Merge branch 'main' into pierremtb/issue4472-Add-shell-point-and-click-operation-backup

Co-authored-by: Frank Noirot <frank@zoo.dev>

.github/workflows/build-apps.yml

@@ -165,6 +165,7 @@ jobs:
       - name: Build the app (release)
         if: ${{ env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true' }}
         env:
+          PUBLISH_FOR_PULL_REQUEST: true
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
@@ -172,6 +173,7 @@ jobs:
           CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
           CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
           CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+          CSC_FOR_PULL_REQUEST: true
           WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
         run: yarn electron-builder --config --publish always
 
@@ -227,6 +229,7 @@ jobs:
           CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
           CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
           CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+          CSC_FOR_PULL_REQUEST: true
           WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
         run: yarn electron-builder --config --publish always
 

docs/kcl/KNOWN-ISSUES.md

@@ -22,5 +22,3 @@ once fixed in engine will just start working here with no language changes.
 
 - **Chamfers**: Chamfers cannot intersect, you will get an error. Only simple
     chamfer cases work currently.
-
-- **Appearance**: Changing the appearance on a loft does not work.

docs/kcl/index.md

@@ -19,7 +19,6 @@ layout: manual
 * [`angledLineThatIntersects`](kcl/angledLineThatIntersects)
 * [`angledLineToX`](kcl/angledLineToX)
 * [`angledLineToY`](kcl/angledLineToY)
-* [`appearance`](kcl/appearance)
 * [`arc`](kcl/arc)
 * [`arcTo`](kcl/arcTo)
 * [`asin`](kcl/asin)

docs/kcl/map.md

@@ -45,7 +45,7 @@ circles = map([1..3], drawCircle)
 ```js
 r = 10 // radius
 // Call `map`, using an anonymous function instead of a named one.
-circles = map([1..3], fn(id) {
+circles = map([1..3], (id) {
   return startSketchOn("XY")
     |> circle({ center = [id * 2 * r, 0], radius = r }, %)
 })

docs/kcl/reduce.md

@@ -61,7 +61,7 @@ assertEqual(sum([1, 2, 3]), 6, 0.00001, "1 + 2 + 3 summed is 6")
 // an anonymous `add` function as its parameter, instead of declaring a
 // named function outside.
 arr = [1, 2, 3]
-sum = reduce(arr, 0, fn(i, result_so_far) {
+sum = reduce(arr, 0, (i, result_so_far) {
   return i + result_so_far
 })
 
@@ -84,7 +84,7 @@ fn decagon(radius) {
   // Use a `reduce` to draw the remaining decagon sides.
   // For each number in the array 1..10, run the given function,
   // which takes a partially-sketched decagon and adds one more edge to it.
-  fullDecagon = reduce([1..10], startOfDecagonSketch, fn(i, partialDecagon) {
+  fullDecagon = reduce([1..10], startOfDecagonSketch, (i, partialDecagon) {
     // Draw one edge of the decagon.
     x = cos(stepAngle * i) * radius
     y = sin(stepAngle * i) * radius

docs/kcl/types/AppearanceData.md

@@ -1,23 +0,0 @@
----
-title: "AppearanceData"
-excerpt: "Data for appearance."
-layout: manual
----
-
-Data for appearance.
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `color` |`string`| Color of the new material, a hex string like "#ff0000". | No |
-| `metalness` |`number` (**maximum:** 100.0)| Metalness of the new material, a percentage like 95.7. | No |
-| `roughness` |`number` (**maximum:** 100.0)| Roughness of the new material, a percentage like 95.7. | No |
-
-

e2e/playwright/point-click.spec.ts

@@ -812,7 +812,6 @@ shellPointAndClickCapCases.forEach(({ shouldPreselect }) => {
           commandName: 'Shell',
         })
         await clickOnCap()
-        await app.page.waitForTimeout(500)
         await cmdBar.progressCmdBar()
         await cmdBar.progressCmdBar()
         await cmdBar.expectState({
@@ -828,7 +827,6 @@ shellPointAndClickCapCases.forEach(({ shouldPreselect }) => {
     } else {
       await test.step(`Preselect the cap`, async () => {
         await clickOnCap()
-        await app.page.waitForTimeout(500)
       })
 
       await test.step(`Go through the command bar flow with a preselected face (cap)`, async () => {

e2e/playwright/snapshot-tests.spec.ts

@@ -950,75 +950,7 @@ test(
 
 test.describe('Grid visibility', { tag: '@snapshot' }, () => {
   // FIXME: Skip on macos its being weird.
-  // test.skip(process.platform === 'darwin', 'Skip on macos')
+  test.skip(process.platform === 'darwin', 'Skip on macos')
-
-  test('Grid turned off to on via command bar', async ({ page }) => {
-    const u = await getUtils(page)
-    const stream = page.getByTestId('stream')
-    const mask = [
-      page.locator('#app-header'),
-      page.locator('#sidebar-top-ribbon'),
-      page.locator('#sidebar-bottom-ribbon'),
-    ]
-
-    await page.setViewportSize({ width: 1200, height: 500 })
-    await page.goto('/')
-    await u.waitForAuthSkipAppStart()
-
-    await u.openDebugPanel()
-    // wait for execution done
-    await expect(
-      page.locator('[data-message-type="execution-done"]')
-    ).toHaveCount(1)
-    await u.closeDebugPanel()
-    await u.closeKclCodePanel()
-    // TODO: Find a way to truly know that the objects have finished
-    // rendering, because an execution-done message is not sufficient.
-    await page.waitForTimeout(1000)
-
-    // Open the command bar.
-    await page
-      .getByRole('button', { name: 'Commands', exact: false })
-      .or(page.getByRole('button', { name: '⌘K' }))
-      .click()
-    const commandName = 'show scale grid'
-    const commandOption = page.getByRole('option', {
-      name: commandName,
-      exact: false,
-    })
-    const cmdSearchBar = page.getByPlaceholder('Search commands')
-    // This selector changes after we set the setting
-    await cmdSearchBar.fill(commandName)
-    await expect(commandOption).toBeVisible()
-    await commandOption.click()
-
-    const toggleInput = page.getByPlaceholder('Off')
-    await expect(toggleInput).toBeVisible()
-    await expect(toggleInput).toBeFocused()
-
-    // Select On
-    await page.keyboard.press('ArrowDown')
-    await expect(page.getByRole('option', { name: 'Off' })).toHaveAttribute(
-      'data-headlessui-state',
-      'active selected'
-    )
-    await page.keyboard.press('ArrowUp')
-    await expect(page.getByRole('option', { name: 'On' })).toHaveAttribute(
-      'data-headlessui-state',
-      'active'
-    )
-    await page.keyboard.press('Enter')
-
-    // Check the toast appeared
-    await expect(
-      page.getByText(`Set show scale grid to "true" as a user default`)
-    ).toBeVisible()
-
-    await expect(stream).toHaveScreenshot({
-      maxDiffPixels: 100,
-      mask,
-    })
-  })
 
   test('Grid turned off', async ({ page }) => {
     const u = await getUtils(page)

e2e/playwright/testing-constraints.spec.ts

@@ -26,17 +26,7 @@ test.describe('Testing constraints', () => {
     })
 
     const u = await getUtils(page)
-    // constants and locators
+    const PUR = 400 / 37.5 //pixeltoUnitRatio
-    const lengthValue = {
-      old: '20',
-      new: '25',
-    }
-    const cmdBarKclInput = page
-      .getByTestId('cmd-bar-arg-value')
-      .getByRole('textbox')
-    const cmdBarSubmitButton = page.getByRole('button', {
-      name: 'arrow right Continue',
-    })
     await page.setViewportSize({ width: 1200, height: 500 })
 
     await u.waitForAuthSkipAppStart()
@@ -46,26 +36,26 @@ test.describe('Testing constraints', () => {
     await u.closeDebugPanel()
 
     // Click the line of code for line.
-    // TODO remove this and reinstate `await topHorzSegmentClick()`
+    await page.getByText(`line([0, 20], %)`).click() // TODO remove this and reinstate // await topHorzSegmentClick()
-    await page.getByText(`line([0, ${lengthValue.old}], %)`).click()
     await page.waitForTimeout(100)
 
     // enter sketch again
     await page.getByRole('button', { name: 'Edit Sketch' }).click()
     await page.waitForTimeout(500) // wait for animation
+
+    const startXPx = 500
+    await page.mouse.move(startXPx + PUR * 15, 250 - PUR * 10)
+    await page.keyboard.down('Shift')
+    await page.mouse.click(834, 244)
+    await page.keyboard.up('Shift')
+
     await page
       .getByRole('button', { name: 'dimension Length', exact: true })
       .click()
-    await expect(cmdBarKclInput).toHaveText('20')
+    await page.getByText('Add constraining value').click()
-    await cmdBarKclInput.fill(lengthValue.new)
-    await expect(
-      page.getByText(`Can't calculate`),
-      `Something went wrong with the KCL expression evaluation`
-    ).not.toBeVisible()
-    await cmdBarSubmitButton.click()
 
     await expect(page.locator('.cm-content')).toHaveText(
-      `length001 = ${lengthValue.new}sketch001 = startSketchOn('XY')  |> startProfileAt([-10, -10], %)  |> line([20, 0], %)  |> angledLine([90, length001], %)  |> xLine(-20, %)`
+      `length001 = 20sketch001 = startSketchOn('XY')  |> startProfileAt([-10, -10], %)  |> line([20, 0], %)  |> angledLine([90, length001], %)  |> xLine(-20, %)`
     )
 
     // Make sure we didn't pop out of sketch mode.
@@ -76,6 +66,7 @@ test.describe('Testing constraints', () => {
     await page.waitForTimeout(500) // wait for animation
 
     // Exit sketch
+    await page.mouse.move(startXPx + PUR * 15, 250 - PUR * 10)
     await page.keyboard.press('Escape')
     await expect(
       page.getByRole('button', { name: 'Exit Sketch' })
@@ -533,7 +524,7 @@ part002 = startSketchOn('XZ')
       })
     }
   })
