Iterate over binary ops (instead of recursing)

.codespellrc

@@ -1,3 +1,3 @@
 [codespell]
 ignore-words-list: crate,everytime,inout,co-ordinate,ot,nwo,atleast,ue,afterall,ser,fromM,FromM
-skip: **/target,node_modules,build,dist,./out,**/Cargo.lock,./docs/kcl/*.md,.package-lock.json,**/package-lock.json,./openapi/*.json,./packages/codemirror-lang-kcl/test/all.test.ts,./public/kcl-samples,./rust/kcl-lib/tests/kcl_samples,tsconfig.tsbuildinfo,./src/lib/machine-api.d.ts
+skip: **/target,node_modules,build,dist,./out,**/Cargo.lock,./docs/kcl/*.md,.yarn.lock,**/yarn.lock,./openapi/*.json,./packages/codemirror-lang-kcl/test/all.test.ts,./public/kcl-samples,./rust/kcl-lib/tests/kcl_samples,tsconfig.tsbuildinfo

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

@@ -7,11 +7,11 @@ if [[ ! -f "test-results/.last-run.json" ]]; then
     # If no last run artifact, than run Playwright normally
     echo "run playwright normally"
     if [[ "$3" == *ubuntu* ]]; then
-        xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test:playwright:electron:ubuntu -- --shard=$1/$2 || true
+        xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu -- --shard=$1/$2 || true
     elif [[ "$3" == *windows* ]]; then
-        npm run test:playwright:electron:windows -- --shard=$1/$2 || true
+        yarn test:playwright:electron:windows -- --shard=$1/$2 || true
     elif [[ "$3" == *macos* ]]; then
-        npm run test:playwright:electron:macos  -- --shard=$1/$2 || true
+        yarn test:playwright:electron:macos  -- --shard=$1/$2 || true
     else
         echo "Do not run Playwright. Unable to detect os runtime."
         exit 1
@@ -31,11 +31,11 @@ while [[ $retry -le $max_retries ]]; do
             echo "retried=true" >>$GITHUB_OUTPUT
             echo "run playwright with last failed tests and retry $retry"
             if [[ "$3" == *ubuntu* ]]; then
-                xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- npm run test:playwright:electron:ubuntu -- --last-failed || true
+                xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu -- --last-failed || true
             elif [[ "$3" == *windows* ]]; then
-                npm run test:playwright:electron:windows -- --last-failed || true
+                yarn test:playwright:electron:windows -- --last-failed || true
             elif [[ "$3" == *macos* ]]; then
-                npm run test:playwright:electron:macos -- --last-failed || true
+                yarn test:playwright:electron:macos -- --last-failed || true
             else
                 echo "Do not run playwright. Unable to detect os runtime."
                 exit 1

.github/workflows/build-and-store-wasm.yml

@@ -13,9 +13,9 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'npm'
+          cache: 'yarn'
       - name: Install dependencies
-        run: npm install
+        run: yarn
       - name: Use correct Rust toolchain
         shell: bash
         run: |
@@ -32,7 +32,7 @@ jobs:
         with:
           workspaces: rust
       - name: build wasm
-        run: npm run build:wasm
+        run: yarn build:wasm
 
 
       # Upload the WASM bundle as an artifact

.github/workflows/build-apps.yml

@@ -29,9 +29,9 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'npm'
+          cache: 'yarn'
 
-      - run: npm install
+      - run: yarn install
 
       - id: filter
         name: Check for Rust changes
@@ -90,20 +90,20 @@ jobs:
 
       - name: Run build:wasm
         if: ${{ steps.wasm.outputs.should-build-wasm == 'true' }}
-        run: "npm run build:wasm"
+        run: "yarn build:wasm"
 
       - name: Set nightly version, product name, release notes, and icons
         if: ${{ env.IS_NIGHTLY == 'true' }}
         run: |
           export VERSION=${GITHUB_REF_NAME#nightly-v}
-          npm run files:set-version
+          yarn files:set-version
-          npm run files:flip-to-nightly
+          yarn files:flip-to-nightly
 
       - name: Set release version
         if: ${{ env.IS_RELEASE == 'true' }}
         run: |
           export VERSION=${GITHUB_REF_NAME#v}
-          npm run files:set-version
+          yarn files:set-version
 
       - uses: actions/upload-artifact@v4
         with:
@@ -172,16 +172,16 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'npm' # Set this to npm, npm or pnpm.
+          cache: 'yarn' # Set this to npm, yarn or pnpm.
 
-      - name: npm install
+      - name: yarn install
         # Windows is picky sometimes and fails on fetch. Step takes about ~30s
         uses: nick-fields/retry@v3.0.2
         with:
           shell: bash
           timeout_minutes: 2
           max_attempts: 3
-          command: npm install
+          command: yarn install
 
       - name: Prepare certificate and variables (Windows only)
         if: ${{ (env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true') && matrix.os == 'windows-2022' }}
@@ -207,20 +207,13 @@ jobs:
           smctl.exe keypair ls
           C:\Windows\System32\certutil.exe -csp "DigiCert Signing Manager KSP" -key -user
           smksp_cert_sync.exe
-          smctl windows certsync
-        # This last line `smctl windows certsync` was added after windows codesign failures started happening
-        # with nightly-v25.4.10. It looks like `smksp_cert_sync.exe` used to do the sync to the local cert store,
-        # but stopped doing it overnight. This extra call that I randomly got from this azure-related doc page
-        # https://docs.digicert.com/en/digicert-keylocker/code-signing/sign-with-third-party-signing-tools/windows-applications/sign-azure-apps-with-signtool-using-ksp-library.html#sync-certificates--windows-only--618365
-        # seems to be doing that extra sync that we need for scripts/sign-win.js to work.
-        # TODO: we still need to make sign-win.js errors fail the workflow, see issue #6276
         shell: cmd
 
       - name: Build the app (debug)
         if: ${{ env.IS_RELEASE == 'false' && env.IS_NIGHTLY == 'false' }}
         # electron-builder doesn't have a concept of release vs debug,
         # this is just not doing any codesign or release yml generation, and points to dev infra
-        run: npm run tronb:package:dev
+        run: yarn tronb:package:dev
 
       - name: Build the app (release)
         if: ${{ env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true' }}
@@ -240,7 +233,7 @@ jobs:
           shell: bash
           timeout_minutes: 10
           max_attempts: 3
-          command: npm run tronb:package:prod
+          command: yarn tronb:package:prod
 
       - name: List artifacts in out/
         run: ls -R out
@@ -302,7 +295,7 @@ jobs:
           shell: bash
           timeout_minutes: 10
           max_attempts: 3
-          command: npm run tronb:package:prod
+          command: yarn tronb:package:prod
 
       - uses: actions/upload-artifact@v4
         if: ${{ env.IS_RELEASE == 'true' }}
@@ -385,7 +378,7 @@ jobs:
           NOTES: ${{ needs.prepare-files.outputs.notes }}
           PUB_DATE: ${{ github.event.repository.updated_at }}
           WEBSITE_DIR: ${{ env.IS_NIGHTLY == 'true' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }}
-          URL_CODED_NAME: ${{ env.IS_NIGHTLY == 'true' && 'Zoo%20Design%20Studio%20%28Nightly%29' || 'Zoo%20Design%20Studio' }}
+          URL_CODED_NAME: ${{ env.IS_NIGHTLY == 'true' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }}
         run: |
           RELEASE_DIR=https://${WEBSITE_DIR}
           jq --null-input \
@@ -442,7 +435,7 @@ jobs:
           export TAG="nightly-${VERSION}"
           export PREVIOUS_TAG=$(git tag --list --sort=-committerdate "nightly-v[0-9]*" | head -n2 | tail -n1)
           export NOTES=$(./scripts/get-nightly-changelog.sh)
-          npm run files:set-notes
+          yarn files:set-notes
 
       - name: Authenticate to Google Cloud
         if: ${{ env.IS_NIGHTLY == 'true' }}
@@ -467,4 +460,4 @@ jobs:
 
       - name: Invalidate bucket cache on latest*.yml and last_download.json files
         if: ${{ env.IS_NIGHTLY == 'true' }}
-        run: npm run files:invalidate-bucket:nightly
+        run: yarn files:invalidate-bucket:nightly

.github/workflows/check-exampleKcl.yml

@@ -5,7 +5,6 @@ on:
     types: [opened, synchronize]
     paths:
       - 'src/lib/exampleKcl.ts'
-      - 'public/kcl-samples/bracket/main.kcl'
 
 permissions:
   contents: read
@@ -23,7 +22,7 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            const message = '`public/kcl-samples/bracket/main.kcl` or `src/lib/exampleKcl.ts` has been updated in this PR, please review and update the `src/routes/onboarding`, if needed.';
+            const message = '`src/lib/exampleKcl.ts` has been updated in this PR, please review and update the `src/routes/onboarding`, if needed.';
             const issue_number = context.payload.pull_request.number;
             const owner = context.repo.owner;
             const repo = context.repo.repo;

.github/workflows/codemirror-lang-kcl.yml

@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  npm-unit-test:
+  yarn-unit-test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -19,11 +19,14 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'npm'
+          cache: 'yarn'
 
-      - run: npm install
+      - run: yarn install
+        working-directory: packages/codemirror-lang-kcl
 
-      - run: npm run tsc --workspace=packages/codemirror-lang-kcl
+      - run: yarn tsc
+        working-directory: packages/codemirror-lang-kcl
 
       - name: run unit tests
-        run: npm run test --workspace=packages/codemirror-lang-kcl
+        run: yarn test
+        working-directory: packages/codemirror-lang-kcl

.github/workflows/e2e-tests.yml

@@ -97,11 +97,11 @@ jobs:
         if: needs.conditions.outputs.should-run == 'true'
         with:
           node-version-file: '.nvmrc'
-          cache: 'npm'
+          cache: 'yarn'
 
       - name: Install dependencies
         if: needs.conditions.outputs.should-run == 'true'
-        run: npm install
+        run: yarn
 
       - name: Download Wasm Cache
         id: download-wasm
@@ -154,7 +154,7 @@ jobs:
       - name: Build Wasm
         if: ${{ needs.conditions.outputs.should-run == 'true' && steps.wasm.outputs.should-build-wasm == 'true' }}
         shell: bash
-        run: npm run build:wasm
+        run: yarn build:wasm
 
       - uses: actions/upload-artifact@v4
         if: needs.conditions.outputs.should-run == 'true'
@@ -197,12 +197,12 @@ jobs:
         if: needs.conditions.outputs.should-run == 'true'
         with:
           node-version-file: '.nvmrc'
-          cache: 'npm'
+          cache: 'yarn'
 
       - name: Install dependencies
         id: deps-install
         if: needs.conditions.outputs.should-run == 'true'
-        run: npm install
+        run: yarn
 
       - name: Cache Playwright Browsers
         if: needs.conditions.outputs.should-run == 'true'
@@ -210,32 +210,27 @@ jobs:
         with:
           path: |
             ~/.cache/ms-playwright/
-          key: ${{ runner.os }}-playwright-${{ hashFiles('package-lock.json') }}
+          key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
 
       - name: Install Playwright Browsers
         if: needs.conditions.outputs.should-run == 'true'
-        run: npm run playwright install --with-deps
+        run: yarn playwright install --with-deps
 
       - name: build web
         if: needs.conditions.outputs.should-run == 'true'
-        run: npm run tronb:vite:dev
+        run: yarn tronb:vite:dev
 
       - name: Run ubuntu/chrome snapshots
         if: needs.conditions.outputs.should-run == 'true'
         uses: nick-fields/retry@v3.0.2
         with:
           shell: bash
-          command: npm run test:snapshots
+          command: yarn test:snapshots
           timeout_minutes: 30
           max_attempts: 3
         env:
           token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
           snapshottoken: ${{ secrets.KITTYCAD_API_TOKEN }}
-          TAB_API_URL: ${{ secrets.TAB_API_URL }}
-          TAB_API_KEY: ${{ secrets.TAB_API_KEY }}
-          CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
-          CI_PR_NUMBER: ${{ github.event.pull_request.number }}
-          TARGET: web
 
       - uses: actions/upload-artifact@v4
         if: ${{ needs.conditions.outputs.should-run == 'true' && !cancelled() && (success() || failure()) }}
@@ -321,12 +316,12 @@ jobs:
         if: needs.conditions.outputs.should-run == 'true'
         with:
           node-version-file: '.nvmrc'
-          cache: 'npm'
+          cache: 'yarn'
 
       - name: Install dependencies
         id: deps-install
         if: needs.conditions.outputs.should-run == 'true'
-        run: npm install
+        run: yarn
 
       - name: Cache Playwright Browsers
         if: needs.conditions.outputs.should-run == 'true'
@@ -334,15 +329,15 @@ jobs:
         with:
           path: |
             ~/.cache/ms-playwright/
-          key: ${{ runner.os }}-playwright-${{ hashFiles('package-lock.json') }}
+          key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
 
       - name: Install Playwright Browsers
         if: needs.conditions.outputs.should-run == 'true'
-        run: npm run playwright install --with-deps
+        run: yarn playwright install --with-deps
 
       - name: Build web
         if: needs.conditions.outputs.should-run == 'true'
-        run: npm run tronb:vite:dev
+        run: yarn tronb:vite:dev
 
       - name: Start Vector
         if: ${{ needs.conditions.outputs.should-run == 'true' && !contains(matrix.os, 'windows') }}
@@ -370,11 +365,6 @@ jobs:
         env:
           FAIL_ON_CONSOLE_ERRORS: true
           token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
-          TAB_API_URL: ${{ secrets.TAB_API_URL }}
-          TAB_API_KEY: ${{ secrets.TAB_API_KEY }}
-          CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
-          CI_PR_NUMBER: ${{ github.event.pull_request.number }}
-          TARGET: desktop
 
       - uses: actions/upload-artifact@v4
         if: ${{ needs.conditions.outputs.should-run == 'true' && always() }}

.github/workflows/generate-machine-api-types.yml

@@ -21,10 +21,10 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'npm'
+          cache: 'yarn'
-      - run: npm install
+      - run: yarn install
-      - run: npm run generate:machine-api
+      - run: yarn generate:machine-api
-      - run: npm run fmt || true
+      - run: yarn fmt
       - name: check for changes
         id: git-check
         run: |

.github/workflows/kcl-language-server.yml

@@ -56,19 +56,21 @@ jobs:
           node-version-file: ".nvmrc"
       - name: Install dependencies
         run: |
-          npm install
+          yarn install
+          cd rust/kcl-language-server
+          yarn install
       - name: Run tests
         run: |
           cd rust/kcl-language-server
-          npm run build
+          yarn build
-          npm run test-compile
+          yarn test-compile
           ls -la dist
-          xvfb-run -a npm run test
+          xvfb-run -a yarn test
         if: runner.os == 'Linux'
       - name: Run tests
         run: |
           cd rust/kcl-language-server
-          npm run test
+          yarn test
         if: runner.os != 'Linux'
   build-release:
     strategy:
@@ -181,20 +183,19 @@ jobs:
       - name: Install dependencies
         run: |
           cd rust/kcl-language-server
-          # npm will symlink which will cause issues w tarballing later
           yarn install
 
       - name: Package Extension (release)
         if: startsWith(github.event.ref, 'refs/tags/')
         run: |
           cd rust/kcl-language-server
-          npx vsce package --yarn -o "../build/kcl-language-server-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }}
+          npx vsce package -o "../build/kcl-language-server-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }}
 
       - name: Package Extension (nightly)
         if: startsWith(github.event.ref, 'refs/tags/') == false
         run: |
           cd rust/kcl-language-server
-          npx vsce package --yarn -o "../build/kcl-language-server-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }} --pre-release
+          npx vsce package -o "../build/kcl-language-server-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }} --pre-release
 
       - name: remove server
         if: matrix.target == 'x86_64-unknown-linux-gnu'
@@ -206,13 +207,13 @@ jobs:
         if: matrix.target == 'x86_64-unknown-linux-gnu' && startsWith(github.event.ref, 'refs/tags/')
         run: |
           cd rust/kcl-language-server
-          npx vsce package --yarn -o ../build/kcl-language-server-no-server.vsix
+          npx vsce package -o ../build/kcl-language-server-no-server.vsix
 
       - name: Package Extension (no server, nightly)
         if: matrix.target == 'x86_64-unknown-linux-gnu' && startsWith(github.event.ref, 'refs/tags/') == false
         run: |
           cd rust/kcl-language-server
-          npx vsce package --yarn -o ../build/kcl-language-server-no-server.vsix --pre-release
+          npx vsce package -o ../build/kcl-language-server-no-server.vsix --pre-release
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -243,8 +244,8 @@ jobs:
             lld \
             musl-dev \
             nodejs \
-            npm \
+            yarn \
-            yarn
+            npm
 
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -271,20 +272,19 @@ jobs:
       - name: Install dependencies
         run: |
           cd rust/kcl-language-server
-          # npm will symlink which will cause issues w tarballing later
           yarn install
 
       - name: Package Extension (release)
         if: startsWith(github.event.ref, 'refs/tags/')
         run: |
           cd rust/kcl-language-server
-          npx vsce package --yarn -o "../build/kcl-language-server-alpine-x64.vsix" --target alpine-x64
+          npx vsce package -o "../build/kcl-language-server-alpine-x64.vsix" --target alpine-x64
 
       - name: Package Extension (release)
         if: startsWith(github.event.ref, 'refs/tags/') == false
         run: |
           cd rust/kcl-language-server
-          npx vsce package --yarn -o "../build/kcl-language-server-alpine-x64.vsix" --target alpine-x64 --pre-release
+          npx vsce package -o "../build/kcl-language-server-alpine-x64.vsix" --target alpine-x64 --pre-release
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4

.github/workflows/nix.yml

@@ -1,55 +0,0 @@
-name: Test Nix Flake
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-jobs:
-  nix-flake-check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-
-      - name: nix flake check for all platforms
-        run: |
-          nix flake check --all-systems
-
-  nix-build-linux:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-
-      - name: nix build . for x86_64-linux
-        run: nix build .
-
-  nix-build-macos:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - uses: cachix/install-nix-action@v31
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-
-      - name: nix build . for x86_64-darwin
-        run: nix build .
-

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

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'npm'
+          cache: 'yarn'
 
       - name: Find tag workflow id
         id: tag_workflow_id
@@ -105,7 +105,7 @@ jobs:
       - name: Override release notes
         env:
           NOTES: ${{ github.event.release.body }}
-        run: npm run files:set-notes
+        run: yarn files:set-notes
 
       - name: Authenticate to Google Cloud
         uses: 'google-github-actions/auth@v2.1.8'
@@ -126,7 +126,7 @@ jobs:
           destination: 'dl.kittycad.io/releases/modeling-app'
 
       - name: Invalidate bucket cache on latest*.yml and last_download.json files
-        run: npm run files:invalidate-bucket
+        run: yarn files:invalidate-bucket
 
       - name: Upload release files to Github
         if: ${{ github.event_name == 'release' }}

.github/workflows/static-analysis.yml

@@ -16,18 +16,18 @@ permissions:
   actions: read
 
 jobs:
-  npm-fmt-check:
+  yarn-fmt-check:
     runs-on: 'ubuntu-22.04'
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'npm'
+          cache: 'yarn'
-      - run: npm install
+      - run: yarn install
-      - run: npm run fmt-check
+      - run: yarn fmt-check
 
-  npm-build-wasm:
+  yarn-build-wasm:
     # Build the wasm blob once on the fastest runner.
     runs-on: runs-on=${{ github.run_id }}/family=i7ie.2xlarge/image=ubuntu22-full-x64
     steps:
@@ -36,10 +36,10 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'npm'
+          cache: 'yarn'
 
       - name: Install dependencies
-        run: npm install
+        run: yarn install
 
       - name: Use correct Rust toolchain
         shell: bash
@@ -62,7 +62,7 @@ jobs:
 
       - name: Build Wasm
         shell: bash
-        run: npm run build:wasm
+        run: yarn build:wasm
 
       - uses: actions/upload-artifact@v4
         with:
@@ -76,17 +76,17 @@ jobs:
           path: |
             rust/kcl-lib/bindings/*
 
-  npm-tsc:
+  yarn-tsc:
     runs-on: ubuntu-latest
-    needs: npm-build-wasm
+    needs: yarn-build-wasm
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'npm'
+          cache: 'yarn'
-      - run: npm install
+      - run: yarn install
 
       - name: Download all artifacts
         uses: actions/download-artifact@v4
@@ -104,19 +104,19 @@ jobs:
           mkdir rust/kcl-lib/bindings
           cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
 
-      - run: npm run tsc
+      - run: yarn tsc
 
-  npm-lint:
+  yarn-lint:
     runs-on: ubuntu-latest
-    needs: npm-build-wasm
+    needs: yarn-build-wasm
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'npm'
+          cache: 'yarn'
-      - run: npm install
+      - run: yarn install
 
       - name: Download all artifacts
         uses: actions/download-artifact@v4
@@ -134,19 +134,19 @@ jobs:
           mkdir rust/kcl-lib/bindings
           cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
 
-      - run: npm run lint
+      - run: yarn lint
 
-  npm-circular-dependencies:
+  yarn-circular-dependencies:
     runs-on: ubuntu-latest
-    needs: npm-build-wasm
+    needs: yarn-build-wasm
 
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'npm'
+          cache: 'yarn'
-      - run: npm install
+      - run: yarn install
 
       - name: Download all artifacts
         uses: actions/download-artifact@v4
@@ -164,7 +164,7 @@ jobs:
           mkdir rust/kcl-lib/bindings
           cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
 
-      - run: npm run circular-deps:diff
+      - run: yarn circular-deps:diff
 
   python-codespell:
     runs-on: ubuntu-22.04
@@ -179,18 +179,18 @@ jobs:
       - name: Run codespell
         run: codespell --config .codespellrc # Edit this file to tweak the typo list and other configuration.
 
-  npm-unit-test-kcl-samples:
+  yarn-unit-test-kcl-samples:
     runs-on: ubuntu-latest
-    needs: npm-build-wasm
+    needs: yarn-build-wasm
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'npm'
+          cache: 'yarn'
 
-      - run: npm install
+      - run: yarn install
       - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
         with:
           tool: wasm-pack
@@ -211,31 +211,31 @@ jobs:
           mkdir rust/kcl-lib/bindings
           cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
 
-      - run: npm run simpleserver:bg
+      - 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: npm run playwright install chromium --with-deps
+        run: yarn playwright install chromium --with-deps
 
       - name: run unit tests for kcl samples
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: npm run test:unit:kcl-samples
+        run: yarn test:unit:kcl-samples
         env:
           VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
 
-  npm-unit-test:
+  yarn-unit-test:
     runs-on: ubuntu-latest
-    needs: npm-build-wasm
+    needs: yarn-build-wasm
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'npm'
+          cache: 'yarn'
 
-      - run: npm install
+      - run: yarn install
       - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
         with:
           tool: wasm-pack
@@ -256,16 +256,16 @@ jobs:
           mkdir rust/kcl-lib/bindings
           cp -r prepared-ts-rs-bindings/* rust/kcl-lib/bindings/
 
-      - run: npm run simpleserver:bg
+      - 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: npm run playwright install chromium --with-deps
+        run: yarn playwright install chromium --with-deps
 
       - name: Run unit tests
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: xvfb-run -a npm run test:unit
+        run: xvfb-run -a yarn test:unit
         env:
           VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
 

.github/workflows/tag-nightly.yml

@@ -27,7 +27,7 @@ jobs:
         with:
           node-version-file: '.nvmrc'
 
-      - run: npm install
+      - run: yarn install
 
       - name: Push tag
         run: |

.gitignore

@@ -26,12 +26,10 @@ yarn-error.log*
 .idea
 .vscode
 .helix
-result
 
 # rust
 rust/target
 rust/kcl-lib/bindings
-rust/kcl-language-server/server
 public/kcl_wasm_lib_bg.wasm
 rust/lcov.info
 rust/kcl-wasm-lib/pkg

.husky/pre-push

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-npm run fmt-check
+yarn fmt-check

.npmrc

@@ -1 +0,0 @@
-legacy-peer-deps=true

Makefile

@@ -5,38 +5,36 @@ all: install build check
 # INSTALL
 
 ifeq ($(OS),Windows_NT)
-export WINDOWS := true
+	CARGO ?= ~/.cargo/bin/cargo.exe
-ifndef MSYSTEM
+	WASM_PACK ?= ~/.cargo/bin/wasm-pack.exe
-export POWERSHELL := true
-endif
-endif
-
-ifdef WINDOWS
-CARGO ?= $(USERPROFILE)/.cargo/bin/cargo.exe
-WASM_PACK ?= $(USERPROFILE)/.cargo/bin/wasm-pack.exe
 else
-CARGO ?= ~/.cargo/bin/cargo
+	CARGO ?= ~/.cargo/bin/cargo
-WASM_PACK ?= ~/.cargo/bin/wasm-pack
+	WASM_PACK ?= ~/.cargo/bin/wasm-pack
 endif
 
 .PHONY: install
-install: node_modules/.package-lock.json $(CARGO) $(WASM_PACK) ## Install dependencies
+install: node_modules/.yarn-integrity $(CARGO) $(WASM_PACK) ## Install dependencies
 
-node_modules/.package-lock.json: package.json package-lock.json
+node_modules/.yarn-integrity: package.json yarn.lock
-	npm install
+	yarn install
+ifeq ($(OS),Windows_NT)
+	@ type nul > $@
+else
+	@ touch $@
+endif
 
 $(CARGO):
-ifdef WINDOWS
+ifeq ($(OS),Windows_NT)
-	npm run install:rust:windows
+	yarn install:rust:windows
 else
-	npm run install:rust
+	yarn install:rust
 endif
 
 $(WASM_PACK):
-ifdef WINDOWS
+ifeq ($(OS),Windows_NT)
-	npm run install:wasm-pack:cargo
+	yarn install:wasm-pack:cargo
 else
-	npm run install:wasm-pack:sh
+	yarn install:wasm-pack:sh
 endif
 
 ###############################################################################
@@ -59,17 +57,17 @@ build-web: install public/kcl_wasm_lib_bg.wasm build/index.html
 build-desktop: install public/kcl_wasm_lib_bg.wasm .vite/build/main.js
 
 public/kcl_wasm_lib_bg.wasm: $(CARGO_SOURCES) $(RUST_SOURCES)
-ifdef WINDOWS
+ifeq ($(OS),Windows_NT)
-	npm run build:wasm:dev:windows
+	yarn build:wasm:dev:windows
 else
-	npm run build:wasm:dev
+	yarn build:wasm:dev
 endif
 
 build/index.html: $(REACT_SOURCES) $(TYPESCRIPT_SOURCES) $(VITE_SOURCES)
-	npm run build:local
+	yarn build:local
 
 .vite/build/main.js: $(REACT_SOURCES) $(TYPESCRIPT_SOURCES) $(VITE_SOURCES)
-	npm run tronb:vite:dev
+	yarn tronb:vite:dev
 
 ###############################################################################
 # CHECK
@@ -79,12 +77,12 @@ check: format lint
 
 .PHONY: format
 format: install ## Format the code
-	npm run fmt
+	yarn fmt
 
 .PHONY: lint
 lint: install ## Lint the code
-	npm run tsc
+	yarn tsc
-	npm run lint
+	yarn lint
 
 ###############################################################################
 # RUN
@@ -96,11 +94,11 @@ run: run-$(TARGET)
 
 .PHONY: run-web
 run-web: install build-web ## Start the web app
-	npm run start
+	yarn start
 
 .PHONY: run-desktop
 run-desktop: install build-desktop ## Start the desktop app
-	npm run tron:start
+	yarn tron:start
 
 ###############################################################################
 # TEST
@@ -115,7 +113,7 @@ test: test-unit test-e2e
 .PHONY: test-unit
 test-unit: install ## Run the unit tests
 	@ curl -fs localhost:3000 >/dev/null || ( echo "Error: localhost:3000 not available, 'make run-web' first" && exit 1 )
-	npm run test:unit
+	yarn test:unit
 
 .PHONY: test-e2e
 test-e2e: test-e2e-$(TARGET)
@@ -124,17 +122,17 @@ test-e2e: test-e2e-$(TARGET)
 test-e2e-web: install build-web ## Run the web e2e tests
 	@ curl -fs localhost:3000 >/dev/null || ( echo "Error: localhost:3000 not available, 'make run-web' first" && exit 1 )
 ifdef E2E_GREP
-	npm run chrome:test -- --headed --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
+	yarn chrome:test --headed --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
 else
-	npm run chrome:test -- --headed --workers='100%'
+	yarn chrome:test --headed --workers='100%'
 endif
 
 .PHONY: test-e2e-desktop
 test-e2e-desktop: install build-desktop ## Run the desktop e2e tests
 ifdef E2E_GREP
-	npm run test:playwright:electron -- --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
+	yarn test:playwright:electron --grep="$(E2E_GREP)" --max-failures=$(E2E_FAILURES)
 else
-	npm run test:playwright:electron -- --workers='100%'
+	yarn test:playwright:electron --workers='100%'
 endif
 
 ###############################################################################
@@ -142,8 +140,8 @@ endif
 
 .PHONY: clean
 clean: ## Delete all artifacts
-ifdef POWERSHELL
+ifeq ($(OS),Windows_NT)
-	git clean --force -d -x --exclude=.env* --exclude=**/*.env
+	git clean --force -d -X
 else
 	rm -rf .vite/ build/
 	rm -rf trace.zip playwright-report/ test-results/
