Merge branch 'main' into pierremtb/codeowners

.github/CODEOWNERS

@@ -0,0 +1 @@
+*   @KittyCAD/frontend

.github/workflows/build-apps.yml

@@ -362,17 +362,6 @@ jobs:
       - name: List artifacts
         run: "ls -R out"
 
-      - name: Set more complete nightly release notes
-        if: ${{ env.IS_NIGHTLY == 'true' }}
-        run: |
-          # Note: preferred going this way instead of a full clone in the checkout step,
-          # see https://github.com/actions/checkout/issues/1471
-          git fetch --prune --unshallow --tags
-          export TAG="nightly-${VERSION}"
-          export PREVIOUS_TAG=$(git describe --tags --match="nightly-v[0-9]*" --abbrev=0)
-          export NOTES=$(./scripts/get-nightly-changelog.sh)
-          yarn files:set-notes
-
       - name: Authenticate to Google Cloud
         if: ${{ env.IS_NIGHTLY == 'true' }}
         uses: 'google-github-actions/auth@v2.1.7'
@@ -393,18 +382,3 @@ jobs:
           glob: '*'
           parent: false
           destination: 'dl.kittycad.io/releases/modeling-app/nightly'
-
-      - name: Invalidate bucket cache on latest*.yml and last_download.json files
-        if: ${{ env.IS_NIGHTLY == 'true' }}
-        run: yarn files:invalidate-bucket:nightly
-
-      - name: Tag nightly commit
-        if: ${{ env.IS_NIGHTLY == 'true' }}
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const { VERSION } = process.env          
-            const { owner, repo } = context.repo
-            const { sha } = context
-            const ref = `refs/tags/nightly-${VERSION}`
-            github.rest.git.createRef({ owner, repo, sha, ref })

.github/workflows/e2e-tests.yml

@@ -68,7 +68,7 @@ jobs:
     - name: Download Wasm Cache
       id: download-wasm
       if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      uses: dawidd6/action-download-artifact@v7
+      uses: dawidd6/action-download-artifact@v6
       continue-on-error: true
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
@@ -255,7 +255,7 @@ jobs:
     - name: Download Wasm Cache
       id: download-wasm
       if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      uses: dawidd6/action-download-artifact@v7
+      uses: dawidd6/action-download-artifact@v6
       continue-on-error: true
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}

.github/workflows/publish-apps-release.yml

@@ -126,7 +126,11 @@ jobs:
           destination: 'dl.kittycad.io/releases/modeling-app'
 
       - name: Invalidate bucket cache on latest*.yml and last_download.json files
-        run: yarn files:invalidate-bucket
+        run: |
+          gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/last_download.json" --async
+          gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/latest-linux-arm64.yml" --async
+          gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/latest-mac.yml" --async
+          gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/latest.yml" --async
 
       - name: Upload release files to Github
         if: ${{ github.event_name == 'release' }}

.gitignore

@@ -61,7 +61,6 @@ Mac_App_Distribution.provisionprofile
 *.tsbuildinfo
 src/wasm-lib/pkg
 
-.eslintcache
 venv
 .vite/
 

.nvmrc

@@ -1 +1 @@
-v22.12.0
+v21.7.3

INSTALL.md

