add react perf plugin (#5645)

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

.eslintignore

@@ -1,4 +1,6 @@
-src/wasm-lib/*
+rust/**/*.ts
+!rust/kcl-language-server/client/src/**/*.ts
 *.typegen.ts
 packages/codemirror-lsp-client/dist/*
 e2e/playwright/snapshots/prompt-to-edit/*
+.vscode-test

.eslintrc

@@ -4,6 +4,7 @@
       "project": "./tsconfig.json"
     },
     "plugins": [
+      "react-perf",
       "css-modules",
       "jest",
       "jsx-a11y",

.github/actions/github-release/Dockerfile

@@ -0,0 +1,8 @@
+FROM node:slim
+
+COPY . /action
+WORKDIR /action
+
+RUN npm install --production
+
+ENTRYPOINT ["node", "/action/main.js"]

.github/actions/github-release/README.md

@@ -0,0 +1,21 @@
+# github-release
+
+Copy-pasted from
+https://github.com/bytecodealliance/wasmtime/tree/8acfdbdd8aa550d1b84e0ce1e6222a6605d14e38/.github/actions/github-release
+
+An action used to publish GitHub releases for `wasmtime`.
+
+As of the time of this writing there's a few actions floating around which
+perform github releases but they all tend to have their set of drawbacks.
+Additionally nothing handles deleting releases which we need for our rolling
+`dev` release.
+
+To handle all this, this action rolls its own implementation using the
+actions/toolkit repository and packages published there. These run in a Docker
+container and take various inputs to orchestrate the release from the build.
+
+More comments can be found in `main.js`.
+
+Testing this is really hard. If you want to try though run `npm install` and
+then `node main.js`. You'll have to configure a bunch of env vars though to get
+anything reasonably working.

.github/actions/github-release/action.yml

@@ -0,0 +1,15 @@
+name: "wasmtime github releases"
+description: "wasmtime github releases"
+inputs:
+  token:
+    description: ""
+    required: true
+  name:
+    description: ""
+    required: true
+  files:
+    description: ""
+    required: true
+runs:
+  using: "docker"
+  image: "Dockerfile"

.github/actions/github-release/main.js

@@ -0,0 +1,143 @@
+const core = require("@actions/core");
+const path = require("path");
+const fs = require("fs");
+const github = require("@actions/github");
+const glob = require("glob");
+
+function sleep(milliseconds) {
+  return new Promise((resolve) => setTimeout(resolve, milliseconds));
+}
+
+async function runOnce() {
+  // Load all our inputs and env vars. Note that `getInput` reads from `INPUT_*`
+  const files = core.getInput("files");
+  const name = core.getInput("name");
+  const token = core.getInput("token");
+  const slug = process.env.GITHUB_REPOSITORY;
+  const owner = slug.split("/")[0];
+  const repo = slug.split("/")[1];
+  const sha = process.env.HEAD_SHA;
+
+  core.info(`files: ${files}`);
+  core.info(`name: ${name}`);
+
+  const options = {
+    request: {
+      timeout: 30000,
+    },
+  };
+  const octokit = github.getOctokit(token, options);
+
+  // Delete the previous release since we can't overwrite one. This may happen
+  // due to retrying an upload or it may happen because we're doing the dev
+  // release.
+  const releases = await octokit.paginate("GET /repos/:owner/:repo/releases", { owner, repo });
+  for (const release of releases) {
+    if (release.tag_name !== name) {
+      continue;
+    }
+    const release_id = release.id;
+    core.info(`deleting release ${release_id}`);
+    await octokit.rest.repos.deleteRelease({ owner, repo, release_id });
+  }
+
+  // We also need to update the `dev` tag while we're at it on the `dev` branch.
+  if (name == "nightly") {
+    try {
+      core.info(`updating nightly tag`);
+      await octokit.rest.git.updateRef({
+        owner,
+        repo,
+        ref: "tags/nightly",
+        sha,
+        force: true,
+      });
+    } catch (e) {
+      core.error(e);
+      core.info(`creating nightly tag`);
+      await octokit.rest.git.createTag({
+        owner,
+        repo,
+        tag: "nightly",
+        message: "nightly release",
+        object: sha,
+        type: "commit",
+      });
+    }
+  }
+
+  // Creates an official GitHub release for this `tag`, and if this is `dev`
+  // then we know that from the previous block this should be a fresh release.
+  core.info(`creating a release`);
+  const release = await octokit.rest.repos.createRelease({
+    owner,
+    repo,
+    name,
+    tag_name: name,
+    target_commitish: sha,
+    prerelease: name === "nightly",
+  });
+  const release_id = release.data.id;
+
+  // Upload all the relevant assets for this release as just general blobs.
+  for (const file of glob.sync(files)) {
+    const size = fs.statSync(file).size;
+    const name = path.basename(file);
+
+    await runWithRetry(async function () {
+      // We can't overwrite assets, so remove existing ones from a previous try.
+      let assets = await octokit.rest.repos.listReleaseAssets({
+        owner,
+        repo,
+        release_id,
+      });
+      for (const asset of assets.data) {
+        if (asset.name === name) {
+          core.info(`delete asset ${name}`);
+          const asset_id = asset.id;
+          await octokit.rest.repos.deleteReleaseAsset({ owner, repo, asset_id });
+        }
+      }
+
+      core.info(`upload ${file}`);
+      const headers = { "content-length": size, "content-type": "application/octet-stream" };
+      const data = fs.createReadStream(file);
+      await octokit.rest.repos.uploadReleaseAsset({
+        data,
+        headers,
+        name,
+        url: release.data.upload_url,
+      });
+    });
+  }
+}
+
+async function runWithRetry(f) {
+  const retries = 10;
+  const maxDelay = 4000;
+  let delay = 1000;
+
+  for (let i = 0; i < retries; i++) {
+    try {
+      await f();
+      break;
+    } catch (e) {
+      if (i === retries - 1) throw e;
+
+      core.error(e);
+      const currentDelay = Math.round(Math.random() * delay);
+      core.info(`sleeping ${currentDelay} ms`);
+      await sleep(currentDelay);
+      delay = Math.min(delay * 2, maxDelay);
+    }
+  }
+}
+
+async function run() {
+  await runWithRetry(runOnce);
+}
+
+run().catch((err) => {
+  core.error(err);
+  core.setFailed(err.message);
+});

.github/actions/github-release/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "wasmtime-github-release",
+  "version": "0.0.0",
+  "main": "main.js",
+  "dependencies": {
+    "@actions/core": "^1.6",
+    "@actions/github": "^5.0",
+    "glob": "^7.1.5"
+  }
+}

.github/dependabot.yml

@@ -10,6 +10,7 @@ updates:
       - '/'
       - '/packages/codemirror-lang-kcl/'
       - '/packages/codemirror-lsp-client/'
+      - '/rust/kcl-language-server/'
     schedule:
       interval: weekly
       day: monday
@@ -25,7 +26,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 +40,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,8 +21,8 @@ jobs:
       - name: Cache wasm
         uses: Swatinem/rust-cache@v2
         with:
-          workspaces: './src/wasm-lib'
-      - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
+          workspaces: './rust'
+      - uses: taiki-e/install-action@955a6ff1416eae278c9f833008a9beb4b7f9afe3
         with:
           tool: wasm-pack
       - name: build wasm
@@ -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,10 +38,10 @@ 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
-      - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
+      # TODO: see if we can fetch from main instead if no diff at rust
+      - uses: taiki-e/install-action@955a6ff1416eae278c9f833008a9beb4b7f9afe3
         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
-          mkdir src/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_bg.wasm public
+          mkdir rust/kcl-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
@@ -132,8 +132,9 @@ jobs:
 
       - name: yarn install
         # Windows is picky sometimes and fails on fetch. Step takes about ~30s
-        uses: nick-fields/retry@v3.0.1
+        uses: nick-fields/retry@v3.0.2
         with:
+          shell: bash
           timeout_minutes: 2
           max_attempts: 3
           command: yarn install
@@ -183,8 +184,9 @@ jobs:
           WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
           DEBUG: "electron-notarize*"
         # TODO: Fix electron-notarize flakes. The logs above should help gather more data on failures
-        uses: nick-fields/retry@v3.0.1
+        uses: nick-fields/retry@v3.0.2
         with:
+          shell: bash
           timeout_minutes: 10
           max_attempts: 3
           command: yarn tronb:package:prod
@@ -244,8 +246,9 @@ jobs:
           WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
           DEBUG: "electron-notarize*"
         # TODO: Fix electron-notarize flakes. The logs above should help gather more data on failures
-        uses: nick-fields/retry@v3.0.1
+        uses: nick-fields/retry@v3.0.2
         with:
+          shell: bash
           timeout_minutes: 10
           max_attempts: 3
           command: yarn tronb:package:prod

.github/workflows/cargo-check.yml

@@ -17,23 +17,20 @@ 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
+      - name: Use correct Rust toolchain
+        shell: bash
+        run: |
+          cp --update=none rust/rust-toolchain.toml ./ || true
+      - name: Install rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-            toolchain: stable
-            override: true
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2.6.1
+          cache-workspaces: rust
 
       - 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,25 +23,22 @@ 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
-      - name: Install latest rust
-        uses: actions-rs/toolchain@v1
+      - name: Use correct Rust toolchain
+        shell: bash
+        run: |
+          cp --update=none rust/rust-toolchain.toml ./ || true
+      - name: Install rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-            toolchain: stable
-            override: true
-            components: clippy
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2.6.1
+          cache-workspaces: rust
+          components: clippy
 
       - 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,23 +26,20 @@ jobs:
   cargofmt:
     name: cargo fmt
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dir: ['src/wasm-lib']
     steps:
       - uses: actions/checkout@v4
-      - name: Install latest rust
-        uses: actions-rs/toolchain@v1
+      - name: Use correct Rust toolchain
+        shell: bash
+        run: |
+          cp --update=none rust/rust-toolchain.toml ./ || true
+      - name: Install rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-            toolchain: stable
-            override: true
-            components: rustfmt
-
-      - name: Rust Cache
-        uses: Swatinem/rust-cache@v2.6.1
+          cache-workspaces: rust
+          components: rustfmt
 
       - name: Run cargo fmt
         run: |
-          cd "${{ matrix.dir }}"
+          cd rust
           cargo fmt -- --check
         shell: bash

.github/workflows/cargo-test.yml

@@ -9,21 +9,21 @@ 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
-        uses: actions-rs/toolchain@v1
+      - name: Use correct Rust toolchain
+        shell: bash
+        run: |
+          cp --update=none rust/rust-toolchain.toml ./ || true
+      - name: Install rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: stable
-          override: true
+          cache: false # Configured below.
       - name: Install vector
         run: |
           curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh
@@ -42,11 +42,13 @@ jobs:
       - uses: taiki-e/install-action@nextest
       - name: Rust Cache
         uses: Swatinem/rust-cache@v2.6.1
+        with:
+          workspaces: rust
       - name: cargo test
         shell: bash
         run: |-
-          cd "${{ matrix.dir }}"
-          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
+          cd rust
+          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 +57,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

@@ -45,13 +45,13 @@ jobs:
       with:
         filters: |
           rust:
-            - 'src/wasm-lib/**'
+            - 'rust/**'
     - uses: actions/setup-node@v4
       with:
         node-version-file: '.nvmrc'
         cache: 'yarn'
-    - uses: KittyCAD/action-install-cli@main
     - name: Install dependencies
+      id: deps-install
       shell: bash
       run: yarn
     - name: Cache Playwright Browsers
@@ -73,27 +73,27 @@ 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: 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
-    - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
+    - uses: taiki-e/install-action@955a6ff1416eae278c9f833008a9beb4b7f9afe3
       with:
         tool: wasm-pack
     - name: Cache Wasm (because rust diff)
       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
@@ -134,7 +134,7 @@ jobs:
       # TODO: break this in its own job, for now it's not slowing down the overall execution as ubuntu is the quickest,
       # but we could do better. This forces a large 1/1 shard of all 20 snapshot tests that runs in about 3 minutes.
       run: |
-        PLATFORM=web yarn playwright test --config=playwright.config.ts --retries="3" --update-snapshots --grep=@snapshot --trace=on --shard=1/1
+        yarn test:snapshots
       env:
         CI: true
         NODE_ENV: development
@@ -194,9 +194,10 @@ jobs:
         path: test-results/
     - name: Run playwright/electron flow (with retries)
       id: retry
-      if: ${{ !cancelled() && (success() || failure()) }}
-      uses: nick-fields/retry@v3.0.1
+      if: ${{ !cancelled() && steps.deps-install.outcome == 'success' }}
+      uses: nick-fields/retry@v3.0.2
       with:
+        shell: bash
         command: .github/ci-cd-scripts/playwright-electron.sh ${{matrix.shardIndex}} ${{matrix.shardTotal}} ${{matrix.os}}
         timeout_minutes: 30
         max_attempts: 25

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

@@ -0,0 +1,401 @@
+name: kcl-language-server
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - 'rust/kcl-language-server/**'
+      - '**.rs'
+      - .github/workflows/kcl-language-server.yml
+    tags:
+      - 'kcl-*'
+  pull_request:
+    paths:
+      - '**/Cargo.toml'
+      - '**/Cargo.lock'
+      - '**/rust-toolchain.toml'
+      - 'rust/kcl-language-server/**'
+      - '**.rs'
+      - .github/workflows/kcl-language-server.yml
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+env:
+  CARGO_INCREMENTAL: 0
+  CARGO_NET_RETRY: 10
+  RUSTFLAGS: ""
+  RUSTUP_MAX_RETRIES: 10
+  FETCH_DEPTH: 0 # pull in the tags for the version string
+  MACOSX_DEPLOYMENT_TARGET: 10.15
+  CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
+  CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc
+
+jobs:
+  test:
+    name: vscode tests
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+      - name: Install dependencies
+        run: |
+          yarn install
+          cd rust/kcl-language-server
+          yarn install
+      - name: Run tests
+        run: |
+          cd rust/kcl-language-server
+          yarn build
+          yarn test-compile
+          ls -la dist
+          xvfb-run -a yarn test
+        if: runner.os == 'Linux'
+      - name: Run tests
+        run: |
+          cd rust/kcl-language-server
+          yarn test
+        if: runner.os != 'Linux'
+  build-release:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows-latest
+            target: x86_64-pc-windows-msvc
+            code-target:
+              win32-x64
+              #- os: windows-latest
+              #target: i686-pc-windows-msvc
+              #code-target:
+              #win32-ia32
+              #- os: windows-latest
+              #target: aarch64-pc-windows-msvc
+              #code-target: win32-arm64
+          - os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+            code-target:
+              linux-x64
+              #- os: ubuntu-latest
+              #target: aarch64-unknown-linux-musl
+              #code-target: linux-arm64
+          - os: ubuntu-latest
+            target: aarch64-unknown-linux-gnu
+            code-target: linux-arm64
+          - os: ubuntu-latest
+            target: arm-unknown-linux-gnueabihf
+            code-target: linux-armhf
+          - os: macos-latest
+            target: x86_64-apple-darwin
+            code-target: darwin-x64
+          - os: macos-latest
+            target: aarch64-apple-darwin
+            code-target: darwin-arm64
+
+    name: build-release (${{ matrix.target }})
+    runs-on: ${{ matrix.os }}
+    container: ${{ matrix.container }}
+
+    env:
+      RA_TARGET: ${{ matrix.target }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: ${{ env.FETCH_DEPTH }}
+
+      - name: Use correct Rust toolchain
+        shell: bash
+        run: |
+          rm rust/rust-toolchain.toml
+
+      - name: Install rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          cache: rust
+          components: rust-src
+          target: ${{ matrix.target }}
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+
+      - name: Update apt repositories
+        if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'arm-unknown-linux-gnueabihf' || matrix.os == 'ubuntu-latest'
+        run: sudo apt-get update
+
+      - if: ${{ matrix.os == 'ubuntu-latest' }}
+        name: Install deps
+        shell: bash
+        run: |
+          sudo apt install -y \
+            ca-certificates \
+            clang \
+            cmake \
+            curl \
+            g++ \
+            gcc \
+            gcc-mingw-w64-i686 \
+            gcc-mingw-w64 \
+            jq \
+            libmpc-dev \
+            libmpfr-dev \
+            libgmp-dev \
+            libssl-dev \
+            libxml2-dev \
+            mingw-w64 \
+            wget \
+            zlib1g-dev
+
+          cargo install cross
+
+      - name: Install AArch64 target toolchain
+        if: matrix.target == 'aarch64-unknown-linux-gnu'
+        run: sudo apt-get install gcc-aarch64-linux-gnu
+
+      - name: Install ARM target toolchain
+        if: matrix.target == 'arm-unknown-linux-gnueabihf'
+        run: sudo apt-get install gcc-arm-linux-gnueabihf
+
+      - name: build
+        run: |
+          cd rust
+          cargo kcl-language-server-release build --client-patch-version ${{ github.run_number }}
+
+      - name: Install dependencies
+        run: |
+          cd rust/kcl-language-server
+          yarn install
+
+      - name: Package Extension (release)
+        if: startsWith(github.event.ref, 'refs/tags/')
+        run: |
+          cd rust/kcl-language-server
+          npx vsce package -o "../build/kcl-language-server-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }}
+
+      - name: Package Extension (nightly)
+        if: startsWith(github.event.ref, 'refs/tags/') == false
+        run: |
+          cd rust/kcl-language-server
+          npx vsce package -o "../build/kcl-language-server-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }} --pre-release
+
+      - name: remove server
+        if: matrix.target == 'x86_64-unknown-linux-gnu'
+        run: |
+          cd rust/kcl-language-server
+          rm -rf server
+
+      - name: Package Extension (no server, release)
+        if: matrix.target == 'x86_64-unknown-linux-gnu' && startsWith(github.event.ref, 'refs/tags/')
+        run: |
+          cd rust/kcl-language-server
+          npx vsce package -o ../build/kcl-language-server-no-server.vsix
+
+      - name: Package Extension (no server, nightly)
+        if: matrix.target == 'x86_64-unknown-linux-gnu' && startsWith(github.event.ref, 'refs/tags/') == false
+        run: |
+          cd rust/kcl-language-server
+          npx vsce package -o ../build/kcl-language-server-no-server.vsix --pre-release
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-${{ matrix.target }}
+          path: ./rust/build
+
+  build-release-x86_64-unknown-linux-musl:
+    name: build-release (x86_64-unknown-linux-musl)
+    runs-on: ubuntu-latest
+    env:
+      RA_TARGET: x86_64-unknown-linux-musl
+      # For some reason `-crt-static` is not working for clang without lld
+      RUSTFLAGS: "-C link-arg=-fuse-ld=lld -C target-feature=-crt-static"
+    container:
+      image: alpine:latest
+      volumes:
+        - /usr/local/cargo/registry:/usr/local/cargo/registry
+
+    steps:
+      - name: Install dependencies
+        run: |
+          apk add --no-cache \
+            bash \
+            curl \
+            git \
+            clang \
+            lld \
+            musl-dev \
+            nodejs \
+            yarn \
+            npm
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: ${{ env.FETCH_DEPTH }}
+
+      - name: Use correct Rust toolchain
+        shell: bash
+        run: |
+          rm rust/rust-toolchain.toml
+
+      - name: Install rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          cache: rust
+          components: rust-src
+          target: ${{ matrix.target }}
+
+      - name: build
+        run: |
+          cd rust
+          cargo kcl-language-server-release build --client-patch-version ${{ github.run_number }}
+
+      - name: Install dependencies
+        run: |
+          cd rust/kcl-language-server
+          yarn install
+
+      - name: Package Extension (release)
+        if: startsWith(github.event.ref, 'refs/tags/')
+        run: |
+          cd rust/kcl-language-server
+          npx vsce package -o "../build/kcl-language-server-alpine-x64.vsix" --target alpine-x64
+
+      - name: Package Extension (release)
+        if: startsWith(github.event.ref, 'refs/tags/') == false
+        run: |
+          cd rust/kcl-language-server
+          npx vsce package -o "../build/kcl-language-server-alpine-x64.vsix" --target alpine-x64 --pre-release
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-x86_64-unknown-linux-musl
+          path: ./rust/build
+
+  publish:
+    name: publish
+    runs-on: ubuntu-latest
+    needs: ["build-release", "build-release-x86_64-unknown-linux-musl"]
+    if: startsWith(github.event.ref, 'refs/tags')
+    permissions:
+      contents: write
+    steps:
+      - run: echo "TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+      - run: 'echo "TAG: $TAG"'
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: ${{ env.FETCH_DEPTH }}
+
+      - name: Install Nodejs
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+
+      - run: echo "HEAD_SHA=$(git rev-parse HEAD)" >> $GITHUB_ENV
+      - run: 'echo "HEAD_SHA: $HEAD_SHA"'
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: release-aarch64-apple-darwin
+          path: rust/build
+      - uses: actions/download-artifact@v4
+        with:
+          name: release-x86_64-apple-darwin
+          path: rust/build
+      - uses: actions/download-artifact@v4
+        with:
+          name: release-x86_64-unknown-linux-gnu
+          path: rust/build
+      - uses: actions/download-artifact@v4
+        with:
+          name: release-x86_64-unknown-linux-musl
+          path: rust/build
+      - uses: actions/download-artifact@v4
+        with:
+          name: release-aarch64-unknown-linux-gnu
+          path: rust/build
+      - uses: actions/download-artifact@v4
+        with:
+          name: release-arm-unknown-linux-gnueabihf
+          path: rust/build
+      - uses: actions/download-artifact@v4
+        with:
+          name: release-x86_64-pc-windows-msvc
+          path:
+            rust/build
+            #- uses: actions/download-artifact@v4
+            #with:
+            #name: release-i686-pc-windows-msvc
+            #path:
+            #build
+            #- uses: actions/download-artifact@v4
+            #with:
+            #name: release-aarch64-pc-windows-msvc
+            #path: rust/build
+      - run: ls -al ./rust/build
+
+      - name: Publish Release
+        uses: ./.github/actions/github-release
+        with:
+          files: "rust/build/*"
+          name: ${{ env.TAG }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: move files to dir for upload
+        shell: bash
+        run: |
+          cd rust
+          mkdir -p releases/language-server/${{ env.TAG }}
+          cp -r build/* releases/language-server/${{ env.TAG }}
+
+      - name: "Authenticate to Google Cloud"
+        uses: "google-github-actions/auth@v2.1.8"
+        with:
+          credentials_json: "${{ secrets.GOOGLE_CLOUD_DL_SA }}"
+      - name: Set up Cloud SDK
+        uses: google-github-actions/setup-gcloud@v2.1.2
+        with:
+          project_id: kittycadapi
+      - name: "upload files to gcp"
+        id: upload-files
+        uses: google-github-actions/upload-cloud-storage@v2.2.2
+        with:
+          path: rust/releases
+          destination: dl.kittycad.io
+
+      - run: rm rust/build/kcl-language-server-no-server.vsix
+
+      - name: Publish Extension (Code Marketplace, release)
+        # token from https://dev.azure.com/kcl-language-server/
+        run: |
+          cd rust/kcl-language-server
+          npx vsce publish --pat ${{ secrets.VSCE_PAT }} --packagePath ../build/kcl-language-server-*.vsix
+
+      - name: Publish Extension (OpenVSX, release)
+        run: |
+          cd rust/kcl-language-server
+          npx ovsx publish --pat ${{ secrets.OPENVSX_TOKEN }} --packagePath ../build/kcl-language-server-*.vsix
+        timeout-minutes: 2

.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

@@ -37,7 +37,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
       - run: yarn install
-      - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
+      - uses: taiki-e/install-action@955a6ff1416eae278c9f833008a9beb4b7f9afe3
         with:
           tool: wasm-pack
       - run: yarn build:wasm
@@ -52,11 +52,12 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
       - run: yarn install
+      - run: yarn --cwd ./rust/kcl-language-server --modules-folder node_modules install
       - uses: Swatinem/rust-cache@v2
         with:
-          workspaces: './src/wasm-lib'
+          workspaces: './rust'
 
-      - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
+      - uses: taiki-e/install-action@955a6ff1416eae278c9f833008a9beb4b7f9afe3
         with:
           tool: wasm-pack
       - run: yarn build:wasm
@@ -72,6 +73,7 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
       - run: yarn install
+      - run: yarn --cwd ./rust/kcl-language-server --modules-folder node_modules install
       - run: yarn lint
 
   python-codespell:
@@ -98,7 +100,7 @@ jobs:
           cache: 'yarn'
 
       - run: yarn install
-      - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
+      - uses: taiki-e/install-action@955a6ff1416eae278c9f833008a9beb4b7f9afe3
         with:
           tool: wasm-pack
       - run: yarn build:wasm
@@ -127,7 +129,7 @@ jobs:
           cache: 'yarn'
 
       - run: yarn install
-      - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
+      - uses: taiki-e/install-action@955a6ff1416eae278c9f833008a9beb4b7f9afe3
         with:
           tool: wasm-pack
       - run: yarn build:wasm
@@ -141,7 +143,7 @@ jobs:
 
       - name: run unit tests
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn test:unit
+        run: xvfb-run -a yarn test:unit
         env:
           VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
 

.gitignore

@@ -1,7 +1,7 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-/node_modules
+node_modules
 /.pnp
 .pnp.js
 
@@ -9,7 +9,7 @@
 /coverage
 
 # production
-/build
+build
 
 # misc
 .DS_Store
@@ -26,16 +26,19 @@ yarn-error.log*
 .idea
 .vscode
 .helix
-src/wasm-lib/.idea
-src/wasm-lib/.vscode
 
 # rust
-src/wasm-lib/target
-src/wasm-lib/bindings
-src/wasm-lib/kcl/bindings
-public/wasm_lib_bg.wasm
-src/wasm-lib/lcov.info
-src/wasm-lib/grackle/test_json_output
+rust/target
+rust/kcl-lib/bindings
+public/kcl_wasm_lib_bg.wasm
+rust/lcov.info
+rust/kcl-wasm-lib/pkg
+*.snap.new
+rust/kcl-lib/fuzz/Cargo.lock
+rust/kcl-language-server-release/Cargo.lock
+
+# kcl language server package
+rust/kcl-language-server/dist/
 
 e2e/playwright/playwright-secrets.env
 e2e/playwright/temp1.png
@@ -59,16 +62,20 @@ 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
+dist
+venv
+
+.vscode-test

.prettierignore

@@ -7,11 +7,10 @@ coverage
 *.rs
 *.hbs
 target
-src/wasm-lib/pkg
-src/wasm-lib/kcl/bindings
 e2e/playwright/export-snapshots
 e2e/playwright/snapshots/prompt-to-edit
 
 
 # XState generated files
 src/machines/**.typegen.ts
+.vscode-test

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
 
@@ -52,18 +52,21 @@ 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. 
+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
@@ -185,11 +190,12 @@ Manually test against this [list](https://github.com/KittyCAD/modeling-app/issue
 
 ##### Updater-test builds
 
-The other `build-apps` output in the release `build-apps` workflow (triggered by 2.) is `updater-test-{arch}-{platform}`. It's a semi-automated process: for macOS, Windows, and Linux, download the corresponding updater-test artifact file, install the app, run it, expect an updater prompt to a dummy v0.255.255, install it and check that the app comes back at that version. 
+The other `build-apps` output in the release `build-apps` workflow (triggered by 2.) is `updater-test-{arch}-{platform}`. It's a semi-automated process: for macOS, Windows, and Linux, download the corresponding updater-test artifact file, install the app, run it, expect an updater prompt to a dummy v0.255.255, install it and check that the app comes back at that version.
 
 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'
@@ -205,15 +211,14 @@ If the prompt doesn't show up, start the app in command line to grab the electro
 
 Head over to https://github.com/KittyCAD/modeling-app/releases/new, pick the newly created tag and type it in the _Release title_ field as well.
 
-Hit _Generate release notes_ as a starting point to discuss the changelog in the issue. Once done, make sure _Set as the latest release_ is checked, and hit _Publish release_. 
+Hit _Generate release notes_ as a starting point to discuss the changelog in the issue. Once done, make sure _Set as the latest release_ is checked, and hit _Publish release_.
 
-A new `publish-apps-release` will kick in and you should be able to find it [here](https://github.com/KittyCAD/modeling-app/actions?query=event%3Arelease). On success, the files will be uploaded to the public bucket as well as to the GitHub release, and the announcement on Discord will be sent. 
+A new `publish-apps-release` will kick in and you should be able to find it [here](https://github.com/KittyCAD/modeling-app/actions?query=event%3Arelease). On success, the files will be uploaded to the public bucket as well as to the GitHub release, and the announcement on Discord will be sent.
 
 #### 5. Close the issue
 
 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/abs.md

@@ -9,7 +9,7 @@ Compute the absolute value of a number.
 
 
 ```js
-abs(num: number) -> number
+abs(num: number): number
 ```
 
 ### Tags

docs/kcl/acos.md

@@ -9,7 +9,7 @@ Compute the arccosine of a number (in radians).
 
 
 ```js
-acos(num: number) -> number
+acos(num: number): number
 ```
 
 ### Tags

docs/kcl/angleToMatchLengthX.md

@@ -13,7 +13,7 @@ angleToMatchLengthX(
   tag: TagIdentifier,
   to: number,
   sketch: Sketch,
-) -> number
+): number
 ```
 
 

docs/kcl/angleToMatchLengthY.md

@@ -13,7 +13,7 @@ angleToMatchLengthY(
   tag: TagIdentifier,
   to: number,
   sketch: Sketch,
-) -> number
+): number
 ```
 
 

docs/kcl/angledLine.md

@@ -1,19 +1,19 @@
 ---
 title: "angledLine"
-excerpt: "Draw a line segment relative to the current origin using the polar"
+excerpt: "Draw a line segment relative to the current origin using the polar measure of some angle and distance."
 layout: manual
 ---
 
-Draw a line segment relative to the current origin using the polar
+Draw a line segment relative to the current origin using the polar measure of some angle and distance.
+
 
-measure of some angle and distance.
 
 ```js
 angledLine(
   data: AngledLineData,
   sketch: Sketch,
   tag?: TagDeclarator,
-) -> Sketch
+): Sketch
 ```
 
 

docs/kcl/angledLineOfXLength.md

@@ -1,19 +1,19 @@
 ---
 title: "angledLineOfXLength"
-excerpt: "Create a line segment from the current 2-dimensional sketch origin"
+excerpt: "Create a line segment from the current 2-dimensional sketch origin along some angle (in degrees) for some relative length in the 'x' dimension."
 layout: manual
 ---
 
-Create a line segment from the current 2-dimensional sketch origin
+Create a line segment from the current 2-dimensional sketch origin along some angle (in degrees) for some relative length in the 'x' dimension.
+
 
-along some angle (in degrees) for some relative length in the 'x' dimension.
 
 ```js
 angledLineOfXLength(
   data: AngledLineData,
   sketch: Sketch,
   tag?: TagDeclarator,
-) -> Sketch
+): Sketch
 ```
 
 

docs/kcl/angledLineOfYLength.md

@@ -1,19 +1,19 @@
 ---
 title: "angledLineOfYLength"
-excerpt: "Create a line segment from the current 2-dimensional sketch origin"
+excerpt: "Create a line segment from the current 2-dimensional sketch origin along some angle (in degrees) for some relative length in the 'y' dimension."
 layout: manual
 ---
 
-Create a line segment from the current 2-dimensional sketch origin
+Create a line segment from the current 2-dimensional sketch origin along some angle (in degrees) for some relative length in the 'y' dimension.
+
 
-along some angle (in degrees) for some relative length in the 'y' dimension.
 
 ```js
 angledLineOfYLength(
   data: AngledLineData,
   sketch: Sketch,
   tag?: TagDeclarator,
-) -> Sketch
+): Sketch
 ```
 
 

docs/kcl/angledLineThatIntersects.md

@@ -1,19 +1,19 @@
 ---
 title: "angledLineThatIntersects"
-excerpt: "Draw an angled line from the current origin, constructing a line segment"
+excerpt: "Draw an angled line from the current origin, constructing a line segment such that the newly created line intersects the desired target line segment."
 layout: manual
 ---
 
-Draw an angled line from the current origin, constructing a line segment
+Draw an angled line from the current origin, constructing a line segment such that the newly created line intersects the desired target line segment.
+
 
-such that the newly created line intersects the desired target line segment.
 
 ```js
 angledLineThatIntersects(
   data: AngledLineThatIntersectsData,
   sketch: Sketch,
   tag?: TagDeclarator,
-) -> Sketch
+): Sketch
 ```
 
 

docs/kcl/angledLineToX.md

@@ -1,19 +1,19 @@
 ---
 title: "angledLineToX"
-excerpt: "Create a line segment from the current 2-dimensional sketch origin"
+excerpt: "Create a line segment from the current 2-dimensional sketch origin along some angle (in degrees) for some length, ending at the provided value in the 'x' dimension."
 layout: manual
 ---
 
-Create a line segment from the current 2-dimensional sketch origin
+Create a line segment from the current 2-dimensional sketch origin along some angle (in degrees) for some length, ending at the provided value in the 'x' dimension.
+
 
-along some angle (in degrees) for some length, ending at the provided value in the 'x' dimension.
 
 ```js
 angledLineToX(
   data: AngledLineToData,
   sketch: Sketch,
   tag?: TagDeclarator,
-) -> Sketch
+): Sketch
 ```
 
 

docs/kcl/angledLineToY.md

@@ -1,19 +1,19 @@
 ---
 title: "angledLineToY"
-excerpt: "Create a line segment from the current 2-dimensional sketch origin"
+excerpt: "Create a line segment from the current 2-dimensional sketch origin along some angle (in degrees) for some length, ending at the provided value in the 'y' dimension."
 layout: manual
 ---
 
-Create a line segment from the current 2-dimensional sketch origin
+Create a line segment from the current 2-dimensional sketch origin along some angle (in degrees) for some length, ending at the provided value in the 'y' dimension.
+
 
-along some angle (in degrees) for some length, ending at the provided value in the 'y' dimension.
 
 ```js
 angledLineToY(
   data: AngledLineToData,
   sketch: Sketch,
   tag?: TagDeclarator,
-) -> Sketch
+): Sketch
 ```
 
 

docs/kcl/appearance.md

@@ -14,7 +14,7 @@ appearance(
   color: String,
   metalness?: number,
   roughness?: number,
-) -> SolidSet
+): SolidSet
 ```
 
 
@@ -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/arc.md

@@ -15,7 +15,7 @@ arc(
   data: ArcData,
   sketch: Sketch,
   tag?: TagDeclarator,
-) -> Sketch
+): Sketch
 ```
 
 

docs/kcl/arcTo.md

@@ -1,10 +1,10 @@
 ---
 title: "arcTo"
-excerpt: "Draw a 3 point arc."
+excerpt: "Draw a three point arc."
 layout: manual
 ---
 
-Draw a 3 point arc.
+Draw a three point arc.
 
 The arc is constructed such that the start point is the current position of the sketch and two more points defined as the end and interior point. The interior point is placed between the start point and end point. The radius of the arc will be controlled by how far the interior point is placed from the start and end.
 
@@ -13,7 +13,7 @@ arcTo(
   data: ArcToData,
   sketch: Sketch,
   tag?: TagDeclarator,
-) -> Sketch
+): Sketch
 ```
 
 

docs/kcl/asin.md

@@ -9,7 +9,7 @@ Compute the arcsine of a number (in radians).
 
 
 ```js
-asin(num: number) -> number
+asin(num: number): number
 ```
 
 ### Tags

docs/kcl/assert.md

@@ -1,18 +1,18 @@
 ---
 title: "assert"
-excerpt: "Check a value at runtime, and raise an error if the argument provided"
+excerpt: "Check a value at runtime, and raise an error if the argument provided is false."
 layout: manual
 ---
 
-Check a value at runtime, and raise an error if the argument provided
+Check a value at runtime, and raise an error if the argument provided is false.
+
 
-is false.
 
 ```js
 assert(
   data: bool,
   message: string,
-) -> ()
+): ()
 ```
 
 

docs/kcl/assertEqual.md

@@ -1,12 +1,12 @@
 ---
 title: "assertEqual"
-excerpt: "Check that a numerical value equals another at runtime,"
+excerpt: "Check that a numerical value equals another at runtime, otherwise raise an error."
 layout: manual
 ---
 
-Check that a numerical value equals another at runtime,
+Check that a numerical value equals another at runtime, otherwise raise an error.
+
 
-otherwise raise an error.
 
 ```js
 assertEqual(
@@ -14,7 +14,7 @@ assertEqual(
   right: number,
   epsilon: number,
   message: string,
-) -> ()
+): ()
 ```
 
 

docs/kcl/assertGreaterThan.md

@@ -1,19 +1,19 @@
 ---
 title: "assertGreaterThan"
-excerpt: "Check that a numerical value is greater than another at runtime,"
+excerpt: "Check that a numerical value is greater than another at runtime, otherwise raise an error."
 layout: manual
 ---
 
-Check that a numerical value is greater than another at runtime,
+Check that a numerical value is greater than another at runtime, otherwise raise an error.
+
 
-otherwise raise an error.
 
 ```js
 assertGreaterThan(
   left: number,
   right: number,
   message: string,
-) -> ()
+): ()
 ```
 
 

docs/kcl/assertGreaterThanOrEq.md

@@ -1,19 +1,19 @@
 ---
 title: "assertGreaterThanOrEq"
-excerpt: "Check that a numerical value is greater than or equal to another at runtime,"
+excerpt: "Check that a numerical value is greater than or equal to another at runtime, otherwise raise an error."
 layout: manual
 ---
 
-Check that a numerical value is greater than or equal to another at runtime,
+Check that a numerical value is greater than or equal to another at runtime, otherwise raise an error.
+
 
-otherwise raise an error.
 
 ```js
 assertGreaterThanOrEq(
   left: number,
   right: number,
   message: string,
-) -> ()
+): ()
 ```
 
 

docs/kcl/assertLessThan.md

@@ -1,19 +1,19 @@
 ---
 title: "assertLessThan"
-excerpt: "Check that a numerical value is less than to another at runtime,"
+excerpt: "Check that a numerical value is less than to another at runtime, otherwise raise an error."
 layout: manual
 ---
 
-Check that a numerical value is less than to another at runtime,
+Check that a numerical value is less than to another at runtime, otherwise raise an error.
+
 
-otherwise raise an error.
 
 ```js
 assertLessThan(
   left: number,
   right: number,
   message: string,
-) -> ()
+): ()
 ```
 
 

docs/kcl/assertLessThanOrEq.md

@@ -1,19 +1,19 @@
 ---
 title: "assertLessThanOrEq"
-excerpt: "Check that a numerical value is less than or equal to another at runtime,"
+excerpt: "Check that a numerical value is less than or equal to another at runtime, otherwise raise an error."
 layout: manual
 ---
 
-Check that a numerical value is less than or equal to another at runtime,
+Check that a numerical value is less than or equal to another at runtime, otherwise raise an error.
+
 
-otherwise raise an error.
 
 ```js
 assertLessThanOrEq(
   left: number,
   right: number,
   message: string,
-) -> ()
+): ()
 ```
 
 

docs/kcl/atan.md

@@ -9,7 +9,7 @@ Compute the arctangent of a number (in radians).
 
 
 ```js
-atan(num: number) -> number
+atan(num: number): number
 ```
 
 ### Tags

docs/kcl/atan2.md

@@ -12,7 +12,7 @@ Compute the four quadrant arctangent of Y and X (in radians).
 atan2(
   y: number,
   x: number,
-) -> number
+): number
 ```
 
 ### Tags

docs/kcl/bezierCurve.md

@@ -1,19 +1,19 @@
 ---
 title: "bezierCurve"
-excerpt: "Draw a smooth, continuous, curved line segment from the current origin to"
+excerpt: "Draw a smooth, continuous, curved line segment from the current origin to the desired (x, y), using a number of control points to shape the curve's shape."
 layout: manual
 ---
 
-Draw a smooth, continuous, curved line segment from the current origin to
+Draw a smooth, continuous, curved line segment from the current origin to the desired (x, y), using a number of control points to shape the curve's shape.
+
 
-the desired (x, y), using a number of control points to shape the curve's shape.
 
 ```js
 bezierCurve(
   data: BezierData,
   sketch: Sketch,
   tag?: TagDeclarator,
-) -> Sketch
+): Sketch
 ```
 
 

docs/kcl/ceil.md

@@ -9,7 +9,7 @@ Compute the smallest integer greater than or equal to a number.
 
 
 ```js
-ceil(num: number) -> number
+ceil(num: number): number
 ```
 
 ### Tags

docs/kcl/chamfer.md

@@ -14,7 +14,7 @@ chamfer(
   length: number,
   tags: [EdgeReference],
   tag?: TagDeclarator,
-) -> Solid
+): Solid
 ```
 
 

docs/kcl/circle.md

@@ -1,19 +1,20 @@
 ---
 title: "circle"
-excerpt: "Construct a 2-dimensional circle, of the specified radius, centered at"
+excerpt: "Construct a 2-dimensional circle, of the specified radius, centered at the provided (x, y) origin point."
 layout: manual
 ---
 
-Construct a 2-dimensional circle, of the specified radius, centered at
+Construct a 2-dimensional circle, of the specified radius, centered at the provided (x, y) origin point.
+
 
-the provided (x, y) origin point.
 
 ```js
 circle(
-  data: CircleData,
-  sketchSurfaceOrGroup: SketchOrSurface,
+  sketchOrSurface: SketchOrSurface,
+  center: [number],
+  radius: number,
   tag?: TagDeclarator,
-) -> Sketch
+): Sketch
 ```
 
 
@@ -21,9 +22,10 @@ circle(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `data` | [`CircleData`](/docs/kcl/types/CircleData) | Data for drawing an circle | Yes |
-| `sketchSurfaceOrGroup` | [`SketchOrSurface`](/docs/kcl/types/SketchOrSurface) | A sketch surface or a sketch. | Yes |
-| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `sketchOrSurface` | [`SketchOrSurface`](/docs/kcl/types/SketchOrSurface) | Plane or surface to sketch on. | Yes |
+| `center` | `[number]` | The center of the circle. | Yes |
+| `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/circleThreePoint.md

@@ -15,7 +15,7 @@ circleThreePoint(
   p3: [number],
   sketchSurfaceOrGroup: SketchOrSurface,
   tag?: TagDeclarator,
-) -> Sketch
+): Sketch
 ```
 
 

docs/kcl/close.md

@@ -1,18 +1,18 @@
 ---
 title: "close"
-excerpt: "Construct a line segment from the current origin back to the profile's"
+excerpt: "Construct a line segment from the current origin back to the profile's origin, ensuring the resulting 2-dimensional sketch is not open-ended."
 layout: manual
 ---
 
-Construct a line segment from the current origin back to the profile's
+Construct a line segment from the current origin back to the profile's origin, ensuring the resulting 2-dimensional sketch is not open-ended.
+
 
-origin, ensuring the resulting 2-dimensional sketch is not open-ended.
 
 ```js
 close(
   sketch: Sketch,
   tag?: TagDeclarator,
-) -> Sketch
+): Sketch
 ```
 
 

docs/kcl/cm.md

@@ -15,7 +15,7 @@ For example, if the current project uses inches, this function will return `0.39
 We merely provide these functions for convenience and readability, as `10 * cm()` is more readable that your intent is "I want 10 centimeters" than `10 * 10`, if the project settings are in millimeters.
 
 ```js
-cm() -> number
+cm(): number
 ```
 
 ### Tags

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/e.md

@@ -11,7 +11,7 @@ Return the value of Euler’s number `e`.
 **DEPRECATED** use the constant E
 
 ```js
-e() -> number
+e(): number
 ```
 
 ### Tags

docs/kcl/extrude.md

@@ -1,18 +1,18 @@
 ---
 title: "extrude"
-excerpt: "Extend a 2-dimensional sketch through a third dimension in order to"
+excerpt: "Extend a 2-dimensional sketch through a third dimension in order to create new 3-dimensional volume, or if extruded into an existing volume, cut into an existing solid."
 layout: manual
 ---
 
-Extend a 2-dimensional sketch through a third dimension in order to
+Extend a 2-dimensional sketch through a third dimension in order to create new 3-dimensional volume, or if extruded into an existing volume, cut into an existing solid.
+
 
-create new 3-dimensional volume, or if extruded into an existing volume, cut into an existing solid.
 
 ```js
 extrude(
   sketchSet: SketchSet,
   length: number,
-) -> SolidSet
+): SolidSet
 ```
 
 

docs/kcl/fillet.md

@@ -15,7 +15,7 @@ fillet(
   tags: [EdgeReference],
   tolerance?: number,
   tag?: TagDeclarator,
-) -> Solid
+): Solid
 ```
 
 

docs/kcl/floor.md

@@ -9,7 +9,7 @@ Compute the largest integer less than or equal to a number.
 
 
 ```js
-floor(num: number) -> number
+floor(num: number): number
 ```
 
 ### Tags

docs/kcl/ft.md

@@ -15,7 +15,7 @@ For example, if the current project uses inches, this function will return `12`.
 We merely provide these functions for convenience and readability, as `10 * ft()` is more readable that your intent is "I want 10 feet" than `10 * 304.8`, if the project settings are in millimeters.
 
 ```js
-ft() -> number
+ft(): number
 ```
 
 ### Tags

docs/kcl/getNextAdjacentEdge.md

@@ -9,7 +9,7 @@ Get the next adjacent edge to the edge given.
 
 
 ```js
-getNextAdjacentEdge(tag: TagIdentifier) -> Uuid
+getNextAdjacentEdge(tag: TagIdentifier): Uuid
 ```
 
 

docs/kcl/getOppositeEdge.md

@@ -9,7 +9,7 @@ Get the opposite edge to the edge given.
 
 
 ```js
-getOppositeEdge(tag: TagIdentifier) -> Uuid
+getOppositeEdge(tag: TagIdentifier): Uuid
 ```
 
 

docs/kcl/getPreviousAdjacentEdge.md

@@ -9,7 +9,7 @@ Get the previous adjacent edge to the edge given.
 
 
 ```js
-getPreviousAdjacentEdge(tag: TagIdentifier) -> Uuid
+getPreviousAdjacentEdge(tag: TagIdentifier): Uuid
 ```
 
 

docs/kcl/helix.md

@@ -16,7 +16,7 @@ helix(
   radius: number,
   axis: Axis3dOrEdgeReference,
   length?: number,
-) -> HelixValue
+): HelixValue
 ```
 
 
@@ -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

@@ -12,7 +12,7 @@ Create a helix on a cylinder.
 helixRevolutions(
   data: HelixRevolutionsData,
   solid: Solid,
-) -> Solid
+): Solid
 ```
 
 
@@ -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

@@ -12,7 +12,7 @@ Use a 2-dimensional sketch to cut a hole in another 2-dimensional sketch.
 hole(
   holeSketch: SketchSet,
   sketch: Sketch,
-) -> Sketch
+): Sketch
 ```
 
 
@@ -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, 4], radius = .25 }, %), %)
+  |> hole(circle(center = [1, 1], 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

@@ -12,7 +12,7 @@ Remove volume from a 3-dimensional shape such that a wall of the provided thickn
 hollow(
   thickness: number,
   solid: Solid,
-) -> Solid
+): Solid
 ```
 
 
@@ -70,17 +70,11 @@ case = startSketchOn('-XZ')
   |> extrude(length = 65)
 
 thing1 = startSketchOn(case, 'end')
-  |> circle({
-       center = [-size / 2, -size / 2],
-       radius = 25
-     }, %)
+  |> circle(center = [-size / 2, -size / 2], radius = 25)
   |> extrude(length = 50)
 
 thing2 = startSketchOn(case, 'end')
-  |> circle({
-       center = [size / 2, -size / 2],
-       radius = 25
-     }, %)
+  |> circle(center = [size / 2, -size / 2], radius = 25)
   |> extrude(length = 50)
 
 hollow(0.5, case)

docs/kcl/import.md

@@ -18,7 +18,7 @@ Note: The import command currently only works when using the native Modeling App
 import(
   filePath: String,
   options?: ImportFormat,
-) -> ImportedGeometry
+): ImportedGeometry
 ```
 
 

docs/kcl/inch.md

@@ -15,7 +15,7 @@ For example, if the current project uses inches, this function will return `1`.
 We merely provide these functions for convenience and readability, as `10 * inch()` is more readable that your intent is "I want 10 inches" than `10 * 25.4`, if the project settings are in millimeters.
 
 ```js
-inch() -> number
+inch(): number
 ```
 
 ### Tags

docs/kcl/int.md

@@ -11,7 +11,7 @@ Convert a number to an integer.
 DEPRECATED use floor(), ceil(), or round().
 
 ```js
-int(num: number) -> number
+int(num: number): number
 ```
 
 ### Tags
@@ -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/lastSegX.md

@@ -1,15 +1,15 @@
 ---
 title: "lastSegX"
-excerpt: "Extract the 'x' axis value of the last line segment in the provided 2-d"
+excerpt: "Extract the 'x' axis value of the last line segment in the provided 2-d sketch."
 layout: manual
 ---
 
-Extract the 'x' axis value of the last line segment in the provided 2-d
+Extract the 'x' axis value of the last line segment in the provided 2-d sketch.
+
 
-sketch.
 
 ```js
-lastSegX(sketch: Sketch) -> number
+lastSegX(sketch: Sketch): number
 ```
 
 

docs/kcl/lastSegY.md

@@ -1,15 +1,15 @@
 ---
 title: "lastSegY"
-excerpt: "Extract the 'y' axis value of the last line segment in the provided 2-d"
+excerpt: "Extract the 'y' axis value of the last line segment in the provided 2-d sketch."
 layout: manual
 ---
 
-Extract the 'y' axis value of the last line segment in the provided 2-d
+Extract the 'y' axis value of the last line segment in the provided 2-d sketch.
+
 
-sketch.
 
 ```js
-lastSegY(sketch: Sketch) -> number
+lastSegY(sketch: Sketch): number
 ```
 
 

docs/kcl/legAngX.md

@@ -12,7 +12,7 @@ Compute the angle of the given leg for x.
 legAngX(
   hypotenuse: number,
   leg: number,
-) -> number
+): number
 ```
 
 ### Tags

docs/kcl/legAngY.md

@@ -12,7 +12,7 @@ Compute the angle of the given leg for y.
 legAngY(
   hypotenuse: number,
   leg: number,
-) -> number
+): number
 ```
 
 ### Tags

docs/kcl/legLen.md

@@ -12,7 +12,7 @@ Compute the length of the given leg.
 legLen(
   hypotenuse: number,
   leg: number,
-) -> number
+): number
 ```
 
 ### Tags

docs/kcl/line.md

@@ -14,7 +14,7 @@ line(
   endAbsolute?: [number],
   end?: [number],
   tag?: TagDeclarator,
-) -> Sketch
+): Sketch
 ```
 
 

docs/kcl/ln.md

@@ -9,7 +9,7 @@ Compute the natural logarithm of the number.
 
 
 ```js
-ln(num: number) -> number
+ln(num: number): number
 ```
 
 ### Tags

docs/kcl/loft.md

@@ -15,7 +15,7 @@ loft(
   bezApproximateRational: bool,
   baseCurveIndex?: integer,
   tolerance?: number,
-) -> Solid
+): Solid
 ```
 
 
@@ -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/log.md

@@ -12,7 +12,7 @@ The result might not be correctly rounded owing to implementation details; `log2
 log(
   num: number,
   base: number,
-) -> number
+): number
 ```
 
 ### Tags

docs/kcl/log10.md

@@ -9,7 +9,7 @@ Compute the base 10 logarithm of the number.
 
 
 ```js
-log10(num: number) -> number
+log10(num: number): number
 ```
 
 ### Tags

docs/kcl/log2.md

@@ -9,7 +9,7 @@ Compute the base 2 logarithm of the number.
 
 
 ```js
-log2(num: number) -> number
+log2(num: number): number
 ```
 
 ### Tags

docs/kcl/m.md

@@ -15,7 +15,7 @@ For example, if the current project uses inches, this function will return `39.3
 We merely provide these functions for convenience and readability, as `10 * m()` is more readable that your intent is "I want 10 meters" than `10 * 1000`, if the project settings are in millimeters.
 
 ```js
-m() -> number
+m(): number
 ```
 
 ### Tags

docs/kcl/map.md

@@ -12,7 +12,7 @@ Given a list like `[a, b, c]`, and a function like `f`, returns `[f(a), f(b), f(
 map(
   array: [KclValue],
   mapFn: FunctionSource,
-) -> [KclValue]
+): [KclValue]
 ```
 
 
@@ -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/max.md

@@ -9,7 +9,7 @@ Compute the maximum of the given arguments.
 
 
 ```js
-max(args: [number]) -> number
+max(args: [number]): number
 ```
 
 ### Tags

docs/kcl/min.md

@@ -9,7 +9,7 @@ Compute the minimum of the given arguments.
 
 
 ```js
-min(args: [number]) -> number
+min(args: [number]): number
 ```
 
 ### Tags

docs/kcl/mirror2d.md

@@ -14,7 +14,7 @@ Mirror occurs around a local sketch axis rather than a global axis.
 mirror2d(
   data: Mirror2dData,
   sketchSet: SketchSet,
-) -> [Sketch]
+): [Sketch]
 ```
 
 

docs/kcl/mm.md

@@ -15,7 +15,7 @@ For example, if the current project uses inches, this function will return `(1/2
 We merely provide these functions for convenience and readability, as `10 * mm()` is more readable that your intent is "I want 10 millimeters" than `10 * (1/25.4)`, if the project settings are in inches.
 
 ```js
-mm() -> number
+mm(): number
 ```
 
 ### Tags

docs/kcl/offsetPlane.md

@@ -12,7 +12,7 @@ For example, if you offset the 'XZ' plane by 10, the new plane will be parallel
 offsetPlane(
   plane: PlaneData,
   offset: number,
-) -> Plane
+): Plane
 ```
 
 
@@ -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/patternCircular2d.md

@@ -1,12 +1,12 @@
 ---
 title: "patternCircular2d"
-excerpt: "Repeat a 2-dimensional sketch some number of times along a partial or"
+excerpt: "Repeat a 2-dimensional sketch some number of times along a partial or complete circle some specified number of times. Each object may additionally be rotated along the circle, ensuring orentation of the solid with respect to the center of the circle is maintained."
 layout: manual
 ---
 
-Repeat a 2-dimensional sketch some number of times along a partial or
+Repeat a 2-dimensional sketch some number of times along a partial or complete circle some specified number of times. Each object may additionally be rotated along the circle, ensuring orentation of the solid with respect to the center of the circle is maintained.
+
 
-complete circle some specified number of times. Each object may additionally be rotated along the circle, ensuring orentation of the solid with respect to the center of the circle is maintained.
 
 ```js
 patternCircular2d(
@@ -16,7 +16,7 @@ patternCircular2d(
   arcDegrees: number,
   rotateDuplicates: bool,
   useOriginal?: bool,
-) -> [Sketch]
+): [Sketch]
 ```
 
 

docs/kcl/patternCircular3d.md

@@ -1,12 +1,12 @@
 ---
 title: "patternCircular3d"
-excerpt: "Repeat a 3-dimensional solid some number of times along a partial or"
+excerpt: "Repeat a 3-dimensional solid some number of times along a partial or complete circle some specified number of times. Each object may additionally be rotated along the circle, ensuring orentation of the solid with respect to the center of the circle is maintained."
 layout: manual
 ---
 
-Repeat a 3-dimensional solid some number of times along a partial or
+Repeat a 3-dimensional solid some number of times along a partial or complete circle some specified number of times. Each object may additionally be rotated along the circle, ensuring orentation of the solid with respect to the center of the circle is maintained.
+
 
-complete circle some specified number of times. Each object may additionally be rotated along the circle, ensuring orentation of the solid with respect to the center of the circle is maintained.
 
 ```js
 patternCircular3d(
@@ -17,7 +17,7 @@ patternCircular3d(
   arcDegrees: number,
   rotateDuplicates: bool,
   useOriginal?: bool,
-) -> [Solid]
+): [Solid]
 ```
 
 
@@ -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

@@ -1,12 +1,12 @@
 ---
 title: "patternLinear2d"
-excerpt: "Repeat a 2-dimensional sketch along some dimension, with a dynamic amount"
+excerpt: "Repeat a 2-dimensional sketch along some dimension, with a dynamic amount of distance between each repetition, some specified number of times."
 layout: manual
 ---
 
-Repeat a 2-dimensional sketch along some dimension, with a dynamic amount
+Repeat a 2-dimensional sketch along some dimension, with a dynamic amount of distance between each repetition, some specified number of times.
+
 
-of distance between each repetition, some specified number of times.
 
 ```js
 patternLinear2d(
@@ -15,7 +15,7 @@ patternLinear2d(
   distance: number,
   axis: [number],
   useOriginal?: bool,
-) -> [Sketch]
+): [Sketch]
 ```
 
 
@@ -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

@@ -1,12 +1,10 @@
 ---
 title: "patternLinear3d"
-excerpt: "Repeat a 3-dimensional solid along a linear path, with a dynamic amount"
+excerpt: "Repeat a 3-dimensional solid along a linear path, with a dynamic amount of distance between each repetition, some specified number of times."
 layout: manual
 ---
 
-Repeat a 3-dimensional solid along a linear path, with a dynamic amount
-
-of distance between each repetition, some specified number of times.
+Repeat a 3-dimensional solid along a linear path, with a dynamic amount of distance between each repetition, some specified number of times.
 
 ///
 
@@ -17,7 +15,7 @@ patternLinear3d(
   distance: number,
   axis: [number],
   useOriginal?: bool,
-) -> [Solid]
+): [Solid]
 ```
 
 
@@ -64,17 +62,11 @@ case = startSketchOn('XY')
   |> extrude(length = 65)
 
 thing1 = startSketchOn(case, 'end')
-  |> circle({
-       center = [-size / 2, -size / 2],
-       radius = 25
-     }, %)
+  |> circle(center = [-size / 2, -size / 2], radius = 25)
   |> extrude(length = 50)
 
 thing2 = startSketchOn(case, 'end')
-  |> circle({
-       center = [size / 2, -size / 2],
-       radius = 25
-     }, %)
+  |> circle(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 +93,7 @@ case = startSketchOn('XY')
   |> extrude(length = 65)
 
 thing1 = startSketchOn(case, 'end')
-  |> circle({
-       center = [-size / 2, -size / 2],
-       radius = 25
-     }, %)
+  |> circle(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

@@ -40,7 +40,7 @@ patternTransform(
   instances: integer,
   transform: FunctionSource,
   useOriginal?: bool,
-) -> [Solid]
+): [Solid]
 ```
 
 
@@ -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

@@ -14,7 +14,7 @@ patternTransform2d(
   instances: integer,
   transform: FunctionSource,
   useOriginal?: bool,
-) -> [Sketch]
+): [Sketch]
 ```
 
 
@@ -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

@@ -11,7 +11,7 @@ Return the value of `pi`. Archimedes’ constant (π).
 **DEPRECATED** use the constant PI
 
 ```js
-pi() -> number
+pi(): number
 ```
 
 ### Tags
@@ -31,10 +31,7 @@ pi() -> number
 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/polar.md

@@ -1,15 +1,15 @@
 ---
 title: "polar"
-excerpt: "Convert polar/sphere (azimuth, elevation, distance) coordinates to"
+excerpt: "Convert polar/sphere (azimuth, elevation, distance) coordinates to cartesian (x/y/z grid) coordinates."
 layout: manual
 ---
 
-Convert polar/sphere (azimuth, elevation, distance) coordinates to
+Convert polar/sphere (azimuth, elevation, distance) coordinates to cartesian (x/y/z grid) coordinates.
+
 
-cartesian (x/y/z grid) coordinates.
 
 ```js
-polar(data: PolarCoordsData) -> [number]
+polar(data: PolarCoordsData): [number]
 ```
 
 

docs/kcl/polygon.md

@@ -13,7 +13,7 @@ polygon(
   data: PolygonData,
   sketchSurfaceOrGroup: SketchOrSurface,
   tag?: TagDeclarator,
-) -> Sketch
+): Sketch
 ```
 
 

docs/kcl/pop.md

@@ -9,7 +9,7 @@ Remove the last element from an array.
 Returns a new array with the last element removed.
 
 ```js
-pop(array: [KclValue]) -> KclValue
+pop(array: [KclValue]): KclValue
 ```
 
 

docs/kcl/pow.md

@@ -12,7 +12,7 @@ Compute the number to a power.
 pow(
   num: number,
   pow: number,
-) -> number
+): number
 ```
 
 ### Tags

docs/kcl/profileStart.md

@@ -1,15 +1,15 @@
 ---
 title: "profileStart"
-excerpt: "Extract the provided 2-dimensional sketch's profile's origin"
+excerpt: "Extract the provided 2-dimensional sketch's profile's origin value."
 layout: manual
 ---
 
-Extract the provided 2-dimensional sketch's profile's origin
+Extract the provided 2-dimensional sketch's profile's origin value.
+
 
-value.
 
 ```js
-profileStart(sketch: Sketch) -> [number]
+profileStart(sketch: Sketch): [number]
 ```
 
 

docs/kcl/profileStartX.md

@@ -1,15 +1,15 @@
 ---
 title: "profileStartX"
-excerpt: "Extract the provided 2-dimensional sketch's profile's origin's 'x'"
+excerpt: "Extract the provided 2-dimensional sketch's profile's origin's 'x' value."
 layout: manual
 ---
 
-Extract the provided 2-dimensional sketch's profile's origin's 'x'
+Extract the provided 2-dimensional sketch's profile's origin's 'x' value.
+
 
-value.
 
 ```js
-profileStartX(sketch: Sketch) -> number
+profileStartX(sketch: Sketch): number
 ```
 
 

docs/kcl/profileStartY.md

@@ -1,15 +1,15 @@
 ---
 title: "profileStartY"
-excerpt: "Extract the provided 2-dimensional sketch's profile's origin's 'y'"
+excerpt: "Extract the provided 2-dimensional sketch's profile's origin's 'y' value."
 layout: manual
 ---
 
-Extract the provided 2-dimensional sketch's profile's origin's 'y'
+Extract the provided 2-dimensional sketch's profile's origin's 'y' value.
+
 
-value.
 
 ```js
-profileStartY(sketch: Sketch) -> number
+profileStartY(sketch: Sketch): number
 ```