@@ -154,7 +152,7 @@ endif
 
 .PHONY: help
 help: install
-ifdef POWERSHELL
+ifeq ($(OS),Windows_NT)
 	@ powershell -Command "Get-Content $(MAKEFILE_LIST) | Select-String -Pattern '^[^\s]+:.*##\s.*$$' | ForEach-Object { $$line = $$_.Line -split ':.*?##\s+'; Write-Host -NoNewline $$line[0].PadRight(30) -ForegroundColor Cyan; Write-Host $$line[1] }"
 else
 	@ grep -E '^[^[:space:]]+:.*## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
@@ -169,5 +167,5 @@ endif
 # It should work for you other Linux users.
 lee-electron-test:
 	Xephyr -br -ac -noreset -screen 1200x500 :2 &
-	DISPLAY=:2 NODE_ENV=development PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ npm run tron:test -g "when using the file tree"
+	DISPLAY=:2 NODE_ENV=development PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn tron:test -g "when using the file tree"
 	killall Xephyr

README.md

@@ -62,39 +62,39 @@ fnm use
 Install the NPM dependencies with:
 
 ```
-npm install
+yarn install
 ```
 
 This project uses a lot of Rust compiled to [WASM](https://webassembly.org/) within it. We have package scripts to run rustup, see `package.json` for reference:
 
 ```
 # macOS/Linux
-npm run install:rust
+yarn install:rust
-npm run install:wasm-pack:sh
+yarn install:wasm-pack:sh
 
 # Windows
-npm run install:rust:windows
+yarn install:rust:windows
-npm run install:wasm-pack:cargo
+yarn install:wasm-pack:cargo
 ```
 
 Then to build the WASM layer, run:
 
 ```
 # macOS/Linux
-npm run build:wasm
+yarn build:wasm
 
 # Windows
-npm run build:wasm:windows
+yarn build:wasm:windows
 ```
 
-Or if you have the `gh` cli installed and want to download the latest main wasm bundle. Note that on Windows, you need to associate .ps1 files with PowerShell, which can be done via the right click menu, selecting `C:\Program Files\PowerShell\7\pwsh.exe`, and you can install tools like `gh` via `npm run install:tools:windows`.
+Or if you have the `gh` cli installed and want to download the latest main wasm bundle. Note that on Windows, you need to associate .ps1 files with PowerShell, which can be done via the right click menu, selecting `C:\Program Files\PowerShell\7\pwsh.exe`, and you can install tools like `gh` via `yarn install:tools:windows`.
 
 ```
 # macOS/Linux
-npm run fetch:wasm
+yarn fetch:wasm
 
 # Windows
-npm run fetch:wasm:windows
+yarn fetch:wasm:windows
 ```
 
 That will build the WASM binary and put in the `public` dir (though gitignored).
@@ -102,7 +102,7 @@ That will build the WASM binary and put in the `public` dir (though gitignored).
 Finally, to run the web app only, run:
 
 ```
-npm start
+yarn start
 ```
 
 If you're not a Zoo employee you won't be able to access the dev environment, you should copy everything from `.env.production` to `.env.development.local` to make it point to production instead, then when you navigate to `localhost:3000` the easiest way to sign in is to paste `localStorage.setItem('TOKEN_PERSIST_KEY', "your-token-from-https://zoo.dev/account/api-tokens")` replacing the with a real token from https://zoo.dev/account/api-tokens of course, then navigate to `localhost:3000` again. Note that navigating to `localhost:3000/signin` removes your token so you will need to set the token again.
@@ -122,17 +122,17 @@ Third-Party Cookies".
 
 ## Desktop
 
-To spin up the desktop app, `npm install` and `npm run build:wasm` need to have been done before hand then:
+To spin up the desktop app, `yarn install` and `yarn build:wasm` need to have been done before hand then:
 
 ```
-npm run tron:start
+yarn tron:start
 ```
 
 This will start the application and hot-reload on changes.
 
 Devtools can be opened with the usual Command-Option-I (macOS) or Ctrl-Shift-I (Linux and Windows).
 
-To package the app for your platform with electron-builder, run `npm run tronb:package:dev` (or `npm run tronb:package:prod` to point to the .env.production variables).
+To package the app for your platform with electron-builder, run `yarn tronb:package:dev` (or `yarn tronb:package:prod` to point to the .env.production variables).
 
 ## Checking out commits / Bisecting
 
@@ -141,9 +141,9 @@ Which commands from setup are one off vs. need to be run every time?
 The following will need to be run when checking out a new commit and guarantees the build is not stale:
 
 ```bash
-npm install
+yarn install
-npm run build:wasm
+yarn build:wasm
-npm start # or npm run build:local && npm run serve for slower but more production-like build
+yarn start # or yarn build:local && yarn serve for slower but more production-like build
 ```
 
 ## Before submitting a PR
@@ -153,10 +153,10 @@ Before you submit a contribution PR to this repo, please ensure that:
 - There is a corresponding issue for the changes you want to make, so that discussion of approach can be had before work begins.
 - You have separated out refactoring commits from feature commits as much as possible
 - You have run all of the following commands locally:
-  - `npm run fmt`
+  - `yarn fmt`
-  - `npm run tsc`
+  - `yarn tsc`
-  - `npm run test`
+  - `yarn test`
-  - Here they are all together: `npm run fmt && npm run tsc && npm run test`
+  - Here they are all together: `yarn fmt && yarn tsc && yarn test`
 
 ## Release a new version
 
@@ -266,7 +266,7 @@ docker run --network host  --rm --init -it playwright/chrome:playwright-x.xx.x
 and in another terminal, run:
 
 ```bash
-PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ npm run playwright test --project="Google Chrome" <test suite>
+PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project="Google Chrome" <test suite>
 ```
 
 #### Specific example
@@ -280,7 +280,7 @@ docker run --network host  --rm --init -it playwright/chrome:playwright-1.46.0
 and in another terminal, run:
 
 ```bash
-PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ npm run playwright test --project="Google Chrome" e2e/playwright/command-bar-tests.spec.ts
+PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project="Google Chrome" e2e/playwright/command-bar-tests.spec.ts
 ```
 
 run a specific test change the test from `test('...` to `test.only('...`
@@ -291,13 +291,13 @@ run a specific test change the test from `test('...` to `test.only('...`
 run headed
 
 ```
-npm run playwright test --headed
+yarn playwright test --headed
 ```
 
 run with step through debugger
 
 ```
-PWDEBUG=1 npm run playwright test
+PWDEBUG=1 yarn playwright test
 ```
 
 However, if you want a debugger I recommend using VSCode and the `playwright` extension, as the above command is a cruder debugger that steps into every function call which is annoying.
@@ -308,7 +308,7 @@ Or comment out browsers in `playwright.config.ts`.
 
 note chromium has encoder compat issues which is why were testing against the branded 'Google Chrome'
 
-You may consider using the VSCode extension, it's useful for running individual threads, but some some reason the "record a test" is locked to chromium with we can't use. A work around is to us the CI `npm run playwright codegen -b wk --load-storage ./store localhost:3000`
+You may consider using the VSCode extension, it's useful for running individual threads, but some some reason the "record a test" is locked to chromium with we can't use. A work around is to us the CI `yarn playwright codegen -b wk --load-storage ./store localhost:3000`
 
 <details>
 <summary>
@@ -351,21 +351,21 @@ However because much of our tests involve clicking in the stream at specific loc
 If you already haven't, run the following:
 
 ```
-npm
+yarn
-npm run build:wasm
+yarn build:wasm
-npm start
+yarn start
 ```
 
 and finally:
 
 ```
-npm run test:unit
+yarn test:unit
 ```
 
 For individual testing:
 
 ```
-npm run test abstractSyntaxTree -t "unexpected closed curly brace" --silent=false
+yarn test abstractSyntaxTree -t "unexpected closed curly brace" --silent=false
 ```
 
 Which will run our suite of [Vitest unit](https://vitest.dev/) and [React Testing Library E2E](https://testing-library.com/docs/react-testing-library/intro) tests, in interactive mode by default.
@@ -439,16 +439,16 @@ Part of the CI CD pipeline performs static analysis on the code. Use the followi
 The following set of commands should get us closer to one and done commands to instantly retest issues.
 
 ```
-npm run test-setup
+yarn test-setup
 ```
 
 > Gotcha, are packages up to date and is the wasm built?
 
 ```
-npm run tsc
+yarn tsc
-npm run fmt-check
+yarn fmt-check
-npm run lint
+yarn lint
-npm run test:unit:local
+yarn test:unit:local
 ```
 
 > Gotcha: Our unit tests have integration tests in them. You need to run a localhost server to run the unit tests.
@@ -460,10 +460,10 @@ npm run test:unit:local
 These E2E tests run in electron. There are tests that are skipped if they are ran in a windows, linux, or macos environment. We can use playwright tags to implement test skipping.
 
 ```
-npm run test:playwright:electron:local
+yarn test:playwright:electron:local
-npm run test:playwright:electron:windows:local
+yarn test:playwright:electron:windows:local
-npm run test:playwright:electron:macos:local
+yarn test:playwright:electron:macos:local
-npm run test:playwright:electron:ubuntu:local
+yarn test:playwright:electron:ubuntu:local
 ```
 
 > Why does it say local? The CI CD commands that run in the pipeline cannot be ran locally. A single command will not properly setup the testing environment locally.

docs/kcl/abs.md

@@ -36,9 +36,9 @@ myAngle = -120
 sketch001 = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> line(end = [8, 0])
-  |> angledLine(angle = abs(myAngle), length = 5)
+  |> angledLine({ angle = abs(myAngle), length = 5 }, %)
   |> line(end = [-5, 0])
-  |> angledLine(angle = myAngle, length = 5)
+  |> angledLine({ angle = myAngle, length = 5 }, %)
   |> close()
 
 baseExtrusion = extrude(sketch001, length = 5)

docs/kcl/acos.md

@@ -33,7 +33,10 @@ acos(num: number): number
 ```js
 sketch001 = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = toDegrees(acos(0.5)), length = 10)
+  |> angledLine({
+       angle = toDegrees(acos(0.5)),
+       length = 10
+     }, %)
   |> line(end = [5, 0])
   |> line(endAbsolute = [12, 0])
   |> close()

docs/kcl/angleToMatchLengthX.md

@@ -36,7 +36,7 @@ angleToMatchLengthX(
 sketch001 = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> line(end = [2, 5], tag = $seg01)
-  |> angledLine(angle = -angleToMatchLengthX(seg01, 7, %), endAbsoluteX = 10)
+  |> angledLineToX([-angleToMatchLengthX(seg01, 7, %), 10], %)
   |> close()
 
 extrusion = extrude(sketch001, length = 5)

docs/kcl/angleToMatchLengthY.md

@@ -36,7 +36,10 @@ angleToMatchLengthY(
 sketch001 = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> line(end = [1, 2], tag = $seg01)
-  |> angledLine(angle = angleToMatchLengthY(seg01, 15, %), length = 5)
+  |> angledLine({
+       angle = angleToMatchLengthY(seg01, 15, %),
+       length = 5
+     }, %)
   |> yLine(endAbsolute = 0)
   |> close()
 

docs/kcl/angledLine.md

@@ -10,13 +10,8 @@ Draw a line segment relative to the current origin using the polar measure of so
 
 ```js
 angledLine(
+  data: AngledLineData,
   sketch: Sketch,
-  angle: number,
-  length?: number,
-  lengthX?: number,
-  lengthY?: number,
-  endAbsoluteX?: number,
-  endAbsoluteY?: number,
   tag?: TagDeclarator,
 ): Sketch
 ```
@@ -26,14 +21,9 @@ angledLine(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | Which sketch should this path be added to? | Yes |
+| `data` | [`AngledLineData`](/docs/kcl/types/AngledLineData) | Data to draw an angled line. | Yes |
-| `angle` | [`number`](/docs/kcl/types/number) | Which angle should the line be drawn at? | Yes |
+| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) |  | Yes |
-| `length` | [`number`](/docs/kcl/types/number) | Draw the line this distance along the given angle. Only one of `length`, `lengthX`, `lengthY`, `endAbsoluteX`, `endAbsoluteY` can be given. | No |
+| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
-| `lengthX` | [`number`](/docs/kcl/types/number) | Draw the line this distance along the X axis. Only one of `length`, `lengthX`, `lengthY`, `endAbsoluteX`, `endAbsoluteY` can be given. | No |
-| `lengthY` | [`number`](/docs/kcl/types/number) | Draw the line this distance along the Y axis. Only one of `length`, `lengthX`, `lengthY`, `endAbsoluteX`, `endAbsoluteY` can be given. | No |
-| `endAbsoluteX` | [`number`](/docs/kcl/types/number) | Draw the line along the given angle until it reaches this point along the X axis. Only one of `length`, `lengthX`, `lengthY`, `endAbsoluteX`, `endAbsoluteY` can be given. | No |
-| `endAbsoluteY` | [`number`](/docs/kcl/types/number) | Draw the line along the given angle until it reaches this point along the Y axis. Only one of `length`, `lengthX`, `lengthY`, `endAbsoluteX`, `endAbsoluteY` can be given. | No |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Create a new tag which refers to this line | No |
 
 ### Returns
 
@@ -46,7 +36,7 @@ angledLine(
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> yLine(endAbsolute = 15)
-  |> angledLine(angle = 30, length = 15)
+  |> angledLine({ angle = 30, length = 15 }, %)
   |> line(end = [8, -10])
   |> yLine(endAbsolute = 0)
   |> close()

docs/kcl/asin.md

@@ -33,7 +33,10 @@ asin(num: number): number
 ```js
 sketch001 = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = toDegrees(asin(0.5)), length = 20)
+  |> angledLine({
+       angle = toDegrees(asin(0.5)),
+       length = 20
+     }, %)
   |> yLine(endAbsolute = 0)
   |> close()
 

docs/kcl/atan.md

@@ -33,7 +33,10 @@ atan(num: number): number
 ```js
 sketch001 = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = toDegrees(atan(1.25)), length = 20)
+  |> angledLine({
+       angle = toDegrees(atan(1.25)),
+       length = 20
+     }, %)
   |> yLine(endAbsolute = 0)
   |> close()
 

docs/kcl/atan2.md

@@ -37,7 +37,10 @@ atan2(
 ```js
 sketch001 = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = toDegrees(atan2(1.25, 2)), length = 20)
