A snapshot a day keeps the bugs away! 📷🐛 (OS: namespace-profile-ubuntu-8-cores)

* ci for kcl-python-bindings

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* bettter concurrency

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* cleanup files

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updaets

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updaets

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updaets

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updaets

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* format

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* format

Signed-off-by: Jess Frazelle <github@jessfraz.com>

---------

Signed-off-by: Jess Frazelle <github@jessfraz.com>

.eslintignore

@@ -1,4 +1,4 @@
-src/wasm-lib/*
+rust/*
 *.typegen.ts
 packages/codemirror-lsp-client/dist/*
 e2e/playwright/snapshots/prompt-to-edit/*

.github/dependabot.yml

@@ -25,7 +25,7 @@ updates:
       - adamchalmers
       - jessfraz
   - package-ecosystem: 'cargo' # See documentation for possible values
-    directory: '/src/wasm-lib/' # Location of package manifests
+    directory: '/rust/' # Location of package manifests
     schedule:
       interval: weekly
       day: monday
@@ -39,3 +39,11 @@ updates:
       wasm-bindgen-deps:
         patterns:
           - "wasm-bindgen*"
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/rust/kcl-python-bindings/" # Location of package manifests
+    schedule:
+      interval: weekly
+      day: monday
+    reviewers:
+      - adamchalmers
+      - jessfraz

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

@@ -21,7 +21,7 @@ jobs:
       - name: Cache wasm
         uses: Swatinem/rust-cache@v2
         with:
-          workspaces: './src/wasm-lib'
+          workspaces: './rust'
       - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
         with:
           tool: wasm-pack
@@ -33,4 +33,4 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: wasm-bundle
-          path: src/wasm-lib/pkg
+          path: rust/kcl-wasm-lib/pkg

.github/workflows/build-apps.yml

@@ -38,9 +38,9 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
         with:
-          workspaces: './src/wasm-lib'
+          workspaces: './rust'
 
-      # TODO: see if we can fetch from main instead if no diff at src/wasm-lib
+      # TODO: see if we can fetch from main instead if no diff at rust
       - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
         with:
           tool: wasm-pack
@@ -67,7 +67,7 @@ jobs:
           path: |
             package.json
             electron-builder.yml
-            src/wasm-lib/pkg/wasm_lib*
+            rust/kcl-wasm-lib/pkg/kcl_wasm_lib*
             release-notes.md
             assets/icon.ico
             assets/icon.png
@@ -117,9 +117,9 @@ jobs:
           ls -R prepared-files
           cp prepared-files/package.json package.json
           cp prepared-files/electron-builder.yml electron-builder.yml
-          cp prepared-files/src/wasm-lib/pkg/wasm_lib_bg.wasm public
+          cp prepared-files/rust/kcl-wasm-lib/pkg/kcl_wasm_lib_bg.wasm public
-          mkdir src/wasm-lib/pkg
+          mkdir rust/kcl-wasm-lib/pkg
-          cp prepared-files/src/wasm-lib/pkg/wasm_lib* src/wasm-lib/pkg
+          cp prepared-files/rust/kcl-wasm-lib/pkg/kcl_wasm_lib* rust/kcl-wasm-lib/pkg
           cp prepared-files/release-notes.md release-notes.md
           cp prepared-files/assets/icon.ico assets/icon.ico
           cp prepared-files/assets/icon.png assets/icon.png

.github/workflows/cargo-check.yml

@@ -17,23 +17,17 @@ jobs:
   cargocheck:
     name: cargo check
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dir: ['src/wasm-lib']
     steps:
       - uses: actions/checkout@v4
       - name: Install latest rust
         uses: actions-rs/toolchain@v1
-        with:
-            toolchain: stable
-            override: true
 
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2.6.1
 
       - name: Run check
         run: |
-          cd "${{ matrix.dir }}"
+          cd rust
           # 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

.github/workflows/cargo-clippy.yml

@@ -23,9 +23,6 @@ jobs:
   cargoclippy:
     name: cargo clippy
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dir: ['src/wasm-lib']
     steps:
       - uses: actions/checkout@v4
       - uses: taiki-e/install-action@just
@@ -41,7 +38,7 @@ jobs:
 
       - name: Run clippy
         run: |
-          cd "${{ matrix.dir }}"
+          cd rust
           just lint
       # If this fails, run "cargo check" to update Cargo.lock,
       # then add Cargo.lock to the PR.

.github/workflows/cargo-fmt.yml

@@ -26,9 +26,6 @@ jobs:
   cargofmt:
     name: cargo fmt
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dir: ['src/wasm-lib']
     steps:
       - uses: actions/checkout@v4
       - name: Install latest rust
@@ -43,6 +40,6 @@ jobs:
 
       - name: Run cargo fmt
         run: |
-          cd "${{ matrix.dir }}"
+          cd rust
           cargo fmt -- --check
         shell: bash

.github/workflows/cargo-test.yml

@@ -9,14 +9,11 @@ permissions: read-all
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
-name: cargo test of wasm-lib
+name: cargo test
 jobs:
   cargotest:
     name: cargo test
     runs-on: ubuntu-latest-8-cores
-    strategy:
-      matrix:
-        dir: ['src/wasm-lib']
     steps:
       - uses: actions/checkout@v4
       - name: Install latest rust
@@ -45,8 +42,8 @@ jobs:
       - name: cargo test
         shell: bash
         run: |-
-          cd "${{ matrix.dir }}"
+          cd rust
-          cargo llvm-cov nextest --workspace --lcov --output-path lcov.info --test-threads=1 --retries=2 --no-fail-fast -P ci 2>&1 | tee /tmp/github-actions.log
+          cargo llvm-cov nextest --workspace --lcov --output-path lcov.info --retries=2 --no-fail-fast -P ci 2>&1 | tee /tmp/github-actions.log
         env:
           KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
           RUST_MIN_STACK: 10485760000
@@ -55,7 +52,7 @@ jobs:
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           fail_ci_if_error: true
-          flags: wasm-lib
+          flags: rust
           verbose: true
           files: lcov.info
 

.github/workflows/e2e-tests.yml

@@ -3,6 +3,8 @@ on:
   push:
     branches: [ main ]
   pull_request:
+  schedule:
+    - cron: 0 * * * *  # hourly
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -15,23 +17,6 @@ permissions:
 
 
 jobs:
-
-  check-rust-changes:
-    runs-on: ubuntu-latest
-    outputs:
-      rust-changed: ${{ steps.filter.outputs.rust }}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - id: filter
-        name: Check for Rust changes
-        uses: dorny/paths-filter@v3
-        with:
-          filters: |
-            rust:
-              - 'src/wasm-lib/**'
-
   electron:
     timeout-minutes: 60
     name: playwright:electron:${{ matrix.os }} ${{ matrix.shardIndex }} ${{ matrix.shardTotal }}
@@ -42,8 +27,8 @@ jobs:
         os: [namespace-profile-ubuntu-8-cores, namespace-profile-macos-8-cores, windows-16-cores]
         shardIndex: [1, 2, 3, 4]
         shardTotal: [4]
+        # TODO: add ref here for main and latest release tag
     runs-on: ${{ matrix.os }}
-    needs: check-rust-changes
     steps:
     - uses: actions/create-github-app-token@v1
       id: app-token
@@ -54,11 +39,17 @@ jobs:
     - uses: actions/checkout@v4
       with:
         token: ${{ steps.app-token.outputs.token }}
+    - id: filter
+      name: Check for Rust changes
+      uses: dorny/paths-filter@v3
+      with:
+        filters: |
+          rust:
+            - 'rust/**'
     - uses: actions/setup-node@v4
       with:
         node-version-file: '.nvmrc'
         cache: 'yarn'
-    - uses: KittyCAD/action-install-cli@main
     - name: Install dependencies
       shell: bash
       run: yarn
@@ -73,7 +64,7 @@ jobs:
       run: yarn playwright install --with-deps
     - name: Download Wasm Cache
       id: download-wasm
-      if: needs.check-rust-changes.outputs.rust-changed == 'false'
+      if: github.event_name != 'schedule' && steps.filter.outputs.rust == 'false'
       uses: dawidd6/action-download-artifact@v7
       continue-on-error: true
       with:
@@ -81,11 +72,11 @@ jobs:
         name: wasm-bundle
         workflow: build-and-store-wasm.yml
         branch: main
-        path: src/wasm-lib/pkg
+        path: rust/kcl-wasm-lib/pkg
     - name: copy wasm blob
-      if: needs.check-rust-changes.outputs.rust-changed == 'false'
+      if: github.event_name != 'schedule' && steps.filter.outputs.rust == 'false'
       shell: bash
-      run: cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
+      run: cp rust/kcl-wasm-lib/pkg/kcl_wasm_lib_bg.wasm public
       continue-on-error: true
     - name: Setup Rust
       uses: dtolnay/rust-toolchain@stable
@@ -93,15 +84,15 @@ jobs:
       with:
         tool: wasm-pack
     - name: Cache Wasm (because rust diff)
-      if: needs.check-rust-changes.outputs.rust-changed == 'true'
+      if: github.event_name == 'schedule' || steps.filter.outputs.rust == 'true'
       uses: Swatinem/rust-cache@v2
       with:
-        workspaces: './src/wasm-lib'
+        workspaces: './rust'
     - name: OR Cache Wasm (because wasm cache failed)
       if: steps.download-wasm.outcome == 'failure'
       uses: Swatinem/rust-cache@v2
       with:
-        workspaces: './src/wasm-lib'
+        workspaces: './rust'
     - name: install good sed
       if:  ${{ startsWith(matrix.os, 'macos') }}
       shell: bash
@@ -126,7 +117,7 @@ jobs:
         cat /tmp/vector.toml
         ${HOME}/.vector/bin/vector --config /tmp/vector.toml &
     - name: Build Wasm (because rust diff)
-      if: needs.check-rust-changes.outputs.rust-changed == 'true'
+      if: github.event_name == 'schedule' || steps.filter.outputs.rust == 'true'
       shell: bash
       run: yarn build:wasm
     - name: OR Build Wasm (because wasm cache failed)

.github/workflows/kcl-python-bindings.yml

@@ -0,0 +1,179 @@
+# This file is autogenerated by maturin v1.6.0 and then modified
+# To update, run
+#
+#    maturin generate-ci github
+#
+name: kcl-python-bindings
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - 'rust/kcl-python-bindings/**'
+      - '**.rs'
+      - .github/workflows/kcl-python-bindings.yml
+    tags:
+      - 'kcl-*'
+  pull_request:
+    paths:
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - 'rust/kcl-python-bindings/**'
+      - '**.rs'
+      - .github/workflows/kcl-python-bindings.yml
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  linux-x86_64:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          working-directory: rust/kcl-python-bindings
+          target: x86_64
+          args: --release --out dist --find-interpreter
+          sccache: 'true'
+          manylinux: auto
+          before-script-linux: |
+            yum install openssl-devel -y
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-linux-x86_64
+          path: rust/kcl-python-bindings/dist
+
+  windows:
+    runs-on: windows-16-cores
+    strategy:
+      matrix:
+        target:
+          - x64
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+          architecture: ${{ matrix.target }}
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          working-directory: rust/kcl-python-bindings
+          target: ${{ matrix.target }}
+          args: --release --out dist --find-interpreter
+          sccache: 'true'
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-windows-${{ matrix.target }}
+          path: rust/kcl-python-bindings/dist
+
+  macos:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        target:
+          - x86_64
+          - aarch64
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+      - name: Build wheels
+        uses: PyO3/maturin-action@v1
+        with:
+          working-directory: rust/kcl-python-bindings
+          target: ${{ matrix.target }}
+          args: --release --out dist --find-interpreter
+          sccache: 'true'
+      - name: Upload wheels
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-macos-${{ matrix.target }}
+          path: rust/kcl-python-bindings/dist
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+      - uses: taiki-e/install-action@just
+      - name: Run tests
+        run: |
+          cd rust/kcl-python-bindings
+          just setup-uv
+          just test
+        env:
+          KITTYCAD_API_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN }}
+
+  sdist:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install the latest version of uv
+        uses: astral-sh/setup-uv@v5
+      - name: Install codespell
+        run: |
+            uv venv .venv
+            echo "VIRTUAL_ENV=.venv" >> $GITHUB_ENV
+            echo "$PWD/.venv/bin" >> $GITHUB_PATH
+            uv pip install pip --upgrade
+      - name: Build sdist
+        uses: PyO3/maturin-action@v1
+        with:
+          working-directory: rust/kcl-python-bindings
+          command: sdist
+          args: --out dist
+      - name: Upload sdist
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels-sdist
+          path: rust/kcl-python-bindings/dist
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    if: startsWith(github.ref, 'refs/tags/')
+    needs: [linux-x86_64, windows, macos, sdist]
+    steps:
+      - uses: actions/download-artifact@v4
+      - name: Install the latest version of uv
+        uses: astral-sh/setup-uv@v5
+      - name: Install codespell
+        run: |
+            cd rust/kcl-python-bindings
+            uv venv .venv
+            echo "VIRTUAL_ENV=.venv" >> $GITHUB_ENV
+            echo "$PWD/.venv/bin" >> $GITHUB_PATH
+            uv pip install pip --upgrade
+      - name: Publish to PyPI
+        uses: PyO3/maturin-action@v1
+        env:
+          MATURIN_PYPI_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
+        with:
+          working-directory: rust/kcl-python-bindings
+          command: upload
+          args: --non-interactive --skip-existing wheels-*/*

.github/workflows/ruff.yml

@@ -0,0 +1,24 @@
+name: ruff
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+on:
+  push:
+    branches: main
+    paths:
+      - '**.py'
+      - .github/workflows/ruff.yml
+  pull_request:
+    paths:
+      - '**.py'
+      - .github/workflows/ruff.yml
+permissions:
+  contents: read
+  pull-requests: write
+jobs:
+  ruff:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: astral-sh/ruff-action@v3
+

.github/workflows/static-analysis.yml

@@ -54,7 +54,7 @@ jobs:
       - run: yarn install
       - uses: Swatinem/rust-cache@v2
         with:
-          workspaces: './src/wasm-lib'
+          workspaces: './rust'
 
       - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
         with:

.gitignore

