Change CUT_RELEASE_PR to BUILD_RELEASE for out-yml (#4214)

Change CUT_RELEASE_PR to BUILD_RELEASE

.github/workflows/build-test-publish-apps.yml

@@ -211,7 +211,7 @@ jobs:
             out/*-x86_64-linux.*
 
       - uses: actions/upload-artifact@v3
-        if: ${{ env.CUT_RELEASE_PR == 'true' }}
+        if: ${{ env.BUILD_RELEASE == 'true' }}
         with:
           name: out-yml
           path: |

e2e/playwright/code-pane-and-errors.spec.ts

@@ -313,3 +313,45 @@ test(
     await electronApp.close()
   }
 )
+
+test(
+  'external change of file contents are reflected in editor',
+  { tag: '@electron' },
+  async ({ browserName }, testInfo) => {
+    const PROJECT_DIR_NAME = 'lee-was-here'
+    const {
+      electronApp,
+      page,
+      dir: projectsDir,
+    } = await setupElectron({
+      testInfo,
+      folderSetupFn: async (dir) => {
+        const aProjectDir = join(dir, PROJECT_DIR_NAME)
+        await fsp.mkdir(aProjectDir, { recursive: true })
+      },
+    })
+
+    const u = await getUtils(page)
+    await page.setViewportSize({ width: 1200, height: 500 })
+
+    await test.step('Open the project', async () => {
+      await expect(page.getByText(PROJECT_DIR_NAME)).toBeVisible()
+      await page.getByText(PROJECT_DIR_NAME).click()
+      await u.waitForPageLoad()
+    })
+
+    await u.openFilePanel()
+    await u.openKclCodePanel()
+
+    await test.step('Write to file externally and check for changed content', async () => {
+      const content = 'ha he ho ho ha blap scap be dap'
+      await fsp.writeFile(
+        join(projectsDir, PROJECT_DIR_NAME, 'main.kcl'),
+        content
+      )
+      await u.editorTextMatches(content)
+    })
+
+    await electronApp.close()
+  }
+)

e2e/playwright/desktop-export.spec.ts

@@ -104,7 +104,7 @@ test(
             },
             { timeout: 15_000 }
           )
-          .toBe(431341)
+          .toBeGreaterThan(300_000)
 
         // clean up output.gltf
         await fsp.rm('output.gltf')
@@ -179,7 +179,7 @@ test(
             },
             { timeout: 15_000 }
           )
-          .toBe(102040)
+          .toBeGreaterThan(100_000)
 
         // clean up output.gltf
         await fsp.rm('output.gltf')

e2e/playwright/editor-tests.spec.ts

@@ -1,6 +1,16 @@
 import { test, expect } from '@playwright/test'
+import fsp from 'fs/promises'
 import { uuidv4 } from 'lib/utils'
-import { getUtils, setup, tearDown } from './test-utils'
+import {
+  darkModeBgColor,
+  darkModePlaneColorXZ,
+  executorInputPath,
+  getUtils,
+  setup,
+  setupElectron,
+  tearDown,
+} from './test-utils'
+import { join } from 'path'
 
 test.beforeEach(async ({ context, page }, testInfo) => {
   await setup(context, page, testInfo)
@@ -974,4 +984,84 @@ test.describe('Editor tests', () => {
     |> close(%)
     |> extrude(5, %)`)
   })
+
+  test(
+    `Can use the import stdlib function on a local OBJ file`,
+    { tag: '@electron' },
+    async ({ browserName }, testInfo) => {
+      const { electronApp, page } = await setupElectron({
+        testInfo,
+        folderSetupFn: async (dir) => {
+          const bracketDir = join(dir, 'cube')
+          await fsp.mkdir(bracketDir, { recursive: true })
+          await fsp.copyFile(
+            executorInputPath('cube.obj'),
+            join(bracketDir, 'cube.obj')
+          )
+          await fsp.writeFile(join(bracketDir, 'main.kcl'), '')
+        },
+      })
+      const viewportSize = { width: 1200, height: 500 }
+      await page.setViewportSize(viewportSize)
+
+      // Locators and constants
+      const u = await getUtils(page)
+      const projectLink = page.getByRole('link', { name: 'cube' })
+      const gizmo = page.locator('[aria-label*=gizmo]')
+      const resetCameraButton = page.getByRole('button', { name: 'Reset view' })
+      const locationToHavColor = async (
+        position: { x: number; y: number },
+        color: [number, number, number]
+      ) => {
+        return u.getGreatestPixDiff(position, color)
+      }
+      const notTheOrigin = {
+        x: viewportSize.width * 0.55,
+        y: viewportSize.height * 0.3,
+      }
+      const origin = { x: viewportSize.width / 2, y: viewportSize.height / 2 }
+      const errorIndicators = page.locator('.cm-lint-marker-error')
+
+      await test.step(`Open the empty file, see the default planes`, async () => {
+        await projectLink.click()
+        await u.waitForPageLoad()
+        await expect
+          .poll(
+            async () => locationToHavColor(notTheOrigin, darkModePlaneColorXZ),
+            {
+              timeout: 5000,
+              message: 'XZ plane color is visible',
+            }
+          )
+          .toBeLessThan(15)
+      })
+      await test.step(`Write the import function line`, async () => {
+        await u.codeLocator.fill(`import('cube.obj')`)
+        await page.waitForTimeout(800)
+      })
+      await test.step(`Reset the camera before checking`, async () => {
+        await u.doAndWaitForCmd(async () => {
+          await gizmo.click({ button: 'right' })
+          await resetCameraButton.click()
+        }, 'zoom_to_fit')
+      })
+      await test.step(`Verify that we see the imported geometry and no errors`, async () => {
+        await expect(errorIndicators).toHaveCount(0)
+        await expect
+          .poll(async () => locationToHavColor(origin, darkModePlaneColorXZ), {
+            timeout: 3000,
+            message: 'Plane color should not be visible',
+          })
+          .toBeGreaterThan(15)
+        await expect
+          .poll(async () => locationToHavColor(origin, darkModeBgColor), {
+            timeout: 3000,
+            message: 'Background color should not be visible',
+          })
+          .toBeGreaterThan(15)
+      })
+
+      await electronApp.close()
+    }
+  )
 })

e2e/playwright/file-tree.spec.ts

@@ -960,4 +960,171 @@ _test.describe('Deleting items from the file pane', () => {
     'TODO - delete folder we are in, with no main.kcl',
     async () => {}
   )
+
+  // Copied from tests above.
+  _test(
+    `external deletion of project navigates back home`,
+    { tag: '@electron' },
+    async ({ browserName }, testInfo) => {
+      const TEST_PROJECT_NAME = 'Test Project'
+      const {
+        electronApp,
+        page,
+        dir: projectsDirName,
+      } = await setupElectron({
+        testInfo,
+        folderSetupFn: async (dir) => {
+          await fsp.mkdir(join(dir, TEST_PROJECT_NAME), { recursive: true })
+          await fsp.mkdir(join(dir, TEST_PROJECT_NAME, 'folderToDelete'), {
+            recursive: true,
+          })
+          await fsp.copyFile(
+            executorInputPath('basic_fillet_cube_end.kcl'),
+            join(dir, TEST_PROJECT_NAME, 'main.kcl')
+          )
+          await fsp.copyFile(
+            executorInputPath('cylinder.kcl'),
+            join(dir, TEST_PROJECT_NAME, 'folderToDelete', 'someFileWithin.kcl')
+          )
+        },
+      })
+      const u = await getUtils(page)
+      await page.setViewportSize({ width: 1200, height: 500 })
+
+      // Constants and locators
+      const projectCard = page.getByText(TEST_PROJECT_NAME)
+      const projectMenuButton = page.getByTestId('project-sidebar-toggle')
+      const folderToDelete = page.getByRole('button', {
+        name: 'folderToDelete',
+      })
+      const fileWithinFolder = page.getByRole('listitem').filter({
+        has: page.getByRole('button', { name: 'someFileWithin.kcl' }),
+      })
+
+      await _test.step(
+        'Open project and navigate into folderToDelete',
+        async () => {
+          await projectCard.click()
+          await u.waitForPageLoad()
+          await _expect(projectMenuButton).toContainText('main.kcl')
+          await u.closeKclCodePanel()
+          await u.openFilePanel()
+
+          await folderToDelete.click()
+          await _expect(fileWithinFolder).toBeVisible()
+          await fileWithinFolder.click()
+          await _expect(projectMenuButton).toContainText('someFileWithin.kcl')
+        }
+      )
+
+      // Point of divergence. Delete the project folder and see if it goes back
+      // to the home view.
+      await _test.step(
+        'Delete projectsDirName/<project-name> externally',
+        async () => {
+          await fsp.rm(join(projectsDirName, TEST_PROJECT_NAME), {
+            recursive: true,
+            force: true,
+          })
+        }
+      )
+
+      await _test.step('Check the app is back on the home view', async () => {
+        const projectsDirLink = page.getByText('Loaded from')
+        await _expect(projectsDirLink).toBeVisible()
+      })
+
+      await electronApp.close()
+    }
+  )
+
+  // Similar to the above
+  _test(
+    `external deletion of file in sub-directory updates the file tree and recreates it on code editor typing`,
+    { tag: '@electron' },
+    async ({ browserName }, testInfo) => {
+      const TEST_PROJECT_NAME = 'Test Project'
+      const {
+        electronApp,
+        page,
+        dir: projectsDirName,
+      } = await setupElectron({
+        testInfo,
+        folderSetupFn: async (dir) => {
+          await fsp.mkdir(join(dir, TEST_PROJECT_NAME), { recursive: true })
+          await fsp.mkdir(join(dir, TEST_PROJECT_NAME, 'folderToDelete'), {
+            recursive: true,
+          })
+          await fsp.copyFile(
+            executorInputPath('basic_fillet_cube_end.kcl'),
+            join(dir, TEST_PROJECT_NAME, 'main.kcl')
+          )
+          await fsp.copyFile(
+            executorInputPath('cylinder.kcl'),
+            join(dir, TEST_PROJECT_NAME, 'folderToDelete', 'someFileWithin.kcl')
+          )
+        },
+      })
+      const u = await getUtils(page)
+      await page.setViewportSize({ width: 1200, height: 500 })
+
+      // Constants and locators
+      const projectCard = page.getByText(TEST_PROJECT_NAME)
+      const projectMenuButton = page.getByTestId('project-sidebar-toggle')
+      const folderToDelete = page.getByRole('button', {
+        name: 'folderToDelete',
+      })
+      const fileWithinFolder = page.getByRole('listitem').filter({
+        has: page.getByRole('button', { name: 'someFileWithin.kcl' }),
+      })
+
+      await _test.step(
+        'Open project and navigate into folderToDelete',
+        async () => {
+          await projectCard.click()
+          await u.waitForPageLoad()
+          await _expect(projectMenuButton).toContainText('main.kcl')
+
+          await u.openFilePanel()
+
+          await folderToDelete.click()
+          await _expect(fileWithinFolder).toBeVisible()
+          await fileWithinFolder.click()
+          await _expect(projectMenuButton).toContainText('someFileWithin.kcl')
+        }
+      )
+
+      await _test.step(
+        'Delete projectsDirName/<project-name> externally',
+        async () => {
+          await fsp.rm(
+            join(
+              projectsDirName,
+              TEST_PROJECT_NAME,
+              'folderToDelete',
+              'someFileWithin.kcl'
+            )
+          )
+        }
+      )
+
+      await _test.step('Check the file is gone in the file tree', async () => {
+        await _expect(
+          page.getByTestId('file-pane-scroll-container')
+        ).not.toContainText('someFileWithin.kcl')
+      })
+
+      await _test.step(
+        'Check the file is back in the file tree after typing in code editor',
+        async () => {
+          await u.pasteCodeInEditor('hello = 1')
+          await _expect(
+            page.getByTestId('file-pane-scroll-container')
+          ).toContainText('someFileWithin.kcl')
+        }
+      )
+
+      await electronApp.close()
+    }
+  )
 })

e2e/playwright/projects.spec.ts

@@ -255,7 +255,7 @@ test.describe('Can export from electron app', () => {
               },
               { timeout: 15_000 }
             )
-            .toBe(431341)
+            .toBeGreaterThan(300_000)
 
           // clean up output.gltf
           await fsp.rm('output.gltf')
@@ -851,7 +851,7 @@ test(
   }
 )
 
-test(
+test.fixme(
   'When the project folder is empty, user can create new project and open it.',
   { tag: '@electron' },
   async ({ browserName }, testInfo) => {
@@ -861,6 +861,12 @@ test(
 
     page.on('console', console.log)
 
+    // Locators and constants
+    const gizmo = page.locator('[aria-label*=gizmo]')
+    const resetCameraButton = page.getByRole('button', { name: 'Reset view' })
+    const pointOnModel = { x: 660, y: 250 }
+    const expectedStartCamZPosition = 15633.47
+
     // expect to see text "No Projects found"
     await expect(page.getByText('No Projects found')).toBeVisible()
 
@@ -873,16 +879,7 @@ test(
 
     await page.getByText('project-000').click()
 
-    await expect(page.getByTestId('loading')).toBeAttached()
-    await expect(page.getByTestId('loading')).not.toBeAttached({
-      timeout: 20_000,
-    })
-
-    await expect(
-      page.getByRole('button', { name: 'Start Sketch' })
-    ).toBeEnabled({
-      timeout: 20_000,
-    })
+    await u.waitForPageLoad()
 
     await page.locator('.cm-content').fill(`sketch001 = startSketchOn('XZ')
   |> startProfileAt([-87.4, 282.92], %)
@@ -892,8 +889,28 @@ test(
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
 extrude001 = extrude(200, sketch001)`)
+    await page.waitForTimeout(800)
 
-    const pointOnModel = { x: 660, y: 250 }
+    async function getCameraZValue() {
+      return page
+        .getByTestId('cam-z-position')
+        .inputValue()
+        .then((value) => parseFloat(value))
+    }
+
+    await test.step(`Reset camera`, async () => {
+      await u.openDebugPanel()
+      await u.clearCommandLogs()
+      await u.doAndWaitForCmd(async () => {
+        await gizmo.click({ button: 'right' })
+        await resetCameraButton.click()
+      }, 'zoom_to_fit')
+      await expect
+        .poll(getCameraZValue, {
+          message: 'Camera Z should be at expected position after reset',
+        })
+        .toEqual(expectedStartCamZPosition)
+    })
 
     // gray at this pixel means the stream has loaded in the most
     // user way we can verify it (pixel color)
@@ -901,7 +918,7 @@ extrude001 = extrude(200, sketch001)`)
       .poll(() => u.getGreatestPixDiff(pointOnModel, [143, 143, 143]), {
         timeout: 10_000,
       })
-      .toBeLessThan(15)
+      .toBeLessThan(30)
 
     await expect(async () => {
       await page.mouse.move(0, 0, { steps: 5 })

e2e/playwright/snapshot-tests.spec.ts

@@ -471,7 +471,7 @@ test(
 
     await page.mouse.move(startXPx + PUR * 30, 500 - PUR * 20, { steps: 10 })
 
-    await page.waitForTimeout(300)
+    await page.waitForTimeout(1000)
 
     await expect(page).toHaveScreenshot({
       maxDiffPixels: 100,
@@ -528,6 +528,7 @@ test(
     // Draw the rectangle
     await page.mouse.click(startXPx + PUR * 20, 500 - PUR * 30)
     await page.mouse.move(startXPx + PUR * 10, 500 - PUR * 10, { steps: 5 })
+    await page.waitForTimeout(800)
 
     // Ensure the draft rectangle looks the same as it usually does
     await expect(page).toHaveScreenshot({
@@ -895,7 +896,7 @@ test(
     // Wait for the second extrusion to appear
     // 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)
+    await page.waitForTimeout(2000)
 
     await expect(page).toHaveScreenshot({
       maxDiffPixels: 100,
@@ -939,7 +940,7 @@ test(
     // Wait for the second extrusion to appear
     // 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)
+    await page.waitForTimeout(2000)
 
     await expect(page).toHaveScreenshot({
       maxDiffPixels: 100,

e2e/playwright/test-utils.ts

@@ -47,6 +47,14 @@ export const commonPoints = {
   num2: 14.44,
 }
 
+/** A semi-reliable color to check the default XZ plane on
+ * in dark mode in the default camera position
+ */
+export const darkModePlaneColorXZ: [number, number, number] = [50, 50, 99]
+
+/** A semi-reliable color to check the default dark mode bg color against */
+export const darkModeBgColor: [number, number, number] = [27, 27, 27]
+
 export const editorSelector = '[role="textbox"][data-language="kcl"]'
 type PaneId = 'variables' | 'code' | 'files' | 'logs'
 
@@ -463,6 +471,9 @@ export async function getUtils(page: Page, test_?: typeof test) {
       return test_?.step(
         `Create and select project with text "${hasText}"`,
         async () => {
+          // Without this, we get unreliable project creation. It's probably
+          // due to a race between the FS being read and clicking doing something.
+          await page.waitForTimeout(100)
           await page.getByTestId('home-new-file').click()
           const projectLinksPost = page.getByTestId('project-link')
           await projectLinksPost.filter({ hasText }).click()
@@ -492,6 +503,11 @@ export async function getUtils(page: Page, test_?: typeof test) {
 
     createNewFile: async (name: string) => {
       return test?.step(`Create a file named ${name}`, async () => {
+        // If the application is in the middle of connecting a stream
+        // then creating a new file won't work in the end.
+        await expect(
+          page.getByRole('button', { name: 'Start Sketch' })
+        ).not.toBeDisabled()
         await page.getByTestId('create-file-button').click()
         await page.getByTestId('file-rename-field').fill(name)
         await page.keyboard.press('Enter')
@@ -874,8 +890,8 @@ export async function setupElectron({
       appSettings
         ? { settings: appSettings }
         : {
-            ...TEST_SETTINGS,
             settings: {
+              ...TEST_SETTINGS,
               app: {
                 ...TEST_SETTINGS.app,
                 projectDirectory: projectDirName,

e2e/playwright/testing-settings.spec.ts

@@ -9,7 +9,7 @@ import {
   executorInputPath,
 } from './test-utils'
 import { SaveSettingsPayload, SettingsLevel } from 'lib/settings/settingsTypes'
-import { SETTINGS_FILE_NAME } from 'lib/constants'
+import { SETTINGS_FILE_NAME, PROJECT_SETTINGS_FILE_NAME } from 'lib/constants'
 import {
   TEST_SETTINGS_KEY,
   TEST_SETTINGS_CORRUPTED,
@@ -445,6 +445,58 @@ test.describe('Testing settings', () => {
     }
   )
 
+  test(
+    'project settings reload on external change',
+    { tag: '@electron' },
+    async ({ browserName }, testInfo) => {
+      const {
+        electronApp,
+        page,
+        dir: projectDirName,
+      } = await setupElectron({
+        testInfo,
+      })
+
+      await page.setViewportSize({ width: 1200, height: 500 })
+
+      const logoLink = page.getByTestId('app-logo')
+      const projectDirLink = page.getByText('Loaded from')
+
+      await test.step('Wait for project view', async () => {
+        await expect(projectDirLink).toBeVisible()
+      })
+
+      const projectLinks = page.getByTestId('project-link')
+      const oldCount = await projectLinks.count()
+      await page.getByRole('button', { name: 'New project' }).click()
+      await expect(projectLinks).toHaveCount(oldCount + 1)
+      await projectLinks.filter({ hasText: 'project-000' }).first().click()
+
+      const changeColorFs = async (color: string) => {
+        const tempSettingsFilePath = join(
+          projectDirName,
+          'project-000',
+          PROJECT_SETTINGS_FILE_NAME
+        )
+        await fsp.writeFile(
+          tempSettingsFilePath,
+          `[settings.app]\nthemeColor = "${color}"`
+        )
+      }
+
+      await test.step('Check the color is first starting as we expect', async () => {
+        await expect(logoLink).toHaveCSS('--primary-hue', '264.5')
+      })
+
+      await test.step('Check color of logo changed', async () => {
+        await changeColorFs('99')
+        await expect(logoLink).toHaveCSS('--primary-hue', '99')
+      })
+
+      await electronApp.close()
+    }
+  )
+
   test(
     `Closing settings modal should go back to the original file being viewed`,
     { tag: '@electron' },

interface.d.ts

@@ -20,10 +20,11 @@ export interface IElectronAPI {
   version: typeof process.env.version
   watchFileOn: (
     path: string,
+    key: string,
     callback: (eventType: string, path: string) => void
   ) => void
-  watchFileOff: (path: string) => void
-  readFile: (path: string) => ReturnType<fs.readFile>
+  readFile: typeof fs.readFile
+  watchFileOff: (path: string, key: string) => void
   writeFile: (
     path: string,
     data: string | Uint8Array

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zoo-modeling-app",
-  "version": "0.25.6",
+  "version": "0.26.0",
   "private": true,
   "productName": "Zoo Modeling App",
   "author": {

src/components/CommandBar/CommandArgOptionInput.tsx

@@ -135,7 +135,9 @@ function CommandArgOptionInput({
           <Combobox.Input
             id="option-input"
             ref={inputRef}
-            onChange={(event) => setQuery(event.target.value)}
+            onChange={(event) =>
+              !event.target.disabled && setQuery(event.target.value)
+            }
             className="flex-grow px-2 py-1 border-b border-b-chalkboard-100 dark:border-b-chalkboard-80 !bg-transparent focus:outline-none"
             onKeyDown={(event) => {
               if (event.metaKey && event.key === 'k')
@@ -175,9 +177,18 @@ function CommandArgOptionInput({
             <Combobox.Option
               key={option.name}
               value={option}
+              disabled={option.disabled}
               className="flex items-center gap-2 px-4 py-1 first:mt-2 last:mb-2 ui-active:bg-primary/10 dark:ui-active:bg-chalkboard-90"
             >
-              <p className="flex-grow">{option.name} </p>
+              <p
+                className={`flex-grow ${
+                  (option.disabled &&
+                    'text-chalkboard-70 dark:text-chalkboard-50 cursor-not-allowed') ||
+                  ''
+                }`}
+              >
+                {option.name}
+              </p>
               {option.value === currentOption?.value && (
                 <small className="text-chalkboard-70 dark:text-chalkboard-50">
                   current

src/components/FileTree.tsx

@@ -2,7 +2,7 @@ import type { IndexLoaderData } from 'lib/types'
 import { PATHS } from 'lib/paths'
 import { ActionButton } from './ActionButton'
 import Tooltip from './Tooltip'
-import { Dispatch, useCallback, useEffect, useRef, useState } from 'react'
+import { Dispatch, useCallback, useRef, useState } from 'react'
 import { useNavigate, useRouteLoaderData } from 'react-router-dom'
 import { Disclosure } from '@headlessui/react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
@@ -13,7 +13,6 @@ import { sortProject } from 'lib/desktopFS'
 import { FILE_EXT } from 'lib/constants'
 import { CustomIcon } from './CustomIcon'
 import { codeManager, kclManager } from 'lib/singletons'
-import { useDocumentHasFocus } from 'hooks/useDocumentHasFocus'
 import { useLspContext } from './LspProvider'
 import useHotkeyWrapper from 'lib/hotkeyWrapper'
 import { useModelingContext } from 'hooks/useModelingContext'
@@ -21,6 +20,8 @@ import { DeleteConfirmationDialog } from './ProjectCard/DeleteProjectDialog'
 import { ContextMenu, ContextMenuItem } from './ContextMenu'
 import usePlatform from 'hooks/usePlatform'
 import { FileEntry } from 'lib/project'
+import { useFileSystemWatcher } from 'hooks/useFileSystemWatcher'
+import { normalizeLineEndings } from 'lib/codeEditor'
 
 function getIndentationCSS(level: number) {
   return `calc(1rem * ${level + 1})`
@@ -131,6 +132,23 @@ const FileTreeItem = ({
   const isCurrentFile = fileOrDir.path === currentFile?.path
   const itemRef = useRef(null)
 
+  // Since every file or directory gets its own FileTreeItem, we can do this.
+  // Because subtrees only render when they are opened, that means this
+  // only listens when they open. Because this acts like a useEffect, when
+  // the ReactNodes are destroyed, so is this listener :)
+  useFileSystemWatcher(
+    async (eventType, path) => {
+      // Don't try to read a file that was removed.
+      if (isCurrentFile && eventType !== 'unlink') {
+        let code = await window.electron.readFile(path, { encoding: 'utf-8' })
+        code = normalizeLineEndings(code)
+        codeManager.updateCodeStateEditor(code)
+      }
+      fileSend({ type: 'Refresh' })
+    },
+    [fileOrDir.path]
+  )
+
   const isRenaming = fileContext.itemsBeingRenamed.includes(fileOrDir.path)
   const removeCurrentItemFromRenaming = useCallback(
     () =>
@@ -154,6 +172,13 @@ const FileTreeItem = ({
     })
   }, [fileContext.itemsBeingRenamed, fileOrDir.path, fileSend])
 
+  const clickDirectory = () => {
+    fileSend({
+      type: 'Set selected directory',
+      directory: fileOrDir,
+    })
+  }
+
   function handleKeyUp(e: React.KeyboardEvent<HTMLButtonElement>) {
     if (e.metaKey && e.key === 'Backspace') {
       // Open confirmation dialog
@@ -242,18 +267,8 @@ const FileTreeItem = ({
                   }
                   style={{ paddingInlineStart: getIndentationCSS(level) }}
                   onClick={(e) => e.currentTarget.focus()}
-                  onClickCapture={(e) =>
-                    fileSend({
-                      type: 'Set selected directory',
-                      directory: fileOrDir,
-                    })
-                  }
-                  onFocusCapture={(e) =>
-                    fileSend({
-                      type: 'Set selected directory',
-                      directory: fileOrDir,
-                    })
-                  }
+                  onClickCapture={clickDirectory}
+                  onFocusCapture={clickDirectory}
                   onKeyDown={(e) => e.key === 'Enter' && e.preventDefault()}
                   onKeyUp={handleKeyUp}
                 >
@@ -469,27 +484,30 @@ export const FileTreeInner = ({
   const loaderData = useRouteLoaderData(PATHS.FILE) as IndexLoaderData
   const { send: fileSend, context: fileContext } = useFileContext()
   const { send: modelingSend } = useModelingContext()
-  const documentHasFocus = useDocumentHasFocus()
 
-  // Refresh the file tree when the document gets focus
-  useEffect(() => {
-    fileSend({ type: 'Refresh' })
-  }, [documentHasFocus])
+  // Refresh the file tree when there are changes.
+  useFileSystemWatcher(
+    async (eventType, path) => {
+      fileSend({ type: 'Refresh' })
+    },
+    [loaderData?.project?.path, fileContext.selectedDirectory.path].filter(
+      (x: string | undefined) => x !== undefined
+    )
+  )
+
+  const clickDirectory = () => {
+    fileSend({
+      type: 'Set selected directory',
+      directory: fileContext.project,
+    })
+  }
 
   return (
     <div
       className="overflow-auto pb-12 absolute inset-0"
       data-testid="file-pane-scroll-container"
     >
-      <ul
-        className="m-0 p-0 text-sm"
-        onClickCapture={(e) => {
-          fileSend({
-            type: 'Set selected directory',
-            directory: fileContext.project,
-          })
-        }}
-      >
+      <ul className="m-0 p-0 text-sm" onClickCapture={clickDirectory}>
         {sortProject(fileContext.project?.children || []).map((fileOrDir) => (
           <FileTreeItem
             project={fileContext.project}

src/components/NetworkMachineIndicator.tsx

@@ -12,7 +12,6 @@ export const NetworkMachineIndicator = ({
   const machineCount = machineManager.machineCount()
   const reason = machineManager.noMachinesReason()
   const machines = machineManager.machines
-  console.log('react machines', machines)
 
   return isDesktop() ? (
     <Popover className="relative">
@@ -55,12 +54,6 @@ export const NetworkMachineIndicator = ({
                   <p className="text-chalkboard-60 dark:text-chalkboard-50 text-xs">
                     {machine.make_model.model}
                   </p>
-                  <p className="text-chalkboard-60 dark:text-chalkboard-50 text-xs">
-                    {machine.state.state.toUpperCase()}
-                    {machine.state.state === 'failed' && machine.state.message
-                      ? ': ' + machine.state.message
-                      : ''}
-                  </p>
                   {machine.extra &&
                     machine.extra.type === 'bambu' &&
                     machine.extra.nozzle_diameter && (
@@ -68,6 +61,17 @@ export const NetworkMachineIndicator = ({
                         Nozzle Diameter: {machine.extra.nozzle_diameter}
                       </p>
                     )}
+                  <p className="text-chalkboard-60 dark:text-chalkboard-50 text-xs">
+                    {`Status: ${machine.state.state
+                      .charAt(0)
+                      .toUpperCase()}${machine.state.state.slice(1)}`}
+                    {machine.state.state === 'failed' && machine.state.message
+                      ? ` (${machine.state.message})`
+                      : ''}
+                    {machine.state.state === 'running' && machine.progress
+                      ? ` (${Math.round(machine.progress)}%)`
+                      : ''}
+                  </p>
                 </li>
               )
             })}

src/components/SettingsAuthProvider.tsx

@@ -221,6 +221,19 @@ export const SettingsAuthProviderBase = ({
 
   useFileSystemWatcher(
     async () => {
+      // If there is a projectPath but it no longer exists it means
+      // it was exterally removed. If we let the code past this condition
+      // execute it will recreate the directory due to code in
+      // loadAndValidateSettings trying to recreate files. I do not
+      // wish to change the behavior in case anything else uses it.
+      // Go home.
+      if (loadedProject?.project?.path) {
+        if (!window.electron.exists(loadedProject?.project?.path)) {
+          navigate(PATHS.HOME)
+          return
+        }
+      }
+
       const data = await loadAndValidateSettings(loadedProject?.project?.path)
       settingsSend({
         type: 'Set all settings',
@@ -228,7 +241,9 @@ export const SettingsAuthProviderBase = ({
         doNotPersist: true,
       })
     },
-    settingsPath ? [settingsPath] : []
+    [settingsPath, loadedProject?.project?.path].filter(
+      (x: string | undefined) => x !== undefined
+    )
   )
 
   // Add settings commands to the command bar

src/hooks/useFileSystemWatcher.tsx

@@ -12,35 +12,51 @@ type Path = string
 // watcher.addListener(() => { ... }).
 
 export const useFileSystemWatcher = (
-  callback: (path: Path) => Promise<void>,
-  dependencyArray: Path[]
+  callback: (eventType: string, path: Path) => Promise<void>,
+  paths: Path[]
 ): void => {
-  // Track a ref to the callback. This is how we get the callback updated
-  // across the NodeJS<->Browser boundary.
-  const callbackRef = useRef<{ fn: (path: Path) => Promise<void> }>({
-    fn: async (_path) => {},
-  })
+  // Used to track this instance of useFileSystemWatcher.
+  // Assign to ref so it doesn't change between renders.
+  const key = useRef(Math.random().toString())
+
+  const [output, setOutput] = useState<
+    { eventType: string; path: string } | undefined
+  >(undefined)
+
+  // Used to track if paths list changes.
+  const [pathsTracked, setPathsTracked] = useState<Path[]>([])
 
   useEffect(() => {
-    callbackRef.current.fn = callback
-  }, [callback])
-
-  // Used to track if dependencyArrray changes.
-  const [dependencyArrayTracked, setDependencyArrayTracked] = useState<Path[]>(
-    []
-  )
+    if (!output) return
+    callback(output.eventType, output.path).catch(reportRejection)
+  }, [output])
 
   // On component teardown obliterate all watchers.
   useEffect(() => {
     // The hook is useless on web.
     if (!isDesktop()) return
 
+    const cbWatcher = (eventType: string, path: string) => {
+      setOutput({ eventType, path })
+    }
+
+    for (let path of pathsTracked) {
+      // Because functions don't retain refs between NodeJS-Browser I need to
+      // pass an identifying key so we can later remove it.
+      // A way to think of the function call is:
+      // "For this path, add a new handler with this key"
+      // "There can be many keys (functions) per path"
+      // Again if refs were preserved, we wouldn't need to do this. Keys
+      // gives us uniqueness.
+      window.electron.watchFileOn(path, key.current, cbWatcher)
+    }
+
     return () => {
-      for (let path of dependencyArray) {
-        window.electron.watchFileOff(path)
+      for (let path of pathsTracked) {
+        window.electron.watchFileOff(path, key.current)
       }
     }
-  }, [])
+  }, [pathsTracked])
 
   function difference<T>(l1: T[], l2: T[]): [T[], T[]] {
     return [
@@ -49,8 +65,7 @@ export const useFileSystemWatcher = (
     ]
   }
 
-  const hasDiff =
-    difference(dependencyArray, dependencyArrayTracked)[0].length !== 0
+  const hasDiff = difference(paths, pathsTracked)[0].length !== 0
 
   // Removing 1 watcher at a time is only possible because in a filesystem,
   // a path is unique (there can never be two paths with the same name).
@@ -61,19 +76,8 @@ export const useFileSystemWatcher = (
 
     if (!hasDiff) return
 
-    const [pathsRemoved, pathsRemaining] = difference(
-      dependencyArrayTracked,
-      dependencyArray
-    )
-    for (let path of pathsRemoved) {
-      window.electron.watchFileOff(path)
-    }
-    const [pathsAdded] = difference(dependencyArray, dependencyArrayTracked)
-    for (let path of pathsAdded) {
-      window.electron.watchFileOn(path, (_eventType: string, path: Path) => {
-        callbackRef.current.fn(path).catch(reportRejection)
-      })
-    }
-    setDependencyArrayTracked(pathsRemaining.concat(pathsAdded))
+    const [, pathsRemaining] = difference(pathsTracked, paths)
+    const [pathsAdded] = difference(paths, pathsTracked)
+    setPathsTracked(pathsRemaining.concat(pathsAdded))
   }, [hasDiff])
 }

src/lang/modifyAst/addFillet.test.ts

@@ -41,7 +41,7 @@ beforeAll(async () => {
       },
     })
   })
-}, 20_000)
+}, 30_000)
 
 afterAll(() => {
   engineCommandManager.tearDown()

src/lang/std/fileSystemManager.ts

@@ -18,7 +18,7 @@ class FileSystemManager {
     return Promise.resolve(window.electron.path.join(dir, path))
   }
 
-  async readFile(path: string): Promise<Uint8Array | void> {
+  async readFile(path: string): Promise<Uint8Array> {
     // Using local file system only works from desktop.
     if (!isDesktop()) {
       return Promise.reject(

src/lib/codeEditor.ts

@@ -0,0 +1,3 @@
+export const normalizeLineEndings = (str: string, normalized = '\n') => {
+  return str.replace(/\r?\n/g, normalized)
+}

src/lib/commandBarConfigs/modelingCommandConfig.ts

@@ -194,10 +194,24 @@ export const modelingMachineCommandConfig: StateMachineCommandSetConfig<
                 `${machine.id} (${
                   machine.make_model.model || machine.make_model.manufacturer
                 }) (${machine.state.state})` +
-                (machine.extra &&
-                machine.extra.type === 'bambu' &&
-                machine.extra.nozzle_diameter
-                  ? ` - Nozzle Diameter: ${machine.extra.nozzle_diameter}`
+                (machine.hardware_configuration &&
+                machine.hardware_configuration.type !== 'none' &&
+                machine.hardware_configuration.config.nozzle_diameter
+                  ? ` - Nozzle Diameter: ${machine.hardware_configuration.config.nozzle_diameter}`
+                  : '') +
+                (machine.hardware_configuration &&
+                machine.hardware_configuration.type !== 'none' &&
+                machine.hardware_configuration.config.filaments &&
+                machine.hardware_configuration.config.filaments[0]
+                  ? ` - ${
+                      machine.hardware_configuration.config.filaments[0].name
+                    } #${
+                      machine.hardware_configuration.config &&
+                      machine.hardware_configuration.config.filaments[0].color?.slice(
+                        0,
+                        6
+                      )
+                    }`
                   : ''),
               isCurrent: false,
               disabled: machine.state.state !== 'idle',

src/lib/commandTypes.ts

@@ -258,5 +258,6 @@ export type CommandArgumentWithName<
 export type CommandArgumentOption<A> = {
   name: string
   isCurrent?: boolean
+  disabled?: boolean
   value: A
 }

src/lib/desktop.ts

@@ -448,7 +448,9 @@ export const readProjectSettingsFile = async (
     }
   }
 
-  const configToml = await window.electron.readFile(settingsPath)
+  const configToml = await window.electron.readFile(settingsPath, {
+    encoding: 'utf-8',
+  })
   const configObj = parseProjectSettings(configToml)
   if (err(configObj)) {
     return Promise.reject(configObj)
@@ -467,7 +469,9 @@ export const readAppSettingsFile = async () => {
 
   // The file exists, read it and parse it.
   if (window.electron.exists(settingsPath)) {
-    const configToml = await window.electron.readFile(settingsPath)
+    const configToml = await window.electron.readFile(settingsPath, {
+      encoding: 'utf-8',
+    })
     const parsedAppConfig = parseAppSettings(configToml)
     if (err(parsedAppConfig)) {
       return Promise.reject(parsedAppConfig)
@@ -527,7 +531,9 @@ export const readTokenFile = async () => {
   let settingsPath = await getTokenFilePath()
 
   if (window.electron.exists(settingsPath)) {
-    const token: string = await window.electron.readFile(settingsPath)
+    const token: string = await window.electron.readFile(settingsPath, {
+      encoding: 'utf-8',
+    })
     if (!token) return ''
 
     return token

src/lib/routeLoaders.ts

@@ -14,6 +14,7 @@ import { codeManager } from 'lib/singletons'
 import { fileSystemManager } from 'lang/std/fileSystemManager'
 import { getProjectInfo } from './desktop'
 import { createSettings } from './settings/initialSettings'
+import { normalizeLineEndings } from 'lib/codeEditor'
 
 // The root loader simply resolves the settings and any errors that
 // occurred during the settings load
@@ -108,7 +109,9 @@ export const fileLoader: LoaderFunction = async (
         )
       }
 
-      code = await window.electron.readFile(currentFilePath)
+      code = await window.electron.readFile(currentFilePath, {
+        encoding: 'utf-8',
+      })
       code = normalizeLineEndings(code)
 
       // Update both the state and the editor's code.
@@ -182,7 +185,3 @@ export const homeLoader: LoaderFunction = async (): Promise<
   }
   return {}
 }
-
-const normalizeLineEndings = (str: string, normalized = '\n') => {
-  return str.replace(/\r?\n/g, normalized)
-}

src/main.ts

@@ -37,8 +37,6 @@ if (!process.env.NODE_ENV)
 // dotenv override when present
 dotenv.config({ path: [`.env.${NODE_ENV}.local`, `.env.${NODE_ENV}`] })
 
-console.log(process.env)
-
 process.env.VITE_KC_API_WS_MODELING_URL ??=
   'wss://api.zoo.dev/ws/modeling/commands'
 process.env.VITE_KC_API_BASE_URL ??= 'https://api.zoo.dev'

src/preload.ts

@@ -30,22 +30,51 @@ const isMac = os.platform() === 'darwin'
 const isWindows = os.platform() === 'win32'
 const isLinux = os.platform() === 'linux'
 
-let fsWatchListeners = new Map<string, ReturnType<typeof chokidar.watch>>()
+let fsWatchListeners = new Map<
+  string,
+  Map<
+    string,
+    {
+      watcher: ReturnType<typeof chokidar.watch>
+      callback: (eventType: string, path: string) => void
+    }
+  >
+>()
 
-const watchFileOn = (path: string, callback: (path: string) => void) => {
-  const watcherMaybe = fsWatchListeners.get(path)
-  if (watcherMaybe) return
-  const watcher = chokidar.watch(path)
+const watchFileOn = (
+  path: string,
+  key: string,
+  callback: (eventType: string, path: string) => void
+) => {
+  let watchers = fsWatchListeners.get(path)
+  if (!watchers) {
+    watchers = new Map()
+  }
+  const watcher = chokidar.watch(path, { depth: 1 })
   watcher.on('all', callback)
-  fsWatchListeners.set(path, watcher)
+  watchers.set(key, { watcher, callback })
+  fsWatchListeners.set(path, watchers)
 }
-const watchFileOff = (path: string) => {
-  const watcher = fsWatchListeners.get(path)
-  if (!watcher) return
-  watcher.unwatch(path)
-  fsWatchListeners.delete(path)
+const watchFileOff = (path: string, key: string) => {
+  const watchers = fsWatchListeners.get(path)
+  if (!watchers) return
+  const data = watchers.get(key)
+  if (!data) {
+    console.warn(
+      "Trying to remove a watcher, callback that doesn't exist anymore. Suspicious."
+    )
+    return
+  }
+  const { watcher, callback } = data
+  watcher.off('all', callback)
+  watchers.delete(key)
+  if (watchers.size === 0) {
+    fsWatchListeners.delete(path)
+  } else {
+    fsWatchListeners.set(path, watchers)
+  }
 }
-const readFile = (path: string) => fs.readFile(path, 'utf-8')
+const readFile = fs.readFile
 // It seems like from the node source code this does not actually block but also
 // don't trust me on that (jess).
 const exists = (path: string) => fsSync.existsSync(path)

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

@@ -494,7 +494,7 @@ impl From<&BodyItem> for SourceRange {
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Bake)]
 #[databake(path = kcl_lib::ast::types)]
 #[ts(export)]
-#[serde(untagged)]
+#[serde(tag = "type")]
 pub enum Expr {
     Literal(Box<Literal>),
     Identifier(Box<Identifier>),

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__a.snap

@@ -23,11 +23,13 @@ expression: actual
             "name": "boxSketch"
           },
           "init": {
+            "type": "PipeExpression",
             "type": "PipeExpression",
             "start": 18,
             "end": 143,
             "body": [
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 18,
                 "end": 39,
@@ -39,11 +41,13 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "ArrayExpression",
                     "type": "ArrayExpression",
                     "start": 32,
                     "end": 38,
                     "elements": [
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 33,
                         "end": 34,
@@ -51,6 +55,7 @@ expression: actual
                         "raw": "0"
                       },
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 36,
                         "end": 37,
@@ -63,6 +68,7 @@ expression: actual
                 "optional": false
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 47,
                 "end": 63,
@@ -74,11 +80,13 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "ArrayExpression",
                     "type": "ArrayExpression",
                     "start": 52,
                     "end": 59,
                     "elements": [
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 53,
                         "end": 54,
@@ -86,6 +94,7 @@ expression: actual
                         "raw": "0"
                       },
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 56,
                         "end": 58,
@@ -95,6 +104,7 @@ expression: actual
                     ]
                   },
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 61,
                     "end": 62
@@ -103,6 +113,7 @@ expression: actual
                 "optional": false
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 71,
                 "end": 96,
@@ -114,11 +125,13 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "ArrayExpression",
                     "type": "ArrayExpression",
                     "start": 85,
                     "end": 92,
                     "elements": [
                       {
+                        "type": "UnaryExpression",
                         "type": "UnaryExpression",
                         "start": 86,
                         "end": 88,
@@ -133,6 +146,7 @@ expression: actual
                         }
                       },
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 90,
                         "end": 91,
@@ -142,6 +156,7 @@ expression: actual
                     ]
                   },
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 94,
                     "end": 95
@@ -150,6 +165,7 @@ expression: actual
                 "optional": false
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 104,
                 "end": 121,
@@ -161,11 +177,13 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "ArrayExpression",
                     "type": "ArrayExpression",
                     "start": 109,
                     "end": 117,
                     "elements": [
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 110,
                         "end": 111,
@@ -173,6 +191,7 @@ expression: actual
                         "raw": "5"
                       },
                       {
+                        "type": "UnaryExpression",
                         "type": "UnaryExpression",
                         "start": 113,
                         "end": 116,
@@ -189,6 +208,7 @@ expression: actual
                     ]
                   },
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 119,
                     "end": 120
@@ -197,6 +217,7 @@ expression: actual
                 "optional": false
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 129,
                 "end": 143,
@@ -208,6 +229,7 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "Literal",
                     "type": "Literal",
                     "start": 137,
                     "end": 139,
@@ -215,6 +237,7 @@ expression: actual
                     "raw": "10"
                   },
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 141,
                     "end": 142

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__aa.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "sg"
           },
           "init": {
+            "type": "UnaryExpression",
             "type": "UnaryExpression",
             "start": 11,
             "end": 17,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ab.snap

@@ -12,6 +12,7 @@ expression: actual
       "start": 0,
       "end": 23,
       "expression": {
+        "type": "CallExpression",
         "type": "CallExpression",
         "start": 0,
         "end": 23,
@@ -23,6 +24,7 @@ expression: actual
         },
         "arguments": [
           {
+            "type": "ObjectExpression",
             "type": "ObjectExpression",
             "start": 7,
             "end": 22,
@@ -38,11 +40,13 @@ expression: actual
                   "name": "to"
                 },
                 "value": {
+                  "type": "ArrayExpression",
                   "type": "ArrayExpression",
                   "start": 13,
                   "end": 20,
                   "elements": [
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 14,
                       "end": 15,
@@ -50,6 +54,7 @@ expression: actual
                       "raw": "0"
                     },
                     {
+                      "type": "UnaryExpression",
                       "type": "UnaryExpression",
                       "start": 17,
                       "end": 19,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ac.snap

@@ -23,10 +23,12 @@ expression: actual
             "name": "myArray"
           },
           "init": {
+            "type": "ArrayRangeExpression",
             "type": "ArrayRangeExpression",
             "start": 16,
             "end": 23,
             "startElement": {
+              "type": "Literal",
               "type": "Literal",
               "start": 17,
               "end": 18,
@@ -34,6 +36,7 @@ expression: actual
               "raw": "0"
             },
             "endElement": {
+              "type": "Literal",
               "type": "Literal",
               "start": 20,
               "end": 22,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ad.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "firstPrimeNumber"
           },
           "init": {
+            "type": "FunctionExpression",
             "type": "FunctionExpression",
             "start": 27,
             "end": 57,
@@ -37,6 +38,7 @@ expression: actual
                   "start": 43,
                   "end": 51,
                   "argument": {
+                    "type": "Literal",
                     "type": "Literal",
                     "start": 50,
                     "end": 51,
@@ -57,6 +59,7 @@ expression: actual
       "start": 62,
       "end": 80,
       "expression": {
+        "type": "CallExpression",
         "type": "CallExpression",
         "start": 62,
         "end": 80,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ae.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "thing"
           },
           "init": {
+            "type": "FunctionExpression",
             "type": "FunctionExpression",
             "start": 11,
             "end": 49,
@@ -48,6 +49,7 @@ expression: actual
                   "start": 32,
                   "end": 43,
                   "argument": {
+                    "type": "Literal",
                     "type": "Literal",
                     "start": 39,
                     "end": 43,
@@ -68,6 +70,7 @@ expression: actual
       "start": 54,
       "end": 66,
       "expression": {
+        "type": "CallExpression",
         "type": "CallExpression",
         "start": 54,
         "end": 66,
@@ -79,6 +82,7 @@ expression: actual
         },
         "arguments": [
           {
+            "type": "Literal",
             "type": "Literal",
             "start": 60,
             "end": 65,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__af.snap

@@ -23,11 +23,13 @@ expression: actual
             "name": "mySketch"
           },
           "init": {
+            "type": "PipeExpression",
             "type": "PipeExpression",
             "start": 17,
             "end": 165,
             "body": [
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 17,
                 "end": 37,
@@ -39,11 +41,13 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "ArrayExpression",
                     "type": "ArrayExpression",
                     "start": 31,
                     "end": 36,
                     "elements": [
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 32,
                         "end": 33,
@@ -51,6 +55,7 @@ expression: actual
                         "raw": "0"
                       },
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 34,
                         "end": 35,
@@ -63,6 +68,7 @@ expression: actual
                 "optional": false
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 49,
                 "end": 75,
@@ -74,11 +80,13 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "ArrayExpression",
                     "type": "ArrayExpression",
                     "start": 56,
                     "end": 62,
                     "elements": [
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 57,
                         "end": 58,
@@ -86,6 +94,7 @@ expression: actual
                         "raw": "0"
                       },
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 60,
                         "end": 61,
@@ -95,11 +104,13 @@ expression: actual
                     ]
                   },
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 64,
                     "end": 65
                   },
                   {
+                    "type": "TagDeclarator",
                     "type": "TagDeclarator",
                     "start": 67,
                     "end": 74,
@@ -109,6 +120,7 @@ expression: actual
                 "optional": false
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 87,
                 "end": 104,
@@ -120,11 +132,13 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "ArrayExpression",
                     "type": "ArrayExpression",
                     "start": 94,
                     "end": 100,
                     "elements": [
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 95,
                         "end": 96,
@@ -132,6 +146,7 @@ expression: actual
                         "raw": "1"
                       },
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 98,
                         "end": 99,
@@ -141,6 +156,7 @@ expression: actual
                     ]
                   },
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 102,
                     "end": 103
@@ -149,6 +165,7 @@ expression: actual
                 "optional": false
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 116,
                 "end": 145,
@@ -160,11 +177,13 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "ArrayExpression",
                     "type": "ArrayExpression",
                     "start": 123,
                     "end": 129,
                     "elements": [
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 124,
                         "end": 125,
@@ -172,6 +191,7 @@ expression: actual
                         "raw": "1"
                       },
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 127,
                         "end": 128,
@@ -181,11 +201,13 @@ expression: actual
                     ]
                   },
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 131,
                     "end": 132
                   },
                   {
+                    "type": "TagDeclarator",
                     "type": "TagDeclarator",
                     "start": 134,
                     "end": 144,
@@ -195,6 +217,7 @@ expression: actual
                 "optional": false
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 157,
                 "end": 165,
@@ -206,6 +229,7 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 163,
                     "end": 164

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ag.snap

@@ -23,11 +23,13 @@ expression: actual
             "name": "mySketch"
           },
           "init": {
+            "type": "PipeExpression",
             "type": "PipeExpression",
             "start": 17,
             "end": 70,
             "body": [
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 17,
                 "end": 37,
@@ -39,11 +41,13 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "ArrayExpression",
                     "type": "ArrayExpression",
                     "start": 31,
                     "end": 36,
                     "elements": [
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 32,
                         "end": 33,
@@ -51,6 +55,7 @@ expression: actual
                         "raw": "0"
                       },
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 34,
                         "end": 35,
@@ -63,6 +68,7 @@ expression: actual
                 "optional": false
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 41,
                 "end": 58,
@@ -74,11 +80,13 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "ArrayExpression",
                     "type": "ArrayExpression",
                     "start": 48,
                     "end": 54,
                     "elements": [
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 49,
                         "end": 50,
@@ -86,6 +94,7 @@ expression: actual
                         "raw": "1"
                       },
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 52,
                         "end": 53,
@@ -95,6 +104,7 @@ expression: actual
                     ]
                   },
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 56,
                     "end": 57
@@ -103,6 +113,7 @@ expression: actual
                 "optional": false
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 62,
                 "end": 70,
@@ -114,6 +125,7 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 68,
                     "end": 69

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ah.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "myBox"
           },
           "init": {
+            "type": "CallExpression",
             "type": "CallExpression",
             "start": 14,
             "end": 30,
@@ -34,6 +35,7 @@ expression: actual
             },
             "arguments": [
               {
+                "type": "Identifier",
                 "type": "Identifier",
                 "start": 28,
                 "end": 29,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ai.snap

@@ -23,11 +23,13 @@ expression: actual
             "name": "myBox"
           },
           "init": {
+            "type": "PipeExpression",
             "type": "PipeExpression",
             "start": 14,
             "end": 29,
             "body": [
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 14,
                 "end": 18,
@@ -39,6 +41,7 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "Literal",
                     "type": "Literal",
                     "start": 16,
                     "end": 17,
@@ -49,6 +52,7 @@ expression: actual
                 "optional": false
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 22,
                 "end": 29,
@@ -60,6 +64,7 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "Literal",
                     "type": "Literal",
                     "start": 24,
                     "end": 25,
@@ -67,6 +72,7 @@ expression: actual
                     "raw": "2"
                   },
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 27,
                     "end": 28

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__aj.snap

@@ -23,11 +23,13 @@ expression: actual
             "name": "myBox"
           },
           "init": {
+            "type": "PipeExpression",
             "type": "PipeExpression",
             "start": 14,
             "end": 49,
             "body": [
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 14,
                 "end": 30,
@@ -39,6 +41,7 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "Identifier",
                     "type": "Identifier",
                     "start": 28,
                     "end": 29,
@@ -48,6 +51,7 @@ expression: actual
                 "optional": false
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 34,
                 "end": 49,
@@ -59,11 +63,13 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "ArrayExpression",
                     "type": "ArrayExpression",
                     "start": 39,
                     "end": 45,
                     "elements": [
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 40,
                         "end": 41,
@@ -71,6 +77,7 @@ expression: actual
                         "raw": "0"
                       },
                       {
+                        "type": "Identifier",
                         "type": "Identifier",
                         "start": 43,
                         "end": 44,
@@ -79,6 +86,7 @@ expression: actual
                     ]
                   },
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 47,
                     "end": 48

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ak.snap

@@ -12,6 +12,7 @@ expression: actual
       "start": 0,
       "end": 22,
       "expression": {
+        "type": "CallExpression",
         "type": "CallExpression",
         "start": 0,
         "end": 22,
@@ -23,6 +24,7 @@ expression: actual
         },
         "arguments": [
           {
+            "type": "ObjectExpression",
             "type": "ObjectExpression",
             "start": 7,
             "end": 21,
@@ -38,11 +40,13 @@ expression: actual
                   "name": "to"
                 },
                 "value": {
+                  "type": "ArrayExpression",
                   "type": "ArrayExpression",
                   "start": 13,
                   "end": 19,
                   "elements": [
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 14,
                       "end": 15,
@@ -50,6 +54,7 @@ expression: actual
                       "raw": "0"
                     },
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 17,
                       "end": 18,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__al.snap

@@ -12,6 +12,7 @@ expression: actual
       "start": 0,
       "end": 36,
       "expression": {
+        "type": "CallExpression",
         "type": "CallExpression",
         "start": 0,
         "end": 36,
@@ -23,6 +24,7 @@ expression: actual
         },
         "arguments": [
           {
+            "type": "ObjectExpression",
             "type": "ObjectExpression",
             "start": 7,
             "end": 35,
@@ -38,11 +40,13 @@ expression: actual
                   "name": "to"
                 },
                 "value": {
+                  "type": "ArrayExpression",
                   "type": "ArrayExpression",
                   "start": 13,
                   "end": 19,
                   "elements": [
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 14,
                       "end": 15,
@@ -50,6 +54,7 @@ expression: actual
                       "raw": "0"
                     },
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 17,
                       "end": 18,
@@ -70,11 +75,13 @@ expression: actual
                   "name": "from"
                 },
                 "value": {
+                  "type": "ArrayExpression",
                   "type": "ArrayExpression",
                   "start": 27,
                   "end": 33,
                   "elements": [
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 28,
                       "end": 29,
@@ -82,6 +89,7 @@ expression: actual
                       "raw": "3"
                     },
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 31,
                       "end": 32,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__am.snap

@@ -12,6 +12,7 @@ expression: actual
       "start": 0,
       "end": 19,
       "expression": {
+        "type": "CallExpression",
         "type": "CallExpression",
         "start": 0,
         "end": 19,
@@ -23,6 +24,7 @@ expression: actual
         },
         "arguments": [
           {
+            "type": "ObjectExpression",
             "type": "ObjectExpression",
             "start": 7,
             "end": 18,
@@ -38,11 +40,13 @@ expression: actual
                   "name": "to"
                 },
                 "value": {
+                  "type": "ArrayExpression",
                   "type": "ArrayExpression",
                   "start": 11,
                   "end": 17,
                   "elements": [
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 12,
                       "end": 13,
@@ -50,6 +54,7 @@ expression: actual
                       "raw": "0"
                     },
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 15,
                       "end": 16,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__an.snap

@@ -12,6 +12,7 @@ expression: actual
       "start": 0,
       "end": 35,
       "expression": {
+        "type": "CallExpression",
         "type": "CallExpression",
         "start": 0,
         "end": 35,
@@ -23,6 +24,7 @@ expression: actual
         },
         "arguments": [
           {
+            "type": "ObjectExpression",
             "type": "ObjectExpression",
             "start": 7,
             "end": 34,
@@ -38,11 +40,13 @@ expression: actual
                   "name": "to"
                 },
                 "value": {
+                  "type": "ArrayExpression",
                   "type": "ArrayExpression",
                   "start": 13,
                   "end": 19,
                   "elements": [
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 14,
                       "end": 15,
@@ -50,6 +54,7 @@ expression: actual
                       "raw": "0"
                     },
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 17,
                       "end": 18,
@@ -70,11 +75,13 @@ expression: actual
                   "name": "from"
                 },
                 "value": {
+                  "type": "ArrayExpression",
                   "type": "ArrayExpression",
                   "start": 27,
                   "end": 33,
                   "elements": [
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 28,
                       "end": 29,
@@ -82,6 +89,7 @@ expression: actual
                       "raw": "3"
                     },
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 31,
                       "end": 32,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ao.snap

@@ -12,6 +12,7 @@ expression: actual
       "start": 0,
       "end": 35,
       "expression": {
+        "type": "CallExpression",
         "type": "CallExpression",
         "start": 0,
         "end": 35,
@@ -23,6 +24,7 @@ expression: actual
         },
         "arguments": [
           {
+            "type": "ObjectExpression",
             "type": "ObjectExpression",
             "start": 7,
             "end": 34,
@@ -38,11 +40,13 @@ expression: actual
                   "name": "to"
                 },
                 "value": {
+                  "type": "ArrayExpression",
                   "type": "ArrayExpression",
                   "start": 13,
                   "end": 19,
                   "elements": [
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 14,
                       "end": 15,
@@ -50,6 +54,7 @@ expression: actual
                       "raw": "0"
                     },
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 17,
                       "end": 18,
@@ -70,11 +75,13 @@ expression: actual
                   "name": "from"
                 },
                 "value": {
+                  "type": "ArrayExpression",
                   "type": "ArrayExpression",
                   "start": 26,
                   "end": 32,
                   "elements": [
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 27,
                       "end": 28,
@@ -82,6 +89,7 @@ expression: actual
                       "raw": "3"
                     },
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 30,
                       "end": 31,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ap.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "mySketch"
           },
           "init": {
+            "type": "CallExpression",
             "type": "CallExpression",
             "start": 17,
             "end": 37,
@@ -34,11 +35,13 @@ expression: actual
             },
             "arguments": [
               {
+                "type": "ArrayExpression",
                 "type": "ArrayExpression",
                 "start": 31,
                 "end": 36,
                 "elements": [
                   {
+                    "type": "Literal",
                     "type": "Literal",
                     "start": 32,
                     "end": 33,
@@ -46,6 +49,7 @@ expression: actual
                     "raw": "0"
                   },
                   {
+                    "type": "Literal",
                     "type": "Literal",
                     "start": 34,
                     "end": 35,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__aq.snap

@@ -12,6 +12,7 @@ expression: actual
       "start": 0,
       "end": 28,
       "expression": {
+        "type": "CallExpression",
         "type": "CallExpression",
         "start": 0,
         "end": 28,
@@ -23,6 +24,7 @@ expression: actual
         },
         "arguments": [
           {
+            "type": "Literal",
             "type": "Literal",
             "start": 4,
             "end": 5,
@@ -30,6 +32,7 @@ expression: actual
             "raw": "5"
           },
           {
+            "type": "Literal",
             "type": "Literal",
             "start": 7,
             "end": 14,
@@ -37,6 +40,7 @@ expression: actual
             "raw": "\"hello\""
           },
           {
+            "type": "Identifier",
             "type": "Identifier",
             "start": 16,
             "end": 27,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ar.snap

@@ -12,6 +12,7 @@ expression: actual
       "start": 0,
       "end": 7,
       "expression": {
+        "type": "BinaryExpression",
         "type": "BinaryExpression",
         "start": 0,
         "end": 7,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__at.snap

@@ -12,6 +12,7 @@ expression: actual
       "start": 0,
       "end": 15,
       "expression": {
+        "type": "CallExpression",
         "type": "CallExpression",
         "start": 0,
         "end": 15,
@@ -23,11 +24,13 @@ expression: actual
         },
         "arguments": [
           {
+            "type": "ArrayExpression",
             "type": "ArrayExpression",
             "start": 5,
             "end": 11,
             "elements": [
               {
+                "type": "Literal",
                 "type": "Literal",
                 "start": 6,
                 "end": 7,
@@ -35,6 +38,7 @@ expression: actual
                 "raw": "0"
               },
               {
+                "type": "Identifier",
                 "type": "Identifier",
                 "start": 9,
                 "end": 10,
@@ -43,6 +47,7 @@ expression: actual
             ]
           },
           {
+            "type": "PipeSubstitution",
             "type": "PipeSubstitution",
             "start": 13,
             "end": 14

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__au.snap

@@ -23,11 +23,13 @@ expression: actual
             "name": "cylinder"
           },
           "init": {
+            "type": "PipeExpression",
             "type": "PipeExpression",
             "start": 17,
             "end": 107,
             "body": [
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 17,
                 "end": 36,
@@ -39,6 +41,7 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "Literal",
                     "type": "Literal",
                     "start": 31,
                     "end": 35,
@@ -49,6 +52,7 @@ expression: actual
                 "optional": false
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 44,
                 "end": 85,
@@ -60,6 +64,7 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "ObjectExpression",
                     "type": "ObjectExpression",
                     "start": 51,
                     "end": 81,
@@ -75,11 +80,13 @@ expression: actual
                           "name": "center"
                         },
                         "value": {
+                          "type": "ArrayExpression",
                           "type": "ArrayExpression",
                           "start": 61,
                           "end": 67,
                           "elements": [
                             {
+                              "type": "Literal",
                               "type": "Literal",
                               "start": 62,
                               "end": 63,
@@ -87,6 +94,7 @@ expression: actual
                               "raw": "0"
                             },
                             {
+                              "type": "Literal",
                               "type": "Literal",
                               "start": 65,
                               "end": 66,
@@ -107,6 +115,7 @@ expression: actual
                           "name": "radius"
                         },
                         "value": {
+                          "type": "Literal",
                           "type": "Literal",
                           "start": 77,
                           "end": 79,
@@ -117,6 +126,7 @@ expression: actual
                     ]
                   },
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 83,
                     "end": 84
@@ -125,6 +135,7 @@ expression: actual
                 "optional": false
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 93,
                 "end": 107,
@@ -136,6 +147,7 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "Literal",
                     "type": "Literal",
                     "start": 101,
                     "end": 103,
@@ -143,6 +155,7 @@ expression: actual
                     "raw": "14"
                   },
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 105,
                     "end": 106

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__av.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "f"
           },
           "init": {
+            "type": "FunctionExpression",
             "type": "FunctionExpression",
             "start": 7,
             "end": 49,
@@ -48,6 +49,7 @@ expression: actual
                   "start": 21,
                   "end": 47,
                   "argument": {
+                    "type": "CallExpression",
                     "type": "CallExpression",
                     "start": 28,
                     "end": 47,
@@ -59,12 +61,14 @@ expression: actual
                     },
                     "arguments": [
                       {
+                        "type": "Identifier",
                         "type": "Identifier",
                         "start": 36,
                         "end": 41,
                         "name": "angle"
                       },
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 43,
                         "end": 46,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__aw.snap

@@ -23,11 +23,13 @@ expression: actual
             "name": "numbers"
           },
           "init": {
+            "type": "ArrayExpression",
             "type": "ArrayExpression",
             "start": 14,
             "end": 91,
             "elements": [
               {
+                "type": "Literal",
                 "type": "Literal",
                 "start": 28,
                 "end": 29,
@@ -35,6 +37,7 @@ expression: actual
                 "raw": "1"
               },
               {
+                "type": "Literal",
                 "type": "Literal",
                 "start": 79,
                 "end": 80,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ax.snap

@@ -23,11 +23,13 @@ expression: actual
             "name": "numbers"
           },
           "init": {
+            "type": "ArrayExpression",
             "type": "ArrayExpression",
             "start": 14,
             "end": 91,
             "elements": [
               {
+                "type": "Literal",
                 "type": "Literal",
                 "start": 28,
                 "end": 29,
@@ -35,6 +37,7 @@ expression: actual
                 "raw": "1"
               },
               {
+                "type": "Literal",
                 "type": "Literal",
                 "start": 43,
                 "end": 44,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ay.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "props"
           },
           "init": {
+            "type": "ObjectExpression",
             "type": "ObjectExpression",
             "start": 12,
             "end": 80,
@@ -38,6 +39,7 @@ expression: actual
                   "name": "a"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 29,
                   "end": 30,
@@ -56,6 +58,7 @@ expression: actual
                   "name": "c"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 68,
                   "end": 69,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__az.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "props"
           },
           "init": {
+            "type": "ObjectExpression",
             "type": "ObjectExpression",
             "start": 12,
             "end": 79,
@@ -38,6 +39,7 @@ expression: actual
                   "name": "a"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 29,
                   "end": 30,
@@ -56,6 +58,7 @@ expression: actual
                   "name": "c"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 68,
                   "end": 69,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__b.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "myVar"
           },
           "init": {
+            "type": "CallExpression",
             "type": "CallExpression",
             "start": 14,
             "end": 36,
@@ -34,6 +35,7 @@ expression: actual
             },
             "arguments": [
               {
+                "type": "Literal",
                 "type": "Literal",
                 "start": 18,
                 "end": 19,
@@ -41,6 +43,7 @@ expression: actual
                 "raw": "5"
               },
               {
+                "type": "UnaryExpression",
                 "type": "UnaryExpression",
                 "start": 22,
                 "end": 35,
@@ -58,6 +61,7 @@ expression: actual
                   },
                   "arguments": [
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 30,
                       "end": 31,
@@ -65,6 +69,7 @@ expression: actual
                       "raw": "5"
                     },
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 33,
                       "end": 34,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__ba.snap

@@ -23,11 +23,13 @@ expression: actual
             "name": "sketch001"
           },
           "init": {
+            "type": "PipeExpression",
             "type": "PipeExpression",
             "start": 19,
             "end": 132,
             "body": [
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 19,
                 "end": 38,
@@ -39,6 +41,7 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "Literal",
                     "type": "Literal",
                     "start": 33,
                     "end": 37,
@@ -49,6 +52,7 @@ expression: actual
                 "optional": false
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 115,
                 "end": 132,
@@ -60,6 +64,7 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 130,
                     "end": 131

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__bb.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "my14"
           },
           "init": {
+            "type": "BinaryExpression",
             "type": "BinaryExpression",
             "start": 14,
             "end": 31,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__bc.snap

@@ -23,10 +23,12 @@ expression: actual
             "name": "x"
           },
           "init": {
+            "type": "IfExpression",
             "type": "IfExpression",
             "start": 10,
             "end": 74,
             "cond": {
+              "type": "Literal",
               "type": "Literal",
               "start": 13,
               "end": 17,
@@ -43,6 +45,7 @@ expression: actual
                   "start": 32,
                   "end": 33,
                   "expression": {
+                    "type": "Literal",
                     "type": "Literal",
                     "start": 32,
                     "end": 33,
@@ -63,6 +66,7 @@ expression: actual
                   "start": 63,
                   "end": 64,
                   "expression": {
+                    "type": "Literal",
                     "type": "Literal",
                     "start": 63,
                     "end": 64,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__bd.snap

@@ -23,10 +23,12 @@ expression: actual
             "name": "x"
           },
           "init": {
+            "type": "IfExpression",
             "type": "IfExpression",
             "start": 10,
             "end": 121,
             "cond": {
+              "type": "Literal",
               "type": "Literal",
               "start": 13,
               "end": 17,
@@ -43,6 +45,7 @@ expression: actual
                   "start": 32,
                   "end": 33,
                   "expression": {
+                    "type": "Literal",
                     "type": "Literal",
                     "start": 32,
                     "end": 33,
@@ -58,6 +61,7 @@ expression: actual
                 "start": 44,
                 "end": 90,
                 "cond": {
+                  "type": "CallExpression",
                   "type": "CallExpression",
                   "start": 52,
                   "end": 64,
@@ -69,6 +73,7 @@ expression: actual
                   },
                   "arguments": [
                     {
+                      "type": "Identifier",
                       "type": "Identifier",
                       "start": 57,
                       "end": 63,
@@ -87,6 +92,7 @@ expression: actual
                       "start": 79,
                       "end": 80,
                       "expression": {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 79,
                         "end": 80,
@@ -109,6 +115,7 @@ expression: actual
                   "start": 110,
                   "end": 111,
                   "expression": {
+                    "type": "Literal",
                     "type": "Literal",
                     "start": 110,
                     "end": 111,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__be.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "x"
           },
           "init": {
+            "type": "BinaryExpression",
             "type": "BinaryExpression",
             "start": 8,
             "end": 14,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__bf.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "x"
           },
           "init": {
+            "type": "BinaryExpression",
             "type": "BinaryExpression",
             "start": 8,
             "end": 14,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__bg.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "x"
           },
           "init": {
+            "type": "Literal",
             "type": "Literal",
             "start": 4,
             "end": 5,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__bh.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "obj"
           },
           "init": {
+            "type": "ObjectExpression",
             "type": "ObjectExpression",
             "start": 12,
             "end": 42,
@@ -38,11 +39,13 @@ expression: actual
                   "name": "center"
                 },
                 "value": {
+                  "type": "ArrayExpression",
                   "type": "ArrayExpression",
                   "start": 22,
                   "end": 30,
                   "elements": [
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 23,
                       "end": 25,
@@ -50,6 +53,7 @@ expression: actual
                       "raw": "10"
                     },
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 27,
                       "end": 29,
@@ -70,6 +74,7 @@ expression: actual
                   "name": "radius"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 40,
                   "end": 41,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__c.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "myVar"
           },
           "init": {
+            "type": "CallExpression",
             "type": "CallExpression",
             "start": 14,
             "end": 35,
@@ -34,6 +35,7 @@ expression: actual
             },
             "arguments": [
               {
+                "type": "UnaryExpression",
                 "type": "UnaryExpression",
                 "start": 18,
                 "end": 31,
@@ -51,6 +53,7 @@ expression: actual
                   },
                   "arguments": [
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 26,
                       "end": 27,
@@ -58,6 +61,7 @@ expression: actual
                       "raw": "5"
                     },
                     {
+                      "type": "Literal",
                       "type": "Literal",
                       "start": 29,
                       "end": 30,
@@ -69,6 +73,7 @@ expression: actual
                 }
               },
               {
+                "type": "Literal",
                 "type": "Literal",
                 "start": 33,
                 "end": 34,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__d.snap

@@ -23,11 +23,13 @@ expression: actual
             "name": "myVar"
           },
           "init": {
+            "type": "PipeExpression",
             "type": "PipeExpression",
             "start": 14,
             "end": 36,
             "body": [
               {
+                "type": "BinaryExpression",
                 "type": "BinaryExpression",
                 "start": 14,
                 "end": 19,
@@ -50,6 +52,7 @@ expression: actual
                 }
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 23,
                 "end": 36,
@@ -61,6 +64,7 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "Literal",
                     "type": "Literal",
                     "start": 30,
                     "end": 32,
@@ -68,6 +72,7 @@ expression: actual
                     "raw": "45"
                   },
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 34,
                     "end": 35

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__d2.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "x"
           },
           "init": {
+            "type": "BinaryExpression",
             "type": "BinaryExpression",
             "start": 10,
             "end": 27,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__e.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "x"
           },
           "init": {
+            "type": "BinaryExpression",
             "type": "BinaryExpression",
             "start": 8,
             "end": 18,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__f.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "x"
           },
           "init": {
+            "type": "Literal",
             "type": "Literal",
             "start": 10,
             "end": 11,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__g.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "x"
           },
           "init": {
+            "type": "FunctionExpression",
             "type": "FunctionExpression",
             "start": 7,
             "end": 58,
@@ -37,6 +38,7 @@ expression: actual
                   "start": 23,
                   "end": 32,
                   "argument": {
+                    "type": "Identifier",
                     "type": "Identifier",
                     "start": 30,
                     "end": 32,
@@ -49,6 +51,7 @@ expression: actual
                   "start": 41,
                   "end": 50,
                   "argument": {
+                    "type": "Identifier",
                     "type": "Identifier",
                     "start": 48,
                     "end": 50,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__h.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "obj"
           },
           "init": {
+            "type": "ObjectExpression",
             "type": "ObjectExpression",
             "start": 12,
             "end": 26,
@@ -38,6 +39,7 @@ expression: actual
                   "name": "a"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 17,
                   "end": 18,
@@ -56,6 +58,7 @@ expression: actual
                   "name": "b"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 23,
                   "end": 24,
@@ -86,6 +89,7 @@ expression: actual
             "name": "height"
           },
           "init": {
+            "type": "BinaryExpression",
             "type": "BinaryExpression",
             "start": 46,
             "end": 55,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__i.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "obj"
           },
           "init": {
+            "type": "ObjectExpression",
             "type": "ObjectExpression",
             "start": 12,
             "end": 26,
@@ -38,6 +39,7 @@ expression: actual
                   "name": "a"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 17,
                   "end": 18,
@@ -56,6 +58,7 @@ expression: actual
                   "name": "b"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 23,
                   "end": 24,
@@ -86,6 +89,7 @@ expression: actual
             "name": "height"
           },
           "init": {
+            "type": "BinaryExpression",
             "type": "BinaryExpression",
             "start": 47,
             "end": 59,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__j.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "obj"
           },
           "init": {
+            "type": "ObjectExpression",
             "type": "ObjectExpression",
             "start": 12,
             "end": 26,
@@ -38,6 +39,7 @@ expression: actual
                   "name": "a"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 17,
                   "end": 18,
@@ -56,6 +58,7 @@ expression: actual
                   "name": "b"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 23,
                   "end": 24,
@@ -86,6 +89,7 @@ expression: actual
             "name": "height"
           },
           "init": {
+            "type": "BinaryExpression",
             "type": "BinaryExpression",
             "start": 46,
             "end": 58,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__k.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "obj"
           },
           "init": {
+            "type": "ObjectExpression",
             "type": "ObjectExpression",
             "start": 12,
             "end": 26,
@@ -38,6 +39,7 @@ expression: actual
                   "name": "a"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 17,
                   "end": 18,
@@ -56,6 +58,7 @@ expression: actual
                   "name": "b"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 23,
                   "end": 24,
@@ -86,11 +89,13 @@ expression: actual
             "name": "height"
           },
           "init": {
+            "type": "ArrayExpression",
             "type": "ArrayExpression",
             "start": 46,
             "end": 63,
             "elements": [
               {
+                "type": "BinaryExpression",
                 "type": "BinaryExpression",
                 "start": 47,
                 "end": 59,
@@ -127,6 +132,7 @@ expression: actual
                 }
               },
               {
+                "type": "Literal",
                 "type": "Literal",
                 "start": 61,
                 "end": 62,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__l.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "obj"
           },
           "init": {
+            "type": "ObjectExpression",
             "type": "ObjectExpression",
             "start": 12,
             "end": 26,
@@ -38,6 +39,7 @@ expression: actual
                   "name": "a"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 17,
                   "end": 18,
@@ -56,6 +58,7 @@ expression: actual
                   "name": "b"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 23,
                   "end": 24,
@@ -86,11 +89,13 @@ expression: actual
             "name": "height"
           },
           "init": {
+            "type": "ArrayExpression",
             "type": "ArrayExpression",
             "start": 46,
             "end": 63,
             "elements": [
               {
+                "type": "BinaryExpression",
                 "type": "BinaryExpression",
                 "start": 47,
                 "end": 59,
@@ -127,6 +132,7 @@ expression: actual
                 }
               },
               {
+                "type": "Literal",
                 "type": "Literal",
                 "start": 61,
                 "end": 62,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__m.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "obj"
           },
           "init": {
+            "type": "ObjectExpression",
             "type": "ObjectExpression",
             "start": 12,
             "end": 26,
@@ -38,6 +39,7 @@ expression: actual
                   "name": "a"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 17,
                   "end": 18,
@@ -56,6 +58,7 @@ expression: actual
                   "name": "b"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 23,
                   "end": 24,
@@ -86,11 +89,13 @@ expression: actual
             "name": "height"
           },
           "init": {
+            "type": "ArrayExpression",
             "type": "ArrayExpression",
             "start": 46,
             "end": 62,
             "elements": [
               {
+                "type": "BinaryExpression",
                 "type": "BinaryExpression",
                 "start": 47,
                 "end": 58,
@@ -127,6 +132,7 @@ expression: actual
                 }
               },
               {
+                "type": "Literal",
                 "type": "Literal",
                 "start": 60,
                 "end": 61,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__n.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "height"
           },
           "init": {
+            "type": "BinaryExpression",
             "type": "BinaryExpression",
             "start": 15,
             "end": 24,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__o.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "six"
           },
           "init": {
+            "type": "BinaryExpression",
             "type": "BinaryExpression",
             "start": 12,
             "end": 21,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__p.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "five"
           },
           "init": {
+            "type": "BinaryExpression",
             "type": "BinaryExpression",
             "start": 13,
             "end": 22,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__q.snap

@@ -23,11 +23,13 @@ expression: actual
             "name": "height"
           },
           "init": {
+            "type": "ArrayExpression",
             "type": "ArrayExpression",
             "start": 15,
             "end": 30,
             "elements": [
               {
+                "type": "MemberExpression",
                 "type": "MemberExpression",
                 "start": 17,
                 "end": 25,
@@ -49,6 +51,7 @@ expression: actual
                 "computed": false
               },
               {
+                "type": "Literal",
                 "type": "Literal",
                 "start": 27,
                 "end": 28,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__r.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "obj"
           },
           "init": {
+            "type": "ObjectExpression",
             "type": "ObjectExpression",
             "start": 12,
             "end": 26,
@@ -38,6 +39,7 @@ expression: actual
                   "name": "a"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 17,
                   "end": 18,
@@ -56,6 +58,7 @@ expression: actual
                   "name": "b"
                 },
                 "value": {
+                  "type": "Literal",
                   "type": "Literal",
                   "start": 23,
                   "end": 24,
@@ -86,6 +89,7 @@ expression: actual
             "name": "height"
           },
           "init": {
+            "type": "MemberExpression",
             "type": "MemberExpression",
             "start": 46,
             "end": 54,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__s.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "prop"
           },
           "init": {
+            "type": "MemberExpression",
             "type": "MemberExpression",
             "start": 13,
             "end": 27,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__t.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "pt1"
           },
           "init": {
+            "type": "MemberExpression",
             "type": "MemberExpression",
             "start": 12,
             "end": 17,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__u.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "prop"
           },
           "init": {
+            "type": "MemberExpression",
             "type": "MemberExpression",
             "start": 13,
             "end": 34,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__v.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "pt1"
           },
           "init": {
+            "type": "MemberExpression",
             "type": "MemberExpression",
             "start": 12,
             "end": 17,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__w.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "pt1"
           },
           "init": {
+            "type": "MemberExpression",
             "type": "MemberExpression",
             "start": 12,
             "end": 22,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__x.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "pt1"
           },
           "init": {
+            "type": "MemberExpression",
             "type": "MemberExpression",
             "start": 12,
             "end": 19,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__y.snap

@@ -23,6 +23,7 @@ expression: actual
             "name": "sg"
           },
           "init": {
+            "type": "CallExpression",
             "type": "CallExpression",
             "start": 11,
             "end": 29,
@@ -34,6 +35,7 @@ expression: actual
             },
             "arguments": [
               {
+                "type": "Identifier",
                 "type": "Identifier",
                 "start": 25,
                 "end": 28,

src/wasm-lib/kcl/src/parser/snapshots/kcl_lib__parser__parser_impl__snapshot_tests__z.snap

@@ -23,11 +23,13 @@ expression: actual
             "name": "sg"
           },
           "init": {
+            "type": "PipeExpression",
             "type": "PipeExpression",
             "start": 11,
             "end": 53,
             "body": [
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 11,
                 "end": 29,
@@ -39,6 +41,7 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "Identifier",
                     "type": "Identifier",
                     "start": 25,
                     "end": 28,
@@ -48,6 +51,7 @@ expression: actual
                 "optional": false
               },
               {
+                "type": "CallExpression",
                 "type": "CallExpression",
                 "start": 33,
                 "end": 53,
@@ -59,11 +63,13 @@ expression: actual
                 },
                 "arguments": [
                   {
+                    "type": "ArrayExpression",
                     "type": "ArrayExpression",
                     "start": 38,
                     "end": 49,
                     "elements": [
                       {
+                        "type": "Literal",
                         "type": "Literal",
                         "start": 39,
                         "end": 40,
@@ -71,6 +77,7 @@ expression: actual
                         "raw": "0"
                       },
                       {
+                        "type": "UnaryExpression",
                         "type": "UnaryExpression",
                         "start": 42,
                         "end": 48,
@@ -86,6 +93,7 @@ expression: actual
                     ]
                   },
                   {
+                    "type": "PipeSubstitution",
                     "type": "PipeSubstitution",
                     "start": 51,
                     "end": 52