+  |> angledLine({
+       angle = toDegrees(atan2(1.25, 2)),
+       length = 20
+     }, %)
   |> yLine(endAbsolute = 0)
   |> close()
 

docs/kcl/consts/std-math-E.md

@@ -17,10 +17,10 @@ std::math::E: number = 2.71828182845904523536028747135266250_
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(
+  |> angledLine({
     angle = 30,
     length = 2 * E ^ 2,
-  )
+  }, %)
   |> yLine(endAbsolute = 0)
   |> close()
 

docs/kcl/consts/std-math-TAU.md

@@ -17,10 +17,10 @@ std::math::TAU: number = 6.28318530717958647692528676655900577_
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(
+  |> angledLine({
     angle = 50,
     length = 10 * TAU,
-  )
+  }, %)
   |> yLine(endAbsolute = 0)
   |> close()
 

docs/kcl/e.md

@@ -30,7 +30,7 @@ e(): number
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = 30, length = 2 * e() ^ 2)
+  |> angledLine({ angle = 30, length = 2 * e() ^ 2 }, %)
   |> yLine(endAbsolute = 0)
   |> close()
 

docs/kcl/getNextAdjacentEdge.md

@@ -30,10 +30,10 @@ getNextAdjacentEdge(tag: TagIdentifier): Uuid
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> line(end = [10, 0])
-  |> angledLine(angle = 60, length = 10)
+  |> angledLine({ angle = 60, length = 10 }, %)
-  |> angledLine(angle = 120, length = 10)
+  |> angledLine({ angle = 120, length = 10 }, %)
   |> line(end = [-10, 0])