@@ -26,16 +26,15 @@ yarn-error.log*
 .idea
 .vscode
 .helix
-src/wasm-lib/.idea
-src/wasm-lib/.vscode
 
 # rust
-src/wasm-lib/target
+rust/target
-src/wasm-lib/bindings
+rust/kcl-lib/bindings
-src/wasm-lib/kcl/bindings
+public/kcl_wasm_lib_bg.wasm
-public/wasm_lib_bg.wasm
+rust/lcov.info
-src/wasm-lib/lcov.info
+rust/kcl-wasm-lib/pkg
-src/wasm-lib/grackle/test_json_output
+*.snap.new
+rust/kcl-lib/fuzz/Cargo.lock
 
 e2e/playwright/playwright-secrets.env
 e2e/playwright/temp1.png
@@ -59,16 +58,18 @@ e2e/playwright/export-snapshots/*
 ## generated files
 src/**/*.typegen.ts
 
-src/wasm-lib/grackle/stdlib_cube_partial.json
 Mac_App_Distribution.provisionprofile
 
 *.tsbuildinfo
-src/wasm-lib/pkg
 
 .eslintcache
-venv
 .vite/
 
 # electron
 out/
-*.snap.new
+
+# python
+__pycache__/
+uv.lock
+rust/kcl-python-bindings/dist
+venv

.prettierignore

@@ -7,8 +7,7 @@ coverage
 *.rs
 *.hbs
 target
-src/wasm-lib/pkg
+rust/
-src/wasm-lib/kcl/bindings
 e2e/playwright/export-snapshots
 e2e/playwright/snapshots/prompt-to-edit
 

Makefile

@@ -1,6 +1,6 @@
 .PHONY: dev
 