@@ -1,43 +0,0 @@
-# Setting Up Zoo Modeling App
-
-Compared to other CAD software, getting Zoo Modeling App up and running is quick and straightforward across platforms. It's about 100MB to download and is quick to install.
-
-## Windows
-
-1. Download the [Zoo Modeling App installer](https://zoo.dev/modeling-app/download) for Windows and for your processor type.
-
-2. Once downloaded, run the installer `Zoo Modeling App-{version}-{arch}-win.exe` which should take a few seconds.
-
-3. The installation happens at `C:\Program Files\Zoo Modeling App`. A shortcut in the start menu is also created so you can run the app easily by clicking on it.
-
-## macOS
-
-1. Download the [Zoo Modeling App installer](https://zoo.dev/modeling-app/download) for macOS and for your processor type.
-
-2. Once downloaded, open the disk image `Zoo Modeling App-{version}-{arch}-mac.dmg` and drag the applications to your `Applications` directory.
-
-3. You can then open your `Applications` directory and double-click on `Zoo Modeling App` to open.
-
-
-## Linux 
-
-1. Download the [Zoo Modeling App installer](https://zoo.dev/modeling-app/download) for Linux and for your processor type.
-
-2. Install the dependencies needed to run the [AppImage format](https://appimage.org/).
-    -  On Ubuntu, install the FUSE library with these commands in a terminal.
-       ```bash
-       sudo apt update
-       sudo apt install libfuse2
-       ```
-    - Optionally, follow [these steps](https://github.com/probonopd/go-appimage/blob/master/src/appimaged/README.md#initial-setup) to install `appimaged`. It is a daemon that makes interacting with AppImage files more seamless. 
-    - Once installed, copy the downloaded `Zoo Modeling App-{version}-{arch}-linux.AppImage` to the directory of your choice, for instance `~/Applications`.
-
-   - `appimaged` should automatically find it and make it executable. If not, run:
-     ```bash
-     chmod a+x ~/Applications/Zoo\ Modeling\ App-{version}-{arch}-linux.AppImage
-     ```
-
-3. You can double-click on the AppImage to run it, or in a terminal with this command:
-   ```bash
-    ~/Applications/Zoo\ Modeling\ App-{version}-{arch}-linux.AppImage
-   ```

README.md

@@ -99,7 +99,7 @@ yarn tron:start
 
 This will start the application and hot-reload on changes.
 
-Devtools can be opened with the usual Cmd-Opt-I (Mac) or Ctrl-Shift-I (Linux and Windows).
+Devtools can be opened with the usual Cmd/Ctrl-Shift-I.
 
 To build, run `yarn tron:package`.
 

docs/kcl/modules.md

@@ -12,7 +12,7 @@ to other modules.
 
 ```
 // util.kcl
-export fn increment(x) {
+export fn increment = (x) => {
   return x + 1
 }
 ```
@@ -37,11 +37,11 @@ Multiple functions can be exported in a file.
 
 ```
 // util.kcl
-export fn increment(x) {
+export fn increment = (x) => {
   return x + 1
 }
 
-export fn decrement(x) {
+export fn decrement = (x) => {
   return x - 1
 }
 ```

docs/kcl/types.md

@@ -54,7 +54,7 @@ We also have support for defining your own functions. Functions can take in any
 type of argument. Below is an example of the syntax:
 
 ```
-fn myFn(x) {
+fn myFn = (x) => {
   return x
 }
 ```
@@ -118,7 +118,7 @@ use the tag `rectangleSegmentA001` in any function or expression in the file.
 However if the code was written like this:
 
 ```
-fn rect(origin) {
+fn rect = (origin) => {
   return startSketchOn('XZ')
     |> startProfileAt(origin, %)
     |> angledLine([0, 191.26], %, $rectangleSegmentA001)
@@ -146,7 +146,7 @@ Tags are accessible through the sketch group they are declared in.
 For example the following code works.
 
 ```
-fn rect(origin) {
+fn rect = (origin) => {
   return startSketchOn('XZ')
     |> startProfileAt(origin, %)
     |> angledLine([0, 191.26], %, $rectangleSegmentA001)

docs/kcl/types/BinaryOperator.md

@@ -0,0 +1,161 @@
+---
+title: "BinaryOperator"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+**This schema accepts exactly one of the following:**
+
+Add two numbers.
+
+**enum:** `+`
+
+
+
+
+
+
+
+
+----
+Subtract two numbers.
+
+**enum:** `-`
+
+
+
+
+
+
+
+
+----
+Multiply two numbers.
+
+**enum:** `*`
+
+
+
+
+
+
+
+
+----
+Divide two numbers.
+
+**enum:** `/`
+
+
+
+
+
+
+
+
+----
+Modulo two numbers.
+
+**enum:** `%`
+
+
+
+
+
+
+
+
+----
+Raise a number to a power.
+
+**enum:** `^`
+
+
+
+
+
+
+
+
+----
+Are two numbers equal?
+
+**enum:** `==`
+
+
+
+
+
+
+
+
+----
+Are two numbers not equal?
+
+**enum:** `!=`
+
+
+
+
+
+
+
+
+----
+Is left greater than right
+
+**enum:** `>`
+
+
+
+
+
+
+
+
+----
+Is left greater than or equal to right
+
+**enum:** `>=`
+
+
+
+
+
+
+
+
+----
+Is left less than right
+
+**enum:** `<`
+
+
+
+
+
+
+
+
+----
+Is left less than or equal to right
+
+**enum:** `<=`
+
+
+
+
+
+
+
+
+----
+
+
+
+

docs/kcl/types/BinaryPart.md

@@ -0,0 +1,160 @@
+---
+title: "BinaryPart"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+**This schema accepts exactly one of the following:**
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Literal`|  | No |
+| `value` |[`LiteralValue`](/docs/kcl/types/LiteralValue)|  | No |
+| `raw` |`string`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: [`Identifier`](/docs/kcl/types/Identifier)|  | No |
+| `name` |`string`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `BinaryExpression`|  | No |
+| `operator` |[`BinaryOperator`](/docs/kcl/types/BinaryOperator)|  | No |
+| `left` |[`BinaryPart`](/docs/kcl/types/BinaryPart)|  | No |
+| `right` |[`BinaryPart`](/docs/kcl/types/BinaryPart)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `CallExpression`|  | No |
+| `callee` |[`Identifier`](/docs/kcl/types/Identifier)|  | No |
+| `arguments` |`[` [`Expr`](/docs/kcl/types/Expr) `]`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `UnaryExpression`|  | No |
+| `operator` |[`UnaryOperator`](/docs/kcl/types/UnaryOperator)|  | No |
+| `argument` |[`BinaryPart`](/docs/kcl/types/BinaryPart)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `MemberExpression`|  | No |
+| `object` |[`MemberObject`](/docs/kcl/types/MemberObject)|  | No |
+| `property` |[`LiteralIdentifier`](/docs/kcl/types/LiteralIdentifier)|  | No |
+| `computed` |`boolean`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `IfExpression`|  | No |
+| `cond` |[`Expr`](/docs/kcl/types/Expr)|  | No |
+| `then_val` |[`Program`](/docs/kcl/types/Program)|  | No |
+| `else_ifs` |`[` [`ElseIf`](/docs/kcl/types/ElseIf) `]`|  | No |
+| `final_else` |[`Program`](/docs/kcl/types/Program)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+
+
+

docs/kcl/types/BodyItem.md

@@ -0,0 +1,97 @@
+---
+title: "BodyItem"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+**This schema accepts exactly one of the following:**
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `ImportStatement`|  | No |
+| `items` |`[` [`ImportItem`](/docs/kcl/types/ImportItem) `]`|  | No |
+| `path` |`string`|  | No |
+| `raw_path` |`string`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `ExpressionStatement`|  | No |
+| `expression` |[`Expr`](/docs/kcl/types/Expr)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `VariableDeclaration`|  | No |
+| `declarations` |`[` [`VariableDeclarator`](/docs/kcl/types/VariableDeclarator) `]`|  | No |
+| `visibility` |[`ItemVisibility`](/docs/kcl/types/ItemVisibility)|  | No |
+| `kind` |[`VariableKind`](/docs/kcl/types/VariableKind)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `ReturnStatement`|  | No |
+| `argument` |[`Expr`](/docs/kcl/types/Expr)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+
+
+

docs/kcl/types/CommentStyle.md

@@ -0,0 +1,41 @@
+---
+title: "CommentStyle"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+**This schema accepts exactly one of the following:**
+
+Like // foo
+
+**enum:** `line`
+
+
+
+
+
+
+
+
+----
+Like /* foo */
+
+**enum:** `block`
+
+
+
+
+
+
+
+
+----
+
+
+
+

docs/kcl/types/ElseIf.md

@@ -0,0 +1,24 @@
+---
+title: "ElseIf"
+excerpt: ""
+layout: manual
+---
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `cond` |[`Expr`](/docs/kcl/types/Expr)|  | No |
+| `then_val` |[`Program`](/docs/kcl/types/Program)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+

docs/kcl/types/EnvironmentRef.md

@@ -0,0 +1,16 @@
+---
+title: "EnvironmentRef"
+excerpt: "An index pointing to an environment."
+layout: manual
+---
+
+An index pointing to an environment.
+
+**Type:** `integer` (`uint`)
+
+
+
+
+
+
+

docs/kcl/types/Expr.md

@@ -0,0 +1,317 @@
+---
+title: "Expr"
+excerpt: "An expression can be evaluated to yield a single KCL value."
+layout: manual
+---
+
+An expression can be evaluated to yield a single KCL value.
+
+
+
+
+
+**This schema accepts exactly one of the following:**
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Literal`|  | No |
+| `value` |[`LiteralValue`](/docs/kcl/types/LiteralValue)| An expression can be evaluated to yield a single KCL value. | No |
+| `raw` |`string`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: [`Identifier`](/docs/kcl/types/Identifier)|  | No |
+| `name` |`string`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: [`TagDeclarator`](/docs/kcl/types#tag-declaration)|  | No |
+| `value` |`string`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `BinaryExpression`|  | No |
+| `operator` |[`BinaryOperator`](/docs/kcl/types/BinaryOperator)| An expression can be evaluated to yield a single KCL value. | No |
+| `left` |[`BinaryPart`](/docs/kcl/types/BinaryPart)| An expression can be evaluated to yield a single KCL value. | No |
+| `right` |[`BinaryPart`](/docs/kcl/types/BinaryPart)| An expression can be evaluated to yield a single KCL value. | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: [`FunctionExpression`](/docs/kcl/types/FunctionExpression)|  | No |
+| `params` |`[` [`Parameter`](/docs/kcl/types/Parameter) `]`|  | No |
+| `body` |[`Program`](/docs/kcl/types/Program)| An expression can be evaluated to yield a single KCL value. | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `CallExpression`|  | No |
+| `callee` |[`Identifier`](/docs/kcl/types/Identifier)| An expression can be evaluated to yield a single KCL value. | No |
+| `arguments` |`[` [`Expr`](/docs/kcl/types/Expr) `]`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `PipeExpression`|  | No |
+| `body` |`[` [`Expr`](/docs/kcl/types/Expr) `]`|  | No |
+| `nonCodeMeta` |[`NonCodeMeta`](/docs/kcl/types/NonCodeMeta)| An expression can be evaluated to yield a single KCL value. | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `PipeSubstitution`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `ArrayExpression`|  | No |
+| `elements` |`[` [`Expr`](/docs/kcl/types/Expr) `]`|  | No |
+| `nonCodeMeta` |[`NonCodeMeta`](/docs/kcl/types/NonCodeMeta)| An expression can be evaluated to yield a single KCL value. | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `ArrayRangeExpression`|  | No |
+| `startElement` |[`Expr`](/docs/kcl/types/Expr)| An expression can be evaluated to yield a single KCL value. | No |
+| `endElement` |[`Expr`](/docs/kcl/types/Expr)| An expression can be evaluated to yield a single KCL value. | No |
+| `endInclusive` |`boolean`| Is the `end_element` included in the range? | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `ObjectExpression`|  | No |
+| `properties` |`[` [`ObjectProperty`](/docs/kcl/types/ObjectProperty) `]`|  | No |
+| `nonCodeMeta` |[`NonCodeMeta`](/docs/kcl/types/NonCodeMeta)| An expression can be evaluated to yield a single KCL value. | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `MemberExpression`|  | No |
+| `object` |[`MemberObject`](/docs/kcl/types/MemberObject)| An expression can be evaluated to yield a single KCL value. | No |
+| `property` |[`LiteralIdentifier`](/docs/kcl/types/LiteralIdentifier)| An expression can be evaluated to yield a single KCL value. | No |
+| `computed` |`boolean`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `UnaryExpression`|  | No |
+| `operator` |[`UnaryOperator`](/docs/kcl/types/UnaryOperator)| An expression can be evaluated to yield a single KCL value. | No |
+| `argument` |[`BinaryPart`](/docs/kcl/types/BinaryPart)| An expression can be evaluated to yield a single KCL value. | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `IfExpression`|  | No |
+| `cond` |[`Expr`](/docs/kcl/types/Expr)| An expression can be evaluated to yield a single KCL value. | No |
+| `then_val` |[`Program`](/docs/kcl/types/Program)| An expression can be evaluated to yield a single KCL value. | No |
+| `else_ifs` |`[` [`ElseIf`](/docs/kcl/types/ElseIf) `]`|  | No |
+| `final_else` |[`Program`](/docs/kcl/types/Program)| An expression can be evaluated to yield a single KCL value. | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+KCL value for an optional parameter which was not given an argument. (remember, parameters are in the function declaration, arguments are in the function call/application).
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `None`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+
+
+

docs/kcl/types/FunctionExpression.md

@@ -0,0 +1,24 @@
+---
+title: "FunctionExpression"
+excerpt: ""
+layout: manual
+---
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `params` |`[` [`Parameter`](/docs/kcl/types/Parameter) `]`|  | No |
+| `body` |[`Program`](/docs/kcl/types/Program)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+

docs/kcl/types/Identifier.md

@@ -0,0 +1,23 @@
+---
+title: "Identifier"
+excerpt: ""
+layout: manual
+---
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `name` |`string`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+

docs/kcl/types/ImportItem.md

@@ -0,0 +1,24 @@
+---
+title: "ImportItem"
+excerpt: ""
+layout: manual
+---
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `name` |[`Identifier`](/docs/kcl/types/Identifier)| Name of the item to import. | No |
+| `alias` |[`Identifier`](/docs/kcl/types/Identifier)| Rename the item using an identifier after "as". | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+

docs/kcl/types/ItemVisibility.md

@@ -0,0 +1,16 @@
+---
+title: "ItemVisibility"
+excerpt: ""
+layout: manual
+---
+
+
+**enum:** `default`, `export`
+
+
+
+
+
+
+
+

docs/kcl/types/KclValue.md

@@ -317,6 +317,7 @@ Data for an imported geometry.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `Function`|  | No |
+| `expression` |[`FunctionExpression`](/docs/kcl/types/FunctionExpression)| Any KCL value. | No |
 | `memory` |[`ProgramMemory`](/docs/kcl/types/ProgramMemory)| Any KCL value. | No |
 | `__meta` |`[` [`Metadata`](/docs/kcl/types/Metadata) `]`|  | No |
 

docs/kcl/types/LiteralIdentifier.md

@@ -0,0 +1,56 @@
+---
+title: "LiteralIdentifier"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+**This schema accepts exactly one of the following:**
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: [`Identifier`](/docs/kcl/types/Identifier)|  | No |
+| `name` |`string`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Literal`|  | No |
+| `value` |[`LiteralValue`](/docs/kcl/types/LiteralValue)|  | No |
+| `raw` |`string`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+
+
+

docs/kcl/types/LiteralValue.md

@@ -0,0 +1,47 @@
+---
+title: "LiteralValue"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+**This schema accepts any of the following:**
+
+
+**Type:** `number` (`double`)
+
+
+
+
+
+
+
+----
+
+**Type:** `string`
+
+
+
+
+
+
+
+----
+
+**Type:** `boolean`
+
+
+
+
+
+
+
+----
+
+
+
+
+

docs/kcl/types/MemberObject.md

@@ -0,0 +1,57 @@
+---
+title: "MemberObject"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+**This schema accepts exactly one of the following:**
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `MemberExpression`|  | No |
+| `object` |[`MemberObject`](/docs/kcl/types/MemberObject)|  | No |
+| `property` |[`LiteralIdentifier`](/docs/kcl/types/LiteralIdentifier)|  | No |
+| `computed` |`boolean`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: [`Identifier`](/docs/kcl/types/Identifier)|  | No |
+| `name` |`string`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+
+----
+
+
+
+

docs/kcl/types/NonCodeMeta.md

@@ -0,0 +1,22 @@
+---
+title: "NonCodeMeta"
+excerpt: ""
+layout: manual
+---
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `nonCodeNodes` |`object`|  | No |
+| `startNodes` |`[` [`NonCodeNode`](/docs/kcl/types/NonCodeNode) `]`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+
+

docs/kcl/types/NonCodeNode.md

@@ -0,0 +1,23 @@
+---
+title: "NonCodeNode"
+excerpt: ""
+layout: manual
+---
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `value` |[`NonCodeValue`](/docs/kcl/types/NonCodeValue)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+

docs/kcl/types/NonCodeValue.md

@@ -0,0 +1,86 @@
+---
+title: "NonCodeValue"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+**This schema accepts exactly one of the following:**
+
+An inline comment. Here are examples: `1 + 1 // This is an inline comment`. `1 + 1 /* Here's another */`.
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `inlineComment`|  | No |
+| `value` |`string`|  | No |
+| `style` |[`CommentStyle`](/docs/kcl/types/CommentStyle)|  | No |
+
+
+----
+A block comment. An example of this is the following: ```python,no_run /* This is a block comment */ 1 + 1 ``` Now this is important. The block comment is attached to the next line. This is always the case. Also the block comment doesn't have a new line above it. If it did it would be a `NewLineBlockComment`.
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `blockComment`|  | No |
+| `value` |`string`|  | No |
+| `style` |[`CommentStyle`](/docs/kcl/types/CommentStyle)|  | No |
+
+
+----
+A block comment that has a new line above it. The user explicitly added a new line above the block comment.
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `newLineBlockComment`|  | No |
+| `value` |`string`|  | No |
+| `style` |[`CommentStyle`](/docs/kcl/types/CommentStyle)|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `newLine`|  | No |
+
+
+----
+
+
+
+

docs/kcl/types/ObjectProperty.md

@@ -0,0 +1,24 @@
+---
+title: "ObjectProperty"
+excerpt: ""
+layout: manual
+---
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `key` |[`Identifier`](/docs/kcl/types/Identifier)|  | No |
+| `value` |[`Expr`](/docs/kcl/types/Expr)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+

docs/kcl/types/Parameter.md

@@ -0,0 +1,23 @@
+---
+title: "Parameter"
+excerpt: "Parameter of a KCL function."
+layout: manual
+---
+
+Parameter of a KCL function.
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `identifier` |[`Identifier`](/docs/kcl/types/Identifier)| The parameter's label or name. | No |
+| `optional` |`boolean`| Is the parameter optional? | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+
+

docs/kcl/types/Program.md

@@ -0,0 +1,26 @@
+---
+title: "Program"
+excerpt: "A KCL program top level, or function body."
+layout: manual
+---
+
+A KCL program top level, or function body.
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `body` |`[` [`BodyItem`](/docs/kcl/types/BodyItem) `]`|  | No |
+| `nonCodeMeta` |[`NonCodeMeta`](/docs/kcl/types/NonCodeMeta)| A KCL program top level, or function body. | No |
+| `shebang` |[`Shebang`](/docs/kcl/types/Shebang)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+

docs/kcl/types/Shebang.md

@@ -0,0 +1,23 @@
+---
+title: "Shebang"
+excerpt: "A shebang. This is a special type of comment that is at the top of the file. It looks like this: ```python,no_run #!/usr/bin/env python ```"
+layout: manual
+---
+
+A shebang. This is a special type of comment that is at the top of the file. It looks like this: ```python,no_run #!/usr/bin/env python ```
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `content` |`string`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+

docs/kcl/types/Uint.md

@@ -0,0 +1,15 @@
+---
+title: "Uint"
+excerpt: ""
+layout: manual
+---
+
+
+**Type:** `integer` (`uint32`)
+
+
+
+
+
+
+

docs/kcl/types/UnaryOperator.md

@@ -0,0 +1,41 @@
+---
+title: "UnaryOperator"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+**This schema accepts exactly one of the following:**
+
+Negate a number.
+
+**enum:** `-`
+
+
+
+
+
+
+
+
+----
+Negate a boolean.
+
+**enum:** `!`
+
+
+
+
+
+
+
+
+----
+
+
+
+

docs/kcl/types/VariableDeclarator.md

@@ -0,0 +1,24 @@
+---
+title: "VariableDeclarator"
+excerpt: ""
+layout: manual
+---
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `id` |[`Identifier`](/docs/kcl/types/Identifier)| The identifier of the variable. | No |
+| `init` |[`Expr`](/docs/kcl/types/Expr)| The value of the variable. | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+| `start` |`integer`|  | No |
+| `end` |`integer`|  | No |
+
+

docs/kcl/types/VariableKind.md

@@ -0,0 +1,41 @@
+---
+title: "VariableKind"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+**This schema accepts exactly one of the following:**
+
+Declare a named constant.
+
+**enum:** `const`
+
+
+
+
+
+
+
+
+----
+Declare a function.
+
+**enum:** `fn`
+
+
+
+
+
+
+
+
+----
+
+
+
+

e2e/playwright/editor-tests.spec.ts

@@ -458,8 +458,8 @@ test.describe('Editor tests', () => {
 
     /* add the following code to the editor ($ error is not a valid line)
       $ error
-      topAng = 30
-      bottomAng = 25
+      const topAng = 30
+      const bottomAng = 25
      */
     await u.codeLocator.click()
     await page.keyboard.type('$ error')
@@ -474,14 +474,12 @@ test.describe('Editor tests', () => {
     await page.keyboard.type('bottomAng = 25')
     await page.keyboard.press('Enter')
 
-    // error in gutter
+    // error in guter
     await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
 
     // error text on hover
     await page.hover('.cm-lint-marker-error')
-    await expect(
-      page.getByText('Tag names must not be empty').first()
-    ).toBeVisible()
+    await expect(page.getByText('Unexpected token: $').first()).toBeVisible()
 
     // select the line that's causing the error and delete it
     await page.getByText('$ error').click()
@@ -520,10 +518,7 @@ test.describe('Editor tests', () => {
     await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
   })
 
-  // TODO currently multiple source ranges are not supported
-  test.skip('error with 2 source ranges gets 2 diagnostics', async ({
-    page,
-  }) => {
+  test('error with 2 source ranges gets 2 diagnostics', async ({ page }) => {
     const u = await getUtils(page)
     await page.addInitScript(async () => {
       localStorage.setItem(

e2e/playwright/file-tree.spec.ts

@@ -45,6 +45,7 @@ test.describe('integrations tests', () => {
             {
               title: 'test-sample',
               fileCount: 1,
+              folderCount: 1,
             },
           ],
           sortBy: 'last-modified-desc',
@@ -232,6 +233,7 @@ test.describe('when using the file tree to', () => {
             {
               title: projectName,
               fileCount: 2,
+              folderCount: 2, // TODO: This is a pre-existing bug, there are no folders within the project
             },
           ],
           sortBy: 'last-modified-desc',

e2e/playwright/fixtures/homePageFixture.ts

@@ -4,6 +4,7 @@ import { expect } from '@playwright/test'
 interface ProjectCardState {
   title: string
   fileCount: number
+  folderCount: number
 }
 
 interface HomePageState {
@@ -60,13 +61,15 @@ export class HomePageFixture {
     const projectCards = await this.projectCard.all()
     const projectCardStates: Array<ProjectCardState> = []
     for (const projectCard of projectCards) {
-      const [title, fileCount] = await Promise.all([
+      const [title, fileCount, folderCount] = await Promise.all([
         (await projectCard.locator(this.projectCardTitle).textContent()) || '',
         Number(await projectCard.locator(this.projectCardFile).textContent()),
+        Number(await projectCard.locator(this.projectCardFolder).textContent()),
       ])
       projectCardStates.push({
         title: title,
         fileCount,
+        folderCount,
       })
     }
     return projectCardStates

e2e/playwright/fixtures/toolbarFixture.ts

@@ -6,8 +6,6 @@ export class ToolbarFixture {
   public page: Page
 
   extrudeButton!: Locator
-  loftButton!: Locator
-  shellButton!: Locator
   offsetPlaneButton!: Locator
   startSketchBtn!: Locator
   lineBtn!: Locator
@@ -28,8 +26,6 @@ export class ToolbarFixture {
   reConstruct = (page: Page) => {
     this.page = page
     this.extrudeButton = page.getByTestId('extrude')
-    this.loftButton = page.getByTestId('loft')
-    this.shellButton = page.getByTestId('shell')
     this.offsetPlaneButton = page.getByTestId('plane-offset')
     this.startSketchBtn = page.getByTestId('sketch')
     this.lineBtn = page.getByTestId('line')

e2e/playwright/point-click.spec.ts

@@ -677,257 +677,3 @@ test(`Offset plane point-and-click`, async ({
     await scene.expectPixelColor([74, 74, 74], testPoint, 15)
   })
 })
-
-const loftPointAndClickCases = [
-  { shouldPreselect: true },
-  { shouldPreselect: false },
-]
-loftPointAndClickCases.forEach(({ shouldPreselect }) => {
-  test(`Loft point-and-click (preselected sketches: ${shouldPreselect})`, async ({
-    app,
-    page,
-    scene,
-    editor,
-    toolbar,
-    cmdBar,
-  }) => {
-    const initialCode = `sketch001 = startSketchOn('XZ')
-    |> circle({ center = [0, 0], radius = 30 }, %)
-    plane001 = offsetPlane('XZ', 50)
-    sketch002 = startSketchOn(plane001)
-    |> circle({ center = [0, 0], radius = 20 }, %)
-`
-    await app.initialise(initialCode)
-
-    // One dumb hardcoded screen pixel value
-    const testPoint = { x: 575, y: 200 }
-    const [clickOnSketch1] = scene.makeMouseHelpers(testPoint.x, testPoint.y)
-    const [clickOnSketch2] = scene.makeMouseHelpers(
-      testPoint.x,
-      testPoint.y + 80
-    )
-    const loftDeclaration = 'loft001 = loft([sketch001, sketch002])'
-
-    await test.step(`Look for the white of the sketch001 shape`, async () => {
-      await scene.expectPixelColor([254, 254, 254], testPoint, 15)
-    })
-
-    async function selectSketches() {
-      await clickOnSketch1()
-      await page.keyboard.down('Shift')
-      await clickOnSketch2()
-      await app.page.waitForTimeout(500)
-      await page.keyboard.up('Shift')
-    }
-
-    if (!shouldPreselect) {
-      await test.step(`Go through the command bar flow without preselected sketches`, async () => {
-        await toolbar.loftButton.click()
-        await cmdBar.expectState({
-          stage: 'arguments',
-          currentArgKey: 'selection',
-          currentArgValue: '',
-          headerArguments: { Selection: '' },
-          highlightedHeaderArg: 'selection',
-          commandName: 'Loft',
-        })
-        await selectSketches()
-        await cmdBar.progressCmdBar()
-        await cmdBar.expectState({
-          stage: 'review',
-          headerArguments: { Selection: '2 faces' },
-          commandName: 'Loft',
-        })
-        await cmdBar.progressCmdBar()
-      })
-    } else {
-      await test.step(`Preselect the two sketches`, async () => {
-        await selectSketches()
-      })
-
-      await test.step(`Go through the command bar flow with preselected sketches`, async () => {
-        await toolbar.loftButton.click()
-        await cmdBar.progressCmdBar()
-        await cmdBar.expectState({
-          stage: 'review',
-          headerArguments: { Selection: '2 faces' },
-          commandName: 'Loft',
-        })
-        await cmdBar.progressCmdBar()
-      })
-    }
-
-    await test.step(`Confirm code is added to the editor, scene has changed`, async () => {
-      await editor.expectEditor.toContain(loftDeclaration)
-      await editor.expectState({
-        diagnostics: [],
-        activeLines: [loftDeclaration],
-        highlightedCode: '',
-      })
-      await scene.expectPixelColor([89, 89, 89], testPoint, 15)
-    })
-  })
-})
-
-const shellPointAndClickCapCases = [
-  { shouldPreselect: true },
-  { shouldPreselect: false },
-]
-shellPointAndClickCapCases.forEach(({ shouldPreselect }) => {
-  test(`Shell point-and-click cap (preselected sketches: ${shouldPreselect})`, async ({
-    app,
-    scene,
-    editor,
-    toolbar,
-    cmdBar,
-  }) => {
-    const initialCode = `sketch001 = startSketchOn('XZ')
-    |> circle({ center = [0, 0], radius = 30 }, %)
-    extrude001 = extrude(30, sketch001)
-    `
-    await app.initialise(initialCode)
-
-    // One dumb hardcoded screen pixel value
-    const testPoint = { x: 575, y: 200 }
-    const [clickOnCap] = scene.makeMouseHelpers(testPoint.x, testPoint.y)
-    const shellDeclaration =
-      "shell001 = shell({ faces = ['end'], thickness = 5 }, extrude001)"
-
-    await test.step(`Look for the grey of the shape`, async () => {
-      await scene.expectPixelColor([127, 127, 127], testPoint, 15)
-    })
-
-    if (!shouldPreselect) {
-      await test.step(`Go through the command bar flow without preselected faces`, async () => {
-        await toolbar.shellButton.click()
-        await cmdBar.expectState({
-          stage: 'arguments',
-          currentArgKey: 'selection',
-          currentArgValue: '',
-          headerArguments: {
-            Selection: '',
-            Thickness: '',
-          },
-          highlightedHeaderArg: 'selection',
-          commandName: 'Shell',
-        })
-        await clickOnCap()
-        await cmdBar.progressCmdBar()
-        await cmdBar.progressCmdBar()
-        await cmdBar.expectState({
-          stage: 'review',
-          headerArguments: {
-            Selection: '1 cap',
-            Thickness: '5',
-          },
-          commandName: 'Shell',
-        })
-        await cmdBar.progressCmdBar()
-      })
-    } else {
-      await test.step(`Preselect the cap`, async () => {
-        await clickOnCap()
-      })
-
-      await test.step(`Go through the command bar flow with a preselected face (cap)`, async () => {
-        await toolbar.shellButton.click()
-        await cmdBar.progressCmdBar()
-        await cmdBar.progressCmdBar()
-        await cmdBar.expectState({
-          stage: 'review',
-          headerArguments: {
-            Selection: '1 cap',
-            Thickness: '5',
-          },
-          commandName: 'Shell',
-        })
-        await cmdBar.progressCmdBar()
-      })
-    }
-
-    await test.step(`Confirm code is added to the editor, scene has changed`, async () => {
-      await editor.expectEditor.toContain(shellDeclaration)
-      await editor.expectState({
-        diagnostics: [],
-        activeLines: [shellDeclaration],
-        highlightedCode: '',
-      })
-      await scene.expectPixelColor([146, 146, 146], testPoint, 15)
-    })
-  })
-})
-
-test('Shell point-and-click wall', async ({
-  app,
-  page,
-  scene,
-  editor,
-  toolbar,
-  cmdBar,
-}) => {
-  const initialCode = `sketch001 = startSketchOn('XY')
-  |> startProfileAt([-20, 20], %)
-  |> xLine(40, %)
-  |> yLine(-60, %)
-  |> xLine(-40, %)
-  |> lineTo([profileStartX(%), profileStartY(%)], %)
-  |> close(%)
-extrude001 = extrude(40, sketch001)
-  `
-  await app.initialise(initialCode)
-
-  // One dumb hardcoded screen pixel value
-  const testPoint = { x: 580, y: 180 }
-  const [clickOnCap] = scene.makeMouseHelpers(testPoint.x, testPoint.y)
-  const [clickOnWall] = scene.makeMouseHelpers(testPoint.x, testPoint.y + 70)
-  const mutatedCode = 'xLine(-40, %, $seg01)'
-  const shellDeclaration =
-    "shell001 = shell({  faces = ['end', seg01],  thickness = 5}, extrude001)"
-  const formattedOutLastLine = '}, extrude001)'
-
-  await test.step(`Look for the grey of the shape`, async () => {
-    await scene.expectPixelColor([99, 99, 99], testPoint, 15)
-  })
-
-  await test.step(`Go through the command bar flow, selecting a wall and keeping default thickness`, async () => {
-    await toolbar.shellButton.click()
-    await cmdBar.expectState({
-      stage: 'arguments',
-      currentArgKey: 'selection',
-      currentArgValue: '',
-      headerArguments: {
-        Selection: '',
-        Thickness: '',
-      },
-      highlightedHeaderArg: 'selection',
-      commandName: 'Shell',
-    })
-    await clickOnCap()
-    await page.keyboard.down('Shift')
-    await clickOnWall()
-    await app.page.waitForTimeout(500)
-    await page.keyboard.up('Shift')
-    await cmdBar.progressCmdBar()
-    await cmdBar.progressCmdBar()
-    await cmdBar.expectState({
-      stage: 'review',
-      headerArguments: {
-        Selection: '1 cap, 1 face',
-        Thickness: '5',
-      },
-      commandName: 'Shell',
-    })
-    await cmdBar.progressCmdBar()
-  })
-
-  await test.step(`Confirm code is added to the editor, scene has changed`, async () => {
-    await editor.expectEditor.toContain(mutatedCode)
-    await editor.expectEditor.toContain(shellDeclaration)
-    await editor.expectState({
-      diagnostics: [],
-      activeLines: [formattedOutLastLine],
-      highlightedCode: '',
-    })
-    await scene.expectPixelColor([49, 49, 49], testPoint, 15)
-  })
-})

e2e/playwright/projects.spec.ts

@@ -136,335 +136,6 @@ test(
   }
 )
 
-test(
-  'open a file in a project works and renders, open another file in different project with errors, it should clear the scene',
-  { tag: '@electron' },
-  async ({ browserName }, testInfo) => {
-    const { electronApp, page } = await setupElectron({
-      testInfo,
-      folderSetupFn: async (dir) => {
-        const bracketDir = join(dir, 'bracket')
-        await fsp.mkdir(bracketDir, { recursive: true })
-        await fsp.copyFile(
-          executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
-          join(bracketDir, 'main.kcl')
-        )
-        const errorDir = join(dir, 'broken-code')
-        await fsp.mkdir(errorDir, { recursive: true })
-        await fsp.copyFile(
-          executorInputPath('broken-code-test.kcl'),
-          join(errorDir, 'main.kcl')
-        )
-      },
-    })
-
-    await page.setViewportSize({ width: 1200, height: 500 })
-    const u = await getUtils(page)
-
-    page.on('console', console.log)
-
-    const pointOnModel = { x: 630, y: 280 }
-
-    await test.step('Opening the bracket project should load the stream', async () => {
-      // expect to see the text bracket
-      await expect(page.getByText('bracket')).toBeVisible()
-
-      await page.getByText('bracket').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,
-      })
-
-      // gray at this pixel means the stream has loaded in the most
-      // user way we can verify it (pixel color)
-      await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [85, 85, 85]), {
-          timeout: 10_000,
-        })
-        .toBeLessThan(15)
-    })
-
-    await test.step('Clicking the logo takes us back to the projects page / home', async () => {
-      await page.getByTestId('app-logo').click()
-
-      await expect(page.getByRole('link', { name: 'bracket' })).toBeVisible()
-      await expect(page.getByText('broken-code')).toBeVisible()
-      await expect(page.getByText('bracket')).toBeVisible()
-      await expect(page.getByText('New Project')).toBeVisible()
-    })
-    await test.step('opening broken code project should clear the scene and show the error', async () => {
-      // Go back home.
-      await expect(page.getByText('broken-code')).toBeVisible()
-
-      await page.getByText('broken-code').click()
-
-      // error in guter
-      await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
-
-      // error text on hover
-      await page.hover('.cm-lint-marker-error')
-      const crypticErrorText = `Expected a tag declarator`
-      await expect(page.getByText(crypticErrorText).first()).toBeVisible()
-
-      // black pixel means the scene has been cleared.
-      await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [30, 30, 30]), {
-          timeout: 10_000,
-        })
-        .toBeLessThan(15)
-    })
-
-    await electronApp.close()
-  }
-)
-
-test(
-  'open a file in a project works and renders, open another file in different project that is empty, it should clear the scene',
-  { tag: '@electron' },
-  async ({ browserName }, testInfo) => {
-    const { electronApp, page } = await setupElectron({
-      testInfo,
-      folderSetupFn: async (dir) => {
-        const bracketDir = join(dir, 'bracket')
-        await fsp.mkdir(bracketDir, { recursive: true })
-        await fsp.copyFile(
-          executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
-          join(bracketDir, 'main.kcl')
-        )
-        const emptyDir = join(dir, 'empty')
-        await fsp.mkdir(emptyDir, { recursive: true })
-        await fsp.writeFile(join(emptyDir, 'main.kcl'), '')
-      },
-    })
-
-    await page.setViewportSize({ width: 1200, height: 500 })
-    const u = await getUtils(page)
-
-    page.on('console', console.log)
-
-    const pointOnModel = { x: 630, y: 280 }
-
-    await test.step('Opening the bracket project should load the stream', async () => {
-      // expect to see the text bracket
-      await expect(page.getByText('bracket')).toBeVisible()
-
-      await page.getByText('bracket').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,
-      })
-
-      // gray at this pixel means the stream has loaded in the most
-      // user way we can verify it (pixel color)
-      await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [85, 85, 85]), {
-          timeout: 10_000,
-        })
-        .toBeLessThan(15)
-    })
-
-    await test.step('Clicking the logo takes us back to the projects page / home', async () => {
-      await page.getByTestId('app-logo').click()
-
-      await expect(page.getByRole('link', { name: 'bracket' })).toBeVisible()
-      await expect(page.getByText('empty')).toBeVisible()
-      await expect(page.getByText('bracket')).toBeVisible()
-      await expect(page.getByText('New Project')).toBeVisible()
-    })
-    await test.step('opening empty code project should clear the scene', async () => {
-      // Go back home.
-      await expect(page.getByText('empty')).toBeVisible()
-
-      await page.getByText('empty').click()
-
-      // Ensure the code is empty.
-      await expect(u.codeLocator).toContainText('')
-      expect(u.codeLocator.innerHTML.length).toBeLessThan(2)
-
-      // planes colors means the scene has been cleared.
-      await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [92, 53, 53]), {
-          timeout: 10_000,
-        })
-        .toBeLessThan(15)
-    })
-
-    await electronApp.close()
-  }
-)
-
-test(
-  'open a file in a project works and renders, open empty file, it should clear the scene',
-  { tag: '@electron' },
-  async ({ browserName }, testInfo) => {
-    const { electronApp, page } = await setupElectron({
-      testInfo,
-      folderSetupFn: async (dir) => {
-        const bracketDir = join(dir, 'bracket')
-        await fsp.mkdir(bracketDir, { recursive: true })
-        await fsp.copyFile(
-          executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
-          join(bracketDir, 'main.kcl')
-        )
-
-        await fsp.writeFile(join(bracketDir, 'empty.kcl'), '')
-      },
-    })
-
-    await page.setViewportSize({ width: 1200, height: 500 })
-    const u = await getUtils(page)
-
-    page.on('console', console.log)
-
-    const pointOnModel = { x: 630, y: 280 }
-
-    await test.step('Opening the bracket project should load the stream', async () => {
-      // expect to see the text bracket
-      await expect(page.getByText('bracket')).toBeVisible()
-
-      await page.getByText('bracket').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,
-      })
-
-      // gray at this pixel means the stream has loaded in the most
-      // user way we can verify it (pixel color)
-      await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [85, 85, 85]), {
-          timeout: 10_000,
-        })
-        .toBeLessThan(15)
-    })
-    await test.step('creating a empty file should clear the scene', async () => {
-      // open the file pane.
-      await page.getByTestId('files-pane-button').click()
-
-      // OPen the other file.
-      const file = page.getByRole('button', { name: 'empty.kcl' })
-      await expect(file).toBeVisible()
-
-      await file.click()
-
-      // planes colors means the scene has been cleared.
-      await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [92, 53, 53]), {
-          timeout: 10_000,
-        })
-        .toBeLessThan(15)
-
-      // Ensure the code is empty.
-      await expect(u.codeLocator).toContainText('')
-      expect(u.codeLocator.innerHTML.length).toBeLessThan(2)
-    })
-
-    await electronApp.close()
-  }
-)
-
-test(
-  'open a file in a project works and renders, open another file in the same project with errors, it should clear the scene',
-  { tag: '@electron' },
-  async ({ browserName }, testInfo) => {
-    const { electronApp, page } = await setupElectron({
-      testInfo,
-      folderSetupFn: async (dir) => {
-        const bracketDir = join(dir, 'bracket')
-        await fsp.mkdir(bracketDir, { recursive: true })
-        await fsp.copyFile(
-          executorInputPath('focusrite_scarlett_mounting_braket.kcl'),
-          join(bracketDir, 'main.kcl')
-        )
-        await fsp.copyFile(
-          executorInputPath('broken-code-test.kcl'),
-          join(bracketDir, 'broken-code-test.kcl')
-        )
-      },
-    })
-
-    await page.setViewportSize({ width: 1200, height: 500 })
-    const u = await getUtils(page)
-
-    page.on('console', console.log)
-
-    const pointOnModel = { x: 630, y: 280 }
-
-    await test.step('Opening the bracket project should load the stream', async () => {
-      // expect to see the text bracket
-      await expect(page.getByText('bracket')).toBeVisible()
-
-      await page.getByText('bracket').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,
-      })
-
-      // gray at this pixel means the stream has loaded in the most
-      // user way we can verify it (pixel color)
-      await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [85, 85, 85]), {
-          timeout: 10_000,
-        })
-        .toBeLessThan(15)
-    })
-    await test.step('opening broken code file should clear the scene and show the error', async () => {
-      // open the file pane.
-      await page.getByTestId('files-pane-button').click()
-
-      // OPen the other file.
-      const file = page.getByRole('button', { name: 'broken-code-test.kcl' })
-      await expect(file).toBeVisible()
-
-      await file.click()
-
-      // error in guter
-      await expect(page.locator('.cm-lint-marker-error')).toBeVisible()
-
-      // error text on hover
-      await page.hover('.cm-lint-marker-error')
-      const crypticErrorText = `Expected a tag declarator`
-      await expect(page.getByText(crypticErrorText).first()).toBeVisible()
-
-      // black pixel means the scene has been cleared.
-      await expect
-        .poll(() => u.getGreatestPixDiff(pointOnModel, [30, 30, 30]), {
-          timeout: 10_000,
-        })
-        .toBeLessThan(15)
-    })
-
-    await electronApp.close()
-  }
-)
-
 test(
   'when code with error first loads you get errors in console',
   { tag: '@electron' },

e2e/playwright/regression-tests.spec.ts

@@ -550,7 +550,7 @@ sketch001 = startSketchAt([-0, -0])
     const u = await getUtils(page)
 
     // Constants and locators
-    const planeColor: [number, number, number] = [161, 220, 155]
+    const planeColor: [number, number, number] = [170, 220, 170]
     const bgColor: [number, number, number] = [27, 27, 27]
     const middlePixelIsColor = async (color: [number, number, number]) => {
       return u.getGreatestPixDiff({ x: 600, y: 250 }, color)

e2e/playwright/secrets.ts

@@ -7,8 +7,6 @@ try {
     .split('\n')
     .filter((line) => line && line.length > 1)
     .forEach((line) => {
-      // Allow line comments.
-      if (line.trimStart().startsWith('#')) return
       const [key, value] = line.split('=')
       // prefer env vars over secrets file
       secrets[key] = process.env[key] || (value as any).replaceAll('"', '')

e2e/playwright/sketch-tests.spec.ts

@@ -943,110 +943,6 @@ sketch002 = startSketchOn(extrude001, 'END')
 `.replace(/\s/g, '')
     )
   })
-
-  /* TODO: once we fix bug turn on.
-   test('empty-scene default-planes act as expected when spaces in file', async ({
-    page,
-    browserName,
-  }) => {
-
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
-
-    await u.waitForAuthSkipAppStart()
-
-    await u.openDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-    await u.closeDebugPanel()
-
-    const XYPlanePoint = { x: 774, y: 116 } as const
-    const unHoveredColor: [number, number, number] = [47, 47, 93]
-    expect(
-      await u.getGreatestPixDiff(XYPlanePoint, unHoveredColor)
-    ).toBeLessThan(8)
-
-    await page.mouse.move(XYPlanePoint.x, XYPlanePoint.y)
-    await page.waitForTimeout(200)
-
-    // color should not change for having been hovered
-    expect(
-      await u.getGreatestPixDiff(XYPlanePoint, unHoveredColor)
-    ).toBeLessThan(8)
-
-    await u.openAndClearDebugPanel()
-
-    // Fill with spaces
-    await u.codeLocator.fill(`               
-`)
-
-    await u.openDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-    await u.closeDebugPanel()
-
-    expect(
-      await u.getGreatestPixDiff(XYPlanePoint, unHoveredColor)
-    ).toBeLessThan(8)
-
-    await page.mouse.move(XYPlanePoint.x, XYPlanePoint.y)
-    await page.waitForTimeout(200)
-
-    // color should not change for having been hovered
-    expect(
-      await u.getGreatestPixDiff(XYPlanePoint, unHoveredColor)
-    ).toBeLessThan(8)
-  })
-
-  test('empty-scene default-planes act as expected when only code comments in file', async ({
-    page,
-    browserName,
-  }) => {
-
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
-
-    await u.waitForAuthSkipAppStart()
-
-    await u.openDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-    await u.closeDebugPanel()
-
-    const XYPlanePoint = { x: 774, y: 116 } as const
-    const unHoveredColor: [number, number, number] = [47, 47, 93]
-    expect(
-      await u.getGreatestPixDiff(XYPlanePoint, unHoveredColor)
-    ).toBeLessThan(8)
-
-    await page.mouse.move(XYPlanePoint.x, XYPlanePoint.y)
-    await page.waitForTimeout(200)
-
-    // color should not change for having been hovered
-    expect(
-      await u.getGreatestPixDiff(XYPlanePoint, unHoveredColor)
-    ).toBeLessThan(8)
-
-    await u.openAndClearDebugPanel()
-
-    // Fill with spaces
-    await u.codeLocator.fill(`// this is a code comments ya nerds
-`)
-
-    await u.openDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-    await u.closeDebugPanel()
-
-    expect(
-      await u.getGreatestPixDiff(XYPlanePoint, unHoveredColor)
-    ).toBeLessThan(8)
-
-    await page.mouse.move(XYPlanePoint.x, XYPlanePoint.y)
-    await page.waitForTimeout(200)
-
-    // color should not change for having been hovered
-    expect(
-      await u.getGreatestPixDiff(XYPlanePoint, unHoveredColor)
-    ).toBeLessThan(8)
-  })*/
-
   test('empty-scene default-planes act as expected', async ({
     page,
     browserName,

e2e/playwright/testing-perspective-toggle.spec.ts

@@ -23,7 +23,7 @@ test.describe('Test toggling perspective', () => {
       y: screenHeight * 0.4,
     }
     const backgroundColor: [number, number, number] = [29, 29, 29]
-    const xzPlaneColor: [number, number, number] = [82, 55, 96]
+    const xzPlaneColor: [number, number, number] = [50, 50, 99]
     const locationToHaveColor = async (color: [number, number, number]) => {
       return u.getGreatestPixDiff(checkedScreenLocation, color)
     }

package.json

@@ -81,7 +81,6 @@
     "simpleserver": "yarn pretest && http-server ./public --cors -p 3000",
     "simpleserver:ci": "yarn pretest && http-server ./public --cors -p 3000 &",
     "simpleserver:bg": "yarn pretest && http-server ./public --cors -p 3000 &",
-    "simpleserver:stop": "kill-port 3000",
     "fmt": "prettier --write ./src *.ts *.json *.js ./e2e ./packages",
     "fmt-check": "prettier --check ./src *.ts *.json *.js ./e2e ./packages",
     "fetch:wasm": "./get-latest-wasm-bundle.sh",
@@ -96,8 +95,6 @@
     "files:set-version": "echo \"$(jq --arg v \"$VERSION\" '.version=$v' package.json --indent 2)\" > package.json",
     "files:set-notes": "./scripts/set-files-notes.sh",
     "files:flip-to-nightly": "./scripts/flip-files-to-nightly.sh",
-    "files:invalidate-bucket": "./scripts/invalidate-files-bucket.sh",
-    "files:invalidate-bucket:nightly": "./scripts/invalidate-files-bucket.sh --nightly",
     "postinstall": "yarn fetch:samples && yarn xstate:typegen && ./node_modules/.bin/electron-rebuild",
     "xstate:typegen": "yarn xstate typegen \"src/**/*.ts?(x)\"",
     "make:dev": "make dev",
@@ -161,7 +158,6 @@
     "@electron/rebuild": "^3.6.0",
     "@iarna/toml": "^2.2.5",
     "@lezer/generator": "^1.7.1",
-    "@nabla/vite-plugin-eslint": "^2.0.5",
     "@playwright/test": "^1.46.1",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^15.0.2",
@@ -174,7 +170,7 @@
     "@types/pixelmatch": "^5.2.6",
     "@types/pngjs": "^6.0.4",
     "@types/react": "^18.3.4",
-    "@types/react-dom": "^18.3.1",
+    "@types/react-dom": "^18.2.25",
     "@types/react-modal": "^3.16.3",
     "@types/three": "^0.163.0",
     "@types/ua-parser-js": "^0.7.39",
@@ -196,7 +192,7 @@
     "eslint-plugin-css-modules": "^2.12.0",
     "eslint-plugin-import": "^2.30.0",
     "eslint-plugin-suggest-no-throw": "^1.0.0",
-    "happy-dom": "^15.11.7",
+    "happy-dom": "^15.10.2",
     "http-server": "^14.1.1",
     "husky": "^9.1.5",
     "kill-port": "^2.0.1",
@@ -211,11 +207,12 @@
     "ts-node": "^10.0.0",
     "typescript": "^5.7.2",
     "vite": "^5.4.6",
+    "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-package-version": "^1.1.0",
     "vite-tsconfig-paths": "^4.3.2",
     "vitest": "^1.6.0",
     "vitest-webgl-canvas-mock": "^1.1.0",
-    "wasm-pack": "^0.13.1",
+    "wasm-pack": "^0.13.0",
     "ws": "^8.17.0",
     "yarn": "^1.22.22"
   }

scripts/get-nightly-changelog.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-echo "## What's Changed"
-git log ${PREVIOUS_TAG}..HEAD --oneline --pretty=format:%s | grep -v Bump | awk '{print "* "toupper(substr($0,0,1))substr($0,2)}'
-echo ""
-echo "**Full Changelog**: https://github.com/KittyCAD/modeling-app/compare/${PREVIOUS_TAG}...${TAG}"

scripts/invalidate-files-bucket.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-base_dir="/releases/modeling-app"
-if [[ $1 = "--nightly" ]]; then
-    base_dir="/releases/modeling-app/nightly"
-fi
-
-echo "Invalidating json and yml files at $base_dir in the download bucket"
-gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="$base_dir/last_download.json" --async
-gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="$base_dir/latest-linux-arm64.yml" --async
-gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="$base_dir/latest-mac.yml" --async
-gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="$base_dir/latest.yml" --async

src/clientSideScene/CameraControls.ts

@@ -155,6 +155,7 @@ export class CameraControls {
       this.camera.zoom = camProps.zoom || 1
     }
     this.camera.updateProjectionMatrix()
+    console.log('doing this thing', camProps)
     this.update(true)
   }
 
@@ -272,26 +273,14 @@ export class CameraControls {
         camSettings.center.y,
         camSettings.center.z
       )
-      const orientation = new Quaternion(
+      const quat = new Quaternion(
         camSettings.orientation.x,
         camSettings.orientation.y,
         camSettings.orientation.z,
         camSettings.orientation.w
       ).invert()
 
-      const newUp = new Vector3(
-        camSettings.up.x,
-        camSettings.up.y,
-        camSettings.up.z
-      )
-      this.camera.quaternion.set(
-        orientation.x,
-        orientation.y,
-        orientation.z,
-        orientation.w
-      )
-      this.camera.up.copy(newUp)
-      this.camera.updateProjectionMatrix()
+      this.camera.up.copy(new Vector3(0, 1, 0).applyQuaternion(quat))
       if (this.camera instanceof PerspectiveCamera && camSettings.ortho) {
         this.useOrthographicCamera()
       }
@@ -1175,7 +1164,7 @@ export class CameraControls {
       this.camera.updateProjectionMatrix()
     }
 
-    if (this.syncDirection === 'clientToEngine' || forceUpdate) {
+    if (this.syncDirection === 'clientToEngine' || forceUpdate)
       this.throttledUpdateEngineCamera({
         quaternion: this.camera.quaternion,
         position: this.camera.position,
@@ -1183,7 +1172,6 @@ export class CameraControls {
         isPerspective: this.isPerspective,
         target: this.target,
       })
-    }
     this.deferReactUpdate(this.reactCameraProperties)
     Object.values(this._camChangeCallbacks).forEach((cb) => cb())
   }

src/clientSideScene/ClientSideSceneComp.tsx

@@ -29,9 +29,6 @@ import {
   Expr,
   parse,
   recast,
-  defaultSourceRange,
-  resultIsOk,
-  ProgramMemory,
 } from 'lang/wasm'
 import { CustomIcon, CustomIconName } from 'components/CustomIcon'
 import { ConstrainInfo } from 'lang/std/stdTypes'
@@ -415,15 +412,14 @@ export async function deleteSegment({
   if (err(modifiedAst)) return Promise.reject(modifiedAst)
 
   const newCode = recast(modifiedAst)
-  const pResult = parse(newCode)
-  if (err(pResult) || !resultIsOk(pResult)) return Promise.reject(pResult)
-  modifiedAst = pResult.program
+  modifiedAst = parse(newCode)
+  if (err(modifiedAst)) return Promise.reject(modifiedAst)
 
   const testExecute = await executeAst({
     ast: modifiedAst,
+    idGenerator: kclManager.execState.idGenerator,
+    useFakeExecutor: true,
     engineCommandManager: engineCommandManager,
-    // We make sure to send an empty program memory to denote we mean mock mode.
-    programMemoryOverride: ProgramMemory.empty(),
   })
   if (testExecute.errors.length) {
     toast.error('Segment tag used outside of current Sketch. Could not delete.')
@@ -594,9 +590,7 @@ const ConstraintSymbol = ({
   if (err(_node)) return
   const node = _node.node
 
-  const range: SourceRange = node
-    ? [node.start, node.end, true]
-    : defaultSourceRange()
+  const range: SourceRange = node ? [node.start, node.end] : [0, 0]
 
   if (_type === 'intersectionTag') return null
 
@@ -618,7 +612,7 @@ const ConstraintSymbol = ({
           editorManager.setHighlightRange([range])
         }}
         onMouseLeave={() => {
-          editorManager.setHighlightRange([defaultSourceRange()])
+          editorManager.setHighlightRange([[0, 0]])
         }}
         // disabled={isConstrained || !convertToVarEnabled}
         // disabled={implicitDesc} TODO why does this change styles that are hard to override?
@@ -633,12 +627,10 @@ const ConstraintSymbol = ({
             })
           } else if (isConstrained) {
             try {
-              const pResult = parse(recast(kclManager.ast))
-              if (trap(pResult) || !resultIsOk(pResult))
-                return Promise.reject(pResult)
-
+              const parsed = parse(recast(kclManager.ast))
+              if (trap(parsed)) return Promise.reject(parsed)
               const _node1 = getNodeFromPath<CallExpression>(
-                pResult.program!,
+                parsed,
                 pathToNode,
                 'CallExpression',
                 true

src/clientSideScene/sceneEntities.ts

@@ -48,9 +48,6 @@ import {
   VariableDeclarator,
   sketchFromKclValue,
   sketchFromKclValueOptional,
-  defaultSourceRange,
-  sourceRangeFromRust,
-  resultIsOk,
 } from 'lang/wasm'
 import {
   engineCommandManager,
@@ -498,9 +495,10 @@ export class SceneEntities {
 
     const { execState } = await executeAst({
       ast: truncatedAst,
+      useFakeExecutor: true,
       engineCommandManager: this.engineCommandManager,
-      // We make sure to send an empty program memory to denote we mean mock mode.
       programMemoryOverride,
+      idGenerator: kclManager.execState.idGenerator,
     })
     const programMemory = execState.memory
     const sketch = sketchFromPathToNode({
@@ -532,7 +530,7 @@ export class SceneEntities {
 
     const segPathToNode = getNodePathFromSourceRange(
       maybeModdedAst,
-      sourceRangeFromRust(sketch.start.__geoMeta.sourceRange)
+      sketch.start.__geoMeta.sourceRange
     )
     if (sketch?.paths?.[0]?.type !== 'Circle') {
       const _profileStart = createProfileStartHandle({
@@ -554,7 +552,7 @@ export class SceneEntities {
     sketch.paths.forEach((segment, index) => {
       let segPathToNode = getNodePathFromSourceRange(
         maybeModdedAst,
-        sourceRangeFromRust(segment.__geoMeta.sourceRange)
+        segment.__geoMeta.sourceRange
       )
       if (
         draftExpressionsIndices &&
@@ -563,12 +561,12 @@ export class SceneEntities {
         const previousSegment = sketch.paths[index - 1] || sketch.start
         const previousSegmentPathToNode = getNodePathFromSourceRange(
           maybeModdedAst,
-          sourceRangeFromRust(previousSegment.__geoMeta.sourceRange)
+          previousSegment.__geoMeta.sourceRange
         )
         const bodyIndex = previousSegmentPathToNode[1][0]
         segPathToNode = getNodePathFromSourceRange(
           truncatedAst,
-          sourceRangeFromRust(segment.__geoMeta.sourceRange)
+          segment.__geoMeta.sourceRange
         )
         segPathToNode[1][0] = bodyIndex
       }
@@ -577,10 +575,7 @@ export class SceneEntities {
         index <= draftExpressionsIndices.end &&
         index >= draftExpressionsIndices.start
       const isSelected = selectionRanges?.graphSelections.some((selection) =>
-        isOverlap(
-          selection?.codeRef?.range,
-          sourceRangeFromRust(segment.__geoMeta.sourceRange)
-        )
+        isOverlap(selection?.codeRef?.range, segment.__geoMeta.sourceRange)
       )
 
       let seg: Group
@@ -662,11 +657,13 @@ export class SceneEntities {
   }
   updateAstAndRejigSketch = async (
     sketchPathToNode: PathToNode,
-    modifiedAst: Node<Program>,
+    modifiedAst: Node<Program> | Error,
     forward: [number, number, number],
     up: [number, number, number],
     origin: [number, number, number]
   ) => {
+    if (err(modifiedAst)) return modifiedAst
+
     const nextAst = await kclManager.updateAst(modifiedAst, false)
     await this.tearDownSketch({ removeAxis: false })
     sceneInfra.resetMouseListeners()
@@ -701,7 +698,8 @@ export class SceneEntities {
       'VariableDeclaration'
     )
     if (trap(_node1)) return Promise.reject(_node1)
-    const variableDeclarationName = _node1.node?.declaration.id?.name || ''
+    const variableDeclarationName =
+      _node1.node?.declarations?.[0]?.id?.name || ''
 
     const sg = sketchFromKclValue(
       kclManager.programMemory.get(variableDeclarationName),
@@ -723,9 +721,8 @@ export class SceneEntities {
       pathToNode: sketchPathToNode,
     })
     if (trap(mod)) return Promise.reject(mod)
-    const pResult = parse(recast(mod.modifiedAst))
-    if (trap(pResult) || !resultIsOk(pResult)) return Promise.reject(pResult)
-    const modifiedAst = pResult.program
+    const modifiedAst = parse(recast(mod.modifiedAst))
+    if (trap(modifiedAst)) return Promise.reject(modifiedAst)
 
     const draftExpressionsIndices = { start: index, end: index }
 
@@ -901,9 +898,10 @@ export class SceneEntities {
       'VariableDeclaration'
     )
     if (trap(_node1)) return Promise.reject(_node1)
-    const variableDeclarationName = _node1.node?.declaration.id?.name || ''
-    const startSketchOn = _node1.node?.declaration
-    const startSketchOnInit = startSketchOn?.init
+    const variableDeclarationName =
+      _node1.node?.declarations?.[0]?.id?.name || ''
+    const startSketchOn = _node1.node?.declarations
+    const startSketchOnInit = startSketchOn?.[0]?.init
 
     const tags: [string, string, string] = [
       findUniqueName(_ast, 'rectangleSegmentA'),
@@ -911,14 +909,14 @@ export class SceneEntities {
       findUniqueName(_ast, 'rectangleSegmentC'),
     ]
 
-    startSketchOn.init = createPipeExpression([
+    startSketchOn[0].init = createPipeExpression([
       startSketchOnInit,
       ...getRectangleCallExpressions(rectangleOrigin, tags),
     ])
 
-    const pResult = parse(recast(_ast))
-    if (trap(pResult) || !resultIsOk(pResult)) return Promise.reject(pResult)
-    _ast = pResult.program
+    let _recastAst = parse(recast(_ast))
+    if (trap(_recastAst)) return Promise.reject(_recastAst)
+    _ast = _recastAst
 
     const { programMemoryOverride, truncatedAst } = await this.setupSketch({
       sketchPathToNode,
@@ -941,7 +939,7 @@ export class SceneEntities {
           'VariableDeclaration'
         )
         if (trap(_node)) return Promise.reject(_node)
-        const sketchInit = _node.node?.declaration.init
+        const sketchInit = _node.node?.declarations?.[0]?.init
 
         const x = (args.intersectionPoint.twoD.x || 0) - rectangleOrigin[0]
         const y = (args.intersectionPoint.twoD.y || 0) - rectangleOrigin[1]
@@ -952,9 +950,10 @@ export class SceneEntities {
 
         const { execState } = await executeAst({
           ast: truncatedAst,
+          useFakeExecutor: true,
           engineCommandManager: this.engineCommandManager,
-          // We make sure to send an empty program memory to denote we mean mock mode.
           programMemoryOverride,
+          idGenerator: kclManager.execState.idGenerator,
         })
         const programMemory = execState.memory
         this.sceneProgramMemory = programMemory
@@ -990,7 +989,7 @@ export class SceneEntities {
           'VariableDeclaration'
         )
         if (trap(_node)) return
-        const sketchInit = _node.node?.declaration.init
+        const sketchInit = _node.node?.declarations?.[0]?.init
 
         if (sketchInit.type !== 'PipeExpression') {
           return
@@ -999,10 +998,9 @@ export class SceneEntities {
         updateRectangleSketch(sketchInit, x, y, tags[0])
 
         const newCode = recast(_ast)
-        const pResult = parse(newCode)
-        if (trap(pResult) || !resultIsOk(pResult))
-          return Promise.reject(pResult)
-        _ast = pResult.program
+        let _recastAst = parse(newCode)
+        if (trap(_recastAst)) return
+        _ast = _recastAst
 
         // Update the primary AST and unequip the rectangle tool
         await kclManager.executeAstMock(_ast)
@@ -1015,9 +1013,10 @@ export class SceneEntities {
 
         const { execState } = await executeAst({
           ast: _ast,
+          useFakeExecutor: true,
           engineCommandManager: this.engineCommandManager,
-          // We make sure to send an empty program memory to denote we mean mock mode.
           programMemoryOverride,
+          idGenerator: kclManager.execState.idGenerator,
         })
         const programMemory = execState.memory
 
@@ -1056,9 +1055,10 @@ export class SceneEntities {
     if (trap(_node1)) return Promise.reject(_node1)
 
     // startSketchOn already exists
-    const variableDeclarationName = _node1.node?.declaration.id?.name || ''
-    const startSketchOn = _node1.node?.declaration
-    const startSketchOnInit = startSketchOn?.init
+    const variableDeclarationName =
+      _node1.node?.declarations?.[0]?.id?.name || ''
+    const startSketchOn = _node1.node?.declarations
+    const startSketchOnInit = startSketchOn?.[0]?.init
 
     const tags: [string, string, string] = [
       findUniqueName(_ast, 'rectangleSegmentA'),
@@ -1066,14 +1066,14 @@ export class SceneEntities {
       findUniqueName(_ast, 'rectangleSegmentC'),
     ]
 
-    startSketchOn.init = createPipeExpression([
+    startSketchOn[0].init = createPipeExpression([
       startSketchOnInit,
       ...getRectangleCallExpressions(rectangleOrigin, tags),
     ])
 
-    const pResult = parse(recast(_ast))
-    if (trap(pResult) || !resultIsOk(pResult)) return Promise.reject(pResult)
-    _ast = pResult.program
+    let _recastAst = parse(recast(_ast))
+    if (trap(_recastAst)) return Promise.reject(_recastAst)
+    _ast = _recastAst
 
     const { programMemoryOverride, truncatedAst } = await this.setupSketch({
       sketchPathToNode,
@@ -1096,7 +1096,7 @@ export class SceneEntities {
           'VariableDeclaration'
         )
         if (trap(_node)) return Promise.reject(_node)
-        const sketchInit = _node.node?.declaration.init
+        const sketchInit = _node.node?.declarations?.[0]?.init
 
         const x = (args.intersectionPoint.twoD.x || 0) - rectangleOrigin[0]
         const y = (args.intersectionPoint.twoD.y || 0) - rectangleOrigin[1]
@@ -1114,9 +1114,10 @@ export class SceneEntities {
 
         const { execState } = await executeAst({
           ast: truncatedAst,
+          useFakeExecutor: true,
           engineCommandManager: this.engineCommandManager,
-          // We make sure to send an empty program memory to denote we mean mock mode.
           programMemoryOverride,
+          idGenerator: kclManager.execState.idGenerator,
         })
         const programMemory = execState.memory
         this.sceneProgramMemory = programMemory
@@ -1152,7 +1153,7 @@ export class SceneEntities {
           'VariableDeclaration'
         )
         if (trap(_node)) return
-        const sketchInit = _node.node?.declaration.init
+        const sketchInit = _node.node?.declarations?.[0]?.init
 
         if (sketchInit.type === 'PipeExpression') {
           updateCenterRectangleSketch(
@@ -1164,10 +1165,9 @@ export class SceneEntities {
             rectangleOrigin[1]
           )
 
-          const pResult = parse(recast(_ast))
-          if (trap(pResult) || !resultIsOk(pResult))
-            return Promise.reject(pResult)
-          _ast = pResult.program
+          let _recastAst = parse(recast(_ast))
+          if (trap(_recastAst)) return
+          _ast = _recastAst
 
           // Update the primary AST and unequip the rectangle tool
           await kclManager.executeAstMock(_ast)
@@ -1180,9 +1180,10 @@ export class SceneEntities {
 
           const { execState } = await executeAst({
             ast: _ast,
+            useFakeExecutor: true,
             engineCommandManager: this.engineCommandManager,
-            // We make sure to send an empty program memory to denote we mean mock mode.
             programMemoryOverride,
+            idGenerator: kclManager.execState.idGenerator,
           })
           const programMemory = execState.memory
 
@@ -1221,11 +1222,12 @@ export class SceneEntities {
       'VariableDeclaration'
     )
     if (trap(_node1)) return Promise.reject(_node1)
-    const variableDeclarationName = _node1.node?.declaration.id?.name || ''
-    const startSketchOn = _node1.node?.declaration
-    const startSketchOnInit = startSketchOn?.init
+    const variableDeclarationName =
+      _node1.node?.declarations?.[0]?.id?.name || ''
+    const startSketchOn = _node1.node?.declarations
+    const startSketchOnInit = startSketchOn?.[0]?.init
 
-    startSketchOn.init = createPipeExpression([
+    startSketchOn[0].init = createPipeExpression([
       startSketchOnInit,
       createCallExpressionStdLib('circle', [
         createObjectExpression({
@@ -1239,9 +1241,9 @@ export class SceneEntities {
       ]),
     ])
 
-    const pResult = parse(recast(_ast))
-    if (trap(pResult) || !resultIsOk(pResult)) return Promise.reject(pResult)
-    _ast = pResult.program
+    let _recastAst = parse(recast(_ast))
+    if (trap(_recastAst)) return Promise.reject(_recastAst)
+    _ast = _recastAst
 
     // do a quick mock execution to get the program memory up-to-date
     await kclManager.executeAstMock(_ast)
@@ -1267,7 +1269,7 @@ export class SceneEntities {
         )
         let modded = structuredClone(truncatedAst)
         if (trap(_node)) return
-        const sketchInit = _node.node.declaration.init
+        const sketchInit = _node.node?.declarations?.[0]?.init
 
         const x = (args.intersectionPoint.twoD.x || 0) - circleCenter[0]
         const y = (args.intersectionPoint.twoD.y || 0) - circleCenter[1]
@@ -1297,9 +1299,10 @@ export class SceneEntities {
 
         const { execState } = await executeAst({
           ast: modded,
+          useFakeExecutor: true,
           engineCommandManager: this.engineCommandManager,
-          // We make sure to send an empty program memory to denote we mean mock mode.
           programMemoryOverride,
+          idGenerator: kclManager.execState.idGenerator,
         })
         const programMemory = execState.memory
         this.sceneProgramMemory = programMemory
@@ -1335,7 +1338,7 @@ export class SceneEntities {
           'VariableDeclaration'
         )
         if (trap(_node)) return
-        const sketchInit = _node.node?.declaration.init
+        const sketchInit = _node.node?.declarations?.[0]?.init
 
         let modded = structuredClone(_ast)
         if (sketchInit.type === 'PipeExpression') {
@@ -1362,10 +1365,9 @@ export class SceneEntities {
 
           const newCode = recast(modded)
           if (err(newCode)) return
-          const pResult = parse(newCode)
-          if (trap(pResult) || !resultIsOk(pResult))
-            return Promise.reject(pResult)
-          _ast = pResult.program
+          let _recastAst = parse(newCode)
+          if (trap(_recastAst)) return Promise.reject(_recastAst)
+          _ast = _recastAst
 
           // Update the primary AST and unequip the rectangle tool
           await kclManager.executeAstMock(_ast)
@@ -1658,7 +1660,7 @@ export class SceneEntities {
         kclManager.programMemory,
         {
           type: 'sourceRange',
-          sourceRange: [node.start, node.end, true],
+          sourceRange: [node.start, node.end],
         },
         getChangeSketchInput()
       )
@@ -1681,9 +1683,10 @@ export class SceneEntities {
         codeManager.updateCodeEditor(code)
       const { execState } = await executeAst({
         ast: truncatedAst,
+        useFakeExecutor: true,
         engineCommandManager: this.engineCommandManager,
-        // We make sure to send an empty program memory to denote we mean mock mode.
         programMemoryOverride,
+        idGenerator: kclManager.execState.idGenerator,
       })
       const programMemory = execState.memory
       this.sceneProgramMemory = programMemory
@@ -1747,7 +1750,7 @@ export class SceneEntities {
   ): (() => SegmentOverlayPayload | null) => {
     const segPathToNode = getNodePathFromSourceRange(
       modifiedAst,
-      sourceRangeFromRust(segment.__geoMeta.sourceRange)
+      segment.__geoMeta.sourceRange
     )
     const sgPaths = sketch.paths
     const originalPathToNodeStr = JSON.stringify(segPathToNode)
@@ -1898,10 +1901,8 @@ export class SceneEntities {
           SEGMENT_BODIES_PLUS_PROFILE_START
         )
         if (parent?.userData?.pathToNode) {
-          const pResult = parse(recast(kclManager.ast))
-          if (trap(pResult) || !resultIsOk(pResult))
-            return Promise.reject(pResult)
-          const updatedAst = pResult.program
+          const updatedAst = parse(recast(kclManager.ast))
+          if (trap(updatedAst)) return
           const _node = getNodeFromPath<Node<CallExpression>>(
             updatedAst,
             parent.userData.pathToNode,
@@ -1909,7 +1910,7 @@ export class SceneEntities {
           )
           if (trap(_node, { suppress: true })) return
           const node = _node.node
-          editorManager.setHighlightRange([[node.start, node.end, true]])
+          editorManager.setHighlightRange([[node.start, node.end]])
           const yellow = 0xffff00
           colorSegment(selected, yellow)
           const extraSegmentGroup = parent.getObjectByName(EXTRA_SEGMENT_HANDLE)
@@ -1954,10 +1955,10 @@ export class SceneEntities {
             })
           return
         }
-        editorManager.setHighlightRange([defaultSourceRange()])
+        editorManager.setHighlightRange([[0, 0]])
       },
       onMouseLeave: ({ selected, ...rest }: OnMouseEnterLeaveArgs) => {
-        editorManager.setHighlightRange([defaultSourceRange()])
+        editorManager.setHighlightRange([[0, 0]])
         const parent = getParentGroup(
           selected,
           SEGMENT_BODIES_PLUS_PROFILE_START
@@ -2056,7 +2057,7 @@ function prepareTruncatedMemoryAndAst(
     'VariableDeclaration'
   )
   if (err(_node)) return _node
-  const variableDeclarationName = _node.node?.declaration.id?.name || ''
+  const variableDeclarationName = _node.node?.declarations?.[0]?.id?.name || ''
   const sg = sketchFromKclValue(
     programMemory.get(variableDeclarationName),
     variableDeclarationName
@@ -2081,30 +2082,28 @@ function prepareTruncatedMemoryAndAst(
       ])
     }
     ;(
-      (_ast.body[bodyIndex] as VariableDeclaration).declaration
+      (_ast.body[bodyIndex] as VariableDeclaration).declarations[0]
         .init as PipeExpression
     ).body.push(newSegment)
     // update source ranges to section we just added.
     // hacks like this wouldn't be needed if the AST put pathToNode info in memory/sketch segments
-    const pResult = parse(recast(_ast)) // get source ranges correct since unfortunately we still rely on them
-    if (trap(pResult) || !resultIsOk(pResult))
-      return Error('Unexpected compilation error')
-    const updatedSrcRangeAst = pResult.program
+    const updatedSrcRangeAst = parse(recast(_ast)) // get source ranges correct since unfortunately we still rely on them
+    if (err(updatedSrcRangeAst)) return updatedSrcRangeAst
 
     const lastPipeItem = (
-      (updatedSrcRangeAst.body[bodyIndex] as VariableDeclaration).declaration
-        .init as PipeExpression
+      (updatedSrcRangeAst.body[bodyIndex] as VariableDeclaration)
+        .declarations[0].init as PipeExpression
     ).body.slice(-1)[0]
 
     ;(
-      (_ast.body[bodyIndex] as VariableDeclaration).declaration
+      (_ast.body[bodyIndex] as VariableDeclaration).declarations[0]
         .init as PipeExpression
     ).body.slice(-1)[0].start = lastPipeItem.start
 
     _ast.end = lastPipeItem.end
     const varDec = _ast.body[bodyIndex] as Node<VariableDeclaration>
     varDec.end = lastPipeItem.end
-    const declarator = varDec.declaration
+    const declarator = varDec.declarations[0]
     declarator.end = lastPipeItem.end
     const init = declarator.init as Node<PipeExpression>
     init.end = lastPipeItem.end
@@ -2141,7 +2140,7 @@ function prepareTruncatedMemoryAndAst(
     if (node.type !== 'VariableDeclaration') {
       continue
     }
-    const name = node.declaration.id.name
+    const name = node.declarations[0].id.name
     const memoryItem = programMemory.get(name)
     if (!memoryItem) {
       continue

src/components/AstExplorer.tsx

@@ -5,7 +5,6 @@ import { useEffect, useRef, useState } from 'react'
 import { trap } from 'lib/trap'
 import { codeToIdSelections } from 'lib/selections'
 import { codeRefFromRange } from 'lang/std/artifactGraph'
-import { defaultSourceRange } from 'lang/wasm'
 
 export function AstExplorer() {
   const { context } = useModelingContext()
@@ -47,7 +46,7 @@ export function AstExplorer() {
       <div
         className="h-full relative"
         onMouseLeave={(e) => {
-          editorManager.setHighlightRange([defaultSourceRange()])
+          editorManager.setHighlightRange([[0, 0]])
         }}
       >
         <pre className="text-xs">
@@ -116,19 +115,15 @@ function DisplayObj({
         hasCursor ? 'bg-violet-100/80 dark:bg-violet-100/25' : ''
       }`}
       onMouseEnter={(e) => {
-        editorManager.setHighlightRange([[obj?.start || 0, obj.end, true]])
+        editorManager.setHighlightRange([[obj?.start || 0, obj.end]])
         e.stopPropagation()
       }}
       onMouseMove={(e) => {
         e.stopPropagation()
-        editorManager.setHighlightRange([[obj?.start || 0, obj.end, true]])
+        editorManager.setHighlightRange([[obj?.start || 0, obj.end]])
       }}
       onClick={(e) => {
-        const range: [number, number, boolean] = [
-          obj?.start || 0,
-          obj.end || 0,
-          true,
-        ]
+        const range: [number, number] = [obj?.start || 0, obj.end || 0]
         const idInfo = codeToIdSelections([
           { codeRef: codeRefFromRange(range, kclManager.ast) },
         ])[0]

src/components/AvailableVarsHelpers.tsx

@@ -1,11 +1,5 @@
 import { useEffect, useState, useRef } from 'react'
-import {
-  parse,
-  BinaryPart,
-  Expr,
-  ProgramMemory,
-  resultIsOk,
-} from '../lang/wasm'
+import { parse, BinaryPart, Expr, ProgramMemory } from '../lang/wasm'
 import {
   createIdentifier,
   createLiteral,
@@ -147,9 +141,8 @@ export function useCalc({
   useEffect(() => {
     try {
       const code = `const __result__ = ${value}`
-      const pResult = parse(code)
-      if (trap(pResult) || !resultIsOk(pResult)) return
-      const ast = pResult.program
+      const ast = parse(code)
+      if (trap(ast)) return
       const _programMem: ProgramMemory = ProgramMemory.empty()
       for (const { key, value } of availableVarInfo.variables) {
         const error = _programMem.set(key, {
@@ -163,17 +156,18 @@ export function useCalc({
       executeAst({
         ast,
         engineCommandManager,
-        // We make sure to send an empty program memory to denote we mean mock mode.
+        useFakeExecutor: true,
         programMemoryOverride: kclManager.programMemory.clone(),
+        idGenerator: kclManager.execState.idGenerator,
       }).then(({ execState }) => {
         const resultDeclaration = ast.body.find(
           (a) =>
             a.type === 'VariableDeclaration' &&
-            a.declaration.id?.name === '__result__'
+            a.declarations?.[0]?.id?.name === '__result__'
         )
         const init =
           resultDeclaration?.type === 'VariableDeclaration' &&
-          resultDeclaration?.declaration.init
+          resultDeclaration?.declarations?.[0]?.init
         const result = execState.memory?.get('__result__')?.value
         setCalcResult(typeof result === 'number' ? String(result) : 'NAN')
         init && setValueNode(init)

src/components/FileTree.tsx

@@ -266,7 +266,6 @@ const FileTreeItem = ({
       // Let the lsp servers know we closed a file.
       onFileClose(currentFile?.path || null, project?.path || null)
       onFileOpen(fileOrDir.path, project?.path || null)
-      kclManager.switchedFiles = true
 
       // Open kcl files
       navigate(`${PATHS.FILE}/${encodeURIComponent(fileOrDir.path)}`)

src/components/ModelingMachineProvider.tsx

@@ -50,8 +50,6 @@ import {
   isSketchPipe,
   Selections,
   updateSelections,
-  canLoftSelection,
-  canShellSelection,
 } from 'lib/selections'
 import { applyConstraintIntersect } from './Toolbar/Intersect'
 import { applyConstraintAbsDistance } from './Toolbar/SetAbsDistance'
@@ -68,9 +66,8 @@ import {
   sketchOnOffsetPlane,
   startSketchOnDefault,
 } from 'lang/modifyAst'
-import { Program, parse, recast, resultIsOk } from 'lang/wasm'
+import { Program, parse, recast } from 'lang/wasm'
 import {
-  doesSceneHaveExtrudedSketch,
   doesSceneHaveSweepableSketch,
   getNodePathFromSourceRange,
   isSingleCursorInPipe,
@@ -85,7 +82,7 @@ import { getVarNameModal } from 'hooks/useToolbarGuards'
 import { err, reportRejection, trap } from 'lib/trap'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { modelingMachineEvent } from 'editor/manager'
-import { hasValidEdgeTreatmentSelection } from 'lang/modifyAst/addEdgeTreatment'
+import { hasValidFilletSelection } from 'lang/modifyAst/addFillet'
 import {
   ExportIntent,
   EngineConnectionStateType,
@@ -572,39 +569,6 @@ export const ModelingMachineProvider = ({
           if (err(canSweep)) return false
           return canSweep
         },
-        'has valid loft selection': ({ context: { selectionRanges } }) => {
-          const hasNoSelection =
-            selectionRanges.graphSelections.length === 0 ||
-            isRangeBetweenCharacters(selectionRanges) ||
-            isSelectionLastLine(selectionRanges, codeManager.code)
-
-          if (hasNoSelection) {
-            const count = 2
-            return doesSceneHaveSweepableSketch(kclManager.ast, count)
-          }
-
-          const canLoft = canLoftSelection(selectionRanges)
-          if (err(canLoft)) return false
-          return canLoft
-        },
-        'has valid shell selection': ({
-          context: { selectionRanges },
-          event,
-        }) => {
-          const hasNoSelection =
-            selectionRanges.graphSelections.length === 0 ||
-            isRangeBetweenCharacters(selectionRanges) ||
-            isSelectionLastLine(selectionRanges, codeManager.code)
-
-          if (hasNoSelection) {
-            return doesSceneHaveExtrudedSketch(kclManager.ast)
-          }
-
-          const canShell = canShellSelection(selectionRanges)
-          console.log('canShellSelection', canShellSelection(selectionRanges))
-          if (err(canShell)) return false
-          return canShell
-        },
         'has valid selection for deletion': ({
           context: { selectionRanges },
         }) => {
@@ -612,10 +576,8 @@ export const ModelingMachineProvider = ({
           if (selectionRanges.graphSelections.length <= 0) return false
           return true
         },
-        'has valid edge treatment selection': ({
-          context: { selectionRanges },
-        }) => {
-          return hasValidEdgeTreatmentSelection({
+        'has valid fillet selection': ({ context: { selectionRanges } }) => {
+          return hasValidFilletSelection({
             selectionRanges,
             ast: kclManager.ast,
             code: codeManager.code,
@@ -632,11 +594,15 @@ export const ModelingMachineProvider = ({
           )
         },
         'Has exportable geometry': () => {
-          if (!kclManager.hasErrors() && kclManager.ast.body.length > 0)
+          if (
+            kclManager.kclErrors.length === 0 &&
+            kclManager.ast.body.length > 0
+          )
             return true
           else {
             let errorMessage = 'Unable to Export '
-            if (kclManager.hasErrors()) errorMessage += 'due to KCL Errors'
+            if (kclManager.kclErrors.length > 0)
+              errorMessage += 'due to KCL Errors'
             else if (kclManager.ast.body.length === 0)
               errorMessage += 'due to Empty Scene'
             console.error(errorMessage)
@@ -754,11 +720,7 @@ export const ModelingMachineProvider = ({
                 constraint: 'setHorzDistance',
                 selectionRanges,
               })
-            const pResult = parse(recast(modifiedAst))
-            if (trap(pResult) || !resultIsOk(pResult))
-              return Promise.reject(new Error('Unexpected compilation error'))
-            const _modifiedAst = pResult.program
-
+            const _modifiedAst = parse(recast(modifiedAst))
             if (!sketchDetails)
               return Promise.reject(new Error('No sketch details'))
             const updatedPathToNode = updatePathToNodeFromMap(
@@ -799,10 +761,7 @@ export const ModelingMachineProvider = ({
                 constraint: 'setVertDistance',
                 selectionRanges,
               })
-            const pResult = parse(recast(modifiedAst))
-            if (trap(pResult) || !resultIsOk(pResult))
-              return Promise.reject(new Error('Unexpected compilation error'))
-            const _modifiedAst = pResult.program
+            const _modifiedAst = parse(recast(modifiedAst))
             if (!sketchDetails)
               return Promise.reject(new Error('No sketch details'))
             const updatedPathToNode = updatePathToNodeFromMap(
@@ -850,10 +809,7 @@ export const ModelingMachineProvider = ({
                   selectionRanges,
                   angleOrLength: 'setAngle',
                 }))
-            const pResult = parse(recast(modifiedAst))
-            if (trap(pResult) || !resultIsOk(pResult))
-              return Promise.reject(new Error('Unexpected compilation error'))
-            const _modifiedAst = pResult.program
+            const _modifiedAst = parse(recast(modifiedAst))
             if (err(_modifiedAst)) return Promise.reject(_modifiedAst)
 
             if (!sketchDetails)
@@ -895,10 +851,7 @@ export const ModelingMachineProvider = ({
               await applyConstraintAngleLength({
                 selectionRanges,
               })
-            const pResult = parse(recast(modifiedAst))
-            if (trap(pResult) || !resultIsOk(pResult))
-              return Promise.reject(new Error('Unexpected compilation error'))
-            const _modifiedAst = pResult.program
+            const _modifiedAst = parse(recast(modifiedAst))
             if (!sketchDetails)
               return Promise.reject(new Error('No sketch details'))
             const updatedPathToNode = updatePathToNodeFromMap(
@@ -938,10 +891,7 @@ export const ModelingMachineProvider = ({
               await applyConstraintIntersect({
                 selectionRanges,
               })
-            const pResult = parse(recast(modifiedAst))
-            if (trap(pResult) || !resultIsOk(pResult))
-              return Promise.reject(new Error('Unexpected compilation error'))
-            const _modifiedAst = pResult.program
+            const _modifiedAst = parse(recast(modifiedAst))
             if (!sketchDetails)
               return Promise.reject(new Error('No sketch details'))
             const updatedPathToNode = updatePathToNodeFromMap(
@@ -982,10 +932,7 @@ export const ModelingMachineProvider = ({
                 constraint: 'xAbs',
                 selectionRanges,
               })
-            const pResult = parse(recast(modifiedAst))
-            if (trap(pResult) || !resultIsOk(pResult))
-              return Promise.reject(new Error('Unexpected compilation error'))
-            const _modifiedAst = pResult.program
+            const _modifiedAst = parse(recast(modifiedAst))
             if (!sketchDetails)
               return Promise.reject(new Error('No sketch details'))
             const updatedPathToNode = updatePathToNodeFromMap(
@@ -1026,10 +973,7 @@ export const ModelingMachineProvider = ({
                 constraint: 'yAbs',
                 selectionRanges,
               })
-            const pResult = parse(recast(modifiedAst))
-            if (trap(pResult) || !resultIsOk(pResult))
-              return Promise.reject(new Error('Unexpected compilation error'))
-            const _modifiedAst = pResult.program
+            const _modifiedAst = parse(recast(modifiedAst))
             if (!sketchDetails)
               return Promise.reject(new Error('No sketch details'))
             const updatedPathToNode = updatePathToNodeFromMap(
@@ -1070,10 +1014,9 @@ export const ModelingMachineProvider = ({
             const { variableName } = await getVarNameModal({
               valueName: data?.variableName || 'var',
             })
-            let pResult = parse(recast(kclManager.ast))
-            if (trap(pResult) || !resultIsOk(pResult))
-              return Promise.reject(new Error('Unexpected compilation error'))
-            let parsed = pResult.program
+            let parsed = parse(recast(kclManager.ast))
+            if (trap(parsed)) return Promise.reject(parsed)
+            parsed = parsed as Node<Program>
 
             const { modifiedAst: _modifiedAst, pathToReplacedNode } =
               moveValueIntoNewVariablePath(
@@ -1082,11 +1025,7 @@ export const ModelingMachineProvider = ({
                 data?.pathToNode || [],
                 variableName
               )
-            pResult = parse(recast(_modifiedAst))
-            if (trap(pResult) || !resultIsOk(pResult))
-              return Promise.reject(new Error('Unexpected compilation error'))
-            parsed = pResult.program
-
+            parsed = parse(recast(_modifiedAst))
             if (trap(parsed)) return Promise.reject(parsed)
             parsed = parsed as Node<Program>
             if (!pathToReplacedNode)

src/components/ModelingSidebar/ModelingPanes/KclEditorMenu.tsx

@@ -40,9 +40,7 @@ export const KclEditorMenu = ({ children }: PropsWithChildren) => {
         <Menu.Items className="absolute right-0 left-auto w-72 flex flex-col gap-1 divide-y divide-chalkboard-20 dark:divide-chalkboard-70 align-stretch px-0 py-1 bg-chalkboard-10 dark:bg-chalkboard-100 rounded-sm shadow-lg border border-solid border-chalkboard-20/50 dark:border-chalkboard-80/50">
           <Menu.Item>
             <button
-              onClick={() => {
-                kclManager.format().catch(reportRejection)
-              }}
+              onClick={() => kclManager.format()}
               className={styles.button}
             >
               <span>Format code</span>

src/components/ModelingSidebar/ModelingPanes/MemoryPane.test.tsx

@@ -1,6 +1,6 @@
 import { processMemory } from './MemoryPane'
 import { enginelessExecutor } from '../../../lib/testHelpers'
-import { assertParse, initPromise, ProgramMemory } from '../../../lang/wasm'
+import { initPromise, parse, ProgramMemory } from '../../../lang/wasm'
 
 beforeAll(async () => {
   await initPromise
@@ -28,16 +28,12 @@ describe('processMemory', () => {
     |> lineTo([0.98, 5.16], %)
     |> lineTo([2.15, 4.32], %)
     // |> rx(90, %)`
-    const ast = assertParse(code)
+    const ast = parse(code)
     const execState = await enginelessExecutor(ast, ProgramMemory.empty())
     const output = processMemory(execState.memory)
     expect(output.myVar).toEqual(5)
     expect(output.otherVar).toEqual(3)
     expect(output).toEqual({
-      HALF_TURN: 180,
-      QUARTER_TURN: 90,
-      THREE_QUARTER_TURN: 270,
-      ZERO: 0,
       myVar: 5,
       myFn: '__function(a)__',
       otherVar: 3,

src/components/ModelingSidebar/ModelingPanes/index.tsx

@@ -90,7 +90,7 @@ export const sidebarPanes: SidebarPane[] = [
     keybinding: 'Shift + C',
     showBadge: {
       value: ({ kclContext }) => {
-        return kclContext.diagnostics.length
+        return kclContext.errors.length
       },
       onClick: (e) => {
         e.preventDefault()

src/components/ModelingSidebar/ModelingSidebar.tsx

@@ -53,7 +53,7 @@ export function ModelingSidebar({ paneOpacity }: ModelingSidebarProps) {
       settings: settings.context,
       platform: getPlatformString(),
     }),
-    [kclContext.diagnostics, settings.context]
+    [kclContext.errors, settings.context]
   )
 
   const sidebarActions: SidebarAction[] = [

src/components/ProjectSidebarMenu.tsx

@@ -10,7 +10,7 @@ import { APP_NAME } from 'lib/constants'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { CustomIcon } from './CustomIcon'
 import { useLspContext } from './LspProvider'
-import { engineCommandManager, kclManager } from 'lib/singletons'
+import { engineCommandManager } from 'lib/singletons'
 import { MachineManagerContext } from 'components/MachineManagerProvider'
 import usePlatform from 'hooks/usePlatform'
 import { useAbsoluteFilePath } from 'hooks/useAbsoluteFilePath'
@@ -68,7 +68,8 @@ function AppLogoLink({
       data-testid="app-logo"
       onClick={() => {
         onProjectClose(file || null, project?.path || null, false)
-        kclManager.switchedFiles = true
+        // Clear the scene and end the session.
+        engineCommandManager.endSession()
       }}
       to={PATHS.HOME}
       className={wrapperClassName + ' hover:before:brightness-110'}
@@ -189,7 +190,8 @@ function ProjectMenuPopover({
           className: !isDesktop() ? 'hidden' : '',
           onClick: () => {
             onProjectClose(file || null, project?.path || null, true)
-            kclManager.switchedFiles = true
+            // Clear the scene and end the session.
+            engineCommandManager.endSession()
           },
         },
       ].filter(

src/components/Toolbar/RemoveConstrainingValues.tsx

@@ -40,10 +40,7 @@ export function removeConstrainingValuesInfo({
         otherSelections: [],
         graphSelections: nodes.map(
           (node): Selection => ({
-            codeRef: codeRefFromRange(
-              [node.start, node.end, true],
-              kclManager.ast
-            ),
+            codeRef: codeRefFromRange([node.start, node.end], kclManager.ast),
           })
         ),
       }

src/editor/manager.ts

@@ -139,9 +139,7 @@ export default class EditorManager {
   }
 
   setHighlightRange(range: Array<Selection['codeRef']['range']>): void {
-    this._highlightRange = range.map((s): [number, number] => {
-      return [s[0], s[1]]
-    })
+    this._highlightRange = range
 
     const selectionsWithSafeEnds = range.map((s): [number, number] => {
       const safeEnd = Math.min(s[1], this._editorView?.state.doc.length || s[1])

src/hooks/useEngineConnectionSubscriptions.ts

@@ -18,7 +18,7 @@ import {
 import { err, reportRejection } from 'lib/trap'
 import { DefaultPlaneStr, getFaceDetails } from 'clientSideScene/sceneEntities'
 import { getNodeFromPath, getNodePathFromSourceRange } from 'lang/queryAst'
-import { CallExpression, defaultSourceRange } from 'lang/wasm'
+import { CallExpression } from 'lang/wasm'
 import { EdgeCutInfo, ExtrudeFacePlane } from 'machines/modelingMachine'
 
 export function useEngineConnectionSubscriptions() {
@@ -46,7 +46,7 @@ export function useEngineConnectionSubscriptions() {
           (editorManager.highlightRange[0][0] !== 0 &&
             editorManager.highlightRange[0][1] !== 0)
         ) {
-          editorManager.setHighlightRange([defaultSourceRange()])
+          editorManager.setHighlightRange([[0, 0]])
         }
       },
     })
@@ -201,7 +201,7 @@ export function useEngineConnectionSubscriptions() {
               const { z_axis, y_axis, origin } = faceInfo
               const sketchPathToNode = getNodePathFromSourceRange(
                 kclManager.ast,
-                err(codeRef) ? defaultSourceRange() : codeRef.range
+                err(codeRef) ? [0, 0] : codeRef.range
               )
 
               const getEdgeCutMeta = (): null | EdgeCutInfo => {

src/lang/KclProvider.tsx

@@ -1,15 +1,15 @@
+import { KCLError } from './errors'
 import { createContext, useContext, useEffect, useState } from 'react'
 import { type IndexLoaderData } from 'lib/types'
 import { useLoaderData } from 'react-router-dom'
 import { codeManager, kclManager } from 'lib/singletons'
-import { Diagnostic } from '@codemirror/lint'
 
 const KclContext = createContext({
   code: codeManager?.code || '',
   programMemory: kclManager?.programMemory,
   ast: kclManager?.ast,
   isExecuting: kclManager?.isExecuting,
-  diagnostics: kclManager?.diagnostics,
+  errors: kclManager?.kclErrors,
   logs: kclManager?.logs,
   wasmInitFailed: kclManager?.wasmInitFailed,
 })
@@ -32,7 +32,7 @@ export function KclContextProvider({
   const [programMemory, setProgramMemory] = useState(kclManager.programMemory)
   const [ast, setAst] = useState(kclManager.ast)
   const [isExecuting, setIsExecuting] = useState(false)
-  const [diagnostics, setErrors] = useState<Diagnostic[]>([])
+  const [errors, setErrors] = useState<KCLError[]>([])
   const [logs, setLogs] = useState<string[]>([])
   const [wasmInitFailed, setWasmInitFailed] = useState(false)
 
@@ -57,7 +57,7 @@ export function KclContextProvider({
         programMemory,
         ast,
         isExecuting,
-        diagnostics,
+        errors,
         logs,
         wasmInitFailed,
       }}

src/lang/KclSingleton.ts

@@ -1,10 +1,6 @@
 import { executeAst, lintAst } from 'lang/langHelpers'
 import { Selections } from 'lib/selections'
-import {
-  KCLError,
-  complilationErrorsToDiagnostics,
-  kclErrorsToDiagnostics,
-} from './errors'
+import { KCLError, kclErrorsToDiagnostics } from './errors'
 import { uuidv4 } from 'lib/utils'
 import { EngineCommandManager } from './std/engineConnection'
 import { err } from 'lib/trap'
@@ -12,7 +8,6 @@ import { EXECUTE_AST_INTERRUPT_ERROR_MESSAGE } from 'lib/constants'
 
 import {
   CallExpression,
-  clearSceneAndBustCache,
   emptyExecState,
   ExecState,
   initPromise,
@@ -56,12 +51,11 @@ export class KclManager {
   private _programMemory: ProgramMemory = ProgramMemory.empty()
   lastSuccessfulProgramMemory: ProgramMemory = ProgramMemory.empty()
   private _logs: string[] = []
-  private _diagnostics: Diagnostic[] = []
+  private _lints: Diagnostic[] = []
+  private _kclErrors: KCLError[] = []
   private _isExecuting = false
   private _executeIsStale: ExecuteArgs | null = null
   private _wasmInitFailed = true
-  private _hasErrors = false
-  private _switchedFiles = false
 
   engineCommandManager: EngineCommandManager
 
@@ -69,7 +63,7 @@ export class KclManager {
   private _astCallBack: (arg: Node<Program>) => void = () => {}
   private _programMemoryCallBack: (arg: ProgramMemory) => void = () => {}
   private _logsCallBack: (arg: string[]) => void = () => {}
-  private _kclErrorsCallBack: (errors: Diagnostic[]) => void = () => {}
+  private _kclErrorsCallBack: (arg: KCLError[]) => void = () => {}
   private _wasmInitFailedCallback: (arg: boolean) => void = () => {}
   private _executeCallback: () => void = () => {}
 
@@ -81,10 +75,6 @@ export class KclManager {
     this._astCallBack(ast)
   }
 
-  set switchedFiles(switchedFiles: boolean) {
-    this._switchedFiles = switchedFiles
-  }
-
   get programMemory() {
     return this._programMemory
   }
@@ -94,7 +84,7 @@ export class KclManager {
     this._programMemoryCallBack(programMemory)
   }
 
-  private set execState(execState) {
+  set execState(execState) {
     this._execState = execState
     this.programMemory = execState.memory
   }
@@ -111,28 +101,38 @@ export class KclManager {
     this._logsCallBack(logs)
   }
 
-  get diagnostics() {
-    return this._diagnostics
+  get lints() {
+    return this._lints
   }
 
-  set diagnostics(ds) {
-    if (ds === this._diagnostics) return
-    this._diagnostics = ds
+  set lints(lints) {
+    if (lints === this._lints) return
+    this._lints = lints
+    // Run the lints through the diagnostics.
+    this.kclErrors = this._kclErrors
+  }
+
+  get kclErrors() {
+    return this._kclErrors
+  }
+  set kclErrors(kclErrors) {
+    if (kclErrors === this._kclErrors && this.lints.length === 0) return
+    this._kclErrors = kclErrors
     this.setDiagnosticsForCurrentErrors()
-  }
-
-  addDiagnostics(ds: Diagnostic[]) {
-    if (ds.length === 0) return
-    this.diagnostics = this.diagnostics.concat(ds)
-  }
-
-  hasErrors(): boolean {
-    return this._hasErrors
+    this._kclErrorsCallBack(kclErrors)
   }
 
   setDiagnosticsForCurrentErrors() {
-    editorManager?.setDiagnostics(this.diagnostics)
-    this._kclErrorsCallBack(this.diagnostics)
+    let diagnostics = kclErrorsToDiagnostics(this.kclErrors)
+    if (this.lints.length > 0) {
+      diagnostics = diagnostics.concat(this.lints)
+    }
+    editorManager?.setDiagnostics(diagnostics)
+  }
+
+  addKclErrors(kclErrors: KCLError[]) {
+    if (kclErrors.length === 0) return
+    this.kclErrors = this.kclErrors.concat(kclErrors)
   }
 
   get isExecuting() {
@@ -172,12 +172,8 @@ export class KclManager {
     this.engineCommandManager = engineCommandManager
 
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.ensureWasmInit().then(async () => {
-      await this.safeParse(codeManager.code).then((ast) => {
-        if (ast) {
-          this.ast = ast
-        }
-      })
+    this.ensureWasmInit().then(() => {
+      this.ast = this.safeParse(codeManager.code) || this.ast
     })
   }
 
@@ -192,7 +188,7 @@ export class KclManager {
     setProgramMemory: (arg: ProgramMemory) => void
     setAst: (arg: Node<Program>) => void
     setLogs: (arg: string[]) => void
-    setKclErrors: (errors: Diagnostic[]) => void
+    setKclErrors: (arg: KCLError[]) => void
     setIsExecuting: (arg: boolean) => void
     setWasmInitFailed: (arg: boolean) => void
   }) {
@@ -221,48 +217,18 @@ export class KclManager {
     }
   }
 
-  // (jess) I'm not in love with this, but it ensures we clear the scene and
-  // bust the cache on
-  // errors from parsing when opening new files.
-  // Why not just clear the cache on all parse errors, you ask? well its actually
-  // really nice to keep the cache on parse errors within the same file, and
-  // only bust on engine errors esp if they take a long time to execute and
-  // you hit the wrong key!
-  private async checkIfSwitchedFilesShouldClear() {
-    // If we were switching files and we hit an error on parse we need to bust
-    // the cache and clear the scene.
-    if (this._hasErrors && this._switchedFiles) {
-      await clearSceneAndBustCache(this.engineCommandManager)
-    } else if (this._switchedFiles) {
-      // Reset the switched files boolean.
-      this._switchedFiles = false
-    }
-  }
+  safeParse(code: string): Node<Program> | null {
+    const ast = parse(code)
+    this.lints = []
+    this.kclErrors = []
+    if (!err(ast)) return ast
+    const kclerror: KCLError = ast as KCLError
 
-  async safeParse(code: string): Promise<Node<Program> | null> {
-    const result = parse(code)
-    this.diagnostics = []
-    this._hasErrors = false
-
-    if (err(result)) {
-      const kclerror: KCLError = result as KCLError
-      this.diagnostics = kclErrorsToDiagnostics([kclerror])
-      this._hasErrors = true
-
-      await this.checkIfSwitchedFilesShouldClear()
-      return null
-    }
-
-    this.addDiagnostics(complilationErrorsToDiagnostics(result.errors))
-    this.addDiagnostics(complilationErrorsToDiagnostics(result.warnings))
-    if (result.errors.length > 0) {
-      this._hasErrors = true
-
-      await this.checkIfSwitchedFilesShouldClear()
-      return null
-    }
-
-    return result.program
+    this.addKclErrors([kclerror])
+    // TODO: re-eval if session should end?
+    if (kclerror.msg === 'file is empty')
+      this.engineCommandManager?.endSession()
+    return null
   }
 
   async ensureWasmInit() {
@@ -301,16 +267,19 @@ export class KclManager {
     this._cancelTokens.set(currentExecutionId, false)
 
     this.isExecuting = true
+    // Make sure we clear before starting again. End session will do this.
+    this.engineCommandManager?.endSession()
     await this.ensureWasmInit()
     const { logs, errors, execState, isInterrupted } = await executeAst({
       ast,
+      idGenerator: this.execState.idGenerator,
       engineCommandManager: this.engineCommandManager,
     })
 
     // Program was not interrupted, setup the scene
     // Do not send send scene commands if the program was interrupted, go to clean up
     if (!isInterrupted) {
-      this.addDiagnostics(await lintAst({ ast: ast }))
+      this.lints = await lintAst({ ast: ast })
 
       sceneInfra.modelingSend({ type: 'code edit during sketch' })
       setSelectionFilterToDefault(execState.memory, this.engineCommandManager)
@@ -352,7 +321,9 @@ export class KclManager {
 
     this.logs = logs
     // Do not add the errors since the program was interrupted and the error is not a real KCL error
-    this.addDiagnostics(isInterrupted ? [] : kclErrorsToDiagnostics(errors))
+    this.addKclErrors(isInterrupted ? [] : errors)
+    // Reset the next ID index so that we reuse the previous IDs next time.
+    execState.idGenerator.nextId = 0
     this.execState = execState
     if (!errors.length) {
       this.lastSuccessfulProgramMemory = execState.memory
@@ -384,7 +355,7 @@ export class KclManager {
       console.error(newCode)
       return
     }
-    const newAst = await this.safeParse(newCode)
+    const newAst = this.safeParse(newCode)
     if (!newAst) {
       this.clearAst()
       return
@@ -393,13 +364,13 @@ export class KclManager {
 
     const { logs, errors, execState } = await executeAst({
       ast: newAst,
+      idGenerator: this.execState.idGenerator,
       engineCommandManager: this.engineCommandManager,
-      // We make sure to send an empty program memory to denote we mean mock mode.
-      programMemoryOverride: ProgramMemory.empty(),
+      useFakeExecutor: true,
     })
 
     this._logs = logs
-    this.addDiagnostics(kclErrorsToDiagnostics(errors))
+    this._kclErrors = errors
     this._execState = execState
     this._programMemory = execState.memory
     if (!errors.length) {
@@ -427,7 +398,7 @@ export class KclManager {
           ...artifact,
           codeRef: {
             ...artifact.codeRef,
-            range: [node.start, node.end, true],
+            range: [node.start, node.end],
           },
         })
       }
@@ -439,7 +410,7 @@ export class KclManager {
     })
   }
   async executeCode(zoomToFit?: boolean): Promise<void> {
-    const ast = await this.safeParse(codeManager.code)
+    const ast = this.safeParse(codeManager.code)
     if (!ast) {
       this.clearAst()
       return
@@ -447,9 +418,9 @@ export class KclManager {
     this.ast = { ...ast }
     return this.executeAst({ zoomToFit })
   }
-  async format() {
+  format() {
     const originalCode = codeManager.code
-    const ast = await this.safeParse(originalCode)
+    const ast = this.safeParse(originalCode)
     if (!ast) {
       this.clearAst()
       return
@@ -489,7 +460,7 @@ export class KclManager {
     const newCode = recast(ast)
     if (err(newCode)) return Promise.reject(newCode)
 
-    const astWithUpdatedSource = await this.safeParse(newCode)
+    const astWithUpdatedSource = this.safeParse(newCode)
     if (!astWithUpdatedSource) return Promise.reject(new Error('bad ast'))
     let returnVal: Selections | undefined = undefined
 
@@ -519,7 +490,7 @@ export class KclManager {
         if (start && end) {
           returnVal.graphSelections.push({
             codeRef: {
-              range: [start, end, true],
+              range: [start, end],
               pathToNode: path,
             },
           })

src/lang/artifact.test.ts

@@ -1,4 +1,4 @@
-import { assertParse, initPromise } from './wasm'
+import { parse, initPromise } from './wasm'
 import { enginelessExecutor } from '../lib/testHelpers'
 
 beforeAll(async () => {
@@ -14,7 +14,7 @@ const mySketch001 = startSketchOn('XY')
   |> lineTo([-1.59, -1.54], %)
   |> lineTo([0.46, -5.82], %)
   // |> rx(45, %)`
-    const execState = await enginelessExecutor(assertParse(code))
+    const execState = await enginelessExecutor(parse(code))
     // @ts-ignore
     const sketch001 = execState.memory.get('mySketch001')
     expect(sketch001).toEqual({
@@ -67,7 +67,7 @@ const mySketch001 = startSketchOn('XY')
   |> lineTo([0.46, -5.82], %)
   // |> rx(45, %)
   |> extrude(2, %)`
-    const execState = await enginelessExecutor(assertParse(code))
+    const execState = await enginelessExecutor(parse(code))
     // @ts-ignore
     const sketch001 = execState.memory.get('mySketch001')
     expect(sketch001).toEqual({
@@ -147,7 +147,7 @@ const sk2 = startSketchOn('XY')
   |> extrude(2, %)
 
 `
-    const execState = await enginelessExecutor(assertParse(code))
+    const execState = await enginelessExecutor(parse(code))
     const programMemory = execState.memory
     // @ts-ignore
     const geos = [programMemory.get('theExtrude'), programMemory.get('sk2')]

src/lang/errors.test.ts

@@ -8,14 +8,20 @@ describe('test kclErrToDiagnostic', () => {
         message: '',
         kind: 'semantic',
         msg: 'Semantic error',
-        sourceRange: [0, 1, true],
+        sourceRanges: [
+          [0, 1, 0],
+          [2, 3, 0],
+        ],
       },
       {
         name: '',
         message: '',
         kind: 'type',
         msg: 'Type error',
-        sourceRange: [4, 5, true],
+        sourceRanges: [
+          [4, 5, 0],
+          [6, 7, 0],
+        ],
       },
     ]
     const diagnostics = kclErrorsToDiagnostics(errors)
@@ -26,12 +32,24 @@ describe('test kclErrToDiagnostic', () => {
         message: 'Semantic error',
         severity: 'error',
       },
+      {
+        from: 2,
+        to: 3,
+        message: 'Semantic error',
+        severity: 'error',
+      },
       {
         from: 4,
         to: 5,
         message: 'Type error',
         severity: 'error',
       },
+      {
+        from: 6,
+        to: 7,
+        message: 'Type error',
+        severity: 'error',
+      },
     ])
   })
 })

src/lang/errors.ts

@@ -1,90 +1,88 @@
 import { KclError as RustKclError } from '../wasm-lib/kcl/bindings/KclError'
-import { CompilationError } from 'wasm-lib/kcl/bindings/CompilationError'
 import { Diagnostic as CodeMirrorDiagnostic } from '@codemirror/lint'
 import { posToOffset } from '@kittycad/codemirror-lsp-client'
 import { Diagnostic as LspDiagnostic } from 'vscode-languageserver-protocol'
 import { Text } from '@codemirror/state'
-import { EditorView } from 'codemirror'
-import { SourceRange } from 'lang/wasm'
+
+const TOP_LEVEL_MODULE_ID = 0
 
 type ExtractKind<T> = T extends { kind: infer K } ? K : never
 export class KCLError extends Error {
   kind: ExtractKind<RustKclError> | 'name'
-  sourceRange: SourceRange
+  sourceRanges: [number, number, number][]
   msg: string
-
   constructor(
     kind: ExtractKind<RustKclError> | 'name',
     msg: string,
-    sourceRange: SourceRange
+    sourceRanges: [number, number, number][]
   ) {
     super()
     this.kind = kind
     this.msg = msg
-    this.sourceRange = sourceRange
+    this.sourceRanges = sourceRanges
     Object.setPrototypeOf(this, KCLError.prototype)
   }
 }
 
 export class KCLLexicalError extends KCLError {
-  constructor(msg: string, sourceRange: SourceRange) {
-    super('lexical', msg, sourceRange)
+  constructor(msg: string, sourceRanges: [number, number, number][]) {
+    super('lexical', msg, sourceRanges)
     Object.setPrototypeOf(this, KCLSyntaxError.prototype)
   }
 }
 
 export class KCLInternalError extends KCLError {
-  constructor(msg: string, sourceRange: SourceRange) {
-    super('internal', msg, sourceRange)
+  constructor(msg: string, sourceRanges: [number, number, number][]) {
+    super('internal', msg, sourceRanges)
     Object.setPrototypeOf(this, KCLSyntaxError.prototype)
   }
 }
 
 export class KCLSyntaxError extends KCLError {
-  constructor(msg: string, sourceRange: SourceRange) {
-    super('syntax', msg, sourceRange)
+  constructor(msg: string, sourceRanges: [number, number, number][]) {
+    super('syntax', msg, sourceRanges)
     Object.setPrototypeOf(this, KCLSyntaxError.prototype)
   }
 }
 
 export class KCLSemanticError extends KCLError {
-  constructor(msg: string, sourceRange: SourceRange) {
-    super('semantic', msg, sourceRange)
+  constructor(msg: string, sourceRanges: [number, number, number][]) {
+    super('semantic', msg, sourceRanges)
     Object.setPrototypeOf(this, KCLSemanticError.prototype)
   }
 }
 
 export class KCLTypeError extends KCLError {
-  constructor(msg: string, sourceRange: SourceRange) {
-    super('type', msg, sourceRange)
+  constructor(msg: string, sourceRanges: [number, number, number][]) {
+    super('type', msg, sourceRanges)
     Object.setPrototypeOf(this, KCLTypeError.prototype)
   }
 }
 
 export class KCLUnimplementedError extends KCLError {
-  constructor(msg: string, sourceRange: SourceRange) {
-    super('unimplemented', msg, sourceRange)
+  constructor(msg: string, sourceRanges: [number, number, number][]) {
+    super('unimplemented', msg, sourceRanges)
     Object.setPrototypeOf(this, KCLUnimplementedError.prototype)
   }
 }
 
 export class KCLUnexpectedError extends KCLError {
-  constructor(msg: string, sourceRange: SourceRange) {
-    super('unexpected', msg, sourceRange)
+  constructor(msg: string, sourceRanges: [number, number, number][]) {
+    super('unexpected', msg, sourceRanges)
     Object.setPrototypeOf(this, KCLUnexpectedError.prototype)
   }
 }
 
 export class KCLValueAlreadyDefined extends KCLError {
-  constructor(key: string, sourceRange: SourceRange) {
-    super('name', `Key ${key} was already defined elsewhere`, sourceRange)
+  constructor(key: string, sourceRanges: [number, number, number][]) {
+    super('name', `Key ${key} was already defined elsewhere`, sourceRanges)
     Object.setPrototypeOf(this, KCLValueAlreadyDefined.prototype)
   }
 }
 
 export class KCLUndefinedValueError extends KCLError {
-  constructor(key: string, sourceRange: SourceRange) {
-    super('name', `Key ${key} has not been defined`, sourceRange)
+  constructor(key: string, sourceRanges: [number, number, number][]) {
+    super('name', `Key ${key} has not been defined`, sourceRanges)
     Object.setPrototypeOf(this, KCLUndefinedValueError.prototype)
   }
 }
@@ -101,14 +99,27 @@ export function lspDiagnosticsToKclErrors(
     .flatMap(
       ({ range, message }) =>
         new KCLError('unexpected', message, [
-          posToOffset(doc, range.start)!,
-          posToOffset(doc, range.end)!,
-          true,
+          [
+            posToOffset(doc, range.start)!,
+            posToOffset(doc, range.end)!,
+            TOP_LEVEL_MODULE_ID,
+          ],
         ])
     )
+    .filter(({ sourceRanges }) => {
+      const [from, to, moduleId] = sourceRanges[0]
+      return (
+        from !== null &&
+        to !== null &&
+        from !== undefined &&
+        to !== undefined &&
+        // Filter out errors that are not from the top-level module.
+        moduleId === TOP_LEVEL_MODULE_ID
+      )
+    })
     .sort((a, b) => {
-      const c = a.sourceRange[0]
-      const d = b.sourceRange[0]
+      const c = a.sourceRanges[0][0]
+      const d = b.sourceRanges[0][0]
       switch (true) {
         case c < d:
           return -1
@@ -126,48 +137,17 @@ export function lspDiagnosticsToKclErrors(
 export function kclErrorsToDiagnostics(
   errors: KCLError[]
 ): CodeMirrorDiagnostic[] {
-  return errors
-    ?.filter((err) => err.sourceRange[2])
-    .map((err) => {
-      return {
-        from: err.sourceRange[0],
-        to: err.sourceRange[1],
-        message: err.msg,
-        severity: 'error',
-      }
-    })
-}
-
-export function complilationErrorsToDiagnostics(
-  errors: CompilationError[]
-): CodeMirrorDiagnostic[] {
-  return errors
-    ?.filter((err) => err.sourceRange[2] === 0)
-    .map((err) => {
-      let severity: any = 'error'
-      if (err.severity === 'Warning') {
-        severity = 'warning'
-      }
-      let actions
-      const suggestion = err.suggestion
-      if (suggestion) {
-        actions = [
-          {
-            name: suggestion.title,
-            apply: (view: EditorView, from: number, to: number) => {
-              view.dispatch({
-                changes: { from, to, insert: suggestion.insert },
-              })
-            },
-          },
-        ]
-      }
-      return {
-        from: err.sourceRange[0],
-        to: err.sourceRange[1],
-        message: err.message,
-        severity,
-        actions,
-      }
-    })
+  return errors?.flatMap((err) => {
+    const sourceRanges: CodeMirrorDiagnostic[] = err.sourceRanges
+      // Filter out errors that are not from the top-level module.
+      .filter(([_start, _end, moduleId]) => moduleId === TOP_LEVEL_MODULE_ID)
+      .map(([from, to]) => {
+        return { from, to, message: err.msg, severity: 'error' }
+      })
+    // Make sure we didn't filter out all the source ranges.
+    if (sourceRanges.length === 0) {
+      sourceRanges.push({ from: 0, to: 0, message: err.msg, severity: 'error' })
+    }
+    return sourceRanges
+  })
 }

src/lang/executor.test.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs'
 
 import {
-  assertParse,
+  parse,
   ProgramMemory,
   Sketch,
   initPromise,
@@ -472,7 +472,7 @@ describe('Testing Errors', () => {
 const theExtrude = startSketchOn('XY')
   |> startProfileAt([0, 0], %)
   |> line([-2.4, 5], %)
-  |> line(myVarZ, %)
+  |> line([-0.76], myVarZ, %)
   |> line([5,5], %)
   |> close(%)
   |> extrude(4, %)`
@@ -480,7 +480,7 @@ const theExtrude = startSketchOn('XY')
       new KCLError(
         'undefined_value',
         'memory item key `myVarZ` is not defined',
-        [129, 135, true]
+        [[129, 135, 0]]
       )
     )
   })
@@ -492,7 +492,7 @@ async function exe(
   code: string,
   programMemory: ProgramMemory = ProgramMemory.empty()
 ) {
-  const ast = assertParse(code)
+  const ast = parse(code)
 
   const execState = await enginelessExecutor(ast, programMemory)
   return execState.memory

src/lang/getNodePathFromSourceRange.test.ts

@@ -1,5 +1,5 @@
 import { getNodePathFromSourceRange, getNodeFromPath } from './queryAst'
-import { Identifier, assertParse, initPromise, Parameter } from './wasm'
+import { Identifier, parse, initPromise, Parameter } from './wasm'
 import { err } from 'lib/trap'
 
 beforeAll(async () => {
@@ -17,19 +17,19 @@ const sk3 = startSketchAt([0, 0])
 `
     const subStr = 'lineTo([3, 4], %, $yo)'
     const lineToSubstringIndex = code.indexOf(subStr)
-    const sourceRange: [number, number, boolean] = [
+    const sourceRange: [number, number] = [
       lineToSubstringIndex,
       lineToSubstringIndex + subStr.length,
-      true,
     ]
 
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const nodePath = getNodePathFromSourceRange(ast, sourceRange)
     const _node = getNodeFromPath<any>(ast, nodePath)
     if (err(_node)) throw _node
     const { node } = _node
 
-    expect([node.start, node.end, true]).toEqual(sourceRange)
+    expect([node.start, node.end]).toEqual(sourceRange)
     expect(node.type).toBe('CallExpression')
   })
   it('gets path right for function definition params', () => {
@@ -45,13 +45,13 @@ const sk3 = startSketchAt([0, 0])
 const b1 = cube([0,0], 10)`
     const subStr = 'pos, scale'
     const subStrIndex = code.indexOf(subStr)
-    const sourceRange: [number, number, boolean] = [
+    const sourceRange: [number, number] = [
       subStrIndex,
       subStrIndex + 'pos'.length,
-      true,
     ]
 
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const nodePath = getNodePathFromSourceRange(ast, sourceRange)
     const _node = getNodeFromPath<Parameter>(ast, nodePath)
     if (err(_node)) throw _node
@@ -60,7 +60,8 @@ const b1 = cube([0,0], 10)`
     expect(nodePath).toEqual([
       ['body', ''],
       [0, 'index'],
-      ['declaration', 'VariableDeclaration'],
+      ['declarations', 'VariableDeclaration'],
+      [0, 'index'],
       ['init', ''],
       ['params', 'FunctionExpression'],
       [0, 'index'],
@@ -81,13 +82,13 @@ const b1 = cube([0,0], 10)`
 const b1 = cube([0,0], 10)`
     const subStr = 'scale, 0'
     const subStrIndex = code.indexOf(subStr)
-    const sourceRange: [number, number, boolean] = [
+    const sourceRange: [number, number] = [
       subStrIndex,
       subStrIndex + 'scale'.length,
-      true,
     ]
 
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const nodePath = getNodePathFromSourceRange(ast, sourceRange)
     const _node = getNodeFromPath<Identifier>(ast, nodePath)
     if (err(_node)) throw _node
@@ -95,12 +96,14 @@ const b1 = cube([0,0], 10)`
     expect(nodePath).toEqual([
       ['body', ''],
       [0, 'index'],
-      ['declaration', 'VariableDeclaration'],
+      ['declarations', 'VariableDeclaration'],
+      [0, 'index'],
       ['init', ''],
       ['body', 'FunctionExpression'],
       ['body', 'FunctionExpression'],
       [0, 'index'],
-      ['declaration', 'VariableDeclaration'],
+      ['declarations', 'VariableDeclaration'],
+      [0, 'index'],
       ['init', ''],
       ['body', 'PipeExpression'],
       [2, 'index'],

src/lang/kclSamples.test.ts

@@ -1,5 +1,6 @@
-import { assertParse, initPromise, programMemoryInit } from './wasm'
+import { parse, initPromise, programMemoryInit } from './wasm'
 import { enginelessExecutor } from '../lib/testHelpers'
+import { assert } from 'vitest'
 // These unit tests makes web requests to a public github repository.
 
 interface KclSampleFile {
@@ -57,7 +58,8 @@ describe('Test KCL Samples from public Github repository', () => {
     files.forEach((file: KclSampleFile) => {
       it(`should parse ${file.filename} without errors`, async () => {
         const code = await getKclSampleCodeFromGithub(file.filename)
-        assertParse(code)
+        const parsed = parse(code)
+        assert(!(parsed instanceof Error))
       }, 1000)
     })
   })
@@ -69,8 +71,9 @@ describe('Test KCL Samples from public Github repository', () => {
         for (let i = 0; i < files.length; i++) {
           const file: KclSampleFile = files[i]
           const code = await getKclSampleCodeFromGithub(file.filename)
-          const ast = assertParse(code)
-          await enginelessExecutor(ast, programMemoryInit())
+          const parsed = parse(code)
+          assert(!(parsed instanceof Error))
+          await enginelessExecutor(parsed, programMemoryInit())
         }
       },
       files.length * 1000

src/lang/langHelpers.ts

@@ -2,6 +2,7 @@ import {
   Program,
   _executor,
   ProgramMemory,
+  programMemoryInit,
   kclLint,
   emptyExecState,
   ExecState,
@@ -10,6 +11,7 @@ import { enginelessExecutor } from 'lib/testHelpers'
 import { EngineCommandManager } from 'lang/std/engineConnection'
 import { KCLError } from 'lang/errors'
 import { Diagnostic } from '@codemirror/lint'
+import { IdGenerator } from 'wasm-lib/kcl/bindings/IdGenerator'
 import { Node } from 'wasm-lib/kcl/bindings/Node'
 
 export type ToolTip =
@@ -47,13 +49,15 @@ export const toolTips: Array<ToolTip> = [
 export async function executeAst({
   ast,
   engineCommandManager,
-  // If you set programMemoryOverride we assume you mean mock mode. Since that
-  // is the only way to go about it.
+  useFakeExecutor = false,
   programMemoryOverride,
+  idGenerator,
 }: {
   ast: Node<Program>
   engineCommandManager: EngineCommandManager
+  useFakeExecutor?: boolean
   programMemoryOverride?: ProgramMemory
+  idGenerator?: IdGenerator
   isInterrupted?: boolean
 }): Promise<{
   logs: string[]
@@ -62,14 +66,22 @@ export async function executeAst({
   isInterrupted: boolean
 }> {
   try {
-    const execState = await (programMemoryOverride
-      ? enginelessExecutor(ast, programMemoryOverride)
-      : _executor(ast, engineCommandManager))
-
-    await engineCommandManager.waitForAllCommands(
-      programMemoryOverride !== undefined
-    )
+    if (!useFakeExecutor) {
+      engineCommandManager.endSession()
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      engineCommandManager.startNewSession()
+    }
+    const execState = await (useFakeExecutor
+      ? enginelessExecutor(ast, programMemoryOverride || programMemoryInit())
+      : _executor(
+          ast,
+          programMemoryInit(),
+          idGenerator,
+          engineCommandManager,
+          false
+        ))
 
+    await engineCommandManager.waitForAllCommands(useFakeExecutor)
     return {
       logs: [],
       errors: [],

src/lang/modifyAst.test.ts

@@ -1,4 +1,4 @@
-import { assertParse, recast, initPromise, Identifier } from './wasm'
+import { parse, recast, initPromise, Identifier } from './wasm'
 import {
   createLiteral,
   createIdentifier,
@@ -82,11 +82,11 @@ describe('Testing createVariableDeclaration', () => {
   it('should create a variable declaration', () => {
     const result = createVariableDeclaration('myVar', createLiteral(5))
     expect(result.type).toBe('VariableDeclaration')
-    expect(result.declaration.type).toBe('VariableDeclarator')
-    expect(result.declaration.id.type).toBe('Identifier')
-    expect(result.declaration.id.name).toBe('myVar')
-    expect(result.declaration.init.type).toBe('Literal')
-    expect((result.declaration.init as any).value).toBe(5)
+    expect(result.declarations[0].type).toBe('VariableDeclarator')
+    expect(result.declarations[0].id.type).toBe('Identifier')
+    expect(result.declarations[0].id.name).toBe('myVar')
+    expect(result.declarations[0].init.type).toBe('Literal')
+    expect((result.declarations[0].init as any).value).toBe(5)
   })
 })
 describe('Testing createPipeExpression', () => {
@@ -146,13 +146,10 @@ function giveSketchFnCallTagTestHelper(
   // giveSketchFnCallTag inputs and outputs an ast, which is very verbose for testing
   // this wrapper changes the input and output to code
   // making it more of an integration test, but easier to read the test intention is the goal
-  const ast = assertParse(code)
+  const ast = parse(code)
+  if (err(ast)) throw ast
   const start = code.indexOf(searchStr)
-  const range: [number, number, boolean] = [
-    start,
-    start + searchStr.length,
-    true,
-  ]
+  const range: [number, number] = [start, start + searchStr.length]
   const sketchRes = giveSketchFnCallTag(ast, range)
   if (err(sketchRes)) throw sketchRes
   const { modifiedAst, tag, isTagExisting } = sketchRes
@@ -224,13 +221,14 @@ part001 = startSketchOn('XY')
 |> angledLine([jkl(yo) + 2, 3.09], %)
 yo2 = hmm([identifierGuy + 5])`
   it('should move a binary expression into a new variable', async () => {
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const execState = await enginelessExecutor(ast)
     const startIndex = code.indexOf('100 + 100') + 1
     const { modifiedAst } = moveValueIntoNewVariable(
       ast,
       execState.memory,
-      [startIndex, startIndex, true],
+      [startIndex, startIndex],
       'newVar'
     )
     const newCode = recast(modifiedAst)
@@ -238,13 +236,14 @@ yo2 = hmm([identifierGuy + 5])`
     expect(newCode).toContain(`angledLine([newVar, 3.09], %)`)
   })
   it('should move a value into a new variable', async () => {
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const execState = await enginelessExecutor(ast)
     const startIndex = code.indexOf('2.8') + 1
     const { modifiedAst } = moveValueIntoNewVariable(
       ast,
       execState.memory,
-      [startIndex, startIndex, true],
+      [startIndex, startIndex],
       'newVar'
     )
     const newCode = recast(modifiedAst)
@@ -252,13 +251,14 @@ yo2 = hmm([identifierGuy + 5])`
     expect(newCode).toContain(`line([newVar, 0], %)`)
   })
   it('should move a callExpression into a new variable', async () => {
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const execState = await enginelessExecutor(ast)
     const startIndex = code.indexOf('def(')
     const { modifiedAst } = moveValueIntoNewVariable(
       ast,
       execState.memory,
-      [startIndex, startIndex, true],
+      [startIndex, startIndex],
       'newVar'
     )
     const newCode = recast(modifiedAst)
@@ -266,13 +266,14 @@ yo2 = hmm([identifierGuy + 5])`
     expect(newCode).toContain(`angledLine([newVar, 3.09], %)`)
   })
   it('should move a binary expression with call expression into a new variable', async () => {
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const execState = await enginelessExecutor(ast)
     const startIndex = code.indexOf('jkl(') + 1
     const { modifiedAst } = moveValueIntoNewVariable(
       ast,
       execState.memory,
-      [startIndex, startIndex, true],
+      [startIndex, startIndex],
       'newVar'
     )
     const newCode = recast(modifiedAst)
@@ -280,13 +281,14 @@ yo2 = hmm([identifierGuy + 5])`
     expect(newCode).toContain(`angledLine([newVar, 3.09], %)`)
   })
   it('should move a identifier into a new variable', async () => {
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const execState = await enginelessExecutor(ast)
     const startIndex = code.indexOf('identifierGuy +') + 1
     const { modifiedAst } = moveValueIntoNewVariable(
       ast,
       execState.memory,
-      [startIndex, startIndex, true],
+      [startIndex, startIndex],
       'newVar'
     )
     const newCode = recast(modifiedAst)
@@ -303,20 +305,19 @@ describe('testing sketchOnExtrudedFace', () => {
   |> line([8.62, -9.57], %)
   |> close(%)
   |> extrude(5 + 7, %)`
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
 
     const segmentSnippet = `line([9.7, 9.19], %)`
-    const segmentRange: [number, number, boolean] = [
+    const segmentRange: [number, number] = [
       code.indexOf(segmentSnippet),
       code.indexOf(segmentSnippet) + segmentSnippet.length,
-      true,
     ]
     const segmentPathToNode = getNodePathFromSourceRange(ast, segmentRange)
     const extrudeSnippet = `extrude(5 + 7, %)`
-    const extrudeRange: [number, number, boolean] = [
+    const extrudeRange: [number, number] = [
       code.indexOf(extrudeSnippet),
       code.indexOf(extrudeSnippet) + extrudeSnippet.length,
-      true,
     ]
     const extrudePathToNode = getNodePathFromSourceRange(ast, extrudeRange)
 
@@ -344,19 +345,18 @@ sketch001 = startSketchOn(part001, seg01)`)
   |> line([8.62, -9.57], %)
   |> close(%)
   |> extrude(5 + 7, %)`
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const segmentSnippet = `close(%)`
-    const segmentRange: [number, number, boolean] = [
+    const segmentRange: [number, number] = [
       code.indexOf(segmentSnippet),
       code.indexOf(segmentSnippet) + segmentSnippet.length,
-      true,
     ]
     const segmentPathToNode = getNodePathFromSourceRange(ast, segmentRange)
     const extrudeSnippet = `extrude(5 + 7, %)`
-    const extrudeRange: [number, number, boolean] = [
+    const extrudeRange: [number, number] = [
       code.indexOf(extrudeSnippet),
       code.indexOf(extrudeSnippet) + extrudeSnippet.length,
-      true,
     ]
     const extrudePathToNode = getNodePathFromSourceRange(ast, extrudeRange)
 
@@ -384,19 +384,18 @@ sketch001 = startSketchOn(part001, seg01)`)
   |> line([8.62, -9.57], %)
   |> close(%)
   |> extrude(5 + 7, %)`
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const sketchSnippet = `startProfileAt([3.58, 2.06], %)`
-    const sketchRange: [number, number, boolean] = [
+    const sketchRange: [number, number] = [
       code.indexOf(sketchSnippet),
       code.indexOf(sketchSnippet) + sketchSnippet.length,
-      true,
     ]
     const sketchPathToNode = getNodePathFromSourceRange(ast, sketchRange)
     const extrudeSnippet = `extrude(5 + 7, %)`
-    const extrudeRange: [number, number, boolean] = [
+    const extrudeRange: [number, number] = [
       code.indexOf(extrudeSnippet),
       code.indexOf(extrudeSnippet) + extrudeSnippet.length,
-      true,
     ]
     const extrudePathToNode = getNodePathFromSourceRange(ast, extrudeRange)
 
@@ -433,19 +432,18 @@ sketch001 = startSketchOn(part001, 'END')`)
     |> line([-17.67, 0.85], %)
     |> close(%)
     part001 = extrude(5 + 7, sketch001)`
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const segmentSnippet = `line([4.99, -0.46], %)`
-    const segmentRange: [number, number, boolean] = [
+    const segmentRange: [number, number] = [
       code.indexOf(segmentSnippet),
       code.indexOf(segmentSnippet) + segmentSnippet.length,
-      true,
     ]
     const segmentPathToNode = getNodePathFromSourceRange(ast, segmentRange)
     const extrudeSnippet = `extrude(5 + 7, sketch001)`
-    const extrudeRange: [number, number, boolean] = [
+    const extrudeRange: [number, number] = [
       code.indexOf(extrudeSnippet),
       code.indexOf(extrudeSnippet) + extrudeSnippet.length,
-      true,
     ]
     const extrudePathToNode = getNodePathFromSourceRange(ast, extrudeRange)
 
@@ -468,13 +466,13 @@ describe('Testing deleteSegmentFromPipeExpression', () => {
   |> line([306.21, 198.82], %)
   |> line([306.21, 198.85], %, $a)
   |> line([306.21, 198.87], %)`
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const execState = await enginelessExecutor(ast)
     const lineOfInterest = 'line([306.21, 198.85], %, $a)'
-    const range: [number, number, boolean] = [
+    const range: [number, number] = [
       code.indexOf(lineOfInterest),
       code.indexOf(lineOfInterest) + lineOfInterest.length,
-      true,
     ]
     const pathToNode = getNodePathFromSourceRange(ast, range)
     const modifiedAst = deleteSegmentFromPipeExpression(
@@ -546,13 +544,13 @@ ${!replace1 ? `  |> ${line}\n` : ''}  |> angledLine([-65, ${
       ],
     ])(`%s`, async (_, line, [replace1, replace2]) => {
       const code = makeCode(line)
-      const ast = assertParse(code)
+      const ast = parse(code)
+      if (err(ast)) throw ast
       const execState = await enginelessExecutor(ast)
       const lineOfInterest = line
-      const range: [number, number, boolean] = [
+      const range: [number, number] = [
         code.indexOf(lineOfInterest),
         code.indexOf(lineOfInterest) + lineOfInterest.length,
-        true,
       ]
       const pathToNode = getNodePathFromSourceRange(ast, range)
       const dependentSegments = findUsesOfTagInPipe(ast, pathToNode)
@@ -634,14 +632,14 @@ describe('Testing removeSingleConstraintInfo', () => {
       ],
       ['tangentialArcTo([3.14 + 0, 13.14], %)', 'arrayIndex', 1],
     ] as const)('stdlib fn: %s', async (expectedFinish, key, value) => {
-      const ast = assertParse(code)
+      const ast = parse(code)
+      if (err(ast)) throw ast
 
       const execState = await enginelessExecutor(ast)
       const lineOfInterest = expectedFinish.split('(')[0] + '('
-      const range: [number, number, boolean] = [
+      const range: [number, number] = [
         code.indexOf(lineOfInterest) + 1,
         code.indexOf(lineOfInterest) + lineOfInterest.length,
-        true,
       ]
       const pathToNode = getNodePathFromSourceRange(ast, range)
       let argPosition: SimplifiedArgDetails
@@ -688,14 +686,14 @@ describe('Testing removeSingleConstraintInfo', () => {
       ['angledLineToX([12.14 + 0, 12], %)', 'arrayIndex', 1],
       ['angledLineToY([30, 10.14 + 0], %)', 'arrayIndex', 0],
     ])('stdlib fn: %s', async (expectedFinish, key, value) => {
-      const ast = assertParse(code)
+      const ast = parse(code)
+      if (err(ast)) throw ast
 
       const execState = await enginelessExecutor(ast)
       const lineOfInterest = expectedFinish.split('(')[0] + '('
-      const range: [number, number, boolean] = [
+      const range: [number, number] = [
         code.indexOf(lineOfInterest) + 1,
         code.indexOf(lineOfInterest) + lineOfInterest.length,
-        true,
       ]
       let argPosition: SimplifiedArgDetails
       if (key === 'arrayIndex' && typeof value === 'number') {
@@ -885,14 +883,14 @@ sketch002 = startSketchOn({
     '%s',
     async (name, { codeBefore, codeAfter, lineOfInterest, type }) => {
       // const lineOfInterest = 'line([-2.94, 2.7], %)'
-      const ast = assertParse(codeBefore)
+      const ast = parse(codeBefore)
+      if (err(ast)) throw ast
       const execState = await enginelessExecutor(ast)
 
       // deleteFromSelection
-      const range: [number, number, boolean] = [
+      const range: [number, number] = [
         codeBefore.indexOf(lineOfInterest),
         codeBefore.indexOf(lineOfInterest) + lineOfInterest.length,
-        true,
       ]
       const artifact = { type } as Artifact
       const newAst = await deleteFromSelection(

src/lang/modifyAst.ts

@@ -66,7 +66,8 @@ export function startSketchOnDefault(
   let pathToNode: PathToNode = [
     ['body', ''],
     [sketchIndex, 'index'],
-    ['declaration', 'VariableDeclaration'],
+    ['declarations', 'VariableDeclaration'],
+    ['0', 'index'],
     ['init', 'VariableDeclarator'],
   ]
 
@@ -93,7 +94,7 @@ export function addStartProfileAt(
     return new Error('variableDeclaration.init.type !== PipeExpression')
   }
   const _node = { ...node }
-  const init = variableDeclaration.declaration.init
+  const init = variableDeclaration.declarations[0].init
   const startProfileAt = createCallExpressionStdLib('startProfileAt', [
     createArrayExpression([
       createLiteral(roundOff(at[0])),
@@ -104,7 +105,7 @@ export function addStartProfileAt(
   if (init.type === 'PipeExpression') {
     init.body.splice(1, 0, startProfileAt)
   } else {
-    variableDeclaration.declaration.init = createPipeExpression([
+    variableDeclaration.declarations[0].init = createPipeExpression([
       init,
       startProfileAt,
     ])
@@ -148,7 +149,8 @@ export function addSketchTo(
   let pathToNode: PathToNode = [
     ['body', ''],
     [sketchIndex, 'index'],
-    ['declaration', 'VariableDeclaration'],
+    ['declarations', 'VariableDeclaration'],
+    ['0', 'index'],
     ['init', 'VariableDeclarator'],
   ]
   if (axis !== 'xy') {
@@ -331,7 +333,8 @@ export function extrudeSketch(
   const pathToExtrudeArg: PathToNode = [
     ['body', ''],
     [sketchIndexInBody + 1, 'index'],
-    ['declaration', 'VariableDeclaration'],
+    ['declarations', 'VariableDeclaration'],
+    [0, 'index'],
     ['init', 'VariableDeclarator'],
     ['arguments', 'CallExpression'],
     [0, 'index'],
@@ -343,36 +346,6 @@ export function extrudeSketch(
   }
 }
 
-export function loftSketches(
-  node: Node<Program>,
-  declarators: VariableDeclarator[]
-): {
-  modifiedAst: Node<Program>
-  pathToNode: PathToNode
-} {
-  const modifiedAst = structuredClone(node)
-  const name = findUniqueName(node, KCL_DEFAULT_CONSTANT_PREFIXES.LOFT)
-  const elements = declarators.map((d) => createIdentifier(d.id.name))
-  const loft = createCallExpressionStdLib('loft', [
-    createArrayExpression(elements),
-  ])
-  const declaration = createVariableDeclaration(name, loft)
-  modifiedAst.body.push(declaration)
-  const pathToNode: PathToNode = [
-    ['body', ''],
-    [modifiedAst.body.length - 1, 'index'],
-    ['declaration', 'VariableDeclaration'],
-    ['init', 'VariableDeclarator'],
-    ['arguments', 'CallExpression'],
-    [0, 'index'],
-  ]
-
-  return {
-    modifiedAst,
-    pathToNode,
-  }
-}
-
 export function revolveSketch(
   node: Node<Program>,
   pathToNode: PathToNode,
@@ -456,7 +429,8 @@ export function revolveSketch(
   const pathToRevolveArg: PathToNode = [
     ['body', ''],
     [sketchIndexInBody + 1, 'index'],
-    ['declaration', 'VariableDeclaration'],
+    ['declarations', 'VariableDeclaration'],
+    [0, 'index'],
     ['init', 'VariableDeclarator'],
     ['arguments', 'CallExpression'],
     [0, 'index'],
@@ -542,7 +516,8 @@ export function sketchOnExtrudedFace(
   const newpathToNode: PathToNode = [
     ['body', ''],
     [expressionIndex + 1, 'index'],
-    ['declaration', 'VariableDeclaration'],
+    ['declarations', 'VariableDeclaration'],
+    [0, 'index'],
     ['init', 'VariableDeclarator'],
   ]
 
@@ -579,7 +554,8 @@ export function addOffsetPlane({
   const pathToNode: PathToNode = [
     ['body', ''],
     [modifiedAst.body.length - 1, 'index'],
-    ['declaration', 'VariableDeclaration'],
+    ['declarations', 'VariableDeclaration'],
+    ['0', 'index'],
     ['init', 'VariableDeclarator'],
     ['arguments', 'CallExpression'],
     [0, 'index'],
@@ -816,15 +792,17 @@ export function createVariableDeclaration(
     end: 0,
     moduleId: 0,
 
-    declaration: {
-      type: 'VariableDeclarator',
-      start: 0,
-      end: 0,
-      moduleId: 0,
+    declarations: [
+      {
+        type: 'VariableDeclarator',
+        start: 0,
+        end: 0,
+        moduleId: 0,
 
-      id: createIdentifier(varName),
-      init,
-    },
+        id: createIdentifier(varName),
+        init,
+      },
+    ],
     visibility,
     kind,
   }
@@ -1111,7 +1089,7 @@ export async function deleteFromSelection(
     traverse(astClone, {
       enter: (node, path) => {
         if (node.type === 'VariableDeclaration') {
-          const dec = node.declaration
+          const dec = node.declarations[0]
           if (
             dec.init.type === 'CallExpression' &&
             (dec.init.callee.name === 'extrude' ||
@@ -1146,7 +1124,7 @@ export async function deleteFromSelection(
             enter: (node, path) => {
               ;(async () => {
                 if (node.type === 'VariableDeclaration') {
-                  currentVariableName = node.declaration.id.name
+                  currentVariableName = node.declarations[0].id.name
                 }
                 if (
                   // match startSketchOn(${extrudeNameToDelete})

src/lang/modifyAst/addFillet.test.ts

@@ -1,5 +1,5 @@
 import {
-  assertParse,
+  parse,
   recast,
   initPromise,
   PathToNode,
@@ -10,21 +10,18 @@ import {
   VariableDeclarator,
 } from '../wasm'
 import {
-  EdgeTreatmentType,
   getPathToExtrudeForSegmentSelection,
-  hasValidEdgeTreatmentSelection,
-  isTagUsedInEdgeTreatment,
-  modifyAstWithEdgeTreatmentAndTag,
-  FilletParameters,
-  ChamferParameters,
-  EdgeTreatmentParameters,
-} from './addEdgeTreatment'
+  hasValidFilletSelection,
+  isTagUsedInFillet,
+  modifyAstWithFilletAndTag,
+} from './addFillet'
 import { getNodeFromPath, getNodePathFromSourceRange } from '../queryAst'
 import { createLiteral } from 'lang/modifyAst'
 import { err } from 'lib/trap'
-import { Selection, Selections } from 'lib/selections'
+import { Selections } from 'lib/selections'
 import { engineCommandManager, kclManager } from 'lib/singletons'
 import { VITE_KC_DEV_TOKEN } from 'env'
+import { KclCommandValue } from 'lib/commandTypes'
 import { isOverlap } from 'lib/utils'
 import { codeRefFromRange } from 'lang/std/artifactGraph'
 
@@ -78,10 +75,9 @@ const runGetPathToExtrudeForSegmentSelectionTest = async (
     code: string,
     expectedExtrudeSnippet: string
   ): CallExpression | PipeExpression | Error {
-    const extrudeRange: [number, number, boolean] = [
+    const extrudeRange: [number, number] = [
       code.indexOf(expectedExtrudeSnippet),
       code.indexOf(expectedExtrudeSnippet) + expectedExtrudeSnippet.length,
-      true,
     ]
     const expectedExtrudePath = getNodePathFromSourceRange(ast, extrudeRange)
     const expectedExtrudeNodeResult = getNodeFromPath<
@@ -110,16 +106,22 @@ const runGetPathToExtrudeForSegmentSelectionTest = async (
   }
 
   // ast
-  const ast = assertParse(code)
+  const astOrError = parse(code)
+  if (err(astOrError)) return new Error('AST not found')
+  const ast = astOrError
 
   // selection
-  const segmentRange: [number, number, boolean] = [
+  const segmentRange: [number, number] = [
     code.indexOf(selectedSegmentSnippet),
     code.indexOf(selectedSegmentSnippet) + selectedSegmentSnippet.length,
-    true,
   ]
-  const selection: Selection = {
-    codeRef: codeRefFromRange(segmentRange, ast),
+  const selection: Selections = {
+    graphSelections: [
+      {
+        codeRef: codeRefFromRange(segmentRange, ast),
+      },
+    ],
+    otherSelections: [],
   }
 
   // executeAst and artifactGraph
@@ -251,24 +253,34 @@ extrude003 = extrude(-15, sketch003)`
   })
 })
 
-const runModifyAstCloneWithEdgeTreatmentAndTag = async (
+const runModifyAstCloneWithFilletAndTag = async (
   code: string,
   selectionSnippets: Array<string>,
-  parameters: EdgeTreatmentParameters,
+  radiusValue: number,
   expectedCode: string
 ) => {
   // ast
-  const ast = assertParse(code)
+  const astOrError = parse(code)
+  if (err(astOrError)) {
+    return new Error('AST not found')
+  }
+  const ast = astOrError
 
   // selection
-  const segmentRanges: Array<[number, number, boolean]> = selectionSnippets.map(
+  const segmentRanges: Array<[number, number]> = selectionSnippets.map(
     (selectionSnippet) => [
       code.indexOf(selectionSnippet),
       code.indexOf(selectionSnippet) + selectionSnippet.length,
-      true,
     ]
   )
 
+  // radius
+  const radius: KclCommandValue = {
+    valueAst: createLiteral(radiusValue),
+    valueText: radiusValue.toString(),
+    valueCalculated: radiusValue.toString(),
+  }
+
   // executeAst
   await kclManager.executeAst({ ast })
   const artifactGraph = engineCommandManager.artifactGraph
@@ -287,8 +299,8 @@ const runModifyAstCloneWithEdgeTreatmentAndTag = async (
     otherSelections: [],
   }
 
-  // apply edge treatment to seleciton
-  const result = modifyAstWithEdgeTreatmentAndTag(ast, selection, parameters)
+  // apply fillet to selection
+  const result = modifyAstWithFilletAndTag(ast, selection, radius)
   if (err(result)) {
     return result
   }
@@ -298,42 +310,9 @@ const runModifyAstCloneWithEdgeTreatmentAndTag = async (
 
   expect(newCode).toContain(expectedCode)
 }
-const createFilletParameters = (radiusValue: number): FilletParameters => ({
-  type: EdgeTreatmentType.Fillet,
-  radius: {
-    valueAst: createLiteral(radiusValue),
-    valueText: radiusValue.toString(),
-    valueCalculated: radiusValue.toString(),
-  },
-})
-const createChamferParameters = (lengthValue: number): ChamferParameters => ({
-  type: EdgeTreatmentType.Chamfer,
-  length: {
-    valueAst: createLiteral(lengthValue),
-    valueText: lengthValue.toString(),
-    valueCalculated: lengthValue.toString(),
-  },
-})
-// Iterate tests over all edge treatment types
-Object.values(EdgeTreatmentType).forEach(
-  (edgeTreatmentType: EdgeTreatmentType) => {
-    // create parameters based on the edge treatment type
-    let parameterName: string
-    let parameters: EdgeTreatmentParameters
-    if (edgeTreatmentType === EdgeTreatmentType.Fillet) {
-      parameterName = 'radius'
-      parameters = createFilletParameters(3)
-    } else if (edgeTreatmentType === EdgeTreatmentType.Chamfer) {
-      parameterName = 'length'
-      parameters = createChamferParameters(3)
-    } else {
-      // Handle future edge treatments
-      return new Error(`Unsupported edge treatment type: ${edgeTreatmentType}`)
-    }
-    // run tests
-    describe(`Testing modifyAstCloneWithEdgeTreatmentAndTag with ${edgeTreatmentType}s`, () => {
-      it(`should add a ${edgeTreatmentType} to a specific segment`, async () => {
-        const code = `sketch001 = startSketchOn('XY')
+describe('Testing applyFilletToSelection', () => {
+  it('should add a fillet to a specific segment', async () => {
+    const code = `sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, 10], %)
   |> line([20, 0], %)
   |> line([0, -20], %)
@@ -341,8 +320,9 @@ Object.values(EdgeTreatmentType).forEach(
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
 extrude001 = extrude(-15, sketch001)`
-        const segmentSnippets = ['line([0, -20], %)']
-        const expectedCode = `sketch001 = startSketchOn('XY')
+    const segmentSnippets = ['line([0, -20], %)']
+    const radiusValue = 3
+    const expectedCode = `sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, 10], %)
   |> line([20, 0], %)
   |> line([0, -20], %, $seg01)
@@ -350,17 +330,17 @@ extrude001 = extrude(-15, sketch001)`
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
 extrude001 = extrude(-15, sketch001)
-  |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01] }, %)`
+  |> fillet({ radius = 3, tags = [seg01] }, %)`
 
-        await runModifyAstCloneWithEdgeTreatmentAndTag(
-          code,
-          segmentSnippets,
-          parameters,
-          expectedCode
-        )
-      })
-      it(`should add a ${edgeTreatmentType} to the sketch pipe`, async () => {
-        const code = `sketch001 = startSketchOn('XY')
+    await runModifyAstCloneWithFilletAndTag(
+      code,
+      segmentSnippets,
+      radiusValue,
+      expectedCode
+    )
+  })
+  it('should add a fillet to the sketch pipe', async () => {
+    const code = `sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, 10], %)
   |> line([20, 0], %)
   |> line([0, -20], %)
@@ -368,8 +348,9 @@ extrude001 = extrude(-15, sketch001)
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
   |> extrude(-15, %)`
-        const segmentSnippets = ['line([0, -20], %)']
-        const expectedCode = `sketch001 = startSketchOn('XY')
+    const segmentSnippets = ['line([0, -20], %)']
+    const radiusValue = 3
+    const expectedCode = `sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, 10], %)
   |> line([20, 0], %)
   |> line([0, -20], %, $seg01)
@@ -377,17 +358,17 @@ extrude001 = extrude(-15, sketch001)
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
   |> extrude(-15, %)
-  |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01] }, %)`
+  |> fillet({ radius = 3, tags = [seg01] }, %)`
 
-        await runModifyAstCloneWithEdgeTreatmentAndTag(
-          code,
-          segmentSnippets,
-          parameters,
-          expectedCode
-        )
-      })
-      it(`should add a ${edgeTreatmentType} to an already tagged segment`, async () => {
-        const code = `sketch001 = startSketchOn('XY')
+    await runModifyAstCloneWithFilletAndTag(
+      code,
+      segmentSnippets,
+      radiusValue,
+      expectedCode
+    )
+  })
+  it('should add a fillet to an already tagged segment', async () => {
+    const code = `sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, 10], %)
   |> line([20, 0], %)
   |> line([0, -20], %, $seg01)
@@ -395,8 +376,9 @@ extrude001 = extrude(-15, sketch001)
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
 extrude001 = extrude(-15, sketch001)`
-        const segmentSnippets = ['line([0, -20], %, $seg01)']
-        const expectedCode = `sketch001 = startSketchOn('XY')
+    const segmentSnippets = ['line([0, -20], %, $seg01)']
+    const radiusValue = 3
+    const expectedCode = `sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, 10], %)
   |> line([20, 0], %)
   |> line([0, -20], %, $seg01)
@@ -404,17 +386,17 @@ extrude001 = extrude(-15, sketch001)`
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
 extrude001 = extrude(-15, sketch001)
-  |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01] }, %)`
+  |> fillet({ radius = 3, tags = [seg01] }, %)`
 
-        await runModifyAstCloneWithEdgeTreatmentAndTag(
-          code,
-          segmentSnippets,
-          parameters,
-          expectedCode
-        )
-      })
-      it(`should add a ${edgeTreatmentType} with existing tag on other segment`, async () => {
-        const code = `sketch001 = startSketchOn('XY')
+    await runModifyAstCloneWithFilletAndTag(
+      code,
+      segmentSnippets,
+      radiusValue,
+      expectedCode
+    )
+  })
+  it('should add a fillet with existing tag on other segment', async () => {
+    const code = `sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, 10], %)
   |> line([20, 0], %, $seg01)
   |> line([0, -20], %)
@@ -422,8 +404,9 @@ extrude001 = extrude(-15, sketch001)
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
 extrude001 = extrude(-15, sketch001)`
-        const segmentSnippets = ['line([-20, 0], %)']
-        const expectedCode = `sketch001 = startSketchOn('XY')
+    const segmentSnippets = ['line([-20, 0], %)']
+    const radiusValue = 3
+    const expectedCode = `sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, 10], %)
   |> line([20, 0], %, $seg01)
   |> line([0, -20], %)
@@ -431,17 +414,17 @@ extrude001 = extrude(-15, sketch001)`
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
 extrude001 = extrude(-15, sketch001)
-  |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg02] }, %)`
+  |> fillet({ radius = 3, tags = [seg02] }, %)`
 
-        await runModifyAstCloneWithEdgeTreatmentAndTag(
-          code,
-          segmentSnippets,
-          parameters,
-          expectedCode
-        )
-      })
-      it(`should add a ${edgeTreatmentType} with existing fillet on other segment`, async () => {
-        const code = `sketch001 = startSketchOn('XY')
+    await runModifyAstCloneWithFilletAndTag(
+      code,
+      segmentSnippets,
+      radiusValue,
+      expectedCode
+    )
+  })
+  it('should add a fillet with existing fillet on other segment', async () => {
+    const code = `sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, 10], %)
   |> line([20, 0], %, $seg01)
   |> line([0, -20], %)
@@ -450,8 +433,9 @@ extrude001 = extrude(-15, sketch001)
   |> close(%)
 extrude001 = extrude(-15, sketch001)
   |> fillet({ radius = 5, tags = [seg01] }, %)`
-        const segmentSnippets = ['line([-20, 0], %)']
-        const expectedCode = `sketch001 = startSketchOn('XY')
+    const segmentSnippets = ['line([-20, 0], %)']
+    const radiusValue = 3
+    const expectedCode = `sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, 10], %)
   |> line([20, 0], %, $seg01)
   |> line([0, -20], %)
@@ -460,46 +444,17 @@ extrude001 = extrude(-15, sketch001)
   |> close(%)
 extrude001 = extrude(-15, sketch001)
   |> fillet({ radius = 5, tags = [seg01] }, %)
-  |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg02] }, %)`
+  |> fillet({ radius = 3, tags = [seg02] }, %)`
 
-        await runModifyAstCloneWithEdgeTreatmentAndTag(
-          code,
-          segmentSnippets,
-          parameters,
-          expectedCode
-        )
-      })
-      it(`should add a ${edgeTreatmentType} with existing chamfer on other segment`, async () => {
-        const code = `sketch001 = startSketchOn('XY')
-  |> startProfileAt([-10, 10], %)
-  |> line([20, 0], %, $seg01)
-  |> line([0, -20], %)
-  |> line([-20, 0], %)
-  |> lineTo([profileStartX(%), profileStartY(%)], %)
-  |> close(%)
-extrude001 = extrude(-15, sketch001)
-  |> chamfer({ length: 5, tags: [seg01] }, %)`
-        const segmentSnippets = ['line([-20, 0], %)']
-        const expectedCode = `sketch001 = startSketchOn('XY')
-  |> startProfileAt([-10, 10], %)
-  |> line([20, 0], %, $seg01)
-  |> line([0, -20], %)
-  |> line([-20, 0], %, $seg02)
-  |> lineTo([profileStartX(%), profileStartY(%)], %)
-  |> close(%)
-extrude001 = extrude(-15, sketch001)
-  |> chamfer({ length: 5, tags: [seg01] }, %)
-  |> ${edgeTreatmentType}({ ${parameterName}: 3, tags: [seg02] }, %)`
-
-        await runModifyAstCloneWithEdgeTreatmentAndTag(
-          code,
-          segmentSnippets,
-          parameters,
-          expectedCode
-        )
-      })
-      it(`should add a ${edgeTreatmentType} to two segments of a single extrusion`, async () => {
-        const code = `sketch001 = startSketchOn('XY')
+    await runModifyAstCloneWithFilletAndTag(
+      code,
+      segmentSnippets,
+      radiusValue,
+      expectedCode
+    )
+  })
+  it('should add a fillet to two segments of a single extrusion', async () => {
+    const code = `sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, 10], %)
   |> line([20, 0], %)
   |> line([0, -20], %)
@@ -507,8 +462,9 @@ extrude001 = extrude(-15, sketch001)
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
 extrude001 = extrude(-15, sketch001)`
-        const segmentSnippets = ['line([20, 0], %)', 'line([-20, 0], %)']
-        const expectedCode = `sketch001 = startSketchOn('XY')
+    const segmentSnippets = ['line([20, 0], %)', 'line([-20, 0], %)']
+    const radiusValue = 3
+    const expectedCode = `sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, 10], %)
   |> line([20, 0], %, $seg01)
   |> line([0, -20], %)
@@ -516,17 +472,17 @@ extrude001 = extrude(-15, sketch001)`
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
 extrude001 = extrude(-15, sketch001)
-  |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01, seg02] }, %)`
+  |> fillet({ radius = 3, tags = [seg01, seg02] }, %)`
 
-        await runModifyAstCloneWithEdgeTreatmentAndTag(
-          code,
-          segmentSnippets,
-          parameters,
-          expectedCode
-        )
-      })
-      it(`should add ${edgeTreatmentType}s to two bodies`, async () => {
-        const code = `sketch001 = startSketchOn('XY')
+    await runModifyAstCloneWithFilletAndTag(
+      code,
+      segmentSnippets,
+      radiusValue,
+      expectedCode
+    )
+  })
+  it('should add fillets to two bodies', async () => {
+    const code = `sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, 10], %)
   |> line([20, 0], %)
   |> line([0, -20], %)
@@ -542,12 +498,13 @@ sketch002 = startSketchOn('XY')
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
 extrude002 = extrude(-25, sketch002)` // <--- body 2
-        const segmentSnippets = [
-          'line([20, 0], %)',
-          'line([-20, 0], %)',
-          'line([0, -15], %)',
-        ]
-        const expectedCode = `sketch001 = startSketchOn('XY')
+    const segmentSnippets = [
+      'line([20, 0], %)',
+      'line([-20, 0], %)',
+      'line([0, -15], %)',
+    ]
+    const radiusValue = 3
+    const expectedCode = `sketch001 = startSketchOn('XY')
   |> startProfileAt([-10, 10], %)
   |> line([20, 0], %, $seg01)
   |> line([0, -20], %)
@@ -555,7 +512,7 @@ extrude002 = extrude(-25, sketch002)` // <--- body 2
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
 extrude001 = extrude(-15, sketch001)
-  |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01, seg02] }, %)
+  |> fillet({ radius = 3, tags = [seg01, seg02] }, %)
 sketch002 = startSketchOn('XY')
   |> startProfileAt([30, 10], %)
   |> line([15, 0], %)
@@ -564,20 +521,18 @@ sketch002 = startSketchOn('XY')
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
 extrude002 = extrude(-25, sketch002)
-  |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg03] }, %)` // <-- able to add a new one
+  |> fillet({ radius = 3, tags = [seg03] }, %)` // <-- able to add a new one
 
-        await runModifyAstCloneWithEdgeTreatmentAndTag(
-          code,
-          segmentSnippets,
-          parameters,
-          expectedCode
-        )
-      })
-    })
-  }
-)
+    await runModifyAstCloneWithFilletAndTag(
+      code,
+      segmentSnippets,
+      radiusValue,
+      expectedCode
+    )
+  })
+})
 
-describe('Testing isTagUsedInEdgeTreatment', () => {
+describe('Testing isTagUsedInFillet', () => {
   const code = `sketch001 = startSketchOn('XZ')
   |> startProfileAt([7.72, 4.13], %)
   |> line([7.11, 3.48], %, $seg01)
@@ -595,12 +550,12 @@ extrude001 = extrude(-5, sketch001)
      }, %)
 `
   it('should correctly identify getOppositeEdge and baseEdge edges', () => {
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) return
     const lineOfInterest = `line([7.11, 3.48], %, $seg01)`
-    const range: [number, number, boolean] = [
+    const range: [number, number] = [
       code.indexOf(lineOfInterest),
       code.indexOf(lineOfInterest) + lineOfInterest.length,
-      true,
     ]
     const pathToNode = getNodePathFromSourceRange(ast, range)
     if (err(pathToNode)) return
@@ -610,16 +565,16 @@ extrude001 = extrude(-5, sketch001)
       'CallExpression'
     )
     if (err(callExp)) return
-    const edges = isTagUsedInEdgeTreatment({ ast, callExp: callExp.node })
+    const edges = isTagUsedInFillet({ ast, callExp: callExp.node })
     expect(edges).toEqual(['getOppositeEdge', 'baseEdge'])
   })
   it('should correctly identify getPreviousAdjacentEdge edges', () => {
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) return
     const lineOfInterest = `line([-6.37, 3.88], %, $seg02)`
-    const range: [number, number, boolean] = [
+    const range: [number, number] = [
       code.indexOf(lineOfInterest),
       code.indexOf(lineOfInterest) + lineOfInterest.length,
-      true,
     ]
     const pathToNode = getNodePathFromSourceRange(ast, range)
     if (err(pathToNode)) return
@@ -629,16 +584,16 @@ extrude001 = extrude(-5, sketch001)
       'CallExpression'
     )
     if (err(callExp)) return
-    const edges = isTagUsedInEdgeTreatment({ ast, callExp: callExp.node })
+    const edges = isTagUsedInFillet({ ast, callExp: callExp.node })
     expect(edges).toEqual(['getPreviousAdjacentEdge'])
   })
   it('should correctly identify no edges', () => {
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) return
     const lineOfInterest = `line([-3.29, -13.85], %)`
-    const range: [number, number, boolean] = [
+    const range: [number, number] = [
       code.indexOf(lineOfInterest),
       code.indexOf(lineOfInterest) + lineOfInterest.length,
-      true,
     ]
     const pathToNode = getNodePathFromSourceRange(ast, range)
     if (err(pathToNode)) return
@@ -648,7 +603,7 @@ extrude001 = extrude(-5, sketch001)
       'CallExpression'
     )
     if (err(callExp)) return
-    const edges = isTagUsedInEdgeTreatment({ ast, callExp: callExp.node })
+    const edges = isTagUsedInFillet({ ast, callExp: callExp.node })
     expect(edges).toEqual([])
   })
 })
@@ -659,15 +614,19 @@ describe('Testing button states', () => {
     segmentSnippet: string,
     expectedState: boolean
   ) => {
-    const ast = assertParse(code)
+    // ast
+    const astOrError = parse(code)
+    if (err(astOrError)) {
+      return new Error('AST not found')
+    }
+    const ast = astOrError
 
-    const range: [number, number, boolean] = segmentSnippet
+    const range: [number, number] = segmentSnippet
       ? [
           code.indexOf(segmentSnippet),
           code.indexOf(segmentSnippet) + segmentSnippet.length,
-          true,
         ]
-      : [ast.end, ast.end, true] // empty line in the end of the code
+      : [ast.end, ast.end] // empty line in the end of the code
 
     const selectionRanges: Selections = {
       graphSelections: [
@@ -679,7 +638,7 @@ describe('Testing button states', () => {
     }
 
     // state
-    const buttonState = hasValidEdgeTreatmentSelection({
+    const buttonState = hasValidFilletSelection({
       ast,
       selectionRanges,
       code,

src/lang/modifyAst/addFillet.ts

@@ -29,7 +29,7 @@ import {
   sketchLineHelperMap,
 } from '../std/sketch'
 import { err, trap } from 'lib/trap'
-import { Selection, Selections } from 'lib/selections'
+import { Selections } from 'lib/selections'
 import { KclCommandValue } from 'lib/commandTypes'
 import {
   Artifact,
@@ -44,49 +44,32 @@ import {
 } from 'lib/singletons'
 import { Node } from 'wasm-lib/kcl/bindings/Node'
 
-// Edge Treatment Types
-export enum EdgeTreatmentType {
-  Chamfer = 'chamfer',
-  Fillet = 'fillet',
-}
+// Apply Fillet To Selection
 
-export interface ChamferParameters {
-  type: EdgeTreatmentType.Chamfer
-  length: KclCommandValue
-}
-export interface FilletParameters {
-  type: EdgeTreatmentType.Fillet
-  radius: KclCommandValue
-}
-export type EdgeTreatmentParameters = ChamferParameters | FilletParameters
-
-// Apply Edge Treatment (Fillet or Chamfer) To Selection
-export function applyEdgeTreatmentToSelection(
+export function applyFilletToSelection(
   ast: Node<Program>,
   selection: Selections,
-  parameters: EdgeTreatmentParameters
+  radius: KclCommandValue
 ): void | Error {
-  // 1. clone and modify with edge treatment and tag
-  const result = modifyAstWithEdgeTreatmentAndTag(ast, selection, parameters)
+  // 1. clone and modify with fillet and tag
+  const result = modifyAstWithFilletAndTag(ast, selection, radius)
   if (err(result)) return result
-  const { modifiedAst, pathToEdgeTreatmentNode } = result
+  const { modifiedAst, pathToFilletNode } = result
 
   // 2. update ast
   // eslint-disable-next-line @typescript-eslint/no-floating-promises
-  updateAstAndFocus(modifiedAst, pathToEdgeTreatmentNode)
+  updateAstAndFocus(modifiedAst, pathToFilletNode)
 }
 
-export function modifyAstWithEdgeTreatmentAndTag(
+export function modifyAstWithFilletAndTag(
   ast: Node<Program>,
   selections: Selections,
-  parameters: EdgeTreatmentParameters
-):
-  | { modifiedAst: Node<Program>; pathToEdgeTreatmentNode: Array<PathToNode> }
-  | Error {
+  radius: KclCommandValue
+): { modifiedAst: Node<Program>; pathToFilletNode: Array<PathToNode> } | Error {
   let clonedAst = structuredClone(ast)
   const clonedAstForGetExtrude = structuredClone(ast)
 
-  const astResult = insertParametersIntoAst(clonedAst, parameters)
+  const astResult = insertRadiusIntoAst(clonedAst, radius)
   if (err(astResult)) return astResult
 
   const artifactGraph = engineCommandManager.artifactGraph
@@ -99,9 +82,14 @@ export function modifyAstWithEdgeTreatmentAndTag(
   const lookupMap: Map<string, PathToNode> = new Map() // work around for Map key comparison
 
   for (const selection of selections.graphSelections) {
+    const singleSelection = {
+      graphSelections: [selection],
+      otherSelections: [],
+    }
+
     const result = getPathToExtrudeForSegmentSelection(
       clonedAstForGetExtrude,
-      selection,
+      singleSelection,
       artifactGraph
     )
     if (err(result)) return result
@@ -131,26 +119,21 @@ export function modifyAstWithEdgeTreatmentAndTag(
     }
   }
 
-  // Step 2: Apply edge treatments for each extrude node (body)
-  let pathToEdgeTreatmentNodes: Array<PathToNode> = []
+  // Step 2: Apply fillet(s) for each extrude node (body)
+  let pathToFilletNodes: Array<PathToNode> = []
   for (const [pathToExtrudeNode, tagInfos] of extrudeToTagsMap.entries()) {
-    // Create an edge treatment expression with multiple tags
+    // Create a fillet expression with multiple tags
+    const radiusValue =
+      'variableName' in radius ? radius.variableIdentifierAst : radius.valueAst
 
-    // edge treatment parameter
-    const parameterResult = getParameterNameAndValue(parameters)
-    if (err(parameterResult)) return parameterResult
-    const { parameterName, parameterValue } = parameterResult
-
-    // tag calls
     const tagCalls = tagInfos.map(({ tag, artifact }) => {
       return getEdgeTagCall(tag, artifact)
     })
     const firstTag = tagCalls[0] // can be Identifier or CallExpression (for opposite and adjacent edges)
 
-    // edge treatment call
-    const edgeTreatmentCall = createCallExpressionStdLib(parameters.type, [
+    const filletCall = createCallExpressionStdLib('fillet', [
       createObjectExpression({
-        [parameterName]: parameterValue,
+        radius: radiusValue,
         tags: createArrayExpression(tagCalls),
       }),
       createPipeSubstitution(),
@@ -164,89 +147,64 @@ export function modifyAstWithEdgeTreatmentAndTag(
     if (err(locatedExtrudeDeclarator)) return locatedExtrudeDeclarator
     const { extrudeDeclarator } = locatedExtrudeDeclarator
 
-    // Modify the extrude expression to include this edge treatment expression
-    // CallExpression - no edge treatment
-    // PipeExpression - edge treatment exists or body in sketch pipe
+    // Modify the extrude expression to include this fillet expression
+    // CallExpression - no fillet
+    // PipeExpression - fillet exists or extrude in sketch pipe
 
-    let pathToEdgeTreatmentNode: PathToNode
+    let pathToFilletNode: PathToNode = []
 
     if (extrudeDeclarator.init.type === 'CallExpression') {
-      // 1. case when no edge treatment exists
+      // 1. case when no fillet exists
 
-      // modify ast with new edge treatment call by mutating the extrude node
+      // modify ast with new fillet call by mutating the extrude node
       extrudeDeclarator.init = createPipeExpression([
         extrudeDeclarator.init,
-        edgeTreatmentCall,
+        filletCall,
       ])
 
-      // get path to the edge treatment node
-      pathToEdgeTreatmentNode = getPathToNodeOfEdgeTreatmentLiteral(
+      // get path to the fillet node
+      pathToFilletNode = getPathToNodeOfFilletLiteral(
         pathToExtrudeNode,
         extrudeDeclarator,
-        firstTag,
-        parameters
+        firstTag
       )
-      pathToEdgeTreatmentNodes.push(pathToEdgeTreatmentNode)
+      pathToFilletNodes.push(pathToFilletNode)
     } else if (extrudeDeclarator.init.type === 'PipeExpression') {
-      // 2. case when edge treatment exists or extrude in sketch pipe
+      // 2. case when fillet exists or extrude in sketch pipe
 
-      // mutate the extrude node with the new edge treatment call
-      extrudeDeclarator.init.body.push(edgeTreatmentCall)
+      // mutate the extrude node with the new fillet call
+      extrudeDeclarator.init.body.push(filletCall)
 
-      // get path to the edge treatment node
-      pathToEdgeTreatmentNode = getPathToNodeOfEdgeTreatmentLiteral(
+      // get path to the fillet node
+      pathToFilletNode = getPathToNodeOfFilletLiteral(
         pathToExtrudeNode,
         extrudeDeclarator,
-        firstTag,
-        parameters
+        firstTag
       )
-      pathToEdgeTreatmentNodes.push(pathToEdgeTreatmentNode)
+      pathToFilletNodes.push(pathToFilletNode)
     } else {
       return new Error('Unsupported extrude type.')
     }
   }
-  return {
-    modifiedAst: clonedAst,
-    pathToEdgeTreatmentNode: pathToEdgeTreatmentNodes,
-  }
+  return { modifiedAst: clonedAst, pathToFilletNode: pathToFilletNodes }
 }
 
-function insertParametersIntoAst(
+function insertRadiusIntoAst(
   ast: Program,
-  parameters: EdgeTreatmentParameters
+  radius: KclCommandValue
 ): { ast: Program } | Error {
   try {
-    const newAst = structuredClone(ast)
-
-    // handle radius parameter
+    // Validate and update AST
     if (
-      parameters.type === EdgeTreatmentType.Fillet &&
-      'variableName' in parameters.radius &&
-      parameters.radius.variableName &&
-      parameters.radius.insertIndex !== undefined
+      'variableName' in radius &&
+      radius.variableName &&
+      radius.insertIndex !== undefined
     ) {
-      newAst.body.splice(
-        parameters.radius.insertIndex,
-        0,
-        parameters.radius.variableDeclarationAst
-      )
+      const newAst = structuredClone(ast)
+      newAst.body.splice(radius.insertIndex, 0, radius.variableDeclarationAst)
+      return { ast: newAst }
     }
-    // handle length parameter
-    if (
-      parameters.type === EdgeTreatmentType.Chamfer &&
-      'variableName' in parameters.length &&
-      parameters.length.variableName &&
-      parameters.length.insertIndex !== undefined
-    ) {
-      newAst.body.splice(
-        parameters.length.insertIndex,
-        0,
-        parameters.length.variableDeclarationAst
-      )
-    }
-
-    // handle upcoming parameters here (for blend, bevel, etc.)
-    return { ast: newAst }
+    return { ast }
   } catch (error) {
     return new Error(`Failed to handle AST: ${(error as Error).message}`)
   }
@@ -254,12 +212,12 @@ function insertParametersIntoAst(
 
 export function getPathToExtrudeForSegmentSelection(
   ast: Program,
-  selection: Selection,
+  selection: Selections,
   artifactGraph: ArtifactGraph
 ): { pathToSegmentNode: PathToNode; pathToExtrudeNode: PathToNode } | Error {
   const pathToSegmentNode = getNodePathFromSourceRange(
     ast,
-    selection.codeRef?.range
+    selection.graphSelections[0]?.codeRef?.range
   )
 
   const varDecNode = getNodeFromPath<VariableDeclaration>(
@@ -268,7 +226,7 @@ export function getPathToExtrudeForSegmentSelection(
     'VariableDeclaration'
   )
   if (err(varDecNode)) return varDecNode
-  const sketchVar = varDecNode.node.declaration.id.name
+  const sketchVar = varDecNode.node.declarations[0].id.name
 
   const sketch = sketchFromKclValue(
     kclManager.programMemory.get(sketchVar),
@@ -290,10 +248,10 @@ export function getPathToExtrudeForSegmentSelection(
 
 async function updateAstAndFocus(
   modifiedAst: Node<Program>,
-  pathToEdgeTreatmentNode: Array<PathToNode>
+  pathToFilletNode: Array<PathToNode>
 ) {
   const updatedAst = await kclManager.updateAst(modifiedAst, true, {
-    focusPath: pathToEdgeTreatmentNode,
+    focusPath: pathToFilletNode,
   })
 
   await codeManager.updateEditorWithAstAndWriteToFile(updatedAst.newAst)
@@ -303,7 +261,7 @@ async function updateAstAndFocus(
   }
 }
 
-export function mutateAstWithTagForSketchSegment(
+function mutateAstWithTagForSketchSegment(
   astClone: Node<Program>,
   pathToSegmentNode: PathToNode
 ): { modifiedAst: Program; tag: string } | Error {
@@ -362,7 +320,7 @@ function locateExtrudeDeclarator(
   if (err(nodeOfExtrudeCall)) return nodeOfExtrudeCall
 
   const { node: extrudeVarDecl } = nodeOfExtrudeCall
-  const extrudeDeclarator = extrudeVarDecl.declaration
+  const extrudeDeclarator = extrudeVarDecl.declarations[0]
   if (!extrudeDeclarator) {
     return new Error('Extrude Declarator not found.')
   }
@@ -382,38 +340,27 @@ function locateExtrudeDeclarator(
   return { extrudeDeclarator }
 }
 
-function getPathToNodeOfEdgeTreatmentLiteral(
+function getPathToNodeOfFilletLiteral(
   pathToExtrudeNode: PathToNode,
   extrudeDeclarator: VariableDeclarator,
-  tag: Identifier | CallExpression,
-  parameters: EdgeTreatmentParameters
+  tag: Identifier | CallExpression
 ): PathToNode {
-  let pathToEdgeTreatmentObj: PathToNode = []
-  let inEdgeTreatment = false
+  let pathToFilletObj: PathToNode = []
+  let inFillet = false
 
   traverse(extrudeDeclarator.init, {
     enter(node, path) {
-      if (
-        node.type === 'CallExpression' &&
-        node.callee.name === parameters.type
-      ) {
-        inEdgeTreatment = true
+      if (node.type === 'CallExpression' && node.callee.name === 'fillet') {
+        inFillet = true
       }
-      if (inEdgeTreatment && node.type === 'ObjectExpression') {
+      if (inFillet && node.type === 'ObjectExpression') {
         if (!hasTag(node, tag)) return false
-        pathToEdgeTreatmentObj = getPathToEdgeTreatmentParameterLiteral(
-          node,
-          path,
-          parameters
-        )
+        pathToFilletObj = getPathToRadiusLiteral(node, path)
       }
     },
     leave(node) {
-      if (
-        node.type === 'CallExpression' &&
-        node.callee.name === parameters.type
-      ) {
-        inEdgeTreatment = false
+      if (node.type === 'CallExpression' && node.callee.name === 'fillet') {
+        inFillet = false
       }
     },
   })
@@ -428,7 +375,7 @@ function getPathToNodeOfEdgeTreatmentLiteral(
 
   return [
     ...pathToExtrudeNode.slice(0, indexOfPipeExpression),
-    ...pathToEdgeTreatmentObj,
+    ...pathToFilletObj,
   ]
 }
 
@@ -461,62 +408,23 @@ function hasTag(
   })
 }
 
-function getPathToEdgeTreatmentParameterLiteral(
-  node: ObjectExpression,
-  path: any,
-  parameters: EdgeTreatmentParameters
-): PathToNode {
-  let pathToEdgeTreatmentObj = path
-  const parameterResult = getParameterNameAndValue(parameters)
-  if (err(parameterResult)) return pathToEdgeTreatmentObj
-  const { parameterName } = parameterResult
-
+function getPathToRadiusLiteral(node: ObjectExpression, path: any): PathToNode {
+  let pathToFilletObj = path
   node.properties.forEach((prop, index) => {
-    if (prop.key.name === parameterName) {
-      pathToEdgeTreatmentObj.push(
+    if (prop.key.name === 'radius') {
+      pathToFilletObj.push(
         ['properties', 'ObjectExpression'],
         [index, 'index'],
         ['value', 'Property']
       )
     }
   })
-  return pathToEdgeTreatmentObj
-}
-
-function getParameterNameAndValue(
-  parameters: EdgeTreatmentParameters
-): { parameterName: string; parameterValue: Expr } | Error {
-  if (parameters.type === EdgeTreatmentType.Fillet) {
-    const parameterValue =
-      'variableName' in parameters.radius
-        ? parameters.radius.variableIdentifierAst
-        : parameters.radius.valueAst
-    return { parameterName: 'radius', parameterValue }
-  } else if (parameters.type === EdgeTreatmentType.Chamfer) {
-    const parameterValue =
-      'variableName' in parameters.length
-        ? parameters.length.variableIdentifierAst
-        : parameters.length.valueAst
-    return { parameterName: 'length', parameterValue }
-  } else {
-    return new Error('Unsupported edge treatment type}')
-  }
-}
-
-// Type Guards
-function isEdgeTreatmentType(name: string): name is EdgeTreatmentType {
-  return name === EdgeTreatmentType.Chamfer || name === EdgeTreatmentType.Fillet
-}
-function isEdgeType(name: string): name is EdgeTypes {
-  return (
-    name === 'getNextAdjacentEdge' ||
-    name === 'getPreviousAdjacentEdge' ||
-    name === 'getOppositeEdge'
-  )
+  return pathToFilletObj
 }
 
 // Button states
-export const hasValidEdgeTreatmentSelection = ({
+
+export const hasValidFilletSelection = ({
   selectionRanges,
   ast,
   code,
@@ -525,14 +433,11 @@ export const hasValidEdgeTreatmentSelection = ({
   ast: Node<Program>
   code: string
 }) => {
-  // check if there is anything valid for the edge treatment in the scene
+  // check if there is anything filletable in the scene
   let extrudeExists = false
   traverse(ast, {
     enter(node) {
-      if (
-        node.type === 'CallExpression' &&
-        (node.callee.name === 'extrude' || node.callee.name === 'revolve')
-      ) {
+      if (node.type === 'CallExpression' && node.callee.name === 'extrude') {
         extrudeExists = true
       }
     },
@@ -589,39 +494,32 @@ export const hasValidEdgeTreatmentSelection = ({
       },
     })
 
-    // check if tag is used in edge treatment
+    // check if tag is used in fillet
     if (tagExists && selection.artifact) {
       // create tag call
       let tagCall: Expr = getEdgeTagCall(tag, selection.artifact)
 
-      // check if tag is used in edge treatment
-      let inEdgeTreatment = false
-      let tagUsedInEdgeTreatment = false
-
+      // check if tag is used in fillet
+      let inFillet = false
+      let tagUsedInFillet = false
       traverse(ast, {
         enter(node) {
-          if (
-            node.type === 'CallExpression' &&
-            isEdgeTreatmentType(node.callee.name)
-          ) {
-            inEdgeTreatment = true
+          if (node.type === 'CallExpression' && node.callee.name === 'fillet') {
+            inFillet = true
           }
-          if (inEdgeTreatment && node.type === 'ObjectExpression') {
+          if (inFillet && node.type === 'ObjectExpression') {
             if (hasTag(node, tagCall)) {
-              tagUsedInEdgeTreatment = true
+              tagUsedInFillet = true
             }
           }
         },
         leave(node) {
-          if (
-            node.type === 'CallExpression' &&
-            isEdgeTreatmentType(node.callee.name)
-          ) {
-            inEdgeTreatment = false
+          if (node.type === 'CallExpression' && node.callee.name === 'fillet') {
+            inFillet = false
           }
         },
       })
-      if (tagUsedInEdgeTreatment) {
+      if (tagUsedInFillet) {
         return false
       }
     }
@@ -635,7 +533,7 @@ type EdgeTypes =
   | 'getPreviousAdjacentEdge'
   | 'getOppositeEdge'
 
-export const isTagUsedInEdgeTreatment = ({
+export const isTagUsedInFillet = ({
   ast,
   callExp,
 }: {
@@ -645,21 +543,16 @@ export const isTagUsedInEdgeTreatment = ({
   const tag = getTagFromCallExpression(callExp)
   if (err(tag)) return []
 
-  let inEdgeTreatment = false
+  let inFillet = false
   let inObj = false
   let inTagHelper: EdgeTypes | '' = ''
   const edges: Array<EdgeTypes> = []
-
   traverse(ast, {
     enter: (node) => {
-      // Check if we are entering an edge treatment call
-      if (
-        node.type === 'CallExpression' &&
-        isEdgeTreatmentType(node.callee.name)
-      ) {
-        inEdgeTreatment = true
+      if (node.type === 'CallExpression' && node.callee.name === 'fillet') {
+        inFillet = true
       }
-      if (inEdgeTreatment && node.type === 'ObjectExpression') {
+      if (inFillet && node.type === 'ObjectExpression') {
         node.properties.forEach((prop) => {
           if (
             prop.key.name === 'tags' &&
@@ -671,15 +564,17 @@ export const isTagUsedInEdgeTreatment = ({
       }
       if (
         inObj &&
-        inEdgeTreatment &&
+        inFillet &&
         node.type === 'CallExpression' &&
-        isEdgeType(node.callee.name)
+        (node.callee.name === 'getOppositeEdge' ||
+          node.callee.name === 'getNextAdjacentEdge' ||
+          node.callee.name === 'getPreviousAdjacentEdge')
       ) {
         inTagHelper = node.callee.name
       }
       if (
         inObj &&
-        inEdgeTreatment &&
+        inFillet &&
         !inTagHelper &&
         node.type === 'Identifier' &&
         node.name === tag
@@ -688,7 +583,7 @@ export const isTagUsedInEdgeTreatment = ({
       }
       if (
         inObj &&
-        inEdgeTreatment &&
+        inFillet &&
         inTagHelper &&
         node.type === 'Identifier' &&
         node.name === tag
@@ -697,13 +592,10 @@ export const isTagUsedInEdgeTreatment = ({
       }
     },
     leave: (node) => {
-      if (
-        node.type === 'CallExpression' &&
-        isEdgeTreatmentType(node.callee.name)
-      ) {
-        inEdgeTreatment = false
+      if (node.type === 'CallExpression' && node.callee.name === 'fillet') {
+        inFillet = false
       }
-      if (inEdgeTreatment && node.type === 'ObjectExpression') {
+      if (inFillet && node.type === 'ObjectExpression') {
         node.properties.forEach((prop) => {
           if (
             prop.key.name === 'tags' &&
@@ -715,9 +607,11 @@ export const isTagUsedInEdgeTreatment = ({
       }
       if (
         inObj &&
-        inEdgeTreatment &&
+        inFillet &&
         node.type === 'CallExpression' &&
-        isEdgeType(node.callee.name)
+        (node.callee.name === 'getOppositeEdge' ||
+          node.callee.name === 'getNextAdjacentEdge' ||
+          node.callee.name === 'getPreviousAdjacentEdge')
       ) {
         inTagHelper = ''
       }

src/lang/modifyAst/addShell.ts

@@ -1,124 +0,0 @@
-import { ArtifactGraph } from 'lang/std/artifactGraph'
-import { Selections } from 'lib/selections'
-import { Expr } from 'wasm-lib/kcl/bindings/Expr'
-import { Program } from 'wasm-lib/kcl/bindings/Program'
-import { Node } from 'wasm-lib/kcl/bindings/Node'
-import { PathToNode, VariableDeclarator } from 'lang/wasm'
-import {
-  getPathToExtrudeForSegmentSelection,
-  mutateAstWithTagForSketchSegment,
-} from './addEdgeTreatment'
-import { getNodeFromPath } from 'lang/queryAst'
-import { err } from 'lib/trap'
-import {
-  createLiteral,
-  createIdentifier,
-  findUniqueName,
-  createCallExpressionStdLib,
-  createObjectExpression,
-  createArrayExpression,
-  createVariableDeclaration,
-} from 'lang/modifyAst'
-import { KCL_DEFAULT_CONSTANT_PREFIXES } from 'lib/constants'
-
-export function addShell({
-  node,
-  selection,
-  artifactGraph,
-  thickness,
-}: {
-  node: Node<Program>
-  selection: Selections
-  artifactGraph: ArtifactGraph
-  thickness: Expr
-}): Error | { modifiedAst: Node<Program>; pathToNode: PathToNode } {
-  const modifiedAst = structuredClone(node)
-
-  // Look up the corresponding extrude
-  const clonedAstForGetExtrude = structuredClone(modifiedAst)
-
-  const expressions: Expr[] = []
-  let pathToExtrudeNode: PathToNode | undefined = undefined
-  for (const graphSelection of selection.graphSelections) {
-    const extrudeLookupResult = getPathToExtrudeForSegmentSelection(
-      clonedAstForGetExtrude,
-      graphSelection,
-      artifactGraph
-    )
-    if (err(extrudeLookupResult)) {
-      return new Error("Couldn't find extrude")
-    }
-
-    pathToExtrudeNode = extrudeLookupResult.pathToExtrudeNode
-    // Get the sketch ref from the selection
-    // TODO: this assumes the segment is piped directly from the sketch, with no intermediate `VariableDeclarator` between.
-    // We must find a technique for these situations that is robust to intermediate declarations
-    const sketchNode = getNodeFromPath<VariableDeclarator>(
-      modifiedAst,
-      graphSelection.codeRef.pathToNode,
-      'VariableDeclarator'
-    )
-    if (err(sketchNode)) {
-      return sketchNode
-    }
-
-    const selectedArtifact = graphSelection.artifact
-    if (!selectedArtifact) {
-      return new Error('Bad artifact')
-    }
-
-    // Check on the selection, and handle the wall vs cap casees
-    let expr: Expr
-    if (selectedArtifact.type === 'cap') {
-      expr = createLiteral(selectedArtifact.subType)
-    } else if (selectedArtifact.type === 'wall') {
-      const tagResult = mutateAstWithTagForSketchSegment(
-        modifiedAst,
-        extrudeLookupResult.pathToSegmentNode
-      )
-      if (err(tagResult)) return tagResult
-      const { tag } = tagResult
-      expr = createIdentifier(tag)
-    } else {
-      continue
-    }
-    expressions.push(expr)
-  }
-
-  if (!pathToExtrudeNode) return new Error('No extrude found')
-
-  const extrudeNode = getNodeFromPath<VariableDeclarator>(
-    modifiedAst,
-    pathToExtrudeNode,
-    'VariableDeclarator'
-  )
-  if (err(extrudeNode)) {
-    return extrudeNode
-  }
-
-  const name = findUniqueName(node, KCL_DEFAULT_CONSTANT_PREFIXES.SHELL)
-  const shell = createCallExpressionStdLib('shell', [
-    createObjectExpression({
-      faces: createArrayExpression(expressions),
-      thickness,
-    }),
-    createIdentifier(extrudeNode.node.id.name),
-  ])
-  const declaration = createVariableDeclaration(name, shell)
-
-  // TODO: check if we should append at the end like here or right after the extrude
-  modifiedAst.body.push(declaration)
-  const pathToNode: PathToNode = [
-    ['body', ''],
-    [modifiedAst.body.length - 1, 'index'],
-    ['declarations', 'VariableDeclaration'],
-    ['0', 'index'],
-    ['init', 'VariableDeclarator'],
-    ['arguments', 'CallExpression'],
-    [0, 'index'],
-  ]
-  return {
-    modifiedAst,
-    pathToNode,
-  }
-}

src/lang/queryAst.test.ts

@@ -1,10 +1,4 @@
-import {
-  assertParse,
-  recast,
-  initPromise,
-  PathToNode,
-  Identifier,
-} from './wasm'
+import { parse, recast, initPromise, PathToNode, Identifier } from './wasm'
 import {
   findAllPreviousVariables,
   isNodeSafeToReplace,
@@ -17,7 +11,6 @@ import {
   doesSceneHaveSweepableSketch,
   traverse,
   getNodeFromPath,
-  doesSceneHaveExtrudedSketch,
 } from './queryAst'
 import { enginelessExecutor } from '../lib/testHelpers'
 import {
@@ -52,13 +45,14 @@ part001 = startSketchOn('XY')
 variableBelowShouldNotBeIncluded = 3
 `
     const rangeStart = code.indexOf('// selection-range-7ish-before-this') - 7
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const execState = await enginelessExecutor(ast)
 
     const { variables, bodyPath, insertIndex } = findAllPreviousVariables(
       ast,
       execState.memory,
-      [rangeStart, rangeStart, true]
+      [rangeStart, rangeStart]
     )
     expect(variables).toEqual([
       { key: 'baseThick', value: 1 },
@@ -86,9 +80,10 @@ describe('testing argIsNotIdentifier', () => {
 yo = 5 + 6
 yo2 = hmm([identifierGuy + 5])`
   it('find a safe binaryExpression', () => {
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const rangeStart = code.indexOf('100 + 100') + 2
-    const result = isNodeSafeToReplace(ast, [rangeStart, rangeStart, true])
+    const result = isNodeSafeToReplace(ast, [rangeStart, rangeStart])
     if (err(result)) throw result
     expect(result.isSafe).toBe(true)
     expect(result.value?.type).toBe('BinaryExpression')
@@ -99,18 +94,20 @@ yo2 = hmm([identifierGuy + 5])`
     expect(outCode).toContain(`angledLine([replaceName, 3.09], %)`)
   })
   it('find a safe Identifier', () => {
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const rangeStart = code.indexOf('abc')
-    const result = isNodeSafeToReplace(ast, [rangeStart, rangeStart, true])
+    const result = isNodeSafeToReplace(ast, [rangeStart, rangeStart])
     if (err(result)) throw result
     expect(result.isSafe).toBe(true)
     expect(result.value?.type).toBe('Identifier')
     expect(code.slice(result.value.start, result.value.end)).toBe('abc')
   })
   it('find a safe CallExpression', () => {
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const rangeStart = code.indexOf('def')
-    const result = isNodeSafeToReplace(ast, [rangeStart, rangeStart, true])
+    const result = isNodeSafeToReplace(ast, [rangeStart, rangeStart])
     if (err(result)) throw result
     expect(result.isSafe).toBe(true)
     expect(result.value?.type).toBe('CallExpression')
@@ -121,9 +118,10 @@ yo2 = hmm([identifierGuy + 5])`
     expect(outCode).toContain(`angledLine([replaceName, 3.09], %)`)
   })
   it('find an UNsafe CallExpression, as it has a PipeSubstitution', () => {
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const rangeStart = code.indexOf('ghi')
-    const range: [number, number, boolean] = [rangeStart, rangeStart, true]
+    const range: [number, number] = [rangeStart, rangeStart]
     const result = isNodeSafeToReplace(ast, range)
     if (err(result)) throw result
     expect(result.isSafe).toBe(false)
@@ -131,9 +129,10 @@ yo2 = hmm([identifierGuy + 5])`
     expect(code.slice(result.value.start, result.value.end)).toBe('ghi(%)')
   })
   it('find an UNsafe Identifier, as it is a callee', () => {
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const rangeStart = code.indexOf('ine([2.8,')
-    const result = isNodeSafeToReplace(ast, [rangeStart, rangeStart, true])
+    const result = isNodeSafeToReplace(ast, [rangeStart, rangeStart])
     if (err(result)) throw result
     expect(result.isSafe).toBe(false)
     expect(result.value?.type).toBe('CallExpression')
@@ -142,9 +141,10 @@ yo2 = hmm([identifierGuy + 5])`
     )
   })
   it("find a safe BinaryExpression that's assigned to a variable", () => {
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const rangeStart = code.indexOf('5 + 6') + 1
-    const result = isNodeSafeToReplace(ast, [rangeStart, rangeStart, true])
+    const result = isNodeSafeToReplace(ast, [rangeStart, rangeStart])
     if (err(result)) throw result
     expect(result.isSafe).toBe(true)
     expect(result.value?.type).toBe('BinaryExpression')
@@ -155,9 +155,10 @@ yo2 = hmm([identifierGuy + 5])`
     expect(outCode).toContain(`yo = replaceName`)
   })
   it('find a safe BinaryExpression that has a CallExpression within', () => {
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     const rangeStart = code.indexOf('jkl') + 1
-    const result = isNodeSafeToReplace(ast, [rangeStart, rangeStart, true])
+    const result = isNodeSafeToReplace(ast, [rangeStart, rangeStart])
     if (err(result)) throw result
     expect(result.isSafe).toBe(true)
     expect(result.value?.type).toBe('BinaryExpression')
@@ -171,10 +172,11 @@ yo2 = hmm([identifierGuy + 5])`
     expect(outCode).toContain(`angledLine([replaceName, 3.09], %)`)
   })
   it('find a safe BinaryExpression within a CallExpression', () => {
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
 
     const rangeStart = code.indexOf('identifierGuy') + 1
-    const result = isNodeSafeToReplace(ast, [rangeStart, rangeStart, true])
+    const result = isNodeSafeToReplace(ast, [rangeStart, rangeStart])
     if (err(result)) throw result
 
     expect(result.isSafe).toBe(true)
@@ -221,17 +223,15 @@ describe('testing getNodePathFromSourceRange', () => {
   it('finds the second line when cursor is put at the end', () => {
     const searchLn = `line([0.94, 2.61], %)`
     const sourceIndex = code.indexOf(searchLn) + searchLn.length
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
 
-    const result = getNodePathFromSourceRange(ast, [
-      sourceIndex,
-      sourceIndex,
-      true,
-    ])
+    const result = getNodePathFromSourceRange(ast, [sourceIndex, sourceIndex])
     expect(result).toEqual([
       ['body', ''],
       [0, 'index'],
-      ['declaration', 'VariableDeclaration'],
+      ['declarations', 'VariableDeclaration'],
+      [0, 'index'],
       ['init', ''],
       ['body', 'PipeExpression'],
       [2, 'index'],
@@ -240,17 +240,15 @@ describe('testing getNodePathFromSourceRange', () => {
   it('finds the last line when cursor is put at the end', () => {
     const searchLn = `line([-0.21, -1.4], %)`
     const sourceIndex = code.indexOf(searchLn) + searchLn.length
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
 
-    const result = getNodePathFromSourceRange(ast, [
-      sourceIndex,
-      sourceIndex,
-      true,
-    ])
+    const result = getNodePathFromSourceRange(ast, [sourceIndex, sourceIndex])
     const expected = [
       ['body', ''],
       [0, 'index'],
-      ['declaration', 'VariableDeclaration'],
+      ['declarations', 'VariableDeclaration'],
+      [0, 'index'],
       ['init', ''],
       ['body', 'PipeExpression'],
       [3, 'index'],
@@ -261,14 +259,12 @@ describe('testing getNodePathFromSourceRange', () => {
     const startResult = getNodePathFromSourceRange(ast, [
       startSourceIndex,
       startSourceIndex,
-      true,
     ])
     expect(startResult).toEqual([...expected, ['callee', 'CallExpression']])
     // expect similar result when whole line is selected
     const selectWholeThing = getNodePathFromSourceRange(ast, [
       startSourceIndex,
       sourceIndex,
-      true,
     ])
     expect(selectWholeThing).toEqual(expected)
   })
@@ -282,17 +278,15 @@ describe('testing getNodePathFromSourceRange', () => {
     }`
     const searchLn = `x > y`
     const sourceIndex = code.indexOf(searchLn)
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
 
-    const result = getNodePathFromSourceRange(ast, [
-      sourceIndex,
-      sourceIndex,
-      true,
-    ])
+    const result = getNodePathFromSourceRange(ast, [sourceIndex, sourceIndex])
     expect(result).toEqual([
       ['body', ''],
       [1, 'index'],
-      ['declaration', 'VariableDeclaration'],
+      ['declarations', 'VariableDeclaration'],
+      [0, 'index'],
       ['init', ''],
       ['cond', 'IfExpression'],
       ['left', 'BinaryExpression'],
@@ -312,17 +306,15 @@ describe('testing getNodePathFromSourceRange', () => {
     }`
     const searchLn = `x + 1`
     const sourceIndex = code.indexOf(searchLn)
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
 
-    const result = getNodePathFromSourceRange(ast, [
-      sourceIndex,
-      sourceIndex,
-      true,
-    ])
+    const result = getNodePathFromSourceRange(ast, [sourceIndex, sourceIndex])
     expect(result).toEqual([
       ['body', ''],
       [1, 'index'],
-      ['declaration', 'VariableDeclaration'],
+      ['declarations', 'VariableDeclaration'],
+      [0, 'index'],
       ['init', ''],
       ['then_val', 'IfExpression'],
       ['body', 'IfExpression'],
@@ -340,18 +332,14 @@ describe('testing getNodePathFromSourceRange', () => {
     const code = `import foo, bar as baz from 'thing.kcl'`
     const searchLn = `bar`
     const sourceIndex = code.indexOf(searchLn)
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
 
-    const result = getNodePathFromSourceRange(ast, [
-      sourceIndex,
-      sourceIndex,
-      true,
-    ])
+    const result = getNodePathFromSourceRange(ast, [sourceIndex, sourceIndex])
     expect(result).toEqual([
       ['body', ''],
       [0, 'index'],
-      ['selector', 'ImportStatement'],
-      ['items', 'ImportSelector'],
+      ['items', 'ImportStatement'],
       [1, 'index'],
       ['name', 'ImportItem'],
     ])
@@ -372,13 +360,14 @@ part001 = startSketchAt([-1.41, 3.46])
   |> angledLine([-175, segLen(seg01)], %)
   |> close(%)
 `
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
+    if (err(ast)) throw ast
 
     const result = doesPipeHaveCallExp({
       calleeName: 'close',
       ast,
       selection: {
-        codeRef: codeRefFromRange([100, 101, true], ast),
+        codeRef: codeRefFromRange([100, 101], ast),
       },
     })
     expect(result).toEqual(true)
@@ -393,13 +382,14 @@ part001 = startSketchAt([-1.41, 3.46])
   |> close(%)
   |> extrude(1, %)
 `
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
+    if (err(ast)) throw ast
 
     const result = doesPipeHaveCallExp({
       calleeName: 'extrude',
       ast,
       selection: {
-        codeRef: codeRefFromRange([100, 101, true], ast),
+        codeRef: codeRefFromRange([100, 101], ast),
       },
     })
     expect(result).toEqual(true)
@@ -412,26 +402,28 @@ part001 = startSketchAt([-1.41, 3.46])
   |> line([-3.22, -7.36], %)
   |> angledLine([-175, segLen(seg01)], %)
 `
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
+    if (err(ast)) throw ast
 
     const result = doesPipeHaveCallExp({
       calleeName: 'close',
       ast,
       selection: {
-        codeRef: codeRefFromRange([100, 101, true], ast),
+        codeRef: codeRefFromRange([100, 101], ast),
       },
     })
     expect(result).toEqual(false)
   })
   it('returns false if not a pipe', () => {
     const exampleCode = `length001 = 2`
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
+    if (err(ast)) throw ast
 
     const result = doesPipeHaveCallExp({
       calleeName: 'close',
       ast,
       selection: {
-        codeRef: codeRefFromRange([9, 10, true], ast),
+        codeRef: codeRefFromRange([9, 10], ast),
       },
     })
     expect(result).toEqual(false)
@@ -446,13 +438,14 @@ part001 = startSketchAt([-1.41, 3.46])
   |> angledLine([-35, length001], %)
   |> line([-3.22, -7.36], %)
   |> angledLine([-175, segLen(seg01)], %)`
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
+    if (err(ast)) throw ast
 
     const execState = await enginelessExecutor(ast)
     const result = hasExtrudeSketch({
       ast,
       selection: {
-        codeRef: codeRefFromRange([100, 101, true], ast),
+        codeRef: codeRefFromRange([100, 101], ast),
       },
       programMemory: execState.memory,
     })
@@ -466,13 +459,14 @@ part001 = startSketchAt([-1.41, 3.46])
   |> line([-3.22, -7.36], %)
   |> angledLine([-175, segLen(seg01)], %)
   |> extrude(1, %)`
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
+    if (err(ast)) throw ast
 
     const execState = await enginelessExecutor(ast)
     const result = hasExtrudeSketch({
       ast,
       selection: {
-        codeRef: codeRefFromRange([100, 101, true], ast),
+        codeRef: codeRefFromRange([100, 101], ast),
       },
       programMemory: execState.memory,
     })
@@ -480,13 +474,14 @@ part001 = startSketchAt([-1.41, 3.46])
   })
   it('finds nothing', async () => {
     const exampleCode = `length001 = 2`
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
+    if (err(ast)) throw ast
 
     const execState = await enginelessExecutor(ast)
     const result = hasExtrudeSketch({
       ast,
       selection: {
-        codeRef: codeRefFromRange([10, 11, true], ast),
+        codeRef: codeRefFromRange([10, 11], ast),
       },
       programMemory: execState.memory,
     })
@@ -503,7 +498,8 @@ describe('Testing findUsesOfTagInPipe', () => {
 |> line([306.21, 198.87], %)
 |> angledLine([65, segLen(seg01)], %)`
   it('finds the current segment', async () => {
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
+    if (err(ast)) throw ast
 
     const lineOfInterest = `198.85], %, $seg01`
     const characterIndex =
@@ -511,7 +507,6 @@ describe('Testing findUsesOfTagInPipe', () => {
     const pathToNode = getNodePathFromSourceRange(ast, [
       characterIndex,
       characterIndex,
-      true,
     ])
     const result = findUsesOfTagInPipe(ast, pathToNode)
     expect(result).toHaveLength(2)
@@ -520,7 +515,8 @@ describe('Testing findUsesOfTagInPipe', () => {
     })
   })
   it('find no tag if line has no tag', () => {
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
+    if (err(ast)) throw ast
 
     const lineOfInterest = `line([306.21, 198.82], %)`
     const characterIndex =
@@ -528,7 +524,6 @@ describe('Testing findUsesOfTagInPipe', () => {
     const pathToNode = getNodePathFromSourceRange(ast, [
       characterIndex,
       characterIndex,
-      true,
     ])
     const result = findUsesOfTagInPipe(ast, pathToNode)
     expect(result).toHaveLength(0)
@@ -569,39 +564,42 @@ sketch003 = startSketchOn(extrude001, 'END')
   |> extrude(3.14, %)
 `
   it('identifies sketch001 pipe as extruded (extrusion after pipe)', async () => {
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
+    if (err(ast)) throw ast
     const lineOfInterest = `line([4.99, -0.46], %, $seg01)`
     const characterIndex =
       exampleCode.indexOf(lineOfInterest) + lineOfInterest.length
     const extruded = hasSketchPipeBeenExtruded(
       {
-        codeRef: codeRefFromRange([characterIndex, characterIndex, true], ast),
+        codeRef: codeRefFromRange([characterIndex, characterIndex], ast),
       },
       ast
     )
     expect(extruded).toBeTruthy()
   })
   it('identifies sketch002 pipe as not extruded', async () => {
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
+    if (err(ast)) throw ast
     const lineOfInterest = `line([2.45, -0.2], %)`
     const characterIndex =
       exampleCode.indexOf(lineOfInterest) + lineOfInterest.length
     const extruded = hasSketchPipeBeenExtruded(
       {
-        codeRef: codeRefFromRange([characterIndex, characterIndex, true], ast),
+        codeRef: codeRefFromRange([characterIndex, characterIndex], ast),
       },
       ast
     )
     expect(extruded).toBeFalsy()
   })
   it('identifies sketch003 pipe as extruded (extrusion within pipe)', async () => {
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
+    if (err(ast)) throw ast
     const lineOfInterest = `|> line([3.12, 1.74], %)`
     const characterIndex =
       exampleCode.indexOf(lineOfInterest) + lineOfInterest.length
     const extruded = hasSketchPipeBeenExtruded(
       {
-        codeRef: codeRefFromRange([characterIndex, characterIndex, true], ast),
+        codeRef: codeRefFromRange([characterIndex, characterIndex], ast),
       },
       ast
     )
@@ -625,21 +623,11 @@ sketch002 = startSketchOn(extrude001, $seg01)
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
 `
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
+    if (err(ast)) throw ast
     const extrudable = doesSceneHaveSweepableSketch(ast)
     expect(extrudable).toBeTruthy()
   })
-  it('finds sketch001 and sketch002 pipes to be lofted', async () => {
-    const exampleCode = `sketch001 = startSketchOn('XZ')
-  |> circle({ center = [0, 0], radius = 1 }, %)
-plane001 = offsetPlane('XZ', 2)
-sketch002 = startSketchOn(plane001)
-  |> circle({ center = [0, 0], radius = 3 }, %)
-`
-    const ast = assertParse(exampleCode)
-    const extrudable = doesSceneHaveSweepableSketch(ast, 2)
-    expect(extrudable).toBeTruthy()
-  })
   it('find sketch002 NOT pipe to be extruded', async () => {
     const exampleCode = `sketch001 = startSketchOn('XZ')
   |> startProfileAt([3.29, 7.86], %)
@@ -649,44 +637,13 @@ sketch002 = startSketchOn(plane001)
   |> close(%)
 extrude001 = extrude(10, sketch001)
 `
-    const ast = assertParse(exampleCode)
+    const ast = parse(exampleCode)
+    if (err(ast)) throw ast
     const extrudable = doesSceneHaveSweepableSketch(ast)
     expect(extrudable).toBeFalsy()
   })
 })
 
-describe('Testing doesSceneHaveExtrudedSketch', () => {
-  it('finds extruded sketch as variable', async () => {
-    const exampleCode = `sketch001 = startSketchOn('XZ')
-  |> circle({ center = [0, 0], radius = 1 }, %)
-extrude001 = extrude(1, sketch001)
-`
-    const ast = parse(exampleCode)
-    if (err(ast)) throw ast
-    const extrudable = doesSceneHaveExtrudedSketch(ast)
-    expect(extrudable).toBeTruthy()
-  })
-  it('finds extruded sketch in pipe', async () => {
-    const exampleCode = `extrude001 = startSketchOn('XZ')
-  |> circle({ center = [0, 0], radius = 1 }, %)
-  |> extrude(1, %)
-`
-    const ast = parse(exampleCode)
-    if (err(ast)) throw ast
-    const extrudable = doesSceneHaveExtrudedSketch(ast)
-    expect(extrudable).toBeTruthy()
-  })
-  it('finds no extrusion with sketch only', async () => {
-    const exampleCode = `extrude001 = startSketchOn('XZ')
-  |> circle({ center = [0, 0], radius = 1 }, %)
-`
-    const ast = parse(exampleCode)
-    if (err(ast)) throw ast
-    const extrudable = doesSceneHaveExtrudedSketch(ast)
-    expect(extrudable).toBeFalsy()
-  })
-})
-
 describe('Testing traverse and pathToNode', () => {
   it.each([
     ['basic', '2.73'],
@@ -709,7 +666,8 @@ myNestedVar = [
 }
 ]
   `
-    const ast = assertParse(code)
+    const ast = parse(code)
+    if (err(ast)) throw ast
     let pathToNode: PathToNode = []
     traverse(ast, {
       enter: (node, path) => {
@@ -731,7 +689,6 @@ myNestedVar = [
     const pathToNode2 = getNodePathFromSourceRange(ast, [
       literalIndex + 2,
       literalIndex + 2,
-      true,
     ])
     expect(pathToNode).toEqual(pathToNode2)
   })

src/lang/queryAst.ts

@@ -16,7 +16,6 @@ import {
   sketchFromKclValue,
   sketchFromKclValueOptional,
   SourceRange,
-  sourceRangeFromRust,
   SyntaxType,
   VariableDeclaration,
   VariableDeclarator,
@@ -174,30 +173,6 @@ function moreNodePathFromSourceRange(
     }
     return path
   }
-
-  if (_node.type === 'CallExpressionKw' && isInRange) {
-    const { callee, arguments: args } = _node
-    if (
-      callee.type === 'Identifier' &&
-      callee.start <= start &&
-      callee.end >= end
-    ) {
-      path.push(['callee', 'CallExpressionKw'])
-      return path
-    }
-    if (args.length > 0) {
-      for (let argIndex = 0; argIndex < args.length; argIndex++) {
-        const arg = args[argIndex].arg
-        if (arg.start <= start && arg.end >= end) {
-          path.push(['arguments', 'CallExpressionKw'])
-          path.push([argIndex, 'index'])
-          return moreNodePathFromSourceRange(arg, sourceRange, path)
-        }
-      }
-    }
-    return path
-  }
-
   if (_node.type === 'BinaryExpression' && isInRange) {
     const { left, right } = _node
     if (left.start <= start && left.end >= end) {
@@ -259,26 +234,34 @@ function moreNodePathFromSourceRange(
     return moreNodePathFromSourceRange(expression, sourceRange, path)
   }
   if (_node.type === 'VariableDeclaration' && isInRange) {
-    const declaration = _node.declaration
+    const declarations = _node.declarations
 
-    if (declaration.start <= start && declaration.end >= end) {
-      path.push(['declaration', 'VariableDeclaration'])
-      const init = declaration.init
-      if (init.start <= start && init.end >= end) {
-        path.push(['init', ''])
-        return moreNodePathFromSourceRange(init, sourceRange, path)
+    for (let decIndex = 0; decIndex < declarations.length; decIndex++) {
+      const declaration = declarations[decIndex]
+      if (declaration.start <= start && declaration.end >= end) {
+        path.push(['declarations', 'VariableDeclaration'])
+        path.push([decIndex, 'index'])
+        const init = declaration.init
+        if (init.start <= start && init.end >= end) {
+          path.push(['init', ''])
+          return moreNodePathFromSourceRange(init, sourceRange, path)
+        }
       }
     }
   }
   if (_node.type === 'VariableDeclaration' && isInRange) {
-    const declaration = _node.declaration
+    const declarations = _node.declarations
 
-    if (declaration.start <= start && declaration.end >= end) {
-      const init = declaration.init
-      if (init.start <= start && init.end >= end) {
-        path.push(['declaration', 'VariableDeclaration'])
-        path.push(['init', ''])
-        return moreNodePathFromSourceRange(init, sourceRange, path)
+    for (let decIndex = 0; decIndex < declarations.length; decIndex++) {
+      const declaration = declarations[decIndex]
+      if (declaration.start <= start && declaration.end >= end) {
+        const init = declaration.init
+        if (init.start <= start && init.end >= end) {
+          path.push(['declarations', 'VariableDeclaration'])
+          path.push([decIndex, 'index'])
+          path.push(['init', ''])
+          return moreNodePathFromSourceRange(init, sourceRange, path)
+        }
       }
     }
     return path
@@ -372,31 +355,24 @@ function moreNodePathFromSourceRange(
   }
 
   if (_node.type === 'ImportStatement' && isInRange) {
-    if (_node.selector && _node.selector.type === 'List') {
-      path.push(['selector', 'ImportStatement'])
-      const { items } = _node.selector
-      for (let i = 0; i < items.length; i++) {
-        const item = items[i]
-        if (item.start <= start && item.end >= end) {
-          path.push(['items', 'ImportSelector'])
-          path.push([i, 'index'])
-          if (item.name.start <= start && item.name.end >= end) {
-            path.push(['name', 'ImportItem'])
-            return path
-          }
-          if (
-            item.alias &&
-            item.alias.start <= start &&
-            item.alias.end >= end
-          ) {
-            path.push(['alias', 'ImportItem'])
-            return path
-          }
+    const { items } = _node
+    for (let i = 0; i < items.length; i++) {
+      const item = items[i]
+      if (item.start <= start && item.end >= end) {
+        path.push(['items', 'ImportStatement'])
+        path.push([i, 'index'])
+        if (item.name.start <= start && item.name.end >= end) {
+          path.push(['name', 'ImportItem'])
           return path
         }
+        if (item.alias && item.alias.start <= start && item.alias.end >= end) {
+          path.push(['alias', 'ImportItem'])
+          return path
+        }
+        return path
       }
-      return path
     }
+    return path
   }
 
   console.error('not implemented: ' + node.type)
@@ -450,10 +426,13 @@ export function traverse(
     traverse(node, option, pathToNode)
 
   if (_node.type === 'VariableDeclaration') {
-    _traverse(_node.declaration, [
-      ...pathToNode,
-      ['declaration', 'VariableDeclaration'],
-    ])
+    _node.declarations.forEach((declaration, index) =>
+      _traverse(declaration, [
+        ...pathToNode,
+        ['declarations', 'VariableDeclaration'],
+        [index, 'index'],
+      ])
+    )
   } else if (_node.type === 'VariableDeclarator') {
     _traverse(_node.init, [...pathToNode, ['init', '']])
   } else if (_node.type === 'PipeExpression') {
@@ -563,7 +542,7 @@ export function findAllPreviousVariablesPath(
   const variables: PrevVariable<any>[] = []
   bodyItems?.forEach?.((item) => {
     if (item.type !== 'VariableDeclaration' || item.end > startRange) return
-    const varName = item.declaration.id.name
+    const varName = item.declarations[0].id.name
     const varValue = programMemory?.get(varName)
     if (!varValue || typeof varValue?.value !== type) return
     variables.push({
@@ -666,7 +645,7 @@ export function isNodeSafeToReplacePath(
 
 export function isNodeSafeToReplace(
   ast: Node<Program>,
-  sourceRange: SourceRange
+  sourceRange: [number, number]
 ):
   | {
       isSafe: boolean
@@ -757,7 +736,7 @@ export function isLinesParallelAndConstrained(
     const _varDec = getNodeFromPath(ast, primaryPath, 'VariableDeclaration')
     if (err(_varDec)) return _varDec
     const varDec = _varDec.node
-    const varName = (varDec as VariableDeclaration)?.declaration.id?.name
+    const varName = (varDec as VariableDeclaration)?.declarations[0]?.id?.name
     const sg = sketchFromKclValue(programMemory?.get(varName), varName)
     if (err(sg)) return sg
     const _primarySegment = getSketchSegmentFromSourceRange(
@@ -818,7 +797,7 @@ export function isLinesParallelAndConstrained(
     return {
       isParallelAndConstrained,
       selection: {
-        codeRef: codeRefFromRange(sourceRangeFromRust(prevSourceRange), ast),
+        codeRef: codeRefFromRange(prevSourceRange, ast),
         artifact: artifactGraph.get(prevSegment.__geoMeta.id),
       },
     }
@@ -877,7 +856,7 @@ export function hasExtrudeSketch({
   }
   const varDec = varDecMeta.node
   if (varDec.type !== 'VariableDeclaration') return false
-  const varName = varDec.declaration.id.name
+  const varName = varDec.declarations[0].id.name
   const varValue = programMemory?.get(varName)
   return (
     varValue?.type === 'Solid' ||
@@ -954,8 +933,7 @@ export function findUsesOfTagInPipe(
         return
       const tagArgValue =
         tagArg.type === 'TagDeclarator' ? String(tagArg.value) : tagArg.name
-      if (tagArgValue === tag)
-        dependentRanges.push([node.start, node.end, true])
+      if (tagArgValue === tag) dependentRanges.push([node.start, node.end])
     },
   })
   return dependentRanges
@@ -997,9 +975,7 @@ export function hasSketchPipeBeenExtruded(selection: Selection, ast: Program) {
         if (
           node.type === 'CallExpression' &&
           node.callee.type === 'Identifier' &&
-          (node.callee.name === 'extrude' ||
-            node.callee.name === 'revolve' ||
-            node.callee.name === 'loft') &&
+          (node.callee.name === 'extrude' || node.callee.name === 'revolve') &&
           node.arguments?.[1]?.type === 'Identifier' &&
           node.arguments[1].name === varDec.id.name
         ) {
@@ -1012,7 +988,7 @@ export function hasSketchPipeBeenExtruded(selection: Selection, ast: Program) {
 }
 
 /** File must contain at least one sketch that has not been extruded already */
-export function doesSceneHaveSweepableSketch(ast: Node<Program>, count = 1) {
+export function doesSceneHaveSweepableSketch(ast: Node<Program>) {
   const theMap: any = {}
   traverse(ast as any, {
     enter(node) {
@@ -1061,35 +1037,6 @@ export function doesSceneHaveSweepableSketch(ast: Node<Program>, count = 1) {
       }
     },
   })
-  return Object.keys(theMap).length >= count
-}
-
-export function doesSceneHaveExtrudedSketch(ast: Node<Program>) {
-  const theMap: any = {}
-  traverse(ast as any, {
-    enter(node) {
-      if (
-        node.type === 'VariableDeclarator' &&
-        node.init?.type === 'PipeExpression'
-      ) {
-        for (const pipe of node.init.body) {
-          if (
-            pipe.type === 'CallExpression' &&
-            pipe.callee.name === 'extrude'
-          ) {
-            theMap[node.id.name] = true
-            break
-          }
-        }
-      } else if (
-        node.type === 'CallExpression' &&
-        node.callee.name === 'extrude' &&
-        node.arguments[1]?.type === 'Identifier'
-      ) {
-        theMap[node.moduleId] = true
-      }
-    },
-  })
   return Object.keys(theMap).length > 0
 }
 

src/lang/recast.test.ts

@@ -1,4 +1,4 @@
-import { assertParse, Program, recast, initPromise } from './wasm'
+import { parse, Program, recast, initPromise } from './wasm'
 import fs from 'node:fs'
 import { err } from 'lib/trap'
 
@@ -394,6 +394,8 @@ describe('it recasts binary expression using brackets where needed', () => {
 // helpers
 
 function code2ast(code: string): { ast: Program } {
-  const ast = assertParse(code)
+  const ast = parse(code)
+  // eslint-ignore-next-line
+  if (err(ast)) throw ast
   return { ast }
 }

src/lang/std/__snapshots__/artifactGraph.test.ts.snap

@@ -11,8 +11,8 @@ Map {
         ],
       ],
       "range": [
-        12,
-        31,
+        37,
+        64,
         0,
       ],
     },

src/lang/std/artifactGraph.test.ts

@@ -1,4 +1,4 @@
-import { makeDefaultPlanes, assertParse, initPromise, Program } from 'lang/wasm'
+import { makeDefaultPlanes, parse, initPromise, Program } from 'lang/wasm'
 import { Models } from '@kittycad/lib'
 import {
   OrderedCommand,
@@ -148,7 +148,11 @@ beforeAll(async () => {
         ][]
         const cacheToWriteToFileTemp: Partial<CacheShape> = {}
         for (const [codeKey, code] of cacheEntries) {
-          const ast = assertParse(code)
+          const ast = parse(code)
+          if (err(ast)) {
+            console.error(ast)
+            return Promise.reject(ast)
+          }
           await kclManager.executeAst({ ast })
 
           cacheToWriteToFileTemp[codeKey] = {
@@ -399,7 +403,11 @@ describe('capture graph of sketchOnFaceOnFace...', () => {
 })
 
 function getCommands(codeKey: CodeKey): CacheShape[CodeKey] & { ast: Program } {
-  const ast = assertParse(codeKey)
+  const ast = parse(codeKey)
+  if (err(ast)) {
+    console.error(ast)
+    throw ast
+  }
   const file = fs.readFileSync(fullPath, 'utf-8')
   const parsed: CacheShape = JSON.parse(file)
   // these either already exist from the last run, or were created in