* rust side of circle args Signed-off-by: Jess Frazelle <github@jessfraz.com> * change circle in all test js files Signed-off-by: Jess Frazelle <github@jessfraz.com> * more js side Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix Signed-off-by: Jess Frazelle <github@jessfraz.com> * A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores) * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * fixes Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * updates Signed-off-by: Jess Frazelle <github@jessfraz.com> * fix Signed-off-by: Jess Frazelle <github@jessfraz.com> * ud[ates Signed-off-by: Jess Frazelle <github@jessfraz.com> * ud[ates Signed-off-by: Jess Frazelle <github@jessfraz.com> * A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores) --------- Signed-off-by: Jess Frazelle <github@jessfraz.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
		
			
				
	
	
		
			392 lines
		
	
	
		
			12 KiB
		
	
	
	
		
			TypeScript
		
	
	
	
	
	
			
		
		
	
	
			392 lines
		
	
	
		
			12 KiB
		
	
	
	
		
			TypeScript
		
	
	
	
	
	
import { test, expect } from './zoo-test'
 | 
						|
import * as fsp from 'fs/promises'
 | 
						|
import { join } from 'path'
 | 
						|
 | 
						|
const FEATURE_TREE_EXAMPLE_CODE = `export fn timesFive(x) {
 | 
						|
  return 5 * x
 | 
						|
}
 | 
						|
export fn triangle() {
 | 
						|
  return startSketchOn('XZ')
 | 
						|
    |> startProfileAt([0, 0], %)
 | 
						|
    |> xLine(10, %)
 | 
						|
    |> line(end = [-10, -5])
 | 
						|
    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
 | 
						|
    |> close()
 | 
						|
}
 | 
						|
 | 
						|
length001 = timesFive(1) * 5
 | 
						|
sketch001 = startSketchOn('XZ')
 | 
						|
  |> startProfileAt([20, 10], %)
 | 
						|
  |> line(end = [10, 10])
 | 
						|
  |> angledLine([-45, length001], %)
 | 
						|
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
 | 
						|
  |> close()
 | 
						|
revolve001 = revolve({ axis = "X" }, sketch001)
 | 
						|
triangle()
 | 
						|
  |> extrude(length = 30)
 | 
						|
plane001 = offsetPlane('XY', offset = 10)
 | 
						|
sketch002 = startSketchOn(plane001)
 | 
						|
  |> startProfileAt([-20, 0], %)
 | 
						|
  |> line(end = [5, -15])
 | 
						|
  |> xLine(-10, %)
 | 
						|
  |> line(endAbsolute = [-40, 0])
 | 
						|
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
 | 
						|
  |> close()
 | 
						|
extrude001 = extrude(sketch002, length = 10)
 | 
						|
`
 | 
						|
 | 
						|
const FEATURE_TREE_SKETCH_CODE = `sketch001 = startSketchOn('XZ')
 | 
						|
  |> startProfileAt([0, 0], %)
 | 
						|
  |> angledLine([0, 4], %, $rectangleSegmentA001)
 | 
						|
  |> angledLine([
 | 
						|
       segAng(rectangleSegmentA001) - 90,
 | 
						|
       2
 | 
						|
     ], %, $rectangleSegmentB001)
 | 
						|
  |> angledLine([
 | 
						|
       segAng(rectangleSegmentA001),
 | 
						|
       -segLen(rectangleSegmentA001)
 | 
						|
     ], %, $rectangleSegmentC001)
 | 
						|
  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
 | 
						|
  |> close(%)
 | 
						|
extrude001 = extrude(sketch001, length = 10)
 | 
						|
sketch002 = startSketchOn(extrude001, rectangleSegmentB001)
 | 
						|
  |> circle(
 | 
						|
       center = [-1, 2],
 | 
						|
       radius = .5
 | 
						|
     )
 | 
						|
plane001 = offsetPlane('XZ', offset = -5)
 | 
						|
sketch003 = startSketchOn(plane001)
 | 
						|
  |> circle(center = [0, 0], radius = 5)
 | 
						|
`
 | 
						|
 | 
						|
test.describe('Feature Tree pane', () => {
 | 
						|
  test(
 | 
						|
    'User can go to definition and go to function definition',
 | 
						|
    { tag: '@electron' },
 | 
						|
    async ({ context, homePage, scene, editor, toolbar }) => {
 | 
						|
      await context.folderSetupFn(async (dir) => {
 | 
						|
        const bracketDir = join(dir, 'test-sample')
 | 
						|
        await fsp.mkdir(bracketDir, { recursive: true })
 | 
						|
        await fsp.writeFile(
 | 
						|
          join(bracketDir, 'main.kcl'),
 | 
						|
          FEATURE_TREE_EXAMPLE_CODE,
 | 
						|
          'utf-8'
 | 
						|
        )
 | 
						|
      })
 | 
						|
 | 
						|
      await test.step('setup test', async () => {
 | 
						|
        await homePage.expectState({
 | 
						|
          projectCards: [
 | 
						|
            {
 | 
						|
              title: 'test-sample',
 | 
						|
              fileCount: 1,
 | 
						|
            },
 | 
						|
          ],
 | 
						|
          sortBy: 'last-modified-desc',
 | 
						|
        })
 | 
						|
        await homePage.openProject('test-sample')
 | 
						|
        await scene.waitForExecutionDone()
 | 
						|
        await editor.closePane()
 | 
						|
        await toolbar.openFeatureTreePane()
 | 
						|
      })
 | 
						|
 | 
						|
      async function testViewSource({
 | 
						|
        operationName,
 | 
						|
        operationIndex,
 | 
						|
        expectedActiveLine,
 | 
						|
      }: {
 | 
						|
        operationName: string
 | 
						|
        operationIndex: number
 | 
						|
        expectedActiveLine: string
 | 
						|
      }) {
 | 
						|
        await test.step(`Go to definition of the ${operationName}`, async () => {
 | 
						|
          await toolbar.viewSourceOnOperation(operationName, operationIndex)
 | 
						|
          await editor.expectState({
 | 
						|
            highlightedCode: '',
 | 
						|
            diagnostics: [],
 | 
						|
            activeLines: [expectedActiveLine],
 | 
						|
          })
 | 
						|
          await expect(
 | 
						|
            editor.activeLine.first(),
 | 
						|
            `${operationName} code should be scrolled into view`
 | 
						|
          ).toBeVisible()
 | 
						|
        })
 | 
						|
      }
 | 
						|
 | 
						|
      await testViewSource({
 | 
						|
        operationName: 'Offset Plane',
 | 
						|
        operationIndex: 0,
 | 
						|
        expectedActiveLine: "plane001 = offsetPlane('XY', offset = 10)",
 | 
						|
      })
 | 
						|
      await testViewSource({
 | 
						|
        operationName: 'Extrude',
 | 
						|
        operationIndex: 1,
 | 
						|
        expectedActiveLine: 'extrude001 = extrude(sketch002, length = 10)',
 | 
						|
      })
 | 
						|
      await testViewSource({
 | 
						|
        operationName: 'Revolve',
 | 
						|
        operationIndex: 0,
 | 
						|
        expectedActiveLine: 'revolve001 = revolve({ axis = "X" }, sketch001)',
 | 
						|
      })
 | 
						|
      await testViewSource({
 | 
						|
        operationName: 'Triangle',
 | 
						|
        operationIndex: 0,
 | 
						|
        expectedActiveLine: 'triangle()',
 | 
						|
      })
 | 
						|
 | 
						|
      await test.step('Go to definition on the triangle function', async () => {
 | 
						|
        await toolbar.goToDefinitionOnOperation('Triangle', 0)
 | 
						|
        await editor.expectState({
 | 
						|
          highlightedCode: '',
 | 
						|
          diagnostics: [],
 | 
						|
          activeLines: ['export fn triangle() {'],
 | 
						|
        })
 | 
						|
        await expect(
 | 
						|
          editor.activeLine.first(),
 | 
						|
          'Triangle function definition should be scrolled into view'
 | 
						|
        ).toBeVisible()
 | 
						|
      })
 | 
						|
    }
 | 
						|
  )
 | 
						|
 | 
						|
  test(
 | 
						|
    `User can edit sketch (but not on offset plane yet) from the feature tree`,
 | 
						|
    { tag: '@electron' },
 | 
						|
    async ({ context, homePage, scene, editor, toolbar, page }) => {
 | 
						|
      await context.addInitScript((initialCode) => {
 | 
						|
        localStorage.setItem('persistCode', initialCode)
 | 
						|
      }, FEATURE_TREE_SKETCH_CODE)
 | 
						|
      await page.setBodyDimensions({ width: 1000, height: 500 })
 | 
						|
      await homePage.goToModelingScene()
 | 
						|
 | 
						|
      await test.step('force re-exe', async () => {
 | 
						|
        await page.waitForTimeout(1000)
 | 
						|
        await editor.replaceCode('90', '91')
 | 
						|
        await page.waitForTimeout(1500)
 | 
						|
      })
 | 
						|
 | 
						|
      await test.step('On a default plane should work', async () => {
 | 
						|
        await (await toolbar.getFeatureTreeOperation('Sketch', 0)).dblclick()
 | 
						|
        await expect(
 | 
						|
          toolbar.exitSketchBtn,
 | 
						|
          'We should be in sketch mode now'
 | 
						|
        ).toBeVisible()
 | 
						|
        await editor.expectState({
 | 
						|
          highlightedCode: '',
 | 
						|
          diagnostics: [],
 | 
						|
          activeLines: ["sketch001 = startSketchOn('XZ')"],
 | 
						|
        })
 | 
						|
        await toolbar.exitSketchBtn.click()
 | 
						|
      })
 | 
						|
 | 
						|
      await test.step('On an extrude face should *not* work', async () => {
 | 
						|
        // Tooltip is getting in the way of clicking, so I'm first closing the pane
 | 
						|
        await toolbar.closeFeatureTreePane()
 | 
						|
        await page.waitForTimeout(1000)
 | 
						|
        await editor.replaceCode('91', '90')
 | 
						|
        await page.waitForTimeout(2000)
 | 
						|
        await (await toolbar.getFeatureTreeOperation('Sketch', 1)).dblclick()
 | 
						|
 | 
						|
        await expect(
 | 
						|
          toolbar.exitSketchBtn,
 | 
						|
          'We should be in sketch mode now'
 | 
						|
        ).toBeVisible()
 | 
						|
        await editor.expectState({
 | 
						|
          highlightedCode: '',
 | 
						|
          diagnostics: [],
 | 
						|
          activeLines: [
 | 
						|
            'sketch002=startSketchOn(extrude001,rectangleSegmentB001)',
 | 
						|
          ],
 | 
						|
        })
 | 
						|
        await toolbar.exitSketchBtn.click()
 | 
						|
      })
 | 
						|
 | 
						|
      await test.step('On an offset plane should work', async () => {
 | 
						|
        // Tooltip is getting in the way of clicking, so I'm first closing the pane
 | 
						|
        await toolbar.closeFeatureTreePane()
 | 
						|
        await (await toolbar.getFeatureTreeOperation('Sketch', 2)).dblclick()
 | 
						|
        await editor.expectState({
 | 
						|
          highlightedCode: '',
 | 
						|
          diagnostics: [],
 | 
						|
          activeLines: ['sketch003=startSketchOn(plane001)'],
 | 
						|
        })
 | 
						|
        await expect(
 | 
						|
          toolbar.exitSketchBtn,
 | 
						|
          'We should be in sketch mode now'
 | 
						|
        ).toBeVisible()
 | 
						|
      })
 | 
						|
    }
 | 
						|
  )
 | 
						|
  test(`User can edit an extrude operation from the feature tree`, async ({
 | 
						|
    context,
 | 
						|
    homePage,
 | 
						|
    scene,
 | 
						|
    editor,
 | 
						|
    toolbar,
 | 
						|
    cmdBar,
 | 
						|
    page,
 | 
						|
  }) => {
 | 
						|
    const initialInput = '23'
 | 
						|
    const initialCode = `sketch001 = startSketchOn('XZ')
 | 
						|
      |> circle(center = [0, 0], radius = 5)
 | 
						|
      renamedExtrude = extrude(sketch001, length = ${initialInput})`
 | 
						|
    const newConstantName = 'distance001'
 | 
						|
    const expectedCode = `sketch001 = startSketchOn('XZ')
 | 
						|
      |> circle(center = [0, 0], radius = 5)
 | 
						|
      ${newConstantName} = 23
 | 
						|
      renamedExtrude = extrude(sketch001, length = ${newConstantName})`
 | 
						|
 | 
						|
    await context.folderSetupFn(async (dir) => {
 | 
						|
      const testDir = join(dir, 'test-sample')
 | 
						|
      await fsp.mkdir(testDir, { recursive: true })
 | 
						|
      await fsp.writeFile(join(testDir, 'main.kcl'), initialCode, 'utf-8')
 | 
						|
    })
 | 
						|
 | 
						|
    await test.step('setup test', async () => {
 | 
						|
      await homePage.expectState({
 | 
						|
        projectCards: [
 | 
						|
          {
 | 
						|
            title: 'test-sample',
 | 
						|
            fileCount: 1,
 | 
						|
          },
 | 
						|
        ],
 | 
						|
        sortBy: 'last-modified-desc',
 | 
						|
      })
 | 
						|
      await homePage.openProject('test-sample')
 | 
						|
      await scene.waitForExecutionDone()
 | 
						|
      await toolbar.openFeatureTreePane()
 | 
						|
    })
 | 
						|
 | 
						|
    await test.step('Double click on the extrude operation', async () => {
 | 
						|
      await (await toolbar.getFeatureTreeOperation('Extrude', 0))
 | 
						|
        .first()
 | 
						|
        .dblclick()
 | 
						|
      await editor.expectState({
 | 
						|
        highlightedCode: '',
 | 
						|
        diagnostics: [],
 | 
						|
        activeLines: [
 | 
						|
          `renamedExtrude = extrude(sketch001, length = ${initialInput})`,
 | 
						|
        ],
 | 
						|
      })
 | 
						|
      await cmdBar.expectState({
 | 
						|
        commandName: 'Extrude',
 | 
						|
        stage: 'arguments',
 | 
						|
        currentArgKey: 'distance',
 | 
						|
        currentArgValue: initialInput,
 | 
						|
        headerArguments: {
 | 
						|
          Selection: '1 face',
 | 
						|
          Distance: initialInput,
 | 
						|
        },
 | 
						|
        highlightedHeaderArg: 'distance',
 | 
						|
      })
 | 
						|
    })
 | 
						|
 | 
						|
    await test.step('Add a named constant for distance argument and submit', async () => {
 | 
						|
      await expect(cmdBar.currentArgumentInput).toBeVisible()
 | 
						|
      const addVariableButton = page.getByRole('button', {
 | 
						|
        name: 'Create new variable',
 | 
						|
      })
 | 
						|
      await addVariableButton.click()
 | 
						|
      await cmdBar.progressCmdBar()
 | 
						|
      await cmdBar.expectState({
 | 
						|
        stage: 'review',
 | 
						|
        headerArguments: {
 | 
						|
          Selection: '1 face',
 | 
						|
          // The calculated value is shown in the argument summary
 | 
						|
          Distance: initialInput,
 | 
						|
        },
 | 
						|
        commandName: 'Extrude',
 | 
						|
      })
 | 
						|
      await cmdBar.progressCmdBar()
 | 
						|
      await editor.expectState({
 | 
						|
        highlightedCode: '',
 | 
						|
        diagnostics: [],
 | 
						|
        activeLines: [
 | 
						|
          `renamedExtrude = extrude(sketch001, length = ${newConstantName})`,
 | 
						|
        ],
 | 
						|
      })
 | 
						|
      await editor.expectEditor.toContain(expectedCode, {
 | 
						|
        shouldNormalise: true,
 | 
						|
      })
 | 
						|
    })
 | 
						|
  })
 | 
						|
  test(`User can edit an offset plane operation from the feature tree`, async ({
 | 
						|
    context,
 | 
						|
    homePage,
 | 
						|
    scene,
 | 
						|
    editor,
 | 
						|
    toolbar,
 | 
						|
    cmdBar,
 | 
						|
  }) => {
 | 
						|
    const testCode = (value: string) =>
 | 
						|
      `p = offsetPlane('XY', offset = ${value})`
 | 
						|
    const initialInput = '10'
 | 
						|
    const initialCode = testCode(initialInput)
 | 
						|
    const newInput = '5 + 10'
 | 
						|
    const expectedCode = testCode(newInput)
 | 
						|
    await context.folderSetupFn(async (dir) => {
 | 
						|
      const testDir = join(dir, 'test-sample')
 | 
						|
      await fsp.mkdir(testDir, { recursive: true })
 | 
						|
      await fsp.writeFile(join(testDir, 'main.kcl'), initialCode, 'utf-8')
 | 
						|
    })
 | 
						|
 | 
						|
    await test.step('setup test', async () => {
 | 
						|
      await homePage.expectState({
 | 
						|
        projectCards: [
 | 
						|
          {
 | 
						|
            title: 'test-sample',
 | 
						|
            fileCount: 1,
 | 
						|
          },
 | 
						|
        ],
 | 
						|
        sortBy: 'last-modified-desc',
 | 
						|
      })
 | 
						|
      await homePage.openProject('test-sample')
 | 
						|
      await scene.waitForExecutionDone()
 | 
						|
      await toolbar.openFeatureTreePane()
 | 
						|
    })
 | 
						|
 | 
						|
    await test.step('Double click on the offset plane operation', async () => {
 | 
						|
      await (await toolbar.getFeatureTreeOperation('Offset Plane', 0))
 | 
						|
        .first()
 | 
						|
        .dblclick()
 | 
						|
      await editor.expectState({
 | 
						|
        highlightedCode: '',
 | 
						|
        diagnostics: [],
 | 
						|
        activeLines: [initialCode],
 | 
						|
      })
 | 
						|
      await cmdBar.expectState({
 | 
						|
        commandName: 'Offset plane',
 | 
						|
        stage: 'arguments',
 | 
						|
        currentArgKey: 'distance',
 | 
						|
        currentArgValue: initialInput,
 | 
						|
        headerArguments: {
 | 
						|
          Plane: '1 plane',
 | 
						|
          Distance: initialInput,
 | 
						|
        },
 | 
						|
        highlightedHeaderArg: 'distance',
 | 
						|
      })
 | 
						|
    })
 | 
						|
 | 
						|
    await test.step('Edit the distance argument and submit', async () => {
 | 
						|
      await expect(cmdBar.currentArgumentInput).toBeVisible()
 | 
						|
      await cmdBar.currentArgumentInput.locator('.cm-content').fill(newInput)
 | 
						|
      await cmdBar.progressCmdBar()
 | 
						|
      await cmdBar.expectState({
 | 
						|
        stage: 'review',
 | 
						|
        headerArguments: {
 | 
						|
          Plane: '1 plane',
 | 
						|
          // We show the calculated value in the argument summary
 | 
						|
          Distance: '15',
 | 
						|
        },
 | 
						|
        commandName: 'Offset plane',
 | 
						|
      })
 | 
						|
      await cmdBar.progressCmdBar()
 | 
						|
      await editor.expectState({
 | 
						|
        highlightedCode: '',
 | 
						|
        diagnostics: [],
 | 
						|
        activeLines: [expectedCode],
 | 
						|
      })
 | 
						|
    })
 | 
						|
  })
 | 
						|
})
 |