-  |> angledLine(angle = 240, length = 10, tag = $referenceEdge)
+  |> angledLine({ angle = 240, length = 10 }, %, $referenceEdge)
   |> close()
 
 example = extrude(exampleSketch, length = 5)

docs/kcl/getOppositeEdge.md

@@ -30,10 +30,10 @@ getOppositeEdge(tag: TagIdentifier): Uuid
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> line(end = [10, 0])
-  |> angledLine(angle = 60, length = 10)
+  |> angledLine({ angle = 60, length = 10 }, %)
-  |> angledLine(angle = 120, length = 10)
+  |> angledLine({ angle = 120, length = 10 }, %)
   |> line(end = [-10, 0])
-  |> angledLine(angle = 240, length = 10, tag = $referenceEdge)
+  |> angledLine({ angle = 240, length = 10 }, %, $referenceEdge)
   |> close()
 
 example = extrude(exampleSketch, length = 5)

docs/kcl/getPreviousAdjacentEdge.md

@@ -30,10 +30,10 @@ getPreviousAdjacentEdge(tag: TagIdentifier): Uuid
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> line(end = [10, 0])
-  |> angledLine(angle = 60, length = 10)
+  |> angledLine({ angle = 60, length = 10 }, %)
-  |> angledLine(angle = 120, length = 10)
+  |> angledLine({ angle = 120, length = 10 }, %)
   |> line(end = [-10, 0])
-  |> angledLine(angle = 240, length = 10, tag = $referenceEdge)
+  |> angledLine({ angle = 240, length = 10 }, %, $referenceEdge)
   |> close()
 
 example = extrude(exampleSketch, length = 5)

docs/kcl/hollow.md

@@ -65,7 +65,7 @@ case = startSketchOn(-XZ)
   |> startProfileAt([-size, -size], %)
   |> line(end = [2 * size, 0])
   |> line(end = [0, 2 * size])
-  |> tangentialArc(endAbsolute = [-size, size])
+  |> tangentialArcTo([-size, size], %)
   |> close()
   |> extrude(length = 65)
 

docs/kcl/index.md

@@ -43,7 +43,11 @@ layout: manual
   * [`angleToMatchLengthX`](kcl/angleToMatchLengthX)
   * [`angleToMatchLengthY`](kcl/angleToMatchLengthY)
   * [`angledLine`](kcl/angledLine)
+  * [`angledLineOfXLength`](kcl/angledLineOfXLength)
+  * [`angledLineOfYLength`](kcl/angledLineOfYLength)
   * [`angledLineThatIntersects`](kcl/angledLineThatIntersects)
