Remove node wrapper around NonCodeMeta

Trying to fix TS unit test errors deserializing JSON AST in Rust.

.github/ci-cd-scripts/playwright-browser-chrome.sh

@@ -4,9 +4,9 @@ set -euo pipefail
 if [[ ! -f "test-results/.last-run.json" ]]; then
     # if no last run artifact, than run plawright normally
     echo "run playwright normally"
-    if [[ "$3" == ubuntu-latest* ]]; then
+    if [[ "$3" == "ubuntu-latest" ]]; then
         yarn test:playwright:browser:chrome:ubuntu -- --shard=$1/$2 || true
-    elif [[ "$3" == windows-latest* ]]; then
+    elif [[ "$3" == "windows-latest" ]]; then
         yarn test:playwright:browser:chrome:windows -- --shard=$1/$2 || true
     else
         echo "Do not run playwright. Unable to detect os runtime."
@@ -26,9 +26,9 @@ while [[ $retry -le $max_retrys ]]; do
         if [[ $failed_tests -gt 0 ]]; then
             echo "retried=true" >>$GITHUB_OUTPUT
             echo "run playwright with last failed tests and retry $retry"
-            if [[ "$3" == ubuntu-latest* ]]; then
+            if [[ "$3" == "ubuntu-latest" ]]; then
                 yarn test:playwright:browser:chrome:ubuntu -- --last-failed || true
-            elif [[ "$3" == windows-latest* ]]; then
+            elif [[ "$3" == "windows-latest" ]]; then
                 yarn test:playwright:browser:chrome:windows -- --last-failed || true
             else
                 echo "Do not run playwright. Unable to detect os runtime."

.github/ci-cd-scripts/playwright-electron.sh

@@ -4,11 +4,11 @@ set -euo pipefail
 if [[ ! -f "test-results/.last-run.json" ]]; then
     # if no last run artifact, than run plawright normally
     echo "run playwright normally"
-        if [[ "$1" == ubuntu-latest* ]]; then
+        if [[ "$1" == "ubuntu-latest" ]]; then
             xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu || true
-        elif [[ "$1" == windows-latest* ]]; then
+        elif [[ "$1" == "windows-latest" ]]; then
             yarn test:playwright:electron:windows || true
-        elif [[ "$1" == macos-14* ]]; then
+        elif [[ "$1" == "macos-14" ]]; then
             yarn test:playwright:electron:macos || true
         else
             echo "Do not run playwright. Unable to detect os runtime."
@@ -28,11 +28,11 @@ while [[ $retry -le $max_retrys ]]; do
         if [[ $failed_tests -gt 0 ]]; then
             echo "retried=true" >>$GITHUB_OUTPUT
             echo "run playwright with last failed tests and retry $retry"
-            if [[ "$1" == ubuntu-latest* ]]; then
+            if [[ "$1" == "ubuntu-latest" ]]; then
                 xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu -- --last-failed || true
-            elif [[ "$1" == windows-latest* ]]; then
+            elif [[ "$1" == "windows-latest" ]]; then
                 yarn test:playwright:electron:windows -- --last-failed || true
-            elif [[ "$1" == macos-14* ]]; then
+            elif [[ "$1" == "macos-14" ]]; then
                 yarn test:playwright:electron:macos -- --last-failed || true
             else
                 echo "Do not run playwright. Unable to detect os runtime."

.github/dependabot.yml

@@ -8,21 +8,21 @@ updates:
     - package-ecosystem: 'npm' # See documentation for possible values
       directory: '/' # Location of package manifests
       schedule:
-          interval: 'weekly'
+          interval: 'daily'
       reviewers:
           - franknoirot
           - irev-dev
     - package-ecosystem: 'github-actions' # See documentation for possible values
       directory: '/' # Location of package manifests
       schedule:
-          interval: 'weekly'
+          interval: 'daily'
       reviewers:
           - adamchalmers
           - jessfraz
     - package-ecosystem: 'cargo' # See documentation for possible values
       directory: '/src/wasm-lib/' # Location of package manifests
       schedule:
-          interval: 'weekly'
+          interval: 'daily'
       reviewers:
           - adamchalmers
           - jessfraz

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

@@ -15,7 +15,6 @@ on:
 env:
   CUT_RELEASE_PR: ${{ github.event_name == 'pull_request' && (contains(github.event.pull_request.title, 'Cut release v')) }}
   BUILD_RELEASE: ${{ github.event_name == 'release' || github.event_name == 'schedule' || github.event_name == 'pull_request' && (contains(github.event.pull_request.title, 'Cut release v')) }}
-  NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Non-release build, commit {0}', github.sha) }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -26,6 +25,7 @@ jobs:
     runs-on: ubuntu-22.04  # seperate job on Ubuntu for easy string manipulations (compared to Windows)
     outputs:
       version: ${{ steps.export_version.outputs.version }}
+      notes: ${{ steps.export_version.outputs.notes }}
     steps:
       - uses: actions/checkout@v4
 
@@ -55,6 +55,8 @@ jobs:
       # TODO: see if we need to inject updater nightly URL here https://dl.zoo.dev/releases/modeling-app/nightly/last_update.json
 
       - name: Generate release notes
+        env:
+          NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Non-release build, commit {0}', github.sha) }}
         run: |
           echo "$NOTES" > release-notes.md
           cat release-notes.md
@@ -82,10 +84,13 @@ jobs:
           path: |
             electron-builder.yml
 
+      - id: export_notes
+        run: echo "notes=`cat release-notes.md'`" >> "$GITHUB_OUTPUT"
+
       - name: Prepare electron-builder.yml file for updater test
         if: ${{ env.CUT_RELEASE_PR == 'true' }}
         run: |
-          yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/updater-test"' electron-builder.yml
+          yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/updater-test-release-notes"' electron-builder.yml
 
       - uses: actions/upload-artifact@v3
         if: ${{ env.CUT_RELEASE_PR == 'true' }}
@@ -109,8 +114,17 @@ jobs:
             platform: linux
     runs-on: ${{ matrix.os }}
     env:
+      APPLE_ID: ${{ secrets.APPLE_ID }}
+      APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+      APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+      APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+      CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
+      CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+      CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+      CSC_FOR_PULL_REQUEST: true
       VERSION: ${{ github.event_name == 'schedule' && needs.prepare-files.outputs.version || format('v{0}', needs.prepare-files.outputs.version) }}
       VERSION_NO_V: ${{ needs.prepare-files.outputs.version }}
+      WINDOWS_CERTIFICATE_THUMBPRINT: F4C9A52FF7BC26EE5E054946F6B11DEEA94C748D
     steps:
       - uses: actions/checkout@v4
 
@@ -172,26 +186,8 @@ jobs:
           smksp_cert_sync.exe
         shell: cmd
 
-      - name: Build the app (debug)
-        if: ${{ env.BUILD_RELEASE == 'false' }}
-        # electron-builder doesn't have a concept of release vs debug,
-        # this is just not doing any codesign or release yml generation
-        run: yarn electron-builder --config
-
-      - name: Build the app (release)
-        if: ${{ env.BUILD_RELEASE == 'true' }}
-        env:
-          PUBLISH_FOR_PULL_REQUEST: true
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
-          CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-          CSC_FOR_PULL_REQUEST: true
-          WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
-        run: yarn electron-builder --config --publish always
+      - name: Build the app
+        run: yarn electron-builder --config ${{ env.BUILD_RELEASE && '--publish always' || '' }}
 
       - name: List artifacts in out/
         run: ls -R out
@@ -235,17 +231,7 @@ jobs:
 
       - name: Build the app (updater-test)
         if: ${{ env.CUT_RELEASE_PR == 'true' }}
-        env:
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
-          CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-          CSC_FOR_PULL_REQUEST: true
-          WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
-        run: yarn electron-builder --config --publish always
+        run: yarn electron-builder --config ${{ env.BUILD_RELEASE && '--publish always' || '' }}
 
       - uses: actions/upload-artifact@v3
         if: ${{ env.CUT_RELEASE_PR == 'true' }}
@@ -276,6 +262,7 @@ jobs:
       VERSION_NO_V: ${{ needs.prepare-files.outputs.version }}
       VERSION: ${{ github.event_name == 'schedule' && needs.prepare-files.outputs.version || format('v{0}', needs.prepare-files.outputs.version) }}
       PUB_DATE: ${{ github.event_name == 'release' && github.event.release.created_at || github.event.repository.updated_at }}
+      NOTES: ${{ needs.prepare-files.outputs.notes }}
       BUCKET_DIR: ${{ github.event_name == 'schedule' && 'dl.kittycad.io/releases/modeling-app/nightly' || 'dl.kittycad.io/releases/modeling-app' }}
       WEBSITE_DIR: ${{ github.event_name == 'schedule' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }}
       URL_CODED_NAME: ${{ github.event_name == 'schedule' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }}
@@ -361,17 +348,17 @@ jobs:
         run: "ls -R out"
 
       - name: Authenticate to Google Cloud
-        uses: 'google-github-actions/auth@v2.1.7'
+        uses: 'google-github-actions/auth@v2.1.6'
         with:
           credentials_json: '${{ secrets.GOOGLE_CLOUD_DL_SA }}'
 
       - name: Set up Google Cloud SDK
-        uses: google-github-actions/setup-gcloud@v2.1.2
+        uses: google-github-actions/setup-gcloud@v2.1.0
         with:
           project_id: ${{ env.GOOGLE_CLOUD_PROJECT_ID }}
 
       - name: Upload release files to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.2.1
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
         with:
           path: out
           glob: 'Zoo*'
@@ -379,7 +366,7 @@ jobs:
           destination: ${{ env.BUCKET_DIR }}
 
       - name: Upload update endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.2.1
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
         with:
           path: out
           glob: 'latest*'
@@ -387,7 +374,7 @@ jobs:
           destination: ${{ env.BUCKET_DIR }}
 
       - name: Upload download endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.2.1
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
         with:
           path: last_download.json
           destination: ${{ env.BUCKET_DIR }}

.github/workflows/cargo-check.yml

@@ -37,4 +37,4 @@ jobs:
           # We specifically want to test the disable-println feature
           # Since it is not enabled by default, we need to specify it
           # This is used in kcl-lsp
-          cargo check --workspace --features disable-println --features pyo3 --features cli
+          cargo check --all --features disable-println --features pyo3 --features cli

.github/workflows/cargo-test.yml

@@ -62,7 +62,7 @@ jobs:
         shell: bash
         run: |-
           cd "${{ matrix.dir }}"
-          cargo llvm-cov nextest --workspace --lcov --output-path lcov.info --test-threads=1 --no-fail-fast -P ci 2>&1 | tee /tmp/github-actions.log
+          cargo llvm-cov nextest --all --lcov --output-path lcov.info --test-threads=1 --no-fail-fast -P ci 2>&1 | tee /tmp/github-actions.log
         env:
           KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
           RUST_MIN_STACK: 10485760000

.github/workflows/e2e-tests.yml

@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest-8-cores, windows-latest-8-cores]
+        os: [ubuntu-latest, windows-latest]
         shardIndex: [1, 2, 3, 4]
         shardTotal: [4]
     runs-on: ${{ matrix.os }}
@@ -227,7 +227,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest-8-cores, windows-latest-8-cores, macos-14-large]
+        os: [ubuntu-latest, windows-latest, macos-14]
     timeout-minutes: 60
     runs-on: ${{ matrix.os }}
     needs: check-rust-changes
@@ -287,7 +287,7 @@ jobs:
         brew install gnu-sed
         echo "/opt/homebrew/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
     - name: Install vector
-      if:  ${{ startsWith(matrix.os, 'ubuntu') }}
+      if:  ${{ !startsWith(matrix.os, 'windows') }}
       shell: bash
       run: |
         curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh

.github/workflows/static-analysis.yml

@@ -81,31 +81,6 @@ jobs:
       - name: Run codespell
         run: codespell --config .codespellrc # Edit this file to tweak the typo list and other configuration.
 
