Merge remote-tracking branch 'origin/main' into paultag/machine-api-api

.codespellrc

@@ -1,3 +1,3 @@
 [codespell]
 ignore-words-list: crate,everytime,inout,co-ordinate,ot,nwo,absolutey,atleast,ue,afterall
-skip: **/target,node_modules,build,**/Cargo.lock,./docs/kcl/*.md,.yarn.lock,**/yarn.lock,./openapi/*.json,./src/lib/machine-api.d.ts
+skip: **/target,node_modules,build,**/Cargo.lock,./docs/kcl/*.md,.yarn.lock,**/yarn.lock

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

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

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

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

.github/dependabot.yml

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

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

@@ -1,20 +1,20 @@
-name: build-apps
+name: build-publish-apps
 
 on:
   pull_request:
   push:
     branches:
       - main
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
+  release:
+    types: [published]
   schedule:
     - cron: '0 4 * * *'
   # Daily at 04:00 AM UTC
   # Will checkout the last commit from the default branch (main as of 2023-10-04)
 
 env:
-  IS_RELEASE: ${{ github.ref_type == 'tag' }}
-  IS_NIGHTLY: ${{ github.event_name == 'schedule' }}
+  CUT_RELEASE_PR: ${{ github.event_name == 'pull_request' && (contains(github.event.pull_request.title, 'Cut release v')) }}
+  BUILD_RELEASE: ${{ github.event_name == 'release' || github.event_name == 'schedule' || github.event_name == 'pull_request' && (contains(github.event.pull_request.title, 'Cut release v')) }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -25,7 +25,6 @@ jobs:
     runs-on: ubuntu-22.04  # seperate job on Ubuntu for easy string manipulations (compared to Windows)
     outputs:
       version: ${{ steps.export_version.outputs.version }}
-      notes: ${{ steps.export_notes.outputs.notes }}
     steps:
       - uses: actions/checkout@v4
 
@@ -47,40 +46,40 @@ jobs:
       - name: Run build:wasm
         run: "yarn build:wasm"
 
-      - name: Set nightly version, product name, release notes, and icons
-        if: ${{ env.IS_NIGHTLY == 'true' }}
-        run: yarn files:flip-to-nightly
-
-      - name: Set release version
-        if: ${{ env.IS_RELEASE == 'true' }}
+      - name: Set nightly version
+        if: github.event_name == 'schedule'
         run: |
-          export VERSION=${GITHUB_REF_NAME#v}
-          yarn files:set-version
+          VERSION=$(date +'%-y.%-m.%-d') yarn bump-jsons
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: prepared-files
           path: |
             package.json
-            electron-builder.yml
             src/wasm-lib/pkg/wasm_lib*
-            release-notes.md
-            assets/icon.ico
-            assets/icon.png
 
       - id: export_version
         run: echo "version=`cat package.json | jq -r '.version'`" >> "$GITHUB_OUTPUT"
 
-      - id: export_notes
-        run: echo "notes=`cat release-notes.md`" >> "$GITHUB_OUTPUT"
+      - name: Prepare electron-builder.yml file for nightly
+        if: ${{ github.event_name == 'schedule' }}
+        run: |
+          yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/nightly"' electron-builder.yml
+
+      - uses: actions/upload-artifact@v3
+        if: ${{ github.event_name == 'schedule' }}
+        with:
+          name: prepared-files-nightly
+          path: |
+            electron-builder.yml
 
       - name: Prepare electron-builder.yml file for updater test
-        if: ${{ env.IS_RELEASE == 'true' }}
+        if: ${{ env.CUT_RELEASE_PR == 'true' }}
         run: |
           yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/updater-test"' electron-builder.yml
 
-      - uses: actions/upload-artifact@v4
-        if: ${{ env.IS_RELEASE == 'true' }}
+      - uses: actions/upload-artifact@v3
+        if: ${{ env.CUT_RELEASE_PR == 'true' }}
         with:
           name: prepared-files-updater-test
           path: |
@@ -92,33 +91,43 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - os: macos-14
-            platform: mac
-          - os: windows-2022
-            platform: win
-          - os: ubuntu-22.04
-            platform: linux
+        os: [macos-14, windows-2022, ubuntu-22.04]
     runs-on: ${{ matrix.os }}
     env:
+      APPLE_ID: ${{ secrets.APPLE_ID }}
+      APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+      APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+      APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+      CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
+      CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+      CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+      CSC_FOR_PULL_REQUEST: true
+      VERSION: ${{ github.event_name == 'schedule' && needs.prepare-files.outputs.version || format('v{0}', needs.prepare-files.outputs.version) }}
       VERSION_NO_V: ${{ needs.prepare-files.outputs.version }}
+      WINDOWS_CERTIFICATE_THUMBPRINT: F4C9A52FF7BC26EE5E054946F6B11DEEA94C748D
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         name: prepared-files
 
       - name: Copy prepared files
         run: |
           ls -R prepared-files
           cp prepared-files/package.json package.json
-          cp prepared-files/electron-builder.yml electron-builder.yml
           cp prepared-files/src/wasm-lib/pkg/wasm_lib_bg.wasm public
           mkdir src/wasm-lib/pkg
           cp prepared-files/src/wasm-lib/pkg/wasm_lib* src/wasm-lib/pkg
-          cp prepared-files/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: actions/download-artifact@v3
+        if: ${{ github.event_name == 'schedule' }}
+        name: prepared-files-nightly
+
+      - name: Copy updated electron-builder.yml file for nightly build
+        if: ${{ github.event_name == 'schedule' }}
+        run: |
+          ls -R prepared-files-nightly
+          cp prepared-files-nightly/electron-builder.yml electron-builder.yml
 
       - name: Sync node version and setup cache
         uses: actions/setup-node@v4
@@ -131,7 +140,7 @@ jobs:
       - run: yarn tronb:vite
 
       - name: Prepare certificate and variables (Windows only)
-        if: ${{ (env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true') && matrix.os == 'windows-2022' }}
+        if: ${{ env.BUILD_RELEASE == 'true' && matrix.os == 'windows-2022' }}
         run: |
           echo "${{secrets.SM_CLIENT_CERT_FILE_B64 }}" | base64 --decode > /d/Certificate_pkcs12.p12
           cat /d/Certificate_pkcs12.p12
@@ -146,7 +155,7 @@ jobs:
         shell: bash
 
       - name: Setup certicate with SSM KSP (Windows only)
-        if: ${{ (env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true') && matrix.os == 'windows-2022' }}
+        if: ${{ env.BUILD_RELEASE == 'true' && matrix.os == 'windows-2022' }}
         run: |
           curl -X GET  https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download -H "x-api-key:%SM_API_KEY%" -o smtools-windows-x64.msi
           msiexec /i smtools-windows-x64.msi /quiet /qn
@@ -156,165 +165,104 @@ jobs:
           smksp_cert_sync.exe
         shell: cmd
 
-      - name: Build the app (debug)
-        if: ${{ env.IS_RELEASE == 'false' && env.IS_NIGHTLY == 'false' }}
-        # electron-builder doesn't have a concept of release vs debug,
-        # this is just not doing any codesign or release yml generation
-        run: yarn electron-builder --config
-
-      - name: Build the app (release)
-        if: ${{ env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true' }}
-        env:
-          PUBLISH_FOR_PULL_REQUEST: true
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
-          CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-          CSC_FOR_PULL_REQUEST: true
-          WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
-        run: yarn electron-builder --config --publish always
+      - name: Build the app
+        run: yarn electron-builder --config ${{ env.BUILD_RELEASE && '--publish always' || '' }}
 
       - name: List artifacts in out/
         run: ls -R out
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
-          name: out-arm64-${{ matrix.platform }}
-          # first two will pick both Zoo Modeling App-$VERSION-arm64-win.exe and Zoo Modeling App-$VERSION-win.exe
-          path: |
-            out/*-${{ env.VERSION_NO_V }}-win.*
-            out/*-${{ env.VERSION_NO_V }}-arm64-win.*
-            out/*-arm64-mac.*
-            out/*-arm64-linux.*
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: out-x64-${{ matrix.platform }}
-          path: |
-            out/*-x64-win.*
-            out/*-x64-mac.*
-            out/*-x86_64-linux.*
-
-      - uses: actions/upload-artifact@v4
-        if: ${{ env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true' }}
-        with:
-          name: out-yml-${{ matrix.platform }}
+          name: out-arm64-${{ matrix.os }}
           path: |
+            out/Zoo*arm64*.*
             out/latest*.yml
 
+      - uses: actions/upload-artifact@v3
+        with:
+          name: out-x64-${{ matrix.os }}
+          path: |
+            out/Zoo*x*64*.*
+
       # TODO: add the 'Build for Mac TestFlight (nightly)' stage back
 
-      # The steps below are for updater-test builds, only on release
-
-      - uses: actions/download-artifact@v4
-        if: ${{ env.IS_RELEASE == 'true' }}
+      - uses: actions/download-artifact@v3
+        if: ${{ env.CUT_RELEASE_PR == 'true' }}
         name: prepared-files-updater-test
 
       - name: Copy updated electron-builder.yml file for updater test
-        if: ${{ env.IS_RELEASE == 'true' }}
+        if: ${{ env.CUT_RELEASE_PR == 'true' }}
         run: |
           ls -R prepared-files-updater-test
           cp prepared-files-updater-test/electron-builder.yml electron-builder.yml
 
       - name: Build the app (updater-test)
-        if: ${{ env.IS_RELEASE == 'true' }}
-        env:
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          CSC_LINK: ${{ secrets.APPLE_CERTIFICATE }}
-          CSC_KEY_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          CSC_KEYCHAIN: ${{ secrets.APPLE_SIGNING_IDENTITY }}
-          CSC_FOR_PULL_REQUEST: true
-          WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }}
-        run: yarn electron-builder --config --publish always
+        if: ${{ env.CUT_RELEASE_PR == 'true' }}
+        run: yarn electron-builder --config ${{ env.BUILD_RELEASE && '--publish always' || '' }}
 
-      - uses: actions/upload-artifact@v4
-        if: ${{ env.IS_RELEASE == 'true' }}
+      - uses: actions/upload-artifact@v3
+        if: ${{ env.CUT_RELEASE_PR == 'true' }}
         with:
-          name: updater-test-arm64-${{ matrix.platform }}
+          name: updater-test-arm64-${{ matrix.os }}
           path: |
-            out/*-arm64-win.exe
-            out/*-arm64-mac.dmg
-            out/*-arm64-linux.AppImage
+            out/Zoo*arm64*.*
 
-      - uses: actions/upload-artifact@v4
-        if: ${{ env.IS_RELEASE == 'true' }}
+      - uses: actions/upload-artifact@v3
+        if: ${{ env.CUT_RELEASE_PR == 'true' }}
         with:
-          name: updater-test-x64-${{ matrix.platform }}
+          name: updater-test-x64-${{ matrix.os }}
           path: |
-            out/*-x64-win.exe
-            out/*-x64-mac.dmg
-            out/*-x86_64-linux.AppImage
+            out/Zoo*x64*.*
 
 
-  upload-apps-release:
+  publish-apps-release:
     runs-on: ubuntu-22.04
     permissions:
       contents: write
-    if: ${{ github.ref_type == 'tag' || github.event_name == 'schedule' }}
+    if: ${{ github.event_name == 'release' || github.event_name == 'schedule' }}
+    needs: [prepare-files, build-apps]
     env:
       VERSION_NO_V: ${{ needs.prepare-files.outputs.version }}
-      VERSION: ${{ format('v{0}', needs.prepare-files.outputs.version) }}
-    needs: [prepare-files, build-apps]
+      VERSION: ${{ github.event_name == 'schedule' && needs.prepare-files.outputs.version || format('v{0}', needs.prepare-files.outputs.version) }}
+      PUB_DATE: ${{ github.event_name == 'release' && github.event.release.created_at || github.event.repository.updated_at }}
+      NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Non-release build, commit {0}', github.sha) }}
+      BUCKET_DIR: ${{ github.event_name == 'schedule' && 'dl.kittycad.io/releases/modeling-app/nightly' || 'dl.kittycad.io/releases/modeling-app' }}
+      WEBSITE_DIR: ${{ github.event_name == 'schedule' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }}
+      URL_CODED_NAME: ${{ github.event_name == 'schedule' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }}
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
-          name: out-arm64-win
+          name: out-arm64-windows-2022
           path: out
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
-          name: out-x64-win
+          name: out-x64-windows-2022
           path: out
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
-          name: out-yml-win
+          name: out-arm64-macos-14
           path: out
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
-          name: out-arm64-mac
+          name: out-x64-macos-14
           path: out
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
-          name: out-x64-mac
+          name: out-arm64-ubuntu-22.04
           path: out
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
-          name: out-yml-mac
-          path: out
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: out-arm64-linux
-          path: out
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: out-x64-linux
-          path: out
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: out-yml-linux
+          name: out-x64-ubuntu-22.04
           path: out
 
       - name: Generate the download static endpoint
-        env:
-          NOTES: ${{ needs.prepare-files.outputs.notes }}
-          PUB_DATE: ${{ github.event.repository.updated_at }}
-          WEBSITE_DIR: ${{ github.event_name == 'schedule' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }}
-          URL_CODED_NAME: ${{ github.event_name == 'schedule' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }}
         run: |
           RELEASE_DIR=https://${WEBSITE_DIR}
           jq --null-input \
@@ -351,34 +299,78 @@ jobs:
                   "url": $linux_x64_url
                 }
               }
-            }' > out/last_download.json
-            cat out/last_download.json
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: out-download-json
-          path: out/last_download.json
+            }' > last_download.json
+            cat last_download.json
 
       - name: List artifacts
         run: "ls -R out"
 
       - name: Authenticate to Google Cloud
-        if: ${{ env.IS_NIGHTLY == 'true' }}
-        uses: 'google-github-actions/auth@v2.1.7'
+        uses: 'google-github-actions/auth@v2.1.6'
         with:
           credentials_json: '${{ secrets.GOOGLE_CLOUD_DL_SA }}'
 
       - name: Set up Google Cloud SDK
-        if: ${{ env.IS_NIGHTLY == 'true' }}
-        uses: google-github-actions/setup-gcloud@v2.1.2
+        uses: google-github-actions/setup-gcloud@v2.1.0
         with:
           project_id: ${{ env.GOOGLE_CLOUD_PROJECT_ID }}
 
-      - name: Upload nightly files to public bucket
-        if: ${{ env.IS_NIGHTLY == 'true' }}
-        uses: google-github-actions/upload-cloud-storage@v2.2.1
+      - name: Upload release files to public bucket
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
         with:
           path: out
-          glob: '*'
+          glob: 'Zoo*'
           parent: false
-          destination: 'dl.kittycad.io/releases/modeling-app/nightly'
+          destination: ${{ env.BUCKET_DIR }}
+
+      - name: Upload update endpoint to public bucket
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
+        with:
+          path: out
+          glob: 'latest*'
+          parent: false
+          destination: ${{ env.BUCKET_DIR }}
+
+      - name: Upload download endpoint to public bucket
+        uses: google-github-actions/upload-cloud-storage@v2.2.0
+        with:
+          path: last_download.json
+          destination: ${{ env.BUCKET_DIR }}
+
+      - name: Upload release files to Github
+        if: ${{ github.event_name == 'release' }}
+        uses: softprops/action-gh-release@v2
+        with:
+          files: 'out/Zoo*'
+
+      - name: Invalidate bucket cache on latest*.yml and last_download.json files
+        run: |
+          gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/last_download.json" --async
+          gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/latest-linux-arm64.yml" --async
+          gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/latest-mac.yml" --async
+          gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/latest.yml" --async
+
+  announce_release:
+    needs: [publish-apps-release]
+    runs-on: ubuntu-22.04
+    if: github.event_name == 'release'
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install requests
+
+      - name: Announce Release
+        env:
+          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          RELEASE_VERSION: ${{ github.event.release.tag_name }}
+          RELEASE_BODY: ${{ github.event.release.body}}
+        run: python public/announce_release.py

.github/workflows/cargo-check.yml

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

.github/workflows/cargo-test.yml

@@ -5,8 +5,6 @@ on:
     paths:
       - 'src/wasm-lib/**.rs'
       - 'src/wasm-lib/**.hbs'
-      - 'src/wasm-lib/**.gen'
-      - 'src/wasm-lib/**.snap'
       - '**/Cargo.toml'
       - '**/Cargo.lock'
       - '**/rust-toolchain.toml'
@@ -17,8 +15,6 @@ on:
     paths:
       - 'src/wasm-lib/**.rs'
       - 'src/wasm-lib/**.hbs'
-      - 'src/wasm-lib/**.gen'
-      - 'src/wasm-lib/**.snap'
       - '**/Cargo.toml'
       - '**/Cargo.lock'
       - '**/rust-toolchain.toml'
@@ -66,7 +62,7 @@ jobs:
         shell: bash
         run: |-
           cd "${{ matrix.dir }}"
-          cargo llvm-cov nextest --workspace --lcov --output-path lcov.info --test-threads=1 --no-fail-fast -P ci 2>&1 | tee /tmp/github-actions.log
+          cargo llvm-cov nextest --all --lcov --output-path lcov.info --test-threads=1 --no-fail-fast -P ci 2>&1 | tee /tmp/github-actions.log
         env:
           KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
           RUST_MIN_STACK: 10485760000

.github/workflows/create-release.yml

@@ -0,0 +1,37 @@
+name: Create Release
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: read
+    if: contains(github.event.head_commit.message, 'Cut release v')
+    steps:
+      - uses: actions/github-script@v7
+        name: Read Cut release PR info and create release
+        with:
+          script: |
+            const { owner, repo } = context.repo
+            const pulls = await github.rest.repos.listPullRequestsAssociatedWithCommit({
+              owner,
+              repo,
+              commit_sha: context.sha,
+            })
+            const { title, body } = pulls.data[0]
+            const version = title.split('Cut release ')[1]
+
+            const result = await github.rest.repos.createRelease({
+              owner,
+              repo,
+              body,
+              tag_name: version,
+              name: version,
+              draft: true,
+            })
+            console.log(result)

.github/workflows/e2e-tests.yml

@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest-8-cores, windows-latest-8-cores]
+        os: [ubuntu-latest, windows-latest]
         shardIndex: [1, 2, 3, 4]
         shardTotal: [4]
     runs-on: ${{ matrix.os }}
@@ -68,7 +68,7 @@ jobs:
     - name: Download Wasm Cache
       id: download-wasm
       if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      uses: dawidd6/action-download-artifact@v7
+      uses: dawidd6/action-download-artifact@v6
       continue-on-error: true
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
@@ -227,7 +227,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest-8-cores, windows-latest-8-cores, macos-14-large]
+        os: [ubuntu-latest, windows-latest, macos-14]
     timeout-minutes: 60
     runs-on: ${{ matrix.os }}
     needs: check-rust-changes
@@ -255,7 +255,7 @@ jobs:
     - name: Download Wasm Cache
       id: download-wasm
       if: needs.check-rust-changes.outputs.rust-changed == 'false'
-      uses: dawidd6/action-download-artifact@v7
+      uses: dawidd6/action-download-artifact@v6
       continue-on-error: true
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
@@ -287,7 +287,7 @@ jobs:
         brew install gnu-sed
         echo "/opt/homebrew/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
     - name: Install vector
-      if:  ${{ startsWith(matrix.os, 'ubuntu') }}
+      if:  ${{ !startsWith(matrix.os, 'windows') }}
       shell: bash
       run: |
         curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh

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

@@ -1,164 +0,0 @@
-name: publish-apps-release
-
-on:
-  release:
-    types: [published]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-jobs:
-  publish-apps-release:
-    runs-on: ubuntu-22.04
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-
-      - name: Find tag workflow id
-        id: tag_workflow_id
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          id=$(gh run ls --repo kittycad/modeling-app -w build-apps.yml --branch ${{ github.event.release.tag_name }} --json databaseId | jq '.[0].databaseId')
-          echo "id=$id" >> "$GITHUB_OUTPUT"
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: out-arm64-win
-          path: out
-          run-id: ${{ steps.tag_workflow_id.outputs.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          
-      - uses: actions/download-artifact@v4
-        with:
-          name: out-x64-win
-          path: out
-          run-id: ${{ steps.tag_workflow_id.outputs.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: out-yml-win
-          path: out
-          run-id: ${{ steps.tag_workflow_id.outputs.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: out-arm64-mac
-          path: out
-          run-id: ${{ steps.tag_workflow_id.outputs.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: out-x64-mac
-          path: out
-          run-id: ${{ steps.tag_workflow_id.outputs.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: out-yml-mac
-          path: out
-          run-id: ${{ steps.tag_workflow_id.outputs.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: out-arm64-linux
-          path: out
-          run-id: ${{ steps.tag_workflow_id.outputs.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: out-x64-linux
-          path: out
-          run-id: ${{ steps.tag_workflow_id.outputs.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: out-yml-linux
-          path: out
-          run-id: ${{ steps.tag_workflow_id.outputs.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: out-download-json
-          path: out
-          run-id: ${{ steps.tag_workflow_id.outputs.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: List artifacts
-        run: ls -R out
-
-      - name: Override release notes
-        env:
-          NOTES: ${{ github.event.release.body }}
-        run: yarn files:set-notes
-
-      - name: Authenticate to Google Cloud
-        uses: 'google-github-actions/auth@v2.1.7'
-        with:
-          credentials_json: '${{ secrets.GOOGLE_CLOUD_DL_SA }}'
-
-      - name: Set up Google Cloud SDK
-        uses: google-github-actions/setup-gcloud@v2.1.2
-        with:
-          project_id: ${{ env.GOOGLE_CLOUD_PROJECT_ID }}
-
-      - name: Upload release files to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.2.1
-        with:
-          path: out
-          glob: '*'
-          parent: false
-          destination: 'dl.kittycad.io/releases/modeling-app'
-
-      - name: Invalidate bucket cache on latest*.yml and last_download.json files
-        run: |
-          gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/last_download.json" --async
-          gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/latest-linux-arm64.yml" --async
-          gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/latest-mac.yml" --async
-          gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/latest.yml" --async
-
-      - name: Upload release files to Github
-        if: ${{ github.event_name == 'release' }}
-        uses: softprops/action-gh-release@v2
-        with:
-          files: 'out/Zoo*'
-
-
-  announce_release:
-    needs: [publish-apps-release]
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install requests
-
-      - name: Announce Release
-        env:
-          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
-          RELEASE_VERSION: ${{ github.event.release.tag_name }}
-          RELEASE_BODY: ${{ github.event.release.body }}
-        run: python public/announce_release.py

.github/workflows/static-analysis.yml

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

.nvmrc

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

Makefile

@@ -19,7 +19,7 @@ $(XSTATE_TYPEGENS): $(TS_SRC)
 	yarn xstate typegen 'src/**/*.ts?(x)'
 
 public/wasm_lib_bg.wasm: $(WASM_LIB_FILES)
-	yarn build:wasm
+	yarn build:wasm-dev
 
 node_modules: package.json yarn.lock
 	yarn install

README.md

@@ -2,7 +2,7 @@
 
 ## Zoo Modeling App
 
-download at [zoo.dev/modeling-app/download](https://zoo.dev/modeling-app/download)
+live at [app.zoo.dev](https://app.zoo.dev/)
 
 A CAD application from the future, brought to you by the [Zoo team](https://zoo.dev).
 
@@ -57,7 +57,7 @@ yarn install
 followed by:
 
 ```
-yarn build:wasm
+yarn build:wasm-dev
 ```
 
 or if you have the gh cli installed
@@ -66,15 +66,15 @@ or if you have the gh cli installed
 ./get-latest-wasm-bundle.sh # this will download the latest main wasm bundle
 ```
 
-That will build the WASM binary and put in the `public` dir (though gitignored).
+That will build the WASM binary and put in the `public` dir (though gitignored)
 
-Finally, to run the web app only, run:
+finally, to run the web app only, run:
 
 ```
 yarn start
 ```
 
-If you're not an KittyCAD 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.
+If you're not an KittyCAD 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 ofcourse, 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.
 
 ### Development environment variables
 
@@ -91,13 +91,13 @@ 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, `yarn install` and `yarn build:wasm-dev` need to have been done before hand then
 
 ```
-yarn tron:start
+yarn electron:start
 ```
 
-This will start the application and hot-reload on changes.
+This will start the application and hot-reload on changed.
 
 Devtools can be opened with the usual Cmd/Ctrl-Shift-I.
 
@@ -110,7 +110,7 @@ Which commands from setup are one off vs need to be run every time?
 The following will need to be run when checking out a new commit and guarantees the build is not stale:
 ```bash
 yarn install
-yarn build:wasm
+yarn build:wasm-dev # or yarn build:wasm for slower but more production-like build
 yarn start # or yarn build:local && yarn serve for slower but more production-like build
 ```
 
@@ -128,63 +128,39 @@ Before you submit a contribution PR to this repo, please ensure that:
 
 ## Release a new version
 
-#### 1. Create a 'Cut release $VERSION' issue
+#### 1. Bump the versions by running `./make-release.sh` and create a Cut Release PR
 
-It will be used to document changelog discussions and release testing.
+That will create the branch with the updated json files for you:
+- run `./make-release.sh` or `./make-release.sh patch` for a patch update;
+- run `./make-release.sh minor` for minor; or
+- run `./make-release.sh major` for major.
 
-https://github.com/KittyCAD/modeling-app/issues/new
+After it runs you should just need the push the branch and open a PR.
 
-#### 2. Push a new tag
+**Important:** It needs to be prefixed with `Cut release v` to build in release mode and a few other things to test in the best context possible, the intent would be for instance to have `Cut release v1.2.3` for the `v1.2.3` release candidate.
 
-Create a new tag and push it to the repo. The `semantic-release.sh` script will automatically bump the minor part, which we use the most. For instance going from `v0.27.0` to `v0.28.0`.
+The PR may then serve as a place to discuss the human-readable changelog and extra QA. The `make-release.sh` tool suggests a changelog for you too to be used as PR description, just make sure to delete lines that are not user facing.
 
-```
-VERSION=$(./scripts/semantic-release.sh)
-git tag $VERSION
-git push origin --tags
-```
+#### 2. Smoke test artifacts from the Cut Release PR
 
-This will trigger the `build-apps` workflow, set the version, build & sign the apps, and generate release files as well as updater-test artifacts.
+The release builds can be find under the `artifact` zip, at the very bottom of the `ci` action page for each commit on this branch.
 
-The workflow should be listed right away [in this list](https://github.com/KittyCAD/modeling-app/actions/workflows/build-apps.yml?query=event%3Apush)).
+We don't have a strict process, but click around and check for anything obvious, posting results as comments in the Cut Release PR.
 
-#### 3. Manually test artifacts
+The other `ci` output in Cut Release PRs is `updater-test`, because we don't have a way to test this fully automated, we have a semi-automated process. Download updater-test zip file, install the app, run it, expect an updater prompt to a dummy v0.99.99, install it and check that the app comes back at that version (on both macOS and Windows).
 
-##### Release builds
+#### 3. Merge the Cut Release PR
 
-The release builds can be found under the `out-{arch}-{platform}` zip files, at the very bottom of the `build-apps` summary page for the workflow (triggered by the tag in 2.).
+This will kick the `create-release` action, that creates a _Draft_ release out of this Cut Release PR merge after less than a minute, with the new version as title and Cut Release PR as description.
 
-Manually test against this [list](https://github.com/KittyCAD/modeling-app/issues/3588) across Windows, MacOS, Linux and posting results as comments in the 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 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'
-
-# macOS
-/Applications/Zoo\ Modeling\ App.app/Contents/MacOS/Zoo\ Modeling\ App
-
-# Linux
-./Zoo Modeling App-{version}-{arch}-linux.AppImage
-```
 
 #### 4. Publish the release
 
-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.
+Head over to https://github.com/KittyCAD/modeling-app/releases, the draft release corresponding to the merged Cut Release PR should show up at the top as _Draft_. Click on it, verify the content, and hit _Publish_.
 
-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_. 
+#### 5. Profit
 
-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.
+A new Action kicks in at https://github.com/KittyCAD/modeling-app/actions, which can be found under `release` event filter.
 
 
 ## Fuzzing the parser
@@ -343,16 +319,7 @@ Which will run our suite of [Vitest unit](https://vitest.dev/) and [React Testin
 
 ```bash
 cd src/wasm-lib
-KITTYCAD_API_TOKEN=XXX cargo test -- --test-threads=1
-```
-
-Where `XXX` is an API token from the production engine (NOT the dev environment).
-
-We recommend using [nextest](https://nexte.st/) to run the Rust tests (its faster and is used in CI). Once installed, run the tests using
-
-```
-cd src/wasm-lib
-KITTYCAD_API_TOKEN=XXX cargo run nextest
+cargo test
 ```
 
 ### Mapping CI CD jobs to local commands
@@ -450,9 +417,3 @@ PS: for the debug panel, the following JSON is useful for snapping the camera
 ## KCL
 
 For how to contribute to KCL, [see our KCL README](https://github.com/KittyCAD/modeling-app/tree/main/src/wasm-lib/kcl).
-
-### Logging
-
-To display logging (to the terminal or console) set `ZOO_LOG=1`. This will log some warnings and simple performance metrics. To view these in test runs, use `-- --nocapture`.
-
-To enable memory metrics, build with `--features dhat-heap`.

docs/kcl/abs.md

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

docs/kcl/acos.md

@@ -34,8 +34,8 @@ acos(num: number) -> number
 sketch001 = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> angledLine({
-       angle = toDegrees(acos(0.5)),
-       length = 10
+       angle: toDegrees(acos(0.5)),
+       length: 10
      }, %)
   |> line([5, 0], %)
   |> lineTo([12, 0], %)

docs/kcl/angleToMatchLengthX.md

@@ -1,10 +1,10 @@
 ---
 title: "angleToMatchLengthX"
-excerpt: "Returns the angle to match the given length for x."
+excerpt: "Compute the angle (in degrees) in o"
 layout: manual
 ---
 
-Returns the angle to match the given length for x.
+Compute the angle (in degrees) in o
 
 
 

docs/kcl/angleToMatchLengthY.md

@@ -33,8 +33,8 @@ sketch001 = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> line([1, 2], %, $seg01)
   |> angledLine({
-       angle = angleToMatchLengthY(seg01, 15, %),
-       length = 5
+       angle: angleToMatchLengthY(seg01, 15, %),
+       length: 5
      }, %)
   |> yLineTo(0, %)
   |> close(%)

docs/kcl/angledLine.md

@@ -32,7 +32,7 @@ angledLine(data: AngledLineData, sketch: Sketch, tag?: TagDeclarator) -> Sketch
 exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> yLineTo(15, %)
-  |> angledLine({ angle = 30, length = 15 }, %)
+  |> angledLine({ angle: 30, length: 15 }, %)
   |> line([8, -10], %)
   |> yLineTo(0, %)
   |> close(%)

docs/kcl/angledLineOfXLength.md

@@ -31,8 +31,8 @@ angledLineOfXLength(data: AngledLineData, sketch: Sketch, tag?: TagDeclarator) -
 ```js
 sketch001 = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
-  |> angledLineOfXLength({ angle = 45, length = 10 }, %, $edge1)
-  |> angledLineOfXLength({ angle = -15, length = 20 }, %, $edge2)
+  |> angledLineOfXLength({ angle: 45, length: 10 }, %, $edge1)
+  |> angledLineOfXLength({ angle: -15, length: 20 }, %, $edge2)
   |> line([0, -5], %)
   |> close(%, $edge3)
 

docs/kcl/angledLineOfYLength.md

@@ -32,9 +32,9 @@ angledLineOfYLength(data: AngledLineData, sketch: Sketch, tag?: TagDeclarator) -
 exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> line([10, 0], %)
-  |> angledLineOfYLength({ angle = 45, length = 10 }, %)
+  |> angledLineOfYLength({ angle: 45, length: 10 }, %)
   |> line([0, 10], %)
-  |> angledLineOfYLength({ angle = 135, length = 10 }, %)
+  |> angledLineOfYLength({ angle: 135, length: 10 }, %)
   |> line([-10, 0], %)
   |> line([0, -30], %)
 

docs/kcl/angledLineThatIntersects.md

@@ -35,9 +35,9 @@ exampleSketch = startSketchOn('XZ')
   |> lineTo([-10, 10], %, $lineToIntersect)
   |> lineTo([0, 20], %)
   |> angledLineThatIntersects({
-       angle = 80,
-       intersectTag = lineToIntersect,
-       offset = 10
+       angle: 80,
+       intersectTag: lineToIntersect,
+       offset: 10
      }, %)
   |> close(%)
 

docs/kcl/angledLineToX.md

@@ -31,7 +31,7 @@ angledLineToX(data: AngledLineToData, sketch: Sketch, tag?: TagDeclarator) -> Sk
 ```js
 exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
-  |> angledLineToX({ angle = 30, to = 10 }, %)
+  |> angledLineToX({ angle: 30, to: 10 }, %)
   |> line([0, 10], %)
   |> line([-10, 0], %)
   |> close(%)

docs/kcl/angledLineToY.md

@@ -31,9 +31,9 @@ angledLineToY(data: AngledLineToData, sketch: Sketch, tag?: TagDeclarator) -> Sk
 ```js
 exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
-  |> angledLineToY({ angle = 60, to = 20 }, %)
+  |> angledLineToY({ angle: 60, to: 20 }, %)
   |> line([-20, 0], %)
-  |> angledLineToY({ angle = 70, to = 10 }, %)
+  |> angledLineToY({ angle: 70, to: 10 }, %)
   |> close(%)
 
 example = extrude(10, exampleSketch)

docs/kcl/asin.md

@@ -34,8 +34,8 @@ asin(num: number) -> number
 sketch001 = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> angledLine({
-       angle = toDegrees(asin(0.5)),
-       length = 20
+       angle: toDegrees(asin(0.5)),
+       length: 20
      }, %)
   |> yLineTo(0, %)
   |> close(%)

docs/kcl/atan.md

@@ -34,8 +34,8 @@ atan(num: number) -> number
 sketch001 = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> angledLine({
-       angle = toDegrees(atan(1.25)),
-       length = 20
+       angle: toDegrees(atan(1.25)),
+       length: 20
      }, %)
   |> yLineTo(0, %)
   |> close(%)

docs/kcl/bezierCurve.md

@@ -33,9 +33,9 @@ exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> line([0, 10], %)
   |> bezierCurve({
-       to = [10, 10],
-       control1 = [5, 0],
-       control2 = [5, 10]
+       to: [10, 10],
+       control1: [5, 0],
+       control2: [5, 10]
      }, %)
   |> lineTo([10, 0], %)
   |> close(%)

docs/kcl/chamfer.md

@@ -44,8 +44,8 @@ mountingPlateSketch = startSketchOn("XY")
 
 mountingPlate = extrude(thickness, mountingPlateSketch)
   |> chamfer({
-       length = chamferLength,
-       tags = [
+       length: chamferLength,
+       tags: [
          getNextAdjacentEdge(edge1),
          getNextAdjacentEdge(edge2),
          getNextAdjacentEdge(edge3),
@@ -58,7 +58,7 @@ mountingPlate = extrude(thickness, mountingPlateSketch)
 
 ```js
 // Sketch on the face of a chamfer.
-fn cube(pos, scale) {
+fn cube = (pos, scale) => {
   sg = startSketchOn('XY')
     |> startProfileAt(pos, %)
     |> line([0, scale], %)
@@ -72,8 +72,8 @@ part001 = cube([0, 0], 20)
   |> close(%, $line1)
   |> extrude(20, %)
   |> chamfer({
-       length = 10,
-       tags = [getOppositeEdge(line1)]
+       length: 10,
+       tags: [getOppositeEdge(line1)]
      }, %, $chamfer1) // We tag the chamfer to reference it later.
 
 sketch001 = startSketchOn(part001, chamfer1)

docs/kcl/circle.md

@@ -30,7 +30,7 @@ circle(data: CircleData, sketch_surface_or_group: SketchOrSurface, tag?: TagDecl
 
 ```js
 exampleSketch = startSketchOn("-XZ")
-  |> circle({ center = [0, 0], radius = 10 }, %)
+  |> circle({ center: [0, 0], radius: 10 }, %)
 
 example = extrude(5, exampleSketch)
 ```
@@ -44,7 +44,7 @@ exampleSketch = startSketchOn("XZ")
   |> line([0, 30], %)
   |> line([-30, 0], %)
   |> close(%)
-  |> hole(circle({ center = [0, 15], radius = 5 }, %), %)
+  |> hole(circle({ center: [0, 15], radius: 5 }, %), %)
 
 example = extrude(5, exampleSketch)
 ```

docs/kcl/cos.md

@@ -34,8 +34,8 @@ cos(num: number) -> number
 exampleSketch = startSketchOn("XZ")
   |> startProfileAt([0, 0], %)
   |> angledLine({
-       angle = 30,
-       length = 3 / cos(toRadians(30))
+       angle: 30,
+       length: 3 / cos(toRadians(30))
      }, %)
   |> yLineTo(0, %)
   |> close(%)

docs/kcl/e.md

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

docs/kcl/extrude.md

@@ -32,16 +32,16 @@ example = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
   |> line([10, 0], %)
   |> arc({
-       angleStart = 120,
-       angleEnd = 0,
-       radius = 5
+       angleStart: 120,
+       angleEnd: 0,
+       radius: 5
      }, %)
   |> line([5, 0], %)
   |> line([0, 10], %)
   |> bezierCurve({
-       control1 = [-10, 0],
-       control2 = [2, 10],
-       to = [-5, 10]
+       control1: [-10, 0],
+       control2: [2, 10],
+       to: [-5, 10]
      }, %)
   |> line([-5, -2], %)
   |> close(%)
@@ -54,16 +54,16 @@ example = startSketchOn('XZ')
 exampleSketch = startSketchOn('XZ')
   |> startProfileAt([-10, 0], %)
   |> arc({
-       angleStart = 120,
-       angleEnd = -60,
-       radius = 5
+       angleStart: 120,
+       angleEnd: -60,
+       radius: 5
      }, %)
   |> line([10, 0], %)
   |> line([5, 0], %)
   |> bezierCurve({
-       control1 = [-3, 0],
-       control2 = [2, 10],
-       to = [-5, 10]
+       control1: [-3, 0],
+       control2: [2, 10],
+       to: [-5, 10]
      }, %)
   |> line([-4, 10], %)
   |> line([-5, -2], %)

docs/kcl/fillet.md

@@ -43,8 +43,8 @@ mountingPlateSketch = startSketchOn("XY")
 
 mountingPlate = extrude(thickness, mountingPlateSketch)
   |> fillet({
-       radius = filletRadius,
-       tags = [
+       radius: filletRadius,
+       tags: [
          getNextAdjacentEdge(edge1),
          getNextAdjacentEdge(edge2),
          getNextAdjacentEdge(edge3),
@@ -70,9 +70,9 @@ mountingPlateSketch = startSketchOn("XY")
 
 mountingPlate = extrude(thickness, mountingPlateSketch)
   |> fillet({
-       radius = filletRadius,
-       tolerance = 0.000001,
-       tags = [
+       radius: filletRadius,
+       tolerance: 0.000001,
+       tags: [
          getNextAdjacentEdge(edge1),
          getNextAdjacentEdge(edge2),
          getNextAdjacentEdge(edge3),

docs/kcl/getNextAdjacentEdge.md

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

docs/kcl/getOppositeEdge.md

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

docs/kcl/getPreviousAdjacentEdge.md

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

docs/kcl/helix.md

@@ -29,12 +29,12 @@ helix(data: HelixData, solid: Solid) -> Solid
 
 ```js
 part001 = startSketchOn('XY')
-  |> circle({ center = [5, 5], radius = 10 }, %)
+  |> circle({ center: [5, 5], radius: 10 }, %)
   |> extrude(10, %)
   |> helix({
-       angleStart = 0,
-       ccw = true,
-       revolutions = 16
+       angleStart: 0,
+       ccw: true,
+       revolutions: 16
      }, %)
 ```
 

docs/kcl/hollow.md

@@ -68,15 +68,15 @@ case = startSketchOn('-XZ')
 
 thing1 = startSketchOn(case, 'end')
   |> circle({
-       center = [-size / 2, -size / 2],
-       radius = 25
+       center: [-size / 2, -size / 2],
+       radius: 25
      }, %)
   |> extrude(50, %)
 
 thing2 = startSketchOn(case, 'end')
   |> circle({
-       center = [size / 2, -size / 2],
-       radius = 25
+       center: [size / 2, -size / 2],
+       radius: 25
      }, %)
   |> extrude(50, %)
 

docs/kcl/index.md

@@ -7,7 +7,6 @@ layout: manual
 ## Table of Contents
 
 * [Types](kcl/types)
-* [Modules](kcl/modules)
 * [Known Issues](kcl/KNOWN-ISSUES)
 * [`abs`](kcl/abs)
 * [`acos`](kcl/acos)
@@ -20,7 +19,6 @@ layout: manual
 * [`angledLineToX`](kcl/angledLineToX)
 * [`angledLineToY`](kcl/angledLineToY)
 * [`arc`](kcl/arc)
-* [`arcTo`](kcl/arcTo)
 * [`asin`](kcl/asin)
 * [`assert`](kcl/assert)
 * [`assertEqual`](kcl/assertEqual)
@@ -74,27 +72,19 @@ layout: manual
 * [`patternLinear2d`](kcl/patternLinear2d)
 * [`patternLinear3d`](kcl/patternLinear3d)
 * [`patternTransform`](kcl/patternTransform)
-* [`patternTransform2d`](kcl/patternTransform2d)
 * [`pi`](kcl/pi)
 * [`polar`](kcl/polar)
-* [`polygon`](kcl/polygon)
 * [`pow`](kcl/pow)
 * [`profileStart`](kcl/profileStart)
 * [`profileStartX`](kcl/profileStartX)
 * [`profileStartY`](kcl/profileStartY)
-* [`push`](kcl/push)
 * [`reduce`](kcl/reduce)
 * [`rem`](kcl/rem)
 * [`revolve`](kcl/revolve)
-* [`round`](kcl/round)
 * [`segAng`](kcl/segAng)
-* [`segEnd`](kcl/segEnd)
 * [`segEndX`](kcl/segEndX)
 * [`segEndY`](kcl/segEndY)
 * [`segLen`](kcl/segLen)
-* [`segStart`](kcl/segStart)
-* [`segStartX`](kcl/segStartX)
-* [`segStartY`](kcl/segStartY)
 * [`shell`](kcl/shell)
 * [`sin`](kcl/sin)
 * [`sqrt`](kcl/sqrt)
@@ -102,7 +92,6 @@ layout: manual
 * [`startSketchAt`](kcl/startSketchAt)
 * [`startSketchOn`](kcl/startSketchOn)
 * [`tan`](kcl/tan)
-* [`tangentToEnd`](kcl/tangentToEnd)
 * [`tangentialArc`](kcl/tangentialArc)
 * [`tangentialArcTo`](kcl/tangentialArcTo)
 * [`tangentialArcToRelative`](kcl/tangentialArcToRelative)

docs/kcl/loft.md

@@ -60,10 +60,10 @@ squareSketch = startSketchOn('XY')
   |> close(%)
 
 circleSketch0 = startSketchOn(offsetPlane('XY', 75))
-  |> circle({ center = [0, 100], radius = 50 }, %)
+  |> circle({ center: [0, 100], radius: 50 }, %)
 
 circleSketch1 = startSketchOn(offsetPlane('XY', 150))
-  |> circle({ center = [0, 100], radius = 20 }, %)
+  |> circle({ center: [0, 100], radius: 20 }, %)
 
 loft([
   squareSketch,
@@ -85,10 +85,10 @@ squareSketch = startSketchOn('XY')
   |> close(%)
 
 circleSketch0 = startSketchOn(offsetPlane('XY', 75))
-  |> circle({ center = [0, 100], radius = 50 }, %)
+  |> circle({ center: [0, 100], radius: 50 }, %)
 
 circleSketch1 = startSketchOn(offsetPlane('XY', 150))
-  |> circle({ center = [0, 100], radius = 20 }, %)
+  |> circle({ center: [0, 100], radius: 20 }, %)
 
 loft([
   squareSketch,
@@ -97,17 +97,17 @@ loft([
 ], {
   // This can be set to override the automatically determined
   // topological base curve, which is usually the first section encountered.
-  baseCurveIndex = 0,
+  baseCurveIndex: 0,
   // 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.
-  bezApproximateRational = false,
+  bezApproximateRational: false,
   // Tolerance for the loft operation.
-  tolerance = 0.000001,
+  tolerance: 0.000001,
   // 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.
-  vDegree = 2
+  vDegree: 2
 })
 ```
 

docs/kcl/max.md

@@ -34,8 +34,8 @@ max(args: [number]) -> number
 exampleSketch = startSketchOn("XZ")
   |> startProfileAt([0, 0], %)
   |> angledLine({
-       angle = 70,
-       length = max(15, 31, 4, 13, 22)
+       angle: 70,
+       length: max(15, 31, 4, 13, 22)
      }, %)
   |> line([20, 0], %)
   |> close(%)

docs/kcl/min.md

@@ -34,8 +34,8 @@ min(args: [number]) -> number
 exampleSketch = startSketchOn("XZ")
   |> startProfileAt([0, 0], %)
   |> angledLine({
-       angle = 70,
-       length = min(15, 31, 4, 13, 22)
+       angle: 70,
+       length: min(15, 31, 4, 13, 22)
      }, %)
   |> line([20, 0], %)
   |> close(%)

docs/kcl/mirror2d.md

@@ -41,7 +41,7 @@ sketch001 = startSketchOn('XZ')
   |> line([-8, -3], %)
   |> line([9, -1], %)
   |> line([-19, -0], %)
-  |> mirror2d({ axis = 'Y' }, %)
+  |> mirror2d({ axis: 'Y' }, %)
 
 example = extrude(10, sketch001)
 ```
@@ -54,7 +54,7 @@ sketch001 = startSketchOn('XZ')
   |> startProfileAt([0, 8.5], %)
   |> line([20, -8.5], %)
   |> line([-20, -8.5], %)
-  |> mirror2d({ axis = 'Y' }, %)
+  |> mirror2d({ axis: 'Y' }, %)
 
 example = extrude(10, sketch001)
 ```
@@ -71,7 +71,7 @@ sketch001 = startSketchOn('XZ')
   |> startProfileAt([0, 8.5], %)
   |> line([20, -8.5], %)
   |> line([-20, -8.5], %)
-  |> mirror2d({ axis = edge001 }, %)
+  |> mirror2d({ axis: edge001 }, %)
 
 example = extrude(10, sketch001)
 ```
@@ -85,11 +85,8 @@ sketch001 = startSketchOn('XZ')
   |> line([20, -8.5], %)
   |> line([-20, -8.5], %)
   |> mirror2d({
-       axis = {
-         custom = {
-           axis = [0.0, 1.0],
-           origin = [0.0, 0.0]
-         }
+       axis: {
+         custom: { axis: [0.0, 1.0], origin: [0.0, 0.0] }
        }
      }, %)
 

docs/kcl/modules.md

@@ -1,59 +0,0 @@
----
-title: "KCL Modules"
-excerpt: "Documentation of modules for the KCL language for the Zoo Modeling App."
-layout: manual
----
-
-`KCL` allows splitting code up into multiple files.  Each file is somewhat
-isolated from other files as a separate module.
-
-When you define a function, you can use `export` before it to make it available
-to other modules.
-
-```
-// util.kcl
-export fn increment = (x) => {
-  return x + 1
-}
-```
-
-Other files in the project can now import functions that have been exported.
-This makes them available to use in another file.
-
-```
-// main.kcl
-import increment from "util.kcl"
-
-answer = increment(41)
-```
-
-Imported files _must_ be in the same project so that units are uniform across
-modules. This means that it must be in the same directory.
-
-Import statements must be at the top-level of a file. It is not allowed to have
-an `import` statement inside a function or in the body of an if-else.
-
-Multiple functions can be exported in a file.
-
-```
-// util.kcl
-export fn increment = (x) => {
-  return x + 1
-}
-
-export fn decrement = (x) => {
-  return x - 1
-}
-```
-
-When importing, you can import multiple functions at once.
-
-```
-import increment, decrement from "util.kcl"
-```
-
-Imported symbols can be renamed for convenience or to avoid name collisions.
-
-```
-import increment as inc, decrement as dec from "util.kcl"
-```

docs/kcl/patternCircular2d.md

@@ -35,10 +35,10 @@ exampleSketch = startSketchOn('XZ')
   |> line([0, -5], %)
   |> close(%)
   |> patternCircular2d({
-       center = [0, 0],
-       instances = 13,
-       arcDegrees = 360,
-       rotateDuplicates = true
+       center: [0, 0],
+       repetitions: 12,
+       arcDegrees: 360,
+       rotateDuplicates: true
      }, %)
 
 example = extrude(1, exampleSketch)

docs/kcl/patternCircular3d.md

@@ -29,15 +29,15 @@ patternCircular3d(data: CircularPattern3dData, solid_set: SolidSet) -> [Solid]
 
 ```js
 exampleSketch = startSketchOn('XZ')
-  |> circle({ center = [0, 0], radius = 1 }, %)
+  |> circle({ center: [0, 0], radius: 1 }, %)
 
 example = extrude(-5, exampleSketch)
   |> patternCircular3d({
-       axis = [1, -1, 0],
-       center = [10, -20, 0],
-       instances = 11,
-       arcDegrees = 360,
-       rotateDuplicates = true
+       axis: [1, -1, 0],
+       center: [10, -20, 0],
+       repetitions: 10,
+       arcDegrees: 360,
+       rotateDuplicates: true
      }, %)
 ```
 

docs/kcl/patternLinear2d.md

@@ -29,11 +29,11 @@ patternLinear2d(data: LinearPattern2dData, sketch_set: SketchSet) -> [Sketch]
 
 ```js
 exampleSketch = startSketchOn('XZ')
-  |> circle({ center = [0, 0], radius = 1 }, %)
+  |> circle({ center: [0, 0], radius: 1 }, %)
   |> patternLinear2d({
-       axis = [1, 0],
-       instances = 7,
-       distance = 4
+       axis: [1, 0],
+       repetitions: 6,
+       distance: 4
      }, %)
 
 example = extrude(1, exampleSketch)

docs/kcl/patternLinear3d.md

@@ -37,9 +37,9 @@ exampleSketch = startSketchOn('XZ')
 
 example = extrude(1, exampleSketch)
   |> patternLinear3d({
-       axis = [1, 0, 1],
-       instances = 7,
-       distance = 6
+       axis: [1, 0, 1],
+       repetitions: 6,
+       distance: 6
      }, %)
 ```
 

docs/kcl/pi.md

@@ -30,8 +30,8 @@ circumference = 70
 
 exampleSketch = startSketchOn("XZ")
   |> circle({
-       center = [0, 0],
-       radius = circumference / (2 * pi())
+       center: [0, 0],
+       radius: circumference / (2 * pi())
      }, %)
 
 example = extrude(5, exampleSketch)

docs/kcl/polar.md

@@ -29,7 +29,7 @@ polar(data: PolarCoordsData) -> [number]
 ```js
 exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
-  |> line(polar({ angle = 30, length = 5 }), %, $thing)
+  |> line(polar({ angle: 30, length: 5 }), %, $thing)
   |> line([0, 5], %)
   |> line([segEndX(thing), 0], %)
   |> line([-20, 10], %)

docs/kcl/pow.md

@@ -34,7 +34,7 @@ pow(num: number, pow: number) -> number
 ```js
 exampleSketch = startSketchOn("XZ")
   |> startProfileAt([0, 0], %)
-  |> angledLine({ angle = 50, length = pow(5, 2) }, %)
+  |> angledLine({ angle: 50, length: pow(5, 2) }, %)
   |> yLineTo(0, %)
   |> close(%)
 

docs/kcl/profileStart.md

@@ -29,10 +29,10 @@ profileStart(sketch: Sketch) -> [number]
 ```js
 sketch001 = startSketchOn('XY')
   |> startProfileAt([5, 2], %)
-  |> angledLine({ angle = 120, length = 50 }, %, $seg01)
+  |> angledLine({ angle: 120, length: 50 }, %, $seg01)
   |> angledLine({
-       angle = segAng(seg01) + 120,
-       length = 50
+       angle: segAng(seg01) + 120,
+       length: 50
      }, %)
   |> lineTo(profileStart(%), %)
   |> close(%)

docs/kcl/segLen.md

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

docs/kcl/sin.md

@@ -34,8 +34,8 @@ sin(num: number) -> number
 exampleSketch = startSketchOn("XZ")
   |> startProfileAt([0, 0], %)
   |> angledLine({
-       angle = 50,
-       length = 15 / sin(toDegrees(135))
+       angle: 50,
+       length: 15 / sin(toDegrees(135))
      }, %)
   |> yLineTo(0, %)
   |> close(%)

docs/kcl/sqrt.md

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

docs/kcl/startSketchOn.md

@@ -101,7 +101,7 @@ exampleSketch = startSketchOn('XY')
   |> line([-2, 0], %)
   |> close(%)
 
-example = revolve({ axis = 'y', angle = 180 }, exampleSketch)
+example = revolve({ axis: 'y', angle: 180 }, exampleSketch)
 
 exampleSketch002 = startSketchOn(example, 'end')
   |> startProfileAt([4.5, -5], %)
@@ -117,11 +117,11 @@ example002 = extrude(5, exampleSketch002)
 
 ```js
 a1 = startSketchOn({
-       plane = {
-         origin = { x = 0, y = 0, z = 0 },
-         xAxis = { x = 1, y = 0, z = 0 },
-         yAxis = { x = 0, y = 1, z = 0 },
-         zAxis = { x = 0, y = 0, z = 1 }
+       plane: {
+         origin: { x: 0, y: 0, z: 0 },
+         xAxis: { x: 1, y: 0, z: 0 },
+         yAxis: { x: 0, y: 1, z: 0 },
+         zAxis: { x: 0, y: 0, z: 1 }
        }
      })
   |> startProfileAt([0, 0], %)

docs/kcl/tan.md

@@ -33,7 +33,7 @@ tan(num: number) -> number
 ```js
 exampleSketch = startSketchOn("XZ")
   |> startProfileAt([0, 0], %)
-  |> angledLine({ angle = 50, length = 50 * tan(1 / 2) }, %)
+  |> angledLine({ angle: 50, length: 50 * tan(1 / 2) }, %)
   |> yLineTo(0, %)
   |> close(%)
 

docs/kcl/tangentialArc.md

@@ -31,9 +31,9 @@ tangentialArc(data: TangentialArcData, sketch: Sketch, tag?: TagDeclarator) -> S
 ```js
 exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
-  |> angledLine({ angle = 60, length = 10 }, %)
-  |> tangentialArc({ radius = 10, offset = -120 }, %)
-  |> angledLine({ angle = -60, length = 10 }, %)
+  |> angledLine({ angle: 60, length: 10 }, %)
+  |> tangentialArc({ radius: 10, offset: -120 }, %)
+  |> angledLine({ angle: -60, length: 10 }, %)
   |> close(%)
 
 example = extrude(10, exampleSketch)

docs/kcl/tangentialArcTo.md

@@ -31,7 +31,7 @@ tangentialArcTo(to: [number], sketch: Sketch, tag?: TagDeclarator) -> Sketch
 ```js
 exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
-  |> angledLine({ angle = 60, length = 10 }, %)
+  |> angledLine({ angle: 60, length: 10 }, %)
   |> tangentialArcTo([15, 15], %)
   |> line([10, -15], %)
   |> close(%)

docs/kcl/tangentialArcToRelative.md

@@ -31,7 +31,7 @@ tangentialArcToRelative(delta: [number], sketch: Sketch, tag?: TagDeclarator) ->
 ```js
 exampleSketch = startSketchOn('XZ')
   |> startProfileAt([0, 0], %)
-  |> angledLine({ angle = 45, length = 10 }, %)
+  |> angledLine({ angle: 45, length: 10 }, %)
   |> tangentialArcToRelative([0, -10], %)
   |> line([-10, 0], %)
   |> close(%)

docs/kcl/tau.md

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

docs/kcl/toDegrees.md

@@ -34,8 +34,8 @@ toDegrees(num: number) -> number
 exampleSketch = startSketchOn("XZ")
   |> startProfileAt([0, 0], %)
   |> angledLine({
-       angle = 50,
-       length = 70 * cos(toDegrees(pi() / 4))
+       angle: 50,
+       length: 70 * cos(toDegrees(pi() / 4))
      }, %)
   |> yLineTo(0, %)
   |> close(%)

docs/kcl/toRadians.md

@@ -34,8 +34,8 @@ toRadians(num: number) -> number
 exampleSketch = startSketchOn("XZ")
   |> startProfileAt([0, 0], %)
   |> angledLine({
-       angle = 50,
-       length = 70 * cos(toRadians(45))
+       angle: 50,
+       length: 70 * cos(toRadians(45))
      }, %)
   |> yLineTo(0, %)
   |> close(%)

docs/kcl/types.md

@@ -41,7 +41,7 @@ If you want to get a value from an array you can use the index like so:
 An object is defined with `{}` braces. Here is an example object:
 
 ```
-myObj = { a = 0, b = "thing" }
+myObj = {a: 0, b: "thing"}
 ```
 
 We support two different ways of getting properties from objects, you can call
@@ -90,12 +90,12 @@ startSketchOn('XZ')
   |> startProfileAt(origin, %)
   |> angledLine([0, 191.26], %, $rectangleSegmentA001)
   |> angledLine([
-       segAng(rectangleSegmentA001) - 90,
+       segAng(rectangleSegmentA001, %) - 90,
        196.99
      ], %, $rectangleSegmentB001)
   |> angledLine([
-       segAng(rectangleSegmentA001),
-       -segLen(rectangleSegmentA001)
+       segAng(rectangleSegmentA001, %),
+       -segLen(rectangleSegmentA001, %)
      ], %, $rectangleSegmentC001)
   |> lineTo([profileStartX(%), profileStartY(%)], %)
   |> close(%)
@@ -120,18 +120,18 @@ However if the code was written like this:
 ```
 fn rect = (origin) => {
   return startSketchOn('XZ')
-    |> startProfileAt(origin, %)
-    |> angledLine([0, 191.26], %, $rectangleSegmentA001)
-    |> angledLine([
-         segAng(rectangleSegmentA001) - 90,
-         196.99
-       ], %, $rectangleSegmentB001)
-    |> angledLine([
-         segAng(rectangleSegmentA001),
-         -segLen(rectangleSegmentA001)
-       ], %, $rectangleSegmentC001)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)
+  |> startProfileAt(origin, %)
+  |> angledLine([0, 191.26], %, $rectangleSegmentA001)
+  |> angledLine([
+       segAng(rectangleSegmentA001, %) - 90,
+       196.99
+     ], %, $rectangleSegmentB001)
+  |> angledLine([
+       segAng(rectangleSegmentA001, %),
+       -segLen(rectangleSegmentA001, %)
+     ], %, $rectangleSegmentC001)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
 }
 
 rect([0, 0])
@@ -148,29 +148,26 @@ For example the following code works.
 ```
 fn rect = (origin) => {
   return startSketchOn('XZ')
-    |> startProfileAt(origin, %)
-    |> angledLine([0, 191.26], %, $rectangleSegmentA001)
-    |> angledLine([
-         segAng(rectangleSegmentA001) - 90,
-         196.99
-       ], %, $rectangleSegmentB001)
-    |> angledLine([
-         segAng(rectangleSegmentA001),
-         -segLen(rectangleSegmentA001)
-       ], %, $rectangleSegmentC001)
-    |> lineTo([profileStartX(%), profileStartY(%)], %)
-    |> close(%)
+  |> startProfileAt(origin, %)
+  |> angledLine([0, 191.26], %, $rectangleSegmentA001)
+  |> angledLine([
+       segAng(rectangleSegmentA001, %) - 90,
+       196.99
+     ], %, $rectangleSegmentB001)
+  |> angledLine([
+       segAng(rectangleSegmentA001, %),
+       -segLen(rectangleSegmentA001, %)
+     ], %, $rectangleSegmentC001)
+  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  |> close(%)
 }
 
 rect([0, 0])
 myRect = rect([20, 0])
 
-myRect
+myRect 
   |> extrude(10, %)
-  |> fillet({
-       radius = 0.5,
-       tags = [myRect.tags.rectangleSegmentA001]
-     }, %)
+  |> fillet({radius: 0.5, tags: [myRect.tags.rectangleSegmentA001]}, %)
 ```
 
 See how we use the tag `rectangleSegmentA001` in the `fillet` function outside

docs/kcl/types/ArcToData.md

@@ -1,22 +0,0 @@
----
-title: "ArcToData"
-excerpt: "Data to draw a three point arc (arcTo)."
-layout: manual
----
-
-Data to draw a three point arc (arcTo).
-
-**Type:** `object`
-
-
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `end` |`[number, number]`| End point of the arc. A point in 3D space | No |
-| `interior` |`[number, number]`| Interior point of the arc. A point in 3D space | No |
-
-

docs/kcl/types/BinaryOperator.md

@@ -0,0 +1,89 @@
+---
+title: "BinaryOperator"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+**This schema accepts exactly one of the following:**
+
+Add two numbers.
+
+**enum:** `+`
+
+
+
+
+
+
+
+
+----
+Subtract two numbers.
+
+**enum:** `-`
+
+
+
+
+
+
+
+
+----
+Multiply two numbers.
+
+**enum:** `*`
+
+
+
+
+
+
+
+
+----
+Divide two numbers.
+
+**enum:** `/`
+
+
+
+
+
+
+
+
+----
+Modulo two numbers.
+
+**enum:** `%`
+
+
+
+
+
+
+
+
+----
+Raise a number to a power.
+
+**enum:** `^`
+
+
+
+
+
+
+
+
+----
+
+
+
+

docs/kcl/types/BinaryPart.md

@@ -0,0 +1,161 @@
+---
+title: "BinaryPart"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+**This schema accepts exactly one of the following:**
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `Literal`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `value` |[`LiteralValue`](/docs/kcl/types/LiteralValue)|  | No |
+| `raw` |`string`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: [`Identifier`](/docs/kcl/types/Identifier)|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `name` |`string`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `BinaryExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `operator` |[`BinaryOperator`](/docs/kcl/types/BinaryOperator)|  | No |
+| `left` |[`BinaryPart`](/docs/kcl/types/BinaryPart)|  | No |
+| `right` |[`BinaryPart`](/docs/kcl/types/BinaryPart)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `CallExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `callee` |[`Identifier`](/docs/kcl/types/Identifier)|  | No |
+| `arguments` |`[` [`Expr`](/docs/kcl/types/Expr) `]`|  | No |
+| `optional` |`boolean`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `UnaryExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `operator` |[`UnaryOperator`](/docs/kcl/types/UnaryOperator)|  | No |
+| `argument` |[`BinaryPart`](/docs/kcl/types/BinaryPart)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `MemberExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `object` |[`MemberObject`](/docs/kcl/types/MemberObject)|  | No |
+| `property` |[`LiteralIdentifier`](/docs/kcl/types/LiteralIdentifier)|  | No |
+| `computed` |`boolean`|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `IfExpression`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `cond` |[`Expr`](/docs/kcl/types/Expr)|  | No |
+| `then_val` |[`Program`](/docs/kcl/types/Program)|  | No |
+| `else_ifs` |`[` [`ElseIf`](/docs/kcl/types/ElseIf) `]`|  | No |
+| `final_else` |[`Program`](/docs/kcl/types/Program)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+
+
+----
+
+
+
+

docs/kcl/types/BodyItem.md

@@ -0,0 +1,75 @@
+---
+title: "BodyItem"
+excerpt: ""
+layout: manual
+---
+
+
+
+
+
+
+**This schema accepts exactly one of the following:**
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `ExpressionStatement`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `expression` |[`Expr`](/docs/kcl/types/Expr)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `VariableDeclaration`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `declarations` |`[` [`VariableDeclarator`](/docs/kcl/types/VariableDeclarator) `]`|  | No |
+| `kind` |[`VariableKind`](/docs/kcl/types/VariableKind)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+
+
+----
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `type` |enum: `ReturnStatement`|  | No |
+| `start` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `end` |[`EnvironmentRef`](/docs/kcl/types/EnvironmentRef)|  | No |
+| `argument` |[`Expr`](/docs/kcl/types/Expr)|  | No |
+| `digest` |`[, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`, `integer`]`|  | No |
+
+
+----
+
+
+
+

docs/kcl/types/CircularPattern2dData.md

@@ -16,7 +16,7 @@ Data for a circular pattern on a 2D sketch.
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `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. | No |
+| `repetitions` |[`Uint`](/docs/kcl/types/Uint)| The number of repetitions. Must be greater than 0. This excludes the original entity. For example, if `repetitions` is 1, the original entity will be copied once. | No |
 | `center` |`[number, number]`| The center about which to make the pattern. This is a 2D vector. | No |
 | `arcDegrees` |`number`| The arc angle (in degrees) to place the repetitions. Must be greater than 0. | No |
 | `rotateDuplicates` |`boolean`| Whether or not to rotate the duplicates as they are copied. | No |

docs/kcl/types/CircularPattern3dData.md

@@ -16,7 +16,7 @@ Data for a circular pattern on a 3D model.
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `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. | No |
+| `repetitions` |[`Uint`](/docs/kcl/types/Uint)| The number of repetitions. Must be greater than 0. This excludes the original entity. For example, if `repetitions` is 1, the original entity will be copied once. | No |
 | `axis` |`[number, number, number]`| The axis around which to make the pattern. This is a 3D vector. | No |
 | `center` |`[number, number, number]`| The center about which to make the pattern. This is a 3D vector. | No |
 | `arcDegrees` |`number`| The arc angle (in degrees) to place the repetitions. Must be greater than 0. | No |