-  test.describe('Test Angle constraint single selection', () => {
+  test.describe('Test Angle/Length constraint single selection', () => {
     const cases = [
       {
         testName: 'Angle - Add variable',
@@ -547,6 +538,18 @@ part002 = startSketchOn('XZ')
         constraint: 'angle',
         value: '83, 78.33',
       },
+      {
+        testName: 'Length - Add variable',
+        addVariable: true,
+        constraint: 'length',
+        value: '83, length001',
+      },
+      {
+        testName: 'Length - No variable',
+        addVariable: false,
+        constraint: 'length',
+        value: '83, 78.33',
+      },
     ] as const
     for (const { testName, addVariable, value, constraint } of cases) {
       test(`${testName}`, async ({ page }) => {
@@ -605,90 +608,6 @@ part002 = startSketchOn('XZ')
       })
     }
   })
-  test.describe('Test Length constraint single selection', () => {
-    const cases = [
-      {
-        testName: 'Length - Add variable',
-        addVariable: true,
-        constraint: 'length',
-        value: '83, length001',
-      },
-      {
-        testName: 'Length - No variable',
-        addVariable: false,
-        constraint: 'length',
-        value: '83, 78.33',
-      },
-    ] as const
-    for (const { testName, addVariable, value, constraint } of cases) {
-      test(`${testName}`, async ({ page }) => {
-        // constants and locators
-        const cmdBarKclInput = page
-          .getByTestId('cmd-bar-arg-value')
-          .getByRole('textbox')
-        const cmdBarKclVariableNameInput =
-          page.getByPlaceholder('Variable name')
-        const cmdBarSubmitButton = page.getByRole('button', {
-          name: 'arrow right Continue',
-        })
-
-        await page.addInitScript(async () => {
-          localStorage.setItem(
-            'persistCode',
-            `yo = 5
-part001 = startSketchOn('XZ')
-  |> startProfileAt([-7.54, -26.74], %)
-  |> line([74.36, 130.4], %)
-  |> line([78.92, -120.11], %)
-  |> line([9.16, 77.79], %)
-  |> line([51.19, 48.97], %)
-part002 = startSketchOn('XZ')
-  |> startProfileAt([299.05, 231.45], %)
-  |> xLine(-425.34, %, $seg_what)
-  |> yLine(-264.06, %)
-  |> xLine(segLen(seg_what), %)
-  |> lineTo([profileStartX(%), profileStartY(%)], %)`
-          )
-        })
-        const u = await getUtils(page)
-        await page.setViewportSize({ width: 1200, height: 500 })
-
-        await u.waitForAuthSkipAppStart()
-
-        await page.getByText('line([74.36, 130.4], %)').click()
-        await page.getByRole('button', { name: 'Edit Sketch' }).click()
-
-        const line3 = await u.getSegmentBodyCoords(
-          `[data-overlay-index="${2}"]`
-        )
-
-        await page.mouse.click(line3.x, line3.y)
-        await page
-          .getByRole('button', {
-            name: 'Length: open menu',
-          })
-          .click()
-        await page.getByTestId('dropdown-constraint-' + constraint).click()
-
-        if (!addVariable) {
-          await test.step(`Clear the variable input`, async () => {
-            await cmdBarKclVariableNameInput.clear()
-            await cmdBarKclVariableNameInput.press('Backspace')
-          })
-        }
-        await expect(cmdBarKclInput).toHaveText('78.33')
-        await cmdBarSubmitButton.click()
-
-        const changedCode = `|> angledLine([${value}], %)`
-        await expect(page.locator('.cm-content')).toContainText(changedCode)
-        // checking active assures the cursor is where it should be
-        await expect(page.locator('.cm-activeLine')).toHaveText(changedCode)
-
-        // checking the count of the overlays is a good proxy check that the client sketch scene is in a good state
-        await expect(page.getByTestId('segment-overlay')).toHaveCount(4)
-      })
-    }
-  })
   test.describe('Many segments - no modal constraints', () => {
     const cases = [
       {
@@ -949,15 +868,6 @@ part002 = startSketchOn('XZ')
   |> line([3.13, -2.4], %)`
       )
     })
-
-    // constants and locators
-    const cmdBarKclInput = page
-      .getByTestId('cmd-bar-arg-value')
-      .getByRole('textbox')
-    const cmdBarSubmitButton = page.getByRole('button', {
-      name: 'arrow right Continue',
-    })
-
     const u = await getUtils(page)
     await page.setViewportSize({ width: 1200, height: 500 })
 
@@ -1018,8 +928,8 @@ part002 = startSketchOn('XZ')
     // await page.getByRole('button', { name: 'length', exact: true }).click()
     await page.getByTestId('dropdown-constraint-length').click()
 
-    await cmdBarKclInput.fill('10')
+    await page.getByLabel('length Value').fill('10')
-    await cmdBarSubmitButton.click()
+    await page.getByRole('button', { name: 'Add constraining value' }).click()
 
     activeLinesContent = await page.locator('.cm-activeLine').all()
     await expect(activeLinesContent[0]).toHaveText(`|> xLine(length001, %)`)

e2e/playwright/testing-segment-overlays.spec.ts

@@ -91,14 +91,7 @@ test.describe('Testing segment overlays', () => {
           await page.getByTestId('constraint-symbol-popover').count()
         ).toBeGreaterThan(0)
         await unconstrainedLocator.click()
-        await expect(
+        await page.getByText('Add variable').click()
-          page.getByTestId('cmd-bar-arg-value').getByRole('textbox')
-        ).toBeFocused()
-        await page
-          .getByRole('button', {
-            name: 'arrow right Continue',
-          })
-          .click()
         await expect(page.locator('.cm-content')).toContainText(expectFinal)
       }
 
@@ -158,14 +151,7 @@ test.describe('Testing segment overlays', () => {
           await page.getByTestId('constraint-symbol-popover').count()
         ).toBeGreaterThan(0)
         await unconstrainedLocator.click()
-        await expect(
+        await page.getByText('Add variable').click()
-          page.getByTestId('cmd-bar-arg-value').getByRole('textbox')
-        ).toBeFocused()
-        await page
-          .getByRole('button', {
-            name: 'arrow right Continue',
-          })
-          .click()
         await expect(page.locator('.cm-content')).toContainText(
           expectAfterUnconstrained
         )

forge.config.ts

@@ -1,9 +1,20 @@
 import type { ForgeConfig } from '@electron-forge/shared-types'
+import { MakerSquirrel } from '@electron-forge/maker-squirrel'
+import { MakerZIP } from '@electron-forge/maker-zip'
+import { MakerDeb } from '@electron-forge/maker-deb'
+import { MakerRpm } from '@electron-forge/maker-rpm'
 import { VitePlugin } from '@electron-forge/plugin-vite'
+import { MakerWix, MakerWixConfig } from '@electron-forge/maker-wix'
 import { FusesPlugin } from '@electron-forge/plugin-fuses'
 import { FuseV1Options, FuseVersion } from '@electron/fuses'
 import path from 'path'
 
+interface ExtendedMakerWixConfig extends MakerWixConfig {
+  // see https://github.com/electron/forge/issues/3673
+  // this is an undocumented property of electron-wix-msi
+  associateExtensions?: string
+}
+
 const rootDir = process.cwd()
 
 const config: ForgeConfig = {
@@ -28,7 +39,26 @@ const config: ForgeConfig = {
     extendInfo: 'Info.plist', // Information for file associations.
   },
   rebuildConfig: {},
-  makers: [],
+  makers: [
+    new MakerSquirrel({
+      setupIcon: path.resolve(rootDir, 'assets', 'icon.ico'),
+    }),
+    new MakerWix({
+      icon: path.resolve(rootDir, 'assets', 'icon.ico'),
+      associateExtensions: 'kcl',
+    } as ExtendedMakerWixConfig),
+    new MakerZIP({}, ['darwin']),
+    new MakerRpm({
+      options: {
+        icon: path.resolve(rootDir, 'assets', 'icon.png'),
+      },
+    }),
+    new MakerDeb({
+      options: {
+        icon: path.resolve(rootDir, 'assets', 'icon.png'),
+      },
+    }),
+  ],
   plugins: [
     new VitePlugin({
       // `build` can specify multiple entry builds, which can be Main process, Preload scripts, Worker process, etc.

package.json

@@ -39,6 +39,7 @@
     "chokidar": "^4.0.1",
     "codemirror": "^6.0.1",
     "decamelize": "^6.0.0",
+    "electron-squirrel-startup": "^1.0.1",
     "electron-updater": "6.3.0",
     "fuse.js": "^7.0.0",
     "html2canvas-pro": "^1.5.8",
@@ -68,7 +69,7 @@
     "yargs": "^17.7.2"
   },
   "scripts": {
-    "start": "vite --port=3000 --host=0.0.0.0",
+    "start": "vite",
     "start:prod": "vite preview --port=3000",
     "serve": "vite serve --port=3000",
     "build": "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && source \"$HOME/.cargo/env\" && curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -s -- -y && yarn build:wasm && vite build",
@@ -103,6 +104,8 @@
     "generate:machine-api": "npx openapi-typescript ./openapi/machine-api.json -o src/lib/machine-api.d.ts",
     "tron:start": "electron-forge start",
     "tron:package": "electron-forge package",
+    "tron:make": "electron-forge make",
+    "tron:publish": "electron-forge publish",
     "tron:test": "NODE_ENV=development yarn playwright test --config=playwright.electron.config.ts --grep=@electron",
     "tronb:vite": "vite build -c vite.main.config.ts && vite build -c vite.preload.config.ts && vite build -c vite.renderer.config.ts",
     "tronb:package": "electron-builder --config electron-builder.yml",
@@ -145,10 +148,17 @@
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/preset-env": "^7.25.4",
-    "@electron-forge/cli": "7.4.0",
+    "@electron-forge/cli": "^7.4.0",
-    "@electron-forge/plugin-fuses": "7.4.0",
+    "@electron-forge/maker-deb": "^7.4.0",
-    "@electron-forge/plugin-vite": "7.4.0",
+    "@electron-forge/maker-rpm": "^7.4.0",
-    "@electron/fuses": "1.8.0",
+    "@electron-forge/maker-squirrel": "^7.4.0",
+    "@electron-forge/maker-wix": "^7.5.0",
+    "@electron-forge/maker-zip": "^7.5.0",
+    "@electron-forge/plugin-auto-unpack-natives": "^7.4.0",
+    "@electron-forge/plugin-fuses": "^7.4.0",
+    "@electron-forge/plugin-vite": "^7.4.0",
+    "@electron/fuses": "^1.8.0",
+    "@electron/rebuild": "^3.6.0",
     "@iarna/toml": "^2.2.5",
     "@lezer/generator": "^1.7.1",
     "@nabla/vite-plugin-eslint": "^2.0.5",
@@ -178,9 +188,9 @@
     "@xstate/cli": "^0.5.17",
     "autoprefixer": "^10.4.19",
     "d3-force": "^3.0.0",
-    "electron": "32.1.2",
+    "electron": "^32.1.2",
-    "electron-builder": "24.13.3",
+    "electron-builder": "^24.13.3",
-    "electron-notarize": "1.2.2",
+    "electron-notarize": "^1.2.2",
     "eslint": "^8.0.1",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-css-modules": "^2.12.0",

src/clientSideScene/ClientSideSceneComp.tsx

@@ -505,8 +505,7 @@ const ConstraintSymbol = ({
   constrainInfo: ConstrainInfo
   verticalPosition: 'top' | 'bottom'
 }) => {
-  const { commandBarSend } = useCommandsContext()
+  const { context, send } = useModelingContext()
-  const { context } = useModelingContext()
   const varNameMap: {
     [key in ConstrainInfo['type']]: {
       varName: string
@@ -625,18 +624,11 @@ const ConstraintSymbol = ({
         // disabled={implicitDesc} TODO why does this change styles that are hard to override?
         onClick={toSync(async () => {
           if (!isConstrained) {
-            commandBarSend({
+            send({
-              type: 'Find and select command',
+              type: 'Convert to variable',
               data: {
-                name: 'Constrain with named value',
+                pathToNode,
-                groupId: 'modeling',
+                variableName: varName,
-                argDefaultValues: {
-                  currentValue: {
-                    pathToNode,
-                    variableName: varName,
-                    valueText: value,
-                  },
-                },
               },
             })
           } else if (isConstrained) {

src/components/CommandBar/CommandBarKclInput.tsx

@@ -8,16 +8,11 @@ import { getSystemTheme } from 'lib/theme'
 import { useCalculateKclExpression } from 'lib/useCalculateKclExpression'
 import { roundOff } from 'lib/utils'
 import { varMentions } from 'lib/varCompletionExtension'
-import { useEffect, useMemo, useRef, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 import styles from './CommandBarKclInput.module.css'
 import { createIdentifier, createVariableDeclaration } from 'lang/modifyAst'
 import { useCodeMirror } from 'components/ModelingSidebar/ModelingPanes/CodeEditor'
-import { useSelector } from '@xstate/react'
-
-const machineContextSelector = (snapshot?: {
-  context: Record<string, unknown>
-}) => snapshot?.context
 
 function CommandBarKclInput({
   arg,
@@ -36,44 +31,12 @@ function CommandBarKclInput({
     arg.name
   ] as KclCommandValue | undefined
   const { settings } = useSettingsAuthContext()
-  const argMachineContext = useSelector(
+  const defaultValue = (arg.defaultValue as string) || ''
-    arg.machineActor,
-    machineContextSelector
-  )
-  const defaultValue = useMemo(
-    () =>
-      arg.defaultValue
-        ? arg.defaultValue instanceof Function
-          ? arg.defaultValue(commandBarState.context, argMachineContext)
-          : arg.defaultValue
-        : '',
-    [arg.defaultValue, commandBarState.context, argMachineContext]
-  )
-  const initialVariableName = useMemo(() => {
-    // Use the configured variable name if it exists
-    if (arg.variableName !== undefined) {
-      return arg.variableName instanceof Function
-        ? arg.variableName(commandBarState.context, argMachineContext)
-        : arg.variableName
-    }
-    // or derive it from the previously set value or the argument name
-    return previouslySetValue && 'variableName' in previouslySetValue
-      ? previouslySetValue.variableName
-      : arg.name
-  }, [
-    arg.variableName,
-    commandBarState.context,
-    argMachineContext,
-    arg.name,
-    previouslySetValue,
-  ])
   const [value, setValue] = useState(
     previouslySetValue?.valueText || defaultValue || ''
   )
   const [createNewVariable, setCreateNewVariable] = useState(
-    (previouslySetValue && 'variableName' in previouslySetValue) ||
+    previouslySetValue && 'variableName' in previouslySetValue
-      arg.createVariableByDefault ||
-      false
   )
   const [canSubmit, setCanSubmit] = useState(true)
   useHotkeys('mod + k, mod + /', () => commandBarSend({ type: 'Close' }))
@@ -89,7 +52,10 @@ function CommandBarKclInput({
     isNewVariableNameUnique,
   } = useCalculateKclExpression({
     value,
-    initialVariableName,
+    initialVariableName:
+      previouslySetValue && 'variableName' in previouslySetValue
+        ? previouslySetValue.variableName
+        : arg.name,
   })
   const varMentionData: Completion[] = prevVariables.map((v) => ({
     label: v.key,

src/components/LowerRightControls.tsx

@@ -1,4 +1,4 @@
-import { APP_VERSION, getReleaseUrl } from 'routes/Settings'
+import { APP_VERSION } from 'routes/Settings'
 import { CustomIcon } from 'components/CustomIcon'
 import Tooltip from 'components/Tooltip'
 import { PATHS } from 'lib/paths'
@@ -72,8 +72,10 @@ export function LowerRightControls({
       <menu className="flex items-center justify-end gap-3 pointer-events-auto">
         {!location.pathname.startsWith(PATHS.HOME) && <ModelStateIndicator />}
         <a
-          onClick={openExternalBrowserIfDesktop(getReleaseUrl())}
+          onClick={openExternalBrowserIfDesktop(
-          href={getReleaseUrl()}
+            `https://github.com/KittyCAD/modeling-app/releases/tag/v${APP_VERSION}`
+          )}
+          href={`https://github.com/KittyCAD/modeling-app/releases/tag/v${APP_VERSION}`}
           target="_blank"
           rel="noopener noreferrer"
           className={'!no-underline font-mono text-xs ' + linkOverrideClassName}

src/components/LspProvider.tsx

@@ -69,7 +69,14 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
   const [isKclLspReady, setIsKclLspReady] = useState(false)
   const [isCopilotLspReady, setIsCopilotLspReady] = useState(false)
 
-  const { auth } = useSettingsAuthContext()
+  const {
+    auth,
+    settings: {
+      context: {
+        modeling: { defaultUnit },
+      },
+    },
+  } = useSettingsAuthContext()
   const token = auth?.context.token
   const navigate = useNavigate()
 
@@ -85,6 +92,7 @@ export const LspProvider = ({ children }: { children: React.ReactNode }) => {
     const initEvent: KclWorkerOptions = {
       wasmUrl: wasmUrl(),
       token: token,
+      baseUnit: defaultUnit.current,
       apiBaseUrl: VITE_KC_API_BASE_URL,
     }
     lspWorker.postMessage({

src/components/ModelingMachineProvider.tsx

@@ -41,10 +41,7 @@ import {
   angleBetweenInfo,
   applyConstraintAngleBetween,
 } from './Toolbar/SetAngleBetween'
-import {
+import { applyConstraintAngleLength } from './Toolbar/setAngleLength'
-  applyConstraintAngleLength,
-  applyConstraintLength,
-} from './Toolbar/setAngleLength'
 import {
   canSweepSelection,
   handleSelectionBatch,
@@ -54,7 +51,6 @@ import {
   Selections,
   updateSelections,
   canLoftSelection,
-  canRevolveSelection,
   canShellSelection,
 } from 'lib/selections'
 import { applyConstraintIntersect } from './Toolbar/Intersect'
@@ -67,13 +63,12 @@ import {
   getSketchOrientationDetails,
 } from 'clientSideScene/sceneEntities'
 import {
-  insertNamedConstant,
+  moveValueIntoNewVariablePath,
-  replaceValueAtNodePath,
   sketchOnExtrudedFace,
   sketchOnOffsetPlane,
   startSketchOnDefault,
 } from 'lang/modifyAst'
-import { PathToNode, Program, parse, recast, resultIsOk } from 'lang/wasm'
+import { Program, parse, recast, resultIsOk } from 'lang/wasm'
 import {
   doesSceneHaveExtrudedSketch,
   doesSceneHaveSweepableSketch,
@@ -86,6 +81,7 @@ import toast from 'react-hot-toast'
 import { EditorSelection, Transaction } from '@codemirror/state'
 import { useLoaderData, useNavigate, useSearchParams } from 'react-router-dom'
 import { letEngineAnimateAndSyncCamAfter } from 'clientSideScene/CameraControls'
+import { getVarNameModal } from 'hooks/useToolbarGuards'
 import { err, reportRejection, trap } from 'lib/trap'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { modelingMachineEvent } from 'editor/manager'
@@ -576,26 +572,6 @@ export const ModelingMachineProvider = ({
           if (err(canSweep)) return false
           return canSweep
         },
-        'has valid revolve selection': ({ context: { selectionRanges } }) => {
-          // A user can begin extruding if they either have 1+ faces selected or nothing selected
-          // TODO: I believe this guard only allows for extruding a single face at a time
-          const hasNoSelection =
-            selectionRanges.graphSelections.length === 0 ||
-            isRangeBetweenCharacters(selectionRanges) ||
-            isSelectionLastLine(selectionRanges, codeManager.code)
-
-          if (hasNoSelection) {
-            // they have no selection, we should enable the button
-            // so they can select the face through the cmdbar
-            // BUT only if there's extrudable geometry
-            return doesSceneHaveSweepableSketch(kclManager.ast)
-          }
-          if (!isSketchPipe(selectionRanges)) return false
-
-          const canSweep = canRevolveSelection(selectionRanges)
-          if (err(canSweep)) return false
-          return canSweep
-        },
         'has valid loft selection': ({ context: { selectionRanges } }) => {
           const hasNoSelection =
             selectionRanges.graphSelections.length === 0 ||
@@ -913,18 +889,12 @@ export const ModelingMachineProvider = ({
             }
           }
         ),
-        astConstrainLength: fromPromise(
+        'Get length info': fromPromise(
-          async ({
+          async ({ input: { selectionRanges, sketchDetails } }) => {
-            input: { selectionRanges, sketchDetails, lengthValue },
+            const { modifiedAst, pathToNodeMap } =
-          }) => {
+              await applyConstraintAngleLength({
-            if (!lengthValue)
+                selectionRanges,
-              return Promise.reject(new Error('No length value'))
+              })
-            const constraintResult = await applyConstraintLength({
-              selectionRanges,
-              length: lengthValue,
-            })
-            if (err(constraintResult)) return Promise.reject(constraintResult)
-            const { modifiedAst, pathToNodeMap } = constraintResult
             const pResult = parse(recast(modifiedAst))
             if (trap(pResult) || !resultIsOk(pResult))
               return Promise.reject(new Error('Unexpected compilation error'))
@@ -1093,88 +1063,38 @@ export const ModelingMachineProvider = ({
             }
           }
         ),
-        'Apply named value constraint': fromPromise(
+        'Get convert to variable info': fromPromise(
           async ({ input: { selectionRanges, sketchDetails, data } }) => {
-            if (!sketchDetails) {
+            if (!sketchDetails)
               return Promise.reject(new Error('No sketch details'))
-            }
+            const { variableName } = await getVarNameModal({
-            if (!data) {
+              valueName: data?.variableName || 'var',
-              return Promise.reject(new Error('No data from command flow'))
+            })
-            }
             let pResult = parse(recast(kclManager.ast))
             if (trap(pResult) || !resultIsOk(pResult))
               return Promise.reject(new Error('Unexpected compilation error'))
             let parsed = pResult.program
 
-            let result: {
+            const { modifiedAst: _modifiedAst, pathToReplacedNode } =
-              modifiedAst: Node<Program>
+              moveValueIntoNewVariablePath(
-              pathToReplaced: PathToNode | null
+                parsed,
-            } = {
+                kclManager.programMemory,
-              modifiedAst: parsed,
+                data?.pathToNode || [],
-              pathToReplaced: null,
+                variableName
-            }
-            // If the user provided a constant name,
-            // we need to insert the named constant
-            // and then replace the node with the constant's name.
-            if ('variableName' in data.namedValue) {
-              const astAfterReplacement = replaceValueAtNodePath({
-                ast: parsed,
-                pathToNode: data.currentValue.pathToNode,
-                newExpressionString: data.namedValue.variableName,
-              })
-              if (trap(astAfterReplacement)) {
-                return Promise.reject(astAfterReplacement)
-              }
-              const parseResultAfterInsertion = parse(
-                recast(
-                  insertNamedConstant({
-                    node: astAfterReplacement.modifiedAst,
-                    newExpression: data.namedValue,
-                  })
-                )
               )
-              if (
+            pResult = parse(recast(_modifiedAst))
-                trap(parseResultAfterInsertion) ||
-                !resultIsOk(parseResultAfterInsertion)
-              )
-                return Promise.reject(parseResultAfterInsertion)
-              result = {
-                modifiedAst: parseResultAfterInsertion.program,
-                pathToReplaced: astAfterReplacement.pathToReplaced,
-              }
-            } else if ('valueText' in data.namedValue) {
-              // If they didn't provide a constant name,
-              // just replace the node with the value.
-              const astAfterReplacement = replaceValueAtNodePath({
-                ast: parsed,
-                pathToNode: data.currentValue.pathToNode,
-                newExpressionString: data.namedValue.valueText,
-              })
-              if (trap(astAfterReplacement)) {
-                return Promise.reject(astAfterReplacement)
-              }
-              // The `replacer` function returns a pathToNode that assumes
-              // an identifier is also being inserted into the AST, creating an off-by-one error.
-              // This corrects that error, but TODO we should fix this upstream
-              // to avoid this kind of error in the future.
-              astAfterReplacement.pathToReplaced[1][0] =
-                (astAfterReplacement.pathToReplaced[1][0] as number) - 1
-              result = astAfterReplacement
-            }
-
-            pResult = parse(recast(result.modifiedAst))
             if (trap(pResult) || !resultIsOk(pResult))
               return Promise.reject(new Error('Unexpected compilation error'))
             parsed = pResult.program
 
             if (trap(parsed)) return Promise.reject(parsed)
             parsed = parsed as Node<Program>
-            if (!result.pathToReplaced)
+            if (!pathToReplacedNode)
               return Promise.reject(new Error('No path to replaced node'))
 
             const updatedAst =
               await sceneEntitiesManager.updateAstAndRejigSketch(
-                result.pathToReplaced || [],
+                pathToReplacedNode || [],
                 parsed,
                 sketchDetails.zAxis,
                 sketchDetails.yAxis,
@@ -1187,7 +1107,7 @@ export const ModelingMachineProvider = ({
             )
 
             const selection = updateSelections(
-              { 0: result.pathToReplaced },
+              { 0: pathToReplacedNode },
               selectionRanges,
               updatedAst.newAst
             )
@@ -1195,7 +1115,7 @@ export const ModelingMachineProvider = ({
             return {
               selectionType: 'completeSelection',
               selection,
-              updatedPathToNode: result.pathToReplaced,
+              updatedPathToNode: pathToReplacedNode,
             }
           }
         ),

src/components/ModelingSidebar/ModelingPane.tsx

@@ -76,7 +76,7 @@ export const ModelingPane = ({
   return (
     <section
       {...props}
-      aria-label={title && typeof title === 'string' ? title : ''}
+      title={title && typeof title === 'string' ? title : ''}
       data-testid={detailsTestId}
       id={id}
       className={

src/components/Settings/AllKeybindingsFields.tsx

@@ -10,7 +10,7 @@ interface AllKeybindingsFieldsProps {}
 
 export const AllKeybindingsFields = forwardRef(
   (
-    _props: AllKeybindingsFieldsProps,
+    props: AllKeybindingsFieldsProps,
     scrollRef: ForwardedRef<HTMLDivElement>
   ) => {
     // This is how we will get the interaction map from the context
@@ -25,7 +25,7 @@ export const AllKeybindingsFields = forwardRef(
             .map(([category, categoryItems]) => (
               <div className="flex flex-col gap-4 px-2 pr-4">
                 <h2
-                  id={`category-${category.replaceAll(/\s/g, '-')}`}
+                  id={`category-${category}`}
                   className="text-xl mt-6 first-of-type:mt-0 capitalize font-bold"
                 >
                   {category}

src/components/Settings/AllSettingsFields.tsx

@@ -13,7 +13,7 @@ import { isDesktop } from 'lib/isDesktop'
 import { ActionButton } from 'components/ActionButton'
 import { SettingsFieldInput } from './SettingsFieldInput'
 import toast from 'react-hot-toast'
-import { APP_VERSION, IS_NIGHTLY, getReleaseUrl } from 'routes/Settings'
+import { APP_VERSION, PACKAGE_NAME } from 'routes/Settings'
 import { PATHS } from 'lib/paths'
 import {
   createAndOpenNewTutorialProject,
@@ -246,8 +246,10 @@ export const AllSettingsFields = forwardRef(
                   to inject the version from package.json */}
               App version {APP_VERSION}.{' '}
               <a
-                onClick={openExternalBrowserIfDesktop(getReleaseUrl())}
+                onClick={openExternalBrowserIfDesktop(
-                href={getReleaseUrl()}
+                  `https://github.com/KittyCAD/modeling-app/releases/tag/v${APP_VERSION}`
+                )}
+                href={`https://github.com/KittyCAD/modeling-app/releases/tag/v${APP_VERSION}`}
                 target="_blank"
                 rel="noopener noreferrer"
               >
@@ -269,7 +271,7 @@ export const AllSettingsFields = forwardRef(
               , and start a discussion if you don't see it! Your feedback will
               help us prioritize what to build next.
             </p>
-            {!IS_NIGHTLY && (
+            {PACKAGE_NAME.indexOf('-nightly') === -1 && (
               <p className="max-w-2xl mt-6">
                 Want to experience the latest and (hopefully) greatest from our
                 main development branch?{' '}

src/components/Settings/KeybindingsSectionsList.tsx

@@ -19,7 +19,7 @@ export function KeybindingsSectionsList({
             key={category}
             onClick={() =>
               scrollRef.current
-                ?.querySelector(`#category-${category.replaceAll(/\s/g, '-')}`)
+                ?.querySelector(`#category-${category}`)
                 ?.scrollIntoView({
                   block: 'center',
                   behavior: 'smooth',

src/components/SettingsAuthProvider.tsx

@@ -1,5 +1,5 @@
 import { trap } from 'lib/trap'
-import { useMachine, useSelector } from '@xstate/react'
+import { useMachine } from '@xstate/react'
 import { useNavigate, useRouteLoaderData, useLocation } from 'react-router-dom'
 import { PATHS, BROWSER_PATH } from 'lib/paths'
 import { authMachine, TOKEN_PERSIST_KEY } from '../machines/authMachine'
@@ -23,6 +23,7 @@ import {
   engineCommandManager,
   sceneEntitiesManager,
 } from 'lib/singletons'
+import { uuidv4 } from 'lib/utils'
 import { IndexLoaderData } from 'lib/types'
 import { settings } from 'lib/settings/initialSettings'
 import {
@@ -54,15 +55,11 @@ type SettingsAuthContextType = {
   settings: MachineContext<typeof settingsMachine>
 }
 
-/**
+// a little hacky for sure, open to changing it
- * This variable is used to store the last snapshot of the settings context
+// this implies that we should only even have one instance of this provider mounted at any one time
- * for use outside of React, such as in `wasm.ts`. It is updated every time
+// but I think that's a safe assumption
- * the settings machine changes with `useSelector`.
+let settingsStateRef: ContextFrom<typeof settingsMachine> | undefined
- * TODO: when we decouple XState from React, we can just subscribe to the actor directly from `wasm.ts`
+export const getSettingsState = () => settingsStateRef
- */
-export let lastSettingsContextSnapshot:
-  | ContextFrom<typeof settingsMachine>
-  | undefined
 
 export const SettingsAuthContext = createContext({} as SettingsAuthContextType)
 
@@ -132,11 +129,27 @@ export const SettingsAuthProviderBase = ({
             .setTheme(context.app.theme.current)
             .catch(reportRejection)
         },
+        setEngineScaleGridVisibility: ({ context }) => {
+          engineCommandManager.setScaleGridVisibility(
+            context.modeling.showScaleGrid.current
+          )
+        },
         setClientTheme: ({ context }) => {
           const opposingTheme = getOppositeTheme(context.app.theme.current)
           sceneInfra.theme = opposingTheme
           sceneEntitiesManager.updateSegmentBaseColor(opposingTheme)
         },
+        setEngineEdges: ({ context }) => {
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
+          engineCommandManager.sendSceneCommand({
+            cmd_id: uuidv4(),
+            type: 'modeling_cmd_req',
+            cmd: {
+              type: 'edge_lines_visible' as any, // TODO update kittycad.ts to get this new command type
+              hidden: !context.modeling.highlightEdges.current,
+            },
+          })
+        },
         toastSuccess: ({ event }) => {
           if (!('data' in event)) return
           const eventParts = event.type.replace(/^set./, '').split('.') as [
@@ -162,27 +175,17 @@ export const SettingsAuthProviderBase = ({
         },
         'Execute AST': ({ context, event }) => {
           try {
-            const relevantSetting = (s: typeof settings) => {
-              return (
-                s.modeling?.defaultUnit?.current !==
-                  context.modeling.defaultUnit.current ||
-                s.modeling.showScaleGrid.current !==
-                  context.modeling.showScaleGrid.current ||
-                s.modeling?.highlightEdges.current !==
-                  context.modeling.highlightEdges.current
-              )
-            }
-
             const allSettingsIncludesUnitChange =
               event.type === 'Set all settings' &&
-              relevantSetting(event.settings)
+              event.settings?.modeling?.defaultUnit?.current !==
+                context.modeling.defaultUnit.current
             const resetSettingsIncludesUnitChange =
-              event.type === 'Reset settings' && relevantSetting(settings)
+              event.type === 'Reset settings' &&
+              context.modeling.defaultUnit.current !==
+                settings?.modeling?.defaultUnit?.default
 
             if (
               event.type === 'set.modeling.defaultUnit' ||
-              event.type === 'set.modeling.showScaleGrid' ||
-              event.type === 'set.modeling.highlightEdges' ||
               allSettingsIncludesUnitChange ||
               resetSettingsIncludesUnitChange
             ) {
@@ -211,10 +214,7 @@ export const SettingsAuthProviderBase = ({
     }),
     { input: loadedSettings }
   )
-  // Any time the actor changes, update the settings state for external use
+  settingsStateRef = settingsState.context
-  useSelector(settingsActor, (s) => {
-    lastSettingsContextSnapshot = s.context
-  })
 
   useEffect(() => {
     if (!isDesktop()) return

src/components/ToastUpdate.tsx

@@ -2,7 +2,6 @@ import toast from 'react-hot-toast'
 import { ActionButton } from './ActionButton'
 import { openExternalBrowserIfDesktop } from 'lib/openWindow'
 import { Marked } from '@ts-stack/markdown'
-import { getReleaseUrl } from 'routes/Settings'
 
 export function ToastUpdate({
   version,
@@ -33,8 +32,10 @@ export function ToastUpdate({
             A new update has downloaded and will be available next time you
             start the app. You can view the release notes{' '}
             <a
-              onClick={openExternalBrowserIfDesktop(getReleaseUrl(version))}
+              onClick={openExternalBrowserIfDesktop(
-              href={getReleaseUrl(version)}
+                `https://github.com/KittyCAD/modeling-app/releases/tag/v${version}`
+              )}
+              href={`https://github.com/KittyCAD/modeling-app/releases/tag/v${version}`}
               target="_blank"
               rel="noreferrer"
             >

src/components/Toolbar/setAngleLength.tsx

@@ -22,7 +22,6 @@ import { removeDoubleNegatives } from '../AvailableVarsHelpers'
 import { normaliseAngle } from '../../lib/utils'
 import { kclManager } from 'lib/singletons'
 import { err } from 'lib/trap'
-import { KclCommandValue } from 'lib/commandTypes'
 
 const getModalInfo = createSetAngleLengthModal(SetAngleLengthModal)
 
@@ -64,57 +63,6 @@ export function angleLengthInfo({
   return { enabled, transforms }
 }
 
-export async function applyConstraintLength({
-  length,
-  selectionRanges,
-}: {
-  length: KclCommandValue
-  selectionRanges: Selections
-}) {
-  const ast = kclManager.ast
-  const angleLength = angleLengthInfo({ selectionRanges })
-  if (err(angleLength)) return angleLength
-  const { transforms } = angleLength
-
-  let distanceExpression: Expr = length.valueAst
-
-  /**
-   * To be "constrained", the value must be a binary expression, a named value, or a function call.
-   * If it has a variable name, we need to insert a variable declaration at the correct index.
-   */
-  if (
-    'variableName' in length &&
-    length.variableName &&
-    length.insertIndex !== undefined
-  ) {
-    const newBody = [...ast.body]
-    newBody.splice(length.insertIndex, 0, length.variableDeclarationAst)
-    ast.body = newBody
-    distanceExpression = createIdentifier(length.variableName)
-  }
-
-  if (!isExprBinaryPart(distanceExpression)) {
-    return new Error('Invalid valueNode, is not a BinaryPart')
-  }
-
-  const retval = transformAstSketchLines({
-    ast,
-    selectionRanges,
-    transformInfos: transforms,
-    programMemory: kclManager.programMemory,
-    referenceSegName: '',
-    forceValueUsedInTransform: distanceExpression,
-  })
-  if (err(retval)) return Promise.reject(retval)
-
-  const { modifiedAst: _modifiedAst, pathToNodeMap } = retval
-
-  return {
-    modifiedAst: _modifiedAst,
-    pathToNodeMap,
-  }
-}
-
 export async function applyConstraintAngleLength({
   selectionRanges,
   angleOrLength = 'setLength',

src/components/UnitsMenu.tsx

@@ -41,10 +41,7 @@ export function UnitsMenu() {
                       close()
                     }}
                   >
-                    <span className="flex-1">{baseUnitLabels[unit]}</span>
+                    {baseUnitLabels[unit]}
-                    {unit === settings.context.modeling.defaultUnit.current && (
-                      <span className="text-chalkboard-60">current</span>
-                    )}
                   </button>
                 </li>
               ))}

src/editor/plugins/lsp/types.ts

@@ -1,5 +1,7 @@
 import { LspWorkerEventType } from '@kittycad/codemirror-lsp-client'
 
+import { UnitLength } from 'wasm-lib/kcl/bindings/UnitLength'
+
 export enum LspWorker {
   Kcl = 'kcl',
   Copilot = 'copilot',
@@ -7,6 +9,7 @@ export enum LspWorker {
 export interface KclWorkerOptions {
   wasmUrl: string
   token: string
+  baseUnit: UnitLength
   apiBaseUrl: string
 }
 

src/editor/plugins/lsp/worker.ts

@@ -17,6 +17,7 @@ import {
   KclWorkerOptions,
   CopilotWorkerOptions,
 } from 'editor/plugins/lsp/types'
+import { EngineCommandManager } from 'lang/std/engineConnection'
 import { err, reportRejection } from 'lib/trap'
 
 const intoServer: IntoServer = new IntoServer()
@@ -45,12 +46,14 @@ export async function copilotLspRun(
 
 export async function kclLspRun(
   config: ServerConfig,
+  engineCommandManager: EngineCommandManager | null,
   token: string,
+  baseUnit: string,
   baseUrl: string
 ) {
   try {
     console.log('start kcl lsp')
-    await kcl_lsp_run(config, null, undefined, token, baseUrl)
+    await kcl_lsp_run(config, engineCommandManager, baseUnit, token, baseUrl)
   } catch (e: any) {
     console.log('kcl lsp failed', e)
     // We can't restart here because a moved value, we should do this another way.
@@ -79,7 +82,13 @@ onmessage = function (event: MessageEvent) {
           switch (worker) {
             case LspWorker.Kcl:
               const kclData = eventData as KclWorkerOptions
-              await kclLspRun(config, kclData.token, kclData.apiBaseUrl)
+              await kclLspRun(
+                config,
+                null,
+                kclData.token,
+                kclData.baseUnit,
+                kclData.apiBaseUrl
+              )
               break
             case LspWorker.Copilot:
               let copilotData = eventData as CopilotWorkerOptions

src/hooks/useSetupEngineManager.ts

@@ -2,7 +2,7 @@ import { useLayoutEffect, useEffect, useRef } from 'react'
 import { engineCommandManager, kclManager } from 'lib/singletons'
 import { deferExecution } from 'lib/utils'
 import { Themes } from 'lib/theme'
-import { makeDefaultPlanes } from 'lang/wasm'
+import { makeDefaultPlanes, modifyGrid } from 'lang/wasm'
 import { useModelingContext } from './useModelingContext'
 import { useNetworkContext } from 'hooks/useNetworkContext'
 import { useAppState, useAppStream } from 'AppState'
@@ -56,6 +56,9 @@ export function useSetupEngineManager(
       makeDefaultPlanes: () => {
         return makeDefaultPlanes(kclManager.engineCommandManager)
       },
+      modifyGrid: (hidden: boolean) => {
+        return modifyGrid(kclManager.engineCommandManager, hidden)
+      },
     })
     hasSetNonZeroDimensions.current = true
   }

src/hooks/useToolbarGuards.ts

@@ -24,8 +24,6 @@ export function useConvertToVariable(range?: SourceRange) {
   }, [enable])
 
   useEffect(() => {
-    // Return early if there are no selection ranges for whatever reason
-    if (!context.selectionRanges) return
     const parsed = ast
 
     const meta = isNodeSafeToReplace(

src/index.css

@@ -317,8 +317,3 @@ code {
 #code-mirror-override .cm-editor {
   height: 100% !important;
 }
-
-/* Can't use #code-mirror-override here as we're outside of this div */
-.body-bg .cm-diagnosticAction {
-  @apply bg-primary;
-}

src/lang/modifyAst.ts

@@ -45,7 +45,6 @@ import { TagDeclarator } from 'wasm-lib/kcl/bindings/TagDeclarator'
 import { Models } from '@kittycad/lib'
 import { ExtrudeFacePlane } from 'machines/modelingMachine'
 import { Node } from 'wasm-lib/kcl/bindings/Node'
-import { KclExpressionWithVariable } from 'lib/commandTypes'
 
 export function startSketchOnDefault(
   node: Node<Program>,
@@ -591,25 +590,6 @@ export function addOffsetPlane({
   }
 }
 
-/**
- * Return a modified clone of an AST with a named constant inserted into the body
- */
-export function insertNamedConstant({
-  node,
-  newExpression,
-}: {
-  node: Node<Program>
-  newExpression: KclExpressionWithVariable
-}): Node<Program> {
-  const ast = structuredClone(node)
-  ast.body.splice(
-    newExpression.insertIndex,
-    0,
-    newExpression.variableDeclarationAst
-  )
-  return ast
-}
-
 /**
  * Modify the AST to create a new sketch using the variable declaration
  * of an offset plane. The new sketch just has to come after the offset
@@ -953,31 +933,6 @@ export function giveSketchFnCallTag(
   }
 }
 
-/**
- * Replace a
- */
-export function replaceValueAtNodePath({
-  ast,
-  pathToNode,
-  newExpressionString,
-}: {
-  ast: Node<Program>
-  pathToNode: PathToNode
-  newExpressionString: string
-}) {
-  const replaceCheckResult = isNodeSafeToReplacePath(ast, pathToNode)
-  if (err(replaceCheckResult)) {
-    return replaceCheckResult
-  }
-  const { isSafe, value, replacer } = replaceCheckResult
-
-  if (!isSafe || value.type === 'Identifier') {
-    return new Error('Not safe to replace')
-  }
-
-  return replacer(ast, newExpressionString)
-}
-
 export function moveValueIntoNewVariablePath(
   ast: Node<Program>,
   programMemory: ProgramMemory,

src/lang/modifyAst/addEdgeTreatment.test.ts

@@ -40,6 +40,7 @@ beforeAll(async () => {
       makeDefaultPlanes: () => makeDefaultPlanes(engineCommandManager),
       setMediaStream: () => {},
       setIsStreamReady: () => {},
+      modifyGrid: async () => {},
       callbackOnEngineLiteConnect: () => {
         resolve(true)
       },

src/lang/modifyAst/addEdgeTreatment.ts

@@ -335,7 +335,7 @@ export function mutateAstWithTagForSketchSegment(
   return { modifiedAst: astClone, tag }
 }
 
-export function getEdgeTagCall(
+function getEdgeTagCall(
   tag: string,
   artifact: Artifact
 ): Node<Identifier | CallExpression> {

src/lang/modifyAst/addRevolve.ts

@@ -1,154 +0,0 @@
-import { err } from 'lib/trap'
-import { KCL_DEFAULT_CONSTANT_PREFIXES } from 'lib/constants'
-import {
-  Program,
-  PathToNode,
-  Expr,
-  CallExpression,
-  PipeExpression,
-  VariableDeclarator,
-} from 'lang/wasm'
-import { Selections } from 'lib/selections'
-import { Node } from 'wasm-lib/kcl/bindings/Node'
-import {
-  createLiteral,
-  createCallExpressionStdLib,
-  createObjectExpression,
-  createIdentifier,
-  createPipeExpression,
-  findUniqueName,
-  createVariableDeclaration,
-} from 'lang/modifyAst'
-import { getNodeFromPath, getNodePathFromSourceRange } from 'lang/queryAst'
-import {
-  mutateAstWithTagForSketchSegment,
-  getEdgeTagCall,
-} from 'lang/modifyAst/addEdgeTreatment'
-export function revolveSketch(
-  ast: Node<Program>,
-  pathToSketchNode: PathToNode,
-  shouldPipe = false,
-  angle: Expr = createLiteral(4),
-  axis: Selections
-):
-  | {
-      modifiedAst: Node<Program>
-      pathToSketchNode: PathToNode
-      pathToRevolveArg: PathToNode
-    }
-  | Error {
-  const clonedAst = structuredClone(ast)
-  const sketchNode = getNodeFromPath(clonedAst, pathToSketchNode)
-  if (err(sketchNode)) return sketchNode
-
-  // testing code
-  const pathToAxisSelection = getNodePathFromSourceRange(
-    clonedAst,
-    axis.graphSelections[0]?.codeRef.range
-  )
-
-  const lineNode = getNodeFromPath<CallExpression>(
-    clonedAst,
-    pathToAxisSelection,
-    'CallExpression'
-  )
-  if (err(lineNode)) return lineNode
-
-  // TODO Kevin: What if |> close(%)?
-  // TODO Kevin: What if opposite edge
-  // TODO Kevin: What if the edge isn't planar to the sketch?
-  // TODO Kevin: add a tag.
-  const tagResult = mutateAstWithTagForSketchSegment(
-    clonedAst,
-    pathToAxisSelection
-  )
-
-  // Have the tag whether it is already created or a new one is generated
-  if (err(tagResult)) return tagResult
-  const { tag } = tagResult
-
-  /* Original Code */
-  const { node: sketchExpression } = sketchNode
-
-  // determine if sketchExpression is in a pipeExpression or not
-  const sketchPipeExpressionNode = getNodeFromPath<PipeExpression>(
-    clonedAst,
-    pathToSketchNode,
-    'PipeExpression'
-  )
-  if (err(sketchPipeExpressionNode)) return sketchPipeExpressionNode
-  const { node: sketchPipeExpression } = sketchPipeExpressionNode
-  const isInPipeExpression = sketchPipeExpression.type === 'PipeExpression'
-
-  const sketchVariableDeclaratorNode = getNodeFromPath<VariableDeclarator>(
-    clonedAst,
-    pathToSketchNode,
-    'VariableDeclarator'
-  )
-  if (err(sketchVariableDeclaratorNode)) return sketchVariableDeclaratorNode
-  const {
-    node: sketchVariableDeclarator,
-    shallowPath: sketchPathToDecleration,
-  } = sketchVariableDeclaratorNode
-
-  const axisSelection = axis?.graphSelections[0]?.artifact
-
-  if (!axisSelection) return new Error('Axis selection is missing.')
-
-  const revolveCall = createCallExpressionStdLib('revolve', [
-    createObjectExpression({
-      angle: angle,
-      axis: getEdgeTagCall(tag, axisSelection),
-    }),
-    createIdentifier(sketchVariableDeclarator.id.name),
-  ])
-
-  if (shouldPipe) {
-    const pipeChain = createPipeExpression(
-      isInPipeExpression
-        ? [...sketchPipeExpression.body, revolveCall]
-        : [sketchExpression as any, revolveCall]
-    )
-
-    sketchVariableDeclarator.init = pipeChain
-    const pathToRevolveArg: PathToNode = [
-      ...sketchPathToDecleration,
-      ['init', 'VariableDeclarator'],
-      ['body', ''],
-      [pipeChain.body.length - 1, 'index'],
-      ['arguments', 'CallExpression'],
-      [0, 'index'],
-    ]
-
-    return {
-      modifiedAst: clonedAst,
-      pathToSketchNode,
-      pathToRevolveArg,
-    }
-  }
-
-  // We're not creating a pipe expression,
-  // but rather a separate constant for the extrusion
-  const name = findUniqueName(clonedAst, KCL_DEFAULT_CONSTANT_PREFIXES.REVOLVE)
-  const VariableDeclaration = createVariableDeclaration(name, revolveCall)
-  const sketchIndexInPathToNode =
-    sketchPathToDecleration.findIndex((a) => a[0] === 'body') + 1
-  const sketchIndexInBody = sketchPathToDecleration[sketchIndexInPathToNode][0]
-  if (typeof sketchIndexInBody !== 'number')
-    return new Error('expected sketchIndexInBody to be a number')
-  clonedAst.body.splice(sketchIndexInBody + 1, 0, VariableDeclaration)
-
-  const pathToRevolveArg: PathToNode = [
-    ['body', ''],
-    [sketchIndexInBody + 1, 'index'],
-    ['declaration', 'VariableDeclaration'],
-    ['init', 'VariableDeclarator'],
-    ['arguments', 'CallExpression'],
-    [0, 'index'],
-  ]
-  return {
-    modifiedAst: clonedAst,
-    pathToSketchNode: [...pathToSketchNode.slice(0, -1), [-1, 'index']],
-    pathToRevolveArg,
-  }
-}

src/lang/modifyAst/addShell.ts

@@ -111,7 +111,8 @@ export function addShell({
   const pathToNode: PathToNode = [
     ['body', ''],
     [modifiedAst.body.length - 1, 'index'],
-    ['declaration', 'VariableDeclaration'],
+    ['declarations', 'VariableDeclaration'],
+    ['0', 'index'],
     ['init', 'VariableDeclarator'],
     ['arguments', 'CallExpression'],
     [0, 'index'],

src/lang/queryAst.test.ts

@@ -661,7 +661,7 @@ describe('Testing doesSceneHaveExtrudedSketch', () => {
   |> circle({ center = [0, 0], radius = 1 }, %)
 extrude001 = extrude(1, sketch001)
 `
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
     if (err(ast)) throw ast
     const extrudable = doesSceneHaveExtrudedSketch(ast)
     expect(extrudable).toBeTruthy()
@@ -671,7 +671,7 @@ extrude001 = extrude(1, sketch001)
   |> circle({ center = [0, 0], radius = 1 }, %)
   |> extrude(1, %)
 `
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
     if (err(ast)) throw ast
     const extrudable = doesSceneHaveExtrudedSketch(ast)
     expect(extrudable).toBeTruthy()
@@ -680,7 +680,7 @@ extrude001 = extrude(1, sketch001)
     const exampleCode = `extrude001 = startSketchOn('XZ')
   |> circle({ center = [0, 0], radius = 1 }, %)
 `
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
     if (err(ast)) throw ast
     const extrudable = doesSceneHaveExtrudedSketch(ast)
     expect(extrudable).toBeFalsy()

src/lang/std/artifactGraph.test.ts

@@ -139,6 +139,7 @@ beforeAll(async () => {
       makeDefaultPlanes: () => makeDefaultPlanes(engineCommandManager),
       setMediaStream: () => {},
       setIsStreamReady: () => {},
+      modifyGrid: async () => {},
       // eslint-disable-next-line @typescript-eslint/no-misused-promises
       callbackOnEngineLiteConnect: async () => {
         const cacheEntries = Object.entries(codeToWriteCacheFor) as [

src/lang/std/artifactGraph.ts

@@ -871,15 +871,3 @@ export function codeRefFromRange(range: SourceRange, ast: Program): CodeRef {
     pathToNode: getNodePathFromSourceRange(ast, range),
   }
 }
-
-export function isSolid2D(artifact: Artifact): artifact is solid2D {
-  return (artifact as solid2D).pathId !== undefined
-}
-
-export function isSegment(artifact: Artifact): artifact is SegmentArtifact {
-  return (artifact as SegmentArtifact).pathId !== undefined
-}
-
-export function isSweep(artifact: Artifact): artifact is SweepArtifact {
-  return (artifact as SweepArtifact).pathId !== undefined
-}

src/lang/std/engineConnection.ts

@@ -1399,6 +1399,7 @@ export class EngineCommandManager extends EventTarget {
   }
 
   private makeDefaultPlanes: () => Promise<DefaultPlanes> | null = () => null
+  private modifyGrid: (hidden: boolean) => Promise<void> | null = () => null
 
   private onEngineConnectionOpened = () => {}
   private onEngineConnectionClosed = () => {}
@@ -1431,6 +1432,7 @@ export class EngineCommandManager extends EventTarget {
     height,
     token,
     makeDefaultPlanes,
+    modifyGrid,
     settings = {
       pool: null,
       theme: Themes.Dark,
@@ -1450,12 +1452,14 @@ export class EngineCommandManager extends EventTarget {
     height: number
     token?: string
     makeDefaultPlanes: () => Promise<DefaultPlanes>
+    modifyGrid: (hidden: boolean) => Promise<void>
     settings?: SettingsViaQueryString
   }) {
     if (settings) {
       this.settings = settings
     }
     this.makeDefaultPlanes = makeDefaultPlanes
+    this.modifyGrid = modifyGrid
     if (width === 0 || height === 0) {
       return
     }
@@ -1535,15 +1539,21 @@ export class EngineCommandManager extends EventTarget {
           type: 'default_camera_get_settings',
         },
       })
-      await this.initPlanes()
+      // We want modify the grid first because we don't want it to flash.
-      setIsStreamReady(true)
+      // Ideally these would already be default hidden in engine (TODO do
+      // that) https://github.com/KittyCAD/engine/issues/2282
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      this.modifyGrid(!this.settings.showScaleGrid)?.then(async () => {
+        await this.initPlanes()
+        setIsStreamReady(true)
 
-      // Other parts of the application should use this to react on scene ready.
+        // Other parts of the application should use this to react on scene ready.
-      this.dispatchEvent(
+        this.dispatchEvent(
-        new CustomEvent(EngineCommandManagerEvents.SceneReady, {
+          new CustomEvent(EngineCommandManagerEvents.SceneReady, {
-          detail: this.engineConnection,
+            detail: this.engineConnection,
-        })
+          })
-      )
+        )
+      })
     }
 
     this.engineConnection.addEventListener(
@@ -2202,6 +2212,15 @@ export class EngineCommandManager extends EventTarget {
     }).catch(reportRejection)
   }
 
+  /**
+   * Set the visibility of the scale grid in the engine scene.
+   * @param visible - whether to show or hide the scale grid
+   */
+  setScaleGridVisibility(visible: boolean) {
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
+    this.modifyGrid(!visible)
+  }
+
   // Some "objects" have the same source range, such as sketch_mode_start and start_path.
   // So when passing a range, we need to also specify the command type
   mapRangeToObjectId(

src/lang/wasm.test.ts

@@ -1,13 +1,9 @@
 import { err } from 'lib/trap'
-import { initPromise, parse, ParseResult } from './wasm'
+import { parse, ParseResult } from './wasm'
 import { enginelessExecutor } from 'lib/testHelpers'
 import { Node } from 'wasm-lib/kcl/bindings/Node'
 import { Program } from '../wasm-lib/kcl/bindings/Program'
 
-beforeEach(async () => {
-  await initPromise
-})
-
 it('can execute parsed AST', async () => {
   const code = `x = 1
 // A comment.`

src/lang/wasm.ts

@@ -1,13 +1,14 @@
 import init, {
   parse_wasm,
   recast_wasm,
-  execute,
+  execute_wasm,
   kcl_lint,
   modify_ast_for_sketch_wasm,
   is_points_ccw,
   get_tangential_arc_to_info,
   program_memory_init,
   make_default_planes,
+  modify_grid,
   coredump,
   toml_stringify,
   default_app_settings,
@@ -42,9 +43,7 @@ import { Environment } from '../wasm-lib/kcl/bindings/Environment'
 import { Node } from 'wasm-lib/kcl/bindings/Node'
 import { CompilationError } from 'wasm-lib/kcl/bindings/CompilationError'
 import { SourceRange as RustSourceRange } from 'wasm-lib/kcl/bindings/SourceRange'
-import { getAllCurrentSettings } from 'lib/settings/settingsUtils'
 
-export type { Configuration } from 'wasm-lib/kcl/bindings/Configuration'
 export type { Program } from '../wasm-lib/kcl/bindings/Program'
 export type { Expr } from '../wasm-lib/kcl/bindings/Expr'
 export type { ObjectExpression } from '../wasm-lib/kcl/bindings/ObjectExpression'
@@ -93,26 +92,12 @@ export type { Solid } from '../wasm-lib/kcl/bindings/Solid'
 export type { KclValue } from '../wasm-lib/kcl/bindings/KclValue'
 export type { ExtrudeSurface } from '../wasm-lib/kcl/bindings/ExtrudeSurface'
 
-/**
- * The first two items are the start and end points (byte offsets from the start of the file).
- * The third item is whether the source range belongs to the 'main' file, i.e., the file currently
- * being rendered/displayed in the editor (TODO we need to handle modules better in the frontend).
- */
 export type SourceRange = [number, number, boolean]
 
-/**
- * Convert a SourceRange as used inside the KCL interpreter into the above one for use in the
- * frontend (essentially we're eagerly checking whether the frontend should care about the SourceRange
- * so as not to expose details of the interpreter's current representation of module ids throughout
- * the frontend).
- */
 export function sourceRangeFromRust(s: RustSourceRange): SourceRange {
   return [s[0], s[1], s[2] === 0]
 }
 
-/**
- * Create a default SourceRange for testing or as a placeholder.
- */
 export function defaultSourceRange(): SourceRange {
   return [0, 0, true]
 }
@@ -137,7 +122,7 @@ const initialise = async () => {
     const fullUrl = wasmUrl()
     const input = await fetch(fullUrl)
     const buffer = await input.arrayBuffer()
-    return await init({ module_or_path: buffer })
+    return await init(buffer)
   } catch (e) {
     console.log('Error initialising WASM', e)
     return Promise.reject(e)
@@ -178,10 +163,6 @@ export class ParseResult {
   }
 }
 
-/**
- * Parsing was successful. There is guaranteed to be an AST and no fatal errors. There may or may
- * not be warnings or non-fatal errors.
- */
 class SuccessParseResult extends ParseResult {
   program: Node<Program>
 
@@ -512,19 +493,18 @@ export const _executor = async (
     return Promise.reject(programMemoryOverride)
 
   try {
-    let jsAppSettings = default_app_settings()
+    let baseUnit = 'mm'
     if (!TEST) {
-      const lastSettingsSnapshot = await import(
+      const getSettingsState = import('components/SettingsAuthProvider').then(
-        'components/SettingsAuthProvider'
+        (module) => module.getSettingsState
-      ).then((module) => module.lastSettingsContextSnapshot)
+      )
-      if (lastSettingsSnapshot) {
+      baseUnit =
-        jsAppSettings = getAllCurrentSettings(lastSettingsSnapshot)
+        (await getSettingsState)()?.modeling.defaultUnit.current || 'mm'
-      }
     }
-    const execState: RawExecState = await execute(
+    const execState: RawExecState = await execute_wasm(
       JSON.stringify(node),
       JSON.stringify(programMemoryOverride?.toRaw() || null),
-      JSON.stringify({ settings: jsAppSettings }),
+      baseUnit,
       engineCommandManager,
       fileSystemManager
     )
@@ -572,6 +552,20 @@ export const makeDefaultPlanes = async (
   }
 }
 
+export const modifyGrid = async (
+  engineCommandManager: EngineCommandManager,
+  hidden: boolean
+): Promise<void> => {
+  try {
+    await modify_grid(engineCommandManager, hidden)
+    return
+  } catch (e) {
+    // TODO: do something real with the error.
+    console.log('modify grid error', e)
+    return Promise.reject(e)
+  }
+}
+
 export const modifyAstForSketch = async (
   engineCommandManager: EngineCommandManager,
   ast: Node<Program>,

src/lib/cameraControls.ts

@@ -32,14 +32,8 @@ export function mouseControlsToCameraSystem(
   mouseControl: MouseControlType | undefined
 ): CameraSystem | undefined {
   switch (mouseControl) {
-    // TODO: understand why the values come back without underscores and fix the root cause
-    // @ts-ignore: TS2678
-    case 'kittycad':
     case 'kitty_cad':
       return 'KittyCAD'
-    // TODO: understand why the values come back without underscores and fix the root cause
-    // @ts-ignore: TS2678
-    case 'onshape':
     case 'on_shape':
       return 'OnShape'
     case 'trackpad_friendly':
@@ -50,9 +44,6 @@ export function mouseControlsToCameraSystem(
       return 'NX'
     case 'creo':
       return 'Creo'
-    // TODO: understand why the values come back without underscores and fix the root cause
-    // @ts-ignore: TS2678
-    case 'autocad':
     case 'auto_cad':
       return 'AutoCAD'
     default:

src/lib/commandBarConfigs/modelingCommandConfig.ts

@@ -1,15 +1,9 @@
 import { Models } from '@kittycad/lib'
-import { angleLengthInfo } from 'components/Toolbar/setAngleLength'
-import { transformAstSketchLines } from 'lang/std/sketchcombos'
-import { PathToNode } from 'lang/wasm'
 import { StateMachineCommandSetConfig, KclCommandValue } from 'lib/commandTypes'
 import { KCL_DEFAULT_LENGTH, KCL_DEFAULT_DEGREE } from 'lib/constants'
 import { components } from 'lib/machine-api'
 import { Selections } from 'lib/selections'
-import { kclManager } from 'lib/singletons'
-import { err } from 'lib/trap'
 import { modelingMachine, SketchTool } from 'machines/modelingMachine'
-import { revolveAxisValidator } from './validators'
 
 type OutputFormat = Models['OutputFormat_type']
 type OutputTypeKey = OutputFormat['type']
@@ -47,7 +41,6 @@ export type ModelingCommandSchema = {
   Revolve: {
     selection: Selections
     angle: KclCommandValue
-    axis: Selections
   }
   Fillet: {
     // todo
@@ -61,18 +54,6 @@ export type ModelingCommandSchema = {
   'change tool': {
     tool: SketchTool
   }
-  'Constrain length': {
-    selection: Selections
-    length: KclCommandValue
-  }
-  'Constrain with named value': {
-    currentValue: {
-      valueText: string
-      pathToNode: PathToNode
-      variableName: string
-    }
-    namedValue: KclCommandValue
-  }
   'Text-to-CAD': {
     prompt: string
   }
@@ -332,13 +313,6 @@ export const modelingMachineCommandConfig: StateMachineCommandSetConfig<
         required: true,
         skip: true,
       },
-      axis: {
-        required: true,
-        inputType: 'selection',
-        selectionTypes: ['segment', 'sweepEdge', 'edgeCutEdge'],
-        multiple: false,
-        validation: revolveAxisValidator,
-      },
       angle: {
         inputType: 'kcl',
         defaultValue: KCL_DEFAULT_DEGREE,
@@ -386,88 +360,6 @@ export const modelingMachineCommandConfig: StateMachineCommandSetConfig<
       },
     },
   },
-  'Constrain length': {
-    description: 'Constrain the length of one or more segments.',
-    icon: 'dimension',
-    args: {
-      selection: {
-        inputType: 'selection',
-        selectionTypes: ['segment'],
-        multiple: false,
-        required: true,
-        skip: true,
-      },
-      length: {
-        inputType: 'kcl',
-        required: true,
-        createVariableByDefault: true,
-        defaultValue(_, machineContext) {
-          const selectionRanges = machineContext?.selectionRanges
-          if (!selectionRanges) return KCL_DEFAULT_LENGTH
-          const angleLength = angleLengthInfo({
-            selectionRanges,
-            angleOrLength: 'setLength',
-          })
-          if (err(angleLength)) return KCL_DEFAULT_LENGTH
-          const { transforms } = angleLength
-
-          // QUESTION: is it okay to reference kclManager here? will its state be up to date?
-          const sketched = transformAstSketchLines({
-            ast: structuredClone(kclManager.ast),
-            selectionRanges,
-            transformInfos: transforms,
-            programMemory: kclManager.programMemory,
-            referenceSegName: '',
-          })
-          if (err(sketched)) return KCL_DEFAULT_LENGTH
-          const { valueUsedInTransform } = sketched
-          return valueUsedInTransform?.toString() || KCL_DEFAULT_LENGTH
-        },
-      },
-    },
-  },
-  'Constrain with named value': {
-    description: 'Constrain a value by making it a named constant.',
-    icon: 'make-variable',
-    args: {
-      currentValue: {
-        description:
-          'Path to the node in the AST to constrain. This is never shown to the user.',
-        inputType: 'text',
-        required: false,
-        skip: true,
-      },
-      namedValue: {
-        inputType: 'kcl',
-        required: true,
-        createVariableByDefault: true,
-        variableName(commandBarContext, machineContext) {
-          const { currentValue } = commandBarContext.argumentsToSubmit
-          if (
-            !currentValue ||
-            !(currentValue instanceof Object) ||
-            !('variableName' in currentValue) ||
-            typeof currentValue.variableName !== 'string'
-          ) {
-            return 'value'
-          }
-          return currentValue.variableName
-        },
-        defaultValue: (commandBarContext) => {
-          const { currentValue } = commandBarContext.argumentsToSubmit
-          if (
-            !currentValue ||
-            !(currentValue instanceof Object) ||
-            !('valueText' in currentValue) ||
-            typeof currentValue.valueText !== 'string'
-          ) {
-            return KCL_DEFAULT_LENGTH
-          }
-          return currentValue.valueText
-        },
-      },
-    },
-  },
   'Text-to-CAD': {
     description: 'Use the Zoo Text-to-CAD API to generate part starters.',
     icon: 'chat',

src/lib/commandBarConfigs/validators.ts

@@ -1,107 +0,0 @@
-import { Models } from '@kittycad/lib'
-import { engineCommandManager } from 'lib/singletons'
-import { uuidv4 } from 'lib/utils'
-import { CommandBarContext } from 'machines/commandBarMachine'
-import { Selections } from 'lib/selections'
-import { isSolid2D, isSegment, isSweep } from 'lang/std/artifactGraph'
-
-export const disableDryRunWithRetry = async (numberOfRetries = 3) => {
-  for (let tries = 0; tries < numberOfRetries; tries++) {
-    try {
-      await engineCommandManager.sendSceneCommand({
-        type: 'modeling_cmd_req',
-        cmd_id: uuidv4(),
-        cmd: { type: 'disable_dry_run' },
-      })
-      // Exit out since the command was successful
-      return
-    } catch (e) {
-      console.error(e)
-      console.error('disable_dry_run failed. This is bad!')
-    }
-  }
-}
-
-// Takes a callback function and wraps it around enable_dry_run and disable_dry_run
-export const dryRunWrapper = async (callback: () => Promise<any>) => {
-  // Gotcha: What about race conditions?
-  try {
-    await engineCommandManager.sendSceneCommand({
-      type: 'modeling_cmd_req',
-      cmd_id: uuidv4(),
-      cmd: { type: 'enable_dry_run' },
-    })
-    const result = await callback()
-    return result
-  } catch (e) {
-    console.error(e)
-  } finally {
-    await disableDryRunWithRetry(5)
-  }
-}
-
-function isSelections(selections: unknown): selections is Selections {
-  return (
-    (selections as Selections).graphSelections !== undefined &&
-    (selections as Selections).otherSelections !== undefined
-  )
-}
-
-export const revolveAxisValidator = async ({
-  data,
-  context,
-}: {
-  data: { [key: string]: Selections }
-  context: CommandBarContext
-}): Promise<boolean | string> => {
-  if (!isSelections(context.argumentsToSubmit.selection)) {
-    return 'Unable to revolve, selections are missing'
-  }
-  const artifact =
-    context.argumentsToSubmit.selection.graphSelections[0].artifact
-
-  if (!artifact) {
-    return 'Unable to revolve, sketch not found'
-  }
-
-  if (!(isSolid2D(artifact) || isSegment(artifact) || isSweep(artifact))) {
-    return 'Unable to revolve, sketch has no path'
-  }
-
-  const sketchSelection = artifact.pathId
-  let edgeSelection = data.axis.graphSelections[0].artifact?.id
-
-  if (!sketchSelection) {
-    return 'Unable to revolve, sketch is missing'
-  }
-
-  if (!edgeSelection) {
-    return 'Unable to revolve, edge is missing'
-  }
-
-  const angleInDegrees: Models['Angle_type'] = {
-    unit: 'degrees',
-    value: 360,
-  }
-
-  const revolveAboutEdgeCommand = async () => {
-    return await engineCommandManager.sendSceneCommand({
-      type: 'modeling_cmd_req',
-      cmd_id: uuidv4(),
-      cmd: {
-        type: 'revolve_about_edge',
-        angle: angleInDegrees,
-        edge_id: edgeSelection,
-        target: sketchSelection,
-        tolerance: 0.0001,
-      },
-    })
-  }
-  const attemptRevolve = await dryRunWrapper(revolveAboutEdgeCommand)
-  if (attemptRevolve?.success) {
-    return true
-  } else {
-    // return error message for the toast
-    return 'Unable to revolve with selected axis'
-  }
-}

src/lib/commandTypes.ts

@@ -7,7 +7,7 @@ import { ReactNode } from 'react'
 import { MachineManager } from 'components/MachineManagerProvider'
 import { Node } from 'wasm-lib/kcl/bindings/Node'
 import { Artifact } from 'lang/std/artifactGraph'
-import { CommandBarContext } from 'machines/commandBarMachine'
+
 type Icon = CustomIconName
 const PLATFORMS = ['both', 'web', 'desktop'] as const
 const INPUT_TYPES = [
@@ -147,30 +147,8 @@ export type CommandArgumentConfig<
       inputType: 'selection'
       selectionTypes: Artifact['type'][]
       multiple: boolean
-      validation?: ({
-        data,
-        context,
-      }: {
-        data: any
-        context: CommandBarContext
-      }) => Promise<boolean | string>
-    }
-  | {
-      inputType: 'kcl'
-      createVariableByDefault?: boolean
-      variableName?:
-        | string
-        | ((
-            commandBarContext: ContextFrom<typeof commandBarMachine>,
-            machineContext?: C
-          ) => string)
-      defaultValue?:
-        | string
-        | ((
-            commandBarContext: ContextFrom<typeof commandBarMachine>,
-            machineContext?: C
-          ) => string)
     }
+  | { inputType: 'kcl'; defaultValue?: string } // KCL expression inputs have simple strings as default values
   | {
       inputType: 'string'
       defaultValue?:
@@ -243,30 +221,8 @@ export type CommandArgument<
       inputType: 'selection'
       selectionTypes: Artifact['type'][]
       multiple: boolean
-      validation?: ({
-        data,
-        context,
-      }: {
-        data: any
-        context: CommandBarContext
-      }) => Promise<boolean | string>
-    }
-  | {
-      inputType: 'kcl'
-      createVariableByDefault?: boolean
-      variableName?:
-        | string
-        | ((
-            commandBarContext: ContextFrom<typeof commandBarMachine>,
-            machineContext?: ContextFrom<T>
-          ) => string)
-      defaultValue?:
-        | string
-        | ((
-            commandBarContext: ContextFrom<typeof commandBarMachine>,
-            machineContext?: ContextFrom<T>
-          ) => string)
     }
+  | { inputType: 'kcl'; defaultValue?: string } // KCL expression inputs have simple strings as default value
   | {
       inputType: 'string'
       defaultValue?:

src/lib/constants.ts

@@ -111,10 +111,3 @@ export const KCL_SAMPLES_MANIFEST_URLS = {
 
 /** Toast id for the app auto-updater toast */
 export const AUTO_UPDATER_TOAST_ID = 'auto-updater-toast'
-
-/** Local sketch axis values in KCL for operations, it could either be 'X' or 'Y' */
-export const KCL_AXIS_X = 'X'
-export const KCL_AXIS_Y = 'Y'
-export const KCL_AXIS_NEG_X = '-X'
-export const KCL_AXIS_NEG_Y = '-Y'
-export const KCL_DEFAULT_AXIS = 'X'

src/lib/createMachineCommand.ts

@@ -155,8 +155,6 @@ export function buildCommandArgument<
   context: ContextFrom<T>,
   machineActor: Actor<T>
 ): CommandArgument<O, T> & { inputType: typeof arg.inputType } {
-  // GOTCHA: modelingCommandConfig is not a 1:1 mapping to this baseCommandArgument
-  // You need to manually add key/value pairs here.
   const baseCommandArgument = {
     description: arg.description,
     required: arg.required,
@@ -183,13 +181,10 @@ export function buildCommandArgument<
       ...baseCommandArgument,
       multiple: arg.multiple,
       selectionTypes: arg.selectionTypes,
-      validation: arg.validation,
     } satisfies CommandArgument<O, T> & { inputType: 'selection' }
   } else if (arg.inputType === 'kcl') {
     return {
       inputType: arg.inputType,
-      createVariableByDefault: arg.createVariableByDefault,
-      variableName: arg.variableName,
       defaultValue: arg.defaultValue,
       ...baseCommandArgument,
     } satisfies CommandArgument<O, T> & { inputType: 'kcl' }

src/lib/selections.ts

@@ -569,17 +569,6 @@ export function canSweepSelection(selection: Selections) {
   )
 }
 
-export function canRevolveSelection(selection: Selections) {
-  const commonNodes = selection.graphSelections.map((_, i) =>
-    buildCommonNodeFromSelection(selection, i)
-  )
-  return (
-    !!isSketchPipe(selection) &&
-    (commonNodes.every((n) => nodeHasClose(n)) ||
-      commonNodes.every((n) => nodeHasCircle(n)))
-  )
-}
-
 export function canLoftSelection(selection: Selections) {
   const commonNodes = selection.graphSelections.map((_, i) =>
     buildCommonNodeFromSelection(selection, i)
@@ -641,29 +630,12 @@ export function getSelectionCountByType(
     }
   })
 
-  selection.graphSelections.forEach((graphSelection) => {
+  selection.graphSelections.forEach((selection) => {
-    if (!graphSelection.artifact) {
+    if (!selection.artifact) {
-      /**
+      incrementOrInitializeSelectionType('other')
-       * TODO: remove this heuristic-based selection type detection.
+      return
-       * Currently, if you've created a sketch and have not left sketch mode,
-       * the selection will be a segment selection with no artifact.
-       * This is because the mock execution does not update the artifact graph.
-       * Once we move the artifactGraph creation to WASM, we can remove this,
-       * as the artifactGraph will always be up-to-date.
-       */
-      if (isSingleCursorInPipe(selection, kclManager.ast)) {
-        incrementOrInitializeSelectionType('segment')
-        return
-      } else {
-        console.warn(
-          'Selection is outside of a sketch but has no artifact. Sketch segment selections are the only kind that can have a valid selection with no artifact.',
-          JSON.stringify(graphSelection)
-        )
-        incrementOrInitializeSelectionType('other')
-        return
-      }
     }
-    incrementOrInitializeSelectionType(graphSelection.artifact.type)
+    incrementOrInitializeSelectionType(selection.artifact.type)
   })
 
   return selectionsByType

src/lib/settings/initialKeybindings.ts

@@ -12,7 +12,7 @@ export type InteractionMapItem = {
  * Controls both the available names for interaction map categories
  * and the order in which they are displayed.
  */
-const interactionMapCategories = [
+export const interactionMapCategories = [
   'Sketching',
   'Modeling',
   'Command Palette',

src/lib/settings/settingsUtils.test.ts

@@ -2,7 +2,6 @@ import { DeepPartial } from 'lib/types'
 import { Configuration } from 'wasm-lib/kcl/bindings/Configuration'
 import {
   configurationToSettingsPayload,
-  getAllCurrentSettings,
   projectConfigurationToSettingsPayload,
   setSettingsAtLevel,
 } from './settingsUtils'
@@ -66,48 +65,3 @@ describe(`testing settings initialization`, () => {
     expect(settings.app.themeColor.current).toBe('200')
   })
 })
-
-describe(`testing getAllCurrentSettings`, () => {
-  it(`returns the correct settings`, () => {
-    // Set up the settings
-    let settings = createSettings()
-    const appConfiguration: DeepPartial<Configuration> = {
-      settings: {
-        app: {
-          appearance: {
-            theme: 'dark',
-            color: 190,
-          },
-        },
-      },
-    }
-    const projectConfiguration: DeepPartial<Configuration> = {
-      settings: {
-        app: {
-          appearance: {
-            theme: 'light',
-            color: 200,
-          },
-        },
-        modeling: {
-          base_unit: 'ft',
-        },
-      },
-    }
-
-    const appSettingsPayload = configurationToSettingsPayload(appConfiguration)
-    const projectSettingsPayload =
-      projectConfigurationToSettingsPayload(projectConfiguration)
-
-    setSettingsAtLevel(settings, 'user', appSettingsPayload)
-    setSettingsAtLevel(settings, 'project', projectSettingsPayload)
-
-    // Now the test: get all the settings' current resolved values
-    const allCurrentSettings = getAllCurrentSettings(settings)
-    // This one gets the 'user'-level theme because it's ignored at the project level
-    // (see the test "doesn't read theme from project settings")
-    expect(allCurrentSettings.app.theme).toBe('dark')
-    expect(allCurrentSettings.app.themeColor).toBe('200')
-    expect(allCurrentSettings.modeling.defaultUnit).toBe('ft')
-  })
-})

src/lib/settings/settingsUtils.ts

@@ -286,27 +286,6 @@ export function getChangedSettingsAtLevel(
   return changedSettings
 }
 
-export function getAllCurrentSettings(
-  allSettings: typeof settings
-): SaveSettingsPayload {
-  const currentSettings = {} as SaveSettingsPayload
-  Object.entries(allSettings).forEach(([category, settingsCategory]) => {
-    const categoryKey = category as keyof typeof settings
-    Object.entries(settingsCategory).forEach(
-      ([setting, settingValue]: [string, Setting]) => {
-        const settingKey =
-          setting as keyof (typeof settings)[typeof categoryKey]
-        currentSettings[categoryKey] = {
-          ...currentSettings[categoryKey],
-          [settingKey]: settingValue.current,
-        }
-      }
-    )
-  })
-
-  return currentSettings
-}
-
 export function setSettingsAtLevel(
   allSettings: typeof settings,
   level: SettingsLevel,

src/lib/testHelpers.ts

@@ -112,6 +112,9 @@ export async function executor(
     makeDefaultPlanes: () => {
       return new Promise((resolve) => resolve(defaultPlanes))
     },
+    modifyGrid: (hidden: boolean) => {
+      return new Promise((resolve) => resolve())
+    },
   })
 
   return new Promise((resolve) => {

src/lib/toolbar.ts

@@ -540,15 +540,13 @@ export const toolbarConfig: Record<ToolbarModeName, ToolbarMode> = {
       [
         {
           id: 'constraint-length',
-          disabled: (state) => !state.matches({ Sketch: 'SketchIdle' }),
+          disabled: (state) =>
-          onClick: ({ commandBarSend }) =>
+            !(
-            commandBarSend({
+              state.matches({ Sketch: 'SketchIdle' }) &&
-              type: 'Find and select command',
+              state.can({ type: 'Constrain length' })
-              data: {
+            ),
-                name: 'Constrain length',
+          onClick: ({ modelingSend }) =>
-                groupId: 'modeling',
+            modelingSend({ type: 'Constrain length' }),
-              },
-            }),
           icon: 'dimension',
           status: 'available',
           title: 'Length',

src/machines/commandBarMachine.ts

@@ -8,7 +8,6 @@ import {
 import { Selections__old } from 'lib/selections'
 import { getCommandArgumentKclValuesOnly } from 'lib/commandUtils'
 import { MachineManager } from 'components/MachineManagerProvider'
-import toast from 'react-hot-toast'
 
 export type CommandBarContext = {
   commands: Command[]
@@ -248,69 +247,14 @@ export const commandBarMachine = setup({
     'All arguments are skippable': () => false,
   },
   actors: {
-    'Validate argument': fromPromise(
+    'Validate argument': fromPromise(({ input }) => {
-      ({
+      return new Promise((resolve, reject) => {
-        input,
+        // TODO: figure out if we should validate argument data here or in the form itself,
-      }: {
+        // and if we should support people configuring a argument's validation function
-        input: {
-          context: CommandBarContext | undefined
-          event: CommandBarMachineEvent | undefined
-        }
-      }) => {
-        return new Promise((resolve, reject) => {
-          if (!input || input?.event?.type !== 'Submit argument') {
-            toast.error(`Unable to validate, wrong event type.`)
-            return reject(`Unable to validate, wrong event type`)
-          }
 
-          const context = input?.context
+        resolve(input)
-
+      })
-          if (!context) {
+    }),
-            toast.error(`Unable to validate, wrong argument.`)
-            return reject(`Unable to validate, wrong argument`)
-          }
-
-          const data = input.event.data
-          const argName = context.currentArgument?.name
-          const args = context?.selectedCommand?.args
-          const argConfig = args && argName ? args[argName] : undefined
-          // Only do a validation check if the argument, selectedCommand, and the validation function are defined
-          if (
-            context.currentArgument &&
-            context.selectedCommand &&
-            argConfig?.inputType === 'selection' &&
-            argConfig?.validation
-          ) {
-            argConfig
-              .validation({ context, data })
-              .then((result) => {
-                if (typeof result === 'boolean' && result === true) {
-                  return resolve(data)
-                } else {
-                  // validation failed
-                  if (typeof result === 'string') {
-                    // The result of the validation is the error message
-                    toast.error(result)
-                    return reject(
-                      `unable to validate ${argName}, Message: ${result}`
-                    )
-                  } else {
-                    // Default message if there is not a custom one sent
-                    toast.error(`Unable to validate ${argName}`)
-                    return reject(`unable to validate ${argName}}`)
-                  }
-                }
-              })
-              .catch(() => {
-                return reject(`unable to validate ${argName}}`)
-              })
-          } else {
-            // Missing several requirements for validate argument, just bypass
-            return resolve(data)
-          }
-        })
-      }
-    ),
     'Validate all arguments': fromPromise(
       ({ input }: { input: CommandBarContext }) => {
         return new Promise((resolve, reject) => {
@@ -505,10 +449,9 @@ export const commandBarMachine = setup({
           invoke: {
             src: 'Validate argument',
             id: 'validateSingleArgument',
-            input: ({ event, context }) => {
+            input: ({ event }) => {
-              if (event.type !== 'Submit argument')
+              if (event.type !== 'Submit argument') return {}
-                return { event: undefined, context: undefined }
+              return event.data
-              return { event, context }
             },
             onDone: {
               target: '#Command Bar.Checking Arguments',

src/machines/settingsMachine.ts

@@ -42,6 +42,8 @@ export const settingsMachine = setup({
     setClientTheme: () => {},
     'Execute AST': () => {},
     toastSuccess: () => {},
+    setEngineEdges: () => {},
+    setEngineScaleGridVisibility: () => {},
     setClientSideSceneUnits: () => {},
     persistSettings: () => {},
     resetSettings: assign(({ context, event }) => {
@@ -170,7 +172,7 @@ export const settingsMachine = setup({
         'set.modeling.highlightEdges': {
           target: 'persisting settings',
 
-          actions: ['setSettingAtLevel', 'toastSuccess', 'Execute AST'],
+          actions: ['setSettingAtLevel', 'toastSuccess', 'setEngineEdges'],
         },
 
         'Reset settings': {
@@ -199,7 +201,11 @@ export const settingsMachine = setup({
 
         'set.modeling.showScaleGrid': {
           target: 'persisting settings',
-          actions: ['setSettingAtLevel', 'toastSuccess', 'Execute AST'],
+          actions: [
+            'setSettingAtLevel',
+            'toastSuccess',
+            'setEngineScaleGridVisibility',
+          ],
         },
       },
     },

src/main.ts

@@ -44,6 +44,11 @@ process.env.VITE_KC_SITE_BASE_URL ??= 'https://zoo.dev'
 process.env.VITE_KC_SKIP_AUTH ??= 'false'
 process.env.VITE_KC_CONNECTION_TIMEOUT_MS ??= '15000'
 
+// Handle creating/removing shortcuts on Windows when installing/uninstalling.
+if (require('electron-squirrel-startup')) {
+  app.quit()
+}
+
 const ZOO_STUDIO_PROTOCOL = 'zoo-studio'
 
 /// Register our application to handle all "electron-fiddle://" protocols.
@@ -251,9 +256,6 @@ export function getAutoUpdater(): AppUpdater {
 
 app.on('ready', () => {
   const autoUpdater = getAutoUpdater()
-  // TODO: we're getting `Error: Response ends without calling any handlers` with our setup,
-  // so at the moment this isn't worth enabling
-  autoUpdater.disableDifferentialDownload = true
   setTimeout(() => {
     autoUpdater.checkForUpdates().catch(reportRejection)
   }, 1000)

src/routes/Settings.tsx

@@ -30,14 +30,6 @@ export const PACKAGE_NAME = isDesktop()
   ? window.electron.packageJson.name
   : 'zoo-modeling-app'
 
-export const IS_NIGHTLY = PACKAGE_NAME.indexOf('-nightly') > -1
-
-export function getReleaseUrl(version: string = APP_VERSION) {
-  return `https://github.com/KittyCAD/modeling-app/releases/tag/${
-    IS_NIGHTLY ? 'nightly-' : ''
-  }v${version}`
-}
-
 export const Settings = () => {
   const navigate = useNavigate()
   const [searchParams, setSearchParams] = useSearchParams()

src/wasm-lib/Cargo.lock

@@ -1721,9 +1721,7 @@ dependencies = [
  "parse-display 0.9.1",
  "pretty_assertions",
  "pyo3",
- "regex",
  "reqwest",
- "rgba_simple",
  "ropey",
  "schemars",
  "serde",
@@ -2973,12 +2971,6 @@ dependencies = [
  "rand 0.8.5",
 ]
 
-[[package]]
-name = "rgba_simple"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6cd655523701785087f69900df39892fb7b9b0721aa67682f571c38c32ac58a"
-
 [[package]]
 name = "ring"
 version = "0.17.8"

src/wasm-lib/Cargo.toml

@@ -79,10 +79,7 @@ kittycad = { version = "0.3.28", default-features = false, features = ["js", "re
 kittycad-modeling-cmds = { version = "0.2.77", features = ["websocket"] }
 
 [workspace.lints.clippy]
-assertions_on_result_states = "warn"
-dbg_macro = "warn"
 iter_over_hash_type = "warn"
-lossy_float_literal = "warn"
 
 [[test]]
 name = "executor"

src/wasm-lib/justfile

@@ -12,8 +12,8 @@ redo-kcl-stdlib-docs-no-imgs:
 # Generate the stdlib image artifacts
 # Then run the stdlib docs generation
 redo-kcl-stdlib-docs:
-    TWENTY_TWENTY=overwrite {{cnr}} -p kcl-lib --no-fail-fast -- kcl_test_example
+    TWENTY_TWENTY=overwrite {{cnr}} -p kcl-lib kcl_test_example
-    EXPECTORATE=overwrite {{cnr}} -p kcl-lib --no-fail-fast -- docs::gen_std_tests::test_generate_stdlib
+    EXPECTORATE=overwrite {{cnr}} -p kcl-lib docs::gen_std_tests::test_generate_stdlib
 
 # Copy a test KCL file from executor tests into a new simulation test.
 copy-exec-test-into-sim-test test_name:

src/wasm-lib/kcl-to-core/tests/kcl_to_core_test.rs

@@ -15,5 +15,5 @@ async fn kcl_to_core_test() {
     )
     .await;
 
-    result.unwrap();
+    assert!(result.is_ok());
 }

src/wasm-lib/kcl/Cargo.toml

@@ -40,12 +40,10 @@ miette = "7.2.0"
 mime_guess = "2.0.5"
 parse-display = "0.9.1"
 pyo3 = { version = "0.22.6", optional = true }
-regex = "1.11.1"
 reqwest = { version = "0.12", default-features = false, features = [
     "stream",
     "rustls-tls",
 ] }
-rgba_simple = "0.10.0"
 ropey = "1.6.1"
 schemars = { version = "0.8.17", features = [
     "impl_json_schema",

src/wasm-lib/kcl/src/docs/mod.rs

@@ -489,12 +489,6 @@ fn get_autocomplete_snippet_from_schema(
                         continue;
                     }
 
-                    if prop_name == "color" {
-                        fn_docs.push_str(&format!("\t{}: ${{{}:\"#ff0000\"}},\n", prop_name, i));
-                        i += 1;
-                        continue;
-                    }
-
                     if let Some((new_index, snippet)) = get_autocomplete_snippet_from_schema(prop, i)? {
                         fn_docs.push_str(&format!("\t{}: {},\n", prop_name, snippet));
                         i = new_index + 1;
@@ -952,21 +946,6 @@ mod tests {
         );
     }
 
-    #[test]
-    fn get_autocomplete_snippet_appearance() {
-        let appearance_fn: Box<dyn StdLibFn> = Box::new(crate::std::appearance::Appearance);
-        let snippet = appearance_fn.to_autocomplete_snippet().unwrap();
-        assert_eq!(
-            snippet,
-            r#"appearance({
-	color: ${0:"#
-                .to_owned()
-                + "\"#"
-                + r#"ff0000"},
-}, ${1:%})${}"#
-        );
-    }
-
     // We want to test the snippets we compile at lsp start.
     #[test]
     fn get_all_stdlib_autocomplete_snippets() {

src/wasm-lib/kcl/src/engine/mod.rs

@@ -120,61 +120,6 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
         Ok(())
     }
 
-    /// Set the visibility of edges.
-    async fn set_edge_visibility(
-        &self,
-        visible: bool,
-        source_range: SourceRange,
-    ) -> Result<(), crate::errors::KclError> {
-        self.batch_modeling_cmd(
-            uuid::Uuid::new_v4(),
-            source_range,
-            &ModelingCmd::from(mcmd::EdgeLinesVisible { hidden: !visible }),
-        )
-        .await?;
-
-        Ok(())
-    }
-
-    async fn set_units(
-        &self,
-        units: crate::UnitLength,
-        source_range: SourceRange,
-    ) -> Result<(), crate::errors::KclError> {
-        // Before we even start executing the program, set the units.
-        self.batch_modeling_cmd(
-            uuid::Uuid::new_v4(),
-            source_range,
-            &ModelingCmd::from(mcmd::SetSceneUnits { unit: units.into() }),
-        )
-        .await?;
-
-        Ok(())
-    }
-
-    /// Re-run the command to apply the settings.
-    async fn reapply_settings(
-        &self,
-        settings: &crate::ExecutorSettings,
-        source_range: SourceRange,
-    ) -> Result<(), crate::errors::KclError> {
-        // Set the edge visibility.
-        self.set_edge_visibility(settings.highlight_edges, source_range).await?;
-
-        // Change the units.
-        self.set_units(settings.units, source_range).await?;
-
-        // Send the command to show the grid.
-        self.modify_grid(!settings.show_grid, source_range).await?;
-
-        // We do not have commands for changing ssao on the fly.
-
-        // Flush the batch queue, so the settings are applied right away.
-        self.flush_batch(false, source_range).await?;
-
-        Ok(())
-    }
-
     // Add a modeling command to the batch but don't fire it right away.
     async fn batch_modeling_cmd(
         &self,
@@ -559,11 +504,11 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
         }))
     }
 
-    async fn modify_grid(&self, hidden: bool, source_range: SourceRange) -> Result<(), KclError> {
+    async fn modify_grid(&self, hidden: bool) -> Result<(), KclError> {
         // Hide/show the grid.
         self.batch_modeling_cmd(
             uuid::Uuid::new_v4(),
-            source_range,
+            Default::default(),
             &ModelingCmd::from(mcmd::ObjectVisible {
                 hidden,
                 object_id: *GRID_OBJECT_ID,
@@ -574,7 +519,7 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
         // Hide/show the grid scale text.
         self.batch_modeling_cmd(
             uuid::Uuid::new_v4(),
-            source_range,
+            Default::default(),
             &ModelingCmd::from(mcmd::ObjectVisible {
                 hidden,
                 object_id: *GRID_SCALE_TEXT_OBJECT_ID,
@@ -582,6 +527,8 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
         )
         .await?;
 
+        self.flush_batch(false, Default::default()).await?;
+
         Ok(())
     }
 

src/wasm-lib/kcl/src/execution/cache.rs

@@ -1,50 +0,0 @@
-//! Functions for helping with caching an ast and finding the parts the changed.
-
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-
-use crate::{
-    execution::ExecState,
-    parsing::ast::types::{Node, Program},
-};
-
-/// Information for the caching an AST and smartly re-executing it if we can.
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
-#[ts(export)]
-pub struct CacheInformation {
-    /// The old information.
-    pub old: Option<OldAstState>,
-    /// The new ast to executed.
-    pub new_ast: Node<Program>,
-}
-
-/// The old ast and program memory.
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
-#[ts(export)]
-pub struct OldAstState {
-    /// The ast.
-    pub ast: Node<Program>,
-    /// The exec state.
-    pub exec_state: ExecState,
-    /// The last settings used for execution.
-    pub settings: crate::execution::ExecutorSettings,
-}
-
-impl From<crate::Program> for CacheInformation {
-    fn from(program: crate::Program) -> Self {
-        CacheInformation {
-            old: None,
-            new_ast: program.ast,
-        }
-    }
-}
-
-/// The result of a cache check.
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
-#[ts(export)]
-pub struct CacheResult {
-    /// Should we clear the scene and start over?
-    pub clear_scene: bool,
-    /// The program that needs to be executed.
-    pub program: Node<Program>,
-}

src/wasm-lib/kcl/src/execution/exec_ast.rs

@@ -326,12 +326,29 @@ async fn inner_execute_pipe_body(
     ctx: &ExecutorContext,
 ) -> Result<KclValue, KclError> {
     for expression in body {
-        if let Expr::TagDeclarator(_) = expression {
+        match expression {
-            return Err(KclError::Semantic(KclErrorDetails {
+            Expr::TagDeclarator(_) => {
-                message: format!("This cannot be in a PipeExpression: {:?}", expression),
+                return Err(KclError::Semantic(KclErrorDetails {
-                source_ranges: vec![expression.into()],
+                    message: format!("This cannot be in a PipeExpression: {:?}", expression),
-            }));
+                    source_ranges: vec![expression.into()],
-        }
+                }));
+            }
+            Expr::Literal(_)
+            | Expr::Identifier(_)
+            | Expr::BinaryExpression(_)
+            | Expr::FunctionExpression(_)
+            | Expr::CallExpression(_)
+            | Expr::CallExpressionKw(_)
+            | Expr::PipeExpression(_)
+            | Expr::PipeSubstitution(_)
+            | Expr::ArrayExpression(_)
+            | Expr::ArrayRangeExpression(_)
+            | Expr::ObjectExpression(_)
+            | Expr::MemberExpression(_)
+            | Expr::UnaryExpression(_)
+            | Expr::IfExpression(_)
+            | Expr::None(_) => {}
+        };
         let metadata = Metadata {
             source_range: SourceRange::from(expression),
         };
@@ -349,11 +366,9 @@ impl Node<CallExpressionKw> {
     #[async_recursion]
     pub async fn execute(&self, exec_state: &mut ExecState, ctx: &ExecutorContext) -> Result<KclValue, KclError> {
         let fn_name = &self.callee.name;
-        let callsite: SourceRange = self.into();
 
         // Build a hashmap from argument labels to the final evaluated values.
         let mut fn_args = HashMap::with_capacity(self.arguments.len());
-        let mut tag_declarator_args = Vec::new();
         for arg_expr in &self.arguments {
             let source_range = SourceRange::from(arg_expr.arg.clone());
             let metadata = Metadata { source_range };
@@ -361,12 +376,8 @@ impl Node<CallExpressionKw> {
                 .execute_expr(&arg_expr.arg, exec_state, &metadata, StatementKind::Expression)
                 .await?;
             fn_args.insert(arg_expr.label.name.clone(), Arg::new(value, source_range));
-            if let Expr::TagDeclarator(td) = &arg_expr.arg {
-                tag_declarator_args.push((td.inner.clone(), source_range));
-            }
         }
         let fn_args = fn_args; // remove mutability
-        let tag_declarator_args = tag_declarator_args; // remove mutability
 
         // Evaluate the unlabeled first param, if any exists.
         let unlabeled = if let Some(ref arg_expr) = self.unlabeled {
@@ -392,43 +403,11 @@ impl Node<CallExpressionKw> {
             FunctionKind::Core(func) => {
                 // Attempt to call the function.
                 let mut result = func.std_lib_fn()(exec_state, args).await?;
-                update_memory_for_tags_of_geometry(&mut result, &tag_declarator_args, exec_state)?;
+                update_memory_for_tags_of_geometry(&mut result, exec_state)?;
                 Ok(result)
             }
             FunctionKind::UserDefined => {
-                let source_range = SourceRange::from(self);
+                todo!("Part of modeling-app#4600: Support keyword arguments for user-defined functions")
-                // Clone the function so that we can use a mutable reference to
-                // exec_state.
-                let func = exec_state.memory.get(fn_name, source_range)?.clone();
-                let fn_dynamic_state = exec_state.dynamic_state.merge(&exec_state.memory);
-
-                let return_value = {
-                    let previous_dynamic_state = std::mem::replace(&mut exec_state.dynamic_state, fn_dynamic_state);
-                    let result = func
-                        .call_fn_kw(args, exec_state, ctx.clone(), callsite)
-                        .await
-                        .map_err(|e| {
-                            // Add the call expression to the source ranges.
-                            // TODO currently ignored by the frontend
-                            e.add_source_ranges(vec![source_range])
-                        });
-                    exec_state.dynamic_state = previous_dynamic_state;
-                    result?
-                };
-
-                let result = return_value.ok_or_else(move || {
-                    let mut source_ranges: Vec<SourceRange> = vec![source_range];
-                    // We want to send the source range of the original function.
-                    if let KclValue::Function { meta, .. } = func {
-                        source_ranges = meta.iter().map(|m| m.source_range).collect();
-                    };
-                    KclError::UndefinedValue(KclErrorDetails {
-                        message: format!("Result of user-defined function {} is undefined", fn_name),
-                        source_ranges,
-                    })
-                })?;
-
-                Ok(result)
             }
         }
     }
@@ -440,7 +419,6 @@ impl Node<CallExpression> {
         let fn_name = &self.callee.name;
 
         let mut fn_args: Vec<Arg> = Vec::with_capacity(self.arguments.len());
-        let mut tag_declarator_args = Vec::new();
 
         for arg_expr in &self.arguments {
             let metadata = Metadata {
@@ -450,19 +428,15 @@ impl Node<CallExpression> {
                 .execute_expr(arg_expr, exec_state, &metadata, StatementKind::Expression)
                 .await?;
             let arg = Arg::new(value, SourceRange::from(arg_expr));
-            if let Expr::TagDeclarator(td) = arg_expr {
-                tag_declarator_args.push((td.inner.clone(), arg.source_range));
-            }
             fn_args.push(arg);
         }
-        let tag_declarator_args = tag_declarator_args; // remove mutability
 
         match ctx.stdlib.get_either(fn_name) {
             FunctionKind::Core(func) => {
                 // Attempt to call the function.
                 let args = crate::std::Args::new(fn_args, self.into(), ctx.clone());
                 let mut result = func.std_lib_fn()(exec_state, args).await?;
-                update_memory_for_tags_of_geometry(&mut result, &tag_declarator_args, exec_state)?;
+                update_memory_for_tags_of_geometry(&mut result, exec_state)?;
                 Ok(result)
             }
             FunctionKind::UserDefined => {
@@ -501,24 +475,7 @@ impl Node<CallExpression> {
     }
 }
 
-/// `tag_declarator_args` should only contain tag declarator literals, which
+fn update_memory_for_tags_of_geometry(result: &mut KclValue, exec_state: &mut ExecState) -> Result<(), KclError> {
-/// will be defined as local variables.  Non-literals that evaluate to tag
-/// declarators should not be defined.
-fn update_memory_for_tags_of_geometry(
-    result: &mut KclValue,
-    tag_declarator_args: &[(TagDeclarator, SourceRange)],
-    exec_state: &mut ExecState,
-) -> Result<(), KclError> {
-    // Define all the tags in the memory.
-    for (tag_declarator, arg_sr) in tag_declarator_args {
-        let tag = TagIdentifier {
-            value: tag_declarator.name.clone(),
-            info: None,
-            meta: vec![Metadata { source_range: *arg_sr }],
-        };
-
-        exec_state.memory.add_tag(&tag.value, tag.clone(), *arg_sr)?;
-    }
     // If the return result is a sketch or solid, we want to update the
     // memory for the tags of the group.
     // TODO: This could probably be done in a better way, but as of now this was my only idea
@@ -526,7 +483,7 @@ fn update_memory_for_tags_of_geometry(
     match result {
         KclValue::Sketch { value: ref mut sketch } => {
             for (_, tag) in sketch.tags.iter() {
-                exec_state.memory.update_tag_if_defined(&tag.value, tag.clone());
+                exec_state.memory.update_tag(&tag.value, tag.clone())?;
             }
         }
         KclValue::Solid(ref mut solid) => {
@@ -564,7 +521,7 @@ fn update_memory_for_tags_of_geometry(
                     info.sketch = solid.id;
                     t.info = Some(info);
 
-                    exec_state.memory.update_tag_if_defined(&tag.name, t.clone());
+                    exec_state.memory.update_tag(&tag.name, t.clone())?;
 
                     // update the sketch tags.
                     solid.sketch.tags.insert(tag.name.clone(), t);
@@ -585,6 +542,22 @@ fn update_memory_for_tags_of_geometry(
     Ok(())
 }
 
+impl Node<TagDeclarator> {
+    pub async fn execute(&self, exec_state: &mut ExecState) -> Result<KclValue, KclError> {
+        let memory_item = KclValue::TagIdentifier(Box::new(TagIdentifier {
+            value: self.name.clone(),
+            info: None,
+            meta: vec![Metadata {
+                source_range: self.into(),
+            }],
+        }));
+
+        exec_state.memory.add(&self.name, memory_item.clone(), self.into())?;
+
+        Ok(self.into())
+    }
+}
+
 impl Node<ArrayExpression> {
     #[async_recursion]
     pub async fn execute(&self, exec_state: &mut ExecState, ctx: &ExecutorContext) -> Result<KclValue, KclError> {

src/wasm-lib/kcl/src/execution/kcl_value.rs

@@ -72,10 +72,6 @@ pub enum KclValue {
     ImportedGeometry(ImportedGeometry),
     #[ts(skip)]
     Function {
-        /// Adam Chalmers speculation:
-        /// Reference to a KCL stdlib function (written in Rust).
-        /// Some if the KCL value is an alias of a stdlib function,
-        /// None if it's a KCL function written/declared in KCL.
         #[serde(skip)]
         func: Option<MemoryFunction>,
         #[schemars(skip)]
@@ -507,39 +503,4 @@ impl KclValue {
             .await
         }
     }
-
-    /// If this is a function, call it by applying keyword arguments.
-    /// If it's not a function, returns an error.
-    pub async fn call_fn_kw(
-        &self,
-        args: crate::std::Args,
-        exec_state: &mut ExecState,
-        ctx: ExecutorContext,
-        callsite: SourceRange,
-    ) -> Result<Option<KclValue>, KclError> {
-        let KclValue::Function {
-            func,
-            expression,
-            memory: closure_memory,
-            meta: _,
-        } = &self
-        else {
-            return Err(KclError::Semantic(KclErrorDetails {
-                message: "cannot call this because it isn't a function".to_string(),
-                source_ranges: vec![callsite],
-            }));
-        };
-        if let Some(_func) = func {
-            todo!("Implement calling KCL stdlib fns that are aliased. Part of https://github.com/KittyCAD/modeling-app/issues/4600");
-        } else {
-            crate::execution::call_user_defined_function_kw(
-                args.kw_args,
-                closure_memory.as_ref(),
-                expression.as_ref(),
-                exec_state,
-                &ctx,
-            )
-            .await
-        }
-    }
 }

src/wasm-lib/kcl/src/execution/mod.rs

@@ -23,18 +23,15 @@ type Point3D = kcmc::shared::Point3d<f64>;
 pub use function_param::FunctionParam;
 pub use kcl_value::{KclObjectFields, KclValue};
 
-pub(crate) mod cache;
-mod exec_ast;
-mod function_param;
-mod kcl_value;
-
 use crate::{
     engine::{EngineManager, ExecutionKind},
     errors::{KclError, KclErrorDetails},
-    execution::cache::{CacheInformation, CacheResult},
     fs::{FileManager, FileSystem},
-    parsing::ast::types::{
+    parsing::ast::{
-        BodyItem, Expr, FunctionExpression, ImportSelector, ItemVisibility, Node, NodeRef, TagDeclarator, TagNode,
+        cache::{get_changed_program, CacheInformation},
+        types::{
+            BodyItem, Expr, FunctionExpression, ImportSelector, ItemVisibility, Node, NodeRef, TagDeclarator, TagNode,
+        },
     },
     settings::types::UnitLength,
     source_range::{ModuleId, SourceRange},
@@ -42,6 +39,10 @@ use crate::{
     ExecError, Program,
 };
 
+mod exec_ast;
+mod function_param;
+mod kcl_value;
+
 /// State for executing a program.
 #[derive(Debug, Default, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
@@ -124,16 +125,10 @@ impl ProgramMemory {
         Ok(())
     }
 
-    pub fn add_tag(&mut self, tag: &str, value: TagIdentifier, source_range: SourceRange) -> Result<(), KclError> {
+    pub fn update_tag(&mut self, tag: &str, value: TagIdentifier) -> Result<(), KclError> {
-        self.add(tag, KclValue::TagIdentifier(Box::new(value)), source_range)
-    }
-
-    pub fn update_tag_if_defined(&mut self, tag: &str, value: TagIdentifier) {
-        if !self.environments[self.current_env.index()].contains_key(tag) {
-            // Do nothing if the tag isn't defined.
-            return;
-        }
         self.environments[self.current_env.index()].insert(tag.to_string(), KclValue::TagIdentifier(Box::new(value)));
+
+        Ok(())
     }
 
     /// Get a value from the program memory.
@@ -850,7 +845,7 @@ impl GetTangentialInfoFromPathsResult {
 
 impl Sketch {
     pub(crate) fn add_tag(&mut self, tag: NodeRef<'_, TagDeclarator>, current_path: &Path) {
-        let mut tag_identifier = TagIdentifier::from(tag);
+        let mut tag_identifier: TagIdentifier = tag.into();
         let base = current_path.get_base();
         tag_identifier.info = Some(TagEngineInfo {
             id: base.geo_meta.id,
@@ -1659,6 +1654,17 @@ impl ExecutorContext {
         let engine: Arc<Box<dyn EngineManager>> =
             Arc::new(Box::new(crate::engine::conn::EngineConnection::new(ws).await?));
 
+        // Set the edge visibility.
+        engine
+            .batch_modeling_cmd(
+                uuid::Uuid::new_v4(),
+                SourceRange::default(),
+                &ModelingCmd::from(mcmd::EdgeLinesVisible {
+                    hidden: !settings.highlight_edges,
+                }),
+            )
+            .await?;
+
         Ok(Self {
             engine,
             fs: Arc::new(FileManager::new()),
@@ -1685,7 +1691,7 @@ impl ExecutorContext {
     pub async fn new(
         engine_manager: crate::engine::conn_wasm::EngineCommandManager,
         fs_manager: crate::fs::wasm::FileSystemManager,
-        settings: ExecutorSettings,
+        units: UnitLength,
     ) -> Result<Self, String> {
         Ok(ExecutorContext {
             engine: Arc::new(Box::new(
@@ -1695,16 +1701,16 @@ impl ExecutorContext {
             )),
             fs: Arc::new(FileManager::new(fs_manager)),
             stdlib: Arc::new(StdLib::new()),
-            settings,
+            settings: ExecutorSettings {
+                units,
+                ..Default::default()
+            },
             context_type: ContextType::Live,
         })
     }
 
     #[cfg(target_arch = "wasm32")]
-    pub async fn new_mock(
+    pub async fn new_mock(fs_manager: crate::fs::wasm::FileSystemManager, units: UnitLength) -> Result<Self, String> {
-        fs_manager: crate::fs::wasm::FileSystemManager,
-        settings: ExecutorSettings,
-    ) -> Result<Self, String> {
         Ok(ExecutorContext {
             engine: Arc::new(Box::new(
                 crate::engine::conn_mock::EngineConnection::new()
@@ -1713,7 +1719,10 @@ impl ExecutorContext {
             )),
             fs: Arc::new(FileManager::new(fs_manager)),
             stdlib: Arc::new(StdLib::new()),
-            settings,
+            settings: ExecutorSettings {
+                units,
+                ..Default::default()
+            },
             context_type: ContextType::Mock,
         })
     }
@@ -1802,71 +1811,6 @@ impl ExecutorContext {
         // AND if we aren't in wasm it doesn't really matter.
         Ok(())
     }
-    // Given an old ast, old program memory and new ast, find the parts of the code that need to be
-    // re-executed.
-    // This function should never error, because in the case of any internal error, we should just pop
-    // the cache.
-    pub async fn get_changed_program(&self, info: CacheInformation) -> Option<CacheResult> {
-        let Some(old) = info.old else {
-            // We have no old info, we need to re-execute the whole thing.
-            return Some(CacheResult {
-                clear_scene: true,
-                program: info.new_ast,
-            });
-        };
-
-        // If the settings are different we might need to bust the cache.
-        // We specifically do this before checking if they are the exact same.
-        if old.settings != self.settings {
-            // If the units are different we need to re-execute the whole thing.
-            if old.settings.units != self.settings.units {
-                return Some(CacheResult {
-                    clear_scene: true,
-                    program: info.new_ast,
-                });
-            }
-
-            // If anything else is different we do not need to re-execute, but rather just
-            // run the settings again.
-
-            if self
-                .engine
-                .reapply_settings(&self.settings, Default::default())
-                .await
-                .is_err()
-            {
-                // Bust the cache, we errored.
-                return Some(CacheResult {
-                    clear_scene: true,
-                    program: info.new_ast,
-                });
-            }
-        }
-
-        // If the ASTs are the EXACT same we return None.
-        // We don't even need to waste time computing the digests.
-        if old.ast == info.new_ast {
-            return None;
-        }
-
-        let mut old_ast = old.ast.inner;
-        old_ast.compute_digest();
-        let mut new_ast = info.new_ast.inner.clone();
-        new_ast.compute_digest();
-
-        // Check if the digest is the same.
-        if old_ast.digest == new_ast.digest {
-            return None;
-        }
-
-        // Check if the changes were only to Non-code areas, like comments or whitespace.
-
-        // For any unhandled cases just re-execute the whole thing.
-        Some(CacheResult {
-            clear_scene: true,
-            program: info.new_ast,
-        })
-    }
 
     /// Perform the execution of a program.
     /// You can optionally pass in some initialization memory.
@@ -1887,7 +1831,7 @@ impl ExecutorContext {
         let _stats = crate::log::LogPerfStats::new("Interpretation");
 
         // Get the program that actually changed from the old and new information.
-        let cache_result = self.get_changed_program(cache_info.clone()).await;
+        let cache_result = get_changed_program(cache_info.clone(), &self.settings);
 
         // Check if we don't need to re-execute.
         let Some(cache_result) = cache_result else {
@@ -1904,9 +1848,23 @@ impl ExecutorContext {
 
         // TODO: Use the top-level file's path.
         exec_state.add_module(std::path::PathBuf::from(""));
-
+        // Before we even start executing the program, set the units.
-        // Re-apply the settings, in case the cache was busted.
+        self.engine
-        self.engine.reapply_settings(&self.settings, Default::default()).await?;
+            .batch_modeling_cmd(
+                exec_state.id_generator.next_uuid(),
+                SourceRange::default(),
+                &ModelingCmd::from(mcmd::SetSceneUnits {
+                    unit: match self.settings.units {
+                        UnitLength::Cm => kcmc::units::UnitLength::Centimeters,
+                        UnitLength::Ft => kcmc::units::UnitLength::Feet,
+                        UnitLength::In => kcmc::units::UnitLength::Inches,
+                        UnitLength::M => kcmc::units::UnitLength::Meters,
+                        UnitLength::Mm => kcmc::units::UnitLength::Millimeters,
+                        UnitLength::Yd => kcmc::units::UnitLength::Yards,
+                    },
+                }),
+            )
+            .await?;
 
         self.inner_execute(&cache_result.program, exec_state, crate::execution::BodyType::Root)
             .await?;
@@ -2117,8 +2075,7 @@ impl ExecutorContext {
         Ok((module_memory, module_exports))
     }
 
-    #[async_recursion]
+    pub async fn execute_expr<'a>(
-    pub async fn execute_expr<'a: 'async_recursion>(
         &self,
         init: &Expr,
         exec_state: &mut ExecState,
@@ -2128,7 +2085,7 @@ impl ExecutorContext {
         let item = match init {
             Expr::None(none) => KclValue::from(none),
             Expr::Literal(literal) => KclValue::from(literal),
-            Expr::TagDeclarator(tag) => KclValue::from(tag),
+            Expr::TagDeclarator(tag) => tag.execute(exec_state).await?,
             Expr::Identifier(identifier) => {
                 let value = exec_state.memory.get(&identifier.name, identifier.into())?;
                 value.clone()
@@ -2175,14 +2132,6 @@ impl ExecutorContext {
             Expr::MemberExpression(member_expression) => member_expression.get_result(exec_state)?,
             Expr::UnaryExpression(unary_expression) => unary_expression.get_result(exec_state, self).await?,
             Expr::IfExpression(expr) => expr.get_result(exec_state, self).await?,
-            Expr::LabelledExpression(expr) => {
-                let result = self
-                    .execute_expr(&expr.expr, exec_state, metadata, statement_kind)
-                    .await?;
-                exec_state.memory.add(&expr.label.name, result.clone(), init.into())?;
-                // TODO this lets us use the label as a variable name, but not as a tag in most cases
-                result
-            }
         };
         Ok(item)
     }
@@ -2192,8 +2141,23 @@ impl ExecutorContext {
         self.settings.units = units;
     }
 
-    /// Get a snapshot of the current scene.
+    /// Execute the program, then get a PNG screenshot.
-    pub async fn prepare_snapshot(&self) -> std::result::Result<TakeSnapshot, ExecError> {
+    pub async fn execute_and_prepare_snapshot(
+        &self,
+        program: &Program,
+        exec_state: &mut ExecState,
+    ) -> std::result::Result<TakeSnapshot, ExecError> {
+        self.execute_and_prepare(program, exec_state).await
+    }
+
+    /// Execute the program, return the interpreter and outputs.
+    pub async fn execute_and_prepare(
+        &self,
+        program: &Program,
+        exec_state: &mut ExecState,
+    ) -> std::result::Result<TakeSnapshot, ExecError> {
+        self.run(program.clone().into(), exec_state).await?;
+
         // Zoom to fit.
         self.engine
             .send_modeling_cmd(
@@ -2229,17 +2193,6 @@ impl ExecutorContext {
         };
         Ok(contents)
     }
-
-    /// Execute the program, then get a PNG screenshot.
-    pub async fn execute_and_prepare_snapshot(
-        &self,
-        program: &Program,
-        exec_state: &mut ExecState,
-    ) -> std::result::Result<TakeSnapshot, ExecError> {
-        self.run(program.clone().into(), exec_state).await?;
-
-        self.prepare_snapshot().await
-    }
 }
 
 /// For each argument given,
@@ -2294,59 +2247,6 @@ fn assign_args_to_params(
     Ok(fn_memory)
 }
 
-fn assign_args_to_params_kw(
-    function_expression: NodeRef<'_, FunctionExpression>,
-    mut args: crate::std::args::KwArgs,
-    mut fn_memory: ProgramMemory,
-) -> Result<ProgramMemory, KclError> {
-    // Add the arguments to the memory.  A new call frame should have already
-    // been created.
-    let source_ranges = vec![function_expression.into()];
-    for param in function_expression.params.iter() {
-        if param.labeled {
-            let arg = args.labeled.get(&param.identifier.name);
-            let arg_val = match arg {
-                Some(arg) => arg.value.clone(),
-                None => match param.default_value {
-                    Some(ref default_val) => KclValue::from(default_val.clone()),
-                    None => {
-                        return Err(KclError::Semantic(KclErrorDetails {
-                            source_ranges,
-                            message: format!(
-                                "This function requires a parameter {}, but you haven't passed it one.",
-                                param.identifier.name
-                            ),
-                        }));
-                    }
-                },
-            };
-            fn_memory.add(&param.identifier.name, arg_val, (&param.identifier).into())?;
-        } else {
-            let Some(unlabeled) = args.unlabeled.take() else {
-                let param_name = &param.identifier.name;
-                return Err(if args.labeled.contains_key(param_name) {
-                    KclError::Semantic(KclErrorDetails {
-                        source_ranges,
-                        message: format!("The function does declare a parameter named '{param_name}', but this parameter doesn't use a label. Try removing the `{param_name}:`"),
-                    })
-                } else {
-                    KclError::Semantic(KclErrorDetails {
-                        source_ranges,
-                        message: "This function expects an unlabeled first parameter, but you haven't passed it one."
-                            .to_owned(),
-                    })
-                });
-            };
-            fn_memory.add(
-                &param.identifier.name,
-                unlabeled.value.clone(),
-                (&param.identifier).into(),
-            )?;
-        }
-    }
-    Ok(fn_memory)
-}
-
 pub(crate) async fn call_user_defined_function(
     args: Vec<Arg>,
     memory: &ProgramMemory,
@@ -2377,36 +2277,6 @@ pub(crate) async fn call_user_defined_function(
     result.map(|_| fn_memory.return_)
 }
 
-pub(crate) async fn call_user_defined_function_kw(
-    args: crate::std::args::KwArgs,
-    memory: &ProgramMemory,
-    function_expression: NodeRef<'_, FunctionExpression>,
-    exec_state: &mut ExecState,
-    ctx: &ExecutorContext,
-) -> Result<Option<KclValue>, KclError> {
-    // Create a new environment to execute the function body in so that local
-    // variables shadow variables in the parent scope.  The new environment's
-    // parent should be the environment of the closure.
-    let mut body_memory = memory.clone();
-    let body_env = body_memory.new_env_for_call(memory.current_env);
-    body_memory.current_env = body_env;
-    let fn_memory = assign_args_to_params_kw(function_expression, args, body_memory)?;
-
-    // Execute the function body using the memory we just created.
-    let (result, fn_memory) = {
-        let previous_memory = std::mem::replace(&mut exec_state.memory, fn_memory);
-        let result = ctx
-            .inner_execute(&function_expression.body, exec_state, BodyType::Block)
-            .await;
-        // Restore the previous memory.
-        let fn_memory = std::mem::replace(&mut exec_state.memory, previous_memory);
-
-        (result, fn_memory)
-    };
-
-    result.map(|_| fn_memory.return_)
-}
-
 pub enum StatementKind<'a> {
     Declaration { name: &'a str },
     Expression,
@@ -2419,12 +2289,9 @@ mod tests {
     use pretty_assertions::assert_eq;
 
     use super::*;
-    use crate::{
+    use crate::parsing::ast::types::{DefaultParamVal, Identifier, Node, Parameter};
-        parsing::ast::types::{DefaultParamVal, Identifier, Node, Parameter},
-        OldAstState,
-    };
 
-    pub async fn parse_execute(code: &str) -> Result<(Program, ExecutorContext, ExecState)> {
+    pub async fn parse_execute(code: &str) -> Result<ProgramMemory> {
         let program = Program::parse_no_errs(code)?;
 
         let ctx = ExecutorContext {
@@ -2435,9 +2302,9 @@ mod tests {
             context_type: ContextType::Mock,
         };
         let mut exec_state = ExecState::default();
-        ctx.run(program.clone().into(), &mut exec_state).await?;
+        ctx.run(program.into(), &mut exec_state).await?;
 
-        Ok((program, ctx, exec_state))
+        Ok(exec_state.memory)
     }
 
     /// Convenience function to get a JSON value from memory and unwrap.
@@ -2848,39 +2715,36 @@ let shape = layer() |> patternTransform(10, transform, %)
     #[tokio::test(flavor = "multi_thread")]
     async fn test_math_execute_with_functions() {
         let ast = r#"const myVar = 2 + min(100, -1 + legLen(5, 3))"#;
-        let (_, _, exec_state) = parse_execute(ast).await.unwrap();
+        let memory = parse_execute(ast).await.unwrap();
-        assert_eq!(5.0, mem_get_json(&exec_state.memory, "myVar").as_f64().unwrap());
+        assert_eq!(5.0, mem_get_json(&memory, "myVar").as_f64().unwrap());
     }
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_math_execute() {
         let ast = r#"const myVar = 1 + 2 * (3 - 4) / -5 + 6"#;
-        let (_, _, exec_state) = parse_execute(ast).await.unwrap();
+        let memory = parse_execute(ast).await.unwrap();
-        assert_eq!(7.4, mem_get_json(&exec_state.memory, "myVar").as_f64().unwrap());
+        assert_eq!(7.4, mem_get_json(&memory, "myVar").as_f64().unwrap());
     }
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_math_execute_start_negative() {
         let ast = r#"const myVar = -5 + 6"#;
-        let (_, _, exec_state) = parse_execute(ast).await.unwrap();
+        let memory = parse_execute(ast).await.unwrap();
-        assert_eq!(1.0, mem_get_json(&exec_state.memory, "myVar").as_f64().unwrap());
+        assert_eq!(1.0, mem_get_json(&memory, "myVar").as_f64().unwrap());
     }
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_math_execute_with_pi() {
         let ast = r#"const myVar = pi() * 2"#;
-        let (_, _, exec_state) = parse_execute(ast).await.unwrap();
+        let memory = parse_execute(ast).await.unwrap();
-        assert_eq!(
+        assert_eq!(std::f64::consts::TAU, mem_get_json(&memory, "myVar").as_f64().unwrap());
-            std::f64::consts::TAU,
-            mem_get_json(&exec_state.memory, "myVar").as_f64().unwrap()
-        );
     }
 
     #[tokio::test(flavor = "multi_thread")]
     async fn test_math_define_decimal_without_leading_zero() {
         let ast = r#"let thing = .4 + 7"#;
-        let (_, _, exec_state) = parse_execute(ast).await.unwrap();
+        let memory = parse_execute(ast).await.unwrap();
-        assert_eq!(7.4, mem_get_json(&exec_state.memory, "thing").as_f64().unwrap());
+        assert_eq!(7.4, mem_get_json(&memory, "thing").as_f64().unwrap());
     }
 
     #[tokio::test(flavor = "multi_thread")]
@@ -2919,11 +2783,11 @@ fn check = (x) => {
 }
 check(false)
 "#;
-        let (_, _, exec_state) = parse_execute(ast).await.unwrap();
+        let mem = parse_execute(ast).await.unwrap();
-        assert_eq!(false, mem_get_json(&exec_state.memory, "notTrue").as_bool().unwrap());
+        assert_eq!(false, mem_get_json(&mem, "notTrue").as_bool().unwrap());
-        assert_eq!(true, mem_get_json(&exec_state.memory, "notFalse").as_bool().unwrap());
+        assert_eq!(true, mem_get_json(&mem, "notFalse").as_bool().unwrap());
-        assert_eq!(true, mem_get_json(&exec_state.memory, "c").as_bool().unwrap());
+        assert_eq!(true, mem_get_json(&mem, "c").as_bool().unwrap());
-        assert_eq!(false, mem_get_json(&exec_state.memory, "d").as_bool().unwrap());
+        assert_eq!(false, mem_get_json(&mem, "d").as_bool().unwrap());
     }
 
     #[tokio::test(flavor = "multi_thread")]
@@ -3024,10 +2888,8 @@ let notTagDeclarator = !myTagDeclarator";
         );
 
         let code9 = "
-sk = startSketchOn('XY')
+let myTagDeclarator = $myTag
-  |> startProfileAt([0, 0], %)
+let notTagIdentifier = !myTag";
-  |> line([5, 0], %, $myTag)
-notTagIdentifier = !myTag";
         let tag_identifier_err = parse_execute(code9).await.unwrap_err().downcast::<KclError>().unwrap();
         // These are currently printed out as JSON objects, so we don't want to
         // check the full error.
@@ -3305,310 +3167,4 @@ let w = f() + f()
         let json = serde_json::to_string(&mem).unwrap();
         assert_eq!(json, r#"{"type":"Solids","value":[]}"#);
     }
-
-    // Easy case where we have no old ast and memory.
-    // We need to re-execute everything.
-    #[tokio::test(flavor = "multi_thread")]
-    async fn test_get_changed_program_no_old_information() {
-        let new = r#"// Remove the end face for the extrusion.
-firstSketch = startSketchOn('XY')
-  |> startProfileAt([-12, 12], %)
-  |> line([24, 0], %)
-  |> line([0, -24], %)
-  |> line([-24, 0], %)
-  |> close(%)
-  |> extrude(6, %)
-
-// Remove the end face for the extrusion.
-shell({ faces = ['end'], thickness = 0.25 }, firstSketch)"#;
-        let (program, ctx, _) = parse_execute(new).await.unwrap();
-
-        let result = ctx
-            .get_changed_program(CacheInformation {
-                old: None,
-                new_ast: program.ast.clone(),
-            })
-            .await;
-
-        assert!(result.is_some());
-
-        let result = result.unwrap();
-
-        assert_eq!(result.program, program.ast);
-        assert!(result.clear_scene);
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn test_get_changed_program_same_code() {
-        let new = r#"// Remove the end face for the extrusion.
-firstSketch = startSketchOn('XY')
-  |> startProfileAt([-12, 12], %)
-  |> line([24, 0], %)
-  |> line([0, -24], %)
-  |> line([-24, 0], %)
-  |> close(%)
-  |> extrude(6, %)
-
-// Remove the end face for the extrusion.
-shell({ faces = ['end'], thickness = 0.25 }, firstSketch)"#;
-
-        let (program, ctx, exec_state) = parse_execute(new).await.unwrap();
-
-        let result = ctx
-            .get_changed_program(CacheInformation {
-                old: Some(OldAstState {
-                    ast: program.ast.clone(),
-                    exec_state,
-                    settings: Default::default(),
-                }),
-                new_ast: program.ast.clone(),
-            })
-            .await;
-
-        assert_eq!(result, None);
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn test_get_changed_program_same_code_changed_whitespace() {
-        let old = r#" // Remove the end face for the extrusion.
-firstSketch = startSketchOn('XY')
-  |> startProfileAt([-12, 12], %)
-  |> line([24, 0], %)
-  |> line([0, -24], %)
-  |> line([-24, 0], %)
-  |> close(%)
-  |> extrude(6, %)
-
-// Remove the end face for the extrusion.
-shell({ faces = ['end'], thickness = 0.25 }, firstSketch) "#;
-
-        let new = r#"// Remove the end face for the extrusion.
-firstSketch = startSketchOn('XY')
-  |> startProfileAt([-12, 12], %)
-  |> line([24, 0], %)
-  |> line([0, -24], %)
-  |> line([-24, 0], %)
-  |> close(%)
-  |> extrude(6, %)
-
-// Remove the end face for the extrusion.
-shell({ faces = ['end'], thickness = 0.25 }, firstSketch)"#;
-
-        let (program_old, ctx, exec_state) = parse_execute(old).await.unwrap();
-
-        let program_new = crate::Program::parse_no_errs(new).unwrap();
-
-        let result = ctx
-            .get_changed_program(CacheInformation {
-                old: Some(OldAstState {
-                    ast: program_old.ast.clone(),
-                    exec_state,
-                    settings: Default::default(),
-                }),
-                new_ast: program_new.ast.clone(),
-            })
-            .await;
-
-        assert_eq!(result, None);
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn test_get_changed_program_same_code_changed_code_comment_start_of_program() {
-        let old = r#" // Removed the end face for the extrusion.
-firstSketch = startSketchOn('XY')
-  |> startProfileAt([-12, 12], %)
-  |> line([24, 0], %)
-  |> line([0, -24], %)
-  |> line([-24, 0], %)
-  |> close(%)
-  |> extrude(6, %)
-
-// Remove the end face for the extrusion.
-shell({ faces = ['end'], thickness = 0.25 }, firstSketch) "#;
-
-        let new = r#"// Remove the end face for the extrusion.
-firstSketch = startSketchOn('XY')
-  |> startProfileAt([-12, 12], %)
-  |> line([24, 0], %)
-  |> line([0, -24], %)
-  |> line([-24, 0], %)
-  |> close(%)
-  |> extrude(6, %)
-
-// Remove the end face for the extrusion.
-shell({ faces = ['end'], thickness = 0.25 }, firstSketch)"#;
-
-        let (program, ctx, exec_state) = parse_execute(old).await.unwrap();
-
-        let program_new = crate::Program::parse_no_errs(new).unwrap();
-
-        let result = ctx
-            .get_changed_program(CacheInformation {
-                old: Some(OldAstState {
-                    ast: program.ast.clone(),
-                    exec_state,
-                    settings: Default::default(),
-                }),
-                new_ast: program_new.ast.clone(),
-            })
-            .await;
-
-        assert_eq!(result, None);
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    async fn test_get_changed_program_same_code_changed_code_comments() {
-        let old = r#" // Removed the end face for the extrusion.
-firstSketch = startSketchOn('XY')
-  |> startProfileAt([-12, 12], %)
-  |> line([24, 0], %)
-  |> line([0, -24], %)
-  |> line([-24, 0], %) // my thing
-  |> close(%)
-  |> extrude(6, %)
-
-// Remove the end face for the extrusion.
-shell({ faces = ['end'], thickness = 0.25 }, firstSketch) "#;
-
-        let new = r#"// Remove the end face for the extrusion.
-firstSketch = startSketchOn('XY')
-  |> startProfileAt([-12, 12], %)
-  |> line([24, 0], %)
-  |> line([0, -24], %)
-  |> line([-24, 0], %)
-  |> close(%)
-  |> extrude(6, %)
-
-// Remove the end face for the extrusion.
-shell({ faces = ['end'], thickness = 0.25 }, firstSketch)"#;
-
-        let (program, ctx, exec_state) = parse_execute(old).await.unwrap();
-
-        let program_new = crate::Program::parse_no_errs(new).unwrap();
-
-        let result = ctx
-            .get_changed_program(CacheInformation {
-                old: Some(OldAstState {
-                    ast: program.ast.clone(),
-                    exec_state,
-                    settings: Default::default(),
-                }),
-                new_ast: program_new.ast.clone(),
-            })
-            .await;
-
-        assert!(result.is_some());
-
-        let result = result.unwrap();
-
-        assert_eq!(result.program, program_new.ast);
-        assert!(result.clear_scene);
-    }
-
-    // Changing the units with the exact same file should bust the cache.
-    #[tokio::test(flavor = "multi_thread")]
-    async fn test_get_changed_program_same_code_but_different_units() {
-        let new = r#"// Remove the end face for the extrusion.
-firstSketch = startSketchOn('XY')
-  |> startProfileAt([-12, 12], %)
-  |> line([24, 0], %)
-  |> line([0, -24], %)
-  |> line([-24, 0], %)
-  |> close(%)
-  |> extrude(6, %)
-
-// Remove the end face for the extrusion.
-shell({ faces = ['end'], thickness = 0.25 }, firstSketch)"#;
-
-        let (program, mut ctx, exec_state) = parse_execute(new).await.unwrap();
-
-        // Change the settings to cm.
-        ctx.settings.units = crate::UnitLength::Cm;
-
-        let result = ctx
-            .get_changed_program(CacheInformation {
-                old: Some(OldAstState {
-                    ast: program.ast.clone(),
-                    exec_state,
-                    settings: Default::default(),
-                }),
-                new_ast: program.ast.clone(),
-            })
-            .await;
-
-        assert!(result.is_some());
-
-        let result = result.unwrap();
-
-        assert_eq!(result.program, program.ast);
-        assert!(result.clear_scene);
-    }
-
-    // Changing the grid settings with the exact same file should NOT bust the cache.
-    #[tokio::test(flavor = "multi_thread")]
-    async fn test_get_changed_program_same_code_but_different_grid_setting() {
-        let new = r#"// Remove the end face for the extrusion.
-firstSketch = startSketchOn('XY')
-  |> startProfileAt([-12, 12], %)
-  |> line([24, 0], %)
-  |> line([0, -24], %)
-  |> line([-24, 0], %)
-  |> close(%)
-  |> extrude(6, %)
-
-// Remove the end face for the extrusion.
-shell({ faces = ['end'], thickness = 0.25 }, firstSketch)"#;
-
-        let (program, mut ctx, exec_state) = parse_execute(new).await.unwrap();
-
-        // Change the settings.
-        ctx.settings.show_grid = !ctx.settings.show_grid;
-
-        let result = ctx
-            .get_changed_program(CacheInformation {
-                old: Some(OldAstState {
-                    ast: program.ast.clone(),
-                    exec_state,
-                    settings: Default::default(),
-                }),
-                new_ast: program.ast.clone(),
-            })
-            .await;
-
-        assert_eq!(result, None);
-    }
-
-    // Changing the edge visibility settings with the exact same file should NOT bust the cache.
-    #[tokio::test(flavor = "multi_thread")]
-    async fn test_get_changed_program_same_code_but_different_edge_visiblity_setting() {
-        let new = r#"// Remove the end face for the extrusion.
-firstSketch = startSketchOn('XY')
-  |> startProfileAt([-12, 12], %)
-  |> line([24, 0], %)
-  |> line([0, -24], %)
-  |> line([-24, 0], %)
-  |> close(%)
-  |> extrude(6, %)
-
-// Remove the end face for the extrusion.
-shell({ faces = ['end'], thickness = 0.25 }, firstSketch)"#;
-
-        let (program, mut ctx, exec_state) = parse_execute(new).await.unwrap();
-
-        // Change the settings.
-        ctx.settings.highlight_edges = !ctx.settings.highlight_edges;
-
-        let result = ctx
-            .get_changed_program(CacheInformation {
-                old: Some(OldAstState {
-                    ast: program.ast.clone(),
-                    exec_state,
-                    settings: Default::default(),
-                }),
-                new_ast: program.ast.clone(),
-            })
-            .await;
-
-        assert_eq!(result, None);
-    }
 }

src/wasm-lib/kcl/src/lib.rs

@@ -82,15 +82,16 @@ mod wasm;
 pub use coredump::CoreDump;
 pub use engine::{EngineManager, ExecutionKind};
 pub use errors::{CompilationError, ConnectionError, ExecError, KclError};
-pub use execution::{
+pub use execution::{ExecState, ExecutorContext, ExecutorSettings};
-    cache::{CacheInformation, OldAstState},
-    ExecState, ExecutorContext, ExecutorSettings,
-};
 pub use lsp::{
     copilot::Backend as CopilotLspBackend,
     kcl::{Backend as KclLspBackend, Server as KclLspServerSubCommand},
 };
-pub use parsing::ast::{modify::modify_ast_for_sketch, types::FormatOptions};
+pub use parsing::ast::{
+    cache::{CacheInformation, OldAstState},
+    modify::modify_ast_for_sketch,
+    types::FormatOptions,
+};
 pub use settings::types::{project::ProjectConfiguration, Configuration, UnitLength};
 pub use source_range::{ModuleId, SourceRange};
 
@@ -137,7 +138,7 @@ pub use lsp::test_util::kcl_lsp_server;
 impl Program {
     pub fn parse(input: &str) -> Result<(Option<Program>, Vec<CompilationError>), KclError> {
         let module_id = ModuleId::default();
-        let tokens = parsing::token::lex(input, module_id)?;
+        let tokens = parsing::token::lexer(input, module_id)?;
         let (ast, errs) = parsing::parse_tokens(tokens).0?;
 
         Ok((ast.map(|ast| Program { ast }), errs))
@@ -145,7 +146,7 @@ impl Program {
 
     pub fn parse_no_errs(input: &str) -> Result<Program, KclError> {
         let module_id = ModuleId::default();
-        let tokens = parsing::token::lex(input, module_id)?;
+        let tokens = parsing::token::lexer(input, module_id)?;
         let ast = parsing::parse_tokens(tokens).parse_errs_as_err()?;
 
         Ok(Program { ast })

src/wasm-lib/kcl/src/lsp/kcl/mod.rs

@@ -45,32 +45,38 @@ use crate::{
     errors::Suggestion,
     lsp::{backend::Backend as _, util::IntoDiagnostic},
     parsing::{
-        ast::types::{Expr, Node, VariableKind},
+        ast::{
-        token::TokenStream,
+            cache::{CacheInformation, OldAstState},
+            types::{Expr, Node, VariableKind},
+        },
+        token::TokenType,
         PIPE_OPERATOR,
     },
-    CacheInformation, ModuleId, OldAstState, Program, SourceRange,
+    ModuleId, Program, SourceRange,
 };
-const SEMANTIC_TOKEN_TYPES: [SemanticTokenType; 10] = [
-    SemanticTokenType::NUMBER,
-    SemanticTokenType::VARIABLE,
-    SemanticTokenType::KEYWORD,
-    SemanticTokenType::TYPE,
-    SemanticTokenType::STRING,
-    SemanticTokenType::OPERATOR,
-    SemanticTokenType::COMMENT,
-    SemanticTokenType::FUNCTION,
-    SemanticTokenType::PARAMETER,
-    SemanticTokenType::PROPERTY,
-];
 
-const SEMANTIC_TOKEN_MODIFIERS: [SemanticTokenModifier; 5] = [
+lazy_static::lazy_static! {
-    SemanticTokenModifier::DECLARATION,
+    pub static ref SEMANTIC_TOKEN_TYPES: Vec<SemanticTokenType> = {
-    SemanticTokenModifier::DEFINITION,
+        // This is safe to unwrap because we know all the token types are valid.
-    SemanticTokenModifier::DEFAULT_LIBRARY,
+        // And the test would fail if they were not.
-    SemanticTokenModifier::READONLY,
+        let mut gen = TokenType::all_semantic_token_types().unwrap();
-    SemanticTokenModifier::STATIC,
+        gen.extend(vec![
-];
+            SemanticTokenType::PARAMETER,
+            SemanticTokenType::PROPERTY,
+        ]);
+        gen
+    };
+
+    pub static ref SEMANTIC_TOKEN_MODIFIERS: Vec<SemanticTokenModifier> = {
+        vec![
+            SemanticTokenModifier::DECLARATION,
+            SemanticTokenModifier::DEFINITION,
+            SemanticTokenModifier::DEFAULT_LIBRARY,
+            SemanticTokenModifier::READONLY,
+            SemanticTokenModifier::STATIC,
+        ]
+    };
+}
 
 /// A subcommand for running the server.
 #[derive(Clone, Debug)]
@@ -99,7 +105,7 @@ pub struct Backend {
     /// The stdlib signatures for the language.
     pub stdlib_signatures: HashMap<String, SignatureHelp>,
     /// Token maps.
-    pub(super) token_map: DashMap<String, TokenStream>,
+    pub token_map: DashMap<String, Vec<crate::parsing::token::Token>>,
     /// AST maps.
     pub ast_map: DashMap<String, Node<crate::parsing::ast::types::Program>>,
     /// Last successful execution.
@@ -278,7 +284,7 @@ impl crate::lsp::backend::Backend for Backend {
 
         // Lets update the tokens.
         let module_id = ModuleId::default();
-        let tokens = match crate::parsing::token::lex(&params.text, module_id) {
+        let tokens = match crate::parsing::token::lexer(&params.text, module_id) {
             Ok(tokens) => tokens,
             Err(err) => {
                 self.add_to_diagnostics(&params, &[err], true).await;
@@ -404,11 +410,11 @@ impl Backend {
         self.executor_ctx.read().await
     }
 
-    async fn update_semantic_tokens(&self, tokens: &TokenStream, params: &TextDocumentItem) {
+    async fn update_semantic_tokens(&self, tokens: &[crate::parsing::token::Token], params: &TextDocumentItem) {
         // Update the semantic tokens map.
         let mut semantic_tokens = vec![];
         let mut last_position = Position::new(0, 0);
-        for token in tokens.as_slice() {
+        for token in tokens {
             let Ok(token_type) = SemanticTokenType::try_from(token.token_type) else {
                 // We continue here because not all tokens can be converted this way, we will get
                 // the rest from the ast.
@@ -438,11 +444,8 @@ impl Backend {
             let token_modifiers_bitset = if let Some(ast) = self.ast_map.get(params.uri.as_str()) {
                 let token_index = Arc::new(Mutex::new(token_type_index));
                 let modifier_index: Arc<Mutex<u32>> = Arc::new(Mutex::new(0));
-                crate::walk::walk(&ast, |node: crate::walk::Node| {
+                crate::walk::walk(&ast, &|node: crate::walk::Node| {
-                    let Ok(node_range): Result<SourceRange, _> = (&node).try_into() else {
+                    let node_range: SourceRange = (&node).into();
-                        return Ok(true);
-                    };
-
                     if !node_range.contains(source_range.start()) {
                         return Ok(true);
                     }
@@ -560,7 +563,7 @@ impl Backend {
                     let semantic_token = SemanticToken {
                         delta_line: position.line - last_position.line + 1,
                         delta_start: 0,
-                        length: (token.end - token.start) as u32,
+                        length: token.value.len() as u32,
                         token_type: token_type_index,
                         token_modifiers_bitset,
                     };
@@ -579,7 +582,7 @@ impl Backend {
                 } else {
                     position.character - last_position.character
                 },
-                length: (token.end - token.start) as u32,
+                length: token.value.len() as u32,
                 token_type: token_type_index,
                 token_modifiers_bitset,
             };
@@ -960,8 +963,8 @@ impl LanguageServer for Backend {
                         semantic_tokens_options: SemanticTokensOptions {
                             work_done_progress_options: WorkDoneProgressOptions::default(),
                             legend: SemanticTokensLegend {
-                                token_types: SEMANTIC_TOKEN_TYPES.to_vec(),
+                                token_types: SEMANTIC_TOKEN_TYPES.clone(),
-                                token_modifiers: SEMANTIC_TOKEN_MODIFIERS.to_vec(),
+                                token_modifiers: SEMANTIC_TOKEN_MODIFIERS.clone(),
                             },
                             range: Some(false),
                             full: Some(SemanticTokensFullOptions::Bool(true)),

src/wasm-lib/kcl/src/lsp/tests.rs

@@ -1082,7 +1082,7 @@ fn myFn = (param1) => {
 
     // Get the token map.
     let token_map = server.token_map.get("file:///test.kcl").unwrap().clone();
-    assert!(!token_map.is_empty());
+    assert!(token_map != vec![]);
 
     // Get the ast.
     let ast = server.ast_map.get("file:///test.kcl").unwrap().clone();
@@ -2206,7 +2206,7 @@ part001 = cube([0,0], 20)
 
     // Get the tokens.
     let tokens = server.token_map.get("file:///test.kcl").unwrap().clone();
-    assert_eq!(tokens.as_slice().len(), 120);
+    assert_eq!(tokens.len(), 120);
 
     // Get the ast.
     let ast = server.ast_map.get("file:///test.kcl").unwrap().clone();
@@ -3379,11 +3379,11 @@ part001 = startSketchOn('XY')
 
     // Get the symbols map.
     let symbols_map = server.symbols_map.get("file:///test.kcl").unwrap().clone();
-    assert!(!symbols_map.is_empty());
+    assert!(symbols_map != vec![]);
 
     // Get the semantic tokens map.
     let semantic_tokens_map = server.semantic_tokens_map.get("file:///test.kcl").unwrap().clone();
-    assert!(!semantic_tokens_map.is_empty());
+    assert!(semantic_tokens_map != vec![]);
 
     // Get the memory.
     let memory = server.memory_map.get("file:///test.kcl").unwrap().clone();
@@ -3422,7 +3422,7 @@ NEW_LINT = 1"#
 
     // Get the semantic tokens map.
     let semantic_tokens_map = server.semantic_tokens_map.get("file:///test.kcl").unwrap().clone();
-    assert!(!semantic_tokens_map.is_empty());
+    assert!(semantic_tokens_map != vec![]);
 
     // Get the memory.
     let memory = server.memory_map.get("file:///test.kcl");
@@ -3466,7 +3466,7 @@ part001 = startSketchOn('XY')
 
     // Get the token map.
     let token_map = server.token_map.get("file:///test.kcl").unwrap().clone();
-    assert!(!token_map.is_empty());
+    assert!(token_map != vec![]);
 
     // Get the ast.
     let ast = server.ast_map.get("file:///test.kcl").unwrap().clone();
@@ -3474,11 +3474,11 @@ part001 = startSketchOn('XY')
 
     // Get the symbols map.
     let symbols_map = server.symbols_map.get("file:///test.kcl").unwrap().clone();
-    assert!(!symbols_map.is_empty());
+    assert!(symbols_map != vec![]);
 
     // Get the semantic tokens map.
     let semantic_tokens_map = server.semantic_tokens_map.get("file:///test.kcl").unwrap().clone();
-    assert!(!semantic_tokens_map.is_empty());
+    assert!(semantic_tokens_map != vec![]);
 
     // Get the memory.
     let memory = server.memory_map.get("file:///test.kcl").unwrap().clone();
@@ -3509,7 +3509,7 @@ part001 = startSketchOn('XY')
 
     // Get the token map.
     let token_map = server.token_map.get("file:///test.kcl").unwrap().clone();
-    assert!(!token_map.is_empty());
+    assert!(token_map != vec![]);
 
     // Get the ast.
     let ast = server.ast_map.get("file:///test.kcl").unwrap().clone();
@@ -3517,11 +3517,11 @@ part001 = startSketchOn('XY')
 
     // Get the symbols map.
     let symbols_map = server.symbols_map.get("file:///test.kcl").unwrap().clone();
-    assert!(!symbols_map.is_empty());
+    assert!(symbols_map != vec![]);
 
     // Get the semantic tokens map.
     let semantic_tokens_map = server.semantic_tokens_map.get("file:///test.kcl").unwrap().clone();
-    assert!(!semantic_tokens_map.is_empty());
+    assert!(semantic_tokens_map != vec![]);
 
     // Get the memory.
     let memory = server.memory_map.get("file:///test.kcl");

src/wasm-lib/kcl/src/parsing/ast/cache.rs

@@ -0,0 +1,373 @@
+//! Functions for helping with caching an ast and finding the parts the changed.
+
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    execution::ExecState,
+    parsing::ast::types::{Node, Program},
+};
+
+/// Information for the caching an AST and smartly re-executing it if we can.
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
+#[ts(export)]
+pub struct CacheInformation {
+    /// The old information.
+    pub old: Option<OldAstState>,
+    /// The new ast to executed.
+    pub new_ast: Node<Program>,
+}
+
+/// The old ast and program memory.
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
+#[ts(export)]
+pub struct OldAstState {
+    /// The ast.
+    pub ast: Node<Program>,
+    /// The exec state.
+    pub exec_state: ExecState,
+    /// The last settings used for execution.
+    pub settings: crate::execution::ExecutorSettings,
+}
+
+impl From<crate::Program> for CacheInformation {
+    fn from(program: crate::Program) -> Self {
+        CacheInformation {
+            old: None,
+            new_ast: program.ast,
+        }
+    }
+}
+
+/// The result of a cache check.
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
+#[ts(export)]
+pub struct CacheResult {
+    /// Should we clear the scene and start over?
+    pub clear_scene: bool,
+    /// The program that needs to be executed.
+    pub program: Node<Program>,
+}
+
+// Given an old ast, old program memory and new ast, find the parts of the code that need to be
+// re-executed.
+// This function should never error, because in the case of any internal error, we should just pop
+// the cache.
+pub fn get_changed_program(
+    info: CacheInformation,
+    new_settings: &crate::execution::ExecutorSettings,
+) -> Option<CacheResult> {
+    let Some(old) = info.old else {
+        // We have no old info, we need to re-execute the whole thing.
+        return Some(CacheResult {
+            clear_scene: true,
+            program: info.new_ast,
+        });
+    };
+
+    // If the settings are different we need to bust the cache.
+    // We specifically do this before checking if they are the exact same.
+    if old.settings != *new_settings {
+        return Some(CacheResult {
+            clear_scene: true,
+            program: info.new_ast,
+        });
+    }
+
+    // If the ASTs are the EXACT same we return None.
+    // We don't even need to waste time computing the digests.
+    if old.ast == info.new_ast {
+        return None;
+    }
+
+    let mut old_ast = old.ast.inner;
+    old_ast.compute_digest();
+    let mut new_ast = info.new_ast.inner.clone();
+    new_ast.compute_digest();
+
+    // Check if the digest is the same.
+    if old_ast.digest == new_ast.digest {
+        return None;
+    }
+
+    // Check if the changes were only to Non-code areas, like comments or whitespace.
+
+    // For any unhandled cases just re-execute the whole thing.
+    Some(CacheResult {
+        clear_scene: true,
+        program: info.new_ast,
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use std::sync::Arc;
+
+    use anyhow::Result;
+    use pretty_assertions::assert_eq;
+
+    use super::*;
+
+    async fn execute(program: &crate::Program) -> Result<ExecState> {
+        let ctx = crate::execution::ExecutorContext {
+            engine: Arc::new(Box::new(crate::engine::conn_mock::EngineConnection::new().await?)),
+            fs: Arc::new(crate::fs::FileManager::new()),
+            stdlib: Arc::new(crate::std::StdLib::new()),
+            settings: Default::default(),
+            context_type: crate::execution::ContextType::Mock,
+        };
+        let mut exec_state = crate::execution::ExecState::default();
+        ctx.run(program.clone().into(), &mut exec_state).await?;
+
+        Ok(exec_state)
+    }
+
+    // Easy case where we have no old ast and memory.
+    // We need to re-execute everything.
+    #[test]
+    fn test_get_changed_program_no_old_information() {
+        let new = r#"// Remove the end face for the extrusion.
+firstSketch = startSketchOn('XY')
+  |> startProfileAt([-12, 12], %)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %)
+  |> close(%)
+  |> extrude(6, %)
+
+// Remove the end face for the extrusion.
+shell({ faces = ['end'], thickness = 0.25 }, firstSketch)"#;
+        let program = crate::Program::parse_no_errs(new).unwrap().ast;
+
+        let result = get_changed_program(
+            CacheInformation {
+                old: None,
+                new_ast: program.clone(),
+            },
+            &Default::default(),
+        );
+
+        assert!(result.is_some());
+
+        let result = result.unwrap();
+
+        assert_eq!(result.program, program);
+        assert!(result.clear_scene);
+    }
+
+    #[tokio::test(flavor = "multi_thread")]
+    async fn test_get_changed_program_same_code() {
+        let new = r#"// Remove the end face for the extrusion.
+firstSketch = startSketchOn('XY')
+  |> startProfileAt([-12, 12], %)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %)
+  |> close(%)
+  |> extrude(6, %)
+
+// Remove the end face for the extrusion.
+shell({ faces = ['end'], thickness = 0.25 }, firstSketch)"#;
+        let program = crate::Program::parse_no_errs(new).unwrap();
+
+        let executed = execute(&program).await.unwrap();
+
+        let result = get_changed_program(
+            CacheInformation {
+                old: Some(OldAstState {
+                    ast: program.ast.clone(),
+                    exec_state: executed,
+                    settings: Default::default(),
+                }),
+                new_ast: program.ast.clone(),
+            },
+            &Default::default(),
+        );
+
+        assert_eq!(result, None);
+    }
+
+    #[tokio::test(flavor = "multi_thread")]
+    async fn test_get_changed_program_same_code_changed_whitespace() {
+        let old = r#" // Remove the end face for the extrusion.
+firstSketch = startSketchOn('XY')
+  |> startProfileAt([-12, 12], %)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %)
+  |> close(%)
+  |> extrude(6, %)
+
+// Remove the end face for the extrusion.
+shell({ faces = ['end'], thickness = 0.25 }, firstSketch) "#;
+
+        let new = r#"// Remove the end face for the extrusion.
+firstSketch = startSketchOn('XY')
+  |> startProfileAt([-12, 12], %)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %)
+  |> close(%)
+  |> extrude(6, %)
+
+// Remove the end face for the extrusion.
+shell({ faces = ['end'], thickness = 0.25 }, firstSketch)"#;
+        let program_old = crate::Program::parse_no_errs(old).unwrap();
+
+        let executed = execute(&program_old).await.unwrap();
+
+        let program_new = crate::Program::parse_no_errs(new).unwrap();
+
+        let result = get_changed_program(
+            CacheInformation {
+                old: Some(OldAstState {
+                    ast: program_old.ast.clone(),
+                    exec_state: executed,
+                    settings: Default::default(),
+                }),
+                new_ast: program_new.ast.clone(),
+            },
+            &Default::default(),
+        );
+
+        assert_eq!(result, None);
+    }
+
+    #[tokio::test(flavor = "multi_thread")]
+    async fn test_get_changed_program_same_code_changed_code_comment_start_of_program() {
+        let old = r#" // Removed the end face for the extrusion.
+firstSketch = startSketchOn('XY')
+  |> startProfileAt([-12, 12], %)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %)
+  |> close(%)
+  |> extrude(6, %)
+
+// Remove the end face for the extrusion.
+shell({ faces = ['end'], thickness = 0.25 }, firstSketch) "#;
+
+        let new = r#"// Remove the end face for the extrusion.
+firstSketch = startSketchOn('XY')
+  |> startProfileAt([-12, 12], %)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %)
+  |> close(%)
+  |> extrude(6, %)
+
+// Remove the end face for the extrusion.
+shell({ faces = ['end'], thickness = 0.25 }, firstSketch)"#;
+        let program_old = crate::Program::parse_no_errs(old).unwrap();
+
+        let executed = execute(&program_old).await.unwrap();
+
+        let program_new = crate::Program::parse_no_errs(new).unwrap();
+
+        let result = get_changed_program(
+            CacheInformation {
+                old: Some(OldAstState {
+                    ast: program_old.ast.clone(),
+                    exec_state: executed,
+                    settings: Default::default(),
+                }),
+                new_ast: program_new.ast.clone(),
+            },
+            &Default::default(),
+        );
+
+        assert_eq!(result, None);
+    }
+
+    #[tokio::test(flavor = "multi_thread")]
+    async fn test_get_changed_program_same_code_changed_code_comments() {
+        let old = r#" // Removed the end face for the extrusion.
+firstSketch = startSketchOn('XY')
+  |> startProfileAt([-12, 12], %)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %) // my thing
+  |> close(%)
+  |> extrude(6, %)
+
+// Remove the end face for the extrusion.
+shell({ faces = ['end'], thickness = 0.25 }, firstSketch) "#;
+
+        let new = r#"// Remove the end face for the extrusion.
+firstSketch = startSketchOn('XY')
+  |> startProfileAt([-12, 12], %)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %)
+  |> close(%)
+  |> extrude(6, %)
+
+// Remove the end face for the extrusion.
+shell({ faces = ['end'], thickness = 0.25 }, firstSketch)"#;
+        let program_old = crate::Program::parse_no_errs(old).unwrap();
+
+        let executed = execute(&program_old).await.unwrap();
+
+        let program_new = crate::Program::parse_no_errs(new).unwrap();
+
+        let result = get_changed_program(
+            CacheInformation {
+                old: Some(OldAstState {
+                    ast: program_old.ast.clone(),
+                    exec_state: executed,
+                    settings: Default::default(),
+                }),
+                new_ast: program_new.ast.clone(),
+            },
+            &Default::default(),
+        );
+
+        assert!(result.is_some());
+
+        let result = result.unwrap();
+
+        assert_eq!(result.program, program_new.ast);
+        assert!(result.clear_scene);
+    }
+
+    // Changing the units with the exact same file should bust the cache.
+    #[tokio::test(flavor = "multi_thread")]
+    async fn test_get_changed_program_same_code_but_different_units() {
+        let new = r#"// Remove the end face for the extrusion.
+firstSketch = startSketchOn('XY')
+  |> startProfileAt([-12, 12], %)
+  |> line([24, 0], %)
+  |> line([0, -24], %)
+  |> line([-24, 0], %)
+  |> close(%)
+  |> extrude(6, %)
+
+// Remove the end face for the extrusion.
+shell({ faces = ['end'], thickness = 0.25 }, firstSketch)"#;
+        let program = crate::Program::parse_no_errs(new).unwrap();
+
+        let executed = execute(&program).await.unwrap();
+
+        let result = get_changed_program(
+            CacheInformation {
+                old: Some(OldAstState {
+                    ast: program.ast.clone(),
+                    exec_state: executed,
+                    settings: Default::default(),
+                }),
+                new_ast: program.ast.clone(),
+            },
+            &crate::ExecutorSettings {
+                units: crate::UnitLength::Cm,
+                ..Default::default()
+            },
+        );
+
+        assert!(result.is_some());
+
+        let result = result.unwrap();
+
+        assert_eq!(result.program, program.ast);
+        assert!(result.clear_scene);
+    }
+}

src/wasm-lib/kcl/src/parsing/ast/digest.rs

@@ -1,6 +1,6 @@
 use sha2::{Digest as DigestTrait, Sha256};
 
-use super::types::{DefaultParamVal, ItemVisibility, LabelledExpression, VariableKind};
+use super::types::{DefaultParamVal, ItemVisibility, VariableKind};
 use crate::parsing::ast::types::{
     ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryPart, BodyItem, CallExpression, CallExpressionKw,
     CommentStyle, ElseIf, Expr, ExpressionStatement, FnArgType, FunctionExpression, Identifier, IfExpression,
@@ -115,7 +115,6 @@ impl Expr {
             Expr::MemberExpression(me) => me.compute_digest(),
             Expr::UnaryExpression(ue) => ue.compute_digest(),
             Expr::IfExpression(e) => e.compute_digest(),
-            Expr::LabelledExpression(e) => e.compute_digest(),
             Expr::None(_) => {
                 let mut hasher = Sha256::new();
                 hasher.update(b"Value::None");
@@ -397,13 +396,6 @@ impl UnaryExpression {
     });
 }
 
-impl LabelledExpression {
-    compute_digest!(|slf, hasher| {
-        hasher.update(slf.expr.compute_digest());
-        hasher.update(slf.label.compute_digest());
-    });
-}
-
 impl PipeExpression {
     compute_digest!(|slf, hasher| {
         hasher.update(slf.body.len().to_ne_bytes());

src/wasm-lib/kcl/src/parsing/ast/mod.rs

@@ -1,3 +1,4 @@
+pub(crate) mod cache;
 pub(crate) mod digest;
 pub mod modify;
 pub mod types;
@@ -36,7 +37,6 @@ impl Expr {
             Expr::MemberExpression(member_expression) => member_expression.module_id,
             Expr::UnaryExpression(unary_expression) => unary_expression.module_id,
             Expr::IfExpression(expr) => expr.module_id,
-            Expr::LabelledExpression(expr) => expr.expr.module_id(),
             Expr::None(none) => none.module_id,
         }
     }

src/wasm-lib/kcl/src/parsing/ast/types/mod.rs

@@ -184,7 +184,7 @@ impl Node<Program> {
     /// Walk the ast and get all the variables and tags as completion items.
     pub fn completion_items<'a>(&'a self) -> Result<Vec<CompletionItem>> {
         let completions = Arc::new(Mutex::new(vec![]));
-        crate::walk::walk(self, |node: crate::walk::Node<'a>| {
+        crate::walk::walk(self, &|node: crate::walk::Node<'a>| {
             let mut findings = completions.lock().map_err(|_| anyhow::anyhow!("mutex"))?;
             match node {
                 crate::walk::Node::TagDeclarator(tag) => {
@@ -195,7 +195,7 @@ impl Node<Program> {
                 }
                 _ => {}
             }
-            Ok::<bool, anyhow::Error>(true)
+            Ok(true)
         })?;
         let x = completions.lock().unwrap();
         Ok(x.clone())
@@ -204,7 +204,7 @@ impl Node<Program> {
     /// Returns all the lsp symbols in the program.
     pub fn get_lsp_symbols<'a>(&'a self, code: &str) -> Result<Vec<DocumentSymbol>> {
         let symbols = Arc::new(Mutex::new(vec![]));
-        crate::walk::walk(self, |node: crate::walk::Node<'a>| {
+        crate::walk::walk(self, &|node: crate::walk::Node<'a>| {
             let mut findings = symbols.lock().map_err(|_| anyhow::anyhow!("mutex"))?;
             match node {
                 crate::walk::Node::TagDeclarator(tag) => {
@@ -215,7 +215,7 @@ impl Node<Program> {
                 }
                 _ => {}
             }
-            Ok::<bool, anyhow::Error>(true)
+            Ok(true)
         })?;
         let x = symbols.lock().unwrap();
         Ok(x.clone())
@@ -227,10 +227,10 @@ impl Node<Program> {
         RuleT: crate::lint::Rule<'a>,
     {
         let v = Arc::new(Mutex::new(vec![]));
-        crate::walk::walk(self, |node: crate::walk::Node<'a>| {
+        crate::walk::walk(self, &|node: crate::walk::Node<'a>| {
             let mut findings = v.lock().map_err(|_| anyhow::anyhow!("mutex"))?;
             findings.append(&mut rule.check(node)?);
-            Ok::<bool, anyhow::Error>(true)
+            Ok(true)
         })?;
         let x = v.lock().unwrap();
         Ok(x.clone())
@@ -598,7 +598,6 @@ pub enum Expr {
     MemberExpression(BoxNode<MemberExpression>),
     UnaryExpression(BoxNode<UnaryExpression>),
     IfExpression(BoxNode<IfExpression>),
-    LabelledExpression(BoxNode<LabelledExpression>),
     None(Node<KclNone>),
 }
 
@@ -641,7 +640,6 @@ impl Expr {
             Expr::UnaryExpression(_unary_exp) => None,
             Expr::PipeSubstitution(_pipe_substitution) => None,
             Expr::IfExpression(_) => None,
-            Expr::LabelledExpression(expr) => expr.expr.get_non_code_meta(),
             Expr::None(_none) => None,
         }
     }
@@ -668,7 +666,6 @@ impl Expr {
             Expr::UnaryExpression(ref mut unary_exp) => unary_exp.replace_value(source_range, new_value),
             Expr::IfExpression(_) => {}
             Expr::PipeSubstitution(_) => {}
-            Expr::LabelledExpression(expr) => expr.expr.replace_value(source_range, new_value),
             Expr::None(_) => {}
         }
     }
@@ -690,7 +687,6 @@ impl Expr {
             Expr::MemberExpression(member_expression) => member_expression.start,
             Expr::UnaryExpression(unary_expression) => unary_expression.start,
             Expr::IfExpression(expr) => expr.start,
-            Expr::LabelledExpression(expr) => expr.start,
             Expr::None(none) => none.start,
         }
     }
@@ -712,7 +708,6 @@ impl Expr {
             Expr::MemberExpression(member_expression) => member_expression.end,
             Expr::UnaryExpression(unary_expression) => unary_expression.end,
             Expr::IfExpression(expr) => expr.end,
-            Expr::LabelledExpression(expr) => expr.end,
             Expr::None(none) => none.end,
         }
     }
@@ -739,8 +734,6 @@ impl Expr {
             Expr::Literal(_) => None,
             Expr::Identifier(_) => None,
             Expr::TagDeclarator(_) => None,
-            // TODO LSP hover info for tag
-            Expr::LabelledExpression(expr) => expr.expr.get_hover_value_for_position(pos, code),
             // TODO: LSP hover information for symbols. https://github.com/KittyCAD/modeling-app/issues/1127
             Expr::PipeSubstitution(_) => None,
         }
@@ -770,7 +763,6 @@ impl Expr {
             }
             Expr::UnaryExpression(ref mut unary_expression) => unary_expression.rename_identifiers(old_name, new_name),
             Expr::IfExpression(ref mut expr) => expr.rename_identifiers(old_name, new_name),
-            Expr::LabelledExpression(expr) => expr.expr.rename_identifiers(old_name, new_name),
             Expr::None(_) => {}
         }
     }
@@ -796,19 +788,9 @@ impl Expr {
             Expr::MemberExpression(member_expression) => member_expression.get_constraint_level(),
             Expr::UnaryExpression(unary_expression) => unary_expression.get_constraint_level(),
             Expr::IfExpression(expr) => expr.get_constraint_level(),
-            Expr::LabelledExpression(expr) => expr.expr.get_constraint_level(),
             Expr::None(none) => none.get_constraint_level(),
         }
     }
-
-    pub fn has_substitution_arg(&self) -> bool {
-        match self {
-            Expr::CallExpression(call_expression) => call_expression.has_substitution_arg(),
-            Expr::CallExpressionKw(call_expression) => call_expression.has_substitution_arg(),
-            Expr::LabelledExpression(expr) => expr.expr.has_substitution_arg(),
-            _ => false,
-        }
-    }
 }
 
 impl From<Expr> for SourceRange {
@@ -823,36 +805,6 @@ impl From<&Expr> for SourceRange {
     }
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
-#[ts(export)]
-#[serde(tag = "type")]
-pub struct LabelledExpression {
-    pub expr: Expr,
-    pub label: Node<Identifier>,
-
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    #[ts(optional)]
-    pub digest: Option<Digest>,
-}
-
-impl LabelledExpression {
-    pub(crate) fn new(expr: Expr, label: Node<Identifier>) -> Node<LabelledExpression> {
-        let start = expr.start();
-        let end = label.end;
-        let module_id = expr.module_id();
-        Node::new(
-            LabelledExpression {
-                expr,
-                label,
-                digest: None,
-            },
-            start,
-            end,
-            module_id,
-        )
-    }
-}
-
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
@@ -2858,8 +2810,7 @@ pub struct Parameter {
     pub identifier: Node<Identifier>,
     /// The type of the parameter.
     /// This is optional if the user defines a type.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
+    #[serde(skip)]
-    #[ts(skip)]
     pub type_: Option<FnArgType>,
     /// Is the parameter optional?
     /// If so, what is its default value?

src/wasm-lib/kcl/src/parsing/mod.rs

@@ -2,7 +2,7 @@ use crate::{
     errors::{CompilationError, KclError, KclErrorDetails},
     parsing::{
         ast::types::{Node, Program},
-        token::TokenStream,
+        token::{Token, TokenType},
     },
     source_range::{ModuleId, SourceRange},
 };
@@ -34,13 +34,15 @@ pub fn top_level_parse(code: &str) -> ParseResult {
 
 /// Parse the given KCL code into an AST.
 pub fn parse_str(code: &str, module_id: ModuleId) -> ParseResult {
-    let tokens = pr_try!(crate::parsing::token::lex(code, module_id));
+    let tokens = pr_try!(crate::parsing::token::lexer(code, module_id));
     parse_tokens(tokens)
 }
 
 /// Parse the supplied tokens into an AST.
-pub fn parse_tokens(mut tokens: TokenStream) -> ParseResult {
+pub fn parse_tokens(tokens: Vec<Token>) -> ParseResult {
-    let unknown_tokens = tokens.remove_unknown();
+    let (tokens, unknown_tokens): (Vec<Token>, Vec<Token>) = tokens
+        .into_iter()
+        .partition(|token| token.token_type != TokenType::Unknown);
 
     if !unknown_tokens.is_empty() {
         let source_ranges = unknown_tokens.iter().map(SourceRange::from).collect();
@@ -67,7 +69,7 @@ pub fn parse_tokens(mut tokens: TokenStream) -> ParseResult {
         return Node::<Program>::default().into();
     }
 
-    parser::run_parser(tokens.as_slice())
+    parser::run_parser(&mut tokens.as_slice())
 }
 
 /// Result of parsing.

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__kw_function_decl_with_default_and_type.snap

@@ -1,76 +0,0 @@
----
-source: kcl/src/parsing/parser.rs
-expression: actual
-snapshot_kind: text
----
-{
-  "body": [
-    {
-      "declaration": {
-        "end": 35,
-        "id": {
-          "end": 6,
-          "name": "foo",
-          "start": 3,
-          "type": "Identifier"
-        },
-        "init": {
-          "body": {
-            "body": [
-              {
-                "argument": {
-                  "end": 33,
-                  "raw": "1",
-                  "start": 32,
-                  "type": "Literal",
-                  "type": "Literal",
-                  "value": 1.0
-                },
-                "end": 33,
-                "start": 25,
-                "type": "ReturnStatement",
-                "type": "ReturnStatement"
-              }
-            ],
-            "end": 35,
-            "start": 23
-          },
-          "end": 35,
-          "params": [
-            {
-              "type": "Parameter",
-              "identifier": {
-                "end": 8,
-                "name": "x",
-                "start": 7,
-                "type": "Identifier"
-              },
-              "type_": {
-                "type": "Primitive",
-                "type": "Number"
-              },
-              "default_value": {
-                "type": "Literal",
-                "type": "Literal",
-                "value": 2.0,
-                "raw": "2"
-              }
-            }
-          ],
-          "start": 6,
-          "type": "FunctionExpression",
-          "type": "FunctionExpression"
-        },
-        "start": 3,
-        "type": "VariableDeclarator"
-      },
-      "end": 35,
-      "kind": "fn",
-      "start": 0,
-      "type": "VariableDeclaration",
-      "type": "VariableDeclaration"
-    }
-  ],
-  "end": 35,
-  "start": 0
-}

src/wasm-lib/kcl/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__kw_function_decl_with_default_no_type.snap

@@ -1,72 +0,0 @@
----
-source: kcl/src/parsing/parser.rs
-expression: actual
-snapshot_kind: text
----
-{
-  "body": [
-    {
-      "declaration": {
-        "end": 27,
-        "id": {
-          "end": 6,
-          "name": "foo",
-          "start": 3,
-          "type": "Identifier"
-        },
-        "init": {
-          "body": {
-            "body": [
-              {
-                "argument": {
-                  "end": 25,
-                  "raw": "1",
-                  "start": 24,
-                  "type": "Literal",
-                  "type": "Literal",
-                  "value": 1.0
-                },
-                "end": 25,
-                "start": 17,
-                "type": "ReturnStatement",
-                "type": "ReturnStatement"
-              }
-            ],
-            "end": 27,
-            "start": 15
-          },
-          "end": 27,
-          "params": [
-            {
-              "type": "Parameter",
-              "identifier": {
-                "end": 8,
-                "name": "x",
-                "start": 7,
-                "type": "Identifier"
-              },
-              "default_value": {
-                "type": "Literal",
-                "type": "Literal",
-                "value": 2.0,
-                "raw": "2"
-              }
-            }
-          ],
-          "start": 6,
-          "type": "FunctionExpression",
-          "type": "FunctionExpression"
-        },
-        "start": 3,
-        "type": "VariableDeclarator"
-      },
-      "end": 27,
-      "kind": "fn",
-      "start": 0,
-      "type": "VariableDeclaration",
-      "type": "VariableDeclaration"
-    }
-  ],
-  "end": 27,
-  "start": 0
-}

src/wasm-lib/kcl/src/parsing/token/mod.rs

@@ -1,17 +1,11 @@
-// Clippy does not agree with rustc here for some reason.
+use std::str::FromStr;
-#![allow(clippy::needless_lifetimes)]
-
-use std::{fmt, iter::Enumerate, num::NonZeroUsize};
 
 use anyhow::Result;
-use parse_display::Display;
+use parse_display::{Display, FromStr};
-use tokeniser::Input;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
 use tower_lsp::lsp_types::SemanticTokenType;
-use winnow::{
+use winnow::{error::ParseError, stream::ContainsToken};
-    self,
-    error::ParseError,
-    stream::{ContainsToken, Stream},
-};
 
 use crate::{
     errors::KclError,
@@ -21,201 +15,14 @@ use crate::{
 
 mod tokeniser;
 
+// Re-export
+pub use tokeniser::Input;
 #[cfg(test)]
 pub(crate) use tokeniser::RESERVED_WORDS;
 
-#[derive(Clone, Debug, PartialEq)]
-pub(crate) struct TokenStream {
-    tokens: Vec<Token>,
-}
-
-impl TokenStream {
-    fn new(tokens: Vec<Token>) -> Self {
-        Self { tokens }
-    }
-
-    pub(super) fn remove_unknown(&mut self) -> Vec<Token> {
-        let tokens = std::mem::take(&mut self.tokens);
-        let (tokens, unknown_tokens): (Vec<Token>, Vec<Token>) = tokens
-            .into_iter()
-            .partition(|token| token.token_type != TokenType::Unknown);
-        self.tokens = tokens;
-        unknown_tokens
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = &Token> {
-        self.tokens.iter()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.tokens.is_empty()
-    }
-
-    pub fn as_slice(&self) -> TokenSlice {
-        TokenSlice::from(self)
-    }
-}
-
-impl<'a> From<&'a TokenStream> for TokenSlice<'a> {
-    fn from(stream: &'a TokenStream) -> Self {
-        TokenSlice {
-            start: 0,
-            end: stream.tokens.len(),
-            stream,
-        }
-    }
-}
-
-impl IntoIterator for TokenStream {
-    type Item = Token;
-
-    type IntoIter = std::vec::IntoIter<Token>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.tokens.into_iter()
-    }
-}
-
-#[derive(Debug, Clone)]
-pub(crate) struct TokenSlice<'a> {
-    stream: &'a TokenStream,
-    start: usize,
-    end: usize,
-}
-
-impl<'a> std::ops::Deref for TokenSlice<'a> {
-    type Target = [Token];
-
-    fn deref(&self) -> &Self::Target {
-        &self.stream.tokens[self.start..self.end]
-    }
-}
-
-impl<'a> TokenSlice<'a> {
-    pub fn token(&self, i: usize) -> &Token {
-        &self.stream.tokens[i + self.start]
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = &Token> {
-        (**self).iter()
-    }
-
-    pub fn without_ends(&self) -> Self {
-        Self {
-            start: self.start + 1,
-            end: self.end - 1,
-            stream: self.stream,
-        }
-    }
-}
-
-impl<'a> IntoIterator for TokenSlice<'a> {
-    type Item = &'a Token;
-
-    type IntoIter = std::slice::Iter<'a, Token>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.stream.tokens[self.start..self.end].iter()
-    }
-}
-
-impl<'a> Stream for TokenSlice<'a> {
-    type Token = Token;
-    type Slice = Self;
-    type IterOffsets = Enumerate<std::vec::IntoIter<Token>>;
-    type Checkpoint = Checkpoint;
-
-    fn iter_offsets(&self) -> Self::IterOffsets {
-        #[allow(clippy::unnecessary_to_owned)]
-        self.to_vec().into_iter().enumerate()
-    }
-
-    fn eof_offset(&self) -> usize {
-        self.len()
-    }
-
-    fn next_token(&mut self) -> Option<Self::Token> {
-        let token = self.first()?.clone();
-        self.start += 1;
-        Some(token)
-    }
-
-    fn offset_for<P>(&self, predicate: P) -> Option<usize>
-    where
-        P: Fn(Self::Token) -> bool,
-    {
-        self.iter().position(|b| predicate(b.clone()))
-    }
-
-    fn offset_at(&self, tokens: usize) -> Result<usize, winnow::error::Needed> {
-        if let Some(needed) = tokens.checked_sub(self.len()).and_then(NonZeroUsize::new) {
-            Err(winnow::error::Needed::Size(needed))
-        } else {
-            Ok(tokens)
-        }
-    }
-
-    fn next_slice(&mut self, offset: usize) -> Self::Slice {
-        assert!(self.start + offset <= self.end);
-
-        let next = TokenSlice {
-            stream: self.stream,
-            start: self.start,
-            end: self.start + offset,
-        };
-        self.start += offset;
-        next
-    }
-
-    fn checkpoint(&self) -> Self::Checkpoint {
-        Checkpoint(self.start, self.end)
-    }
-
-    fn reset(&mut self, checkpoint: &Self::Checkpoint) {
-        self.start = checkpoint.0;
-        self.end = checkpoint.1;
-    }
-
-    fn raw(&self) -> &dyn fmt::Debug {
-        self
-    }
-}
-
-impl<'a> winnow::stream::Offset for TokenSlice<'a> {
-    fn offset_from(&self, start: &Self) -> usize {
-        self.start - start.start
-    }
-}
-
-impl<'a> winnow::stream::Offset<Checkpoint> for TokenSlice<'a> {
-    fn offset_from(&self, start: &Checkpoint) -> usize {
-        self.start - start.0
-    }
-}
-
-impl winnow::stream::Offset for Checkpoint {
-    fn offset_from(&self, start: &Self) -> usize {
-        self.0 - start.0
-    }
-}
-
-impl<'a> winnow::stream::StreamIsPartial for TokenSlice<'a> {
-    type PartialState = ();
-
-    fn complete(&mut self) -> Self::PartialState {}
-
-    fn restore_partial(&mut self, _: Self::PartialState) {}
-
-    fn is_partial_supported() -> bool {
-        false
-    }
-}
-
-#[derive(Clone, Debug)]
-pub struct Checkpoint(usize, usize);
-
 /// The types of tokens.
-#[derive(Debug, PartialEq, Eq, Copy, Clone, Display)]
+#[derive(Debug, PartialEq, Eq, Copy, Clone, Deserialize, Serialize, JsonSchema, FromStr, Display)]
+#[serde(rename_all = "camelCase")]
 #[display(style = "camelCase")]
 pub enum TokenType {
     /// A number.
@@ -266,8 +73,6 @@ pub enum TokenType {
 impl TryFrom<TokenType> for SemanticTokenType {
     type Error = anyhow::Error;
     fn try_from(token_type: TokenType) -> Result<Self> {
-        // If you return a new kind of `SemanticTokenType`, make sure to update `SEMANTIC_TOKEN_TYPES`
-        // in the LSP implementation.
         Ok(match token_type {
             TokenType::Number => Self::NUMBER,
             TokenType::Word => Self::VARIABLE,
@@ -297,6 +102,52 @@ impl TryFrom<TokenType> for SemanticTokenType {
 }
 
 impl TokenType {
+    // This is for the lsp server.
+    // Don't call this function directly in the code use a lazy_static instead
+    // like we do in the lsp server.
+    pub fn all_semantic_token_types() -> Result<Vec<SemanticTokenType>> {
+        let mut settings = schemars::gen::SchemaSettings::openapi3();
+        settings.inline_subschemas = true;
+        let mut generator = schemars::gen::SchemaGenerator::new(settings);
+
+        let schema = TokenType::json_schema(&mut generator);
+        let schemars::schema::Schema::Object(o) = &schema else {
+            anyhow::bail!("expected object schema: {:#?}", schema);
+        };
+        let Some(subschemas) = &o.subschemas else {
+            anyhow::bail!("expected subschemas: {:#?}", schema);
+        };
+        let Some(one_ofs) = &subschemas.one_of else {
+            anyhow::bail!("expected one_of: {:#?}", schema);
+        };
+
+        let mut semantic_tokens = vec![];
+        for one_of in one_ofs {
+            let schemars::schema::Schema::Object(o) = one_of else {
+                anyhow::bail!("expected object one_of: {:#?}", one_of);
+            };
+
+            let Some(enum_values) = o.enum_values.as_ref() else {
+                anyhow::bail!("expected enum values: {:#?}", o);
+            };
+
+            if enum_values.len() > 1 {
+                anyhow::bail!("expected only one enum value: {:#?}", o);
+            }
+
+            if enum_values.is_empty() {
+                anyhow::bail!("expected at least one enum value: {:#?}", o);
+            }
+
+            let label = TokenType::from_str(&enum_values[0].to_string().replace('"', ""))?;
+            if let Ok(semantic_token_type) = SemanticTokenType::try_from(label) {
+                semantic_tokens.push(semantic_token_type);
+            }
+        }
+
+        Ok(semantic_tokens)
+    }
+
     pub fn is_whitespace(&self) -> bool {
         matches!(self, Self::Whitespace)
     }
@@ -306,15 +157,17 @@ impl TokenType {
     }
 }
 
-#[derive(Debug, PartialEq, Eq, Clone)]
+#[derive(Debug, PartialEq, Eq, Deserialize, Serialize, Clone)]
 pub struct Token {
+    #[serde(rename = "type")]
     pub token_type: TokenType,
     /// Offset in the source code where this token begins.
     pub start: usize,
     /// Offset in the source code where this token ends.
     pub end: usize,
-    pub(super) module_id: ModuleId,
+    #[serde(default, skip_serializing_if = "ModuleId::is_top_level")]
-    pub(super) value: String,
+    pub module_id: ModuleId,
+    pub value: String,
 }
 
 impl ContainsToken<Token> for (TokenType, &str) {
@@ -396,7 +249,7 @@ impl From<&Token> for SourceRange {
     }
 }
 
-pub fn lex(s: &str, module_id: ModuleId) -> Result<TokenStream, KclError> {
+pub fn lexer(s: &str, module_id: ModuleId) -> Result<Vec<Token>, KclError> {
     tokeniser::lex(s, module_id).map_err(From::from)
 }
 
@@ -428,3 +281,15 @@ impl From<ParseError<Input<'_>, winnow::error::ContextError>> for KclError {
         })
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    // We have this as a test so we can ensure it never panics with an unwrap in the server.
+    #[test]
+    fn test_token_type_to_semantic_token_type() {
+        let semantic_types = TokenType::all_semantic_token_types().unwrap();
+        assert!(!semantic_types.is_empty());
+    }
+}

src/wasm-lib/kcl/src/simulation_tests.rs

@@ -47,7 +47,7 @@ fn read(filename: &'static str, test_name: &str) -> String {
 
 fn parse(test_name: &str) {
     let input = read("input.kcl", test_name);
-    let tokens = crate::parsing::token::lex(&input, ModuleId::default()).unwrap();
+    let tokens = crate::parsing::token::lexer(&input, ModuleId::default()).unwrap();
 
     // Parse the tokens into an AST.
     let parse_res = Result::<_, KclError>::Ok(crate::parsing::parse_tokens(tokens).unwrap());
@@ -1502,108 +1502,3 @@ mod kw_fn {
         super::execute(TEST_NAME, true).await
     }
 }
-mod tag_can_be_proxied_through_parameter {
-    const TEST_NAME: &str = "tag_can_be_proxied_through_parameter";
-
-    /// Test parsing KCL.
-    #[test]
-    fn parse() {
-        super::parse(TEST_NAME)
-    }
-
-    /// Test that parsing and unparsing KCL produces the original KCL input.
-    #[test]
-    fn unparse() {
-        super::unparse(TEST_NAME)
-    }
-
-    /// Test that KCL is executed correctly.
-    #[tokio::test(flavor = "multi_thread")]
-    async fn kcl_test_execute() {
-        super::execute(TEST_NAME, false).await
-    }
-}
-mod tag_proxied_through_function_does_not_define_var {
-    const TEST_NAME: &str = "tag_proxied_through_function_does_not_define_var";
-
-    /// Test parsing KCL.
-    #[test]
-    fn parse() {
-        super::parse(TEST_NAME)
-    }
-
-    /// Test that parsing and unparsing KCL produces the original KCL input.
-    #[test]
-    fn unparse() {
-        super::unparse(TEST_NAME)
-    }
-
-    /// Test that KCL is executed correctly.
-    #[tokio::test(flavor = "multi_thread")]
-    async fn kcl_test_execute() {
-        super::execute(TEST_NAME, false).await
-    }
-}
-mod kw_fn_too_few_args {
-    const TEST_NAME: &str = "kw_fn_too_few_args";
-
-    /// Test parsing KCL.
-    #[test]
-    fn parse() {
-        super::parse(TEST_NAME)
-    }
-
-    /// Test that parsing and unparsing KCL produces the original KCL input.
-    #[test]
-    fn unparse() {
-        super::unparse(TEST_NAME)
-    }
-
-    /// Test that KCL is executed correctly.
-    #[tokio::test(flavor = "multi_thread")]
-    async fn kcl_test_execute() {
-        super::execute(TEST_NAME, false).await
-    }
-}
-mod kw_fn_unlabeled_but_has_label {
-    const TEST_NAME: &str = "kw_fn_unlabeled_but_has_label";
-
-    /// Test parsing KCL.
-    #[test]
-    fn parse() {
-        super::parse(TEST_NAME)
-    }
-
-    /// Test that parsing and unparsing KCL produces the original KCL input.
-    #[test]
-    fn unparse() {
-        super::unparse(TEST_NAME)
-    }
-
-    /// Test that KCL is executed correctly.
-    #[tokio::test(flavor = "multi_thread")]
-    async fn kcl_test_execute() {
-        super::execute(TEST_NAME, false).await
-    }
-}
-mod kw_fn_with_defaults {
-    const TEST_NAME: &str = "kw_fn_with_defaults";
-
-    /// Test parsing KCL.
-    #[test]
-    fn parse() {
-        super::parse(TEST_NAME)
-    }
-
-    /// Test that parsing and unparsing KCL produces the original KCL input.
-    #[test]
-    fn unparse() {
-        super::unparse(TEST_NAME)
-    }
-
-    /// Test that KCL is executed correctly.
-    #[tokio::test(flavor = "multi_thread")]
-    async fn kcl_test_execute() {
-        super::execute(TEST_NAME, false).await
-    }
-}

src/wasm-lib/kcl/src/std/appearance.rs

@@ -1,263 +0,0 @@
-//! Standard library appearance.
-
-use anyhow::Result;
-use derive_docs::stdlib;
-use kcmc::{each_cmd as mcmd, ModelingCmd};
-use kittycad_modeling_cmds::{self as kcmc, shared::Color};
-use regex::Regex;
-use rgba_simple::Hex;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use validator::Validate;
-
-use crate::{
-    errors::{KclError, KclErrorDetails},
-    execution::{ExecState, KclValue, Solid, SolidSet},
-    std::Args,
-};
-
-lazy_static::lazy_static! {
-    static ref HEX_REGEX: Regex = Regex::new(r"^#[0-9a-fA-F]{6}$").unwrap();
-}
-
-/// Data for appearance.
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Validate)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-pub struct AppearanceData {
-    /// Color of the new material, a hex string like "#ff0000".
-    #[schemars(regex(pattern = "#[0-9a-fA-F]{6}"))]
-    pub color: String,
-    /// Metalness of the new material, a percentage like 95.7.
-    #[validate(range(min = 0.0, max = 100.0))]
-    pub metalness: Option<f64>,
-    /// Roughness of the new material, a percentage like 95.7.
-    #[validate(range(min = 0.0, max = 100.0))]
-    pub roughness: Option<f64>,
-    // TODO(jess): we can also ambient occlusion here I just don't know what it is.
-}
-
-/// Set the appearance of a solid. This only works on solids, not sketches or individual paths.
-pub async fn appearance(_exec_state: &mut ExecState, args: Args) -> Result<KclValue, KclError> {
-    let (data, solid_set): (AppearanceData, SolidSet) = args.get_data_and_solid_set()?;
-
-    // Validate the data.
-    data.validate().map_err(|err| {
-        KclError::Semantic(KclErrorDetails {
-            message: format!("Invalid appearance data: {}", err),
-            source_ranges: vec![args.source_range],
-        })
-    })?;
-
-    // Make sure the color if set is valid.
-    if !HEX_REGEX.is_match(&data.color) {
-        return Err(KclError::Semantic(KclErrorDetails {
-            message: format!("Invalid hex color (`{}`), try something like `#fff000`", data.color),
-            source_ranges: vec![args.source_range],
-        }));
-    }
-
-    let result = inner_appearance(data, solid_set, args).await?;
-    Ok(result.into())
-}
-
-/// Set the appearance of a solid. This only works on solids, not sketches or individual paths.
-///
-/// This will work on any solid, including extruded solids, revolved solids, and shelled solids.
-/// ```no_run
-/// /// Add color to an extruded solid.
-/// exampleSketch = startSketchOn("XZ")
-///   |> startProfileAt([0, 0], %)
-///   |> lineTo([10, 0], %)
-///   |> lineTo([0, 10], %)
-///   |> lineTo([-10, 0], %)
-///   |> close(%)
-///
-/// example = extrude(5, exampleSketch)
-///  |> appearance({color= '#ff0000', metalness= 50, roughness= 50}, %)
-/// ```
-///
-/// ```no_run
-/// /// Add color to a revolved solid.
-/// sketch001 = startSketchOn('XY')
-///     |> circle({ center = [15, 0], radius = 5 }, %)
-///     |> revolve({ angle = 360, axis = 'y' }, %)
-///     |> appearance({
-///         color = '#ff0000',
-///         metalness = 90,
-///         roughness = 90
-///     }, %)
-/// ```
-///
-/// ```no_run
-/// /// Add color to different solids.
-/// fn cube(center) {
-///    return startSketchOn('XY')
-///    |> startProfileAt([center[0] - 10, center[1] - 10], %)
-///    |> lineTo([center[0] + 10, center[1] - 10], %)
-///     |> lineTo([center[0] + 10, center[1] + 10], %)
-///     |> lineTo([center[0] - 10, center[1] + 10], %)
-///     |> close(%)
-///    |> extrude(10, %)
-/// }
-///
-/// example0 = cube([0, 0])
-/// example1 = cube([20, 0])
-/// example2 = cube([40, 0])
-///
-///  appearance({color= '#ff0000', metalness= 50, roughness= 50}, [example0, example1])
-///  appearance({color= '#00ff00', metalness= 50, roughness= 50}, example2)
-/// ```
-///
-/// ```no_run
-/// /// You can set the appearance before or after you shell it will yield the same result.
-/// /// This example shows setting the appearance _after_ the shell.
-/// firstSketch = startSketchOn('XY')
-///     |> startProfileAt([-12, 12], %)
-///     |> line([24, 0], %)
-///     |> line([0, -24], %)
-///     |> line([-24, 0], %)
-///     |> close(%)
-///     |> extrude(6, %)
-///
-/// shell({
-///     faces = ['end'],
-///     thickness = 0.25,
-/// }, firstSketch)
-///     |> appearance({
-///         color = '#ff0000',
-///         metalness = 90,
-///         roughness = 90
-///     }, %)
-/// ```
-///
-/// ```no_run
-/// /// You can set the appearance before or after you shell it will yield the same result.
-/// /// This example shows setting the appearance _before_ the shell.
-/// firstSketch = startSketchOn('XY')
-///     |> startProfileAt([-12, 12], %)
-///     |> line([24, 0], %)
-///     |> line([0, -24], %)
-///     |> line([-24, 0], %)
-///     |> close(%)
-///     |> extrude(6, %)
-///     |> appearance({
-///         color = '#ff0000',
-///         metalness = 90,
-///         roughness = 90
-///     }, %)
-///
-/// shell({
-///     faces = ['end'],
-///     thickness = 0.25,
-/// }, firstSketch)
-/// ```
-///
-/// ```no_run
-/// /// Setting the appearance of a 3D pattern can be done _before_ or _after_ the pattern.
-/// /// This example shows _before_ the pattern.
-/// exampleSketch = startSketchOn('XZ')
-///   |> startProfileAt([0, 0], %)
-///   |> line([0, 2], %)
-///   |> line([3, 1], %)
-///   |> line([0, -4], %)
-///   |> close(%)
-///
-/// example = extrude(1, exampleSketch)
-///     |> appearance({
-///         color = '#ff0000',
-///         metalness = 90,
-///         roughness = 90
-///     }, %)
-///   |> patternLinear3d({
-///       axis = [1, 0, 1],
-///       instances = 7,
-///       distance = 6
-///     }, %)
-/// ```
-///
-/// ```no_run
-/// /// Setting the appearance of a 3D pattern can be done _before_ or _after_ the pattern.
-/// /// This example shows _after_ the pattern.
-/// exampleSketch = startSketchOn('XZ')
-///   |> startProfileAt([0, 0], %)
-///   |> line([0, 2], %)
-///   |> line([3, 1], %)
-///   |> line([0, -4], %)
-///   |> close(%)
-///
-/// example = extrude(1, exampleSketch)
-///   |> patternLinear3d({
-///       axis = [1, 0, 1],
-///       instances = 7,
-///       distance = 6
-///     }, %)
-///     |> appearance({
-///         color = '#ff0000',
-///         metalness = 90,
-///         roughness = 90
-///     }, %)
-/// ```
-///
-/// ```no_run
-/// /// Color the result of a 2D pattern that was extruded.
-/// exampleSketch = startSketchOn('XZ')
-///   |> startProfileAt([.5, 25], %)
-///   |> line([0, 5], %)
-///   |> line([-1, 0], %)
-///   |> line([0, -5], %)
-///   |> close(%)
-///   |> patternCircular2d({
-///        center = [0, 0],
-///        instances = 13,
-///        arcDegrees = 360,
-///        rotateDuplicates = true
-///      }, %)
-///
-/// example = extrude(1, exampleSketch)
-///     |> appearance({
-///         color = '#ff0000',
-///         metalness = 90,
-///         roughness = 90
-///     }, %)
-/// ```
-#[stdlib {
-    name = "appearance",
-}]
-async fn inner_appearance(data: AppearanceData, solid_set: SolidSet, args: Args) -> Result<SolidSet, KclError> {
-    let solids: Vec<Box<Solid>> = solid_set.into();
-
-    for solid in &solids {
-        // Set the material properties.
-        let rgb = rgba_simple::RGB::<f32>::from_hex(&data.color).map_err(|err| {
-            KclError::Semantic(KclErrorDetails {
-                message: format!("Invalid hex color (`{}`): {}", data.color, err),
-                source_ranges: vec![args.source_range],
-            })
-        })?;
-
-        let color = Color {
-            r: rgb.red,
-            g: rgb.green,
-            b: rgb.blue,
-            a: 100.0,
-        };
-
-        args.batch_modeling_cmd(
-            uuid::Uuid::new_v4(),
-            ModelingCmd::from(mcmd::ObjectSetMaterialParamsPbr {
-                object_id: solid.id,
-                color,
-                metalness: data.metalness.unwrap_or_default() as f32 / 100.0,
-                roughness: data.roughness.unwrap_or_default() as f32 / 100.0,
-                ambient_occlusion: 0.0,
-            }),
-        )
-        .await?;
-
-        // Idk if we want to actually modify the memory for the colors, but I'm not right now since
-        // I can't think of a use case for it.
-    }
-
-    Ok(SolidSet::from(solids))
-}

src/wasm-lib/kcl/src/std/args.rs

@@ -50,13 +50,6 @@ pub struct KwArgs {
     pub labeled: HashMap<String, Arg>,
 }
 
-impl KwArgs {
-    /// How many arguments are there?
-    pub fn len(&self) -> usize {
-        self.labeled.len() + if self.unlabeled.is_some() { 1 } else { 0 }
-    }
-}
-
 #[derive(Debug, Clone)]
 pub struct Args {
     /// Positional args.
@@ -1096,20 +1089,6 @@ impl<'a> FromKclValue<'a> for super::fillet::FilletData {
     }
 }
 
-impl<'a> FromKclValue<'a> for super::appearance::AppearanceData {
-    fn from_kcl_val(arg: &'a KclValue) -> Option<Self> {
-        let obj = arg.as_object()?;
-        let_field_of!(obj, color);
-        let_field_of!(obj, metalness?);
-        let_field_of!(obj, roughness?);
-        Some(Self {
-            color,
-            metalness,
-            roughness,
-        })
-    }
-}
-
 impl<'a> FromKclValue<'a> for super::helix::HelixData {
     fn from_kcl_val(arg: &'a KclValue) -> Option<Self> {
         let obj = arg.as_object()?;

src/wasm-lib/kcl/src/std/mod.rs

@@ -1,6 +1,5 @@
 //! Functions implemented for language execution.
 
-pub mod appearance;
 pub mod args;
 pub mod array;
 pub mod assert;
@@ -51,7 +50,6 @@ lazy_static! {
         Box::new(LegLen),
         Box::new(LegAngX),
         Box::new(LegAngY),
-        Box::new(crate::std::appearance::Appearance),
         Box::new(crate::std::convert::Int),
         Box::new(crate::std::extrude::Extrude),
         Box::new(crate::std::segment::SegEnd),

src/wasm-lib/kcl/src/test_server.rs

@@ -55,11 +55,7 @@ async fn do_execute_and_snapshot(
     program: Program,
 ) -> Result<(crate::execution::ExecState, image::DynamicImage), ExecError> {
     let mut exec_state = Default::default();
-    let snapshot_png_bytes = ctx
+    let snapshot_png_bytes = ctx.execute_and_prepare(&program, &mut exec_state).await?.contents.0;
-        .execute_and_prepare_snapshot(&program, &mut exec_state)
-        .await?
-        .contents
-        .0;
 
     // Decode the snapshot, return it.
     let img = image::ImageReader::new(std::io::Cursor::new(snapshot_png_bytes))

src/wasm-lib/kcl/src/unparser.rs

@@ -3,10 +3,10 @@ use std::fmt::Write;
 use crate::parsing::{
     ast::types::{
         ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryOperator, BinaryPart, BodyItem, CallExpression,
-        CallExpressionKw, DefaultParamVal, Expr, FnArgType, FormatOptions, FunctionExpression, IfExpression,
+        CallExpressionKw, Expr, FnArgType, FormatOptions, FunctionExpression, IfExpression, ImportSelector,
-        ImportSelector, ImportStatement, ItemVisibility, LabeledArg, Literal, LiteralIdentifier, LiteralValue,
+        ImportStatement, ItemVisibility, LabeledArg, Literal, LiteralIdentifier, LiteralValue, MemberExpression,
-        MemberExpression, MemberObject, Node, NonCodeValue, ObjectExpression, Parameter, PipeExpression, Program,
+        MemberObject, Node, NonCodeValue, ObjectExpression, Parameter, PipeExpression, Program, TagDeclarator,
-        TagDeclarator, UnaryExpression, VariableDeclaration, VariableKind,
+        UnaryExpression, VariableDeclaration, VariableKind,
     },
     PIPE_OPERATOR,
 };
@@ -166,14 +166,7 @@ pub(crate) enum ExprContext {
 }
 
 impl Expr {
-    pub(crate) fn recast(&self, options: &FormatOptions, indentation_level: usize, mut ctxt: ExprContext) -> String {
+    pub(crate) fn recast(&self, options: &FormatOptions, indentation_level: usize, ctxt: ExprContext) -> String {
-        let is_decl = matches!(ctxt, ExprContext::Decl);
-        if is_decl {
-            // Just because this expression is being bound to a variable, doesn't mean that every child
-            // expression is being bound. So, reset the expression context if necessary.
-            // This will still preserve the "::Pipe" context though.
-            ctxt = ExprContext::Other;
-        }
         match &self {
             Expr::BinaryExpression(bin_exp) => bin_exp.recast(options),
             Expr::ArrayExpression(array_exp) => array_exp.recast(options, indentation_level, ctxt),
@@ -182,7 +175,11 @@ impl Expr {
             Expr::MemberExpression(mem_exp) => mem_exp.recast(),
             Expr::Literal(literal) => literal.recast(),
             Expr::FunctionExpression(func_exp) => {
-                let mut result = if is_decl { String::new() } else { "fn".to_owned() };
+                let mut result = if ctxt == ExprContext::Decl {
+                    String::new()
+                } else {
+                    "fn".to_owned()
+                };
                 result += &func_exp.recast(options, indentation_level);
                 result
             }
@@ -194,12 +191,6 @@ impl Expr {
             Expr::UnaryExpression(unary_exp) => unary_exp.recast(options),
             Expr::IfExpression(e) => e.recast(options, indentation_level, ctxt),
             Expr::PipeSubstitution(_) => crate::parsing::PIPE_SUBSTITUTION_OPERATOR.to_string(),
-            Expr::LabelledExpression(e) => {
-                let mut result = e.expr.recast(options, indentation_level, ctxt);
-                result += " as ";
-                result += &e.label.name;
-                result
-            }
             Expr::None(_) => {
                 unimplemented!("there is no literal None, see https://github.com/KittyCAD/modeling-app/issues/1115")
             }
@@ -413,8 +404,7 @@ fn expr_is_trivial(expr: &Expr) -> bool {
         | Expr::ObjectExpression(_)
         | Expr::MemberExpression(_)
         | Expr::UnaryExpression(_)
-        | Expr::IfExpression(_)
+        | Expr::IfExpression(_) => false,
-        | Expr::LabelledExpression(_) => false,
     }
 }
 
@@ -669,18 +659,15 @@ impl FunctionExpression {
 
 impl Parameter {
     pub fn recast(&self, options: &FormatOptions, indentation_level: usize) -> String {
-        let at_sign = if self.labeled { "" } else { "@" };
+        let mut result = format!(
-        let identifier = &self.identifier.name;
+            "{}{}",
-        let question_mark = if self.default_value.is_some() { "?" } else { "" };
+            if self.labeled { "" } else { "@" },
-        let mut result = format!("{at_sign}{identifier}{question_mark}");
+            self.identifier.name.clone()
+        );
         if let Some(ty) = &self.type_ {
             result += ": ";
             result += &ty.recast(options, indentation_level);
         }
-        if let Some(DefaultParamVal::Literal(ref literal)) = self.default_value {
-            let lit = literal.recast();
-            result.push_str(&format!(" = {lit}"));
-        };
 
         result
     }
@@ -1526,28 +1513,6 @@ tabs_l = startSketchOn({
         );
     }
 
-    #[test]
-    fn test_as() {
-        let some_program_string = r#"fn cube(pos, scale) {
-  x = dfsfs + dfsfsd as y
-
-  sg = startSketchOn('XY')
-    |> startProfileAt(pos, %) as foo
-    |> line([0, scale], %)
-    |> line([scale, 0], %) as bar
-    |> line([0 as baz, -scale] as qux, %)
-    |> close(%)
-    |> extrude(scale, %)
-}
-
-cube(0, 0) as cub
-"#;
-        let program = crate::parsing::top_level_parse(some_program_string).unwrap();
-
-        let recasted = program.recast(&Default::default(), 0);
-        assert_eq!(recasted, some_program_string,);
-    }
-
     #[test]
     fn test_recast_with_bad_indentation() {
         let some_program_string = r#"part001 = startSketchOn('XY')
@@ -2169,10 +2134,8 @@ fn f() {
         .into_iter()
         .enumerate()
         {
-            let tokens = crate::parsing::token::lex(raw, ModuleId::default()).unwrap();
+            let tokens = crate::parsing::token::lexer(raw, ModuleId::default()).unwrap();
-            let literal = crate::parsing::parser::unsigned_number_literal
+            let literal = crate::parsing::parser::unsigned_number_literal.parse(&tokens).unwrap();
-                .parse(tokens.as_slice())
-                .unwrap();
             assert_eq!(
                 literal.recast(),
                 expected,
@@ -2207,28 +2170,6 @@ sketch002 = startSketchOn({
         assert_eq!(actual, expected);
     }
 
-    #[test]
-    fn unparse_fn_unnamed() {
-        let input = r#"squares_out = reduce(arr, 0, fn(i, squares) {
-  return 1
-})
-"#;
-        let ast = crate::parsing::top_level_parse(input).unwrap();
-        let actual = ast.recast(&FormatOptions::new(), 0);
-        assert_eq!(actual, input);
-    }
-
-    #[test]
-    fn unparse_fn_named() {
-        let input = r#"fn f(x) {
-  return 1
-}
-"#;
-        let ast = crate::parsing::top_level_parse(input).unwrap();
-        let actual = ast.recast(&FormatOptions::new(), 0);
-        assert_eq!(actual, input);
-    }
-
     #[test]
     fn recast_objects_with_comments() {
         use winnow::Parser;
@@ -2250,9 +2191,9 @@ sketch002 = startSketchOn({
         .into_iter()
         .enumerate()
         {
-            let tokens = crate::parsing::token::lex(input, ModuleId::default()).unwrap();
+            let tokens = crate::parsing::token::lexer(input, ModuleId::default()).unwrap();
-            crate::parsing::parser::print_tokens(tokens.as_slice());
+            crate::parsing::parser::print_tokens(&tokens);
-            let expr = crate::parsing::parser::object.parse(tokens.as_slice()).unwrap();
+            let expr = crate::parsing::parser::object.parse(&tokens).unwrap();
             assert_eq!(
                 expr.recast(&FormatOptions::new(), 0, ExprContext::Other),
                 expected,
@@ -2348,10 +2289,8 @@ sketch002 = startSketchOn({
         .into_iter()
         .enumerate()
         {
-            let tokens = crate::parsing::token::lex(input, ModuleId::default()).unwrap();
+            let tokens = crate::parsing::token::lexer(input, ModuleId::default()).unwrap();
-            let expr = crate::parsing::parser::array_elem_by_elem
+            let expr = crate::parsing::parser::array_elem_by_elem.parse(&tokens).unwrap();
-                .parse(tokens.as_slice())
-                .unwrap();
             assert_eq!(
                 expr.recast(&FormatOptions::new(), 0, ExprContext::Other),
                 expected,

src/wasm-lib/kcl/src/walk/ast_node.rs

@@ -5,7 +5,7 @@ use crate::{
 
 /// The "Node" type wraps all the AST elements we're able to find in a KCL
 /// file. Tokens we walk through will be one of these.
-#[derive(Copy, Clone, Debug)]
+#[derive(Clone, Debug)]
 pub enum Node<'a> {
     Program(NodeRef<'a, types::Program>),
 
@@ -31,8 +31,6 @@ pub enum Node<'a> {
     MemberExpression(NodeRef<'a, types::MemberExpression>),
     UnaryExpression(NodeRef<'a, types::UnaryExpression>),
     IfExpression(NodeRef<'a, types::IfExpression>),
-    ElseIf(&'a types::ElseIf),
-    LabelledExpression(NodeRef<'a, types::LabelledExpression>),
 
     Parameter(&'a types::Parameter),
 
@@ -40,22 +38,11 @@ pub enum Node<'a> {
 
     MemberObject(&'a types::MemberObject),
     LiteralIdentifier(&'a types::LiteralIdentifier),
-
-    KclNone(&'a types::KclNone),
 }
 
-/// Returned during source_range conversion.
+impl From<&Node<'_>> for SourceRange {
-#[derive(Debug)]
+    fn from(node: &Node) -> Self {
-pub enum AstNodeError {
+        match node {
-    /// Returned if we try and [SourceRange] a [types::KclNone].
-    NoSourceForAKclNone,
-}
-
-impl TryFrom<&Node<'_>> for SourceRange {
-    type Error = AstNodeError;
-
-    fn try_from(node: &Node) -> Result<Self, Self::Error> {
-        Ok(match node {
             Node::Program(n) => SourceRange::from(*n),
             Node::ImportStatement(n) => SourceRange::from(*n),
             Node::ExpressionStatement(n) => SourceRange::from(*n),
@@ -80,65 +67,7 @@ impl TryFrom<&Node<'_>> for SourceRange {
             Node::ObjectProperty(n) => SourceRange::from(*n),
             Node::MemberObject(m) => SourceRange::new(m.start(), m.end(), m.module_id()),
             Node::IfExpression(n) => SourceRange::from(*n),
-            Node::LabelledExpression(n) => SourceRange::from(*n),
             Node::LiteralIdentifier(l) => SourceRange::new(l.start(), l.end(), l.module_id()),
-
-            // This is broken too
-            Node::ElseIf(n) => SourceRange::new(n.cond.start(), n.cond.end(), n.cond.module_id()),
-
-            // The KclNone type here isn't an actual node, so it has no
-            // start/end information.
-            Node::KclNone(_) => return Err(Self::Error::NoSourceForAKclNone),
-        })
-    }
-}
-
-impl<'tree> From<&'tree types::BodyItem> for Node<'tree> {
-    fn from(node: &'tree types::BodyItem) -> Self {
-        match node {
-            types::BodyItem::ImportStatement(v) => v.as_ref().into(),
-            types::BodyItem::ExpressionStatement(v) => v.into(),
-            types::BodyItem::VariableDeclaration(v) => v.as_ref().into(),
-            types::BodyItem::ReturnStatement(v) => v.into(),
-        }
-    }
-}
-
-impl<'tree> From<&'tree types::Expr> for Node<'tree> {
-    fn from(node: &'tree types::Expr) -> Self {
-        match node {
-            types::Expr::Literal(lit) => lit.as_ref().into(),
-            types::Expr::TagDeclarator(tag) => tag.as_ref().into(),
-            types::Expr::Identifier(id) => id.as_ref().into(),
-            types::Expr::BinaryExpression(be) => be.as_ref().into(),
-            types::Expr::FunctionExpression(fe) => fe.as_ref().into(),
-            types::Expr::CallExpression(ce) => ce.as_ref().into(),
-            types::Expr::CallExpressionKw(ce) => ce.as_ref().into(),
-            types::Expr::PipeExpression(pe) => pe.as_ref().into(),
-            types::Expr::PipeSubstitution(ps) => ps.as_ref().into(),
-            types::Expr::ArrayExpression(ae) => ae.as_ref().into(),
-            types::Expr::ArrayRangeExpression(are) => are.as_ref().into(),
-            types::Expr::ObjectExpression(oe) => oe.as_ref().into(),
-            types::Expr::MemberExpression(me) => me.as_ref().into(),
-            types::Expr::UnaryExpression(ue) => ue.as_ref().into(),
-            types::Expr::IfExpression(e) => e.as_ref().into(),
-            types::Expr::LabelledExpression(e) => e.as_ref().into(),
-            types::Expr::None(n) => n.into(),
-        }
-    }
-}
-
-impl<'tree> From<&'tree types::BinaryPart> for Node<'tree> {
-    fn from(node: &'tree types::BinaryPart) -> Self {
-        match node {
-            types::BinaryPart::Literal(lit) => lit.as_ref().into(),
-            types::BinaryPart::Identifier(id) => id.as_ref().into(),
-            types::BinaryPart::BinaryExpression(be) => be.as_ref().into(),
-            types::BinaryPart::CallExpression(ce) => ce.as_ref().into(),
-            types::BinaryPart::CallExpressionKw(ce) => ce.as_ref().into(),
-            types::BinaryPart::UnaryExpression(ue) => ue.as_ref().into(),
-            types::BinaryPart::MemberExpression(me) => me.as_ref().into(),
-            types::BinaryPart::IfExpression(e) => e.as_ref().into(),
         }
     }
 }
@@ -187,7 +116,4 @@ impl_from!(Node, ObjectProperty);
 impl_from_ref!(Node, Parameter);
 impl_from_ref!(Node, MemberObject);
 impl_from!(Node, IfExpression);
-impl_from!(Node, ElseIf);
-impl_from!(Node, LabelledExpression);
 impl_from_ref!(Node, LiteralIdentifier);
-impl_from!(Node, KclNone);

src/wasm-lib/kcl/src/walk/ast_visitor.rs

@@ -1,201 +0,0 @@
-use anyhow::Result;
-
-use crate::walk::Node;
-
-/// Walk-specific trait adding the ability to traverse the KCL AST.
-///
-/// This trait is implemented on [Node] to handle the fairly tricky bit of
-/// recursing into the AST in a single place, as well as helpers for traversing
-/// the tree. for callers to use.
-pub trait Visitable<'tree> {
-    /// Return a `Vec<Node>` for all *direct* children of this AST node. This
-    /// should only contain direct descendants.
-    fn children(&self) -> Vec<Node<'tree>>;
-
-    /// Return `self` as a [Node]. Generally speaking, the [Visitable] trait
-    /// is only going to be implemented on [Node], so this is purely used by
-    /// helpers that are generic over a [Visitable] and want to deref back
-    /// into a [Node].
-    fn node(&self) -> Node<'tree>;
-
-    /// Call the provided [Visitor] in order to Visit `self`. This will
-    /// only be called on `self` -- the [Visitor] is responsible for
-    /// recursing into any children, if desired.
-    fn visit<VisitorT>(&self, visitor: VisitorT) -> Result<bool, VisitorT::Error>
-    where
-        VisitorT: Visitor<'tree>,
-    {
-        visitor.visit_node(self.node())
-    }
-}
-
-/// Trait used to enable visiting members of KCL AST.
-///
-/// Implementing this trait enables the implementer to be invoked over
-/// members of KCL AST by using the [Visitable::visit] function on
-/// a [Node].
-pub trait Visitor<'tree> {
-    /// Error type returned by the [Self::visit] function.
-    type Error;
-
-    /// Visit a KCL AST [Node].
-    ///
-    /// In general, implementers likely wish to check to see if a Node is what
-    /// they're looking for, and either descend into that [Node]'s children (by
-    /// calling [Visitable::children] on [Node] to get children nodes,
-    /// calling [Visitable::visit] on each node of interest), or perform
-    /// some action.
-    fn visit_node(&self, node: Node<'tree>) -> Result<bool, Self::Error>;
-}
-
-impl<'a, FnT, ErrorT> Visitor<'a> for FnT
-where
-    FnT: Fn(Node<'a>) -> Result<bool, ErrorT>,
-{
-    type Error = ErrorT;
-
-    fn visit_node(&self, n: Node<'a>) -> Result<bool, ErrorT> {
-        self(n)
-    }
-}
-
-impl<'tree> Visitable<'tree> for Node<'tree> {
-    fn node(&self) -> Node<'tree> {
-        *self
-    }
-
-    fn children(&self) -> Vec<Node<'tree>> {
-        match self {
-            Node::Program(n) => n.body.iter().map(|node| node.into()).collect(),
-            Node::ExpressionStatement(n) => {
-                vec![(&n.expression).into()]
-            }
-            Node::BinaryExpression(n) => {
-                vec![(&n.left).into(), (&n.right).into()]
-            }
-            Node::FunctionExpression(n) => {
-                let mut children = n.params.iter().map(|v| v.into()).collect::<Vec<Node>>();
-                children.push((&n.body).into());
-                children
-            }
-            Node::CallExpression(n) => {
-                let mut children = n.arguments.iter().map(|v| v.into()).collect::<Vec<Node>>();
-                children.insert(0, (&n.callee).into());
-                children
-            }
-            Node::CallExpressionKw(n) => {
-                let mut children = n.unlabeled.iter().map(|v| v.into()).collect::<Vec<Node>>();
-
-                // TODO: this is wrong but it's what the old walk code was doing.
-                // We likely need a real LabeledArg AST node, but I don't
-                // want to tango with it since it's a lot deeper than
-                // adding it to the enum.
-                children.extend(n.arguments.iter().map(|v| (&v.arg).into()).collect::<Vec<Node>>());
-                children
-            }
-            Node::PipeExpression(n) => n.body.iter().map(|v| v.into()).collect(),
-            Node::ArrayExpression(n) => n.elements.iter().map(|v| v.into()).collect(),
-            Node::ArrayRangeExpression(n) => {
-                vec![(&n.start_element).into(), (&n.end_element).into()]
-            }
-            Node::ObjectExpression(n) => n.properties.iter().map(|v| v.into()).collect(),
-            Node::MemberExpression(n) => {
-                vec![(&n.object).into(), (&n.property).into()]
-            }
-            Node::IfExpression(n) => {
-                let mut children = n.else_ifs.iter().map(|v| v.into()).collect::<Vec<Node>>();
-                children.insert(0, n.cond.as_ref().into());
-                children.push(n.final_else.as_ref().into());
-                children
-            }
-            Node::VariableDeclaration(n) => vec![(&n.declaration).into()],
-            Node::ReturnStatement(n) => {
-                vec![(&n.argument).into()]
-            }
-            Node::VariableDeclarator(n) => {
-                vec![(&n.id).into(), (&n.init).into()]
-            }
-            Node::UnaryExpression(n) => {
-                vec![(&n.argument).into()]
-            }
-            Node::Parameter(n) => {
-                vec![(&n.identifier).into()]
-            }
-            Node::ObjectProperty(n) => {
-                vec![(&n.value).into()]
-            }
-            Node::ElseIf(n) => {
-                vec![(&n.cond).into(), n.then_val.as_ref().into()]
-            }
-            Node::LabelledExpression(e) => {
-                vec![(&e.expr).into(), (&e.label).into()]
-            }
-            Node::PipeSubstitution(_)
-            | Node::TagDeclarator(_)
-            | Node::Identifier(_)
-            | Node::ImportStatement(_)
-            | Node::MemberObject(_)
-            | Node::LiteralIdentifier(_)
-            | Node::KclNone(_)
-            | Node::Literal(_) => vec![],
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use std::sync::Mutex;
-
-    use super::*;
-
-    macro_rules! kcl {
-        ( $kcl:expr ) => {{
-            $crate::parsing::top_level_parse($kcl).unwrap()
-        }};
-    }
-
-    #[test]
-    fn count_crows() {
-        let program = kcl!(
-            "\
-const crow1 = 1
-const crow2 = 2
-
-fn crow3() {
-    const crow4 = 3
-    crow5()
-}
-"
-        );
-
-        #[derive(Debug, Default)]
-        struct CountCrows {
-            n: Box<Mutex<usize>>,
-        }
-
-        impl<'tree> Visitor<'tree> for &CountCrows {
-            type Error = ();
-
-            fn visit_node(&self, node: Node<'tree>) -> Result<bool, Self::Error> {
-                if let Node::VariableDeclarator(vd) = node {
-                    if vd.id.name.starts_with("crow") {
-                        *self.n.lock().unwrap() += 1;
-                    }
-                }
-
-                for child in node.children().iter() {
-                    if !child.visit(*self)? {
-                        return Ok(false);
-                    }
-                }
-
-                Ok(true)
-            }
-        }
-
-        let prog: Node = (&program).into();
-        let count_crows: CountCrows = Default::default();
-        Visitable::visit(&prog, &count_crows).unwrap();
-        assert_eq!(*count_crows.n.lock().unwrap(), 4);
-    }
-}

src/wasm-lib/kcl/src/walk/ast_walk.rs

@@ -1,55 +1,329 @@
 use anyhow::Result;
 
-use super::ast_visitor::{Visitable, Visitor};
 use crate::{
-    parsing::ast::types::{NodeRef, Program},
+    parsing::ast::types::{
+        BinaryPart, BodyItem, Expr, IfExpression, LiteralIdentifier, MemberExpression, MemberObject, NodeRef,
+        ObjectExpression, ObjectProperty, Parameter, Program, UnaryExpression, VariableDeclarator,
+    },
     walk::Node,
 };
 
-/// *DEPRECATED* Walk trait.
+/// Walker is implemented by things that are able to walk an AST tree to
-///
+/// produce lints. This trait is implemented automatically for a few of the
-/// This was written before [Visitor], which is the better way to traverse
+/// common types, but can be manually implemented too.
-/// a AST.
-///
-/// This trait continues to exist in order to not change all the linter
-/// as we refine the walk code.
-///
-/// This, internally, uses the new [Visitor] trait, and is only provided as
-/// a stub until we migrate all existing code off this trait.
 pub trait Walker<'a> {
-    /// Walk will visit every element of the AST, recursing through the
+    /// Walk will visit every element of the AST.
-    /// whole tree.
     fn walk(&self, n: Node<'a>) -> Result<bool>;
 }
 
-impl<'tree, VisitorT> Walker<'tree> for VisitorT
+impl<'a, FnT> Walker<'a> for FnT
 where
-    VisitorT: Visitor<'tree>,
+    FnT: Fn(Node<'a>) -> Result<bool>,
-    VisitorT: Clone,
-    anyhow::Error: From<VisitorT::Error>,
-    VisitorT::Error: Send,
-    VisitorT::Error: Sync,
 {
-    fn walk(&self, n: Node<'tree>) -> Result<bool> {
+    fn walk(&self, n: Node<'a>) -> Result<bool> {
-        if !n.visit(self.clone())? {
+        self(n)
-            return Ok(false);
-        }
-        for child in n.children() {
-            if !Self::walk(self, child)? {
-                return Ok(false);
-            }
-        }
-        Ok(true)
     }
 }
 
 /// Run the Walker against all [Node]s in a [Program].
-pub fn walk<'a, WalkT>(prog: NodeRef<'a, Program>, f: WalkT) -> Result<bool>
+pub fn walk<'a, WalkT>(prog: NodeRef<'a, Program>, f: &WalkT) -> Result<bool>
 where
     WalkT: Walker<'a>,
 {
-    let prog: Node = prog.into();
+    if !f.walk(prog.into())? {
-    f.walk(prog)
+        return Ok(false);
+    }
+
+    for bi in &prog.body {
+        if !walk_body_item(bi, f)? {
+            return Ok(false);
+        }
+    }
+    Ok(true)
+}
+
+fn walk_variable_declarator<'a, WalkT>(node: NodeRef<'a, VariableDeclarator>, f: &WalkT) -> Result<bool>
+where
+    WalkT: Walker<'a>,
+{
+    if !f.walk(node.into())? {
+        return Ok(false);
+    }
+    if !f.walk((&node.id).into())? {
+        return Ok(false);
+    }
+    walk_value(&node.init, f)
+}
+
+fn walk_parameter<'a, WalkT>(node: &'a Parameter, f: &WalkT) -> Result<bool>
+where
+    WalkT: Walker<'a>,
+{
+    if !f.walk(node.into())? {
+        return Ok(false);
+    }
+    f.walk((&node.identifier).into())
+}
+
+fn walk_member_object<'a, WalkT>(node: &'a MemberObject, f: &WalkT) -> Result<bool>
+where
+    WalkT: Walker<'a>,
+{
+    f.walk(node.into())
+}
+
+fn walk_literal_identifier<'a, WalkT>(node: &'a LiteralIdentifier, f: &WalkT) -> Result<bool>
+where
+    WalkT: Walker<'a>,
+{
+    f.walk(node.into())
+}
+
+fn walk_member_expression<'a, WalkT>(node: NodeRef<'a, MemberExpression>, f: &WalkT) -> Result<bool>
+where
+    WalkT: Walker<'a>,
+{
+    if !f.walk(node.into())? {
+        return Ok(false);
+    }
+
+    if !walk_member_object(&node.object, f)? {
+        return Ok(false);
+    }
+
+    walk_literal_identifier(&node.property, f)
+}
+
+fn walk_binary_part<'a, WalkT>(node: &'a BinaryPart, f: &WalkT) -> Result<bool>
+where
+    WalkT: Walker<'a>,
+{
+    match node {
+        BinaryPart::Literal(lit) => f.walk(lit.as_ref().into()),
+        BinaryPart::Identifier(id) => f.walk(id.as_ref().into()),
+        BinaryPart::BinaryExpression(be) => f.walk(be.as_ref().into()),
+        BinaryPart::CallExpression(ce) => f.walk(ce.as_ref().into()),
+        BinaryPart::CallExpressionKw(ce) => f.walk(ce.as_ref().into()),
+        BinaryPart::UnaryExpression(ue) => walk_unary_expression(ue, f),
+        BinaryPart::MemberExpression(me) => walk_member_expression(me, f),
+        BinaryPart::IfExpression(e) => walk_if_expression(e, f),
+    }
+}
+
+// TODO: Rename this to walk_expr
+fn walk_value<'a, WalkT>(node: &'a Expr, f: &WalkT) -> Result<bool>
+where
+    WalkT: Walker<'a>,
+{
+    match node {
+        Expr::Literal(lit) => f.walk(lit.as_ref().into()),
+        Expr::TagDeclarator(tag) => f.walk(tag.as_ref().into()),
+
+        Expr::Identifier(id) => {
+            // sometimes there's a bare Identifier without a Value::Identifier.
+            f.walk(id.as_ref().into())
+        }
+
+        Expr::BinaryExpression(be) => {
+            if !f.walk(be.as_ref().into())? {
+                return Ok(false);
+            }
+            if !walk_binary_part(&be.left, f)? {
+                return Ok(false);
+            }
+            walk_binary_part(&be.right, f)
+        }
+        Expr::FunctionExpression(fe) => {
+            if !f.walk(fe.as_ref().into())? {
+                return Ok(false);
+            }
+
+            for arg in &fe.params {
+                if !walk_parameter(arg, f)? {
+                    return Ok(false);
+                }
+            }
+            walk(&fe.body, f)
+        }
+        Expr::CallExpression(ce) => {
+            if !f.walk(ce.as_ref().into())? {
+                return Ok(false);
+            }
+
+            if !f.walk((&ce.callee).into())? {
+                return Ok(false);
+            }
+            for e in &ce.arguments {
+                if !walk_value::<WalkT>(e, f)? {
+                    return Ok(false);
+                }
+            }
+            Ok(true)
+        }
+        Expr::CallExpressionKw(ce) => {
+            if !f.walk(ce.as_ref().into())? {
+                return Ok(false);
+            }
+
+            if !f.walk((&ce.callee).into())? {
+                return Ok(false);
+            }
+            if let Some(ref e) = ce.unlabeled {
+                if !walk_value::<WalkT>(e, f)? {
+                    return Ok(false);
+                }
+            }
+            for e in &ce.arguments {
+                if !walk_value::<WalkT>(&e.arg, f)? {
+                    return Ok(false);
+                }
+            }
+            Ok(true)
+        }
+        Expr::PipeExpression(pe) => {
+            if !f.walk(pe.as_ref().into())? {
+                return Ok(false);
+            }
+
+            for e in &pe.body {
+                if !walk_value::<WalkT>(e, f)? {
+                    return Ok(false);
+                }
+            }
+            Ok(true)
+        }
+        Expr::PipeSubstitution(ps) => f.walk(ps.as_ref().into()),
+        Expr::ArrayExpression(ae) => {
+            if !f.walk(ae.as_ref().into())? {
+                return Ok(false);
+            }
+            for e in &ae.elements {
+                if !walk_value::<WalkT>(e, f)? {
+                    return Ok(false);
+                }
+            }
+            Ok(true)
+        }
+        Expr::ArrayRangeExpression(are) => {
+            if !f.walk(are.as_ref().into())? {
+                return Ok(false);
+            }
+            if !walk_value::<WalkT>(&are.start_element, f)? {
+                return Ok(false);
+            }
+            if !walk_value::<WalkT>(&are.end_element, f)? {
+                return Ok(false);
+            }
+            Ok(true)
+        }
+        Expr::ObjectExpression(oe) => walk_object_expression(oe, f),
+        Expr::MemberExpression(me) => walk_member_expression(me, f),
+        Expr::UnaryExpression(ue) => walk_unary_expression(ue, f),
+        Expr::IfExpression(e) => walk_if_expression(e, f),
+        Expr::None(_) => Ok(true),
+    }
+}
+
+/// Walk through an [ObjectProperty].
+fn walk_object_property<'a, WalkT>(node: NodeRef<'a, ObjectProperty>, f: &WalkT) -> Result<bool>
+where
+    WalkT: Walker<'a>,
+{
+    if !f.walk(node.into())? {
+        return Ok(false);
+    }
+    walk_value(&node.value, f)
+}
+
+/// Walk through an [ObjectExpression].
+fn walk_object_expression<'a, WalkT>(node: NodeRef<'a, ObjectExpression>, f: &WalkT) -> Result<bool>
+where
+    WalkT: Walker<'a>,
+{
+    if !f.walk(node.into())? {
+        return Ok(false);
+    }
+
+    for prop in &node.properties {
+        if !walk_object_property(prop, f)? {
+            return Ok(false);
+        }
+    }
+    Ok(true)
+}
+
+/// Walk through an [IfExpression].
+fn walk_if_expression<'a, WalkT>(node: NodeRef<'a, IfExpression>, f: &WalkT) -> Result<bool>
+where
+    WalkT: Walker<'a>,
+{
+    if !f.walk(node.into())? {
+        return Ok(false);
+    }
+    if !walk_value(&node.cond, f)? {
+        return Ok(false);
+    }
+
+    for else_if in &node.else_ifs {
+        if !walk_value(&else_if.cond, f)? {
+            return Ok(false);
+        }
+        if !walk(&else_if.then_val, f)? {
+            return Ok(false);
+        }
+    }
+    let final_else = &(*node.final_else);
+    if !f.walk(final_else.into())? {
+        return Ok(false);
+    }
+    Ok(true)
+}
+
+/// walk through an [UnaryExpression].
+fn walk_unary_expression<'a, WalkT>(node: NodeRef<'a, UnaryExpression>, f: &WalkT) -> Result<bool>
+where
+    WalkT: Walker<'a>,
+{
+    if !f.walk(node.into())? {
+        return Ok(false);
+    }
+    walk_binary_part(&node.argument, f)
+}
+
+/// walk through a [BodyItem].
+fn walk_body_item<'a, WalkT>(node: &'a BodyItem, f: &WalkT) -> Result<bool>
+where
+    WalkT: Walker<'a>,
+{
+    // We don't walk a BodyItem since it's an enum itself.
+
+    match node {
+        BodyItem::ImportStatement(xs) => {
+            if !f.walk(xs.as_ref().into())? {
+                return Ok(false);
+            }
+            Ok(true)
+        }
+        BodyItem::ExpressionStatement(xs) => {
+            if !f.walk(xs.into())? {
+                return Ok(false);
+            }
+            walk_value(&xs.expression, f)
+        }
+        BodyItem::VariableDeclaration(vd) => {
+            if !f.walk(vd.as_ref().into())? {
+                return Ok(false);
+            }
+
+            walk_variable_declarator(&vd.declaration, f)
+        }
+        BodyItem::ReturnStatement(rs) => {
+            if !f.walk(rs.into())? {
+                return Ok(false);
+            }
+            walk_value(&rs.argument, f)
+        }
+    }
 }
 
 #[cfg(test)]
@@ -71,10 +345,10 @@ const bar = 2
 "
         );
 
-        walk(&program, |node| {
+        walk(&program, &|node| {
             if let Node::VariableDeclarator(vd) = node {
                 if vd.id.name == "foo" {
-                    return Ok::<bool, anyhow::Error>(false);
+                    return Ok(false);
                 }
                 panic!("walk didn't stop");
             }

src/wasm-lib/kcl/src/walk/mod.rs

@@ -1,5 +1,4 @@
 mod ast_node;
-mod ast_visitor;
 mod ast_walk;
 
 pub use ast_node::Node;

src/wasm-lib/kcl/tests/kw_fn/ast.snap

@@ -78,179 +78,46 @@ snapshot_kind: text
       },
       {
         "declaration": {
-          "end": 77,
+          "end": 55,
           "id": {
-            "end": 43,
+            "end": 40,
-            "name": "add",
-            "start": 40,
-            "type": "Identifier"
-          },
-          "init": {
-            "body": {
-              "body": [
-                {
-                  "argument": {
-                    "end": 75,
-                    "left": {
-                      "end": 67,
-                      "name": "x",
-                      "start": 66,
-                      "type": "Identifier",
-                      "type": "Identifier"
-                    },
-                    "operator": "+",
-                    "right": {
-                      "end": 75,
-                      "name": "delta",
-                      "start": 70,
-                      "type": "Identifier",
-                      "type": "Identifier"
-                    },
-                    "start": 66,
-                    "type": "BinaryExpression",
-                    "type": "BinaryExpression"
-                  },
-                  "end": 75,
-                  "start": 59,
-                  "type": "ReturnStatement",
-                  "type": "ReturnStatement"
-                }
-              ],
-              "end": 77,
-              "start": 55
-            },
-            "end": 77,
-            "params": [
-              {
-                "type": "Parameter",
-                "identifier": {
-                  "end": 46,
-                  "name": "x",
-                  "start": 45,
-                  "type": "Identifier"
-                },
-                "labeled": false
-              },
-              {
-                "type": "Parameter",
-                "identifier": {
-                  "end": 53,
-                  "name": "delta",
-                  "start": 48,
-                  "type": "Identifier"
-                }
-              }
-            ],
-            "start": 43,
-            "type": "FunctionExpression",
-            "type": "FunctionExpression"
-          },
-          "start": 40,
-          "type": "VariableDeclarator"
-        },
-        "end": 77,
-        "kind": "fn",
-        "start": 37,
-        "type": "VariableDeclaration",
-        "type": "VariableDeclaration"
-      },
-      {
-        "declaration": {
-          "end": 97,
-          "id": {
-            "end": 82,
             "name": "two",
-            "start": 79,
+            "start": 37,
             "type": "Identifier"
           },
           "init": {
             "arguments": [
               {
-                "end": 96,
+                "end": 54,
                 "raw": "1",
-                "start": 95,
+                "start": 53,
                 "type": "Literal",
                 "type": "Literal",
                 "value": 1.0
               }
             ],
             "callee": {
-              "end": 94,
+              "end": 52,
               "name": "increment",
-              "start": 85,
+              "start": 43,
               "type": "Identifier"
             },
-            "end": 97,
+            "end": 55,
-            "start": 85,
+            "start": 43,
             "type": "CallExpression",
             "type": "CallExpression"
           },
-          "start": 79,
+          "start": 37,
           "type": "VariableDeclarator"
         },
-        "end": 97,
+        "end": 55,
         "kind": "const",
-        "start": 79,
+        "start": 37,
-        "type": "VariableDeclaration",
-        "type": "VariableDeclaration"
-      },
-      {
-        "declaration": {
-          "end": 122,
-          "id": {
-            "end": 103,
-            "name": "three",
-            "start": 98,
-            "type": "Identifier"
-          },
-          "init": {
-            "arguments": [
-              {
-                "type": "LabeledArg",
-                "label": {
-                  "type": "Identifier",
-                  "name": "delta"
-                },
-                "arg": {
-                  "end": 121,
-                  "raw": "2",
-                  "start": 120,
-                  "type": "Literal",
-                  "type": "Literal",
-                  "value": 2.0
-                }
-              }
-            ],
-            "callee": {
-              "end": 109,
-              "name": "add",
-              "start": 106,
-              "type": "Identifier"
-            },
-            "end": 122,
-            "start": 106,
-            "type": "CallExpressionKw",
-            "type": "CallExpressionKw",
-            "unlabeled": {
-              "end": 111,
-              "raw": "1",
-              "start": 110,
-              "type": "Literal",
-              "type": "Literal",
-              "value": 1.0
-            }
-          },
-          "start": 98,
-          "type": "VariableDeclarator"
-        },
-        "end": 122,
-        "kind": "const",
-        "start": 98,
         "type": "VariableDeclaration",
         "type": "VariableDeclaration"
       }
     ],
-    "end": 123,
+    "end": 56,
     "nonCodeMeta": {
       "nonCodeNodes": {
         "0": [
@@ -262,16 +129,6 @@ snapshot_kind: text
               "type": "newLine"
             }
           }
-        ],
-        "1": [
-          {
-            "end": 79,
-            "start": 77,
-            "type": "NonCodeNode",
-            "value": {
-              "type": "newLine"
-            }
-          }
         ]
       },
       "startNodes": []