+  * [`angledLineToX`](kcl/angledLineToX)
+  * [`angledLineToY`](kcl/angledLineToY)
   * [`appearance`](kcl/appearance)
   * [`arc`](kcl/arc)
   * [`arcTo`](kcl/arcTo)
@@ -77,8 +81,6 @@ layout: manual
   * [`helix`](kcl/std-helix)
   * [`hole`](kcl/hole)
   * [`hollow`](kcl/hollow)
-  * [`intersect`](kcl/intersect)
-  * [`involuteCircular`](kcl/involuteCircular)
   * [`lastSegX`](kcl/lastSegX)
   * [`lastSegY`](kcl/lastSegY)
   * [`legAngX`](kcl/legAngX)
@@ -125,14 +127,14 @@ layout: manual
   * [`sqrt`](kcl/sqrt)
   * [`startProfileAt`](kcl/startProfileAt)
   * [`startSketchOn`](kcl/startSketchOn)
-  * [`subtract`](kcl/subtract)
   * [`sweep`](kcl/sweep)
   * [`tangentToEnd`](kcl/tangentToEnd)
   * [`tangentialArc`](kcl/tangentialArc)
+  * [`tangentialArcTo`](kcl/tangentialArcTo)
+  * [`tangentialArcToRelative`](kcl/tangentialArcToRelative)
   * [`toDegrees`](kcl/toDegrees)
   * [`toRadians`](kcl/toRadians)
   * [`translate`](kcl/translate)
-  * [`union`](kcl/union)
   * [`xLine`](kcl/xLine)
   * [`yLine`](kcl/yLine)
 * **std::math**

docs/kcl/max.md

@@ -33,7 +33,10 @@ max(args: [number]): number
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = 70, length = max(15, 31, 4, 13, 22))
+  |> angledLine({
+       angle = 70,
+       length = max(15, 31, 4, 13, 22)
+     }, %)
   |> line(end = [20, 0])
   |> close()
 

docs/kcl/min.md

@@ -33,7 +33,10 @@ min(args: [number]): number
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = 70, length = min(15, 31, 4, 13, 22))
+  |> angledLine({
+       angle = 70,
+       length = min(15, 31, 4, 13, 22)
+     }, %)
   |> line(end = [20, 0])
   |> close()
 

docs/kcl/patternLinear3d.md

@@ -57,7 +57,7 @@ case = startSketchOn(XY)
   |> startProfileAt([-size, -size], %)
   |> line(end = [2 * size, 0])
   |> line(end = [0, 2 * size])
-  |> tangentialArc(endAbsolute = [-size, size])
+  |> tangentialArcTo([-size, size], %)
   |> close(%)
   |> extrude(length = 65)
 
@@ -88,7 +88,7 @@ case = startSketchOn(XY)
   |> startProfileAt([-size, -size], %)
   |> line(end = [2 * size, 0])
   |> line(end = [0, 2 * size])
-  |> tangentialArc(endAbsolute = [-size, size])
+  |> tangentialArcTo([-size, size], %)
   |> close(%)
   |> extrude(length = 65)
 

docs/kcl/pow.md

@@ -37,7 +37,7 @@ pow(
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = 50, length = pow(5, 2))
+  |> angledLine({ angle = 50, length = pow(5, 2) }, %)
   |> yLine(endAbsolute = 0)
   |> close()
 

docs/kcl/profileStart.md

@@ -29,8 +29,11 @@ profileStart(sketch: Sketch): [number]
 ```js
 sketch001 = startSketchOn(XY)
   |> startProfileAt([5, 2], %)
-  |> angledLine(angle = 120, length = 50, tag = $seg01)
+  |> angledLine({ angle = 120, length = 50 }, %, $seg01)
-  |> angledLine(angle = segAng(seg01) + 120, length = 50)
+  |> angledLine({
+       angle = segAng(seg01) + 120,
+       length = 50
+     }, %)
   |> line(end = profileStart(%))
   |> close()
   |> extrude(length = 20)

docs/kcl/reduce.md

@@ -78,7 +78,7 @@ assertEqual(sum, 6, 0.00001, "1 + 2 + 3 summed is 6")
 ```js
 // Declare a function that sketches a decagon.
 fn decagon(radius) {
-  // Each side of the decagon is turned this many radians from the previous angle.
+  // Each side of the decagon is turned this many degrees from the previous angle.
   stepAngle = 1 / 10 * TAU
 
   // Start the decagon sketch at this point.

docs/kcl/segAng.md

@@ -32,9 +32,9 @@ exampleSketch = startSketchOn(XZ)
   |> line(end = [10, 0])
   |> line(end = [5, 10], tag = $seg01)
   |> line(end = [-10, 0])
-  |> angledLine(angle = segAng(seg01), length = 10)
+  |> angledLine([segAng(seg01), 10], %)
   |> line(end = [-10, 0])
-  |> angledLine(angle = segAng(seg01), length = -15)
+  |> angledLine([segAng(seg01), -15], %)
   |> close()
 
 example = extrude(exampleSketch, length = 4)

docs/kcl/segLen.md

@@ -29,9 +29,9 @@ segLen(tag: TagIdentifier): number
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = 60, length = 10, tag = $thing)
+  |> angledLine({ angle = 60, length = 10 }, %, $thing)
-  |> tangentialArc(angle = -120, radius = 5)
+  |> tangentialArc({ offset = -120, radius = 5 }, %)
-  |> angledLine(angle = -60, length = segLen(thing))
+  |> angledLine({ angle = -60, length = segLen(thing) }, %)
   |> close()
 
 example = extrude(exampleSketch, length = 5)

docs/kcl/shell.md

@@ -103,7 +103,7 @@ case = startSketchOn(-XZ)
   |> startProfileAt([-size, -size], %)
   |> line(end = [2 * size, 0])
   |> line(end = [0, 2 * size])
-  |> tangentialArc(endAbsolute = [-size, size])
+  |> tangentialArcTo([-size, size], %)
   |> close()
   |> extrude(length = 65)
 
@@ -128,7 +128,7 @@ case = startSketchOn(XY)
   |> startProfileAt([-size, -size], %)
   |> line(end = [2 * size, 0])
   |> line(end = [0, 2 * size])
-  |> tangentialArc(endAbsolute = [-size, size])
+  |> tangentialArcTo([-size, size], %)
   |> close()
   |> extrude(length = 65)
 
@@ -156,7 +156,7 @@ case = startSketchOn(XY)
   |> startProfileAt([-size, -size], %)
   |> line(end = [2 * size, 0])
   |> line(end = [0, 2 * size])
-  |> tangentialArc(endAbsolute = [-size, size])
+  |> tangentialArcTo([-size, size], %)
   |> close()
   |> extrude(length = 65)
 

docs/kcl/sqrt.md

@@ -33,7 +33,7 @@ sqrt(num: number): number
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = 50, length = sqrt(2500))
+  |> angledLine({ angle = 50, length = sqrt(2500) }, %)
   |> yLine(endAbsolute = 0)
   |> close()
 

docs/kcl/std-helix.md

@@ -9,15 +9,7 @@ Create a helix.
 
 
 ```js
-helix(
+helix(revolutions: number(_), angleStart: number(deg), ccw?: bool, radius?: number(mm), axis?: Axis3d | Edge, length?: number(mm), cylinder?: Solid): Helix
-  revolutions: number(_),
-  angleStart: number(deg),
-  ccw?: bool,
-  radius?: number(mm),
-  axis?: Axis3d | Edge,
-  length?: number(mm),
-  cylinder?: Solid,
-): Helix
 ```
 
 

docs/kcl/std-math-cos.md

@@ -29,10 +29,10 @@ cos(@num: number(rad)): number(_)
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(
+  |> angledLine({
     angle = 30,
     length = 3 / cos(toRadians(30)),
-  )
+  }, %)
   |> yLine(endAbsolute = 0)
   |> close()
 

docs/kcl/std-math-polar.md

@@ -6,14 +6,10 @@ layout: manual
 
 
 
-Convert polar/sphere (azimuth, elevation, distance) coordinates to
+Convert polar/sphere (azimuth, elevation, distance) coordinates tocartesian (x/y/z grid) coordinates.
-cartesian (x/y/z grid) coordinates.
 
 ```js
-polar(
+polar(angle: number(deg), length: number(mm)): [number(mm); 2]
-  angle: number(deg),
-  length: number(mm),
-): [number(mm); 2]
 ```
 
 

docs/kcl/std-math-tan.md

@@ -29,10 +29,10 @@ tan(@num: number(rad)): number(_)
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(
+  |> angledLine({
     angle = 50,
     length = 50 * tan(1/2),
-  )
+  }, %)
   |> yLine(endAbsolute = 0)
   |> close()
 

docs/kcl/std-sketch-circle.md

@@ -6,16 +6,10 @@ layout: manual
 
 
 
-Construct a 2-dimensional circle, of the specified radius, centered at
+Construct a 2-dimensional circle, of the specified radius, centered atthe provided (x, y) origin point.
-the provided (x, y) origin point.
 
 ```js
-circle(
+circle(@sketch_or_surface: Sketch | Plane | Face, center: Point2d, radius: number, tag?: tag): Sketch
-  @sketch_or_surface: Sketch | Plane | Face,
-  center: Point2d,
-  radius: number,
-  tag?: tag,
-): Sketch
 ```
 
 

docs/kcl/std-sketch-mirror2d.md

@@ -11,10 +11,7 @@ Only works on unclosed sketches for now.
 Mirror occurs around a local sketch axis rather than a global axis.
 
 ```js
-mirror2d(
+mirror2d(@sketches: [Sketch; 1+], axis: Axis2d | Edge): Sketch
-  @sketches: [Sketch; 1+],
-  axis: Axis2d | Edge,
-): Sketch
 ```
 
 
@@ -103,9 +100,9 @@ example = extrude(sketch001, length = 10)
 sketch0011 = startSketchOn(XY)
      |> startProfileAt([6.77, 0], %)
      |> yLine(length = 1.27)
-     |> tangentialArc(endAbsolute = [5.96, 2.37])
+     |> tangentialArcTo([5.96, 2.37], %)
-     |> tangentialArc(endAbsolute = [-6.2, 2.44])
+     |> tangentialArcTo([-6.2, 2.44], %)
-     |> tangentialArc(endAbsolute = [-6.6, 1.82])
+     |> tangentialArcTo([-6.6, 1.82], %)
      |> yLine(length = -1.82)
      |> mirror2d( axis = X )
      |> extrude(length = 10)

docs/kcl/tangentToEnd.md

@@ -31,9 +31,12 @@ tangentToEnd(tag: TagIdentifier): number
 pillSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> line(end = [20, 0])
-  |> tangentialArc(end = [0, 10], tag = $arc1)
+  |> tangentialArcToRelative([0, 10], %, $arc1)
-  |> angledLine(angle = tangentToEnd(arc1), length = 20)
+  |> angledLine({
-  |> tangentialArc(end = [0, -10])
+       angle = tangentToEnd(arc1),
+       length = 20
+     }, %)
+  |> tangentialArcToRelative([0, -10], %)
   |> close()
 
 pillExtrude = extrude(pillSketch, length = 10)
@@ -46,9 +49,12 @@ pillExtrude = extrude(pillSketch, length = 10)
 pillSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> line(end = [0, 20])
-  |> tangentialArc(endAbsolute = [10, 20], tag = $arc1)
+  |> tangentialArcTo([10, 20], %, $arc1)
-  |> angledLine(angle = tangentToEnd(arc1), length = 20)
+  |> angledLine({
-  |> tangentialArc(end = [-10, 0])
+       angle = tangentToEnd(arc1),
+       length = 20
+     }, %)
+  |> tangentialArcToRelative([-10, 0], %)
   |> close()
 
 pillExtrude = extrude(pillSketch, length = 10)
@@ -60,7 +66,10 @@ pillExtrude = extrude(pillSketch, length = 10)
 rectangleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> line(end = [10, 0], tag = $seg1)
-  |> angledLine(angle = tangentToEnd(seg1), length = 10)
+  |> angledLine({
+       angle = tangentToEnd(seg1),
+       length = 10
+     }, %)
   |> line(end = [0, 10])
   |> line(end = [-20, 0])
   |> close()
