Merge branch 'main' into pierremtb/adhoc/pnpm

.codespellrc

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

.eslintignore

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

.eslintrc

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

.github/actions/github-release/Dockerfile

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

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

@@ -1,21 +0,0 @@
-# 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

@@ -1,15 +0,0 @@
-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

@@ -1,143 +0,0 @@
-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

@@ -1,10 +0,0 @@
-{
-  "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/ci-cd-scripts/playwright-electron.sh

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

.github/dependabot.yml

@@ -10,7 +10,6 @@ updates:
       - '/'
       - '/packages/codemirror-lang-kcl/'
       - '/packages/codemirror-lsp-client/'
-      - '/rust/kcl-language-server/'
     schedule:
       interval: weekly
       day: monday
@@ -26,7 +25,7 @@ updates:
       - adamchalmers
       - jessfraz
   - package-ecosystem: 'cargo' # See documentation for possible values
-    directory: '/rust/' # Location of package manifests
+    directory: '/src/wasm-lib/' # Location of package manifests
     schedule:
       interval: weekly
       day: monday
@@ -40,13 +39,3 @@ updates:
       wasm-bindgen-deps:
         patterns:
           - "wasm-bindgen*"
-  - package-ecosystem: "pip"
-    directories:
-      - "/public/kcl-samples/"
-      - "/rust/kcl-python-bindings/"
-    schedule:
-      interval: weekly
-      day: monday
-    reviewers:
-      - adamchalmers
-      - jessfraz

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

@@ -10,27 +10,28 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'pnpm'
       - name: Install dependencies
-        run: yarn
+        run: pnpm install
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@stable
       - name: Cache wasm
         uses: Swatinem/rust-cache@v2
         with:
-          workspaces: './rust'
+          workspaces: './src/wasm-lib'
-      - uses: taiki-e/install-action@955a6ff1416eae278c9f833008a9beb4b7f9afe3
+      - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
         with:
           tool: wasm-pack
       - name: build wasm
-        run: yarn build:wasm
+        run: pnpm build:wasm
 
 
       # Upload the WASM bundle as an artifact
       - uses: actions/upload-artifact@v4
         with:
           name: wasm-bundle
-          path: rust/kcl-wasm-lib/pkg
+          path: src/wasm-lib/pkg

.github/workflows/build-apps.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - main
+      - pierremtb/adhoc/pnpm
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+'
       - 'nightly-v[0-9]+.[0-9]+.[0-9]+'
@@ -26,40 +27,42 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: pnpm/action-setup@v4
+
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'pnpm'
 
-      - run: yarn install
+      - run: pnpm install
 
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@stable
 
       - uses: Swatinem/rust-cache@v2
         with:
-          workspaces: './rust'
+          workspaces: './src/wasm-lib'
 
-      # TODO: see if we can fetch from main instead if no diff at rust
+      # TODO: see if we can fetch from main instead if no diff at src/wasm-lib
-      - uses: taiki-e/install-action@955a6ff1416eae278c9f833008a9beb4b7f9afe3
+      - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
         with:
           tool: wasm-pack
 
       - name: Run build:wasm
-        run: "yarn build:wasm"
+        run: "pnpm build:wasm"
 
       - name: Set nightly version, product name, release notes, and icons
         if: ${{ env.IS_NIGHTLY == 'true' }}
         run: |
           export VERSION=${GITHUB_REF_NAME#nightly-v}
-          yarn files:set-version
+          pnpm files:set-version
-          yarn files:flip-to-nightly
+          pnpm files:flip-to-nightly
 
       - name: Set release version
         if: ${{ env.IS_RELEASE == 'true' }}
         run: |
           export VERSION=${GITHUB_REF_NAME#v}
-          yarn files:set-version
+          pnpm files:set-version
 
       - uses: actions/upload-artifact@v4
         with:
@@ -67,7 +70,7 @@ jobs:
           path: |
             package.json
             electron-builder.yml
-            rust/kcl-wasm-lib/pkg/kcl_wasm_lib*
+            src/wasm-lib/pkg/wasm_lib*
             release-notes.md
             assets/icon.ico
             assets/icon.png
@@ -117,27 +120,28 @@ jobs:
           ls -R prepared-files
           cp prepared-files/package.json package.json
           cp prepared-files/electron-builder.yml electron-builder.yml
-          cp prepared-files/rust/kcl-wasm-lib/pkg/kcl_wasm_lib_bg.wasm public
+          cp prepared-files/src/wasm-lib/pkg/wasm_lib_bg.wasm public
-          mkdir rust/kcl-wasm-lib/pkg
+          mkdir src/wasm-lib/pkg
-          cp prepared-files/rust/kcl-wasm-lib/pkg/kcl_wasm_lib* rust/kcl-wasm-lib/pkg
+          cp prepared-files/src/wasm-lib/pkg/wasm_lib* src/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
 
+      - uses: pnpm/action-setup@v4
+
       - name: Sync node version and setup cache
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn' # Set this to npm, yarn or pnpm.
+          cache: 'pnpm' # Set this to npm, pnpm or pnpm.
 
-      - name: yarn install
+      - name: pnpm install
         # Windows is picky sometimes and fails on fetch. Step takes about ~30s
-        uses: nick-fields/retry@v3.0.2
+        uses: nick-fields/retry@v3.0.1
         with:
-          shell: bash
           timeout_minutes: 2
           max_attempts: 3
-          command: yarn install
+          command: pnpm install
 
       - name: Prepare certificate and variables (Windows only)
         if: ${{ (env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true') && matrix.os == 'windows-2022' }}
@@ -169,7 +173,7 @@ jobs:
         if: ${{ env.IS_RELEASE == 'false' && env.IS_NIGHTLY == 'false' }}
         # electron-builder doesn't have a concept of release vs debug,
         # this is just not doing any codesign or release yml generation, and points to dev infra
-        run: yarn tronb:package:dev
+        run: pnpm tronb:package:dev
 
       - name: Build the app (release)
         if: ${{ env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true' }}
@@ -184,12 +188,11 @@ 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.2
+        uses: nick-fields/retry@v3.0.1
         with:
-          shell: bash
           timeout_minutes: 10
           max_attempts: 3
-          command: yarn tronb:package:prod
+          command: pnpm tronb:package:prod
 
       - name: List artifacts in out/
         run: ls -R out
@@ -246,12 +249,11 @@ 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.2
+        uses: nick-fields/retry@v3.0.1
         with:
-          shell: bash
           timeout_minutes: 10
           max_attempts: 3
-          command: yarn tronb:package:prod
+          command: pnpm tronb:package:prod
 
       - uses: actions/upload-artifact@v4
         if: ${{ env.IS_RELEASE == 'true' }}
@@ -391,7 +393,7 @@ jobs:
           export TAG="nightly-${VERSION}"
           export PREVIOUS_TAG=$(git tag --list --sort=-committerdate "nightly-v[0-9]*" | head -n2 | tail -n1)
           export NOTES=$(./scripts/get-nightly-changelog.sh)
-          yarn files:set-notes
+          pnpm files:set-notes
 
       - name: Authenticate to Google Cloud
         if: ${{ env.IS_NIGHTLY == 'true' }}
@@ -416,4 +418,4 @@ jobs:
 
       - name: Invalidate bucket cache on latest*.yml and last_download.json files
         if: ${{ env.IS_NIGHTLY == 'true' }}
-        run: yarn files:invalidate-bucket:nightly
+        run: pnpm files:invalidate-bucket:nightly

.github/workflows/cargo-check.yml

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

.github/workflows/cargo-test.yml

@@ -5,35 +5,25 @@ on:
 
   pull_request:
   workflow_dispatch:
-permissions:
+permissions: read-all
-  contents: read
-  pull-requests: write
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
-name: cargo test
+name: cargo test of wasm-lib
 jobs:
   cargotest:
     name: cargo test
     runs-on: ubuntu-latest-8-cores
+    strategy:
+      matrix:
+        dir: ['src/wasm-lib']
     steps:
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.MODELING_APP_GH_APP_ID }}
-          private-key: ${{ secrets.MODELING_APP_GH_APP_PRIVATE_KEY }}
-          owner: ${{ github.repository_owner }}
       - uses: actions/checkout@v4
+      - name: Install latest rust
+        uses: actions-rs/toolchain@v1
         with:
-          token: ${{ steps.app-token.outputs.token }}
+          toolchain: stable
-      - name: Use correct Rust toolchain
+          override: true
-        shell: bash
-        run: |
-          cp --update=none rust/rust-toolchain.toml ./ || true
-      - name: Install rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          cache: false # Configured below.
       - name: Install vector
         run: |
           curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh
@@ -50,95 +40,22 @@ jobs:
           ${HOME}/.vector/bin/vector --config /tmp/vector.toml &
       - uses: taiki-e/install-action@cargo-llvm-cov
       - uses: taiki-e/install-action@nextest
-      - name: Install just
-        uses: taiki-e/install-action@just
-      - name: Install cargo-insta
-        shell: bash
-        run: |
-          cargo install cargo-insta
       - name: Rust Cache
-        uses: Swatinem/rust-cache@v2
+        uses: Swatinem/rust-cache@v2.6.1
-        with:
-          workspaces: rust
-      - name: Fetch the base branch
-        if: ${{ github.event_name == 'pull_request' }}
-        run: git fetch origin ${{ github.base_ref }} --depth=1
-      - name: Check for path changes
-        id: path-changes
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          # Manual runs or push should run all tests.
-          if [[ ${{ github.event_name }} != 'pull_request' ]]; then
-            echo "outside-kcl-samples=true" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          changed_files=$(git diff --name-only origin/${{ github.base_ref }})
-          echo "$changed_files"
-          if grep -Evq '^public/kcl-samples/|^rust/kcl-lib/tests/kcl_samples/' <<< "$changed_files" ; then
-            echo "outside-kcl-samples=true" >> $GITHUB_OUTPUT
-          else
-            echo "outside-kcl-samples=false" >> $GITHUB_OUTPUT
-          fi
-      - name: cargo test only kcl-samples
-        id: cargo-test-kcl-samples
-        if: steps.path-changes.outputs.outside-kcl-samples == 'false'
-        continue-on-error: true
-        shell: bash
-        run: |
-          set -euo pipefail
-          cd rust
-          cargo nextest run --workspace --retries=2 --no-fail-fast --profile ci simulation_tests::kcl_samples 2>&1 | tee /tmp/github-actions.log
-        env:
-          KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
-          RUST_BACKTRACE: full
-          RUST_MIN_STACK: 10485760000
-      - name: Commit differences
-        if: steps.path-changes.outputs.outside-kcl-samples == 'false' && steps.cargo-test-kcl-samples.outcome == 'failure'
-        shell: bash
-        run: |
-          set -euo pipefail
-          cd rust
-          just overwrite-sim-test kcl_samples
-          git add kcl-lib/tests
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          git remote set-url origin https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
-          git fetch origin
-          echo ${{ github.head_ref }}
-          git checkout ${{ github.head_ref }}
-          if ! git commit -m "Update kcl-samples simulation test output" ; then
-            echo "No changes to commit"
-            # This only runs if tests failed, so we should fail the step.
-            exit 1
-          fi
-          git push origin ${{ github.head_ref }}
-        env:
-          # The default is auto, and insta behaves differently in CI vs. not.
-          INSTA_UPDATE: always
-          KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
-          # Configure nextest when it's run by insta (via just).
-          NEXTEST_PROFILE: ci
-          RUST_BACKTRACE: full
-          RUST_MIN_STACK: 10485760000
       - name: cargo test
-        if: steps.path-changes.outputs.outside-kcl-samples == 'true'
         shell: bash
         run: |-
-          cd rust
+          cd "${{ matrix.dir }}"
-          cargo llvm-cov nextest --workspace --lcov --output-path lcov.info --retries=2 --no-fail-fast -P ci 2>&1 | tee /tmp/github-actions.log
+          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
         env:
           KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
           RUST_MIN_STACK: 10485760000
       - name: Upload to codecov.io
-        if: steps.path-changes.outputs.outside-kcl-samples == 'true'
         uses: codecov/codecov-action@v5
         with:
           token: ${{secrets.CODECOV_TOKEN}}
           fail_ci_if_error: true
-          flags: rust
+          flags: wasm-lib
           verbose: true
           files: lcov.info
 

.github/workflows/check-kcl-header.yml

@@ -1,48 +0,0 @@
-name: Check kcl-samples files for proper header structure
-
-on:
-  pull_request:
-    paths:
-      - 'public/kcl-samples/**/*.kcl'
-      - .github/workflows/check-kcl-header.yml
-    branches:
-      - main
-  push:
-    paths:
-      - 'public/kcl-samples/**/*.kcl'
-      - .github/workflows/check-kcl-header.yml
-    branches:
-      - main
-
-permissions:
-  contents: read
-
-jobs:
-  check-kcl-header:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Check KCL files for header comment block and blank line
-        run: |
-          files=$(find public/kcl-samples -type f -name '*.kcl')
-          failed_files=()
-
-          for file in $files; do
-            if ! awk '
-              NR == 1 && $0 !~ /^\/\// { exit 1 }
-              BEGIN { in_comment = 1 }
-              NF == 0 && in_comment == 1 { in_comment = 0; next }
-              $1 !~ /^\/\// && in_comment == 1 { exit 1 }
-              in_comment == 0 && NF > 0 { exit 0 }
-              END { if (in_comment == 1) exit 1 }
-              ' "$file"; then
-              failed_files+=("$file")
-            fi
-          done
-
-          if [ ${#failed_files[@]} -ne 0 ]; then
-            echo "One or more KCL files do not begin with a header comment block followed by a blank line:"
-            printf '%s\n' "${failed_files[@]}"
-            exit 1
-          fi

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

@@ -16,17 +16,19 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: pnpm/action-setup@v4
+
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'pnpm'
 
-      - run: yarn install
+      - run: pnpm install
         working-directory: packages/codemirror-lang-kcl
 
-      - run: yarn tsc
+      - run: pnpm tsc
         working-directory: packages/codemirror-lang-kcl
 
       - name: run unit tests
-        run: yarn test
+        run: pnpm test
         working-directory: packages/codemirror-lang-kcl

.github/workflows/e2e-tests.yml

@@ -1,7 +1,7 @@
 name: E2E Tests
 on:
   push:
-    branches: [ main ]
+    branches: [ main, pierremtb/adhoc/pnpm]
   pull_request:
   schedule:
     - cron: 0 * * * *  # hourly
@@ -17,41 +17,6 @@ permissions:
 
 
 jobs:
-
-  path-changes:
-    runs-on: ubuntu-latest
-    outputs:
-      significant: ${{ steps.path-changes.outputs.significant }}
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Fetch the base branch
-        if: ${{ github.event_name == 'pull_request' }}
-        run: git fetch origin ${{ github.base_ref }} --depth=1
-      - name: Check for path changes
-        id: path-changes
-        shell: bash
-        run: |
-          set -euo pipefail
-
-          # Manual runs or push should run all tests.
-          if [[ ${{ github.event_name }} != 'pull_request' ]]; then
-            echo "significant=true" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          changed_files=$(git diff --name-only origin/${{ github.base_ref }})
-          echo "$changed_files"
-          if grep -Evq '^README.md|^public/kcl-samples/|^rust/kcl-lib/tests/kcl_samples/' <<< "$changed_files" ; then
-            echo "significant=true" >> $GITHUB_OUTPUT
-          else
-            echo "significant=false" >> $GITHUB_OUTPUT
-          fi
-      - name: Display path changes
-        run: |
-          # For debugging purposes.
-          echo "significant: ${{ steps.path-changes.outputs.significant }}"
-
   electron:
     timeout-minutes: 60
     name: playwright:electron:${{ matrix.os }} ${{ matrix.shardIndex }} ${{ matrix.shardTotal }}
@@ -64,8 +29,6 @@ jobs:
         shardTotal: [4]
         # TODO: add ref here for main and latest release tag
     runs-on: ${{ matrix.os }}
-    needs: path-changes
-    if: ${{ needs.path-changes.outputs.significant == 'true' }}
     steps:
     - uses: actions/create-github-app-token@v1
       id: app-token
@@ -82,24 +45,27 @@ jobs:
       with:
         filters: |
           rust:
-            - 'rust/**'
+            - 'src/wasm-lib/**'
+    - uses: pnpm/action-setup@v4
+    # TODO: remove this
+    - run: npm install --global --force corepack@latest
     - uses: actions/setup-node@v4
       with:
         node-version-file: '.nvmrc'
-        cache: 'yarn'
+        cache: 'pnpm'
+    - uses: KittyCAD/action-install-cli@main
     - name: Install dependencies
-      id: deps-install
       shell: bash
-      run: yarn
+      run: pnpm install
     - name: Cache Playwright Browsers
       uses: actions/cache@v4
       with:
         path: |
           ~/.cache/ms-playwright/
-        key: ${{ runner.os }}-playwright-${{ hashFiles('yarn.lock') }}
+        key: ${{ runner.os }}-playwright-${{ hashFiles('pnpm.lock') }}
     - name: Install Playwright Browsers
       shell: bash
-      run: yarn playwright install --with-deps
+      run: pnpm playwright install --with-deps
     - name: Download Wasm Cache
       id: download-wasm
       if: github.event_name != 'schedule' && steps.filter.outputs.rust == 'false'
@@ -110,27 +76,27 @@ jobs:
         name: wasm-bundle
         workflow: build-and-store-wasm.yml
         branch: main
-        path: rust/kcl-wasm-lib/pkg
+        path: src/wasm-lib/pkg
     - name: copy wasm blob
       if: github.event_name != 'schedule' && steps.filter.outputs.rust == 'false'
       shell: bash
-      run: cp rust/kcl-wasm-lib/pkg/kcl_wasm_lib_bg.wasm public
+      run: cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
       continue-on-error: true
     - name: Setup Rust
       uses: dtolnay/rust-toolchain@stable
-    - uses: taiki-e/install-action@955a6ff1416eae278c9f833008a9beb4b7f9afe3
+    - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
       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: './rust'
+        workspaces: './src/wasm-lib'
     - name: OR Cache Wasm (because wasm cache failed)
       if: steps.download-wasm.outcome == 'failure'
       uses: Swatinem/rust-cache@v2
       with:
-        workspaces: './rust'
+        workspaces: './src/wasm-lib'
     - name: install good sed
       if:  ${{ startsWith(matrix.os, 'macos') }}
       shell: bash
@@ -157,21 +123,21 @@ jobs:
     - name: Build Wasm (because rust diff)
       if: github.event_name == 'schedule' || steps.filter.outputs.rust == 'true'
       shell: bash
-      run: yarn build:wasm
+      run: pnpm build:wasm
     - name: OR Build Wasm (because wasm cache failed)
       if: steps.download-wasm.outcome == 'failure'
       shell: bash
-      run: yarn build:wasm
+      run: pnpm build:wasm
     - name: build web
       shell: bash
-      run: yarn tronb:vite:dev
+      run: pnpm tronb:vite:dev
     - name: Run ubuntu/chrome snapshots
       if: ${{ matrix.os == 'namespace-profile-ubuntu-8-cores' && matrix.shardIndex == 1 }}
       shell: bash
       # 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: |
-        yarn test:snapshots
+        PLATFORM=web pnpm playwright test --config=playwright.config.ts --retries="3" --update-snapshots --grep=@snapshot --trace=on --shard=1/1
       env:
         CI: true
         NODE_ENV: development
@@ -231,10 +197,9 @@ jobs:
         path: test-results/
     - name: Run playwright/electron flow (with retries)
       id: retry
-      if: ${{ !cancelled() && steps.deps-install.outcome == 'success' }}
+      if: ${{ !cancelled() && (success() || failure()) }}
-      uses: nick-fields/retry@v3.0.2
+      uses: nick-fields/retry@v3.0.1
       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/generate-machine-api-types.yml

@@ -18,13 +18,14 @@ jobs:
     runs-on: 'ubuntu-latest'
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'pnpm'
-      - run: yarn install
+      - run: pnpm install
-      - run: yarn generate:machine-api
+      - run: pnpm generate:machine-api
-      - run: yarn fmt
+      - run: pnpm fmt
       - name: check for changes
         id: git-check
         run: |

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

@@ -1,401 +0,0 @@
-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

@@ -1,179 +0,0 @@
-# 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/kcl-samples-manifest.yml

@@ -1,52 +0,0 @@
-name: KCL Samples Manifest
-
-permissions:
-    contents: write
-    pull-requests: write
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-  workflow_dispatch: # Allows manual triggering from the Actions tab
-
-jobs:
-  generate-manifest:
-    runs-on: ubuntu-latest
-
-    steps:
-      # Checkout the repository
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      # Set up Node.js
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-
-      # Run the script to generate the manifest.json
-      - name: Run manifest generation script
-        working-directory: public/kcl-samples
-        run: node generate-manifest.js
-
-      # Check if the manifest.json has changed
-      - name: Check for changes
-        id: check-for-changes
-        working-directory: public/kcl-samples
-        run: |
-          git diff --exit-code ./manifest.json || echo "changed=changes detected" >> "$GITHUB_OUTPUT"
-
-      # Stage and commit the changes if any were made
-      - name: Commit and push changes
-        if: ${{ success() && (steps.check-for-changes.outputs.changed == 'changes detected') }}
-        working-directory: public/kcl-samples
-        run: |
-          git add ./manifest.json
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          git remote set-url origin https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
-          git fetch origin
-          echo ${{ github.head_ref }}
-          git checkout ${{ github.head_ref }}
-          git commit -m "Update manifest.json"
-          git push origin ${{ github.head_ref }}

.github/workflows/pr-kcl-samples-repo.yml

@@ -1,64 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - 'public/kcl-samples/**'
-  # pull_request:
-  #   paths:
-  #     - .github/workflows/pr-kcl-samples-repo.yml
-  workflow_dispatch:
-name: Create PR in kcl-samples repo
-permissions:
-  contents: read
-  pull-requests: write
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-jobs:
-  pr-kcl-samples-repo:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/create-github-app-token@v1
-        id: app-token
-        with:
-          # required
-          app-id: ${{ secrets.GH_ORG_APP_ID }}
-          private-key: ${{ secrets.GH_ORG_APP_PRIVATE_KEY }}
-          owner: ${{ github.repository_owner }}
-      - uses: actions/checkout@v4
-      # Checkout the other repo since we want to update the files there.
-      - uses: actions/checkout@v4
-        with:
-          repository: 'KittyCAD/kcl-samples'
-          ref: next
-          path: kcl-samples-repo
-          token: ${{ steps.app-token.outputs.token }}
-      - name: Move files to repo work tree
-        shell: bash
-        run: |
-          rsync -av --delete \
-            --exclude='.git' \
-            --exclude='.github' \
-            --exclude='screenshots' \
-            --exclude='step' \
-            public/kcl-samples/ kcl-samples-repo/
-      - name: Commit the changes in the repo
-        shell: bash
-        run: |
-          set -euo pipefail
-          cd kcl-samples-repo
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
-          export NEW_BRANCH="update-from-modeling-app"
-          git switch -c "$NEW_BRANCH"
-          git add --all .
-          git commit -m "Updates from modeling-app repo" || exit 0
-          git push -f origin "$NEW_BRANCH"
-          gh pr create --title "Update from modeling-app" \
-            --body "Updating files from the modeling-app repo" \
-            --head "$NEW_BRANCH" \
-            --reviewer jtran \
-            --base next || true
-        env:
-          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}

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

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

.github/workflows/ruff.yml

@@ -1,24 +0,0 @@
-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

@@ -20,61 +20,63 @@ jobs:
     runs-on: 'ubuntu-22.04'
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'pnpm'
-      - run: yarn install
+      - run: pnpm install
-      - run: yarn fmt-check
+      - run: pnpm fmt-check
 
   yarn-build-wasm:
     runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'pnpm'
-      - run: yarn install
+      - run: pnpm install
-      - uses: taiki-e/install-action@955a6ff1416eae278c9f833008a9beb4b7f9afe3
+      - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
         with:
           tool: wasm-pack
-      - run: yarn build:wasm
+      - run: pnpm build:wasm
 
   yarn-tsc:
     runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'pnpm'
-      - run: yarn install
+      - run: pnpm install
-      - run: yarn --cwd ./rust/kcl-language-server --modules-folder node_modules install
       - uses: Swatinem/rust-cache@v2
         with:
-          workspaces: './rust'
+          workspaces: './src/wasm-lib'
 
-      - uses: taiki-e/install-action@955a6ff1416eae278c9f833008a9beb4b7f9afe3
+      - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
         with:
           tool: wasm-pack
-      - run: yarn build:wasm
+      - run: pnpm build:wasm
-      - run: yarn tsc
+      - run: pnpm tsc
 
   yarn-lint:
     runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'pnpm'
-      - run: yarn install
+      - run: pnpm install
-      - run: yarn --cwd ./rust/kcl-language-server --modules-folder node_modules install
+      - run: pnpm lint
-      - run: yarn lint
 
   python-codespell:
     runs-on: ubuntu-22.04
@@ -94,27 +96,29 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: pnpm/action-setup@v4
+
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'pnpm'
 
-      - run: yarn install
+      - run: pnpm install
-      - uses: taiki-e/install-action@955a6ff1416eae278c9f833008a9beb4b7f9afe3
+      - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
         with:
           tool: wasm-pack
-      - run: yarn build:wasm
+      - run: pnpm build:wasm
 
-      - run: yarn simpleserver:bg
+      - run: pnpm simpleserver:bg
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
 
       - name: Install Chromium Browser
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn playwright install chromium --with-deps
+        run: pnpm playwright install chromium --with-deps
 
       - name: run unit tests for kcl samples
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn test:unit:kcl-samples
+        run: pnpm test:unit:kcl-samples
         env:
           VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
 
@@ -123,27 +127,29 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: pnpm/action-setup@v4
+
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-          cache: 'yarn'
+          cache: 'pnpm'
 
-      - run: yarn install
+      - run: pnpm install
-      - uses: taiki-e/install-action@955a6ff1416eae278c9f833008a9beb4b7f9afe3
+      - uses: taiki-e/install-action@2dbeb927f58939d3aa13bf06ba0c0a34b76b9bfb
         with:
           tool: wasm-pack
-      - run: yarn build:wasm
+      - run: pnpm build:wasm
 
-      - run: yarn simpleserver:bg
+      - run: pnpm simpleserver:bg
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
 
       - name: Install Chromium Browser
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn playwright install chromium --with-deps
+        run: pnpm playwright install chromium --with-deps
 
       - name: run unit tests
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: xvfb-run -a yarn test:unit
+        run: pnpm test:unit
         env:
           VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
 

.github/workflows/tag-nightly.yml

@@ -23,11 +23,13 @@ jobs:
         with:
           token: ${{ steps.app-token.outputs.token }}
 
+      - uses: pnpm/action-setup@v4
+
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 
-      - run: yarn install
+      - run: pnpm install
 
       - name: Push tag
         run: |

.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 @@ node_modules
 /coverage
 
 # production
-build
+/build
 
 # misc
 .DS_Store
@@ -26,19 +26,16 @@ yarn-error.log*
 .idea
 .vscode
 .helix
+src/wasm-lib/.idea
+src/wasm-lib/.vscode
 
 # rust
-rust/target
+src/wasm-lib/target
-rust/kcl-lib/bindings
+src/wasm-lib/bindings
-public/kcl_wasm_lib_bg.wasm
+src/wasm-lib/kcl/bindings
-rust/lcov.info
+public/wasm_lib_bg.wasm
-rust/kcl-wasm-lib/pkg
+src/wasm-lib/lcov.info
-*.snap.new
+src/wasm-lib/grackle/test_json_output
-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
@@ -51,10 +48,7 @@ e2e/playwright/export-snapshots/*
 !e2e/playwright/export-snapshots/*.png
 !e2e/playwright/snapshot-tests.spec.ts-snapshots/*.png
 
-/public/kcl-samples.zip
+/kcl-samples
-/public/kcl-samples/.github
-/public/kcl-samples/screenshots
-/public/kcl-samples/step
 /test-results/
 /playwright-report/
 /blob-report/
@@ -65,20 +59,16 @@ 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

.husky/pre-push

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

.prettierignore

@@ -7,10 +7,11 @@ 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,25 +1,25 @@
 .PHONY: dev
 
-KCL_WASM_LIB_FILES := $(wildcard rust/**/*.rs)
+WASM_LIB_FILES := $(wildcard src/wasm-lib/**/*.rs)
 TS_SRC := $(wildcard src/**/*.tsx) $(wildcard src/**/*.ts)
 XSTATE_TYPEGENS := $(wildcard src/machines/*.typegen.ts)
 
 dev: node_modules public/wasm_lib_bg.wasm $(XSTATE_TYPEGENS)
-	yarn start
+	pnpm start
 
 # I'm sorry this is so specific to my setup you may as well ignore this.
 # This is so you don't have to deal with electron windows popping up constantly.
 # It should work for you other Linux users.
 lee-electron-test:
 	Xephyr -br -ac -noreset -screen 1200x500 :2 &
-	DISPLAY=:2 NODE_ENV=development PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn tron:test -g "when using the file tree"
+	DISPLAY=:2 NODE_ENV=development PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ pnpm tron:test -g "when using the file tree"
 	killall Xephyr
 
 $(XSTATE_TYPEGENS): $(TS_SRC)
-	yarn xstate typegen 'src/**/*.ts?(x)'
+	pnpm xstate typegen 'src/**/*.ts?(x)'
 
-public/kcl_wasm_lib_bg.wasm: $(KCL_WASM_LIB_FILES)
+public/wasm_lib_bg.wasm: $(WASM_LIB_FILES)
-	yarn build:wasm
+	pnpm build:wasm
 
 node_modules: package.json yarn.lock
-	yarn install
+	pnpm install

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/user-attachments/files/19010536/demo.pdf)
+[Original demo slides](https://github.com/KittyCAD/Eng/files/10398178/demo.pdf)
 
 ## Get started
 
@@ -52,49 +52,45 @@ 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
+pnpm 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
+pnpm install:rust
-yarn install:wasm-pack:sh
+pnpm install:wasm-pack:sh
 
 # Windows
-yarn install:rust:windows
+pnpm install:rust:windows
-yarn install:wasm-pack:cargo
+pnpm install:wasm-pack:cargo
 ```
 
 Then to build the WASM layer, run:
+```
+# macOS/Linux
+pnpm build:wasm
+
+# Windows
+pnpm build:wasm:windows
+```
+
+Or if you have the `gh` cli installed and want to download the latest main wasm bundle. Note that on Windows, you need to associate .ps1 files with PowerShell, which can be done via the right click menu, selecting `C:\Program Files\PowerShell\7\pwsh.exe`, and you can install tools like `gh` via `pnpm install:tools:windows`.
 
 ```
 # macOS/Linux
-yarn build:wasm
+pnpm fetch:wasm
 
 # Windows
-yarn build:wasm:windows
+pnpm fetch:wasm:windows
-```
-
-Or if you have the `gh` cli installed and want to download the latest main wasm bundle. Note that on Windows, you need to associate .ps1 files with PowerShell, which can be done via the right click menu, selecting `C:\Program Files\PowerShell\7\pwsh.exe`, and you can install tools like `gh` via `yarn install:tools:windows`.
-
-```
-# macOS/Linux
-yarn fetch:wasm
-
-# Windows
-yarn fetch:wasm:windows
 ```
 
 That will build the WASM binary and put in the `public` dir (though gitignored).
@@ -102,7 +98,7 @@ That will build the WASM binary and put in the `public` dir (though gitignored).
 Finally, to run the web app only, run:
 
 ```
-yarn start
+pnpm start
 ```
 
 If you're not a Zoo employee you won't be able to access the dev environment, you should copy everything from `.env.production` to `.env.development` to make it point to production instead, then when you navigate to `localhost:3000` the easiest way to sign in is to paste `localStorage.setItem('TOKEN_PERSIST_KEY', "your-token-from-https://zoo.dev/account/api-tokens")` replacing the with a real token from https://zoo.dev/account/api-tokens of course, then navigate to localhost:3000 again. Note that navigating to `localhost:3000/signin` removes your token so you will need to set the token again.
@@ -122,28 +118,27 @@ Third-Party Cookies".
 
 ## Desktop
 
-To spin up the desktop app, `yarn install` and `yarn build:wasm` need to have been done before hand then
+To spin up the desktop app, `pnpm install` and `pnpm build:wasm` need to have been done before hand then
 
 ```
-yarn tron:start
+pnpm tron:start
 ```
 
 This will start the application and hot-reload on changes.
 
 Devtools can be opened with the usual Cmd-Opt-I (Mac) or Ctrl-Shift-I (Linux and Windows).
 
-To package the app for your platform with electron-builder, run `yarn tronb:package:dev` (or `yarn tronb:package:prod` to point to the .env.production variables)
+To package the app for your platform with electron-builder, run `pnpm tronb:package:dev` (or `pnpm tronb:package:prod` to point to the .env.production variables)
 
 ## Checking out commits / Bisecting
 
 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
+pnpm install
-yarn build:wasm
+pnpm build:wasm
-yarn start # or yarn build:local && yarn serve for slower but more production-like build
+pnpm start # or pnpm build:local && pnpm serve for slower but more production-like build
 ```
 
 ## Before submitting a PR
@@ -153,10 +148,10 @@ Before you submit a contribution PR to this repo, please ensure that:
 - There is a corresponding issue for the changes you want to make, so that discussion of approach can be had before work begins.
 - You have separated out refactoring commits from feature commits as much as possible
 - You have run all of the following commands locally:
-  - `yarn fmt`
+  - `pnpm fmt`
-  - `yarn tsc`
+  - `pnpm tsc`
-  - `yarn test`
+  - `pnpm test`
-  - Here they are all together: `yarn fmt && yarn tsc && yarn test`
+  - Here they are all together: `pnpm fmt && pnpm tsc && pnpm test`
 
 ## Release a new version
 
@@ -190,12 +185,11 @@ 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'
@@ -211,14 +205,15 @@ 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:
@@ -228,7 +223,7 @@ $ cargo install cargo-fuzz
 ```
 
 ```bash
-$ cd rust/kcl-lib
+$ cd src/wasm-lib/kcl
 
 # list the fuzz targets
 $ cargo fuzz list
@@ -256,7 +251,6 @@ 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
@@ -266,9 +260,10 @@ docker run --network host  --rm --init -it playwright/chrome:playwright-x.xx.x
 and in another terminal, run:
 
 ```bash
-PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project="Google Chrome" <test suite>
+PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ pnpm playwright test --project="Google Chrome" <test suite>
 ```
 
+
 #### Specific example
 
 open a terminal and run:
@@ -280,24 +275,25 @@ docker run --network host  --rm --init -it playwright/chrome:playwright-1.46.0
 and in another terminal, run:
 
 ```bash
-PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project="Google Chrome" e2e/playwright/command-bar-tests.spec.ts
+PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ pnpm playwright test --project="Google Chrome" e2e/playwright/command-bar-tests.spec.ts
 ```
 
 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
 
 ```
-yarn playwright test --headed
+pnpm playwright test --headed
 ```
 
 run with step through debugger
 
 ```
-PWDEBUG=1 yarn playwright test
+PWDEBUG=1 pnpm playwright test
 ```
 
 However, if you want a debugger I recommend using VSCode and the `playwright` extension, as the above command is a cruder debugger that steps into every function call which is annoying.
@@ -308,7 +304,7 @@ Or comment out browsers in `playwright.config.ts`.
 
 note chromium has encoder compat issues which is why were testing against the branded 'Google Chrome'
 
-You may consider using the VSCode extension, it's useful for running individual threads, but some some reason the "record a test" is locked to chromium with we can't use. A work around is to us the CI `yarn playwright codegen -b wk --load-storage ./store localhost:3000`
+You may consider using the VSCode extension, it's useful for running individual threads, but some some reason the "record a test" is locked to chromium with we can't use. A work around is to us the CI `pnpm playwright codegen -b wk --load-storage ./store localhost:3000`
 
 <details>
 <summary>
@@ -351,21 +347,21 @@ However because much of our tests involve clicking in the stream at specific loc
 If you already haven't, run the following:
 
 ```
-yarn
+pnpm install
-yarn build:wasm
+pnpm build:wasm
-yarn start
+pnpm start
 ```
 
 and finally:
 
 ```
-yarn test:unit
+pnpm test:unit
 ```
 
 For individual testing:
 
 ```
-yarn test abstractSyntaxTree -t "unexpected closed curly brace" --silent=false
+pnpm test abstractSyntaxTree -t "unexpected closed curly brace" --silent=false
 ```
 
 Which will run our suite of [Vitest unit](https://vitest.dev/) and [React Testing Library E2E](https://testing-library.com/docs/react-testing-library/intro) tests, in interactive mode by default.
@@ -379,19 +375,17 @@ 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 rust 
+cd src/wasm-lib
 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
@@ -401,7 +395,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 rust 
+cd src/wasm-lib
 just test
 ```
 
@@ -409,7 +403,7 @@ just test
 # Without just
 # Make sure KITTYCAD_API_TOKEN=<prod zoo.dev token> is set
 # Make sure you installed cargo-nextest
-cd rust 
+cd src/wasm-lib
 export RUST_BRACKTRACE="full" && cargo nextest run --workspace --test-threads=1
 ```
 
@@ -418,14 +412,13 @@ 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 rust 
+cd src/wasm-lib
 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`?
@@ -439,16 +432,17 @@ Part of the CI CD pipeline performs static analysis on the code. Use the followi
 The following set of commands should get us closer to one and done commands to instantly retest issues.
 
 ```
-yarn test-setup
+pnpm test-setup
 ```
 
 > Gotcha, are packages up to date and is the wasm built?
 
+
 ```
-yarn tsc
+pnpm tsc
-yarn fmt-check
+pnpm fmt-check
-yarn lint
+pnpm lint
-yarn test:unit:local
+pnpm test:unit:local
 ```
 
 > Gotcha: Our unit tests have integration tests in them. You need to run a localhost server to run the unit tests.
@@ -460,10 +454,10 @@ yarn test:unit:local
 These E2E tests run in electron. There are tests that are skipped if they are ran in a windows, linux, or macos environment. We can use playwright tags to implement test skipping.
 
 ```
-yarn test:playwright:electron:local
+pnpm test:playwright:electron:local
-yarn test:playwright:electron:windows:local
+pnpm test:playwright:electron:windows:local
-yarn test:playwright:electron:macos:local
+pnpm test:playwright:electron:macos:local
-yarn test:playwright:electron:ubuntu:local
+pnpm test:playwright:electron:ubuntu:local
 ```
 
 > Why does it say local? The CI CD commands that run in the pipeline cannot be ran locally. A single command will not properly setup the testing environment locally.
@@ -499,7 +493,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/rust/kcl-lib).
+For how to contribute to KCL, [see our KCL README](https://github.com/KittyCAD/modeling-app/tree/main/src/wasm-lib/kcl).
 
 ### 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
@@ -21,11 +21,11 @@ abs(num: number): number
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `num` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `num` | `number` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

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
@@ -21,11 +21,11 @@ acos(num: number): number
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `num` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `num` | `number` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

docs/kcl/angleToMatchLengthX.md

@@ -13,7 +13,7 @@ angleToMatchLengthX(
   tag: TagIdentifier,
   to: number,
   sketch: Sketch,
-): number
+) -> number
 ```
 
 
@@ -21,13 +21,13 @@ angleToMatchLengthX(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| [`tag`](/docs/kcl/types/tag) | [`TagIdentifier`](/docs/kcl/types#tag-identifier) |  | Yes |
+| `tag` | [`TagIdentifier`](/docs/kcl/types#tag-identifier) |  | Yes |
-| `to` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `to` | `number` |  | Yes |
-| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) |  | Yes |
+| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

docs/kcl/angleToMatchLengthY.md

@@ -13,7 +13,7 @@ angleToMatchLengthY(
   tag: TagIdentifier,
   to: number,
   sketch: Sketch,
-): number
+) -> number
 ```
 
 
@@ -21,13 +21,13 @@ angleToMatchLengthY(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| [`tag`](/docs/kcl/types/tag) | [`TagIdentifier`](/docs/kcl/types#tag-identifier) |  | Yes |
+| `tag` | [`TagIdentifier`](/docs/kcl/types#tag-identifier) |  | Yes |
-| `to` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `to` | `number` |  | Yes |
-| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) |  | Yes |
+| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

docs/kcl/angledLine.md

@@ -1,19 +1,19 @@
 ---
 title: "angledLine"
-excerpt: "Draw a line segment relative to the current origin using the polar measure of some angle and distance."
+excerpt: "Draw a line segment relative to the current origin using the polar"
 layout: manual
 ---
 
-Draw a line segment relative to the current origin using the polar measure of some angle and distance.
+Draw a line segment relative to the current origin using the polar
-
 
+measure of some angle and distance.
 
 ```js
 angledLine(
   data: AngledLineData,
   sketch: Sketch,
   tag?: TagDeclarator,
-): Sketch
+) -> Sketch
 ```
 
 
@@ -22,12 +22,12 @@ angledLine(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `data` | [`AngledLineData`](/docs/kcl/types/AngledLineData) | Data to draw an angled line. | Yes |
-| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) |  | Yes |
+| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
 
 ### Returns
 
-[`Sketch`](/docs/kcl/types/Sketch)
+[`Sketch`](/docs/kcl/types/Sketch) - A sketch is a collection of paths.
 
 
 ### Examples

docs/kcl/angledLineOfXLength.md

@@ -1,19 +1,19 @@
 ---
 title: "angledLineOfXLength"
-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."
+excerpt: "Create a line segment from the current 2-dimensional sketch origin"
 layout: manual
 ---
 
-Create a line segment from the current 2-dimensional sketch origin along some angle (in degrees) for some relative length in the 'x' dimension.
+Create a line segment from the current 2-dimensional sketch origin
-
 
+along some angle (in degrees) for some relative length in the 'x' dimension.
 
 ```js
 angledLineOfXLength(
   data: AngledLineData,
   sketch: Sketch,
   tag?: TagDeclarator,
-): Sketch
+) -> Sketch
 ```
 
 
@@ -22,12 +22,12 @@ angledLineOfXLength(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `data` | [`AngledLineData`](/docs/kcl/types/AngledLineData) | Data to draw an angled line. | Yes |
-| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) |  | Yes |
+| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
 
 ### Returns
 
-[`Sketch`](/docs/kcl/types/Sketch)
+[`Sketch`](/docs/kcl/types/Sketch) - A sketch is a collection of paths.
 
 
 ### Examples

docs/kcl/angledLineOfYLength.md

@@ -1,19 +1,19 @@
 ---
 title: "angledLineOfYLength"
-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."
+excerpt: "Create a line segment from the current 2-dimensional sketch origin"
 layout: manual
 ---
 
-Create a line segment from the current 2-dimensional sketch origin along some angle (in degrees) for some relative length in the 'y' dimension.
+Create a line segment from the current 2-dimensional sketch origin
-
 
+along some angle (in degrees) for some relative length in the 'y' dimension.
 
 ```js
 angledLineOfYLength(
   data: AngledLineData,
   sketch: Sketch,
   tag?: TagDeclarator,
-): Sketch
+) -> Sketch
 ```
 
 
@@ -22,12 +22,12 @@ angledLineOfYLength(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `data` | [`AngledLineData`](/docs/kcl/types/AngledLineData) | Data to draw an angled line. | Yes |
-| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) |  | Yes |
+| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
 
 ### Returns
 
-[`Sketch`](/docs/kcl/types/Sketch)
+[`Sketch`](/docs/kcl/types/Sketch) - A sketch is a collection of paths.
 
 
 ### Examples

docs/kcl/angledLineThatIntersects.md

@@ -1,19 +1,19 @@
 ---
 title: "angledLineThatIntersects"
-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."
+excerpt: "Draw an angled line from the current origin, constructing a line segment"
 layout: manual
 ---
 
-Draw an angled line from the current origin, constructing a line segment such that the newly created line intersects the desired target 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.
 
 ```js
 angledLineThatIntersects(
   data: AngledLineThatIntersectsData,
   sketch: Sketch,
   tag?: TagDeclarator,
-): Sketch
+) -> Sketch
 ```
 
 
@@ -22,12 +22,12 @@ angledLineThatIntersects(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `data` | [`AngledLineThatIntersectsData`](/docs/kcl/types/AngledLineThatIntersectsData) | Data for drawing an angled line that intersects with a given line. | Yes |
-| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) |  | Yes |
+| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
 
 ### Returns
 
-[`Sketch`](/docs/kcl/types/Sketch)
+[`Sketch`](/docs/kcl/types/Sketch) - A sketch is a collection of paths.
 
 
 ### Examples

docs/kcl/angledLineToX.md

@@ -1,19 +1,19 @@
 ---
 title: "angledLineToX"
-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."
+excerpt: "Create a line segment from the current 2-dimensional sketch origin"
 layout: manual
 ---
 
-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.
+Create a line segment from the current 2-dimensional sketch origin
-
 
+along some angle (in degrees) for some length, ending at the provided value in the 'x' dimension.
 
 ```js
 angledLineToX(
   data: AngledLineToData,
   sketch: Sketch,
   tag?: TagDeclarator,
-): Sketch
+) -> Sketch
 ```
 
 
@@ -22,12 +22,12 @@ angledLineToX(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `data` | [`AngledLineToData`](/docs/kcl/types/AngledLineToData) | Data to draw an angled line to a point. | Yes |
-| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) |  | Yes |
+| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
 
 ### Returns
 
-[`Sketch`](/docs/kcl/types/Sketch)
+[`Sketch`](/docs/kcl/types/Sketch) - A sketch is a collection of paths.
 
 
 ### Examples

docs/kcl/angledLineToY.md

@@ -1,19 +1,19 @@
 ---
 title: "angledLineToY"
-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."
+excerpt: "Create a line segment from the current 2-dimensional sketch origin"
 layout: manual
 ---
 
-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.
+Create a line segment from the current 2-dimensional sketch origin
-
 
+along some angle (in degrees) for some length, ending at the provided value in the 'y' dimension.
 
 ```js
 angledLineToY(
   data: AngledLineToData,
   sketch: Sketch,
   tag?: TagDeclarator,
-): Sketch
+) -> Sketch
 ```
 
 
@@ -22,12 +22,12 @@ angledLineToY(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `data` | [`AngledLineToData`](/docs/kcl/types/AngledLineToData) | Data to draw an angled line to a point. | Yes |
-| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) |  | Yes |
+| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
 
 ### Returns
 
-[`Sketch`](/docs/kcl/types/Sketch)
+[`Sketch`](/docs/kcl/types/Sketch) - A sketch is a collection of paths.
 
 
 ### Examples

docs/kcl/appearance.md

@@ -14,7 +14,7 @@ appearance(
   color: String,
   metalness?: number,
   roughness?: number,
-): SolidSet
+) -> SolidSet
 ```
 
 
@@ -24,8 +24,8 @@ appearance(
 |----------|------|-------------|----------|
 | `solidSet` | [`SolidSet`](/docs/kcl/types/SolidSet) | The solid(s) whose appearance is being set | Yes |
 | `color` | `String` | Color of the new material, a hex string like '#ff0000' | Yes |
-| `metalness` | [`number`](/docs/kcl/types/number) | Metalness of the new material, a percentage like 95.7. | No |
+| `metalness` | `number` | Metalness of the new material, a percentage like 95.7. | No |
-| `roughness` | [`number`](/docs/kcl/types/number) | Roughness of the new material, a percentage like 95.7. | No |
+| `roughness` | `number` | Roughness of the new material, a percentage like 95.7. | No |
 
 ### Returns
 
@@ -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
 ```
 
 
@@ -24,12 +24,12 @@ arc(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `data` | [`ArcData`](/docs/kcl/types/ArcData) | Data to draw an arc. | Yes |
-| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) |  | Yes |
+| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
 
 ### Returns
 
-[`Sketch`](/docs/kcl/types/Sketch)
+[`Sketch`](/docs/kcl/types/Sketch) - A sketch is a collection of paths.
 
 
 ### Examples

docs/kcl/arcTo.md

@@ -1,10 +1,10 @@
 ---
 title: "arcTo"
-excerpt: "Draw a three point arc."
+excerpt: "Draw a 3 point arc."
 layout: manual
 ---
 
-Draw a three point arc.
+Draw a 3 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
 ```
 
 
@@ -22,12 +22,12 @@ arcTo(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `data` | [`ArcToData`](/docs/kcl/types/ArcToData) | Data to draw a three point arc (arcTo). | Yes |
-| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) |  | Yes |
+| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
 
 ### Returns
 
-[`Sketch`](/docs/kcl/types/Sketch)
+[`Sketch`](/docs/kcl/types/Sketch) - A sketch is a collection of paths.
 
 
 ### Examples

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
@@ -21,11 +21,11 @@ asin(num: number): number
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `num` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `num` | `number` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

docs/kcl/assert.md

@@ -1,18 +1,18 @@
 ---
 title: "assert"
-excerpt: "Check a value at runtime, and raise an error if the argument provided is false."
+excerpt: "Check a value at runtime, and raise an error if the argument provided"
 layout: manual
 ---
 
-Check a value at runtime, and raise an error if the argument provided is false.
+Check a value at runtime, and raise an error if the argument provided
-
 
+is false.
 
 ```js
 assert(
   data: bool,
   message: string,
-): ()
+) -> ()
 ```
 
 
@@ -20,8 +20,8 @@ assert(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `data` | [`bool`](/docs/kcl/types/bool) |  | Yes |
+| `data` | `bool` |  | Yes |
-| `message` | [`string`](/docs/kcl/types/string) |  | Yes |
+| `message` | `string` |  | Yes |
 
 ### Returns
 

docs/kcl/assertEqual.md

@@ -1,12 +1,12 @@
 ---
 title: "assertEqual"
-excerpt: "Check that a numerical value equals another at runtime, otherwise raise an error."
+excerpt: "Check that a numerical value equals another at runtime,"
 layout: manual
 ---
 
-Check that a numerical value equals another at runtime, otherwise raise an error.
+Check that a numerical value equals another at runtime,
-
 
+otherwise raise an error.
 
 ```js
 assertEqual(
@@ -14,7 +14,7 @@ assertEqual(
   right: number,
   epsilon: number,
   message: string,
-): ()
+) -> ()
 ```
 
 
@@ -22,10 +22,10 @@ assertEqual(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `left` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `left` | `number` |  | Yes |
-| `right` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `right` | `number` |  | Yes |
-| `epsilon` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `epsilon` | `number` |  | Yes |
-| `message` | [`string`](/docs/kcl/types/string) |  | Yes |
+| `message` | `string` |  | Yes |
 
 ### Returns
 

docs/kcl/assertGreaterThan.md

@@ -1,19 +1,19 @@
 ---
 title: "assertGreaterThan"
-excerpt: "Check that a numerical value is greater than another at runtime, otherwise raise an error."
+excerpt: "Check that a numerical value is greater than another at runtime,"
 layout: manual
 ---
 
-Check that a numerical value is greater than another at runtime, otherwise raise an error.
+Check that a numerical value is greater than another at runtime,
-
 
+otherwise raise an error.
 
 ```js
 assertGreaterThan(
   left: number,
   right: number,
   message: string,
-): ()
+) -> ()
 ```
 
 
@@ -21,9 +21,9 @@ assertGreaterThan(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `left` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `left` | `number` |  | Yes |
-| `right` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `right` | `number` |  | Yes |
-| `message` | [`string`](/docs/kcl/types/string) |  | Yes |
+| `message` | `string` |  | Yes |
 
 ### Returns
 

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, otherwise raise an error."
+excerpt: "Check that a numerical value is greater than or equal to another at runtime,"
 layout: manual
 ---
 
-Check that a numerical value is greater than or equal to another at runtime, otherwise raise an error.
+Check that a numerical value is greater than or equal to another at runtime,
-
 
+otherwise raise an error.
 
 ```js
 assertGreaterThanOrEq(
   left: number,
   right: number,
   message: string,
-): ()
+) -> ()
 ```
 
 
@@ -21,9 +21,9 @@ assertGreaterThanOrEq(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `left` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `left` | `number` |  | Yes |
-| `right` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `right` | `number` |  | Yes |
-| `message` | [`string`](/docs/kcl/types/string) |  | Yes |
+| `message` | `string` |  | Yes |
 
 ### Returns
 

docs/kcl/assertLessThan.md

@@ -1,19 +1,19 @@
 ---
 title: "assertLessThan"
-excerpt: "Check that a numerical value is less than to another at runtime, otherwise raise an error."
+excerpt: "Check that a numerical value is less than to another at runtime,"
 layout: manual
 ---
 
-Check that a numerical value is less than to another at runtime, otherwise raise an error.
+Check that a numerical value is less than to another at runtime,
-
 
+otherwise raise an error.
 
 ```js
 assertLessThan(
   left: number,
   right: number,
   message: string,
-): ()
+) -> ()
 ```
 
 
@@ -21,9 +21,9 @@ assertLessThan(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `left` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `left` | `number` |  | Yes |
-| `right` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `right` | `number` |  | Yes |
-| `message` | [`string`](/docs/kcl/types/string) |  | Yes |
+| `message` | `string` |  | Yes |
 
 ### Returns
 

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, otherwise raise an error."
+excerpt: "Check that a numerical value is less than or equal to another at runtime,"
 layout: manual
 ---
 
-Check that a numerical value is less than or equal to another at runtime, otherwise raise an error.
+Check that a numerical value is less than or equal to another at runtime,
-
 
+otherwise raise an error.
 
 ```js
 assertLessThanOrEq(
   left: number,
   right: number,
   message: string,
-): ()
+) -> ()
 ```
 
 
@@ -21,9 +21,9 @@ assertLessThanOrEq(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `left` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `left` | `number` |  | Yes |
-| `right` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `right` | `number` |  | Yes |
-| `message` | [`string`](/docs/kcl/types/string) |  | Yes |
+| `message` | `string` |  | Yes |
 
 ### Returns
 

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
@@ -21,11 +21,11 @@ atan(num: number): number
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `num` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `num` | `number` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

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
@@ -24,12 +24,12 @@ atan2(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `y` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `y` | `number` |  | Yes |
-| `x` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `x` | `number` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

docs/kcl/bezierCurve.md

@@ -1,19 +1,19 @@
 ---
 title: "bezierCurve"
-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."
+excerpt: "Draw a smooth, continuous, curved line segment from the current origin to"
 layout: manual
 ---
 
-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.
+Draw a smooth, continuous, curved line segment from the current origin to
-
 
+the desired (x, y), using a number of control points to shape the curve's shape.
 
 ```js
 bezierCurve(
   data: BezierData,
   sketch: Sketch,
   tag?: TagDeclarator,
-): Sketch
+) -> Sketch
 ```
 
 
@@ -22,12 +22,12 @@ bezierCurve(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `data` | [`BezierData`](/docs/kcl/types/BezierData) | Data to draw a bezier curve. | Yes |
-| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) |  | Yes |
+| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
+| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
 
 ### Returns
 
-[`Sketch`](/docs/kcl/types/Sketch)
+[`Sketch`](/docs/kcl/types/Sketch) - A sketch is a collection of paths.
 
 
 ### Examples

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
@@ -21,11 +21,11 @@ ceil(num: number): number
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `num` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `num` | `number` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

docs/kcl/chamfer.md

@@ -14,7 +14,7 @@ chamfer(
   length: number,
   tags: [EdgeReference],
   tag?: TagDeclarator,
-): Solid
+) -> Solid
 ```
 
 
@@ -23,13 +23,13 @@ chamfer(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `solid` | [`Solid`](/docs/kcl/types/Solid) | The solid whose edges should be chamfered | Yes |
-| `length` | [`number`](/docs/kcl/types/number) | The length of the chamfer | Yes |
+| `length` | `number` | The length of the chamfer | Yes |
 | `tags` | [`[EdgeReference]`](/docs/kcl/types/EdgeReference) | The paths you want to chamfer | Yes |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Create a new tag which refers to this chamfer | No |
+| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Create a new tag which refers to this chamfer | No |
 
 ### Returns
 
-[`Solid`](/docs/kcl/types/Solid)
+[`Solid`](/docs/kcl/types/Solid) - A solid is a collection of extrude surfaces.
 
 
 ### Examples

docs/kcl/circle.md

@@ -1,20 +1,19 @@
 ---
 title: "circle"
-excerpt: "Construct a 2-dimensional circle, of the specified radius, centered at the provided (x, y) origin point."
+excerpt: "Construct a 2-dimensional circle, of the specified radius, centered at"
 layout: manual
 ---
 
-Construct a 2-dimensional circle, of the specified radius, centered at the provided (x, y) origin point.
+Construct a 2-dimensional circle, of the specified radius, centered at
-
 
+the provided (x, y) origin point.
 
 ```js
 circle(
-  sketchOrSurface: SketchOrSurface,
+  data: CircleData,
-  center: [number],
+  sketchSurfaceOrGroup: SketchOrSurface,
-  radius: number,
   tag?: TagDeclarator,
-): Sketch
+) -> Sketch
 ```
 
 
@@ -22,21 +21,20 @@ circle(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `sketchOrSurface` | [`SketchOrSurface`](/docs/kcl/types/SketchOrSurface) | Plane or surface to sketch on. | Yes |
+| `data` | [`CircleData`](/docs/kcl/types/CircleData) | Data for drawing an circle | Yes |
-| `center` | [`[number]`](/docs/kcl/types/number) | The center of the circle. | Yes |
+| `sketchSurfaceOrGroup` | [`SketchOrSurface`](/docs/kcl/types/SketchOrSurface) | A sketch surface or a sketch. | Yes |
-| `radius` | [`number`](/docs/kcl/types/number) | The radius of the circle. | Yes |
+| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) |  | No |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Create a new tag which refers to this circle | No |
 
 ### Returns
 
-[`Sketch`](/docs/kcl/types/Sketch)
+[`Sketch`](/docs/kcl/types/Sketch) - A sketch is a collection of paths.
 
 
 ### Examples
 
 ```js
 exampleSketch = startSketchOn("-XZ")
-  |> circle(center = [0, 0], radius = 10)
+  |> circle({ center = [0, 0], radius = 10 }, %)
 
 example = extrude(exampleSketch, length = 5)
 ```
@@ -50,7 +48,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
 ```
 
 
@@ -23,15 +23,15 @@ circleThreePoint(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `p1` | [`[number]`](/docs/kcl/types/number) | 1st point to derive the circle. | Yes |
+| `p1` | `[number]` | 1st point to derive the circle. | Yes |
-| `p2` | [`[number]`](/docs/kcl/types/number) | 2nd point to derive the circle. | Yes |
+| `p2` | `[number]` | 2nd point to derive the circle. | Yes |
-| `p3` | [`[number]`](/docs/kcl/types/number) | 3rd point to derive the circle. | Yes |
+| `p3` | `[number]` | 3rd point to derive the circle. | Yes |
 | `sketchSurfaceOrGroup` | [`SketchOrSurface`](/docs/kcl/types/SketchOrSurface) | Plane or surface to sketch on. | Yes |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Identifier for the circle to reference elsewhere. | No |
+| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Identifier for the circle to reference elsewhere. | No |
 
 ### Returns
 
-[`Sketch`](/docs/kcl/types/Sketch)
+[`Sketch`](/docs/kcl/types/Sketch) - A sketch is a collection of paths.
 
 
 ### Examples

docs/kcl/close.md

@@ -1,18 +1,18 @@
 ---
 title: "close"
-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."
+excerpt: "Construct a line segment from the current origin back to the profile's"
 layout: manual
 ---
 
-Construct a line segment from the current origin back to the profile's origin, ensuring the resulting 2-dimensional sketch is not open-ended.
+Construct a line segment from the current origin back to the profile's
-
 
+origin, ensuring the resulting 2-dimensional sketch is not open-ended.
 
 ```js
 close(
   sketch: Sketch,
   tag?: TagDeclarator,
-): Sketch
+) -> Sketch
 ```
 
 
@@ -21,11 +21,11 @@ close(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | The sketch you want to close | Yes |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Create a new tag which refers to this line | No |
+| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Create a new tag which refers to this line | No |
 
 ### Returns
 
-[`Sketch`](/docs/kcl/types/Sketch)
+[`Sketch`](/docs/kcl/types/Sketch) - A sketch is a collection of paths.
 
 
 ### Examples

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
@@ -26,7 +26,7 @@ cm(): number
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

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
@@ -22,7 +22,7 @@ e(): number
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

docs/kcl/extrude.md

@@ -1,18 +1,18 @@
 ---
 title: "extrude"
-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."
+excerpt: "Extend a 2-dimensional sketch through a third dimension in order to"
 layout: manual
 ---
 
-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.
+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.
 
 ```js
 extrude(
   sketchSet: SketchSet,
   length: number,
-): SolidSet
+) -> SolidSet
 ```
 
 
@@ -21,7 +21,7 @@ extrude(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `sketchSet` | [`SketchSet`](/docs/kcl/types/SketchSet) | Which sketches should be extruded | Yes |
-| `length` | [`number`](/docs/kcl/types/number) | How far to extrude the given sketches | Yes |
+| `length` | `number` | How far to extrude the given sketches | Yes |
 
 ### Returns
 

docs/kcl/fillet.md

@@ -15,7 +15,7 @@ fillet(
   tags: [EdgeReference],
   tolerance?: number,
   tag?: TagDeclarator,
-): Solid
+) -> Solid
 ```
 
 
@@ -24,14 +24,14 @@ fillet(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `solid` | [`Solid`](/docs/kcl/types/Solid) | The solid whose edges should be filletted | Yes |
-| `radius` | [`number`](/docs/kcl/types/number) | The radius of the fillet | Yes |
+| `radius` | `number` | The radius of the fillet | Yes |
 | `tags` | [`[EdgeReference]`](/docs/kcl/types/EdgeReference) | The paths you want to fillet | Yes |
-| `tolerance` | [`number`](/docs/kcl/types/number) | The tolerance for this fillet | No |
+| `tolerance` | `number` | The tolerance for this fillet | No |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Create a new tag which refers to this fillet | No |
+| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Create a new tag which refers to this fillet | No |
 
 ### Returns
 
-[`Solid`](/docs/kcl/types/Solid)
+[`Solid`](/docs/kcl/types/Solid) - A solid is a collection of extrude surfaces.
 
 
 ### Examples

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
@@ -21,11 +21,11 @@ floor(num: number): number
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `num` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `num` | `number` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

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
@@ -26,7 +26,7 @@ ft(): number
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

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
 ```
 
 
@@ -17,7 +17,7 @@ getNextAdjacentEdge(tag: TagIdentifier): Uuid
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| [`tag`](/docs/kcl/types/tag) | [`TagIdentifier`](/docs/kcl/types#tag-identifier) |  | Yes |
+| `tag` | [`TagIdentifier`](/docs/kcl/types#tag-identifier) |  | Yes |
 
 ### Returns
 

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
 ```
 
 
@@ -17,7 +17,7 @@ getOppositeEdge(tag: TagIdentifier): Uuid
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| [`tag`](/docs/kcl/types/tag) | [`TagIdentifier`](/docs/kcl/types#tag-identifier) |  | Yes |
+| `tag` | [`TagIdentifier`](/docs/kcl/types#tag-identifier) |  | Yes |
 
 ### Returns
 

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
 ```
 
 
@@ -17,7 +17,7 @@ getPreviousAdjacentEdge(tag: TagIdentifier): Uuid
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| [`tag`](/docs/kcl/types/tag) | [`TagIdentifier`](/docs/kcl/types#tag-identifier) |  | Yes |
+| `tag` | [`TagIdentifier`](/docs/kcl/types#tag-identifier) |  | Yes |
 
 ### Returns
 

docs/kcl/helix.md

@@ -16,7 +16,7 @@ helix(
   radius: number,
   axis: Axis3dOrEdgeReference,
   length?: number,
-): HelixValue
+) -> HelixValue
 ```
 
 
@@ -24,12 +24,12 @@ helix(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `revolutions` | [`number`](/docs/kcl/types/number) | Number of revolutions. | Yes |
+| `revolutions` | `number` | Number of revolutions. | Yes |
-| `angleStart` | [`number`](/docs/kcl/types/number) | Start angle (in degrees). | Yes |
+| `angleStart` | `number` | Start angle (in degrees). | Yes |
-| `ccw` | [`bool`](/docs/kcl/types/bool) | Is the helix rotation counter clockwise? The default is `false`. | No |
+| `ccw` | `bool` | Is the helix rotation counter clockwise? The default is `false`. | No |
-| `radius` | [`number`](/docs/kcl/types/number) | Radius of the helix. | Yes |
+| `radius` | `number` | Radius of the helix. | Yes |
 | `axis` | [`Axis3dOrEdgeReference`](/docs/kcl/types/Axis3dOrEdgeReference) | Axis to use for the helix. | Yes |
-| `length` | [`number`](/docs/kcl/types/number) | Length of the helix. This is not necessary if the helix is created around an edge. If not given the length of the edge is used. | No |
+| `length` | `number` | Length of the helix. This is not necessary if the helix is created around an edge. If not given the length of the edge is used. | No |
 
 ### Returns
 
@@ -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
 ```
 
 
@@ -21,18 +21,18 @@ helixRevolutions(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `data` | [`HelixRevolutionsData`](/docs/kcl/types/HelixRevolutionsData) | Data for helix revolutions. | Yes |
-| `solid` | [`Solid`](/docs/kcl/types/Solid) |  | Yes |
+| `solid` | [`Solid`](/docs/kcl/types/Solid) | A solid is a collection of extrude surfaces. | Yes |
 
 ### Returns
 
-[`Solid`](/docs/kcl/types/Solid)
+[`Solid`](/docs/kcl/types/Solid) - A solid is a collection of extrude surfaces.
 
 
 ### Examples
 
 ```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
 ```
 
 
@@ -21,11 +21,11 @@ hole(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `holeSketch` | [`SketchSet`](/docs/kcl/types/SketchSet) | A sketch or a group of sketches. | Yes |
-| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) |  | Yes |
+| `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | A sketch is a collection of paths. | Yes |
 
 ### Returns
 
-[`Sketch`](/docs/kcl/types/Sketch)
+[`Sketch`](/docs/kcl/types/Sketch) - A sketch is a collection of paths.
 
 
 ### Examples
@@ -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

@@ -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
 ```
 
 
@@ -20,12 +20,12 @@ hollow(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `thickness` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `thickness` | `number` |  | Yes |
-| `solid` | [`Solid`](/docs/kcl/types/Solid) |  | Yes |
+| `solid` | [`Solid`](/docs/kcl/types/Solid) | A solid is a collection of extrude surfaces. | Yes |
 
 ### Returns
 
-[`Solid`](/docs/kcl/types/Solid)
+[`Solid`](/docs/kcl/types/Solid) - A solid is a collection of extrude surfaces.
 
 
 ### Examples
@@ -70,11 +70,17 @@ 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
@@ -26,7 +26,7 @@ inch(): number
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

docs/kcl/index.md

@@ -15,17 +15,9 @@ layout: manual
 
 ### Standard library
 
-* **Primitive types**
+* **`std`**
-  * [`bool`](kcl/bool)
-  * [`number`](kcl/number)
-  * [`string`](kcl/string)
-  * [`tag`](kcl/tag)
-* **std**
   * [`HALF_TURN`](kcl/const_std-HALF_TURN)
-  * [`Plane`](kcl/Plane)
   * [`QUARTER_TURN`](kcl/const_std-QUARTER_TURN)
-  * [`Sketch`](kcl/Sketch)
-  * [`Solid`](kcl/Solid)
   * [`THREE_QUARTER_TURN`](kcl/const_std-THREE_QUARTER_TURN)
   * [`XY`](kcl/const_std-XY)
   * [`XZ`](kcl/const_std-XZ)
@@ -135,7 +127,7 @@ layout: manual
   * [`yLine`](kcl/yLine)
   * [`yLineTo`](kcl/yLineTo)
   * [`yd`](kcl/yd)
-* **std::math**
+* **`std::math`**
   * [`E`](kcl/const_std-math-E)
   * [`PI`](kcl/const_std-math-PI)
   * [`TAU`](kcl/const_std-math-TAU)

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
@@ -23,11 +23,11 @@ int(num: number): number
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `num` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `num` | `number` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples
@@ -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 sketch."
+excerpt: "Extract the 'x' axis value of the last line segment in the provided 2-d"
 layout: manual
 ---
 
-Extract the 'x' axis value of the last line segment in the provided 2-d sketch.
+Extract the 'x' axis value of the last line segment in the provided 2-d
-
 
+sketch.
 
 ```js
-lastSegX(sketch: Sketch): number
+lastSegX(sketch: Sketch) -> number
 ```
 
 
@@ -21,7 +21,7 @@ lastSegX(sketch: Sketch): number
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

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 sketch."
+excerpt: "Extract the 'y' axis value of the last line segment in the provided 2-d"
 layout: manual
 ---
 
-Extract the 'y' axis value of the last line segment in the provided 2-d sketch.
+Extract the 'y' axis value of the last line segment in the provided 2-d
-
 
+sketch.
 
 ```js
-lastSegY(sketch: Sketch): number
+lastSegY(sketch: Sketch) -> number
 ```
 
 
@@ -21,7 +21,7 @@ lastSegY(sketch: Sketch): number
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

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
@@ -24,12 +24,12 @@ legAngX(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `hypotenuse` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `hypotenuse` | `number` |  | Yes |
-| `leg` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `leg` | `number` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

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
@@ -24,12 +24,12 @@ legAngY(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `hypotenuse` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `hypotenuse` | `number` |  | Yes |
-| `leg` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `leg` | `number` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

docs/kcl/legLen.md

@@ -12,7 +12,7 @@ Compute the length of the given leg.
 legLen(
   hypotenuse: number,
   leg: number,
-): number
+) -> number
 ```
 
 ### Tags
@@ -24,12 +24,12 @@ legLen(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `hypotenuse` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `hypotenuse` | `number` |  | Yes |
-| `leg` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `leg` | `number` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

docs/kcl/line.md

@@ -14,7 +14,7 @@ line(
   endAbsolute?: [number],
   end?: [number],
   tag?: TagDeclarator,
-): Sketch
+) -> Sketch
 ```
 
 
@@ -23,13 +23,13 @@ line(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `sketch` | [`Sketch`](/docs/kcl/types/Sketch) | Which sketch should this path be added to? | Yes |
-| `endAbsolute` | [`[number]`](/docs/kcl/types/number) | Which absolute point should this line go to? Incompatible with `end`. | No |
+| `endAbsolute` | `[number]` | Which absolute point should this line go to? Incompatible with `end`. | No |
-| `end` | [`[number]`](/docs/kcl/types/number) | How far away (along the X and Y axes) should this line go? Incompatible with `endAbsolute`. | No |
+| `end` | `[number]` | How far away (along the X and Y axes) should this line go? Incompatible with `endAbsolute`. | No |
-| [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Create a new tag which refers to this line | No |
+| `tag` | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Create a new tag which refers to this line | No |
 
 ### Returns
 
-[`Sketch`](/docs/kcl/types/Sketch)
+[`Sketch`](/docs/kcl/types/Sketch) - A sketch is a collection of paths.
 
 
 ### Examples

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
@@ -21,11 +21,11 @@ ln(num: number): number
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `num` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `num` | `number` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

docs/kcl/loft.md

@@ -15,7 +15,7 @@ loft(
   bezApproximateRational: bool,
   baseCurveIndex?: integer,
   tolerance?: number,
-): Solid
+) -> Solid
 ```
 
 
@@ -25,13 +25,13 @@ loft(
 |----------|------|-------------|----------|
 | `sketches` | [`[Sketch]`](/docs/kcl/types/Sketch) | Which sketches to loft. Must include at least 2 sketches. | Yes |
 | `vDegree` | `NonZeroU32` | Degree of the interpolation. Must be greater than zero. For example, use 2 for quadratic, or 3 for cubic interpolation in the V direction. This defaults to 2, if not specified. | Yes |
-| `bezApproximateRational` | [`bool`](/docs/kcl/types/bool) | Attempt to approximate rational curves (such as arcs) using a bezier. This will remove banding around interpolations between arcs and non-arcs. It may produce errors in other scenarios Over time, this field won't be necessary. | Yes |
+| `bezApproximateRational` | `bool` | Attempt to approximate rational curves (such as arcs) using a bezier. This will remove banding around interpolations between arcs and non-arcs. It may produce errors in other scenarios Over time, this field won't be necessary. | Yes |
 | `baseCurveIndex` | `integer` | This can be set to override the automatically determined topological base curve, which is usually the first section encountered. | No |
-| `tolerance` | [`number`](/docs/kcl/types/number) | Tolerance for the loft operation. | No |
+| `tolerance` | `number` | Tolerance for the loft operation. | No |
 
 ### Returns
 
-[`Solid`](/docs/kcl/types/Solid)
+[`Solid`](/docs/kcl/types/Solid) - A solid is a collection of extrude surfaces.
 
 
 ### Examples
@@ -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
@@ -24,12 +24,12 @@ log(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `num` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `num` | `number` |  | Yes |
-| `base` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `base` | `number` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

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
@@ -21,11 +21,11 @@ log10(num: number): number
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `num` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `num` | `number` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

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
@@ -21,11 +21,11 @@ log2(num: number): number
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `num` | [`number`](/docs/kcl/types/number) |  | Yes |
+| `num` | `number` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

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
@@ -26,7 +26,7 @@ m(): number
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

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
@@ -21,11 +21,11 @@ max(args: [number]): number
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `args` | [`[number]`](/docs/kcl/types/number) |  | Yes |
+| `args` | `[number]` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

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
@@ -21,11 +21,11 @@ min(args: [number]): number
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
-| `args` | [`[number]`](/docs/kcl/types/number) |  | Yes |
+| `args` | `[number]` |  | Yes |
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

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
@@ -26,7 +26,7 @@ mm(): number
 
 ### Returns
 
-[`number`](/docs/kcl/types/number)
+`number`
 
 
 ### Examples

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
 ```
 
 
@@ -21,11 +21,11 @@ offsetPlane(
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
 | `plane` | [`PlaneData`](/docs/kcl/types/PlaneData) | The plane (e.g. 'XY') which this new plane is created from. | Yes |
-| `offset` | [`number`](/docs/kcl/types/number) | Distance from the standard plane this new plane will be created at. | Yes |
+| `offset` | `number` | Distance from the standard plane this new plane will be created at. | Yes |
 
 ### Returns
 
-[`Plane`](/docs/kcl/types/Plane)
+[`Plane`](/docs/kcl/types/Plane) - A plane.
 
 
 ### Examples
@@ -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 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."
+excerpt: "Repeat a 2-dimensional sketch some number of times along a partial or"
 layout: manual
 ---
 
-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.
+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.
 
 ```js
 patternCircular2d(
@@ -16,7 +16,7 @@ patternCircular2d(
   arcDegrees: number,
   rotateDuplicates: bool,
   useOriginal?: bool,
-): [Sketch]
+) -> [Sketch]
 ```
 
 
@@ -26,10 +26,10 @@ patternCircular2d(
 |----------|------|-------------|----------|
 | `sketchSet` | [`SketchSet`](/docs/kcl/types/SketchSet) | Which sketch(es) to pattern | Yes |
 | `instances` | `integer` | The number of total instances. Must be greater than or equal to 1. This includes the original entity. For example, if instances is 2, there will be two copies -- the original, and one new copy. If instances is 1, this has no effect. | Yes |
-| `center` | [`[number]`](/docs/kcl/types/number) | The center about which to make the pattern. This is a 2D vector. | Yes |
+| `center` | `[number]` | The center about which to make the pattern. This is a 2D vector. | Yes |
-| `arcDegrees` | [`number`](/docs/kcl/types/number) | The arc angle (in degrees) to place the repetitions. Must be greater than 0. | Yes |
+| `arcDegrees` | `number` | The arc angle (in degrees) to place the repetitions. Must be greater than 0. | Yes |
-| `rotateDuplicates` | [`bool`](/docs/kcl/types/bool) | Whether or not to rotate the duplicates as they are copied. | Yes |
+| `rotateDuplicates` | `bool` | Whether or not to rotate the duplicates as they are copied. | Yes |
-| `useOriginal` | [`bool`](/docs/kcl/types/bool) | If the target was sketched on an extrusion, setting this will use the original sketch as the target, not the entire joined solid. Defaults to false. | No |
+| `useOriginal` | `bool` | If the target was sketched on an extrusion, setting this will use the original sketch as the target, not the entire joined solid. Defaults to false. | No |
 
 ### Returns
 

docs/kcl/patternCircular3d.md

@@ -1,12 +1,12 @@
 ---
 title: "patternCircular3d"
-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."
+excerpt: "Repeat a 3-dimensional solid some number of times along a partial or"
 layout: manual
 ---
 
-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.
+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.
 
 ```js
 patternCircular3d(
@@ -17,7 +17,7 @@ patternCircular3d(
   arcDegrees: number,
   rotateDuplicates: bool,
   useOriginal?: bool,
-): [Solid]
+) -> [Solid]
 ```
 
 
@@ -27,11 +27,11 @@ patternCircular3d(
 |----------|------|-------------|----------|
 | `solidSet` | [`SolidSet`](/docs/kcl/types/SolidSet) | Which solid(s) to pattern | Yes |
 | `instances` | `integer` | The number of total instances. Must be greater than or equal to 1. This includes the original entity. For example, if instances is 2, there will be two copies -- the original, and one new copy. If instances is 1, this has no effect. | Yes |
-| `axis` | [`[number]`](/docs/kcl/types/number) | The axis around which to make the pattern. This is a 3D vector | Yes |
+| `axis` | `[number]` | The axis around which to make the pattern. This is a 3D vector | Yes |
-| `center` | [`[number]`](/docs/kcl/types/number) | The center about which to make the pattern. This is a 3D vector. | Yes |
+| `center` | `[number]` | The center about which to make the pattern. This is a 3D vector. | Yes |
-| `arcDegrees` | [`number`](/docs/kcl/types/number) | The arc angle (in degrees) to place the repetitions. Must be greater than 0. | Yes |
+| `arcDegrees` | `number` | The arc angle (in degrees) to place the repetitions. Must be greater than 0. | Yes |
-| `rotateDuplicates` | [`bool`](/docs/kcl/types/bool) | Whether or not to rotate the duplicates as they are copied. | Yes |
+| `rotateDuplicates` | `bool` | Whether or not to rotate the duplicates as they are copied. | Yes |
-| `useOriginal` | [`bool`](/docs/kcl/types/bool) | If the target was sketched on an extrusion, setting this will use the original sketch as the target, not the entire joined solid. Defaults to false. | No |
+| `useOriginal` | `bool` | If the target was sketched on an extrusion, setting this will use the original sketch as the target, not the entire joined solid. Defaults to false. | No |
 
 ### Returns
 
@@ -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 of distance between each repetition, some specified number of times."
+excerpt: "Repeat a 2-dimensional sketch along some dimension, with a dynamic amount"
 layout: manual
 ---
 
-Repeat a 2-dimensional sketch along some dimension, with a dynamic amount of distance between each repetition, some specified number of times.
+Repeat a 2-dimensional sketch along some dimension, with a dynamic amount
-
 
+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]
 ```
 
 
@@ -25,9 +25,9 @@ patternLinear2d(
 |----------|------|-------------|----------|
 | `sketchSet` | [`SketchSet`](/docs/kcl/types/SketchSet) | The sketch(es) to duplicate | Yes |
 | `instances` | `integer` | The number of total instances. Must be greater than or equal to 1. This includes the original entity. For example, if instances is 2, there will be two copies -- the original, and one new copy. If instances is 1, this has no effect. | Yes |
-| `distance` | [`number`](/docs/kcl/types/number) | Distance between each repetition. Also known as 'spacing'. | Yes |
+| `distance` | `number` | Distance between each repetition. Also known as 'spacing'. | Yes |
-| `axis` | [`[number]`](/docs/kcl/types/number) | The axis of the pattern. A 2D vector. | Yes |
+| `axis` | `[number]` | The axis of the pattern. A 2D vector. | Yes |
-| `useOriginal` | [`bool`](/docs/kcl/types/bool) | If the target was sketched on an extrusion, setting this will use the original sketch as the target, not the entire joined solid. Defaults to false. | No |
+| `useOriginal` | `bool` | If the target was sketched on an extrusion, setting this will use the original sketch as the target, not the entire joined solid. Defaults to false. | No |
 
 ### Returns
 
@@ -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)