-  yarn-unit-test-kcl-samples:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-
-      - run: yarn install
-      - run: yarn build:wasm
-
-      - run: yarn simpleserver:bg
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-
-      - name: Install Chromium Browser
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn playwright install chromium --with-deps
-
-      - name: run unit tests for kcl samples
-        if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn test:unit:kcl-samples
-        env:
-          VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
 
   yarn-unit-test:
     runs-on: ubuntu-latest

.nvmrc

@@ -1 +1 @@
-v21.7.3
+v21.7.1

docs/kcl/angledLine.md

@@ -9,7 +9,7 @@ Draw a line segment relative to the current origin using the polar
 measure of some angle and distance.
 
 ```js
-angledLine(data: AngledLineData, sketch: Sketch, tag?: TagDeclarator) -> Sketch
+angledLine(data: AngledLineData, sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ angledLine(data: AngledLineData, sketch: Sketch, tag?: TagDeclarator) -> Sketch
 |----------|------|-------------|----------|
 | `data` | [`AngledLineData`](/docs/kcl/types/AngledLineData) | Data to draw an angled line. | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/angledLineOfXLength.md

@@ -9,7 +9,7 @@ Create a line segment from the current 2-dimensional sketch origin
 along some angle (in degrees) for some relative length in the 'x' dimension.
 
 ```js