@@ -74,7 +83,7 @@ rectangleExtrude = extrude(rectangleSketch, length = 10)
 bottom = startSketchOn(XY)
   |> startProfileAt([0, 0], %)
   |> arcTo({ end = [10, 10], interior = [5, 1] }, %, $arc1)
-  |> angledLine(angle = tangentToEnd(arc1), length = 20)
+  |> angledLine([tangentToEnd(arc1), 20], %)
   |> close()
 ```
 
@@ -86,7 +95,7 @@ circSketch = startSketchOn(XY)
 
 triangleSketch = startSketchOn(XY)
   |> startProfileAt([-5, 0], %)
-  |> angledLine(angle = tangentToEnd(circ), length = 10)
+  |> angledLine([tangentToEnd(circ), 10], %)
   |> line(end = [-15, 0])
   |> close()
 ```

docs/kcl/tangentialArcTo.md

@@ -35,7 +35,7 @@ tangentialArcTo(
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = 60, length = 10)
+  |> angledLine({ angle = 60, length = 10 }, %)
   |> tangentialArcTo([15, 15], %)
   |> line(end = [10, -15])
   |> close()

docs/kcl/tangentialArcToRelative.md

@@ -35,7 +35,7 @@ tangentialArcToRelative(
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = 45, length = 10)
+  |> angledLine({ angle = 45, length = 10 }, %)
   |> tangentialArcToRelative([0, -10], %)
   |> line(end = [-10, 0])
   |> close()

docs/kcl/tau.md

@@ -30,7 +30,7 @@ tau(): number
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = 50, length = 10 * tau())
+  |> angledLine({ angle = 50, length = 10 * tau() }, %)
   |> yLine(endAbsolute = 0)
   |> close()
 

docs/kcl/toDegrees.md

@@ -33,7 +33,10 @@ toDegrees(num: number): number
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = 50, length = 70 * cos(toDegrees(pi() / 4)))
+  |> angledLine({
+       angle = 50,
+       length = 70 * cos(toDegrees(pi() / 4))
+     }, %)
   |> yLine(endAbsolute = 0)
   |> close()
 

docs/kcl/toRadians.md

@@ -33,7 +33,10 @@ toRadians(num: number): number
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = 50, length = 70 * cos(toRadians(45)))
+  |> angledLine({
+       angle = 50,
+       length = 70 * cos(toRadians(45))
+     }, %)
   |> yLine(endAbsolute = 0)
   |> close()
 

docs/kcl/types.md

@@ -184,17 +184,15 @@ way:
 ```norun
 startSketchOn('XZ')
   |> startProfileAt(origin, %)
-  |> angledLine(angle = 0, length = 191.26, tag = $rectangleSegmentA001)
+  |> angledLine({angle = 0, length = 191.26}, %, $rectangleSegmentA001)
-  |> angledLine(
+  |> angledLine({
        angle = segAng(rectangleSegmentA001) - 90,
        length = 196.99,
-       tag = $rectangleSegmentB001,
+     }, %, $rectangleSegmentB001)
-     )
+  |> angledLine({
-  |> angledLine(
        angle = segAng(rectangleSegmentA001),
        length = -segLen(rectangleSegmentA001),
-       tag = $rectangleSegmentC001,
+     }, %, $rectangleSegmentC001)
-     )
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 ```
@@ -219,17 +217,15 @@ However if the code was written like this:
 fn rect(origin) {
   return startSketchOn('XZ')
     |> startProfileAt(origin, %)
-    |> angledLine(angle = 0, length = 191.26, tag = $rectangleSegmentA001)
+    |> angledLine({angle = 0, length = 191.26}, %, $rectangleSegmentA001)
-    |> angledLine(
+    |> angledLine({
          angle = segAng(rectangleSegmentA001) - 90,
-         length = 196.99,
+         length = 196.99
-         tag = $rectangleSegmentB001,
+       }, %, $rectangleSegmentB001)
-       )
+    |> angledLine({
-    |> angledLine(
          angle = segAng(rectangleSegmentA001),
          length = -segLen(rectangleSegmentA001)
-         tag = $rectangleSegmentC001,
+       }, %, $rectangleSegmentC001)
-       )
     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
     |> close()
 }
@@ -249,17 +245,15 @@ For example the following code works.
 fn rect(origin) {
   return startSketchOn('XZ')
     |> startProfileAt(origin, %)
-    |> angledLine(angle = 0, length = 191.26, tag = $rectangleSegmentA001)
+    |> angledLine({angle = 0, length = 191.26}, %, $rectangleSegmentA001)
-    |> angledLine(
+    |> angledLine({
          angle = segAng(rectangleSegmentA001) - 90,
-         length = 196.99,
+         length = 196.99
-         tag = $rectangleSegmentB001,
+       }, %, $rectangleSegmentB001)
-       )
+    |> angledLine({
-    |> angledLine(
          angle = segAng(rectangleSegmentA001),
          length = -segLen(rectangleSegmentA001)
-         tag = $rectangleSegmentC001,
+       }, %, $rectangleSegmentC001)
-       )
     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
     |> close()
 }

docs/kcl/types/KclValue.md

@@ -252,7 +252,7 @@ Data for an imported geometry.
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `type` |enum: `ImportedGeometry`|  | No |
+| `type` |enum: [`ImportedGeometry`](/docs/kcl/types/ImportedGeometry)|  | No |
 | `id` |[`string`](/docs/kcl/types/string)| The ID of the imported geometry. | No |
 | `value` |`[` [`string`](/docs/kcl/types/string) `]`| The original file paths. | No |
 

docs/kcl/types/tag.md

@@ -14,17 +14,15 @@ way:
 ```js
 startSketchOn('XZ')
   |> startProfileAt(origin, %)
-  |> angledLine(angle = 0, length = 191.26, tag = $rectangleSegmentA001)
+  |> angledLine({angle = 0, length = 191.26}, %, $rectangleSegmentA001)
-  |> angledLine(
+  |> angledLine({
        angle = segAng(rectangleSegmentA001) - 90,
        length = 196.99,
-       tag = $rectangleSegmentB001,
+     }, %, $rectangleSegmentB001)
-     )
+  |> angledLine({
-  |> angledLine(
        angle = segAng(rectangleSegmentA001),
        length = -segLen(rectangleSegmentA001),
-       tag = $rectangleSegmentC001,
+     }, %, $rectangleSegmentC001)
-     )
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 ```
@@ -48,16 +46,15 @@ However if the code was written like this:
 fn rect(origin) {
   return startSketchOn('XZ')
     |> startProfileAt(origin, %)
-    |> angledLine(angle = 0, length = 191.26, tag = $rectangleSegmentA001)
+    |> angledLine({angle = 0, length = 191.26}, %, $rectangleSegmentA001)
-    |> angledLine(
+    |> angledLine({
          angle = segAng(rectangleSegmentA001) - 90,
-         length = 196.99,
+         length = 196.99
-         tag = $rectangleSegmentB001)
+       }, %, $rectangleSegmentB001)
-    |> angledLine(
+    |> angledLine({
          angle = segAng(rectangleSegmentA001),
-         length = -segLen(rectangleSegmentA001),
+         length = -segLen(rectangleSegmentA001)
-         tag = $rectangleSegmentC001
+       }, %, $rectangleSegmentC001)
-       )
     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
     |> close()
 }
@@ -77,15 +74,15 @@ For example the following code works.
 fn rect(origin) {
   return startSketchOn('XZ')
     |> startProfileAt(origin, %)
-    |> angledLine(angle = 0, length = 191.26, tag = $rectangleSegmentA001)
+    |> angledLine({angle = 0, length = 191.26}, %, $rectangleSegmentA001)
-    |> angledLine(
+    |> angledLine({
          angle = segAng(rectangleSegmentA001) - 90,
          length = 196.99
-       , %, $rectangleSegmentB001)
+       }, %, $rectangleSegmentB001)
-    |> angledLine(
+    |> angledLine({
          angle = segAng(rectangleSegmentA001),
          length = -segLen(rectangleSegmentA001)
-       , %, $rectangleSegmentC001)
+       }, %, $rectangleSegmentC001)
     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
     |> close()
 }

docs/kcl/xLine.md

@@ -38,10 +38,10 @@ xLine(
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> xLine(length = 15)
-  |> angledLine(angle = 80, length = 15)
+  |> angledLine({ angle = 80, length = 15 }, %)
   |> line(end = [8, -10])
   |> xLine(length = 10)
-  |> angledLine(angle = 120, length = 30)
+  |> angledLine({ angle = 120, length = 30 }, %)
   |> xLine(length = -15)
   |> close()
 

docs/kcl/yLine.md

@@ -38,7 +38,7 @@ yLine(
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> yLine(length = 15)
-  |> angledLine(angle = 30, length = 15)
+  |> angledLine({ angle = 30, length = 15 }, %)
   |> line(end = [8, -10])
   |> yLine(length = -5)
   |> close()

e2e/playwright/basic-sketch.spec.ts

@@ -137,7 +137,7 @@ async function doBasicSketch(
     await page.waitForTimeout(100)
   }
 
-  await page.getByRole('button', { name: 'constraints: open menu' }).click()
+  await page.getByRole('button', { name: 'Length: open menu' }).click()
   await page.getByRole('button', { name: 'Equal Length' }).click()
 
   // Open the code pane.

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

@@ -1,4 +1,4 @@
-import { bracket } from '@e2e/playwright/fixtures/bracket'
+import { bracket } from '@src/lib/exampleKcl'
 import fsp from 'fs/promises'
 import { join } from 'path'
 

e2e/playwright/editor-tests.spec.ts

@@ -920,7 +920,7 @@ sketch001 = startSketchOn(XZ)
         `sketch001 = startSketchOn(XZ)
   |> startProfileAt([4.61, -14.01], %)
   |> line(end = [12.73, -0.09])
-  |> tangentialArc(endAbsolute = [24.95, -5.38])
+  |> tangentialArcTo([24.95, -5.38], %)
   |> close()`
       )
     })
@@ -969,7 +969,7 @@ sketch001 = startSketchOn(XZ)
 
     // expect the code to have changed
     await expect(page.locator('.cm-content')).toHaveText(
-      `sketch001 = startSketchOn(XZ)  |> startProfileAt([4.61, -14.01], %)  |> line(end = [12.73, -0.09])  |> tangentialArc(endAbsolute = [24.95, -5.38])  |> close()extrude001 = extrude(sketch001, length = 5)`
+      `sketch001 = startSketchOn(XZ)  |> startProfileAt([4.61, -14.01], %)  |> line(end = [12.73, -0.09])  |> tangentialArcTo([24.95, -5.38], %)  |> close()extrude001 = extrude(sketch001, length = 5)`
     )
 
     // Now hit undo
@@ -982,7 +982,7 @@ sketch001 = startSketchOn(XZ)
       .toHaveText(`sketch001 = startSketchOn(XZ)
   |> startProfileAt([4.61, -14.01], %)
   |> line(end = [12.73, -0.09])
-  |> tangentialArc(endAbsolute = [24.95, -5.38])
+  |> tangentialArcTo([24.95, -5.38], %)
   |> close()`)
   })
 
@@ -998,7 +998,7 @@ sketch001 = startSketchOn(XZ)
 sketch001 = startSketchOn(XZ)
   |> startProfileAt([4.61, -10.01], %)
   |> line(end = [12.73, -0.09])
-  |> tangentialArc(endAbsolute = [24.95, -0.38])
+  |> tangentialArcTo([24.95, -0.38], %)
   |> close()
   |> extrude(length = 5)`
         )
@@ -1072,7 +1072,7 @@ sketch001 = startSketchOn(XZ)
       // we wait so it saves the code
       await page.waitForTimeout(800)
 
-      // drag tangentialArc handle
+      // drag tangentialArcTo handle
       const tangentEnd = await u.getBoundingBox('[data-overlay-index="1"]')
       await page.dragAndDrop('#stream', '#stream', {
         sourcePosition: { x: tangentEnd.x + 10, y: tangentEnd.y - 5 },
@@ -1089,7 +1089,7 @@ sketch001 = startSketchOn(XZ)
         `sketch001 = startSketchOn(XZ)
     |> startProfileAt([2.71, -2.71], %)
     |> line(end = [15.4, -2.78])