-WASM_LIB_FILES := $(wildcard src/wasm-lib/**/*.rs)
+KCL_WASM_LIB_FILES := $(wildcard rust/**/*.rs)
 TS_SRC := $(wildcard src/**/*.tsx) $(wildcard src/**/*.ts)
 XSTATE_TYPEGENS := $(wildcard src/machines/*.typegen.ts)
 
@@ -18,7 +18,7 @@ lee-electron-test:
 $(XSTATE_TYPEGENS): $(TS_SRC)
 	yarn xstate typegen 'src/**/*.ts?(x)'
 
-public/wasm_lib_bg.wasm: $(WASM_LIB_FILES)
+public/kcl_wasm_lib_bg.wasm: $(KCL_WASM_LIB_FILES)
 	yarn build:wasm
 
 node_modules: package.json yarn.lock

README.md

@@ -40,7 +40,7 @@ The 3D view in Modeling App is just a video stream from our hosted geometry engi
 
 [Original demo video](https://drive.google.com/file/d/183_wjqGdzZ8EEZXSqZ3eDcJocYPCyOdC/view?pli=1)
 
-[Original demo slides](https://github.com/KittyCAD/Eng/files/10398178/demo.pdf)
+[Original demo slides](https://github.com/user-attachments/files/19010536/demo.pdf)
 
 ## Get started
 
@@ -53,17 +53,20 @@ Install a node version manager such as [fnm](https://github.com/Schniz/fnm?tab=r
 On Windows, it's also recommended to [upgrade your PowerShell version](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-windows?view=powershell-7.5#winget), we're using 7.
 
 Then in the repo run the following to install and use the node version specified in `.nvmrc`. You might need to specify your processor architecture with `--arch arm64` or `--arch x64` if it's not autodetected.
+
 ```
 fnm install --corepack-enabled
 fnm use
 ```
 
 Install the NPM dependencies with:
+
 ```
 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
 yarn install:rust
@@ -75,6 +78,7 @@ yarn install:wasm-pack:cargo
 ```
 
 Then to build the WASM layer, run:
+
 ```
 # macOS/Linux
 yarn build:wasm
@@ -135,6 +139,7 @@ To package the app for your platform with electron-builder, run `yarn tronb:pack
 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
 yarn install
 yarn build:wasm
@@ -190,6 +195,7 @@ The other `build-apps` output in the release `build-apps` workflow (triggered by
 The only difference with these builds is that they point to a different update location on the release bucket, with this dummy v0.255.255 always available. This helps ensuring that the version we release will be able to update to the next one available.
 
 If the prompt doesn't show up, start the app in command line to grab the electron-updater logs. This is likely an issue with the current build that needs addressing (or the updater-test location in the storage bucket).
+
 ```
 # Windows (PowerShell)
 & 'C:\Program Files\Zoo Modeling App\Zoo Modeling App.exe'
@@ -213,7 +219,6 @@ A new `publish-apps-release` will kick in and you should be able to find it [her
 
 If everything is well and the release is out to the public, the issue tracking the release shall be closed.
 
-
 ## Fuzzing the parser
 
 Make sure you install cargo fuzz:
@@ -223,7 +228,7 @@ $ cargo install cargo-fuzz
 ```
 
 ```bash
-$ cd src/wasm-lib/kcl
+$ cd rust/kcl-lib
 
 # list the fuzz targets
 $ cargo fuzz list
@@ -251,6 +256,7 @@ snapshottoken=<your-snapshot-token>
 For a portable way to run Playwright you'll need Docker.
 
 #### Generic example
+
 After that, open a terminal and run:
 
 ```bash
@@ -263,7 +269,6 @@ and in another terminal, run:
 PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project="Google Chrome" <test suite>
 ```
 
-
 #### Specific example
 
 open a terminal and run:
@@ -281,7 +286,6 @@ PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project=
 run a specific test change the test from `test('...` to `test.only('...`
 (note if you commit this, the tests will instantly fail without running any of the tests)
 
-
 **Gotcha**: running the docker container with a mismatched image against your `./node_modules/playwright` will cause a failure. Make sure the versions are matched and up to date.
 
 run headed
@@ -375,17 +379,19 @@ Which will run our suite of [Vitest unit](https://vitest.dev/) and [React Testin
 - `just`
 
 #### Setting KITTYCAD_API_TOKEN
+
 Use the production zoo.dev token, set this environment variable before running the tests
 
 #### Installing cargonextest
 
 ```
-cd src/wasm-lib
+cd rust 
 cargo search cargo-nextest
 cargo install cargo-nextest
 ```
 
 #### just
+
 install [`just`](https://github.com/casey/just?tab=readme-ov-file#pre-built-binaries)
 
 #### Running the tests
@@ -395,7 +401,7 @@ install [`just`](https://github.com/casey/just?tab=readme-ov-file#pre-built-bina
 # Make sure KITTYCAD_API_TOKEN=<prod zoo.dev token> is set
 # Make sure you installed cargo-nextest
 # Make sure you installed just
-cd src/wasm-lib
+cd rust 
 just test
 ```
 
@@ -403,7 +409,7 @@ just test
 # Without just
 # Make sure KITTYCAD_API_TOKEN=<prod zoo.dev token> is set
 # Make sure you installed cargo-nextest
-cd src/wasm-lib
+cd rust 
 export RUST_BRACKTRACE="full" && cargo nextest run --workspace --test-threads=1
 ```
 
@@ -412,13 +418,14 @@ Where `XXX` is an API token from the production engine (NOT the dev environment)
 We recommend using [nextest](https://nexte.st/) to run the Rust tests (its faster and is used in CI). Once installed, run the tests using
 
 ```
-cd src/wasm-lib
+cd rust 
 KITTYCAD_API_TOKEN=XXX cargo run nextest
 ```
 
 ### Mapping CI CD jobs to local commands
 
 When you see the CI CD fail on jobs you may wonder three things
+
 - Do I have a bug in my code?
 - Is the test flaky?
 - Is there a bug in `main`?
@@ -437,7 +444,6 @@ yarn test-setup
 
 > Gotcha, are packages up to date and is the wasm built?
 
-
 ```
 yarn tsc
 yarn fmt-check
@@ -493,7 +499,7 @@ PS: for the debug panel, the following JSON is useful for snapping the camera
 
 ## KCL
 
-For how to contribute to KCL, [see our KCL README](https://github.com/KittyCAD/modeling-app/tree/main/src/wasm-lib/kcl).
+For how to contribute to KCL, [see our KCL README](https://github.com/KittyCAD/modeling-app/tree/main/rust/kcl-lib).
 
 ### Logging
 

docs/kcl/appearance.md

@@ -53,7 +53,7 @@ example = extrude(exampleSketch, length = 5)
 ```js
 // Add color to a revolved solid.
 sketch001 = startSketchOn('XY')
-  |> circle({ center = [15, 0], radius = 5 }, %)
+  |> circle(center = [15, 0], radius = 5)
   |> revolve({ angle = 360, axis = 'y' }, %)
   |> appearance(color = '#ff0000', metalness = 90, roughness = 90)
 ```
@@ -195,10 +195,10 @@ sweepPath = startSketchOn('XZ')
   |> line(end = [0, 7])
 
 pipeHole = startSketchOn('XY')
-  |> circle({ center = [0, 0], radius = 1.5 }, %)
+  |> circle(center = [0, 0], radius = 1.5)
 
 sweepSketch = startSketchOn('XY')
-  |> circle({ center = [0, 0], radius = 2 }, %)
+  |> circle(center = [0, 0], radius = 2)
   |> hole(pipeHole, %)
   |> sweep(path = sweepPath)
   |> appearance(color = "#ff0000", metalness = 50, roughness = 50)

docs/kcl/circle.md

@@ -10,8 +10,9 @@ the provided (x, y) origin point.
 
 ```js
 circle(
-  data: CircleData,
+  sketchOrSurface: SketchOrSurface,
-  sketchSurfaceOrGroup: SketchOrSurface,
+  center: [number],
+  radius: number,
   tag?: TagDeclarator,
 ) -> Sketch
 ```
@@ -21,9 +22,10 @@ circle(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `data` | [`CircleData`](/docs/kcl/types/CircleData) | Data for drawing an circle | Yes |
+| `sketchOrSurface` | [`SketchOrSurface`](/docs/kcl/types/SketchOrSurface) | Plane or surface to sketch on. | Yes |
-| `sketchSurfaceOrGroup` | [`SketchOrSurface`](/docs/kcl/types/SketchOrSurface) | A sketch surface or a sketch. | Yes |
+| `center` | `[number]` | The center of the circle. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `radius` | `number` | The radius of the circle. | Yes |
+| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Create a new tag which refers to this circle | No |
 
 ### Returns
 
@@ -34,7 +36,7 @@ circle(
 
 ```js
 exampleSketch = startSketchOn("-XZ")
-  |> circle({ center = [0, 0], radius = 10 }, %)
+  |> circle(center = [0, 0], radius = 10)
 
 example = extrude(exampleSketch, length = 5)
 ```
@@ -48,7 +50,7 @@ exampleSketch = startSketchOn("XZ")
   |> line(end = [0, 30])
   |> line(end = [-30, 0])
   |> close()
-  |> hole(circle({ center = [0, 15], radius = 5 }, %), %)
+  |> hole(circle(center = [0, 15], radius = 5), %)
 
 example = extrude(exampleSketch, length = 5)
 ```

docs/kcl/const_std-math-PI.md

@@ -18,7 +18,7 @@ std::math::PI: number = 3.14159265358979323846264338327950288_
 circumference = 70
 
 exampleSketch = startSketchOn("XZ")
- |> circle({ center = [0, 0], radius = circumference/ (2 * PI) }, %)
+ |> circle(center = [0, 0], radius = circumference/ (2 * PI))
 
 example = extrude(exampleSketch, length = 5)
 ```

docs/kcl/helix.md

@@ -51,7 +51,7 @@ helixPath = helix(
 
 // Create a spring by sweeping around the helix path.
 springSketch = startSketchOn('YZ')
-  |> circle({ center = [0, 0], radius = 0.5 }, %)
+  |> circle(center = [0, 0], radius = 0.5)
   |> sweep(path = helixPath)
 ```
 
@@ -74,7 +74,7 @@ helixPath = helix(
 
 // Create a spring by sweeping around the helix path.
 springSketch = startSketchOn('XY')
-  |> circle({ center = [0, 0], radius = 0.5 }, %)
+  |> circle(center = [0, 0], radius = 0.5)
   |> sweep(path = helixPath)
 ```
 
@@ -98,7 +98,7 @@ helixPath = helix(
 
 // Create a spring by sweeping around the helix path.
 springSketch = startSketchOn('XY')
-  |> circle({ center = [0, 0], radius = 1 }, %)
+  |> circle(center = [0, 0], radius = 1)
   |> sweep(path = helixPath)
 ```
 

docs/kcl/helixRevolutions.md

@@ -32,7 +32,7 @@ helixRevolutions(
 
 ```js
 part001 = startSketchOn('XY')
-  |> circle({ center = [5, 5], radius = 10 }, %)
+  |> circle(center = [5, 5], radius = 10)
   |> extrude(length = 10)
   |> helixRevolutions({
        angleStart = 0,

docs/kcl/hole.md

@@ -37,8 +37,8 @@ exampleSketch = startSketchOn(XY)
   |> line(end = [5, 0])
   |> line(end = [0, -5])
   |> close()
-  |> hole(circle({ center = [1, 1], radius = .25 }, %), %)
+  |> hole(circle(center = [1, 1], radius = .25), %)
-  |> hole(circle({ center = [1, 4], radius = .25 }, %), %)
+  |> hole(circle(center = [1, 4], radius = .25), %)
 
 example = extrude(exampleSketch, length = 1)
 ```
@@ -57,7 +57,7 @@ fn squareHoleSketch() {
 }
 
 exampleSketch = startSketchOn(-XZ)
-  |> circle({ center = [0, 0], radius = 3 }, %)
+  |> circle(center = [0, 0], radius = 3)
   |> hole(squareHoleSketch(), %)
 example = extrude(exampleSketch, length = 1)
 ```

docs/kcl/hollow.md

@@ -70,17 +70,11 @@ case = startSketchOn('-XZ')
   |> extrude(length = 65)
 
 thing1 = startSketchOn(case, 'end')
-  |> circle({
+  |> circle(center = [-size / 2, -size / 2], radius = 25)
-       center = [-size / 2, -size / 2],
-       radius = 25
-     }, %)
   |> extrude(length = 50)
 
 thing2 = startSketchOn(case, 'end')
-  |> circle({
+  |> circle(center = [size / 2, -size / 2], radius = 25)
-       center = [size / 2, -size / 2],
-       radius = 25
-     }, %)
   |> extrude(length = 50)
 
 hollow(0.5, case)

docs/kcl/int.md

@@ -37,7 +37,7 @@ n = int(ceil(5 / 2))
 assertEqual(n, 3, 0.0001, "5/2 = 2.5, rounded up makes 3")
 // Draw n cylinders.
 startSketchOn('XZ')
-  |> circle({ center = [0, 0], radius = 2 }, %)
+  |> circle(center = [0, 0], radius = 2)
   |> extrude(length = 5)
   |> patternTransform(
        instances = n,

docs/kcl/loft.md

@@ -69,10 +69,10 @@ squareSketch = startSketchOn('XY')
   |> close()
 
 circleSketch0 = startSketchOn(offsetPlane('XY', offset = 75))
-  |> circle({ center = [0, 100], radius = 50 }, %)
+  |> circle(center = [0, 100], radius = 50)
 
 circleSketch1 = startSketchOn(offsetPlane('XY', offset = 150))
-  |> circle({ center = [0, 100], radius = 20 }, %)
+  |> circle(center = [0, 100], radius = 20)
 
 loft([
   squareSketch,
@@ -94,10 +94,10 @@ squareSketch = startSketchOn('XY')
   |> close()
 
 circleSketch0 = startSketchOn(offsetPlane('XY', offset = 75))
-  |> circle({ center = [0, 100], radius = 50 }, %)
+  |> circle(center = [0, 100], radius = 50)
 
 circleSketch1 = startSketchOn(offsetPlane('XY', offset = 150))
-  |> circle({ center = [0, 100], radius = 20 }, %)
+  |> circle(center = [0, 100], radius = 20)
 
 loft(
   [

docs/kcl/map.md

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

docs/kcl/offsetPlane.md

@@ -41,7 +41,7 @@ squareSketch = startSketchOn('XY')
   |> close()
 
 circleSketch = startSketchOn(offsetPlane('XY', offset = 150))
-  |> circle({ center = [0, 100], radius = 50 }, %)
+  |> circle(center = [0, 100], radius = 50)
 
 loft([squareSketch, circleSketch])
 ```
@@ -59,7 +59,7 @@ squareSketch = startSketchOn('XZ')
   |> close()
 
 circleSketch = startSketchOn(offsetPlane('XZ', offset = 150))
-  |> circle({ center = [0, 100], radius = 50 }, %)
+  |> circle(center = [0, 100], radius = 50)
 
 loft([squareSketch, circleSketch])
 ```
@@ -77,7 +77,7 @@ squareSketch = startSketchOn('YZ')
   |> close()
 
 circleSketch = startSketchOn(offsetPlane('YZ', offset = 150))
-  |> circle({ center = [0, 100], radius = 50 }, %)
+  |> circle(center = [0, 100], radius = 50)
 
 loft([squareSketch, circleSketch])
 ```
@@ -95,7 +95,7 @@ squareSketch = startSketchOn('-XZ')
   |> close()
 
 circleSketch = startSketchOn(offsetPlane('-XZ', offset = -150))
-  |> circle({ center = [0, 100], radius = 50 }, %)
+  |> circle(center = [0, 100], radius = 50)
 
 loft([squareSketch, circleSketch])
 ```
@@ -106,7 +106,7 @@ loft([squareSketch, circleSketch])
 // A circle on the XY plane
 startSketchOn("XY")
   |> startProfileAt([0, 0], %)
-  |> circle({ radius = 10, center = [0, 0] }, %)
+  |> circle(radius = 10, center = [0, 0])
 
 // Triangle on the plane 4 units above
 startSketchOn(offsetPlane("XY", offset = 4))

docs/kcl/patternCircular3d.md

@@ -42,7 +42,7 @@ patternCircular3d(
 
 ```js
 exampleSketch = startSketchOn('XZ')
-  |> circle({ center = [0, 0], radius = 1 }, %)
+  |> circle(center = [0, 0], radius = 1)
 
 example = extrude(exampleSketch, length = -5)
   |> patternCircular3d(

docs/kcl/patternLinear2d.md

@@ -38,7 +38,7 @@ patternLinear2d(
 
 ```js
 exampleSketch = startSketchOn('XZ')
-  |> circle({ center = [0, 0], radius = 1 }, %)
+  |> circle(center = [0, 0], radius = 1)
   |> patternLinear2d(axis = [1, 0], instances = 7, distance = 4)
 
 example = extrude(exampleSketch, length = 1)

docs/kcl/patternLinear3d.md

@@ -64,17 +64,11 @@ case = startSketchOn('XY')
   |> extrude(length = 65)
 
 thing1 = startSketchOn(case, 'end')
-  |> circle({
+  |> circle(center = [-size / 2, -size / 2], radius = 25)
-       center = [-size / 2, -size / 2],
-       radius = 25
-     }, %)
   |> extrude(length = 50)
 
 thing2 = startSketchOn(case, 'end')
-  |> circle({
+  |> circle(center = [size / 2, -size / 2], radius = 25)
-       center = [size / 2, -size / 2],
-       radius = 25
-     }, %)
   |> extrude(length = 50)
 
   // We pass in the "case" here since we want to pattern the whole sketch.
@@ -101,10 +95,7 @@ case = startSketchOn('XY')
   |> extrude(length = 65)
 
 thing1 = startSketchOn(case, 'end')
-  |> circle({
+  |> circle(center = [-size / 2, -size / 2], radius = 25)
-       center = [-size / 2, -size / 2],
-       radius = 25
-     }, %)
   |> extrude(length = 50)
 
 // We pass in `thing1` here with `useOriginal` since we want to pattern just this object on the face.

docs/kcl/patternTransform.md

@@ -68,7 +68,7 @@ fn transform(id) {
 
 // Sketch 4 cylinders.
 sketch001 = startSketchOn('XZ')
-  |> circle({ center = [0, 0], radius = 2 }, %)
+  |> circle(center = [0, 0], radius = 2)
   |> extrude(length = 5)
   |> patternTransform(instances = 4, transform = transform)
 ```
@@ -84,7 +84,7 @@ fn transform(id) {
 }
 
 sketch001 = startSketchOn('XZ')
-  |> circle({ center = [0, 0], radius = 2 }, %)
+  |> circle(center = [0, 0], radius = 2)
   |> extrude(length = 5)
   |> patternTransform(instances = 4, transform = transform)
 ```
@@ -184,7 +184,7 @@ fn transform(replicaId) {
 fn layer() {
   return startSketchOn("XY")
     // or some other plane idk
-    |> circle({ center = [0, 0], radius = 1 }, %, $tag1)
+    |> circle(center = [0, 0], radius = 1, tag = $tag1)
     |> extrude(length = h)
 }
 // The vase is 100 layers tall.

docs/kcl/patternTransform2d.md

@@ -42,7 +42,7 @@ fn transform(id) {
 
 // Sketch 4 circles.
 sketch001 = startSketchOn('XZ')
-  |> circle({ center = [0, 0], radius = 2 }, %)
+  |> circle(center = [0, 0], radius = 2)
   |> patternTransform2d(instances = 4, transform = transform)
 ```
 

docs/kcl/pi.md

@@ -31,10 +31,7 @@ pi() -> number
 circumference = 70
 
 exampleSketch = startSketchOn("XZ")
-  |> circle({
+  |> circle(center = [0, 0], radius = circumference / (2 * pi()))
-       center = [0, 0],
-       radius = circumference / (2 * pi())
-     }, %)
 
 example = extrude(exampleSketch, length = 5)
 ```

docs/kcl/revolve.md

@@ -51,7 +51,7 @@ part001 = startSketchOn('XY')
 ```js
 // A donut shape.
 sketch001 = startSketchOn('XY')
-  |> circle({ center = [15, 0], radius = 5 }, %)
+  |> circle(center = [15, 0], radius = 5)
   |> revolve({ angle = 360, axis = 'y' }, %)
 ```
 
@@ -106,7 +106,7 @@ box = startSketchOn('XY')
   |> extrude(length = 20)
 
 sketch001 = startSketchOn(box, "END")
-  |> circle({ center = [10, 10], radius = 4 }, %)
+  |> circle(center = [10, 10], radius = 4)
   |> revolve({ angle = -90, axis = 'y' }, %)
 ```
 
@@ -122,7 +122,7 @@ box = startSketchOn('XY')
   |> extrude(length = 20)
 
 sketch001 = startSketchOn(box, "END")
-  |> circle({ center = [10, 10], radius = 4 }, %)
+  |> circle(center = [10, 10], radius = 4)
   |> revolve({
        angle = 90,
        axis = getOppositeEdge(revolveAxis)
@@ -141,7 +141,7 @@ box = startSketchOn('XY')
   |> extrude(length = 20)
 
 sketch001 = startSketchOn(box, "END")
-  |> circle({ center = [10, 10], radius = 4 }, %)
+  |> circle(center = [10, 10], radius = 4)
   |> revolve({
        angle = 90,
        axis = getOppositeEdge(revolveAxis),

docs/kcl/rotate.md

@@ -69,10 +69,10 @@ sweepPath = startSketchOn('XZ')
 
 // Create a hole for the pipe.
 pipeHole = startSketchOn('XY')
-  |> circle({ center = [0, 0], radius = 1.5 }, %)
+  |> circle(center = [0, 0], radius = 1.5)
 
 sweepSketch = startSketchOn('XY')
-  |> circle({ center = [0, 0], radius = 2 }, %)
+  |> circle(center = [0, 0], radius = 2)
   |> hole(pipeHole, %)
   |> sweep(path = sweepPath)
   |> rotate(roll = 10, pitch = 10, yaw = 90)
@@ -95,10 +95,10 @@ sweepPath = startSketchOn('XZ')
 
 // Create a hole for the pipe.
 pipeHole = startSketchOn('XY')
-  |> circle({ center = [0, 0], radius = 1.5 }, %)
+  |> circle(center = [0, 0], radius = 1.5)
 
 sweepSketch = startSketchOn('XY')
-  |> circle({ center = [0, 0], radius = 2 }, %)
+  |> circle(center = [0, 0], radius = 2)
   |> hole(pipeHole, %)
   |> sweep(path = sweepPath)
   |> rotate(axis = [0, 0, 1.0], angle = 90)

docs/kcl/scale.md

@@ -49,10 +49,10 @@ sweepPath = startSketchOn('XZ')
 
 // Create a hole for the pipe.
 pipeHole = startSketchOn('XY')
-  |> circle({ center = [0, 0], radius = 1.5 }, %)
+  |> circle(center = [0, 0], radius = 1.5)
 
 sweepSketch = startSketchOn('XY')
-  |> circle({ center = [0, 0], radius = 2 }, %)
+  |> circle(center = [0, 0], radius = 2)
   |> hole(pipeHole, %)
   |> sweep(path = sweepPath)
   |> scale(scale = [1.0, 1.0, 2.5])

docs/kcl/segEnd.md

@@ -40,10 +40,7 @@ cube = startSketchOn('XY')
 fn cylinder(radius, tag) {
   return startSketchOn('XY')
     |> startProfileAt([0, 0], %)
-    |> circle({
+    |> circle(radius = radius, center = segEnd(tag))
-         radius = radius,
-         center = segEnd(tag)
-       }, %)
     |> extrude(length = radius)
 }
 

docs/kcl/segStart.md

@@ -40,10 +40,7 @@ cube = startSketchOn('XY')
 fn cylinder(radius, tag) {
   return startSketchOn('XY')
     |> startProfileAt([0, 0], %)
-    |> circle({
+    |> circle(radius = radius, center = segStart(tag))
-         radius = radius,
-         center = segStart(tag)
-       }, %)
     |> extrude(length = radius)
 }
 

docs/kcl/shell.md

@@ -108,17 +108,11 @@ case = startSketchOn('-XZ')
   |> extrude(length = 65)
 
 thing1 = startSketchOn(case, 'end')
-  |> circle({
+  |> circle(center = [-size / 2, -size / 2], radius = 25)
-       center = [-size / 2, -size / 2],
-       radius = 25
-     }, %)
   |> extrude(length = 50)
 
 thing2 = startSketchOn(case, 'end')
-  |> circle({
+  |> circle(center = [size / 2, -size / 2], radius = 25)
-       center = [size / 2, -size / 2],
-       radius = 25
-     }, %)
   |> extrude(length = 50)
 
 // We put "case" in the shell function to shell the entire object.
@@ -139,17 +133,11 @@ case = startSketchOn('XY')
   |> extrude(length = 65)
 
 thing1 = startSketchOn(case, 'end')
-  |> circle({
+  |> circle(center = [-size / 2, -size / 2], radius = 25)
-       center = [-size / 2, -size / 2],
-       radius = 25
-     }, %)
   |> extrude(length = 50)
 
 thing2 = startSketchOn(case, 'end')
-  |> circle({
+  |> circle(center = [size / 2, -size / 2], radius = 25)
-       center = [size / 2, -size / 2],
-       radius = 25
-     }, %)
   |> extrude(length = 50)
 
 // We put "thing1" in the shell function to shell the end face of the object.
@@ -173,17 +161,11 @@ case = startSketchOn('XY')
   |> extrude(length = 65)
 
 thing1 = startSketchOn(case, 'end')
-  |> circle({
+  |> circle(center = [-size / 2, -size / 2], radius = 25)
-       center = [-size / 2, -size / 2],
-       radius = 25
-     }, %)
   |> extrude(length = 50)
 
 thing2 = startSketchOn(case, 'end')
-  |> circle({
+  |> circle(center = [size / 2, -size / 2], radius = 25)
-       center = [size / 2, -size / 2],
-       radius = 25
-     }, %)
   |> extrude(length = 50)
 
 // We put "thing1" and "thing2" in the shell function to shell the end face of the object.

docs/kcl/sweep.md

@@ -49,10 +49,10 @@ sweepPath = startSketchOn('XZ')
 
 // Create a hole for the pipe.
 pipeHole = startSketchOn('XY')
-  |> circle({ center = [0, 0], radius = 1.5 }, %)
+  |> circle(center = [0, 0], radius = 1.5)
 
 sweepSketch = startSketchOn('XY')
-  |> circle({ center = [0, 0], radius = 2 }, %)
+  |> circle(center = [0, 0], radius = 2)
   |> hole(pipeHole, %)
   |> sweep(path = sweepPath)
 ```
@@ -75,7 +75,7 @@ helixPath = helix(
 
 // Create a spring by sweeping around the helix path.
 springSketch = startSketchOn('YZ')
-  |> circle({ center = [0, 0], radius = 1 }, %)
+  |> circle(center = [0, 0], radius = 1)
   |> sweep(path = helixPath)
 ```
 

docs/kcl/tangentToEnd.md

@@ -91,7 +91,7 @@ bottom = startSketchOn("XY")
 
 ```js
 circSketch = startSketchOn("XY")
-  |> circle({ center = [0, 0], radius = 3 }, %, $circ)
+  |> circle(center = [0, 0], radius = 3, tag = $circ)
 
 triangleSketch = startSketchOn("XY")
   |> startProfileAt([-5, 0], %)

docs/kcl/translate.md

@@ -47,10 +47,10 @@ sweepPath = startSketchOn('XZ')
 
 // Create a hole for the pipe.
 pipeHole = startSketchOn('XY')
-  |> circle({ center = [0, 0], radius = 1.5 }, %)
+  |> circle(center = [0, 0], radius = 1.5)
 
 sweepSketch = startSketchOn('XY')
-  |> circle({ center = [0, 0], radius = 2 }, %)
+  |> circle(center = [0, 0], radius = 2)
   |> hole(pipeHole, %)
   |> sweep(path = sweepPath)
   |> translate(translate = [1.0, 1.0, 2.5])

e2e/playwright/editor-tests.spec.ts

@@ -689,7 +689,7 @@ test.describe('Editor tests', { tag: ['@skipWin'] }, () => {
       await page.keyboard.press('ArrowDown')
       await page.keyboard.press('Enter')
       await page.keyboard.type(`extrusion = startSketchOn('XY')
-  |> circle({ center: [0, 0], radius: dia/2 }, %)
+  |> circle(center: [0, 0], radius: dia/2)
     |> hole(squareHole(length, width, height), %)
     |> extrude(length = height)`)
 

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

@@ -50,13 +50,13 @@ const FEATURE_TREE_SKETCH_CODE = `sketch001 = startSketchOn('XZ')
   |> close(%)
 extrude001 = extrude(sketch001, length = 10)
 sketch002 = startSketchOn(extrude001, rectangleSegmentB001)
-  |> circle({
+  |> circle(
        center = [-1, 2],
        radius = .5
-     }, %)
+     )
 plane001 = offsetPlane('XZ', offset = -5)
 sketch003 = startSketchOn(plane001)
-  |> circle({ center = [0, 0], radius = 5 }, %)
+  |> circle(center = [0, 0], radius = 5)
 `
 
 test.describe('Feature Tree pane', () => {
@@ -201,7 +201,7 @@ test.describe('Feature Tree pane', () => {
         await toolbar.exitSketchBtn.click()
       })
 
-      await test.step('On an offset plane should *not* work', async () => {
+      await test.step('On an offset plane should work', async () => {
         // Tooltip is getting in the way of clicking, so I'm first closing the pane
         await toolbar.closeFeatureTreePane()
         await (await toolbar.getFeatureTreeOperation('Sketch', 2)).dblclick()
@@ -212,13 +212,7 @@ test.describe('Feature Tree pane', () => {
         })
         await expect(
           toolbar.exitSketchBtn,
-          'We should not be in sketch mode now'
+          'We should be in sketch mode now'
-        ).not.toBeVisible()
-        await expect(
-          page.getByText(
-            'Editing sketches on faces or offset planes through the feature tree is not yet supported'
-          ),
-          'We should see a toast message about this'
         ).toBeVisible()
       })
     }
@@ -234,11 +228,11 @@ test.describe('Feature Tree pane', () => {
   }) => {
     const initialInput = '23'
     const initialCode = `sketch001 = startSketchOn('XZ')
-      |> circle({ center = [0, 0], radius = 5 }, %)
+      |> circle(center = [0, 0], radius = 5)
       renamedExtrude = extrude(sketch001, length = ${initialInput})`
     const newConstantName = 'distance001'
     const expectedCode = `sketch001 = startSketchOn('XZ')
-      |> circle({ center = [0, 0], radius = 5 }, %)
+      |> circle(center = [0, 0], radius = 5)
       ${newConstantName} = 23
       renamedExtrude = extrude(sketch001, length = ${newConstantName})`
 

e2e/playwright/file-tree.spec.ts

@@ -107,7 +107,7 @@ test.describe('when using the file tree to', () => {
 
       // File the main.kcl with contents
       const kclCube = await fsp.readFile(
-        'src/wasm-lib/tests/executor/inputs/cube.kcl',
+        'rust/kcl-lib/e2e/executor/inputs/cube.kcl',
         'utf-8'
       )
       await pasteCodeInEditor(kclCube)
@@ -245,7 +245,7 @@ test.describe('when using the file tree to', () => {
       await createProject({ name: 'project-000', page })
       // File the main.kcl with contents
       const kclCube = await fsp.readFile(
-        'src/wasm-lib/tests/executor/inputs/cube.kcl',
+        'rust/kcl-lib/e2e/executor/inputs/cube.kcl',
         'utf-8'
       )
       await pasteCodeInEditor(kclCube)
@@ -283,7 +283,7 @@ test.describe('when using the file tree to', () => {
 
       // Create a small file
       const kclCube = await fsp.readFile(
-        'src/wasm-lib/tests/executor/inputs/cube.kcl',
+        'rust/kcl-lib/e2e/executor/inputs/cube.kcl',
         'utf-8'
       )
       // pasted into main.kcl
@@ -297,7 +297,7 @@ test.describe('when using the file tree to', () => {
       await expect(legoFile).toBeVisible({ timeout: 60_000 })
       await legoFile.click()
       const kclLego = await fsp.readFile(
-        'src/wasm-lib/tests/executor/inputs/lego.kcl',
+        'rust/kcl-lib/e2e/executor/inputs/lego.kcl',
         'utf-8'
       )
       await pasteCodeInEditor(kclLego)

e2e/playwright/fixtures/cmdBarFixture.ts

@@ -47,6 +47,8 @@ export class CmdBarFixture {
   private _serialiseCmdBar = async (): Promise<CmdBarSerialised> => {
     if (!(await this.page.getByTestId('command-bar-wrapper').isVisible())) {
       return { stage: 'commandBarClosed' }
+    } else if (await this.page.getByTestId('cmd-bar-search').isVisible()) {
+      return { stage: 'pickCommand' }
     }
     const reviewForm = this.page.locator('#review-form')
     const getHeaderArgs = async () => {

e2e/playwright/fixtures/fixtureSetup.ts

@@ -45,7 +45,7 @@ export class AuthenticatedApp {
   }
   getInputFile = (fileName: string) => {
     return fsp.readFile(
-      join('src', 'wasm-lib', 'tests', 'executor', 'inputs', fileName),
+      join('rust', 'kcl-lib', 'e2e', 'executor', 'inputs', fileName),
       'utf-8'
     )
   }

e2e/playwright/fixtures/toolbarFixture.ts

@@ -61,7 +61,7 @@ export class ToolbarFixture {
     this.rectangleBtn = page.getByTestId('corner-rectangle')
     this.lengthConstraintBtn = page.getByTestId('constraint-length')
     this.exitSketchBtn = page.getByTestId('sketch-exit')
-    this.editSketchBtn = page.getByText('Edit Sketch')
+    this.editSketchBtn = page.locator('[name="Edit Sketch"]')
     this.fileTreeBtn = page.locator('[id="files-button-holder"]')
     this.createFileBtn = page.getByTestId('create-file-button')
     this.treeInputField = page.getByTestId('tree-input-field')

e2e/playwright/point-click.spec.ts

@@ -22,7 +22,7 @@ test.describe('Point-and-click tests', () => {
       path.resolve(
         __dirname,
         '../../',
-        './src/wasm-lib/tests/executor/inputs/test-circle-extrude.kcl'
+        './rust/kcl-lib/e2e/executor/inputs/test-circle-extrude.kcl'
       ),
       'utf-8'
     )
@@ -42,27 +42,25 @@ test.describe('Point-and-click tests', () => {
 
     await test.step('check code model connection works and that button is still enable once circle is selected ', async () => {
       await moveToCircle()
-      const circleSnippet =
+      const circleSnippet = 'circle(center = [318.33, 168.1], radius = 182.8)'
-        'circle({ center = [318.33, 168.1], radius = 182.8 }, %)'
       await editor.expectState({
-        activeLines: ["constsketch002=startSketchOn('XZ')"],
+        activeLines: ["sketch002=startSketchOn('XZ')"],
         highlightedCode: circleSnippet,
         diagnostics: [],
       })
 
       await test.step('check code model connection works and that button is still enable once circle is selected ', async () => {
         await moveToCircle()
-        const circleSnippet =
+        const circleSnippet = 'circle(center = [318.33, 168.1], radius = 182.8)'
-          'circle({ center = [318.33, 168.1], radius = 182.8 }, %)'
         await editor.expectState({
-          activeLines: ["constsketch002=startSketchOn('XZ')"],
+          activeLines: ["sketch002=startSketchOn('XZ')"],
           highlightedCode: circleSnippet,
           diagnostics: [],
         })
 
         await clickCircle()
         await editor.expectState({
-          activeLines: [circleSnippet.slice(-5)],
+          activeLines: ['|>' + circleSnippet],
           highlightedCode: circleSnippet,
           diagnostics: [],
         })
@@ -193,7 +191,7 @@ test.describe('Point-and-click tests', () => {
         path.resolve(
           __dirname,
           '../../',
-          './src/wasm-lib/tests/executor/inputs/e2e-can-sketch-on-chamfer.kcl'
+          './rust/kcl-lib/e2e/executor/inputs/e2e-can-sketch-on-chamfer.kcl'
         ),
         'utf-8'
       )
@@ -381,7 +379,7 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
         path.resolve(
           __dirname,
           '../../',
-          './src/wasm-lib/tests/executor/inputs/e2e-can-sketch-on-chamfer-no-pipeExpr.kcl'
+          './rust/kcl-lib/e2e/executor/inputs/e2e-can-sketch-on-chamfer-no-pipeExpr.kcl'
         ),
         'utf-8'
       )
@@ -581,7 +579,7 @@ profile001 = startProfileAt([205.96, 254.59], sketch002)
     const u = await getUtils(page)
 
     const initialCode = `closedSketch = startSketchOn('XZ')
-  |> circle({ center = [8, 5], radius = 2 }, %)
+  |> circle(center = [8, 5], radius = 2)
 openSketch = startSketchOn('XY')
   |> startProfileAt([-5, 0], %)
   |> line(endAbsolute = [0, 5])
@@ -633,8 +631,8 @@ openSketch = startSketchOn('XY')
       await expect(toolbar.startSketchBtn).not.toBeVisible()
       await expect(toolbar.exitSketchBtn).toBeVisible()
       await editor.expectState({
-        activeLines: [`|>circle({center=[8,5],radius=2},%)`],
+        activeLines: [`|>circle(center=[8,5],radius=2)`],
-        highlightedCode: 'circle({center=[8,5],radius=2},%)',
+        highlightedCode: 'circle(center=[8,5],radius=2)',
         diagnostics: [],
       })
     })
@@ -1192,10 +1190,10 @@ openSketch = startSketchOn('XY')
       cmdBar,
     }) => {
       const initialCode = `sketch001 = startSketchOn('XZ')
-    |> circle({ center = [0, 0], radius = 30 }, %)
+    |> circle(center = [0, 0], radius = 30)
     plane001 = offsetPlane('XZ', offset = 50)
     sketch002 = startSketchOn(plane001)
-    |> circle({ center = [0, 0], radius = 20 }, %)
+    |> circle(center = [0, 0], radius = 20)
 `
       await context.addInitScript((initialCode) => {
         localStorage.setItem('persistCode', initialCode)
@@ -1278,10 +1276,10 @@ openSketch = startSketchOn('XY')
     scene,
   }) => {
     const initialCode = `sketch001 = startSketchOn('XZ')
-  |> circle({ center = [0, 0], radius = 30 }, %)
+  |> circle(center = [0, 0], radius = 30)
   plane001 = offsetPlane('XZ', offset = 50)
   sketch002 = startSketchOn(plane001)
-  |> circle({ center = [0, 0], radius = 20 }, %)
+  |> circle(center = [0, 0], radius = 20)
 loft001 = loft([sketch001, sketch002])
 `
     await context.addInitScript((initialCode) => {
@@ -1304,7 +1302,7 @@ loft001 = loft([sketch001, sketch002])
       await scene.expectPixelColor([89, 89, 89], testPoint, 15)
       await clickOnSketch1()
       await expect(page.locator('.cm-activeLine')).toHaveText(`
-      |> circle({ center = [0, 0], radius = 30 }, %)
+      |> circle(center = [0, 0], radius = 30)
     `)
       await page.keyboard.press('Delete')
       // Check for sketch 1
@@ -1315,7 +1313,7 @@ loft001 = loft([sketch001, sketch002])
       await page.waitForTimeout(1000)
       await clickOnSketch2()
       await expect(page.locator('.cm-activeLine')).toHaveText(`
-      |> circle({ center = [0, 0], radius = 20 }, %)
+      |> circle(center = [0, 0], radius = 20)
     `)
       await page.keyboard.press('Delete')
       // Check for plane001
@@ -1344,10 +1342,10 @@ loft001 = loft([sketch001, sketch002])
     cmdBar,
   }) => {
     const initialCode = `sketch001 = startSketchOn('YZ')
-  |> circle({
+  |> circle(
        center = [0, 0],
        radius = 500
-     }, %)
+     )
 sketch002 = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> xLine(-500, %)
@@ -1438,10 +1436,10 @@ sketch002 = startSketchOn('XZ')
     cmdBar,
   }) => {
     const initialCode = `sketch001 = startSketchOn('YZ')
-  |> circle({
+  |> circle(
        center = [0, 0],
        radius = 500
-     }, %)
+     )
 sketch002 = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> xLine(-500, %)
@@ -2270,7 +2268,7 @@ chamfer04 = chamfer(extrude001, length = 5, tags = [getOppositeEdge(seg02)])
       cmdBar,
     }) => {
       const initialCode = `sketch001 = startSketchOn('XZ')
-    |> circle({ center = [0, 0], radius = 30 }, %)
+    |> circle(center = [0, 0], radius = 30)
     extrude001 = extrude(sketch001, length = 30)
     `
       await context.addInitScript((initialCode) => {
@@ -2445,19 +2443,19 @@ extrude001 = extrude(sketch001, length = 40)
 
   const shellSketchOnFacesCases = [
     `sketch001 = startSketchOn('XZ')
-  |> circle({ center = [0, 0], radius = 100 }, %)
+  |> circle(center = [0, 0], radius = 100)
   |> extrude(length = 100)
 
 sketch002 = startSketchOn(sketch001, 'END')
-  |> circle({ center = [0, 0], radius = 50 }, %)
+  |> circle(center = [0, 0], radius = 50)
   |> extrude(length = 50)
   `,
     `sketch001 = startSketchOn('XZ')
-  |> circle({ center = [0, 0], radius = 100 }, %)
+  |> circle(center = [0, 0], radius = 100)
 extrude001 = extrude(sketch001, length = 100)
 
 sketch002 = startSketchOn(extrude001, 'END')
-  |> circle({ center = [0, 0], radius = 50 }, %)
+  |> circle(center = [0, 0], radius = 50)
 extrude002 = extrude(sketch002, length = 50)
   `,
   ]
@@ -2631,10 +2629,10 @@ profile001 = startProfileAt([-20, 20], sketch001)
     cmdBar,
   }) => {
     const initialCode = `sketch001 = startSketchOn('YZ')
-  |> circle({
+  |> circle(
        center = [0, 0],
        radius = 500
-     }, %)
+     )
 sketch002 = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> xLine(-2000, %)
@@ -2761,10 +2759,10 @@ segAng(rectangleSegmentA001),
 |> close()
 extrude001 = extrude(sketch001, length = 50)
 sketch002 = startSketchOn(extrude001, rectangleSegmentA001)
-|> circle({
+|> circle(
 center = [-11.34, 10.0],
 radius = 8.69
-}, %)
+)
 `
       await context.addInitScript((initialCode) => {
         localStorage.setItem('persistCode', initialCode)
@@ -2811,10 +2809,10 @@ radius = 8.69
       |> close()
     extrude001 = extrude(sketch001, length = 5)
     sketch003 = startSketchOn(extrude001, 'START')
-      |> circle({
+      |> circle(
         center = [-0.69, 0.56],
         radius = 0.28
-      }, %)
+      )
 `
 
       await context.addInitScript((initialCode) => {
@@ -2849,10 +2847,11 @@ radius = 8.69
     cmdBar,
   }) => {
     const initialCode = `sketch001 = startSketchOn('XZ')
-profile001 = circle({
+profile001 = circle(
+  sketch001,
   center = [0, 0],
   radius = 100
-}, sketch001)
+)
 extrude001 = extrude(profile001, length = 100)
 `
     await context.addInitScript((initialCode) => {
@@ -2864,7 +2863,7 @@ extrude001 = extrude(profile001, length = 100)
 
     // One dumb hardcoded screen pixel value
     const testPoint = { x: 500, y: 250 }
-    const initialColor: [number, number, number] = [135, 135, 135]
+    const initialColor: [number, number, number] = [123, 123, 123]
 
     await test.step(`Confirm extrude exists with default appearance`, async () => {
       await toolbar.closePane('code')
@@ -2877,6 +2876,8 @@ extrude001 = extrude(profile001, length = 100)
       shapeColor: [number, number, number]
     ) {
       await toolbar.openPane('feature-tree')
+      const enterAppearanceFlow = async (stepName: string) =>
+        test.step(stepName, async () => {
           const operationButton = await toolbar.getFeatureTreeOperation(
             'Extrude',
             0
@@ -2894,6 +2895,22 @@ extrude001 = extrude(profile001, length = 100)
             highlightedHeaderArg: 'color',
             stage: 'arguments',
           })
+        })
+
+      await enterAppearanceFlow(`Open Set Appearance flow`)
+
+      await test.step(`Validate hidden argument "nodeToEdit" can't be reached with Backspace`, async () => {
+        await page.keyboard.press('Backspace')
+        await cmdBar.expectState({
+          stage: 'pickCommand',
+        })
+        await page.keyboard.press('Escape')
+        await cmdBar.expectState({
+          stage: 'commandBarClosed',
+        })
+      })
+
+      await enterAppearanceFlow(`Restart Appearance flow`)
       const item = page.getByText(option, { exact: true })
       await item.click()
       await cmdBar.expectState({
@@ -2905,7 +2922,7 @@ extrude001 = extrude(profile001, length = 100)
       })
       await cmdBar.progressCmdBar()
       await toolbar.closePane('feature-tree')
-      await scene.expectPixelColor(shapeColor, testPoint, 40)
+      await scene.expectPixelColor(shapeColor, testPoint, 10)
       await toolbar.openPane('code')
       if (hex === 'default') {
         const anyAppearanceDeclaration = `|> appearance(`
@@ -2931,9 +2948,9 @@ extrude001 = extrude(profile001, length = 100)
       await setApperanceAndCheck('Purple', '#FF00FF', [180, 0, 180])
       await setApperanceAndCheck('Yellow', '#FFFF00', [180, 180, 0])
       await setApperanceAndCheck('Black', '#000000', [0, 0, 0])
-      await setApperanceAndCheck('Dark Grey', '#080808', [10, 10, 10])
+      await setApperanceAndCheck('Dark Grey', '#080808', [0x33, 0x33, 0x33])
-      await setApperanceAndCheck('Light Grey', '#D3D3D3', [190, 190, 190])
+      await setApperanceAndCheck('Light Grey', '#D3D3D3', [176, 176, 176])
-      await setApperanceAndCheck('White', '#FFFFFF', [200, 200, 200])
+      await setApperanceAndCheck('White', '#FFFFFF', [184, 184, 184])
       await setApperanceAndCheck(
         'Default (clear appearance)',
         'default',

e2e/playwright/projects.spec.ts

@@ -556,7 +556,7 @@ test(
     await context.folderSetupFn(async (dir) => {
       await fsp.mkdir(`${dir}/router-template-slate`, { recursive: true })
       await fsp.copyFile(
-        'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
+        'rust/kcl-lib/e2e/executor/inputs/router-template-slate.kcl',
         `${dir}/router-template-slate/main.kcl`
       )
       const _1975 = new Date('1975-01-01T00:01:11')
@@ -564,7 +564,7 @@ test(
 
       await fsp.mkdir(`${dir}/bracket`, { recursive: true })
       await fsp.copyFile(
-        'src/wasm-lib/tests/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
+        'rust/kcl-lib/e2e/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
         `${dir}/bracket/main.kcl`
       )
       const _1985 = new Date('1985-01-01T00:02:22')
@@ -573,7 +573,7 @@ test(
       await new Promise((r) => setTimeout(r, 1_000))
       await fsp.mkdir(`${dir}/lego`, { recursive: true })
       await fsp.copyFile(
-        'src/wasm-lib/tests/executor/inputs/lego.kcl',
+        'rust/kcl-lib/e2e/executor/inputs/lego.kcl',
         `${dir}/lego/main.kcl`
       )
       const _1995 = new Date('1995-01-01T00:03:33')
@@ -755,7 +755,7 @@ test(
     await context.folderSetupFn(async (dir) => {
       await fsp.mkdir(`${dir}/router-template-slate`, { recursive: true })
       await fsp.copyFile(
-        'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
+        'rust/kcl-lib/e2e/executor/inputs/router-template-slate.kcl',
         `${dir}/router-template-slate/main.kcl`
       )
     })
@@ -785,7 +785,7 @@ test.describe(`Project management commands`, () => {
       await context.folderSetupFn(async (dir) => {
         await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
         await fsp.copyFile(
-          'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
+          'rust/kcl-lib/e2e/executor/inputs/router-template-slate.kcl',
           `${dir}/${projectName}/main.kcl`
         )
       })
@@ -846,7 +846,7 @@ test.describe(`Project management commands`, () => {
       await context.folderSetupFn(async (dir) => {
         await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
         await fsp.copyFile(
-          'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
+          'rust/kcl-lib/e2e/executor/inputs/router-template-slate.kcl',
           `${dir}/${projectName}/main.kcl`
         )
       })
@@ -897,7 +897,7 @@ test.describe(`Project management commands`, () => {
       await context.folderSetupFn(async (dir) => {
         await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
         await fsp.copyFile(
-          'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
+          'rust/kcl-lib/e2e/executor/inputs/router-template-slate.kcl',
           `${dir}/${projectName}/main.kcl`
         )
       })
@@ -952,7 +952,7 @@ test.describe(`Project management commands`, () => {
       await context.folderSetupFn(async (dir) => {
         await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
         await fsp.copyFile(
-          'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
+          'rust/kcl-lib/e2e/executor/inputs/router-template-slate.kcl',
           `${dir}/${projectName}/main.kcl`
         )
       })
@@ -1123,11 +1123,11 @@ test(
     await context.folderSetupFn(async (dir) => {
       await fsp.mkdir(`${dir}/${projectName}`, { recursive: true })
       await fsp.copyFile(
-        'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
+        'rust/kcl-lib/e2e/executor/inputs/router-template-slate.kcl',
         `${dir}/${projectName}/main.kcl`
       )
       await fsp.copyFile(
-        'src/wasm-lib/tests/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
+        'rust/kcl-lib/e2e/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
         `${dir}/${projectName}/otherThingToClickOn.kcl`
       )
     })
@@ -1540,9 +1540,9 @@ test(
       })
       await fsp.copyFile(
         path.join(
-          'src',
+          'rust',
-          'wasm-lib',
+          'kcl-lib',
-          'tests',
+          'e2e',
           'executor',
           'inputs',
           'router-template-slate.kcl'
@@ -1552,9 +1552,9 @@ test(
       await fsp.mkdir(path.join(dir, 'bracket'), { recursive: true })
       await fsp.copyFile(
         path.join(
-          'src',
+          'rust',
-          'wasm-lib',
+          'kcl-lib',
-          'tests',
+          'e2e',
           'executor',
           'inputs',
           'focusrite_scarlett_mounting_braket.kcl'
@@ -1673,11 +1673,11 @@ test(
       ])
       await Promise.all([
         fsp.copyFile(
-          'src/wasm-lib/tests/executor/inputs/router-template-slate.kcl',
+          'rust/kcl-lib/e2e/executor/inputs/router-template-slate.kcl',
           `${dir}/router-template-slate/main.kcl`
         ),
         fsp.copyFile(
-          'src/wasm-lib/tests/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
+          'rust/kcl-lib/e2e/executor/inputs/focusrite_scarlett_mounting_braket.kcl',
           `${dir}/bracket/main.kcl`
         ),
       ])
@@ -1928,7 +1928,7 @@ test(
   { tag: '@electron' },
   async ({ context, page }, testInfo) => {
     await context.folderSetupFn(async (dir) => {
-      // src/wasm-lib/tests/executor/inputs/mike_stress_test.kcl
+      // rust/kcl-lib/e2e/executor/inputs/mike_stress_test.kcl
       const name = 'mike_stress_test'
       const testDir = path.join(dir, name)
       await fsp.mkdir(testDir, { recursive: true })

e2e/playwright/prompt-to-edit.spec.ts

@@ -12,10 +12,10 @@ profile001 = startProfileAt([57.81, 250.51], sketch001)
   |> close()
 extrude001 = extrude(profile001, length = 200)
 sketch002 = startSketchOn('XZ')
-  |> startProfileAt([-73.64, -42.89], %)
+  |> startProfileAt([-114, 85.52], %)
-  |> xLine(173.71, %)
+  |> xLine(265.36, %)
-  |> line(end = [-22.12, -94.4])
+  |> line(end = [33.17, -261.22])
-  |> xLine(-156.98, %)
+  |> xLine(-297.25, %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 extrude002 = extrude(sketch002, length = 50)
@@ -62,8 +62,8 @@ test.describe('Prompt-to-edit tests', { tag: '@skipWin' }, () => {
         await homePage.goToModelingScene()
         await scene.waitForExecutionDone()
 
-        const body1CapCoords = { x: 571, y: 351 }
+        const body1CapCoords = { x: 571, y: 311 }
-        const greenCheckCoords = { x: 565, y: 345 }
+        const greenCheckCoords = { x: 565, y: 305 }
         const body2WallCoords = { x: 609, y: 153 }
         const [clickBody1Cap] = scene.makeMouseHelpers(
           body1CapCoords.x,
@@ -88,7 +88,7 @@ test.describe('Prompt-to-edit tests', { tag: '@skipWin' }, () => {
           await scene.expectPixelColor(yellow, body1CapCoords, 20)
           await editor.expectState({
             highlightedCode: '',
-            activeLines: ['|>startProfileAt([-73.64,-42.89],%)'],
+            activeLines: ['|>startProfileAt([-114,85.52],%)'],
             diagnostics: [],
           })
         })
@@ -157,7 +157,7 @@ test.describe('Prompt-to-edit tests', { tag: '@skipWin' }, () => {
     await homePage.goToModelingScene()
     await scene.waitForExecutionDone()
 
-    const body1CapCoords = { x: 571, y: 351 }
+    const body1CapCoords = { x: 571, y: 311 }
     const [clickBody1Cap] = scene.makeMouseHelpers(
       body1CapCoords.x,
       body1CapCoords.y
@@ -176,7 +176,7 @@ test.describe('Prompt-to-edit tests', { tag: '@skipWin' }, () => {
 
       await editor.expectState({
         highlightedCode: '',
-        activeLines: ['|>startProfileAt([-73.64,-42.89],%)'],
+        activeLines: ['|>startProfileAt([-114,85.52],%)'],
         diagnostics: [],
       })
     })
@@ -204,7 +204,7 @@ test.describe('Prompt-to-edit tests', { tag: '@skipWin' }, () => {
     page,
     scene,
   }) => {
-    const body1CapCoords = { x: 571, y: 351 }
+    const body1CapCoords = { x: 571, y: 311 }
 
     await context.addInitScript((file) => {
       localStorage.setItem('persistCode', file)
@@ -263,7 +263,7 @@ test.describe('Prompt-to-edit tests', { tag: '@skipWin' }, () => {
     page,
     scene,
   }) => {
-    const body1CapCoords = { x: 571, y: 351 }
+    const body1CapCoords = { x: 571, y: 311 }
     const body2WallCoords = { x: 620, y: 152 }
     const [clickBody1Cap] = scene.makeMouseHelpers(
       body1CapCoords.x,
@@ -299,7 +299,7 @@ test.describe('Prompt-to-edit tests', { tag: '@skipWin' }, () => {
       // Hold shift and select second body
       await editor.expectState({
         highlightedCode: '',
-        activeLines: ['|>startProfileAt([-73.64,-42.89],%)'],
+        activeLines: ['|>startProfileAt([-114,85.52],%)'],
         diagnostics: [],
       })
       await page.keyboard.down('Shift')
@@ -310,7 +310,7 @@ test.describe('Prompt-to-edit tests', { tag: '@skipWin' }, () => {
           'line(end=[121.13,56.63],tag=$seg02)extrude(profile001,length=200)',
         activeLines: [
           '|>line(end=[121.13,56.63],tag=$seg02)',
-          '|>startProfileAt([-73.64,-42.89],%)',
+          '|>startProfileAt([-114,85.52],%)',
         ],
         diagnostics: [],
       })

e2e/playwright/regression-tests.spec.ts

@@ -20,7 +20,8 @@ test.describe('Regression tests', { tag: ['@skipWin'] }, () => {
       localStorage.setItem(
         'persistCode',
         `sketch2 = startSketchOn("XY")
-  sketch001 = startSketchAt([-0, -0])
+  sketch001 = startSketchOn("XY")
+    |> startProfileAt([-0, -0], %)
     |> line(end = [0, 0])
     |> line(end = [-4.84, -5.29])
     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])

e2e/playwright/sketch-tests.spec.ts

@@ -367,7 +367,7 @@ sketch001 = startProfileAt([12.34, -12.34], sketch002)
       localStorage.setItem(
         'persistCode',
         `sketch001 = startSketchOn('XZ')
-    |> circle({ center = [4.61, -5.01], radius = 8 }, %)`
+    |> circle(center = [4.61, -5.01], radius = 8)`
       )
     })
 
@@ -403,9 +403,7 @@ sketch001 = startProfileAt([12.34, -12.34], sketch002)
 
     const dragPX = 40
 
-    await page
+    await page.getByText('circle(center = [4.61, -5.01], radius = 8)').click()
-      .getByText('circle({ center = [4.61, -5.01], radius = 8 }, %)')
-      .click()
     await expect(
       page.getByRole('button', { name: 'Edit Sketch' })
     ).toBeVisible()
@@ -444,7 +442,7 @@ sketch001 = startProfileAt([12.34, -12.34], sketch002)
     // expect the code to have changed
     await editor.expectEditor.toContain(
       `sketch001 = startSketchOn('XZ')
-    |> circle({ center = [7.26, -2.37], radius = 11.44 }, %)`,
+    |> circle(center = [7.26, -2.37], radius = 11.44)`,
       { shouldNormalise: true }
     )
   })
@@ -1245,7 +1243,7 @@ test.describe('Sketch mode should be toleratant to syntax errors', () => {
         path.resolve(
           __dirname,
           '../../',
-          './src/wasm-lib/tests/executor/inputs/e2e-can-sketch-on-chamfer.kcl'
+          './rust/kcl-lib/e2e/executor/inputs/e2e-can-sketch-on-chamfer.kcl'
         ),
         'utf-8'
       )
@@ -1390,12 +1388,14 @@ profile002 = startProfileAt([117.2, 56.08], sketch001)
         await toolbar.circleBtn.click()
         await page.waitForTimeout(100)
         await circlePoint1()
-        await editor.expectEditor.toContain('profile003 = circle({ center = [')
+        await editor.expectEditor.toContain(
+          'profile003 = circle(sketch001, center = ['
+        )
       })
 
       await test.step('equip line tool and verify circle code is removed', async () => {
         await toolbar.lineBtn.click()
-        await editor.expectEditor.not.toContain('profile003 = circle({')
+        await editor.expectEditor.not.toContain('profile003 = circle(')
       })
 
       const [circle3Point1] = scene.makeMouseHelpers(650, 200)
@@ -1649,7 +1649,7 @@ profile003 = startProfileAt([206.63, -56.73], sketch001)
       await circle1Radius({ delay: 500 })
       await page.waitForTimeout(300)
       await editor.expectEditor.toContain(
-        `profile003 = circle({ center = [23.19, 6.98], radius = 2.5 }, sketch001)`
+        `profile003 = circle(sketch001, center = [23.19, 6.98], radius = 2.5)`
       )
 
       await test.step('hover in empty space to wait for overlays to get out of the way', async () => {
@@ -1661,7 +1661,7 @@ profile003 = startProfileAt([206.63, -56.73], sketch001)
       await page.waitForTimeout(300)
       await circle2Radius()
       await editor.expectEditor.toContain(
-        `profile004 = circle({ center = [23.74, 1.9], radius = 0.72 }, sketch001)`
+        `profile004 = circle(sketch001, center = [23.74, 1.9], radius = 0.72)`
       )
     })
     await test.step('create two corner rectangles in a row without unequip', async () => {
@@ -1855,7 +1855,7 @@ profile002 = startProfileAt([11.19, 5.02], sketch001)
      ], %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-profile003 = circle({ center = [6.92, -4.2], radius = 3.16 }, sketch001)
+profile003 = circle(sketch001, center = [6.92, -4.2], radius = 3.16)
 profile004 = circleThreePoint(sketch001, p1 = [13.44, -6.8], p2 = [13.39, -2.07], p3 = [18.75, -4.41])
 `
         )
@@ -1931,7 +1931,7 @@ profile004 = circleThreePoint(sketch001, p1 = [13.44, -6.8], p2 = [13.39, -2.07]
         await dragCircleTo()
         await page.mouse.up()
         await editor.expectEditor.toContain(
-          `profile003 = circle({ center = [6.92, -4.2], radius = 4.81 }, sketch001)`
+          `profile003 = circle(sketch001, center = [6.92, -4.2], radius = 4.81)`
         )
       })
 
@@ -2000,7 +2000,7 @@ profile002 = startProfileAt([11.19, 5.02], sketch001)
      ], %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-profile003 = circle({ center = [6.92, -4.2], radius = 3.16 }, sketch001)
+profile003 = circle(sketch001, center = [6.92, -4.2], radius = 3.16)
 `
         )
       })
@@ -2108,10 +2108,11 @@ profile003 = startProfileAt([16.79, 38.24], sketch001)
      ], %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-profile004 = circle({
+profile004 = circle(
+  sketch001,
   center = [280.45, 47.57],
   radius = 55.26
-}, sketch001)
+)
 extrude002 = extrude(profile001, length = 50)
 extrude001 = extrude(profile003, length = 5)
 `
@@ -2173,10 +2174,11 @@ extrude001 = extrude(profile003, length = 5)
         'myVar = 5',
         `myVar = 5
   sketch001 = startSketchOn('XZ')
-  profile001 = circle({
+  profile001 = circle(
+    sketch001,
     center = [12.41, 3.87],
     radius = myVar
-  }, sketch001)`
+  )`
       )
 
       await scene.expectPixelColor([255, 255, 255], { x: 633, y: 211 }, 15)
@@ -2320,7 +2322,7 @@ profile004 = startProfileAt([3.15, 9.39], sketch002)
   |> line(end = [-7.41, -2.85])
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-profile005 = circle({ center = [5.15, 4.34], radius = 1.66 }, sketch002)
+profile005 = circle(sketch002, center = [5.15, 4.34], radius = 1.66)
 profile006 = startProfileAt([9.65, 3.82], sketch002)
   |> line(end = [2.38, 5.62])
   |> line(end = [2.13, -5.57])
@@ -2345,10 +2347,11 @@ profile009 = startProfileAt([5.23, 1.95], sketch003)
   |> line(end = [7.34, -2.75])
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-profile010 = circle({
+profile010 = circle(
+  sketch003,
   center = [7.18, -2.11],
   radius = 2.67
-}, sketch003)
+)
 profile011 = startProfileAt([5.07, -6.39], sketch003)
   |> angledLine([0, 4.54], %, $rectangleSegmentA002)
   |> angledLine([
@@ -2468,7 +2471,7 @@ extrude003 = extrude(profile011, length = 2.5)
         })
 
       const verifyCapProfilesAreDrawn = async () =>
-        test.step('verify wall profiles are drawn', async () => {
+        test.step('verify cap profiles are drawn', async () => {
           // open polygon
           await scene.expectPixelColor(
             TEST_COLORS.WHITE,
@@ -2519,13 +2522,14 @@ extrude003 = extrude(profile011, length = 2.5)
         }
       })
 
-      await test.step('select cap profiles', async () => {
+      /* FIXME: the cap part of this test is insanely flaky, and I'm not sure
+       * why.
+       * await test.step('select cap profiles', async () => {
         for (const { title, selectClick } of capSelectionOptions) {
           await test.step(title, async () => {
             await camPositionForSelectingSketchOnCapProfiles()
             await page.waitForTimeout(100)
             await selectClick()
-            await page.waitForTimeout(100)
             await toolbar.editSketch()
             await page.waitForTimeout(600)
             await verifyCapProfilesAreDrawn()
@@ -2533,7 +2537,7 @@ extrude003 = extrude(profile011, length = 2.5)
             await page.waitForTimeout(100)
           })
         }
-      })
+      }) */
     }
   )
   test(

e2e/playwright/snapshot-tests.spec.ts

@@ -599,7 +599,7 @@ test(
       mask: [page.getByTestId('model-state-indicator')],
     })
     await expect(page.locator('.cm-content')).toHaveText(
-      `sketch001 = startSketchOn('XZ')profile001 = circle({ center = [14.44, -2.44], radius = 1 }, sketch001)`
+      `sketch001 = startSketchOn('XZ')profile001 = circle(sketch001, center = [14.44, -2.44], radius = 1)`
     )
   }
 )

e2e/playwright/snapshots/prompt-to-edit/prompt-to-edit-snapshot-tests-spec-ts--change-colour.snap.json

@@ -29,5 +29,5 @@
       }
     }
   ],
-  "kcl_version": "0.2.41"
+  "kcl_version": "0.2.45"
 }

e2e/playwright/storageStates.ts

@@ -10,13 +10,13 @@ export const TEST_SETTINGS = {
     theme: Themes.Dark,
     onboardingStatus: 'dismissed',
     projectDirectory: '',
-    enableSSAO: false,
+    showDebugPanel: true,
   },
   modeling: {
+    enableSSAO: false,
     defaultUnit: 'in',
     mouseControls: 'Zoo',
     cameraProjection: 'perspective',
-    showDebugPanel: true,
   },
   projects: {
     defaultProjectName: 'project-$nnn',
@@ -59,12 +59,12 @@ export const TEST_SETTINGS_CORRUPTED = {
     theme: Themes.Dark,
     onboardingStatus: 'dismissed',
     projectDirectory: 123 as any,
+    showDebugPanel: true,
   },
   modeling: {
     defaultUnit: 'invalid' as any,
     mouseControls: `() => alert('hack the planet')` as any,
     cameraProjection: 'perspective',
-    showDebugPanel: true,
   },
   projects: {
     defaultProjectName: false as any,

e2e/playwright/test-utils.ts

@@ -1113,7 +1113,7 @@ export async function createProject({
 }
 
 export function executorInputPath(fileName: string): string {
-  return path.join('src', 'wasm-lib', 'tests', 'executor', 'inputs', fileName)
+  return path.join('rust', 'kcl-lib', 'e2e', 'executor', 'inputs', fileName)
 }
 
 export async function doAndWaitForImageDiff(

e2e/playwright/testing-gizmo.spec.ts

@@ -243,7 +243,7 @@ test.describe('Testing Gizmo', { tag: ['@skipWin'] }, () => {
 })
 
 test.describe(`Testing gizmo, fixture-based`, () => {
-  test('Center on selection from menu', async ({
+  test('Center on selection from menu, disable interaction in sketch mode', async ({
     context,
     page,
     homePage,
@@ -269,10 +269,7 @@ test.describe(`Testing gizmo, fixture-based`, () => {
              ], %)
           |> close()
         const sketch001 = startSketchOn('XZ')
-          |> circle({
+          |> circle(center = [818.33, 168.1], radius = 182.8)
-               center: [818.33, 168.1],
-               radius: 182.8
-             }, %)
           |> extrude(length = 50)
       `
       )
@@ -295,12 +292,11 @@ test.describe(`Testing gizmo, fixture-based`, () => {
     const [clickCircle, moveToCircle] = scene.makeMouseHelpers(582, 217)
 
     await test.step(`Select an edge of this circle`, async () => {
-      const circleSnippet =
+      const circleSnippet = 'circle(center = [818.33, 168.1], radius = 182.8)'
-        'circle({ center: [818.33, 168.1], radius: 182.8 }, %)'
       await moveToCircle()
       await clickCircle()
       await editor.expectState({
-        activeLines: [circleSnippet.slice(-5)],
+        activeLines: ['|>' + circleSnippet],
         highlightedCode: circleSnippet,
         diagnostics: [],
       })
@@ -318,5 +314,26 @@ test.describe(`Testing gizmo, fixture-based`, () => {
         },
       })
     })
+
+    await test.step(`Gizmo should be disabled when in sketch mode`, async () => {
+      const sketchModeButton = page.getByRole('button', {
+        name: 'Edit sketch',
+      })
+      const exitSketchButton = page.getByRole('button', {
+        name: 'Exit sketch',
+      })
+
+      await sketchModeButton.click()
+      await expect(exitSketchButton).toBeVisible()
+      const gizmoPopoverButton = page.getByRole('button', {
+        name: 'view settings',
+      })
+      await gizmoPopoverButton.click()
+      const buttonToTest = page.getByRole('button', {
+        name: 'right view',
+      })
+      await expect(buttonToTest).toBeVisible()
+      await expect(buttonToTest).toBeDisabled()
+    })
   })
 })

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

@@ -825,7 +825,7 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => {
           localStorage.setItem(
             'persistCode',
             `part001 = startSketchOn('XZ')
-      |> circle({ center = [1 + 0, 0], radius = 8 }, %)
+      |> circle(center = [1 + 0, 0], radius = 8)
     `
           )
           localStorage.setItem('disableAxis', 'true')
@@ -840,9 +840,7 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => {
         await u.expectCmdLog('[data-message-type="execution-done"]')
         await u.closeDebugPanel()
 
-        await page
+        await page.getByText('circle(center = [1 + 0, 0], radius = 8)').click()
-          .getByText('circle({ center = [1 + 0, 0], radius = 8 }, %)')
-          .click()
         await page.waitForTimeout(100)
         await page.getByRole('button', { name: 'Edit Sketch' }).click()
         await page.waitForTimeout(500)
@@ -859,11 +857,9 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => {
         await clickConstrained({
           hoverPos,
           constraintType: 'xAbsolute',
-          expectBeforeUnconstrained:
+          expectBeforeUnconstrained: 'circle(center = [1 + 0, 0], radius = 8)',
-            'circle({ center = [1 + 0, 0], radius = 8 }, %)',
+          expectAfterUnconstrained: 'circle(center = [1, 0], radius = 8)',
-          expectAfterUnconstrained:
+          expectFinal: 'circle(center = [xAbs001, 0], radius = 8)',
-            'circle({ center = [1, 0], radius = 8 }, %)',
-          expectFinal: 'circle({ center = [xAbs001, 0], radius = 8 }, %)',
           ang: ang + 105,
           steps: 6,
           locator: '[data-overlay-toolbar-index="0"]',
@@ -873,10 +869,10 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => {
           hoverPos,
           constraintType: 'yAbsolute',
           expectBeforeUnconstrained:
-            'circle({ center = [xAbs001, 0], radius = 8 }, %)',
+            'circle(center = [xAbs001, 0], radius = 8)',
           expectAfterUnconstrained:
-            'circle({ center = [xAbs001, yAbs001], radius =  8 }, %)',
+            'circle(center = [xAbs001, yAbs001], radius =  8)',
-          expectFinal: 'circle({ center = [xAbs001, 0], radius =  8 }, %)',
+          expectFinal: 'circle(center = [xAbs001, 0], radius =  8)',
           ang: ang + 180,
           steps: 30,
           locator: '[data-overlay-toolbar-index="0"]',
@@ -886,10 +882,10 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => {
           hoverPos,
           constraintType: 'radius',
           expectBeforeUnconstrained:
-            'circle({ center = [xAbs001, 0], radius = 8 }, %)',
+            'circle(center = [xAbs001, 0], radius = 8)',
           expectAfterUnconstrained:
-            'circle({ center = [xAbs001, 0], radius = radius001 }, %)',
+            'circle(center = [xAbs001, 0], radius = radius001)',
-          expectFinal: 'circle({ center = [xAbs001, 0], radius = 8 }, %)',
+          expectFinal: 'circle(center = [xAbs001, 0], radius = 8)',
           ang: ang + 105,
           steps: 10,
           locator: '[data-overlay-toolbar-index="0"]',

e2e/playwright/testing-selections.spec.ts

@@ -320,10 +320,11 @@ part009 = startSketchOn('XY')
   |> close()
 rev = revolve({ axis = 'y' }, part009)
 sketch006 = startSketchOn('XY')
-profile001 = circle({
+profile001 = circle(
+  sketch006,
   center = [42.91, -70.42],
   radius = 17.96
-}, sketch006)
+)
 profile002 = startProfileAt([86.92, -63.81], sketch006)
   |> angledLine([0, 63.81], %, $rectangleSegmentA001)
   |> angledLine([

e2e/playwright/testing-settings.spec.ts

@@ -62,7 +62,7 @@ test.describe('Testing settings', () => {
         name: 'Settings',
         exact: true,
       })
-      const inputLocator = page.locator('input[name="modeling-showDebugPanel"]')
+      const inputLocator = page.locator('input[name="app-showDebugPanel"]')
 
       await test.step('Open settings dialog and set "Show debug panel" to on', async () => {
         await page.keyboard.press('ControlOrMeta+,')
@@ -125,7 +125,7 @@ test.describe('Testing settings', () => {
       // Check that the project setting did not change
       await page.getByRole('radio', { name: 'Project' }).click()
       await expect(
-        page.locator('input[name="modeling-showDebugPanel"]')
+        page.locator('input[name="app-showDebugPanel"]')
       ).not.toBeChecked()
     }
   )
@@ -833,7 +833,8 @@ test.describe('Testing settings', () => {
       // but "show debug panel" set to false
       appSettings: {
         ...TEST_SETTINGS,
-        modeling: { ...TEST_SETTINGS.modeling, showDebugPanel: false },
+        app: { ...TEST_SETTINGS.app, showDebugPanel: false },
+        modeling: { ...TEST_SETTINGS.modeling },
       },
     },
     async ({ context, page, homePage }) => {
@@ -853,7 +854,7 @@ test.describe('Testing settings', () => {
       const debugPaneButton = page.getByTestId('debug-pane-button')
       const commandsButton = page.getByRole('button', { name: 'Commands' })
       const debugPaneOption = page.getByRole('option', {
-        name: 'Settings · modeling · show debug panel',
+        name: 'Settings · app · show debug panel',
       })
 
       async function setShowDebugPanelTo(value: 'On' | 'Off') {

package.json

@@ -82,7 +82,7 @@
     "build:both": "vite build",
     "build:both:local": "yarn build:wasm && vite build",
     "pretest": "yarn remove-importmeta",
-    "test:rust": "(cd src/wasm-lib && cargo test --workspace && cargo clippy --workspace --all-targets)",
+    "test:rust": "(cd rust && just test && just lint)",
     "simpleserver": "yarn pretest && http-server ./public --cors -p 3000",
     "simpleserver:ci": "yarn pretest && http-server ./public --cors -p 3000 &",
     "simpleserver:bg": "yarn pretest && http-server ./public --cors -p 3000 &",
@@ -92,12 +92,12 @@
     "fetch:wasm": "./scripts/get-latest-wasm-bundle.sh",
     "fetch:wasm:windows": "./scripts/get-latest-wasm-bundle.ps1",
     "fetch:samples": "echo \"Fetching latest KCL samples...\" && curl -o public/kcl-samples-manifest-fallback.json https://raw.githubusercontent.com/KittyCAD/kcl-samples/next/manifest.json",
-    "build:wasm-dev": "yarn wasm-prep && (cd src/wasm-lib && wasm-pack build --dev --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && yarn isomorphic-copy-wasm && yarn fmt",
+    "build:wasm-dev": "yarn wasm-prep && (cd rust && wasm-pack build kcl-wasm-lib --dev --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && yarn isomorphic-copy-wasm && yarn fmt",
-    "build:wasm:nocopy": "yarn wasm-prep && cd src/wasm-lib && wasm-pack build --release --target web --out-dir pkg && cargo test -p kcl-lib export_bindings",
+    "build:wasm:nocopy": "yarn wasm-prep && cd rust && wasm-pack build kcl-wasm-lib --release  --target web --out-dir pkg && cargo test -p kcl-lib export_bindings",
-    "build:wasm": "yarn build:wasm:nocopy && cp src/wasm-lib/pkg/wasm_lib_bg.wasm public && yarn fmt",
+    "build:wasm": "yarn build:wasm:nocopy && cp rust/kcl-wasm-lib/pkg/kcl_wasm_lib_bg.wasm public && yarn fmt",
     "build:wasm:windows": "yarn install:wasm-pack:cargo && yarn build:wasm:nocopy && ./scripts/copy-wasm.ps1  && yarn fmt",
-    "remove-importmeta": "sed -i 's/import.meta.url/window.location.origin/g' \"./src/wasm-lib/pkg/wasm_lib.js\"; sed -i '' 's/import.meta.url/window.location.origin/g' \"./src/wasm-lib/pkg/wasm_lib.js\" || echo \"sed for both mac and linux\"",
+    "remove-importmeta": "sed -i 's/import.meta.url/window.location.origin/g' \"./rust/kcl-wasm-lib/pkg/kcl_wasm_lib.js\"; sed -i '' 's/import.meta.url/window.location.origin/g' \"./rust/kcl-wasm-lib/pkg/kcl_wasm_lib.js\" || echo \"sed for both mac and linux\"",
-    "wasm-prep": "rimraf src/wasm-lib/pkg && mkdirp src/wasm-lib/pkg && rimraf src/wasm-lib/kcl/bindings",
+    "wasm-prep": "rimraf rust/kcl-wasm-lib/pkg && mkdirp rust/kcl-wasm-lib/pkg && rimraf rust/kcl-lib/bindings",
     "lint-fix": "eslint --fix --ext .ts --ext .tsx src e2e packages/codemirror-lsp-client/src",
     "lint": "eslint --max-warnings 0 --ext .ts --ext .tsx src e2e packages/codemirror-lsp-client/src",
     "files:set-version": "echo \"$(jq --arg v \"$VERSION\" '.version=$v' package.json --indent 2)\" > package.json",

public/kcl-samples-manifest-fallback.json

@@ -125,6 +125,34 @@
     "title": "100mm Gear Rack",
     "description": "A flat bar or rail that is engraved with teeth along its length. These teeth are designed to mesh with the teeth of a gear, known as a pinion. When the pinion, a small cylindrical gear, rotates, its teeth engage with the teeth on the rack, causing the rack to move linearly. Conversely, linear motion applied to the rack will cause the pinion to rotate."
   },
+  {
+    "file": "main.kcl",
+    "pathFromProjectDirectoryToFirstFile": "gridfinity-baseplate/main.kcl",
+    "multipleFiles": false,
+    "title": "Gridfinity Baseplate",
+    "description": "Gridfinity is a system to help you work more efficiently. This is a system invented by Zack Freedman. There are two main components the baseplate and the bins. The components are comprised of a matrix of squares. Allowing easy stacking and expansion"
+  },
+  {
+    "file": "main.kcl",
+    "pathFromProjectDirectoryToFirstFile": "gridfinity-baseplate-magnets/main.kcl",
+    "multipleFiles": false,
+    "title": "Gridfinity Baseplate With Magnets",
+    "description": "Gridfinity is a system to help you work more efficiently. This is a system invented by Zack Freedman. There are two main components the baseplate and the bins. The components are comprised of a matrix of squares. Allowing easy stacking and expansion. This baseplate version includes holes for magnet placement"
+  },
+  {
+    "file": "main.kcl",
+    "pathFromProjectDirectoryToFirstFile": "gridfinity-bins/main.kcl",
+    "multipleFiles": false,
+    "title": "Gridfinity Bins",
+    "description": "Gridfinity is a system to help you work more efficiently. This is a system invented by Zack Freedman. There are two main components the baseplate and the bins. The components are comprised of a matrix of squares. Allowing easy stacking and expansion"
+  },
+  {
+    "file": "main.kcl",
+    "pathFromProjectDirectoryToFirstFile": "gridfinity-bins-stacking-lip/main.kcl",
+    "multipleFiles": false,
+    "title": "Gridfinity Bins With A Stacking Lip",
+    "description": "Gridfinity is a system to help you work more efficiently. This is a system invented by Zack Freedman. There are two main components the baseplate and the bins. The components are comprised of a matrix of squares. Allowing easy stacking and expansion. This Gridfinity bins version includes a lip to allowable stacking Gridfinity bins"
+  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "hex-nut/main.kcl",

rust/Cargo.lock

@@ -191,12 +191,6 @@ dependencies = [
  "syn 2.0.96",
 ]
 
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
 [[package]]
 name = "auto_impl"
 version = "1.2.1"
@@ -696,7 +690,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.10",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -710,7 +704,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.10",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -728,25 +722,6 @@ dependencies = [
  "powerfmt",
 ]
 
-[[package]]
-name = "derive-docs"
-version = "0.1.44"
-dependencies = [
- "Inflector",
- "anyhow",
- "convert_case",
- "expectorate",
- "once_cell",
- "pretty_assertions",
- "proc-macro2",
- "quote",
- "regex",
- "rustfmt-wrapper",
- "serde",
- "serde_tokenstream",
- "syn 2.0.96",
-]
-
 [[package]]
 name = "derive_arbitrary"
 version = "1.4.1"
@@ -798,7 +773,7 @@ dependencies = [
  "backtrace",
  "lazy_static",
  "mintex",
- "parking_lot 0.12.3",
+ "parking_lot",
  "rustc-hash 1.1.0",
  "serde",
  "serde_json",
@@ -1108,12 +1083,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60884563ea313b5037683cd5d44f1e14e9cb07b08543756242a65887f9cff48e"
 
-[[package]]
-name = "glob"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
-
 [[package]]
 name = "gloo-utils"
 version = "0.2.0"
@@ -1151,25 +1120,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "h2"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http 1.2.0",
- "indexmap 2.7.1",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
 [[package]]
 name = "half"
 version = "2.4.1"
@@ -1347,7 +1297,6 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2",
  "http 1.2.0",
  "http-body 1.0.1",
  "httparse",
@@ -1638,18 +1587,6 @@ dependencies = [
  "similar",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "ipnet"
 version = "2.11.0"
@@ -1722,9 +1659,28 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "kcl-derive-docs"
+version = "0.1.45"
+dependencies = [
+ "Inflector",
+ "anyhow",
+ "convert_case",
+ "expectorate",
+ "once_cell",
+ "pretty_assertions",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustfmt-wrapper",
+ "serde",
+ "serde_tokenstream",
+ "syn 2.0.96",
+]
+
 [[package]]
 name = "kcl-lib"
-version = "0.2.44"
+version = "0.2.45"
 dependencies = [
  "anyhow",
  "approx 0.5.1",
@@ -1737,7 +1693,6 @@ dependencies = [
  "convert_case",
  "criterion",
  "dashmap 6.1.0",
- "derive-docs",
  "dhat",
  "expectorate",
  "fnv",
@@ -1752,6 +1707,7 @@ dependencies = [
  "insta",
  "itertools 0.13.0",
  "js-sys",
+ "kcl-derive-docs",
  "kittycad",
  "kittycad-modeling-cmds",
  "lazy_static",
@@ -1778,7 +1734,6 @@ dependencies = [
  "ts-rs",
  "twenty-twenty",
  "url",
- "urlencoding",
  "uuid",
  "validator",
  "wasm-bindgen",
@@ -1789,9 +1744,24 @@ dependencies = [
  "zip",
 ]
 
+[[package]]
+name = "kcl-python-bindings"
+version = "0.3.45"
+dependencies = [
+ "anyhow",
+ "kcl-lib",
+ "kittycad-modeling-cmds",
+ "miette",
+ "pyo3",
+ "serde",
+ "serde_json",
+ "tokio",
+ "uuid",
+]
+
 [[package]]
 name = "kcl-test-server"
-version = "0.1.44"
+version = "0.1.45"
 dependencies = [
  "anyhow",
  "hyper 0.14.32",
@@ -1816,6 +1786,30 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "kcl-wasm-lib"
+version = "0.1.0"
+dependencies = [
+ "bson",
+ "console_error_panic_hook",
+ "data-encoding",
+ "futures",
+ "getrandom 0.2.15",
+ "gloo-utils",
+ "js-sys",
+ "kcl-lib",
+ "kittycad",
+ "serde_json",
+ "tokio",
+ "toml",
+ "tower-lsp",
+ "uuid",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams",
+ "web-sys",
+]
+
 [[package]]
 name = "kittycad"
 version = "0.3.28"
@@ -1840,10 +1834,6 @@ dependencies = [
  "phonenumber",
  "rand 0.8.5",
  "reqwest",
- "reqwest-conditional-middleware",
- "reqwest-middleware",
- "reqwest-retry",
- "reqwest-tracing",
  "schemars",
  "serde",
  "serde_bytes",
@@ -1858,9 +1848,9 @@ dependencies = [
 
 [[package]]
 name = "kittycad-modeling-cmds"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "828a0c74476533e6258ea7dd70cfc7d63a5df4b37753d30ef198e0689eaac4eb"
+checksum = "fb5a824cb9bb4c602962ecbaca5ce71225938aa1abc24103bf46c222f468dd26"
 dependencies = [
  "anyhow",
  "chrono",
@@ -1994,12 +1984,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "matchit"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f926ade0c4e170215ae43342bf13b9310a437609c81f29f86c5df6657582ef9"
-
 [[package]]
 name = "measurements"
 version = "0.11.0"
@@ -2220,38 +2204,6 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
-[[package]]
-name = "opentelemetry"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c365a63eec4f55b7efeceb724f1336f26a9cf3427b70e59e2cd2a5b947fba96"
-dependencies = [
- "futures-core",
- "futures-sink",
- "js-sys",
- "once_cell",
- "pin-project-lite",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "opentelemetry_sdk"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692eac490ec80f24a17828d49b40b60f5aeaccdfe6a503f939713afd22bc28df"
-dependencies = [
- "async-trait",
- "futures-channel",
- "futures-executor",
- "futures-util",
- "glob",
- "once_cell",
- "opentelemetry",
- "percent-encoding",
- "rand 0.8.5",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "owo-colors"
 version = "4.1.0"
@@ -2269,17 +2221,6 @@ dependencies = [
  "unicode-width 0.1.14",
 ]
 
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.6",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
@@ -2287,21 +2228,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.10",
+ "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "winapi",
 ]
 
 [[package]]
@@ -2312,7 +2239,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.8",
+ "redox_syscall",
  "smallvec",
  "windows-targets",
 ]
@@ -2618,6 +2545,7 @@ dependencies = [
  "pyo3-build-config",
  "pyo3-ffi",
  "pyo3-macros",
+ "serde",
  "unindent",
 ]
 
@@ -2829,15 +2757,6 @@ dependencies = [
  "rand_core 0.3.1",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.5.8"
@@ -2904,7 +2823,6 @@ dependencies = [
  "bytes",
  "futures-core",
  "futures-util",
- "h2",
  "http 1.2.0",
  "http-body 1.0.1",
  "http-body-util",
@@ -2941,82 +2859,6 @@ dependencies = [
  "windows-registry",
 ]
 
-[[package]]
-name = "reqwest-conditional-middleware"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f67ad7fdf5c0a015763fcd164bee294b13fb7b6f89f1b55961d40f00c3e32d6b"
-dependencies = [
- "async-trait",
- "http 1.2.0",
- "reqwest",
- "reqwest-middleware",
-]
-
-[[package]]
-name = "reqwest-middleware"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1ccd3b55e711f91a9885a2fa6fbbb2e39db1776420b062efc058c6410f7e5e3"
-dependencies = [
- "anyhow",
- "async-trait",
- "http 1.2.0",
- "reqwest",
- "serde",
- "thiserror 1.0.69",
- "tower-service",
-]
-
-[[package]]
-name = "reqwest-retry"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c73e4195a6bfbcb174b790d9b3407ab90646976c55de58a6515da25d851178"
-dependencies = [
- "anyhow",
- "async-trait",
- "futures",
- "getrandom 0.2.15",
- "http 1.2.0",
- "hyper 1.5.2",
- "parking_lot 0.11.2",
- "reqwest",
- "reqwest-middleware",
- "retry-policies",
- "thiserror 1.0.69",
- "tokio",
- "tracing",
- "wasm-timer",
-]
-
-[[package]]
-name = "reqwest-tracing"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73e6153390585f6961341b50e5a1931d6be6dee4292283635903c26ef9d980d2"
-dependencies = [
- "anyhow",
- "async-trait",
- "getrandom 0.2.15",
- "http 1.2.0",
- "matchit",
- "opentelemetry",
- "reqwest",
- "reqwest-middleware",
- "tracing",
- "tracing-opentelemetry",
-]
-
-[[package]]
-name = "retry-policies"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5875471e6cab2871bc150ecb8c727db5113c9338cc3354dc5ee3425b6aa40a1c"
-dependencies = [
- "rand 0.8.5",
-]
-
 [[package]]
 name = "rgba_simple"
 version = "0.10.0"
@@ -3374,15 +3216,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -3698,16 +3531,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820"
 
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
 [[package]]
 name = "time"
 version = "0.3.37"
@@ -3784,7 +3607,7 @@ dependencies = [
  "bytes",
  "libc",
  "mio",
- "parking_lot 0.12.3",
+ "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
@@ -3995,47 +3818,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-opentelemetry"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b"
-dependencies = [
- "js-sys",
- "once_cell",
- "opentelemetry",
- "opentelemetry_sdk",
- "smallvec",
- "tracing",
- "tracing-core",
- "tracing-log",
- "tracing-subscriber",
- "web-time",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
-dependencies = [
- "sharded-slab",
- "thread_local",
- "tracing-core",
 ]
 
 [[package]]
@@ -4176,12 +3958,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
 [[package]]
 name = "utf-8"
 version = "0.7.6"
@@ -4220,9 +3996,9 @@ dependencies = [
 
 [[package]]
 name = "validator"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0b4a29d8709210980a09379f27ee31549b73292c87ab9899beee1c0d3be6303"
+checksum = "43fb22e1a008ece370ce08a3e9e4447a910e92621bb49b85d6e48a45397e7cfa"
 dependencies = [
  "idna",
  "once_cell",
@@ -4236,9 +4012,9 @@ dependencies = [
 
 [[package]]
 name = "validator_derive"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bac855a2ce6f843beb229757e6e570a42e837bcb15e5f449dd48d5747d41bf77"
+checksum = "b7df16e474ef958526d1205f6dda359fdfab79d9aa6d54bafcb92dcd07673dca"
 dependencies = [
  "darling",
  "once_cell",
@@ -4248,12 +4024,6 @@ dependencies = [
  "syn 2.0.96",
 ]
 
-[[package]]
-name = "valuable"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
-
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -4366,37 +4136,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "wasm-lib"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "bson",
- "console_error_panic_hook",
- "data-encoding",
- "futures",
- "getrandom 0.2.15",
- "gloo-utils",
- "image",
- "js-sys",
- "kcl-lib",
- "kittycad",
- "kittycad-modeling-cmds",
- "lazy_static",
- "pretty_assertions",
- "reqwest",
- "serde_json",
- "tokio",
- "toml",
- "tower-lsp",
- "twenty-twenty",
- "uuid",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-streams",
- "web-sys",
-]
-
 [[package]]
 name = "wasm-streams"
 version = "0.4.2"
@@ -4410,21 +4149,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "wasm-timer"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
-dependencies = [
- "futures",
- "js-sys",
- "parking_lot 0.11.2",
- "pin-utils",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
 [[package]]
 name = "web-sys"
 version = "0.3.77"

rust/Cargo.toml

@@ -0,0 +1,50 @@
+[workspace]
+resolver = "2"
+members = [
+	"kcl-derive-docs",
+	"kcl-lib",
+	"kcl-python-bindings",
+	"kcl-test-server",
+	"kcl-to-core",
+	"kcl-wasm-lib"
+]
+
+[profile.release]
+panic = "abort"
+debug = true
+
+[profile.dev]
+debug = 0
+
+[profile.dev.package]
+insta = { opt-level = 3 }
+similar = { opt-level = 3 }
+
+[profile.test]
+debug = "line-tables-only"
+
+[workspace.dependencies]
+async-trait = "0.1.85"
+anyhow = { version = "1" }
+http = "1"
+indexmap = "2.7.0"
+kittycad = { version = "0.3.28", default-features = false, features = ["js", "requests"] }
+kittycad-modeling-cmds = { version = "0.2.100", features = ["ts-rs", "websocket"] }
+miette = "7.5.0"
+pyo3 = { version = "0.22.6" }
+serde = { version = "1", features = ["derive"] }
+serde_json = { version = "1" }
+tokio = { version = "1" }
+tower-lsp = { version = "0.20.0", default-features = false }
+uuid = { version = "1", features = ["v4", "serde"] }
+
+[workspace.lints.clippy]
+assertions_on_result_states = "warn"
+dbg_macro = "warn"
+iter_over_hash_type = "warn"
+lossy_float_literal = "warn"
+
+# Example: how to point modeling-app at a different repo (e.g. a branch or a local clone)
+#[patch.crates-io]
+#kittycad-modeling-cmds = { path = "../../../modeling-api/modeling-cmds" }
+#kittycad-modeling-session = { path = "../../../modeling-api/modeling-session" }

rust/justfile

@@ -3,7 +3,7 @@ cita := "cargo insta test --accept"
 
 # Run the same lint checks we run in CI.
 lint:
-    cargo clippy --workspace --all-targets -- -D warnings
+    cargo clippy --workspace --all-targets --tests --all-features --examples --benches -- -D warnings
 
 # Run the stdlib docs generation
 redo-kcl-stdlib-docs-no-imgs:
@@ -17,17 +17,17 @@ redo-kcl-stdlib-docs:
 
 # Copy a test KCL file from executor tests into a new simulation test.
 copy-exec-test-into-sim-test test_name:
-    mkdir -p kcl/tests/{{test_name}}
+    mkdir -p kcl-lib/tests/{{test_name}}
-    cp tests/executor/inputs/{{test_name}}.kcl kcl/tests/{{test_name}}/input.kcl
+    cp kcl-lib/e2e/executor/inputs/{{test_name}}.kcl kcl-lib/tests/{{test_name}}/input.kcl
-    zoo kcl fmt -w kcl/tests/{{test_name}}/input.kcl
+    zoo kcl fmt -w kcl-lib/tests/{{test_name}}/input.kcl
     just new-sim-test {{test_name}}
 
 # Create a new, empty KCL deterministic simulation test case.
 new-sim-test test_name render_to_png="true":
-    mkdir kcl/tests/{{test_name}}
+    mkdir kcl-lib/tests/{{test_name}}
-    touch kcl/tests/{{test_name}}/input.kcl
+    touch kcl-lib/tests/{{test_name}}/input.kcl
     # Add the various tests for this new test case.
-    cat kcl/tests/simtest.tmpl | sed "s/TEST_NAME_HERE/{{test_name}}/" | sed "s/RENDER_TO_PNG/{{render_to_png}}/" >> kcl/src/simulation_tests.rs
+    cat kcl-lib/tests/simtest.tmpl | sed "s/TEST_NAME_HERE/{{test_name}}/" | sed "s/RENDER_TO_PNG/{{render_to_png}}/" >> kcl-lib/src/simulation_tests.rs
 
 # Run a KCL deterministic simulation test case and accept output.
 run-sim-test test_name:
@@ -42,11 +42,13 @@ overwrite-sim-test test_name:
     {{cita}} -p kcl-lib -- tests::{{test_name}}::kcl_test_execute
 
 test:
-    export RUST_BRACKTRACE="full" && cargo nextest run --workspace --test-threads=1
+    export RUST_BRACKTRACE="full" && cargo nextest run --workspace --no-fail-fast
 
 publish-kcl version:
-    git tag {{version}}
+    git tag kcl-{{version}}
-    git push --tags
+    cargo publish -p kcl-derive-docs
-    cargo publish -p derive-docs
     cargo publish -p kcl-lib
     cargo publish -p kcl-test-server
+    # We push the tag at the end of publish since pushing the tag
+    # will trigger CI to release the kcl python bindings.
+    git push origin kcl-{{version}}

rust/kcl-derive-docs/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
-name = "derive-docs"
+name = "kcl-derive-docs"
 description = "A tool for generating documentation from Rust derive macros"
-version = "0.1.44"
+version = "0.1.45"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"
@@ -18,12 +18,12 @@ once_cell = "1.20.2"
 proc-macro2 = "1"
 quote = "1"
 regex = "1.11"
-serde = { version = "1.0.217", features = ["derive"] }
+serde = { workspace = true }
 serde_tokenstream = "0.2"
 syn = { version = "2.0.96", features = ["full"] }
 
 [dev-dependencies]
-anyhow = "1.0.95"
+anyhow = { workspace = true }
 expectorate = "1.1.0"
 pretty_assertions = "1.4.1"
 rustfmt-wrapper = "0.2.1"