-angledLineOfXLength(data: AngledLineData, sketch: Sketch, tag?: TagDeclarator) -> Sketch
+angledLineOfXLength(data: AngledLineData, sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ angledLineOfXLength(data: AngledLineData, sketch: Sketch, tag?: TagDeclarator) -
 |----------|------|-------------|----------|
 | `data` | [`AngledLineData`](/docs/kcl/types/AngledLineData) | Data to draw an angled line. | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/angledLineOfYLength.md

@@ -9,7 +9,7 @@ Create a line segment from the current 2-dimensional sketch origin
 along some angle (in degrees) for some relative length in the 'y' dimension.
 
 ```js
-angledLineOfYLength(data: AngledLineData, sketch: Sketch, tag?: TagDeclarator) -> Sketch
+angledLineOfYLength(data: AngledLineData, sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ angledLineOfYLength(data: AngledLineData, sketch: Sketch, tag?: TagDeclarator) -
 |----------|------|-------------|----------|
 | `data` | [`AngledLineData`](/docs/kcl/types/AngledLineData) | Data to draw an angled line. | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/angledLineThatIntersects.md

@@ -9,7 +9,7 @@ Draw an angled line from the current origin, constructing a line segment
 such that the newly created line intersects the desired target line segment.
 
 ```js
-angledLineThatIntersects(data: AngledLineThatIntersectsData, sketch: Sketch, tag?: TagDeclarator) -> Sketch
+angledLineThatIntersects(data: AngledLineThatIntersectsData, sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ angledLineThatIntersects(data: AngledLineThatIntersectsData, sketch: Sketch, tag
 |----------|------|-------------|----------|
 | `data` | [`AngledLineThatIntersectsData`](/docs/kcl/types/AngledLineThatIntersectsData) | Data for drawing an angled line that intersects with a given line. | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/angledLineToX.md

@@ -9,7 +9,7 @@ Create a line segment from the current 2-dimensional sketch origin
 along some angle (in degrees) for some length, ending at the provided value in the 'x' dimension.
 
 ```js
-angledLineToX(data: AngledLineToData, sketch: Sketch, tag?: TagDeclarator) -> Sketch
+angledLineToX(data: AngledLineToData, sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ angledLineToX(data: AngledLineToData, sketch: Sketch, tag?: TagDeclarator) -> Sk
 |----------|------|-------------|----------|
 | `data` | [`AngledLineToData`](/docs/kcl/types/AngledLineToData) | Data to draw an angled line to a point. | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/angledLineToY.md

@@ -9,7 +9,7 @@ Create a line segment from the current 2-dimensional sketch origin
 along some angle (in degrees) for some length, ending at the provided value in the 'y' dimension.
 
 ```js
-angledLineToY(data: AngledLineToData, sketch: Sketch, tag?: TagDeclarator) -> Sketch
+angledLineToY(data: AngledLineToData, sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ angledLineToY(data: AngledLineToData, sketch: Sketch, tag?: TagDeclarator) -> Sk
 |----------|------|-------------|----------|
 | `data` | [`AngledLineToData`](/docs/kcl/types/AngledLineToData) | Data to draw an angled line to a point. | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/arc.md

@@ -11,7 +11,7 @@ The arc is constructed such that the current position of the sketch is placed al
 Unless this makes a lot of sense and feels like what you're looking for to construct your shape, you're likely looking for tangentialArc.
 
 ```js
-arc(data: ArcData, sketch: Sketch, tag?: TagDeclarator) -> Sketch
+arc(data: ArcData, sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -21,7 +21,7 @@ arc(data: ArcData, sketch: Sketch, tag?: TagDeclarator) -> Sketch
 |----------|------|-------------|----------|
 | `data` | [`ArcData`](/docs/kcl/types/ArcData) | Data to draw an arc. | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/bezierCurve.md

@@ -9,7 +9,7 @@ Draw a smooth, continuous, curved line segment from the current origin to
 the desired (x, y), using a number of control points to shape the curve's shape.
 
 ```js
-bezierCurve(data: BezierData, sketch: Sketch, tag?: TagDeclarator) -> Sketch
+bezierCurve(data: BezierData, sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ bezierCurve(data: BezierData, sketch: Sketch, tag?: TagDeclarator) -> Sketch
 |----------|------|-------------|----------|
 | `data` | [`BezierData`](/docs/kcl/types/BezierData) | Data to draw a bezier curve. | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/chamfer.md

@@ -9,7 +9,7 @@ Cut a straight transitional edge along a tagged path.
 Chamfer is similar in function and use to a fillet, except a fillet will blend the transition along an edge, rather than cut a sharp, straight transitional edge.
 
 ```js
-chamfer(data: ChamferData, solid: Solid, tag?: TagDeclarator) -> Solid
+chamfer(data: ChamferData, solid: Solid, tag?: TagNode) -> Solid
 ```
 
 
@@ -19,7 +19,7 @@ chamfer(data: ChamferData, solid: Solid, tag?: TagDeclarator) -> Solid
 |----------|------|-------------|----------|
 | `data` | [`ChamferData`](/docs/kcl/types/ChamferData) | Data for chamfers. | Yes |
 | `solid` | [`Solid`](/docs/kcl/types/Solid) | An solid is a collection of extrude surfaces. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/circle.md

@@ -9,7 +9,7 @@ Construct a 2-dimensional circle, of the specified radius, centered at
 the provided (x, y) origin point.
 
 ```js
-circle(data: CircleData, sketch_surface_or_group: SketchOrSurface, tag?: TagDeclarator) -> Sketch
+circle(data: CircleData, sketch_surface_or_group: SketchOrSurface, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ circle(data: CircleData, sketch_surface_or_group: SketchOrSurface, tag?: TagDecl
 |----------|------|-------------|----------|
 | `data` | [`CircleData`](/docs/kcl/types/CircleData) | Data for drawing an circle | Yes |
 | `sketch_surface_or_group` | [`SketchOrSurface`](/docs/kcl/types/SketchOrSurface) | A sketch surface or a sketch. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/close.md

@@ -9,7 +9,7 @@ Construct a line segment from the current origin back to the profile's
 origin, ensuring the resulting 2-dimensional sketch is not open-ended.
 
 ```js
-close(sketch: Sketch, tag?: TagDeclarator) -> Sketch
+close(sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -18,7 +18,7 @@ close(sketch: Sketch, tag?: TagDeclarator) -> Sketch
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/fillet.md

@@ -9,7 +9,7 @@ Blend a transitional edge along a tagged path, smoothing the sharp edge.
 Fillet is similar in function and use to a chamfer, except a chamfer will cut a sharp transition along an edge while fillet will smoothly blend the transition.
 
 ```js
-fillet(data: FilletData, solid: Solid, tag?: TagDeclarator) -> Solid
+fillet(data: FilletData, solid: Solid, tag?: TagNode) -> Solid
 ```
 
 
@@ -19,7 +19,7 @@ fillet(data: FilletData, solid: Solid, tag?: TagDeclarator) -> Solid
 |----------|------|-------------|----------|
 | `data` | [`FilletData`](/docs/kcl/types/FilletData) | Data for fillets. | Yes |
 | `solid` | [`Solid`](/docs/kcl/types/Solid) | An solid is a collection of extrude surfaces. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/index.md

@@ -74,23 +74,17 @@ layout: manual
 * [`patternTransform`](kcl/patternTransform)
 * [`pi`](kcl/pi)
 * [`polar`](kcl/polar)
-* [`polygon`](kcl/polygon)
 * [`pow`](kcl/pow)
 * [`profileStart`](kcl/profileStart)
 * [`profileStartX`](kcl/profileStartX)
 * [`profileStartY`](kcl/profileStartY)
-* [`push`](kcl/push)
 * [`reduce`](kcl/reduce)
 * [`rem`](kcl/rem)
 * [`revolve`](kcl/revolve)
 * [`segAng`](kcl/segAng)
-* [`segEnd`](kcl/segEnd)
 * [`segEndX`](kcl/segEndX)
 * [`segEndY`](kcl/segEndY)
 * [`segLen`](kcl/segLen)
-* [`segStart`](kcl/segStart)
-* [`segStartX`](kcl/segStartX)
-* [`segStartY`](kcl/segStartY)
 * [`shell`](kcl/shell)
 * [`sin`](kcl/sin)
 * [`sqrt`](kcl/sqrt)

docs/kcl/line.md

@@ -9,7 +9,7 @@ Draw a line relative to the current origin to a specified (x, y) away
 from the current position.
 
 ```js
-line(delta: [number], sketch: Sketch, tag?: TagDeclarator) -> Sketch
+line(delta: [number], sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ line(delta: [number], sketch: Sketch, tag?: TagDeclarator) -> Sketch
 |----------|------|-------------|----------|
 | `delta` | `[number]` |  | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/lineTo.md

@@ -9,7 +9,7 @@ Draw a line from the current origin to some absolute (x, y) point.
 
 
 ```js
-lineTo(to: [number], sketch: Sketch, tag?: TagDeclarator) -> Sketch
+lineTo(to: [number], sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ lineTo(to: [number], sketch: Sketch, tag?: TagDeclarator) -> Sketch
 |----------|------|-------------|----------|
 | `to` | `[number]` |  | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/startProfileAt.md

@@ -9,7 +9,7 @@ Start a new profile at a given point.
 
 
 ```js
-startProfileAt(to: [number], sketch_surface: SketchSurface, tag?: TagDeclarator) -> Sketch
+startProfileAt(to: [number], sketch_surface: SketchSurface, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ startProfileAt(to: [number], sketch_surface: SketchSurface, tag?: TagDeclarator)
 |----------|------|-------------|----------|
 | `to` | `[number]` |  | Yes |
 | `sketch_surface` | [`SketchSurface`](/docs/kcl/types/SketchSurface) | A sketch type. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/tangentialArc.md

@@ -9,7 +9,7 @@ Draw a curved line segment along part of an imaginary circle.
 The arc is constructed such that the last line segment is placed tangent to the imaginary circle of the specified radius. The resulting arc is the segment of the imaginary circle from that tangent point for 'offset' degrees along the imaginary circle.
 
 ```js
-tangentialArc(data: TangentialArcData, sketch: Sketch, tag?: TagDeclarator) -> Sketch
+tangentialArc(data: TangentialArcData, sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ tangentialArc(data: TangentialArcData, sketch: Sketch, tag?: TagDeclarator) -> S
 |----------|------|-------------|----------|
 | `data` | [`TangentialArcData`](/docs/kcl/types/TangentialArcData) | Data to draw a tangential arc. | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/tangentialArcTo.md

@@ -9,7 +9,7 @@ Starting at the current sketch's origin, draw a curved line segment along
 some part of an imaginary circle until it reaches the desired (x, y) coordinates.
 
 ```js
-tangentialArcTo(to: [number], sketch: Sketch, tag?: TagDeclarator) -> Sketch
+tangentialArcTo(to: [number], sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ tangentialArcTo(to: [number], sketch: Sketch, tag?: TagDeclarator) -> Sketch
 |----------|------|-------------|----------|
 | `to` | `[number]` |  | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/tangentialArcToRelative.md

@@ -9,7 +9,7 @@ Starting at the current sketch's origin, draw a curved line segment along
 some part of an imaginary circle until it reaches a point the given (x, y) distance away.
 
 ```js
-tangentialArcToRelative(delta: [number], sketch: Sketch, tag?: TagDeclarator) -> Sketch
+tangentialArcToRelative(delta: [number], sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ tangentialArcToRelative(delta: [number], sketch: Sketch, tag?: TagDeclarator) ->
 |----------|------|-------------|----------|
 | `delta` | `[number]` |  | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/types/BasePath.md

@@ -18,7 +18,7 @@ A base path.
 |----------|------|-------------|----------|
 | `from` |`[number, number]`| The from point. | No |
 | `to` |`[number, number]`| The to point. | No |
-| `tag` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag of the path. | No |
+| `tag` |[`TagNode`](/docs/kcl/types/TagNode)| The tag of the path. | No |
 | `__geoMeta` |[`GeoMeta`](/docs/kcl/types/GeoMeta)| Metadata. | No |
 
 

docs/kcl/types/BinaryPart.md

@@ -22,12 +22,10 @@ layout: manual
 
 | 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` |enum: [`Literal`](/docs/kcl/types/Literal)|  | No |
+| `kind` |[`Literal`](/docs/kcl/types/Literal)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -43,10 +41,9 @@ layout: manual
 | 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 |
+| `kind` |[`Identifier`](/docs/kcl/types/Identifier)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -61,13 +58,10 @@ layout: manual
 
 | 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` |enum: [`BinaryExpression`](/docs/kcl/types/BinaryExpression)|  | No |
+| `kind` |[`BinaryExpression`](/docs/kcl/types/BinaryExpression)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -82,13 +76,10 @@ layout: manual
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `type` |enum: `CallExpression`|  | No |
-| `callee` |[`Identifier`](/docs/kcl/types/Identifier)|  | No |
-| `arguments` |`[` [`Expr`](/docs/kcl/types/Expr) `]`|  | No |
-| `optional` |`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` |enum: [`CallExpression`](/docs/kcl/types/CallExpression)|  | No |
+| `kind` |[`CallExpression`](/docs/kcl/types/CallExpression)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -103,12 +94,10 @@ layout: manual
 
 | 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` |enum: [`UnaryExpression`](/docs/kcl/types/UnaryExpression)|  | No |
+| `kind` |[`UnaryExpression`](/docs/kcl/types/UnaryExpression)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -123,13 +112,10 @@ layout: manual
 
 | 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` |enum: [`MemberExpression`](/docs/kcl/types/MemberExpression)|  | No |
+| `kind` |[`MemberExpression`](/docs/kcl/types/MemberExpression)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -144,14 +130,10 @@ layout: manual
 
 | 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 |
+| `type` |enum: [`IfExpression`](/docs/kcl/types/IfExpression)|  | No |
+| `kind` |[`IfExpression`](/docs/kcl/types/IfExpression)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----

docs/kcl/types/BodyItem.md

@@ -22,13 +22,10 @@ layout: manual
 
 | 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` |enum: [`ImportStatement`](/docs/kcl/types/ImportStatement)|  | No |
+| `kind` |[`ImportStatement`](/docs/kcl/types/ImportStatement)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -43,11 +40,10 @@ layout: manual
 
 | 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` |enum: [`ExpressionStatement`](/docs/kcl/types/ExpressionStatement)|  | No |
+| `kind` |[`ExpressionStatement`](/docs/kcl/types/ExpressionStatement)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -62,13 +58,10 @@ layout: manual
 
 | 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` |enum: [`VariableDeclaration`](/docs/kcl/types/VariableDeclaration)|  | No |
+| `kind` |[`VariableDeclaration`](/docs/kcl/types/VariableDeclaration)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -83,11 +76,10 @@ layout: manual
 
 | 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 |
+| `type` |enum: [`ReturnStatement`](/docs/kcl/types/ReturnStatement)|  | No |
+| `kind` |[`ReturnStatement`](/docs/kcl/types/ReturnStatement)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----

docs/kcl/types/EdgeCut.md

@@ -28,7 +28,7 @@ A fillet.
 | `id` |`string`| The id of the engine command that called this fillet. | No |
 | `radius` |`number`|  | No |
 | `edgeId` |`string`| The engine id of the edge to fillet. | No |
-| `tag` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)|  | No |
+| `tag` |[`TagNode`](/docs/kcl/types/TagNode)|  | No |
 
 
 ----
@@ -48,7 +48,7 @@ A chamfer.
 | `id` |`string`| The id of the engine command that called this chamfer. | No |
 | `length` |`number`|  | No |
 | `edgeId` |`string`| The engine id of the edge to chamfer. | No |
-| `tag` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)|  | No |
+| `tag` |[`TagNode`](/docs/kcl/types/TagNode)|  | No |
 
 
 ----

docs/kcl/types/ElseIf.md

@@ -16,9 +16,7 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `cond` |[`Expr`](/docs/kcl/types/Expr)|  | No |
-| `then_val` |[`Program`](/docs/kcl/types/Program)|  | No |
+| `then_val` |[`UnboxedNode_for_Program`](/docs/kcl/types/UnboxedNode_for_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/Environment.md

@@ -16,6 +16,6 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `bindings` |`object`|  | No |
-| `parent` |`integer`|  | No |
+| `parent` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 

docs/kcl/types/Expr.md

@@ -23,12 +23,10 @@ An expression can be evaluated to yield a single KCL value.
 
 | 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` |enum: [`Literal`](/docs/kcl/types/Literal)|  | No |
+| `kind` |[`Literal`](/docs/kcl/types/Literal)| An expression can be evaluated to yield a single KCL value. | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -44,10 +42,9 @@ An expression can be evaluated to yield a single KCL value.
 | 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 |
+| `kind` |[`Identifier`](/docs/kcl/types/Identifier)| An expression can be evaluated to yield a single KCL value. | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -63,10 +60,9 @@ An expression can be evaluated to yield a single KCL value.
 | 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 |
+| `kind` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| An expression can be evaluated to yield a single KCL value. | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -81,13 +77,10 @@ An expression can be evaluated to yield a single KCL value.
 
 | 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` |enum: [`BinaryExpression`](/docs/kcl/types/BinaryExpression)|  | No |
+| `kind` |[`BinaryExpression`](/docs/kcl/types/BinaryExpression)| An expression can be evaluated to yield a single KCL value. | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -103,11 +96,9 @@ An expression can be evaluated to yield a single KCL value.
 | 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 |
+| `kind` |[`FunctionExpression`](/docs/kcl/types/FunctionExpression)| An expression can be evaluated to yield a single KCL value. | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -122,13 +113,10 @@ An expression can be evaluated to yield a single KCL value.
 
 | 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 |
-| `optional` |`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` |enum: [`CallExpression`](/docs/kcl/types/CallExpression)|  | No |
+| `kind` |[`CallExpression`](/docs/kcl/types/CallExpression)| An expression can be evaluated to yield a single KCL value. | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -143,12 +131,10 @@ An expression can be evaluated to yield a single KCL value.
 
 | 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` |enum: [`PipeExpression`](/docs/kcl/types/PipeExpression)|  | No |
+| `kind` |[`PipeExpression`](/docs/kcl/types/PipeExpression)| An expression can be evaluated to yield a single KCL value. | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -163,10 +149,10 @@ An expression can be evaluated to yield a single KCL value.
 
 | 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` |enum: [`PipeSubstitution`](/docs/kcl/types/PipeSubstitution)|  | No |
+| `kind` |[`PipeSubstitution`](/docs/kcl/types/PipeSubstitution)| An expression can be evaluated to yield a single KCL value. | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -181,12 +167,10 @@ An expression can be evaluated to yield a single KCL value.
 
 | 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` |enum: [`ArrayExpression`](/docs/kcl/types/ArrayExpression)|  | No |
+| `kind` |[`ArrayExpression`](/docs/kcl/types/ArrayExpression)| An expression can be evaluated to yield a single KCL value. | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -201,13 +185,10 @@ An expression can be evaluated to yield a single KCL value.
 
 | 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` |enum: [`ArrayRangeExpression`](/docs/kcl/types/ArrayRangeExpression)|  | No |
+| `kind` |[`ArrayRangeExpression`](/docs/kcl/types/ArrayRangeExpression)| An expression can be evaluated to yield a single KCL value. | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -222,12 +203,10 @@ An expression can be evaluated to yield a single KCL value.
 
 | 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` |enum: [`ObjectExpression`](/docs/kcl/types/ObjectExpression)|  | No |
+| `kind` |[`ObjectExpression`](/docs/kcl/types/ObjectExpression)| An expression can be evaluated to yield a single KCL value. | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -242,13 +221,10 @@ An expression can be evaluated to yield a single KCL value.
 
 | 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` |enum: [`MemberExpression`](/docs/kcl/types/MemberExpression)|  | No |
+| `kind` |[`MemberExpression`](/docs/kcl/types/MemberExpression)| An expression can be evaluated to yield a single KCL value. | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -263,12 +239,10 @@ An expression can be evaluated to yield a single KCL value.
 
 | 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` |enum: [`UnaryExpression`](/docs/kcl/types/UnaryExpression)|  | No |
+| `kind` |[`UnaryExpression`](/docs/kcl/types/UnaryExpression)| An expression can be evaluated to yield a single KCL value. | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -283,14 +257,10 @@ An expression can be evaluated to yield a single KCL value.
 
 | 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 |
+| `type` |enum: [`IfExpression`](/docs/kcl/types/IfExpression)|  | No |
+| `kind` |[`IfExpression`](/docs/kcl/types/IfExpression)| An expression can be evaluated to yield a single KCL value. | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -307,8 +277,8 @@ KCL value for an optional parameter which was not given an argument. (remember,
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `None`|  | No |
-| `start` |`integer`|  | No |
-| `end` |`integer`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----

docs/kcl/types/ExtrudeSurface.md

@@ -26,7 +26,7 @@ An extrude plane.
 |----------|------|-------------|----------|
 | `type` |enum: `extrudePlane`|  | No |
 | `faceId` |`string`| The face id for the extrude plane. | No |
-| `tag` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag. | No |
+| `tag` |[`TagNode`](/docs/kcl/types/TagNode)| The tag. | No |
 | `id` |`string`| The id of the geometry. | No |
 | `sourceRange` |`SourceRange`| The source range. | No |
 
@@ -46,7 +46,7 @@ An extruded arc.
 |----------|------|-------------|----------|
 | `type` |enum: `extrudeArc`|  | No |
 | `faceId` |`string`| The face id for the extrude plane. | No |
-| `tag` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag. | No |
+| `tag` |[`TagNode`](/docs/kcl/types/TagNode)| The tag. | No |
 | `id` |`string`| The id of the geometry. | No |
 | `sourceRange` |`SourceRange`| The source range. | No |
 
@@ -66,7 +66,7 @@ Geometry metadata.
 |----------|------|-------------|----------|
 | `type` |enum: `chamfer`|  | No |
 | `faceId` |`string`| The id for the chamfer surface. | No |
-| `tag` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag. | No |
+| `tag` |[`TagNode`](/docs/kcl/types/TagNode)| The tag. | No |
 | `id` |`string`| The id of the geometry. | No |
 | `sourceRange` |`SourceRange`| The source range. | No |
 
@@ -86,7 +86,7 @@ Geometry metadata.
 |----------|------|-------------|----------|
 | `type` |enum: `fillet`|  | No |
 | `faceId` |`string`| The id for the fillet surface. | No |
-| `tag` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag. | No |
+| `tag` |[`TagNode`](/docs/kcl/types/TagNode)| The tag. | No |
 | `id` |`string`| The id of the geometry. | No |
 | `sourceRange` |`SourceRange`| The source range. | No |
 

docs/kcl/types/FunctionExpression.md

@@ -16,9 +16,7 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `params` |`[` [`Parameter`](/docs/kcl/types/Parameter) `]`|  | No |
-| `body` |[`Program`](/docs/kcl/types/Program)|  | No |
+| `body` |[`UnboxedNode_for_Program`](/docs/kcl/types/UnboxedNode_for_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

@@ -17,7 +17,5 @@ layout: manual
 |----------|------|-------------|----------|
 | `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

@@ -15,10 +15,8 @@ layout: manual
 
 | 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 |
+| `name` |[`UnboxedNode_for_Identifier`](/docs/kcl/types/UnboxedNode_for_Identifier)| Name of the item to import. | No |
+| `alias` |[`UnboxedNode_for_Identifier`](/docs/kcl/types/UnboxedNode_for_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/KclValue.md

@@ -59,10 +59,9 @@ Any KCL value.
 | 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 |
+| `kind` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| Any KCL value. | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -183,7 +182,7 @@ Data for an imported geometry.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `Function`|  | No |
-| `expression` |[`FunctionExpression`](/docs/kcl/types/FunctionExpression)| Any KCL value. | No |
+| `expression` |[`UnboxedNode_for_FunctionExpression`](/docs/kcl/types/UnboxedNode_for_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

@@ -23,10 +23,9 @@ layout: manual
 | 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 |
+| `kind` |[`Identifier`](/docs/kcl/types/Identifier)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -41,12 +40,10 @@ layout: manual
 
 | 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` |enum: [`Literal`](/docs/kcl/types/Literal)|  | No |
+| `kind` |[`Literal`](/docs/kcl/types/Literal)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----

docs/kcl/types/MemberObject.md

@@ -22,13 +22,10 @@ layout: manual
 
 | 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` |enum: [`MemberExpression`](/docs/kcl/types/MemberExpression)|  | No |
+| `kind` |[`MemberExpression`](/docs/kcl/types/MemberExpression)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----
@@ -44,10 +41,9 @@ layout: manual
 | 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 |
+| `kind` |[`Identifier`](/docs/kcl/types/Identifier)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 
 
 ----

docs/kcl/types/NonCodeMeta.md

@@ -16,7 +16,7 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `nonCodeNodes` |`object`|  | No |
-| `startNodes` |`[` [`NonCodeNode`](/docs/kcl/types/NonCodeNode) `]`|  | No |
+| `start` |`[` [`UnboxedNode_for_NonCodeNode`](/docs/kcl/types/UnboxedNode_for_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

@@ -17,7 +17,5 @@ layout: manual
 |----------|------|-------------|----------|
 | `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/ObjectProperty.md

@@ -15,10 +15,8 @@ layout: manual
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `key` |[`Identifier`](/docs/kcl/types/Identifier)|  | No |
+| `key` |[`UnboxedNode_for_Identifier`](/docs/kcl/types/UnboxedNode_for_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

@@ -16,7 +16,7 @@ Parameter of a KCL function.
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `identifier` |[`Identifier`](/docs/kcl/types/Identifier)| The parameter's label or name. | No |
+| `identifier` |[`UnboxedNode_for_Identifier`](/docs/kcl/types/UnboxedNode_for_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/Path.md

@@ -27,7 +27,7 @@ A path that goes to a point.
 | `type` |enum: `ToPoint`|  | No |
 | `from` |`[number, number]`| The from point. | No |
 | `to` |`[number, number]`| The to point. | No |
-| `tag` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag of the path. | No |
+| `tag` |[`TagNode`](/docs/kcl/types/TagNode)| The tag of the path. | No |
 | `__geoMeta` |[`GeoMeta`](/docs/kcl/types/GeoMeta)| Metadata. | No |
 
 
@@ -49,7 +49,7 @@ A arc that is tangential to the last path segment that goes to a point
 | `ccw` |`boolean`| arc's direction | No |
 | `from` |`[number, number]`| The from point. | No |
 | `to` |`[number, number]`| The to point. | No |
-| `tag` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag of the path. | No |
+| `tag` |[`TagNode`](/docs/kcl/types/TagNode)| The tag of the path. | No |
 | `__geoMeta` |[`GeoMeta`](/docs/kcl/types/GeoMeta)| Metadata. | No |
 
 
@@ -71,7 +71,7 @@ A arc that is tangential to the last path segment
 | `ccw` |`boolean`| arc's direction | No |
 | `from` |`[number, number]`| The from point. | No |
 | `to` |`[number, number]`| The to point. | No |
-| `tag` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag of the path. | No |
+| `tag` |[`TagNode`](/docs/kcl/types/TagNode)| The tag of the path. | No |
 | `__geoMeta` |[`GeoMeta`](/docs/kcl/types/GeoMeta)| Metadata. | No |
 
 
@@ -94,7 +94,7 @@ a complete arc
 | `ccw` |`boolean`| arc's direction | No |
 | `from` |`[number, number]`| The from point. | No |
 | `to` |`[number, number]`| The to point. | No |
-| `tag` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag of the path. | No |
+| `tag` |[`TagNode`](/docs/kcl/types/TagNode)| The tag of the path. | No |
 | `__geoMeta` |[`GeoMeta`](/docs/kcl/types/GeoMeta)| Metadata. | No |
 
 
@@ -115,7 +115,7 @@ A path that is horizontal.
 | `x` |`number`| The x coordinate. | No |
 | `from` |`[number, number]`| The from point. | No |
 | `to` |`[number, number]`| The to point. | No |
-| `tag` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag of the path. | No |
+| `tag` |[`TagNode`](/docs/kcl/types/TagNode)| The tag of the path. | No |
 | `__geoMeta` |[`GeoMeta`](/docs/kcl/types/GeoMeta)| Metadata. | No |
 
 
@@ -137,7 +137,7 @@ An angled line to.
 | `y` |`number`| The y coordinate. | No |
 | `from` |`[number, number]`| The from point. | No |
 | `to` |`[number, number]`| The to point. | No |
-| `tag` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag of the path. | No |
+| `tag` |[`TagNode`](/docs/kcl/types/TagNode)| The tag of the path. | No |
 | `__geoMeta` |[`GeoMeta`](/docs/kcl/types/GeoMeta)| Metadata. | No |
 
 
@@ -157,29 +157,7 @@ A base path.
 | `type` |enum: `Base`|  | No |
 | `from` |`[number, number]`| The from point. | No |
 | `to` |`[number, number]`| The to point. | No |
-| `tag` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag of the path. | No |
-| `__geoMeta` |[`GeoMeta`](/docs/kcl/types/GeoMeta)| Metadata. | No |
-
-
-----
-A circular arc, not necessarily tangential to the current point.
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `Arc`|  | No |
-| `center` |`[number, number]`| Center of the circle that this arc is drawn on. | No |
-| `radius` |`number`| Radius of the circle that this arc is drawn on. | No |
-| `from` |`[number, number]`| The from point. | No |
-| `to` |`[number, number]`| The to point. | No |
-| `tag` |[`TagDeclarator`](/docs/kcl/types#tag-declaration)| The tag of the path. | No |
+| `tag` |[`TagNode`](/docs/kcl/types/TagNode)| The tag of the path. | No |
 | `__geoMeta` |[`GeoMeta`](/docs/kcl/types/GeoMeta)| Metadata. | No |
 
 

docs/kcl/types/PolygonData.md

@@ -1,24 +0,0 @@
----
-title: "PolygonData"
-excerpt: "Data for drawing a polygon"
-layout: manual
----
-
-Data for drawing a polygon
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `radius` |`number`| The radius of the polygon | No |
-| `numSides` |`integer`| The number of sides in the polygon | No |
-| `center` |`[number, number]`| The center point of the polygon | No |
-| `inscribed` |`boolean`| Whether the polygon is inscribed (true) or circumscribed (false) about a circle with the specified radius | No |
-
-

docs/kcl/types/Program.md

@@ -17,9 +17,7 @@ A KCL program top level, or function body.
 | 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 |
+| `nonCodeMeta` |[`UnboxedNode_for_NonCodeMeta`](/docs/kcl/types/UnboxedNode_for_NonCodeMeta)| A KCL program top level, or function body. | 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/ProgramMemory.md

@@ -16,7 +16,7 @@ layout: manual
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `environments` |`[` [`Environment`](/docs/kcl/types/Environment) `]`|  | No |
-| `currentEnv` |`integer`|  | No |
+| `currentEnv` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `return` |[`KclValue`](/docs/kcl/types/KclValue)|  | No |
 
 

docs/kcl/types/Sketch.md

@@ -16,8 +16,8 @@ A sketch is a collection of paths.
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `id` |`string`| The id of the sketch (this will change when the engine's reference to it changes). | No |
-| `paths` |`[` [`Path`](/docs/kcl/types/Path) `]`| The paths in the sketch. | No |
+| `id` |`string`| The id of the sketch (this will change when the engine's reference to it changes. | No |
+| `value` |`[` [`Path`](/docs/kcl/types/Path) `]`| The paths in the sketch. | No |
 | `on` |[`SketchSurface`](/docs/kcl/types/SketchSurface)| What the sketch is on (can be a plane or a face). | No |
 | `start` |[`BasePath`](/docs/kcl/types/BasePath)| The starting path. | No |
 | `tags` |`object`| Tag identifiers that have been declared in this sketch. | No |

docs/kcl/types/SketchSet.md

@@ -25,8 +25,8 @@ A sketch is a collection of paths.
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
 | `type` |enum: `sketch`|  | No |
-| `id` |`string`| The id of the sketch (this will change when the engine's reference to it changes). | No |
-| `paths` |`[` [`Path`](/docs/kcl/types/Path) `]`| The paths in the sketch. | No |
+| `id` |`string`| The id of the sketch (this will change when the engine's reference to it changes. | No |
+| `value` |`[` [`Path`](/docs/kcl/types/Path) `]`| The paths in the sketch. | No |
 | `on` |[`SketchSurface`](/docs/kcl/types/SketchSurface)| What the sketch is on (can be a plane or a face). | No |
 | `start` |[`BasePath`](/docs/kcl/types/BasePath)| The starting path. | No |
 | `tags` |`object`| Tag identifiers that have been declared in this sketch. | No |

docs/kcl/types/TagEngineInfo.md

@@ -18,7 +18,7 @@ Engine information for a tag.
 |----------|------|-------------|----------|
 | `id` |`string`| The id of the tagged object. | No |
 | `sketch` |`string`| The sketch the tag is on. | No |
-| `path` |[`Path`](/docs/kcl/types/Path)| The path the tag is on. | No |
+| `path` |[`BasePath`](/docs/kcl/types/BasePath)| The path the tag is on. | No |
 | `surface` |[`ExtrudeSurface`](/docs/kcl/types/ExtrudeSurface)| The surface information for the tag. | No |
 
 

docs/kcl/types/VariableDeclarator.md

@@ -15,10 +15,10 @@ layout: manual
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
 | `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/xLine.md

@@ -9,7 +9,7 @@ Draw a line relative to the current origin to a specified distance away
 from the current position along the 'x' axis.
 
 ```js
-xLine(length: number, sketch: Sketch, tag?: TagDeclarator) -> Sketch
+xLine(length: number, sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ xLine(length: number, sketch: Sketch, tag?: TagDeclarator) -> Sketch
 |----------|------|-------------|----------|
 | `length` | `number` |  | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/xLineTo.md

@@ -9,7 +9,7 @@ Draw a line parallel to the X axis, that ends at the given X.
 E.g. if the previous line ended at (1, 1), then xLineTo(4) draws a line from (1, 1) to (4, 1)
 
 ```js
-xLineTo(to: number, sketch: Sketch, tag?: TagDeclarator) -> Sketch
+xLineTo(to: number, sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ xLineTo(to: number, sketch: Sketch, tag?: TagDeclarator) -> Sketch
 |----------|------|-------------|----------|
 | `to` | `number` |  | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/yLine.md

@@ -9,7 +9,7 @@ Draw a line relative to the current origin to a specified distance away
 from the current position along the 'y' axis.
 
 ```js
-yLine(length: number, sketch: Sketch, tag?: TagDeclarator) -> Sketch
+yLine(length: number, sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ yLine(length: number, sketch: Sketch, tag?: TagDeclarator) -> Sketch
 |----------|------|-------------|----------|
 | `length` | `number` |  | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

docs/kcl/yLineTo.md

@@ -9,7 +9,7 @@ Draw a line parallel to the Y axis, that ends at the given Y.
 E.g. if the previous line ended at (1, 1), then yLineTo(4) draws a line from (1, 1) to (1, 4)
 
 ```js
-yLineTo(to: number, sketch: Sketch, tag?: TagDeclarator) -> Sketch
+yLineTo(to: number, sketch: Sketch, tag?: TagNode) -> Sketch
 ```
 
 
@@ -19,7 +19,7 @@ yLineTo(to: number, sketch: Sketch, tag?: TagDeclarator) -> Sketch
 |----------|------|-------------|----------|
 | `to` | `number` |  | Yes |
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagNode`](/docs/kcl/types/TagNode) |  | No |
 
 ### Returns
 

e2e/playwright/basic-sketch.spec.ts

@@ -86,7 +86,7 @@ async function doBasicSketch(page: Page, openPanes: string[]) {
   |> startProfileAt(${commonPoints.startAt}, %)
   |> line([${commonPoints.num1}, 0], %)
   |> line([0, ${commonPoints.num1 + 0.01}], %)
-  |> lineTo([0, ${commonPoints.num3}], %)`)
+  |> line([-${commonPoints.num2}, 0], %)`)
   }
 
   // deselect line tool

e2e/playwright/editor-tests.spec.ts

@@ -632,18 +632,16 @@ test.describe('Editor tests', () => {
 
       await u.waitForAuthSkipAppStart()
 
+      // this test might be brittle as we add and remove functions
+      // but should also be easy to update.
       // tests clicking on an option, selection the first option
       // and arrowing down to an option
 
       await u.codeLocator.click()
       await page.keyboard.type('sketch001 = start')
 
-      // expect there to be some auto complete options
-      // exact number depends on the KCL stdlib, so let's just check it's > 0 for now.
-      await expect(async () => {
-        const children = await page.locator('.cm-completionLabel').count()
-        expect(children).toBeGreaterThan(0)
-      }).toPass()
+      // expect there to be six auto complete options
+      await expect(page.locator('.cm-completionLabel')).toHaveCount(8)
       // this makes sure we can accept a completion with click
       await page.getByText('startSketchOn').click()
       await page.keyboard.type("'XZ'")
@@ -987,7 +985,7 @@ test.describe('Editor tests', () => {
     |> extrude(5, %)`)
   })
 
-  test.fixme(
+  test(
     `Can use the import stdlib function on a local OBJ file`,
     { tag: '@electron' },
     async ({ browserName }, testInfo) => {

e2e/playwright/file-tree.spec.ts

@@ -3,7 +3,6 @@ import { test, expect } from './fixtures/fixtureSetup'
 import * as fsp from 'fs/promises'
 import * as fs from 'fs'
 import {
-  createProject,
   executorInputPath,
   getUtils,
   setup,
@@ -26,6 +25,10 @@ test.describe('integrations tests', () => {
     'Creating a new file or switching file while in sketchMode should exit sketchMode',
     { tag: '@electron' },
     async ({ tronApp, homePage, scene, editor, toolbar }) => {
+      test.skip(
+        process.platform === 'win32',
+        'windows times out will waiting for the execution indicator?'
+      )
       await tronApp.initialise({
         fixtures: { homePage, scene, editor, toolbar },
         folderSetupFn: async (dir) => {
@@ -51,6 +54,7 @@ test.describe('integrations tests', () => {
           sortBy: 'last-modified-desc',
         })
         await homePage.openProject('test-sample')
+        // windows times out here, hence the skip above
         await scene.waitForExecutionDone()
       })
       await test.step('enter sketch mode', async () => {
@@ -66,13 +70,10 @@ test.describe('integrations tests', () => {
         await toolbar.editSketch()
         await expect(toolbar.exitSketchBtn).toBeVisible()
       })
-
-      const fileName = 'Untitled.kcl'
       await test.step('check sketch mode is exited when creating new file', async () => {
         await toolbar.fileTreeBtn.click()
         await toolbar.expectFileTreeState(['main.kcl'])
-
-        await toolbar.createFile({ fileName, waitForToastToDisappear: true })
+        await toolbar.createFile({ wait: true })
 
         // check we're out of sketch mode
         await expect(toolbar.exitSketchBtn).not.toBeVisible()
@@ -91,10 +92,10 @@ test.describe('integrations tests', () => {
         })
         await toolbar.editSketch()
         await expect(toolbar.exitSketchBtn).toBeVisible()
-        await toolbar.expectFileTreeState(['main.kcl', fileName])
+        await toolbar.expectFileTreeState(['main.kcl', 'Untitled.kcl'])
       })
       await test.step('check sketch mode is exited when opening a different file', async () => {
-        await toolbar.openFile(fileName, { wait: false })
+        await toolbar.openFile('untitled.kcl', { wait: false })
 
         // check we're out of sketch mode
         await expect(toolbar.exitSketchBtn).not.toBeVisible()
@@ -107,21 +108,26 @@ test.describe('when using the file tree to', () => {
   const fromFile = 'main.kcl'
   const toFile = 'hello.kcl'
 
-  test.fixme(
+  test(
     `rename ${fromFile} to ${toFile}, and doesn't crash on reload and settings load`,
     { tag: '@electron' },
     async ({ browser: _, tronApp }, testInfo) => {
       await tronApp.initialise()
 
-      const { panesOpen, pasteCodeInEditor, renameFile, editorTextMatches } =
-        await getUtils(tronApp.page, test)
+      const {
+        panesOpen,
+        createAndSelectProject,
+        pasteCodeInEditor,
+        renameFile,
+        editorTextMatches,
+      } = await getUtils(tronApp.page, test)
 
       await tronApp.page.setViewportSize({ width: 1200, height: 500 })
       tronApp.page.on('console', console.log)
 
       await panesOpen(['files', 'code'])
 
-      await createProject({ name: 'project-000', page: tronApp.page })
+      await createAndSelectProject('project-000')
 
       // File the main.kcl with contents
       const kclCube = await fsp.readFile(
@@ -130,9 +136,6 @@ test.describe('when using the file tree to', () => {
       )
       await pasteCodeInEditor(kclCube)
 
-      // TODO: We have a timeout of 1s between edits to write to disk. If you reload the page too quickly it won't write to disk.
-      await tronApp.page.waitForTimeout(2000)
-
       await renameFile(fromFile, toFile)
       await tronApp.page.reload()
 
@@ -155,20 +158,21 @@ test.describe('when using the file tree to', () => {
     }
   )
 
-  test.fixme(
+  test(
     `create many new untitled files they increment their names`,
     { tag: '@electron' },
     async ({ browser: _, tronApp }, testInfo) => {
       await tronApp.initialise()
 
-      const { panesOpen, createNewFile } = await getUtils(tronApp.page, test)
+      const { panesOpen, createAndSelectProject, createNewFile } =
+        await getUtils(tronApp.page, test)
 
       await tronApp.page.setViewportSize({ width: 1200, height: 500 })
       tronApp.page.on('console', console.log)
 
       await panesOpen(['files'])
 
-      await createProject({ name: 'project-000', page: tronApp.page })
+      await createAndSelectProject('project-000')
 
       await createNewFile('')
       await createNewFile('')
@@ -191,74 +195,57 @@ test.describe('when using the file tree to', () => {
   test(
     'create a new file with the same name as an existing file cancels the operation',
     { tag: '@electron' },
-    async (
-      { browser: _, tronApp, homePage, scene, editor, toolbar },
-      testInfo
-    ) => {
-      const projectName = 'cube'
-      const mainFile = 'main.kcl'
-      const secondFile = 'cylinder.kcl'
-      const kclCube = await fsp.readFile(executorInputPath('cube.kcl'), 'utf-8')
-      const kclCylinder = await fsp.readFile(
-        executorInputPath('cylinder.kcl'),
-        'utf-8'
-      )
-      await tronApp.initialise({
-        fixtures: { homePage, scene, editor, toolbar },
-        folderSetupFn: async (dir) => {
-          const cubeDir = join(dir, projectName)
-          await fsp.mkdir(cubeDir, { recursive: true })
-          await fsp.copyFile(
-            executorInputPath('cube.kcl'),
-            join(cubeDir, mainFile)
-          )
-          await fsp.copyFile(
-            executorInputPath('cylinder.kcl'),
-            join(cubeDir, secondFile)
-          )
-        },
-      })
+    async ({ browser: _, tronApp }, testInfo) => {
+      await tronApp.initialise()
 
       const {
+        openKclCodePanel,
         openFilePanel,
+        createAndSelectProject,
+        pasteCodeInEditor,
+        createNewFileAndSelect,
         renameFile,
         selectFile,
         editorTextMatches,
-        waitForPageLoad,
       } = await getUtils(tronApp.page, _test)
 
-      await test.step(`Setup: Open project and navigate to ${secondFile}`, async () => {
-        await homePage.expectState({
-          projectCards: [
-            {
-              title: projectName,
-              fileCount: 2,
-              folderCount: 2, // TODO: This is a pre-existing bug, there are no folders within the project
-            },
-          ],
-          sortBy: 'last-modified-desc',
-        })
-        await homePage.openProject(projectName)
-        await waitForPageLoad()
-        await openFilePanel()
-        await selectFile(secondFile)
-      })
+      await tronApp.page.setViewportSize({ width: 1200, height: 500 })
+      tronApp.page.on('console', console.log)
 
-      await test.step(`Attempt to rename ${secondFile} to ${mainFile}`, async () => {
-        await renameFile(secondFile, mainFile)
-      })
+      await createAndSelectProject('project-000')
+      await openKclCodePanel()
+      await openFilePanel()
+      // File the main.kcl with contents
+      const kclCube = await fsp.readFile(
+        'src/wasm-lib/tests/executor/inputs/cube.kcl',
+        'utf-8'
+      )
+      await pasteCodeInEditor(kclCube)
 
-      await test.step(`Postcondition: ${mainFile} still has the original content`, async () => {
-        await selectFile(mainFile)
+      const kcl1 = 'main.kcl'
+      const kcl2 = '2.kcl'
+
+      await createNewFileAndSelect(kcl2)
+      const kclCylinder = await fsp.readFile(
+        'src/wasm-lib/tests/executor/inputs/cylinder.kcl',
+        'utf-8'
+      )
+      await pasteCodeInEditor(kclCylinder)
+
+      await renameFile(kcl2, kcl1)
+
+      await test.step(`Postcondition: ${kcl1} still has the original content`, async () => {
+        await selectFile(kcl1)
         await editorTextMatches(kclCube)
       })
+      await tronApp.page.waitForTimeout(500)
 
-      await test.step(`Postcondition: ${secondFile} still exists with the original content`, async () => {
-        await selectFile(secondFile)
+      await test.step(`Postcondition: ${kcl2} still exists with the original content`, async () => {
+        await selectFile(kcl2)
         await editorTextMatches(kclCylinder)
       })
 
-      await tronApp.close()
+      await tronApp?.close?.()
     }
   )
 
@@ -268,15 +255,20 @@ test.describe('when using the file tree to', () => {
     async ({ browser: _, tronApp }, testInfo) => {
       await tronApp.initialise()
 
-      const { panesOpen, pasteCodeInEditor, deleteFile, editorTextMatches } =
-        await getUtils(tronApp.page, _test)
+      const {
+        panesOpen,
+        createAndSelectProject,
+        pasteCodeInEditor,
+        deleteFile,
+        editorTextMatches,
+      } = await getUtils(tronApp.page, _test)
 
       await tronApp.page.setViewportSize({ width: 1200, height: 500 })
       tronApp.page.on('console', console.log)
 
       await panesOpen(['files', 'code'])
 
-      await createProject({ name: 'project-000', page: tronApp.page })
+      await createAndSelectProject('project-000')
       // File the main.kcl with contents
       const kclCube = await fsp.readFile(
         'src/wasm-lib/tests/executor/inputs/cube.kcl',
@@ -284,11 +276,11 @@ test.describe('when using the file tree to', () => {
       )
       await pasteCodeInEditor(kclCube)
 
-      const mainFile = 'main.kcl'
+      const kcl1 = 'main.kcl'
 
-      await deleteFile(mainFile)
+      await deleteFile(kcl1)
 
-      await test.step(`Postcondition: ${mainFile} is recreated but has no content`, async () => {
+      await test.step(`Postcondition: ${kcl1} is recreated but has no content`, async () => {
         await editorTextMatches('')
       })
 
@@ -296,7 +288,7 @@ test.describe('when using the file tree to', () => {
     }
   )
 
-  test.fixme(
+  test(
     'loading small file, then large, then back to small',
     {
       tag: '@electron',
@@ -306,6 +298,7 @@ test.describe('when using the file tree to', () => {
 
       const {
         panesOpen,
+        createAndSelectProject,
         pasteCodeInEditor,
         createNewFile,
         openDebugPanel,
@@ -317,7 +310,7 @@ test.describe('when using the file tree to', () => {
       tronApp.page.on('console', console.log)
 
       await panesOpen(['files', 'code'])
-      await createProject({ name: 'project-000', page: tronApp.page })
+      await createAndSelectProject('project-000')
 
       // Create a small file
       const kclCube = await fsp.readFile(
@@ -721,7 +714,7 @@ _test.describe('Renaming in the file tree', () => {
       })
 
       await _test.step('Rename the folder', async () => {
-        await page.waitForTimeout(1000)
+        await page.waitForTimeout(60000)
         await folderToRename.click({ button: 'right' })
         await _expect(renameMenuItem).toBeVisible()
         await renameMenuItem.click()

e2e/playwright/fixtures/editorFixture.ts

@@ -1,11 +1,6 @@
 import type { Page, Locator } from '@playwright/test'
 import { expect } from '@playwright/test'
-import {
-  closePane,
-  checkIfPaneIsOpen,
-  openPane,
-  sansWhitespace,
-} from '../test-utils'
+import { sansWhitespace } from '../test-utils'
 
 interface EditorState {
   activeLines: Array<string>
@@ -16,7 +11,6 @@ interface EditorState {
 export class EditorFixture {
   public page: Page
 
-  private paneButtonTestId = 'code-pane-button'
   private diagnosticsTooltip!: Locator
   private diagnosticsGutterIcon!: Locator
   private codeContent!: Locator
@@ -37,32 +31,19 @@ export class EditorFixture {
 
   private _expectEditorToContain =
     (not = false) =>
-    async (
+    (
       code: string,
       {
         shouldNormalise = false,
         timeout = 5_000,
       }: { shouldNormalise?: boolean; timeout?: number } = {}
     ) => {
-      const wasPaneOpen = await this.checkIfPaneIsOpen()
-      if (!wasPaneOpen) {
-        await this.openPane()
-      }
-      const resetPane = async () => {
-        if (!wasPaneOpen) {
-          await this.closePane()
-        }
-      }
       if (!shouldNormalise) {
         const expectStart = expect(this.codeContent)
         if (not) {
-          const result = await expectStart.not.toContainText(code, { timeout })
-          await resetPane()
-          return result
+          return expectStart.not.toContainText(code, { timeout })
         }
-        const result = await expectStart.toContainText(code, { timeout })
-        await resetPane()
-        return result
+        return expectStart.toContainText(code, { timeout })
       }
       const normalisedCode = code.replaceAll(/\s+/g, '').trim()
       const expectStart = expect.poll(
@@ -75,13 +56,9 @@ export class EditorFixture {
         }
       )
       if (not) {
-        const result = await expectStart.not.toContain(normalisedCode)
-        await resetPane()
-        return result
+        return expectStart.not.toContain(normalisedCode)
       }
-      const result = await expectStart.toContain(normalisedCode)
-      await resetPane()
-      return result
+      return expectStart.toContain(normalisedCode)
     }
   expectEditor = {
     toContain: this._expectEditorToContain(),
@@ -138,13 +115,4 @@ export class EditorFixture {
     code = code.replace(findCode, replaceCode)
     await this.codeContent.fill(code)
   }
-  checkIfPaneIsOpen() {
-    return checkIfPaneIsOpen(this.page, this.paneButtonTestId)
-  }
-  closePane() {
-    return closePane(this.page, this.paneButtonTestId)
-  }
-  openPane() {
-    return openPane(this.page, this.paneButtonTestId)
-  }
 }

e2e/playwright/fixtures/fixtureSetup.ts

@@ -20,7 +20,6 @@ export class AuthenticatedApp {
   public readonly page: Page
   public readonly context: BrowserContext
   public readonly testInfo: TestInfo
-  public readonly viewPortSize = { width: 1000, height: 500 }
 
   constructor(context: BrowserContext, page: Page, testInfo: TestInfo) {
     this.page = page
@@ -37,7 +36,7 @@ export class AuthenticatedApp {
       ;(window as any).playwrightSkipFilePicker = true
     }, code)
 
-    await this.page.setViewportSize(this.viewPortSize)
+    await this.page.setViewportSize({ width: 1000, height: 500 })
 
     await u.waitForAuthSkipAppStart()
   }

e2e/playwright/fixtures/sceneFixture.ts

@@ -10,13 +10,7 @@ import {
 } from '../test-utils'
 
 type mouseParams = {
-  pixelDiff?: number
-}
-type mouseDragToParams = mouseParams & {
-  fromPoint: { x: number; y: number }
-}
-type mouseDragFromParams = mouseParams & {
-  toPoint: { x: number; y: number }
+  pixelDiff: number
 }
 
 type SceneSerialised = {
@@ -26,13 +20,6 @@ type SceneSerialised = {
   }
 }
 
-type ClickHandler = (clickParams?: mouseParams) => Promise<void | boolean>
-type MoveHandler = (moveParams?: mouseParams) => Promise<void | boolean>
-type DragToHandler = (dragParams: mouseDragToParams) => Promise<void | boolean>
-type DragFromHandler = (
-  dragParams: mouseDragFromParams
-) => Promise<void | boolean>
-
 export class SceneFixture {
   public page: Page
 
@@ -68,7 +55,7 @@ export class SceneFixture {
     x: number,
     y: number,
     { steps }: { steps: number } = { steps: 20 }
-  ): [ClickHandler, MoveHandler] =>
+  ) =>
     [
       (clickParams?: mouseParams) => {
         if (clickParams?.pixelDiff) {
@@ -91,47 +78,6 @@ export class SceneFixture {
         return this.page.mouse.move(x, y, { steps })
       },
     ] as const
-  makeDragHelpers = (
-    x: number,
-    y: number,
-    { steps }: { steps: number } = { steps: 20 }
-  ): [DragToHandler, DragFromHandler] =>
-    [
-      (dragToParams: mouseDragToParams) => {
-        if (dragToParams?.pixelDiff) {
-          return doAndWaitForImageDiff(
-            this.page,
-            () =>
-              this.page.dragAndDrop('#stream', '#stream', {
-                sourcePosition: dragToParams.fromPoint,
-                targetPosition: { x, y },
-              }),
-            dragToParams.pixelDiff
-          )
-        }
-        return this.page.dragAndDrop('#stream', '#stream', {
-          sourcePosition: dragToParams.fromPoint,
-          targetPosition: { x, y },
-        })
-      },
-      (dragFromParams: mouseDragFromParams) => {
-        if (dragFromParams?.pixelDiff) {
-          return doAndWaitForImageDiff(
-            this.page,
-            () =>
-              this.page.dragAndDrop('#stream', '#stream', {
-                sourcePosition: { x, y },
-                targetPosition: dragFromParams.toPoint,
-              }),
-            dragFromParams.pixelDiff
-          )
-        }
-        return this.page.dragAndDrop('#stream', '#stream', {
-          sourcePosition: { x, y },
-          targetPosition: dragFromParams.toPoint,
-        })
-      },
-    ] as const
 
   /** Likely no where, there's a chance it will click something in the scene, depending what you have in the scene.
    *
@@ -195,7 +141,7 @@ export class SceneFixture {
   }
 
   waitForExecutionDone = async () => {
-    await expect(this.exeIndicator).toBeVisible({ timeout: 30000 })
+    await expect(this.exeIndicator).toBeVisible()
   }
 
   expectPixelColor = async (

e2e/playwright/fixtures/toolbarFixture.ts

@@ -7,7 +7,6 @@ export class ToolbarFixture {
 
   extrudeButton!: Locator
   startSketchBtn!: Locator
-  lineBtn!: Locator
   rectangleBtn!: Locator
   exitSketchBtn!: Locator
   editSketchBtn!: Locator
@@ -16,7 +15,6 @@ export class ToolbarFixture {
   fileCreateToast!: Locator
   filePane!: Locator
   exeIndicator!: Locator
-  treeInputField!: Locator
 
   constructor(page: Page) {
     this.page = page
@@ -26,13 +24,11 @@ export class ToolbarFixture {
     this.page = page
     this.extrudeButton = page.getByTestId('extrude')
     this.startSketchBtn = page.getByTestId('sketch')
-    this.lineBtn = page.getByTestId('line')
     this.rectangleBtn = page.getByTestId('corner-rectangle')
     this.exitSketchBtn = page.getByTestId('sketch-exit')
     this.editSketchBtn = page.getByText('Edit Sketch')
     this.fileTreeBtn = page.locator('[id="files-button-holder"]')
     this.createFileBtn = page.getByTestId('create-file-button')
-    this.treeInputField = page.getByTestId('tree-input-field')
 
     this.filePane = page.locator('#files-pane')
     this.fileCreateToast = page.getByText('Successfully created')
@@ -61,15 +57,10 @@ export class ToolbarFixture {
   expectFileTreeState = async (expected: string[]) => {
     await expect.poll(this._serialiseFileTree).toEqual(expected)
   }
-  createFile = async (args: {
-    fileName: string
-    waitForToastToDisappear: boolean
-  }) => {
+  createFile = async ({ wait }: { wait: boolean } = { wait: false }) => {
     await this.createFileBtn.click()
-    await this.treeInputField.fill(args.fileName)
-    await this.treeInputField.press('Enter')
     await expect(this.fileCreateToast).toBeVisible()
-    if (args.waitForToastToDisappear) {
+    if (wait) {
       await this.fileCreateToast.waitFor({ state: 'detached' })
     }
   }

e2e/playwright/lib/console-error-whitelist.ts

@@ -18,7 +18,7 @@ export const isErrorWhitelisted = (exception: Error) => {
     {
       name: '"{"kind"',
       message:
-        '"engine","sourceRanges":[[0,0,0]],"msg":"Failed to get string from response from engine: `JsValue(undefined)`"}"',
+        '"engine","sourceRanges":[[0,0]],"msg":"Failed to get string from response from engine: `JsValue(undefined)`"}"',
       stack: '',
       foundInSpec: 'e2e/playwright/testing-settings.spec.ts',
       project: 'Google Chrome',
@@ -156,8 +156,8 @@ export const isErrorWhitelisted = (exception: Error) => {
     {
       name: 'Unhandled Promise Rejection',
       message:
-        '{"kind":"engine","sourceRanges":[[0,0,0]],"msg":"Failed to get string from response from engine: `JsValue(undefined)`"}',
-      stack: `Unhandled Promise Rejection: {"kind":"engine","sourceRanges":[[0,0,0]],"msg":"Failed to get string from response from engine: \`JsValue(undefined)\`"}
+        '{"kind":"engine","sourceRanges":[[0,0]],"msg":"Failed to get string from response from engine: `JsValue(undefined)`"}',
+      stack: `Unhandled Promise Rejection: {"kind":"engine","sourceRanges":[[0,0]],"msg":"Failed to get string from response from engine: \`JsValue(undefined)\`"}
     at unknown (http://localhost:3000/src/lang/std/engineConnection.ts:1245:26)`,
       foundInSpec:
         'e2e/playwright/onboarding-tests.spec.ts Click through each onboarding step',
@@ -253,7 +253,7 @@ export const isErrorWhitelisted = (exception: Error) => {
     {
       name: '{"kind"',
       stack: ``,
-      message: `engine","sourceRanges":[[0,0,0]],"msg":"Failed to wait for promise from engine: JsValue(\\"Force interrupt, executionIsStale, new AST requested\\")"}`,
+      message: `engine","sourceRanges":[[0,0]],"msg":"Failed to wait for promise from engine: JsValue(\\"Force interrupt, executionIsStale, new AST requested\\")"}`,
       project: 'Google Chrome',
       foundInSpec: 'e2e/playwright/testing-settings.spec.ts',
     },

e2e/playwright/onboarding-tests.spec.ts

@@ -7,7 +7,6 @@ import {
   setupElectron,
   tearDown,
   executorInputPath,
-  createProject,
 } from './test-utils'
 import { bracket } from 'lib/exampleKcl'
 import { onboardingPaths } from 'routes/Onboarding/paths'
@@ -56,48 +55,6 @@ test.describe('Onboarding tests', () => {
     await expect(page.locator('.cm-content')).toContainText('// Shelf Bracket')
   })
 
-  test(
-    'Desktop: fresh onboarding executes and loads',
-    { tag: '@electron' },
-    async ({ browserName: _ }, testInfo) => {
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        appSettings: {
-          app: {
-            onboardingStatus: 'incomplete',
-          },
-        },
-        cleanProjectDir: true,
-      })
-
-      const u = await getUtils(page)
-
-      const viewportSize = { width: 1200, height: 500 }
-      await page.setViewportSize(viewportSize)
-
-      await test.step(`Create a project and open to the onboarding`, async () => {
-        await createProject({ name: 'project-link', page })
-        await test.step(`Ensure the engine connection works by testing the sketch button`, async () => {
-          await u.waitForPageLoad()
-        })
-      })
-
-      await test.step(`Ensure we see the onboarding stuff`, async () => {
-        // Test that the onboarding pane loaded
-        await expect(
-          page.getByText('Welcome to Modeling App! This')
-        ).toBeVisible()
-
-        // *and* that the code is shown in the editor
-        await expect(page.locator('.cm-content')).toContainText(
-          '// Shelf Bracket'
-        )
-      })
-
-      await electronApp.close()
-    }
-  )
-
   test('Code resets after confirmation', async ({ page }) => {
     const initialCode = `sketch001 = startSketchOn('XZ')`
 
@@ -421,9 +378,7 @@ test(
     const restartConfirmationButton = page.getByRole('button', {
       name: 'Make a new project',
     })
-    const tutorialProjectIndicator = page
-      .getByTestId('project-sidebar-toggle')
-      .filter({ hasText: 'Tutorial Project 00' })
+    const tutorialProjectIndicator = page.getByText('Tutorial Project 00')
     const tutorialModalText = page.getByText('Welcome to Modeling App!')
     const tutorialDismissButton = page.getByRole('button', { name: 'Dismiss' })
     const userMenuButton = page.getByTestId('user-sidebar-toggle')

e2e/playwright/point-click.spec.ts

@@ -451,103 +451,3 @@ sketch002 = startSketchOn(extrude001, seg03)
     }
   )
 })
-
-test(`Verify axis and origin snapping`, async ({
-  app,
-  editor,
-  toolbar,
-  scene,
-}) => {
-  // Constants and locators
-  // These are mappings from screenspace to KCL coordinates,
-  // until we merge in our coordinate system helpers
-  const xzPlane = [
-    app.viewPortSize.width * 0.65,
-    app.viewPortSize.height * 0.3,
-  ] as const
-  const originSloppy = {
-    screen: [
-      app.viewPortSize.width / 2 + 3, // 3px off the center of the screen
-      app.viewPortSize.height / 2,
-    ],
-    kcl: [0, 0],
-  } as const
-  const xAxisSloppy = {
-    screen: [
-      app.viewPortSize.width * 0.75,
-      app.viewPortSize.height / 2 - 3, // 3px off the X-axis
-    ],
-    kcl: [16.95, 0],
-  } as const
-  const offYAxis = {
-    screen: [
-      app.viewPortSize.width * 0.6, // Well off the Y-axis, out of snapping range
-      app.viewPortSize.height * 0.3,
-    ],
-    kcl: [6.78, 6.78],
-  } as const
-  const yAxisSloppy = {
-    screen: [
-      app.viewPortSize.width / 2 + 5, // 5px off the Y-axis
-      app.viewPortSize.height * 0.3,
-    ],
-    kcl: [0, 6.78],
-  } as const
-  const [clickOnXzPlane, moveToXzPlane] = scene.makeMouseHelpers(...xzPlane)
-  const [clickOriginSloppy] = scene.makeMouseHelpers(...originSloppy.screen)
-  const [clickXAxisSloppy, moveXAxisSloppy] = scene.makeMouseHelpers(
-    ...xAxisSloppy.screen
-  )
-  const [dragToOffYAxis, dragFromOffAxis] = scene.makeDragHelpers(
-    ...offYAxis.screen
-  )
-
-  const expectedCodeSnippets = {
-    sketchOnXzPlane: `sketch001 = startSketchOn('XZ')`,
-    pointAtOrigin: `startProfileAt([${originSloppy.kcl[0]}, ${originSloppy.kcl[1]}], %)`,
-    segmentOnXAxis: `lineTo([${xAxisSloppy.kcl[0]}, ${xAxisSloppy.kcl[1]}], %)`,
-    afterSegmentDraggedOffYAxis: `startProfileAt([${offYAxis.kcl[0]}, ${offYAxis.kcl[1]}], %)`,
-    afterSegmentDraggedOnYAxis: `startProfileAt([${yAxisSloppy.kcl[0]}, ${yAxisSloppy.kcl[1]}], %)`,
-  }
-
-  await app.initialise()
-
-  await test.step(`Start a sketch on the XZ plane`, async () => {
-    await editor.closePane()
-    await toolbar.startSketchPlaneSelection()
-    await moveToXzPlane()
-    await clickOnXzPlane()
-    // timeout wait for engine animation is unavoidable
-    await app.page.waitForTimeout(600)
-    await editor.expectEditor.toContain(expectedCodeSnippets.sketchOnXzPlane)
-  })
-  await test.step(`Place a point a few pixels off the middle, verify it still snaps to 0,0`, async () => {
-    await clickOriginSloppy()
-    await editor.expectEditor.toContain(expectedCodeSnippets.pointAtOrigin)
-  })
-  await test.step(`Add a segment on x-axis after moving the mouse a bit, verify it snaps`, async () => {
-    await moveXAxisSloppy()
-    await clickXAxisSloppy()
-    await editor.expectEditor.toContain(expectedCodeSnippets.segmentOnXAxis)
-  })
-  await test.step(`Unequip line tool`, async () => {
-    await toolbar.lineBtn.click()
-    await expect(toolbar.lineBtn).not.toHaveAttribute('aria-pressed', 'true')
-  })
-  await test.step(`Drag the origin point up and to the right, verify it's past snapping`, async () => {
-    await dragToOffYAxis({
-      fromPoint: { x: originSloppy.screen[0], y: originSloppy.screen[1] },
-    })
-    await editor.expectEditor.toContain(
-      expectedCodeSnippets.afterSegmentDraggedOffYAxis
-    )
-  })
-  await test.step(`Drag the origin point left to the y-axis, verify it snaps back`, async () => {
-    await dragFromOffAxis({
-      toPoint: { x: yAxisSloppy.screen[0], y: yAxisSloppy.screen[1] },
-    })
-    await editor.expectEditor.toContain(
-      expectedCodeSnippets.afterSegmentDraggedOnYAxis
-    )
-  })
-})

e2e/playwright/projects.spec.ts

@@ -7,7 +7,7 @@ import {
   Paths,
   setupElectron,
   tearDown,
-  createProject,
+  createProjectAndRenameIt,
 } from './test-utils'
 import fsp from 'fs/promises'
 import fs from 'fs'
@@ -503,261 +503,21 @@ test(
   }
 )
 
-test.describe(`Project management commands`, () => {
-  test(
-    `Rename from project page`,
-    { tag: '@electron' },
-    async ({ browserName }, testInfo) => {
-      const projectName = `my_project_to_rename`
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        folderSetupFn: async (dir) => {
-          await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
-          await fsp.copyFile(
-            'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
-            `${dir}/${projectName}/main.kcl`
-          )
-        },
-      })
-      const u = await getUtils(page)
-
-      // Constants and locators
-      const projectHomeLink = page.getByTestId('project-link')
-      const commandButton = page.getByRole('button', { name: 'Commands' })
-      const commandOption = page.getByRole('option', { name: 'rename project' })
-      const projectNameOption = page.getByRole('option', { name: projectName })
-      const projectRenamedName = `project-000`
-      // const projectMenuButton = page.getByTestId('project-sidebar-toggle')
-      const commandContinueButton = page.getByRole('button', {
-        name: 'Continue',
-      })
-      const commandSubmitButton = page.getByRole('button', {
-        name: 'Submit command',
-      })
-      const toastMessage = page.getByText(`Successfully renamed`)
-
-      await test.step(`Setup`, async () => {
-        await page.setViewportSize({ width: 1200, height: 500 })
-        page.on('console', console.log)
-
-        await projectHomeLink.click()
-        await u.waitForPageLoad()
-      })
-
-      await test.step(`Run rename command via command palette`, async () => {
-        await commandButton.click()
-        await commandOption.click()
-        await projectNameOption.click()
-
-        await expect(commandContinueButton).toBeVisible()
-        await commandContinueButton.click()
-
-        await expect(commandSubmitButton).toBeVisible()
-        await commandSubmitButton.click()
-
-        await expect(toastMessage).toBeVisible()
-      })
-
-      // TODO: in future I'd like the behavior to be to
-      // navigate to the new project's page directly,
-      // see ProjectContextProvider.tsx:158
-      await test.step(`Check the project was renamed and we navigated home`, async () => {
-        await expect(projectHomeLink.first()).toBeVisible()
-        await expect(projectHomeLink.first()).toContainText(projectRenamedName)
-      })
-
-      await electronApp.close()
-    }
-  )
-
-  test(
-    `Delete from project page`,
-    { tag: '@electron' },
-    async ({ browserName: _ }, testInfo) => {
-      const projectName = `my_project_to_delete`
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        folderSetupFn: async (dir) => {
-          await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
-          await fsp.copyFile(
-            'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
-            `${dir}/${projectName}/main.kcl`
-          )
-        },
-      })
-      const u = await getUtils(page)
-
-      // Constants and locators
-      const projectHomeLink = page.getByTestId('project-link')
-      const commandButton = page.getByRole('button', { name: 'Commands' })
-      const commandOption = page.getByRole('option', { name: 'delete project' })
-      const projectNameOption = page.getByRole('option', { name: projectName })
-      const commandWarning = page.getByText('Are you sure you want to delete?')
-      const commandSubmitButton = page.getByRole('button', {
-        name: 'Submit command',
-      })
-      const toastMessage = page.getByText(`Successfully deleted`)
-      const noProjectsMessage = page.getByText('No Projects found')
-
-      await test.step(`Setup`, async () => {
-        await page.setViewportSize({ width: 1200, height: 500 })
-        page.on('console', console.log)
-
-        await projectHomeLink.click()
-        await u.waitForPageLoad()
-      })
-
-      await test.step(`Run delete command via command palette`, async () => {
-        await commandButton.click()
-        await commandOption.click()
-        await projectNameOption.click()
-
-        await expect(commandWarning).toBeVisible()
-        await expect(commandSubmitButton).toBeVisible()
-        await commandSubmitButton.click()
-
-        await expect(toastMessage).toBeVisible()
-      })
-
-      await test.step(`Check the project was deleted and we navigated home`, async () => {
-        await expect(noProjectsMessage).toBeVisible()
-      })
-
-      await electronApp.close()
-    }
-  )
-  test(
-    `Rename from home page`,
-    { tag: '@electron' },
-    async ({ browserName: _ }, testInfo) => {
-      const projectName = `my_project_to_rename`
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        folderSetupFn: async (dir) => {
-          await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
-          await fsp.copyFile(
-            'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
-            `${dir}/${projectName}/main.kcl`
-          )
-        },
-      })
-
-      // Constants and locators
-      const projectHomeLink = page.getByTestId('project-link')
-      const commandButton = page.getByRole('button', { name: 'Commands' })
-      const commandOption = page.getByRole('option', { name: 'rename project' })
-      const projectNameOption = page.getByRole('option', { name: projectName })
-      const projectRenamedName = `project-000`
-      const commandContinueButton = page.getByRole('button', {
-        name: 'Continue',
-      })
-      const commandSubmitButton = page.getByRole('button', {
-        name: 'Submit command',
-      })
-      const toastMessage = page.getByText(`Successfully renamed`)
-
-      await test.step(`Setup`, async () => {
-        await page.setViewportSize({ width: 1200, height: 500 })
-        page.on('console', console.log)
-        await expect(projectHomeLink).toBeVisible()
-      })
-
-      await test.step(`Run rename command via command palette`, async () => {
-        await commandButton.click()
-        await commandOption.click()
-        await projectNameOption.click()
-
-        await expect(commandContinueButton).toBeVisible()
-        await commandContinueButton.click()
-
-        await expect(commandSubmitButton).toBeVisible()
-        await commandSubmitButton.click()
-
-        await expect(toastMessage).toBeVisible()
-      })
-
-      await test.step(`Check the project was renamed`, async () => {
-        await expect(
-          page.getByRole('link', { name: projectRenamedName })
-        ).toBeVisible()
-        await expect(projectHomeLink).not.toHaveText(projectName)
-      })
-
-      await electronApp.close()
-    }
-  )
-  test(
-    `Delete from home page`,
-    { tag: '@electron' },
-    async ({ browserName: _ }, testInfo) => {
-      const projectName = `my_project_to_delete`
-      const { electronApp, page } = await setupElectron({
-        testInfo,
-        folderSetupFn: async (dir) => {
-          await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
-          await fsp.copyFile(
-            'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
-            `${dir}/${projectName}/main.kcl`
-          )
-        },
-      })
-
-      // Constants and locators
-      const projectHomeLink = page.getByTestId('project-link')
-      const commandButton = page.getByRole('button', { name: 'Commands' })
-      const commandOption = page.getByRole('option', { name: 'delete project' })
-      const projectNameOption = page.getByRole('option', { name: projectName })
-      const commandWarning = page.getByText('Are you sure you want to delete?')
-      const commandSubmitButton = page.getByRole('button', {
-        name: 'Submit command',
-      })
-      const toastMessage = page.getByText(`Successfully deleted`)
-      const noProjectsMessage = page.getByText('No Projects found')
-
-      await test.step(`Setup`, async () => {
-        await page.setViewportSize({ width: 1200, height: 500 })
-        page.on('console', console.log)
-        await expect(projectHomeLink).toBeVisible()
-      })
-
-      await test.step(`Run delete command via command palette`, async () => {
-        await commandButton.click()
-        await commandOption.click()
-        await projectNameOption.click()
-
-        await expect(commandWarning).toBeVisible()
-        await expect(commandSubmitButton).toBeVisible()
-        await commandSubmitButton.click()
-
-        await expect(toastMessage).toBeVisible()
-      })
-
-      await test.step(`Check the project was deleted`, async () => {
-        await expect(projectHomeLink).not.toBeVisible()
-        await expect(noProjectsMessage).toBeVisible()
-      })
-
-      await electronApp.close()
-    }
-  )
-})
-
 test(
   'File in the file pane should open with a single click',
   { tag: '@electron' },
   async ({ browserName }, testInfo) => {
-    const projectName = 'router-template-slate'
     const { electronApp, page } = await setupElectron({
       testInfo,
       folderSetupFn: async (dir) => {
-        await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
+        await fsp.mkdir(`${dir}/router-template-slate`, { recursive: true })
         await fsp.copyFile(
           'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
-          `${dir}/${projectName}/main.kcl`
+          `${dir}/router-template-slate/main.kcl`
         )
         await fsp.copyFile(
           'src/wasm-lib/tests/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
-          `${dir}/${projectName}/otherThingToClickOn.kcl`
+          `${dir}/router-template-slate/otherThingToClickOn.kcl`
         )
       },
     })
@@ -766,7 +526,7 @@ test(
 
     page.on('console', console.log)
 
-    await page.getByText(projectName).click()
+    await page.getByText('router-template-slate').click()
     await expect(page.getByTestId('loading')).toBeAttached()
     await expect(page.getByTestId('loading')).not.toBeAttached({
       timeout: 20_000,
@@ -854,7 +614,7 @@ test(
   }
 )
 
-test.fixme(
+test(
   'Deleting projects, can delete individual project, can still create projects after deleting all',
   { tag: '@electron' },
   async ({ browserName }, testInfo) => {
@@ -883,7 +643,7 @@ test.fixme(
     page.on('console', console.log)
 
     await test.step('delete the middle project, i.e. the bracket project', async () => {
-      const project = page.getByTestId('project-link').getByText('bracket')
+      const project = page.getByText('bracket')
 
       await project.hover()
       await project.focus()
@@ -927,10 +687,10 @@ test.fixme(
     })
 
     await test.step('Check we can still create a project', async () => {
-      await createProject({ name: 'project-000', page, returnHome: true })
-      await expect(
-        page.getByTestId('project-link').filter({ hasText: 'project-000' })
-      ).toBeVisible()
+      await page.getByRole('button', { name: 'New project' }).click()
+      await expect(page.getByText('Successfully created')).toBeVisible()
+      await expect(page.getByText('Successfully created')).not.toBeVisible()
+      await expect(page.getByText('project-000')).toBeVisible()
     })
 
     await electronApp.close()
@@ -1107,16 +867,17 @@ test.fixme(
     const pointOnModel = { x: 660, y: 250 }
     const expectedStartCamZPosition = 15633.47
 
-    // Constants and locators
-    const projectLinks = page.getByTestId('project-link')
-
     // expect to see text "No Projects found"
     await expect(page.getByText('No Projects found')).toBeVisible()
 
-    await createProject({ name: 'project-000', page, returnHome: true })
-    await expect(projectLinks.getByText('project-000')).toBeVisible()
+    await page.getByRole('button', { name: 'New project' }).click()
 
-    await projectLinks.getByText('project-000').click()
+    await expect(page.getByText('Successfully created')).toBeVisible()
+    await expect(page.getByText('Successfully created')).not.toBeVisible()
+
+    await expect(page.getByText('project-000')).toBeVisible()
+
+    await page.getByText('project-000').click()
 
     await u.waitForPageLoad()
 
@@ -1175,10 +936,16 @@ extrude001 = extrude(200, sketch001)`)
       page.getByRole('button', { name: 'New project' })
     ).toBeVisible()
 
+    const createProject = async (projectNum: number) => {
+      await page.getByRole('button', { name: 'New project' }).click()
+      await expect(page.getByText('Successfully created')).toBeVisible()
+      await expect(page.getByText('Successfully created')).not.toBeVisible()
+
+      const projectNumStr = projectNum.toString().padStart(3, '0')
+      await expect(page.getByText(`project-${projectNumStr}`)).toBeVisible()
+    }
     for (let i = 1; i <= 10; i++) {
-      const name = `project-${i.toString().padStart(3, '0')}`
-      await createProject({ name, page, returnHome: true })
-      await expect(projectLinks.getByText(name)).toBeVisible()
+      await createProject(i)
     }
     await electronApp.close()
   }
@@ -1353,10 +1120,11 @@ test(
       await page.getByTestId('settings-close-button').click()
 
       await expect(page.getByText('No Projects found')).toBeVisible()
-      await createProject({ name: 'project-000', page, returnHome: true })
-      await expect(
-        page.getByTestId('project-link').filter({ hasText: 'project-000' })
-      ).toBeVisible()
+      await page.getByRole('button', { name: 'New project' }).click()
+      await expect(page.getByText('Successfully created')).toBeVisible()
+      await expect(page.getByText('Successfully created')).not.toBeVisible()
+
+      await expect(page.getByText(`project-000`)).toBeVisible()
     })
 
     await test.step('We can change back to the original root project directory', async () => {
@@ -1490,13 +1258,13 @@ test(
           'function_sketch.kcl',
           'function_sketch_with_position.kcl',
           'global-tags.kcl',
+          'helix_ccw.kcl',
           'helix_defaults.kcl',
           'helix_defaults_negative_extrude.kcl',
           'helix_with_length.kcl',
           'i_shape.kcl',
           'kittycad_svg.kcl',
           'lego.kcl',
-          'lsystem.kcl',
           'math.kcl',
           'member_expression_sketch.kcl',
           'mike_stress_test.kcl',
@@ -1669,8 +1437,7 @@ test(
   }
 )
 
-// Flaky
-test.fixme(
+test(
   'Original project name persist after onboarding',
   { tag: '@electron' },
   async ({ browserName }, testInfo) => {
@@ -1683,7 +1450,7 @@ test.fixme(
     page.on('console', console.log)
 
     await test.step('Should create and name a project called wrist brace', async () => {
-      await createProject({ name: 'wrist brace', page, returnHome: true })
+      await createProjectAndRenameIt({ name: 'wrist brace', page })
     })
 
     await test.step('Should go through onboarding', async () => {

e2e/playwright/sketch-tests.spec.ts

@@ -637,6 +637,7 @@ test.describe('Sketch tests', () => {
     |> revolve({ axis: "X" }, %)`)
   })
   test('Can add multiple sketches', async ({ page }) => {
+    test.skip(process.platform === 'darwin', 'Can add multiple sketches')
     const u = await getUtils(page)
     const viewportSize = { width: 1200, height: 500 }
     await page.setViewportSize(viewportSize)
@@ -674,16 +675,15 @@ test.describe('Sketch tests', () => {
 
     await click00r(50, 0)
     await page.waitForTimeout(100)
-    codeStr += `  |> lineTo(${toSU([50, 0])}, %)`
+    codeStr += `  |> line(${toSU([50, 0])}, %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
     await click00r(0, 50)
     codeStr += `  |> line(${toSU([0, 50])}, %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
-    let clickCoords = await click00r(-50, 0)
-    expect(clickCoords).not.toBeUndefined()
-    codeStr += `  |> lineTo(${toSU(clickCoords!)}, %)`
+    await click00r(-50, 0)
+    codeStr += `  |> line(${toSU([-50, 0])}, %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
     // exit the sketch, reset relative clicker
@@ -709,10 +709,8 @@ test.describe('Sketch tests', () => {
     codeStr += `  |> startProfileAt([2.03, 0], %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
-    // TODO: I couldn't use `toSU` here because of some rounding error causing
-    // it to be off by 0.01
     await click00r(30, 0)
-    codeStr += `  |> lineTo([4.07, 0], %)`
+    codeStr += `  |> line([2.04, 0], %)`
     await expect(u.codeLocator).toHaveText(codeStr)
 
     await click00r(0, 30)

e2e/playwright/snapshot-tests.spec.ts

@@ -1031,7 +1031,7 @@ test.describe('Grid visibility', { tag: '@snapshot' }, () => {
   })
 })
 
-test.fixme('theme persists', async ({ page, context }) => {
+test('theme persists', async ({ page, context }) => {
   const u = await getUtils(page)
   await context.addInitScript(async () => {
     localStorage.setItem(