-    |> tangentialArc(endAbsolute = [27.6, -3.05])
+    |> tangentialArcTo([27.6, -3.05], %)
     |> close()
     |> extrude(length = 5)`,
         { shouldNormalise: true }
@@ -1104,7 +1104,7 @@ sketch001 = startSketchOn(XZ)
         `sketch001 = startSketchOn(XZ)
     |> startProfileAt([2.71, -2.71], %)
     |> line(end = [15.4, -2.78])
-    |> tangentialArc(endAbsolute = [24.95, -0.38])
+    |> tangentialArcTo([24.95, -0.38], %)
     |> close()
     |> extrude(length = 5)`,
         { shouldNormalise: true }
@@ -1119,7 +1119,7 @@ sketch001 = startSketchOn(XZ)
         `sketch001 = startSketchOn(XZ)
     |> startProfileAt([2.71, -2.71], %)
     |> line(end = [12.73, -0.09])
-    |> tangentialArc(endAbsolute = [24.95, -0.38])
+    |> tangentialArcTo([24.95, -0.38], %)
     |> close()
     |> extrude(length = 5)`,
         { shouldNormalise: true }
@@ -1135,7 +1135,7 @@ sketch001 = startSketchOn(XZ)
         `sketch001 = startSketchOn(XZ)
     |> startProfileAt([4.61, -10.01], %)
     |> line(end = [12.73, -0.09])
-    |> tangentialArc(endAbsolute = [24.95, -0.38])
+    |> tangentialArcTo([24.95, -0.38], %)
     |> close()
     |> extrude(length = 5)`,
         { shouldNormalise: true }
@@ -1144,7 +1144,7 @@ sketch001 = startSketchOn(XZ)
   )
 
   test(
-    `Can import a local OBJ file`,
+    `Can use the import stdlib function on a local OBJ file`,
     { tag: '@electron' },
     async ({ page, context }, testInfo) => {
       test.fixme(orRunWhenFullSuiteEnabled())
@@ -1194,7 +1194,7 @@ sketch001 = startSketchOn(XZ)
           .toBeLessThan(15)
       })
       await test.step(`Write the import function line`, async () => {
-        await u.codeLocator.fill(`import 'cube.obj'\ncube`)
+        await u.codeLocator.fill(`import('cube.obj')`)
         await page.waitForTimeout(800)
       })
       await test.step(`Reset the camera before checking`, async () => {
@@ -1353,51 +1353,4 @@ sketch001 = startSketchOn(XZ)
       15
     )
   })
-
-  test(`test-toolbar-buttons`, async ({
-    page,
-    homePage,
-    toolbar,
-    scene,
-    cmdBar,
-  }) => {
-    await test.step('Load an empty file', async () => {
-      await page.addInitScript(async () => {
-        localStorage.setItem('persistCode', '')
-      })
-      await page.setBodyDimensions({ width: 1200, height: 500 })
-      await homePage.goToModelingScene()
-
-      // wait until scene is ready to be interacted with
-      await scene.connectionEstablished()
-      await scene.settled(cmdBar)
-    })
-
-    await test.step('Test toolbar button correct selection', async () => {
-      await toolbar.expectToolbarMode.toBe('modeling')
-
-      await toolbar.startSketchPlaneSelection()
-
-      // Click on a default plane
-      await page.mouse.click(700, 200)
-
-      // tools cannot be selected immediately, couldn't find an event to await instead.
-      await page.waitForTimeout(1000)
-
-      await toolbar.selectCenterRectangle()
-
-      await expect(page.getByTestId('center-rectangle')).toHaveAttribute(
-        'aria-pressed',
-        'true'
-      )
-    })
-
-    await test.step('Test Toolbar dropdown remembering last selection', async () => {
-      // Select another tool
-      await page.getByTestId('circle-center').click()
-
-      // center-rectangle should still be the active option in the rectangle dropdown
-      await expect(page.getByTestId('center-rectangle')).toBeVisible()
-    })
-  })
 })

e2e/playwright/feature-tree-pane.spec.ts

@@ -19,7 +19,7 @@ length001 = timesFive(1) * 5
 sketch001 = startSketchOn(XZ)
   |> startProfileAt([20, 10], %)
   |> line(end = [10, 10])
-  |> angledLine(angle = -45, length = length001)
+  |> angledLine([-45, length001], %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 revolve001 = revolve(sketch001, axis = X)
@@ -38,9 +38,15 @@ extrude001 = extrude(sketch002, length = 10)
 
 const FEATURE_TREE_SKETCH_CODE = `sketch001 = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
-  |> angledLine(angle = 0, length = 4, tag = $rectangleSegmentA001)
+  |> angledLine([0, 4], %, $rectangleSegmentA001)
-  |> angledLine(angle = segAng(rectangleSegmentA001) - 90, length = 2, tag = $rectangleSegmentB001)
+  |> angledLine([
-  |> angledLine(angle = segAng(rectangleSegmentA001), length = -segLen(rectangleSegmentA001), tag = $rectangleSegmentC001)
+       segAng(rectangleSegmentA001) - 90,
+       2
+     ], %, $rectangleSegmentB001)
+  |> angledLine([
+       segAng(rectangleSegmentA001),
+       -segLen(rectangleSegmentA001)
+     ], %, $rectangleSegmentC001)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close(%)
 extrude001 = extrude(sketch001, length = 10)

e2e/playwright/fixtures/bracket.ts

@@ -1,16 +0,0 @@
-import fs from 'fs'
-import path from 'path'
-
-export const bracket = fs.readFileSync(
-  path.resolve(
-    __dirname,
-    '..',
-    '..',
-    '..',
-    'public',
-    'kcl-samples',
-    'bracket',
-    'main.kcl'
-  ),
-  'utf8'
-)

e2e/playwright/fixtures/homePageFixture.ts

@@ -99,6 +99,7 @@ export class HomePageFixture {
   createAndGoToProject = async (projectTitle = 'untitled') => {
     await this.projectsLoaded()
     await this.projectButtonNew.click()
+    await this.projectTextName.click()
     await this.projectTextName.fill(projectTitle)
     await this.projectButtonContinue.click()
   }

e2e/playwright/fixtures/sceneFixture.ts

@@ -49,9 +49,7 @@ export class SceneFixture {
   constructor(page: Page) {
     this.page = page
     this.streamWrapper = page.getByTestId('stream')
-    this.networkToggleConnected = page
+    this.networkToggleConnected = page.getByTestId('network-toggle-ok')
-      .getByTestId('network-toggle-ok')
-      .or(page.getByTestId('network-toggle-other'))
     this.startEditSketchBtn = page
       .getByRole('button', { name: 'Start Sketch' })
       .or(page.getByRole('button', { name: 'Edit Sketch' }))
@@ -233,7 +231,7 @@ export class SceneFixture {
   settled = async (cmdBar: CmdBarFixture) => {
     const u = await getUtils(this.page)
 
-    await expect(this.startEditSketchBtn).not.toBeDisabled({ timeout: 15_000 })
+    await expect(this.startEditSketchBtn).not.toBeDisabled()
     await expect(this.startEditSketchBtn).toBeVisible()
 
     await cmdBar.openCmdBar()

e2e/playwright/fixtures/toolbarFixture.ts

@@ -169,7 +169,7 @@ export class ToolbarFixture {
   }
   selectCenterRectangle = async () => {
     await this.page
-      .getByRole('button', { name: 'caret down rectangles:' })
+      .getByRole('button', { name: 'caret down Corner rectangle:' })
       .click()
     await expect(
       this.page.getByTestId('dropdown-center-rectangle')
@@ -178,7 +178,7 @@ export class ToolbarFixture {
   }
   selectBoolean = async (operation: 'union' | 'subtract' | 'intersect') => {
     await this.page
-      .getByRole('button', { name: 'caret down booleans: open menu' })
+      .getByRole('button', { name: 'caret down Union: open menu' })
       .click()
     const operationTestId = `dropdown-boolean-${operation}`
     await expect(this.page.getByTestId(operationTestId)).toBeVisible()
@@ -186,19 +186,25 @@ export class ToolbarFixture {
   }
 
   selectCircleThreePoint = async () => {
-    await this.page.getByRole('button', { name: 'caret down circles:' }).click()
+    await this.page
+      .getByRole('button', { name: 'caret down Center circle:' })
+      .click()
     await expect(
       this.page.getByTestId('dropdown-circle-three-points')
     ).toBeVisible()
     await this.page.getByTestId('dropdown-circle-three-points').click()
   }
   selectArc = async () => {
-    await this.page.getByRole('button', { name: 'caret down arcs:' }).click()
+    await this.page
+      .getByRole('button', { name: 'caret down Tangential Arc:' })
+      .click()
     await expect(this.page.getByTestId('dropdown-arc')).toBeVisible()
     await this.page.getByTestId('dropdown-arc').click()
   }
   selectThreePointArc = async () => {
-    await this.page.getByRole('button', { name: 'caret down arcs:' }).click()
+    await this.page
+      .getByRole('button', { name: 'caret down Tangential Arc:' })
+      .click()
     await expect(
       this.page.getByTestId('dropdown-three-point-arc')
     ).toBeVisible()

e2e/playwright/import-ui.spec.ts

@@ -21,9 +21,15 @@ test.describe('Import UI tests', () => {
         path.join(projectDir, 'toBeImported.kcl'),
         `sketch001 = startSketchOn(XZ)
 profile001 = startProfileAt([281.54, 305.81], sketch001)
-  |> angledLine(angle = 0, length = 123.43, tag = $rectangleSegmentA001)
+  |> angledLine([0, 123.43], %, $rectangleSegmentA001)
-  |> angledLine(angle = segAng(rectangleSegmentA001) - 90, length = 85.99)
+  |> angledLine([
-  |> angledLine(angle = segAng(rectangleSegmentA001), length = -segLen(rectangleSegmentA001))
+       segAng(rectangleSegmentA001) - 90,
+       85.99
+     ], %)
+  |> angledLine([
+       segAng(rectangleSegmentA001),
+       -segLen(rectangleSegmentA001)
+     ], %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 extrude(profile001, length = 100)`
@@ -38,9 +44,15 @@ importedCube
 
 sketch001 = startSketchOn(XZ)
 profile001 = startProfileAt([-134.53, -56.17], sketch001)
-  |> angledLine(angle = 0, length = 79.05, tag = $rectangleSegmentA001)
+  |> angledLine([0, 79.05], %, $rectangleSegmentA001)
-  |> angledLine(angle = segAng(rectangleSegmentA001) - 90, length = 76.28)
+  |> angledLine([
-  |> angledLine(angle = segAng(rectangleSegmentA001), length = -segLen(rectangleSegmentA001), tag = $seg01)
+       segAng(rectangleSegmentA001) - 90,
+       76.28
+     ], %)
+  |> angledLine([
+       segAng(rectangleSegmentA001),
+       -segLen(rectangleSegmentA001)
+     ], %, $seg01)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02)
   |> close()
 extrude001 = extrude(profile001, length = 100)

e2e/playwright/lib/api-reporter.ts

@@ -1,63 +0,0 @@
-import type { Reporter, TestCase, TestResult } from '@playwright/test/reporter'
-
-class MyAPIReporter implements Reporter {
-  onTestEnd(test: TestCase, result: TestResult): void {
-    if (!process.env.TAB_API_URL || !process.env.TAB_API_KEY) {
-      return
-    }
-
-    const payload = {
-      // Required information
-      project: 'https://github.com/KittyCAD/modeling-app',
-      branch: process.env.GITHUB_HEAD_REF || process.env.GITHUB_REF_NAME || '',
-      commit: process.env.CI_COMMIT_SHA || process.env.GITHUB_SHA || '',
-      test: test.titlePath().slice(2).join(' › '),
-      status: result.status,
-      // Optional information
-      duration: result.duration / 1000,
-      message: result.error?.stack,
-      target: process.env.TARGET || null,
-      platform: process.env.RUNNER_OS || process.platform,
-      // Extra test and result data
-      annotations: test.annotations.map((a) => a.type),
-      retries: result.retry,
-      // Extra environment variables
-      CI_COMMIT_SHA: process.env.CI_COMMIT_SHA || null,
-      CI_PR_NUMBER: process.env.CI_PR_NUMBER || null,
-      GITHUB_BASE_REF: process.env.GITHUB_BASE_REF || null,
-      GITHUB_EVENT_NAME: process.env.GITHUB_EVENT_NAME || null,
-      GITHUB_HEAD_REF: process.env.GITHUB_HEAD_REF || null,
-      GITHUB_REF_NAME: process.env.GITHUB_REF_NAME || null,
-      GITHUB_REF: process.env.GITHUB_REF || null,
-      GITHUB_SHA: process.env.GITHUB_SHA || null,
-      GITHUB_WORKFLOW: process.env.GITHUB_WORKFLOW || null,
-      RUNNER_ARCH: process.env.RUNNER_ARCH || null,
-    }
-
-    void (async () => {
-      try {
-        const response = await fetch(`${process.env.TAB_API_URL}/api/results`, {
-          method: 'POST',
-          headers: new Headers({
-            'Content-Type': 'application/json',
-            'X-API-Key': process.env.TAB_API_KEY || '',
-          }),
-          body: JSON.stringify(payload),
-        })
-
-        if (!response.ok && !process.env.CI) {
-          console.error(
-            'TAB API - Failed to send test result:',
-            await response.text()
-          )
-        }
-      } catch {
-        if (!process.env.CI) {
-          console.error('TAB API - Unable to send test result')
-        }
-      }
-    })()
-  }
-}
-
-export default MyAPIReporter

e2e/playwright/named-views.spec.ts

@@ -6,9 +6,7 @@ import type { NamedView } from '@rust/kcl-lib/bindings/NamedView'
 
 import {
   createProject,
-  orRunWhenFullSuiteEnabled,
+  perProjectsettingsToToml,
-  perProjectSettingsToToml,
-  runningOnMac,
   tomlToPerProjectSettings,
 } from '@e2e/playwright/test-utils'
 import { expect, test } from '@e2e/playwright/zoo-test'
@@ -59,13 +57,10 @@ function tomlStringOverWriteNamedViewUuids(toml: string): string {
       settings.settings.app.named_views = remappedNamedViews
     }
   }
-  return perProjectSettingsToToml(settings)
+  return perProjectsettingsToToml(settings)
 }
 
 test.describe('Named view tests', () => {
-  if (runningOnMac()) {
-    test.fixme(orRunWhenFullSuiteEnabled())
-  }
   test('Verify project.toml is not created', async ({ page }, testInfo) => {
     // Create project and load it
     const projectName = 'named-views'
@@ -109,9 +104,6 @@ test.describe('Named view tests', () => {
       PROJECT_SETTINGS_FILE_NAME
     )
 
-    const toastMessage = page.getByText('Named view uuid1 created.')
-    await expect(toastMessage).toBeInViewport()
-
     // Expect project.toml to be generated on disk since a named view was created
     await expect(async () => {
       let exists = await fileExists(tempProjectSettingsFilePath)
@@ -137,6 +129,7 @@ test.describe('Named view tests', () => {
   }, testInfo) => {
     const projectName = 'named-views'
     const myNamedView1 = 'uuid1'
+    const myNamedView2 = 'uuid2'
 
     // Create project and go into the project
     await createProject({ name: projectName, page })
@@ -148,9 +141,6 @@ test.describe('Named view tests', () => {
     await cmdBar.argumentInput.fill(myNamedView1)
     await cmdBar.progressCmdBar(false)
 
-    let toastMessage = page.getByText('Named view uuid1 created.')
-    await expect(toastMessage).toBeInViewport()
-
     // Generate file paths for project.toml
     const projectDirName = testInfo.outputPath('electron-test-projects-dir')
     const tempProjectSettingsFilePath = join(
@@ -179,20 +169,17 @@ test.describe('Named view tests', () => {
     // Delete a named view
     await cmdBar.openCmdBar()
     await cmdBar.chooseCommand('delete named view')
-    cmdBar.selectOption({ name: myNamedView1 })
+    cmdBar.selectOption({ name: myNamedView2 })
     await cmdBar.progressCmdBar(false)
 
-    toastMessage = page.getByText('Named view uuid1 removed.')
-    await expect(toastMessage).toBeInViewport()
-
     await expect(async () => {
       // Read project.toml into memory again since we deleted a named view
       let tomlString = await fsp.readFile(tempProjectSettingsFilePath, 'utf-8')
       // Rewrite the uuids in the named views to match snapshot otherwise they will be randomly generated from rust and break
       tomlString = tomlStringOverWriteNamedViewUuids(tomlString)
 
-      // Write the entire tomlString to a snapshot.
+      // // Write the entire tomlString to a snapshot.
-      // There are many key/value pairs to check this is a safer match.
+      // // There are many key/value pairs to check this is a safer match.
       expect(tomlString).toMatchSnapshot('verify-named-view-gets-deleted')
     }).toPass()
   })
@@ -214,9 +201,6 @@ test.describe('Named view tests', () => {
     await cmdBar.argumentInput.fill(myNamedView)
     await cmdBar.progressCmdBar(false)
 
-    let toastMessage = page.getByText('Named view uuid1 created.')
-    await expect(toastMessage).toBeInViewport()
-
     // Generate file paths for project.toml
     const projectDirName = testInfo.outputPath('electron-test-projects-dir')
     const tempProjectSettingsFilePath = join(
@@ -273,19 +257,26 @@ test.describe('Named view tests', () => {
     await cmdBar.argumentInput.fill(myNamedView1)
     await cmdBar.progressCmdBar(false)
 
-    let toastMessage = page.getByText('Named view uuid1 created.')
+    await page.waitForTimeout(1000)
-    await expect(toastMessage).toBeInViewport()
 
-    await scene.moveCameraTo({ x: 608, y: 0, z: 0 }, { x: 0, y: 0, z: 0 })
+    const orbitMouseStart = { x: 800, y: 130 }
-    await page.waitForTimeout(2500)
+    const orbitMouseEnd = { x: 0, y: 130 }
+    await page.mouse.move(orbitMouseStart.x, orbitMouseStart.y)
+    await page.mouse.down({ button: 'middle' })
+    await page.mouse.move(orbitMouseEnd.x, orbitMouseEnd.y, {
+      steps: 3,
+    })
+    await page.mouse.up({ button: 'middle' })
+
+    await page.waitForTimeout(1000)
 
     await cmdBar.openCmdBar()
     await cmdBar.chooseCommand('create named view')
     await cmdBar.argumentInput.fill(myNamedView2)
     await cmdBar.progressCmdBar(false)
 
-    toastMessage = page.getByText('Named view uuid2 created.')
+    // Wait a moment for the project.toml to get written to disk with the new view point
-    await expect(toastMessage).toBeInViewport()
+    await page.waitForTimeout(1000)
 
     // Generate paths for the project.toml
     const tempProjectSettingsFilePath = join(

e2e/playwright/named-views.spec.ts-snapshots/verify-named-view-gets-created-chromium-darwin

@@ -1,16 +0,0 @@
-[settings]
-modeling = { }
-text_editor = { }
-command_bar = { }
-
-[settings.app.named_views.0656fb1a-9640-473e-b334-591dc70c0138]
-name = "uuid1"
-eye_offset = 1_378.0059
-fov_y = 45
-is_ortho = false
-ortho_scale_enabled = true
-ortho_scale_factor = 1.6
-pivot_position = [ 0, 0, 0 ]
-pivot_rotation = [ 0.5380994, 0.0, 0.0, 0.8428814 ]
-world_coord_system = "right_handed_up_z"
-version = 1

e2e/playwright/named-views.spec.ts-snapshots/verify-named-view-gets-deleted-chromium-linux

@@ -1,5 +1,16 @@
 [settings]
-app = { }
 modeling = { }
 text_editor = { }
 command_bar = { }
+
+[settings.app.named_views.0656fb1a-9640-473e-b334-591dc70c0138]
+name = "uuid1"
+eye_offset = 1_378.0059
+fov_y = 45
+is_ortho = false
+ortho_scale_enabled = true
+ortho_scale_factor = 1.6
+pivot_position = [ 0, 0, 0 ]
+pivot_rotation = [ 0.5380994, 0.0, 0.0, 0.8428814 ]
+world_coord_system = "right_handed_up_z"
+version = 1

e2e/playwright/named-views.spec.ts-snapshots/verify-two-named-view-gets-created-chromium-darwin

@@ -1,28 +0,0 @@
-[settings]
-modeling = { }
-text_editor = { }
-command_bar = { }
-
-[settings.app.named_views.0656fb1a-9640-473e-b334-591dc70c0138]
-name = "uuid1"
-eye_offset = 1_378.0059
-fov_y = 45
-is_ortho = false
-ortho_scale_enabled = true
-ortho_scale_factor = 1.6
-pivot_position = [ 0, 0, 0 ]
-pivot_rotation = [ 0.5380994, 0.0, 0.0, 0.8428814 ]
-world_coord_system = "right_handed_up_z"
-version = 1
-
-[settings.app.named_views.c810cf04-c6cc-4a4a-8b11-17bf445dcab7]
-name = "uuid2"
-eye_offset = 1_378.0059
-fov_y = 45
-is_ortho = false
-ortho_scale_enabled = true
-ortho_scale_factor = 1.6
-pivot_position = [ 1_826.5239, 0.0, 0.0 ]
-pivot_rotation = [ 0.5380994, 0.0, 0.0, 0.8428814 ]
-world_coord_system = "right_handed_up_z"
-version = 1

e2e/playwright/named-views.spec.ts-snapshots/verify-two-named-view-gets-created-chromium-linux

@@ -17,12 +17,12 @@ version = 1
 
 [settings.app.named_views.c810cf04-c6cc-4a4a-8b11-17bf445dcab7]
 name = "uuid2"
-eye_offset = 608
+eye_offset = 1_378.0059
 fov_y = 45
 is_ortho = false
 ortho_scale_enabled = true
 ortho_scale_factor = 1.6
-pivot_position = [ 0, 0, 0 ]
+pivot_position = [ 1_826.5239, 0.0, 0.0 ]
-pivot_rotation = [ 0.5, 0.5, 0.5, 0.5 ]
+pivot_rotation = [ 0.5380994, 0.0, 0.0, 0.8428814 ]
 world_coord_system = "right_handed_up_z"
 version = 1

e2e/playwright/native-file-menu.spec.ts

@@ -7,7 +7,6 @@ import { expect, test } from '@e2e/playwright/zoo-test'
  * Test file menu actions that trigger something in the frontend
  */
 test.describe('Native file menu', { tag: ['@electron'] }, () => {
-  test.skip() // TODO: Reimplement native file menu tests
   test.describe('Home page', () => {
     test.describe('File role', () => {
       test('Home.File.Create project', async ({ tronApp, cmdBar, page }) => {

e2e/playwright/onboarding-tests.spec.ts

@@ -1,4 +1,4 @@
-import { bracket } from '@e2e/playwright/fixtures/bracket'
+import { bracket } from '@src/lib/exampleKcl'
 import { onboardingPaths } from '@src/routes/Onboarding/paths'
 import fsp from 'fs/promises'
 import { join } from 'path'
@@ -15,7 +15,6 @@ import {
   executorInputPath,
   getUtils,
   orRunWhenFullSuiteEnabled,
-  runningOnWindows,
   settingsToToml,
 } from '@e2e/playwright/test-utils'
 import { expect, test } from '@e2e/playwright/zoo-test'
@@ -280,9 +279,6 @@ test.describe('Onboarding tests', () => {
     if (!tronApp) {
       fail()
     }
-    if (runningOnWindows()) {
-      test.fixme(orRunWhenFullSuiteEnabled())
-    }
     await tronApp.cleanProjectDir({
       app: {
         onboarding_status: '/parametric-modeling',