WIP: Start using the recursion crate

.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
+skip: **/target,node_modules,build,**/Cargo.lock,./docs/kcl/*.md,./src-tauri/gen/schemas,.yarn.lock,**/yarn.lock

.env.development

@@ -2,9 +2,7 @@ NODE_ENV=development
 DEV=true
 VITE_KC_API_WS_MODELING_URL=wss://api.dev.zoo.dev/ws/modeling/commands
 VITE_KC_API_BASE_URL=https://api.dev.zoo.dev
-BASE_URL=https://api.dev.zoo.dev
 VITE_KC_SITE_BASE_URL=https://dev.zoo.dev
 VITE_KC_SKIP_AUTH=false
 VITE_KC_CONNECTION_TIMEOUT_MS=5000
-# ONLY add your token in .env.development.local if you want to skip auth, otherwise this token takes precedence!
-#VITE_KC_DEV_TOKEN="your token from dev.zoo.dev should go in .env.development.local"
+VITE_KC_DEV_TOKEN="your token from dev.zoo.dev should go in .env.development.local"

.eslintignore

@@ -1,3 +1,2 @@
 src/wasm-lib/*
 *.typegen.ts
-packages/codemirror-lsp-client/dist/*

.eslintrc

@@ -13,8 +13,6 @@
       "plugin:css-modules/recommended"
     ],
     "rules": {
-      "@typescript-eslint/no-floating-promises": "error",
-      "@typescript-eslint/no-misused-promises": "error",
       "semi": [
         "error",
         "never"
@@ -26,9 +24,8 @@
       {
         "files": ["e2e/**/*.ts"], // Update the pattern based on your file structure
         "rules": {
-          "suggest-no-throw/suggest-no-throw": "off",
-          "testing-library/prefer-screen-queries": "off",
-          "jest/valid-expect": "off"
+          "@typescript-eslint/no-floating-promises": "warn",
+          "testing-library/prefer-screen-queries": "off"
         }
       },
       {

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

@@ -1,59 +0,0 @@
-# bash strict mode
-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
-        yarn test:playwright:browser:chrome:ubuntu -- --shard=$1/$2 || true
-    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."
-        exit 1
-    fi
-    # # send to axiom
-    node playwrightProcess.mjs | tee /tmp/github-actions.log > /dev/null 2>&1
-fi
-
-retry=1
-max_retrys=4
-
-# retry failed tests, doing our own retries because using inbuilt playwright retries causes connection issues
-while [[ $retry -le $max_retrys ]]; do
-    if [[ -f "test-results/.last-run.json" ]]; then
-        failed_tests=$(jq '.failedTests | length' test-results/.last-run.json)
-        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
-                yarn test:playwright:browser:chrome:ubuntu -- --last-failed || true
-            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."
-                exit 1
-            fi
-            # send to axiom
-            node playwrightProcess.mjs | tee /tmp/github-actions.log > /dev/null 2>&1
-            retry=$((retry + 1))
-        else
-            echo "retried=false" >>$GITHUB_OUTPUT
-            exit 0
-        fi
-    else
-        echo "retried=false" >>$GITHUB_OUTPUT
-        exit 0
-    fi
-done
-
-echo "retried=false" >>$GITHUB_OUTPUT
-
-if [[ -f "test-results/.last-run.json" ]]; then
-    failed_tests=$(jq '.failedTests | length' test-results/.last-run.json)
-    if [[ $failed_tests -gt 0 ]]; then
-        # if it still fails after 3 retrys, then fail the job
-        exit 1
-    fi
-fi
-exit 0

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

@@ -1,63 +0,0 @@
-# bash strict mode
-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
-            xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu || true
-        elif [[ "$1" == "windows-latest" ]]; then
-            yarn test:playwright:electron:windows || true
-        elif [[ "$1" == "macos-14" ]]; then
-            yarn test:playwright:electron:macos || true
-        else
-            echo "Do not run playwright. Unable to detect os runtime."
-            exit 1
-        fi
-        # # send to axiom
-        node playwrightProcess.mjs | tee /tmp/github-actions.log > /dev/null 2>&1
-fi
-
-retry=1
-max_retrys=4
-
-# retry failed tests, doing our own retries because using inbuilt playwright retries causes connection issues
-while [[ $retry -le $max_retrys ]]; do
-    if [[ -f "test-results/.last-run.json" ]]; then
-        failed_tests=$(jq '.failedTests | length' test-results/.last-run.json)
-        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
-                xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test:playwright:electron:ubuntu -- --last-failed || true
-            elif [[ "$1" == "windows-latest" ]]; then
-                yarn test:playwright:electron:windows -- --last-failed || true
-            elif [[ "$1" == "macos-14" ]]; then
-                yarn test:playwright:electron:macos -- --last-failed || true
-            else
-                echo "Do not run playwright. Unable to detect os runtime."
-                exit 1
-            fi
-            # send to axiom
-            node playwrightProcess.mjs | tee /tmp/github-actions.log > /dev/null 2>&1
-            retry=$((retry + 1))
-        else
-            echo "retried=false" >>$GITHUB_OUTPUT
-            exit 0
-        fi
-    else
-        echo "retried=false" >>$GITHUB_OUTPUT
-        exit 0
-    fi
-done
-
-echo "retried=false" >>$GITHUB_OUTPUT
-
-if [[ -f "test-results/.last-run.json" ]]; then
-    failed_tests=$(jq '.failedTests | length' test-results/.last-run.json)
-    if [[ $failed_tests -gt 0 ]]; then
-        # if it still fails after 3 retrys, then fail the job
-        exit 1
-    fi
-fi
-exit 0

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

@@ -1,4 +1,4 @@
-name: build-publish-apps
+name: build-test-publish-apps
 
 on:
   pull_request:
@@ -21,7 +21,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  prepare-files:
+  prepare-json-files:
     runs-on: ubuntu-22.04  # seperate job on Ubuntu for easy string manipulations (compared to Windows)
     outputs:
       version: ${{ steps.export_version.outputs.version }}
@@ -33,101 +33,45 @@ jobs:
           node-version-file: '.nvmrc'
           cache: 'yarn'
 
-      - run: yarn install
-
-      - name: Setup Rust
-        uses: dtolnay/rust-toolchain@stable
-
-      - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: './src/wasm-lib'
-
-      # TODO: see if we can fetch from main instead if no diff at src/wasm-lib
-      - name: Run build:wasm
-        run: "yarn build:wasm"
-
       - name: Set nightly version
         if: github.event_name == 'schedule'
         run: |
           VERSION=$(date +'%-y.%-m.%-d') yarn bump-jsons
 
+      # TODO: see if we need to inject updater nightly URL here https://dl.zoo.dev/releases/modeling-app/nightly/last_update.json
+      # TODO: see if we ned to add updater test URL here https://dl.zoo.dev/releases/modeling-app/updater-test/last_update.json
+
       - uses: actions/upload-artifact@v3
+        if: ${{ github.event_name == 'schedule' || env.CUT_RELEASE_PR == 'true' }}
         with:
-          name: prepared-files
           path: |
             package.json
-            src/wasm-lib/pkg/wasm_lib*
 
       - id: export_version
         run: echo "version=`cat package.json | jq -r '.version'`" >> "$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.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@v3
-        if: ${{ env.CUT_RELEASE_PR == 'true' }}
-        with:
-          name: prepared-files-updater-test
-          path: |
-            electron-builder.yml
-
-
-  build-apps:
-    needs: [prepare-files]
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-14, windows-2022, ubuntu-22.04]
-    runs-on: ${{ matrix.os }}
+  build-test-app-macos:
+    needs: [prepare-json-files]
+    runs-on: macos-14
     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
+      APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+      APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+      APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/download-artifact@v3
-        name: prepared-files
+        if: github.event_name == 'schedule'
 
-      - name: Copy prepared files
+      - name: Copy updated .json files
+        if: github.event_name == 'schedule'
         run: |
-          ls -R prepared-files
-          cp prepared-files/package.json package.json
-          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
-
-      - 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
+          ls -l artifact
+          cp artifact/package.json package.json
 
       - name: Sync node version and setup cache
         uses: actions/setup-node@v4
@@ -137,10 +81,79 @@ jobs:
 
       - run: yarn install
 
-      - run: yarn tronb:vite
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: './src/wasm-lib'
+
+      - name: Run build:wasm
+        run: "yarn build:wasm${{ env.BUILD_RELEASE == 'true' && '-dev' || ''}}"
+
+      # TODO: sign the app (and updater bundle potentially)
+      - name: Add signing certificate
+        if: ${{ env.BUILD_RELEASE == 'true' }}
+        run: chmod +x add-osx-cert.sh && ./add-osx-cert.sh
+
+      - name: Build the app for arm64
+        run: "yarn electron-forge make"
+
+      - name: Build the app for x64
+        run: "yarn electron-forge make --arch x64"
+
+      - name: List artifacts
+        run: "ls -R out/make"
+
+      # TODO: add the 'Build for Mac TestFlight (nightly)' stage back
+
+      - uses: actions/upload-artifact@v3
+        with:
+          path: "out/make/*/*/*/*"
+
+
+  build-test-app-windows:
+    needs: [prepare-json-files]
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/download-artifact@v3
+
+      - name: Copy updated .json files
+        if: github.event_name == 'schedule'
+        run: |
+          ls -l artifact
+          cp artifact/package.json package.json
+
+      - 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.
+
+      - run: yarn install
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: './src/wasm-lib'
+
+      - name: Run build:wasm manually
+        shell: bash
+        env:
+          MODE: ${{ env.BUILD_RELEASE == 'true' && '--release' || '--debug' }}
+        run: |
+          mkdir src/wasm-lib/pkg; cd src/wasm-lib
+          echo "building with ${{ env.MODE }}"
+          npx wasm-pack build --target web --out-dir pkg ${{ env.MODE }}
+          cd ../../
+          cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
 
       - name: Prepare certificate and variables (Windows only)
-        if: ${{ env.BUILD_RELEASE == 'true' && matrix.os == 'windows-2022' }}
+        if: ${{ env.BUILD_RELEASE == 'true' }}
         run: |
           echo "${{secrets.SM_CLIENT_CERT_FILE_B64 }}" | base64 --decode > /d/Certificate_pkcs12.p12
           cat /d/Certificate_pkcs12.p12
@@ -155,7 +168,7 @@ jobs:
         shell: bash
 
       - name: Setup certicate with SSM KSP (Windows only)
-        if: ${{ env.BUILD_RELEASE == 'true' && matrix.os == 'windows-2022' }}
+        if: ${{ env.BUILD_RELEASE == 'true' }}
         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
@@ -165,54 +178,83 @@ jobs:
           smksp_cert_sync.exe
         shell: cmd
 
-      - name: Build the app
-        run: yarn electron-builder --config ${{ env.BUILD_RELEASE && '--publish always' || '' }}
+      - name: Build the app for x64
+        run: "yarn electron-forge make --arch x64"
 
-      - name: List artifacts in out/
-        run: ls -R out
+      - name: Build the app for arm64
+        run: "yarn electron-forge make --arch arm64"
+
+      - name: List artifacts
+        run: "ls -R out/make"
+
+      - name: Sign using Signtool
+        if: ${{ env.BUILD_RELEASE == 'true' }}
+        env:
+          THUMBPRINT: "F4C9A52FF7BC26EE5E054946F6B11DEEA94C748D"
+          X64_FILE: "D:\\a\\modeling-app\\modeling-app\\out\\make\\squirrel.windows\\x64\\Zoo Modeling App-*Setup.exe"
+          ARM64_FILE: "D:\\a\\modeling-app\\modeling-app\\out\\make\\squirrel.windows\\arm64\\Zoo Modeling App-*Setup.exe"
+        run: |
+          signtool.exe sign /sha1 ${{ env.THUMBPRINT }} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 "${{ env.X64_FILE }}"
+          signtool.exe verify /v /pa "${{ env.X64_FILE }}"
+          signtool.exe sign /sha1 ${{ env.THUMBPRINT }} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 "${{ env.ARM64_FILE }}"
+          signtool.exe verify /v /pa "${{ env.ARM64_FILE }}"
 
       - uses: actions/upload-artifact@v3
         with:
-          name: out-arm64-${{ matrix.os }}
-          path: |
-            out/Zoo*arm64*.*
-            out/latest*.yml
+          path: "out/make/*/*/*"
 
-      - uses: actions/upload-artifact@v3
+      # TODO: Run e2e tests
+
+
+  build-test-app-ubuntu:
+    needs: [prepare-json-files]
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/download-artifact@v3
+        if: github.event_name == 'schedule'
+
+      - name: Copy updated .json files
+        if: github.event_name == 'schedule'
+        run: |
+          ls -l artifact
+          cp artifact/package.json package.json
+
+      - name: Sync node version and setup cache
+        uses: actions/setup-node@v4
         with:
-          name: out-x64-${{ matrix.os }}
-          path: |
-            out/Zoo*x*64*.*
+          node-version-file: '.nvmrc'
+          cache: 'yarn' # Set this to npm, yarn or pnpm.
+
+      - run: yarn install
+
+      - name: Setup Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: './src/wasm-lib'
+
+      - name: Run build:wasm
+        run: "yarn build:wasm${{ env.BUILD_RELEASE == 'true' && '-dev' || ''}}"
+
+      - name: Build the app for arm64
+        run: "yarn electron-forge make --arch arm64"
+
+      - name: Build the app for x64
+        run: "yarn electron-forge make --arch x64"
+
+      - name: List artifacts
+        run: "ls -R out/make"
 
       # TODO: add the 'Build for Mac TestFlight (nightly)' stage back
 
-      - 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.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.CUT_RELEASE_PR == 'true' }}
-        run: yarn electron-builder --config ${{ env.BUILD_RELEASE && '--publish always' || '' }}
+      # TODO: sign the app (and updater bundle potentially)
 
       - uses: actions/upload-artifact@v3
-        if: ${{ env.CUT_RELEASE_PR == 'true' }}
         with:
-          name: updater-test-arm64-${{ matrix.os }}
-          path: |
-            out/Zoo*arm64*.*
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ env.CUT_RELEASE_PR == 'true' }}
-        with:
-          name: updater-test-x64-${{ matrix.os }}
-          path: |
-            out/Zoo*x64*.*
+          path: "out/make/*/*/*"
 
 
   publish-apps-release:
@@ -220,119 +262,114 @@ jobs:
     permissions:
       contents: write
     if: ${{ github.event_name == 'release' || github.event_name == 'schedule' }}
-    needs: [prepare-files, build-apps]
+    needs: [prepare-json-files, build-test-app-macos, build-test-app-windows, build-test-app-ubuntu]
     env:
-      VERSION_NO_V: ${{ needs.prepare-files.outputs.version }}
-      VERSION: ${{ github.event_name == 'schedule' && needs.prepare-files.outputs.version || format('v{0}', needs.prepare-files.outputs.version) }}
+      VERSION_NO_V: ${{ needs.prepare-json-files.outputs.version }}
+      VERSION: ${{ github.event_name == 'release' && format('v{0}', needs.prepare-json-files.outputs.version) || needs.prepare-json-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' }}
+      NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Nightly build, commit {0}', github.sha) }}
+      BUCKET_DIR: ${{ github.event_name == 'release' && 'dl.kittycad.io/releases/modeling-app' || 'dl.kittycad.io/releases/modeling-app/nightly' }}
+      WEBSITE_DIR: ${{ github.event_name == 'release' && 'dl.zoo.dev/releases/modeling-app' || 'dl.zoo.dev/releases/modeling-app/nightly' }}
       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@v3
-        with:
-          name: out-arm64-windows-2022
-          path: out
 
-      - uses: actions/download-artifact@v3
-        with:
-          name: out-x64-windows-2022
-          path: out
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: out-arm64-macos-14
-          path: out
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: out-x64-macos-14
-          path: out
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: out-arm64-ubuntu-22.04
-          path: out
-
-      - uses: actions/download-artifact@v3
-        with:
-          name: out-x64-ubuntu-22.04
-          path: out
-
-      - name: Generate the download static endpoint
+      - name: Generate the update static endpoint
         run: |
-          RELEASE_DIR=https://${WEBSITE_DIR}
+          ls -l artifact/*/*oo*
+          DARWIN_SIG=`cat artifact/macos/*.app.tar.gz.sig`
+          WINDOWS_X86_64_SIG=`cat artifact/msi/*x64*.msi.zip.sig`
+          WINDOWS_AARCH64_SIG=`cat artifact/msi/*arm64*.msi.zip.sig`
+          RELEASE_DIR=https://${WEBSITE_DIR}/${VERSION}
           jq --null-input \
             --arg version "${VERSION}" \
             --arg pub_date "${PUB_DATE}" \
             --arg notes "${NOTES}" \
-            --arg mac_arm64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-arm64-mac.dmg" \
-            --arg mac_x64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-x64-mac.dmg" \
-            --arg windows_arm64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-arm64-win.exe" \
-            --arg windows_x64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-x64-win.exe" \
-            --arg linux_arm64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-arm64-linux.AppImage" \
-            --arg linux_x64_url "$RELEASE_DIR/${{ env.URL_CODED_NAME }}-${VERSION_NO_V}-x86_64-linux.AppImage" \
+            --arg darwin_sig "$DARWIN_SIG" \
+            --arg darwin_url "$RELEASE_DIR/macos/${{ env.URL_CODED_NAME }}.app.tar.gz" \
+            --arg windows_x86_64_sig "$WINDOWS_X86_64_SIG" \
+            --arg windows_x86_64_url "$RELEASE_DIR/msi/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_x64_en-US.msi.zip" \
+            --arg windows_aarch64_sig "$WINDOWS_AARCH64_SIG" \
+            --arg windows_aarch64_url "$RELEASE_DIR/msi/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_arm64_en-US.msi.zip" \
             '{
               "version": $version,
               "pub_date": $pub_date,
               "notes": $notes,
               "platforms": {
-                "dmg-arm64": {
-                  "url": $mac_arm64_url
+                "darwin-x86_64": {
+                  "signature": $darwin_sig,
+                  "url": $darwin_url
                 },
-                "dmg-x64": {
-                  "url": $mac_x64_url
+                "darwin-aarch64": {
+                  "signature": $darwin_sig,
+                  "url": $darwin_url
                 },
-                "exe-arm64": {
-                  "url": $windows_arm64_url
+                "windows-x86_64": {
+                  "signature": $windows_x86_64_sig,
+                  "url": $windows_x86_64_url
                 },
-                "exe-x64": {
-                  "url": $windows_x64_url
+                "windows-aarch64": {
+                  "signature": $windows_aarch64_sig,
+                  "url": $windows_aarch64_url
+                }
+              }
+            }' > last_update.json
+            cat last_update.json
+
+      - name: Generate the download static endpoint
+        run: |
+          RELEASE_DIR=https://${WEBSITE_DIR}/${VERSION}
+          jq --null-input \
+            --arg version "${VERSION}" \
+            --arg pub_date "${PUB_DATE}" \
+            --arg notes "${NOTES}" \
+            --arg darwin_url "$RELEASE_DIR/dmg/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_universal.dmg" \
+            --arg windows_x86_64_url "$RELEASE_DIR/msi/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_x64_en-US.msi" \
+            --arg windows_aarch64_url "$RELEASE_DIR/msi/${{ env.URL_CODED_NAME }}_${VERSION_NO_V}_arm64_en-US.msi" \
+            '{
+              "version": $version,
+              "pub_date": $pub_date,
+              "notes": $notes,
+              "platforms": {
+                "dmg-universal": {
+                  "url": $darwin_url
                 },
-                "appimage-arm64": {
-                  "url": $linux_arm64_url
+                "msi-x86_64": {
+                  "url": $windows_x86_64_url
                 },
-                "appimage-x64": {
-                  "url": $linux_x64_url
+                "msi-aarch64": {
+                  "url": $windows_aarch64_url
                 }
               }
             }' > last_download.json
             cat last_download.json
 
-      - name: List artifacts
-        run: "ls -R out"
-
       - name: Authenticate to Google Cloud
-        uses: 'google-github-actions/auth@v2.1.6'
+        uses: 'google-github-actions/auth@v2.1.3'
         with:
           credentials_json: '${{ secrets.GOOGLE_CLOUD_DL_SA }}'
 
       - name: Set up Google Cloud SDK
         uses: google-github-actions/setup-gcloud@v2.1.0
         with:
-          project_id: ${{ env.GOOGLE_CLOUD_PROJECT_ID }}
+          project_id: kittycadapi
 
       - name: Upload release files to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.2.0
+        uses: google-github-actions/upload-cloud-storage@v2.1.0
         with:
-          path: out
-          glob: 'Zoo*'
+          path: artifact
+          glob: '*/Zoo*'
           parent: false
-          destination: ${{ env.BUCKET_DIR }}
+          destination: ${{ env.BUCKET_DIR }}/${{ env.VERSION }}
 
       - name: Upload update endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.2.0
+        uses: google-github-actions/upload-cloud-storage@v2.1.0
         with:
-          path: out
-          glob: 'latest*'
-          parent: false
+          path: last_update.json
           destination: ${{ env.BUCKET_DIR }}
 
       - name: Upload download endpoint to public bucket
-        uses: google-github-actions/upload-cloud-storage@v2.2.0
+        uses: google-github-actions/upload-cloud-storage@v2.1.0
         with:
           path: last_download.json
           destination: ${{ env.BUCKET_DIR }}
@@ -341,14 +378,7 @@ jobs:
         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
+          files: 'artifact/*/Zoo*'
 
   announce_release:
     needs: [publish-apps-release]

.github/workflows/build-test-web.yml

@@ -1,4 +1,4 @@
-name: Static Analysis
+name: build-test-web
 
 on:
   pull_request:
@@ -16,7 +16,7 @@ permissions:
   actions: read
 
 jobs:
-  yarn-fmt-check:
+  check-format:
     runs-on: 'ubuntu-22.04'
     steps:
       - uses: actions/checkout@v4
@@ -27,23 +27,7 @@ jobs:
       - run: yarn install
       - run: yarn fmt-check
 
-  yarn-build-wasm:
-    runs-on: ubuntu-22.04
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          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:
+  check-types:
     runs-on: ubuntu-22.04
 
     steps:
@@ -58,25 +42,11 @@ jobs:
           workspaces: './src/wasm-lib'
 
       - run: yarn build:wasm
+      - run: yarn xstate:typegen
       - run: yarn tsc
 
-  yarn-lint:
-    runs-on: ubuntu-22.04
 
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-      - run: yarn install
-      - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: './src/wasm-lib'
-
-      - run: yarn lint
-
-  python-codespell:
+  check-typos:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
@@ -90,7 +60,7 @@ jobs:
         run: codespell --config .codespellrc # Edit this file to tweak the typo list and other configuration.
 
 
-  yarn-unit-test:
+  build-test-web:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -108,7 +78,7 @@ jobs:
 
       - run: yarn build:wasm
 
-      - run: yarn simpleserver:bg
+      - run: yarn simpleserver:ci
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
 
       - name: Install Chromium Browser
@@ -117,7 +87,7 @@ jobs:
 
       - name: run unit tests
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
-        run: yarn test:unit
+        run: yarn test:nowatch
         env:
           VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
 

.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 --all --features disable-println --features pyo3 --features cli
+          cargo check --all --features disable-println --features pyo3

.github/workflows/cargo-clippy.yml

@@ -28,7 +28,6 @@ jobs:
         dir: ['src/wasm-lib']
     steps:
       - uses: actions/checkout@v4
-      - uses: taiki-e/install-action@just
       - name: Install latest rust
         uses: actions-rs/toolchain@v1
         with:
@@ -42,7 +41,7 @@ jobs:
       - name: Run clippy
         run: |
           cd "${{ matrix.dir }}"
-          just lint
+          cargo clippy --all --tests --benches -- -D warnings
       # If this fails, run "cargo check" to update Cargo.lock,
       # then add Cargo.lock to the PR.
       - name: Check Cargo.lock doesn't need updating

.github/workflows/cargo-test.yml

@@ -4,21 +4,17 @@ on:
       - main
     paths:
       - 'src/wasm-lib/**.rs'
-      - 'src/wasm-lib/**.hbs'
       - '**/Cargo.toml'
       - '**/Cargo.lock'
       - '**/rust-toolchain.toml'
-      - 'src/wasm-lib/**.kcl'
       - .github/workflows/cargo-test.yml
 
   pull_request:
     paths:
       - 'src/wasm-lib/**.rs'
-      - 'src/wasm-lib/**.hbs'
       - '**/Cargo.toml'
       - '**/Cargo.lock'
       - '**/rust-toolchain.toml'
-      - 'src/wasm-lib/**.kcl'
       - .github/workflows/cargo-test.yml
   workflow_dispatch:
 permissions: read-all
@@ -40,6 +36,11 @@ jobs:
         with:
           toolchain: stable
           override: true
+      - name: install dependencies
+        if: matrix.dir ==  'src-tauri'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf
       - name: Install vector
         run: |
           curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh

.github/workflows/generate-website-docs.yml

@@ -38,10 +38,8 @@ jobs:
           mkdir -p documentation/content/pages/docs/kcl/
           # cleanup old
           rm -rf documentation/content/pages/docs/kcl/*.md
-          rm -rf documentation/content/pages/docs/kcl/types
           # move new
           mv -f docs/kcl/*.md documentation/content/pages/docs/kcl/
-          mv -f docs/kcl/types documentation/content/pages/docs/kcl/
       - name: commit the changes in the docs repo
         shell: bash
         run: |

.github/workflows/label-issues.yml

@@ -1,31 +0,0 @@
-name: Label Issues
-
-on:
-  issues:
-    types: [opened]
-permissions:
-  issues: write
-jobs:
-  label:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check if issue opener is ZooSpiritWolf
-        id: check_opener
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const issueOpener = context.payload.issue.user.login;
-            return issueOpener === 'ZooSpiritWolf';
-
-      - name: Add labels
-        if: steps.check_opener.outputs.result == 'true'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            github.issues.addLabels({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.payload.issue.number,
-              labels: ['bug', 'regression', 'high-priority']
-            });

.github/workflows/playwright.yml

@@ -1,4 +1,4 @@
-name: E2E Tests
+name: Playwright Tests
 on:
   push:
     branches: [ main ]
@@ -33,9 +33,8 @@ jobs:
             rust:
               - 'src/wasm-lib/**'
 
-  browser:
-    timeout-minutes: ${{ matrix.os == 'macos-14' && 60 || 50 }}
-    name: playwright:browser:${{ matrix.os }} ${{ matrix.shardIndex }} ${{ matrix.shardTotal }}
+  playwright-chrome:
+    timeout-minutes: ${{ matrix.os == 'macos-14' && 60 || 40 }}
     strategy:
       fail-fast: false
       matrix:
@@ -140,9 +139,8 @@ jobs:
     - uses: actions/upload-artifact@v4
       if: ${{ !cancelled() && (success() || failure()) }}
       with:
-        name: playwright-report-${{ matrix.os }}-snapshot-${{ matrix.shardIndex }}-${{ github.sha }}
+        name: playwright-report-ubuntu-snapshot-${{ matrix.shardIndex }}-${{ github.sha }}
         path: playwright-report/
-        include-hidden-files: true
         retention-days: 30
         overwrite: true
     - name: Clean up test-results
@@ -176,25 +174,64 @@ jobs:
     - uses: actions/upload-artifact@v4
       if: steps.git-check.outputs.modified == 'true'
       with:
-        name: playwright-report-${{ matrix.os }}-${{ matrix.shardIndex }}-${{ github.sha }}
+        name: playwright-report-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }}
         path: playwright-report/
-        include-hidden-files: true
         retention-days: 30
     - uses: actions/download-artifact@v4
       if: ${{ !cancelled() && (success() || failure()) }}
       continue-on-error: true
       with:
-        name: test-results-${{ matrix.os }}-${{ matrix.shardIndex }}-${{ github.sha }}
+        name: test-results-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }}
         path: test-results/
     - name: Run playwright/chrome flow (with retries)
       id: retry
       if: ${{ !cancelled() && (success() || failure()) }}
       shell: bash
       run: |
-        .github/ci-cd-scripts/playwright-browser-chrome.sh ${{matrix.shardIndex}} ${{matrix.shardTotal}} ${{matrix.os}}
+        if [[ ! -f "test-results/.last-run.json" ]]; then
+            # if no last run artifact, than run plawright normally
+            echo "run playwright normally"
+            yarn playwright test --project="Google Chrome" --config=playwright.ci.config.ts --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --grep-invert="@snapshot|@electron" || true
+            # # send to axiom
+            node playwrightProcess.mjs | tee /tmp/github-actions.log > /dev/null 2>&1
+        fi
+
+        retry=1
+        max_retrys=4
+
+        # retry failed tests, doing our own retries because using inbuilt playwright retries causes connection issues
+        while [[ $retry -le $max_retrys ]]; do
+            if [[ -f "test-results/.last-run.json" ]]; then
+                failed_tests=$(jq '.failedTests | length' test-results/.last-run.json)
+                if [[ $failed_tests -gt 0 ]]; then
+                    echo "retried=true" >>$GITHUB_OUTPUT
+                    echo "run playwright with last failed tests and retry $retry"
+                    yarn playwright test --project="Google Chrome" --config=playwright.ci.config.ts --last-failed --grep-invert="@snapshot|@electron" || true
+                    # send to axiom
+                    node playwrightProcess.mjs | tee /tmp/github-actions.log > /dev/null 2>&1
+                    retry=$((retry + 1))
+                else
+                    echo "retried=false" >>$GITHUB_OUTPUT
+                    exit 0
+                fi
+            else
+                echo "retried=false" >>$GITHUB_OUTPUT
+                exit 0
+            fi
+        done
+
+        echo "retried=false" >>$GITHUB_OUTPUT
+
+        if [[ -f "test-results/.last-run.json" ]]; then
+            failed_tests=$(jq '.failedTests | length' test-results/.last-run.json)
+            if [[ $failed_tests -gt 0 ]]; then
+                # if it still fails after 3 retrys, then fail the job
+                exit 1
+            fi
+        fi
+        exit 0
       env:
         CI: true
-        FAIL_ON_CONSOLE_ERRORS: true
         NODE_ENV: development
         VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
         VITE_KC_SKIP_AUTH: true
@@ -207,28 +244,25 @@ jobs:
     - uses: actions/upload-artifact@v4
       if: always()
       with:
-        name: test-results-${{ matrix.os }}-${{ matrix.shardIndex }}-${{ github.sha }}
+        name: test-results-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }}
         path: test-results/
-        include-hidden-files: true
         retention-days: 30
         overwrite: true
     - uses: actions/upload-artifact@v4
       if: always()
       with:
-        name: playwright-report-${{ matrix.os }}-${{ matrix.shardIndex }}-${{ github.sha }}
+        name: playwright-report-ubuntu-${{ matrix.shardIndex }}-${{ github.sha }}
         path: playwright-report/
-        include-hidden-files: true
         retention-days: 30
         overwrite: true
 
 
-  electron:
-    name: playwright:electron:${{matrix.os}}
+  playwright-electron:
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-14]
-    timeout-minutes: 60
+    timeout-minutes: 30
     runs-on: ${{ matrix.os }}
     needs: check-rust-changes
     steps:
@@ -312,22 +346,70 @@ jobs:
       run: yarn build:wasm
     - name: build electron
       shell: bash
-      run: yarn tron:package
+      run: yarn electron:package
     - uses: actions/download-artifact@v4
       if: ${{ !cancelled() && (success() || failure()) }}
       continue-on-error: true
       with:
-        name: test-results-electron-${{ matrix.os }}-${{ github.sha }}
+        name: test-results-ubuntu-${{ github.sha }}
         path: test-results/
     - name: Run electron tests (with retries)
       id: retry
       if: ${{ !cancelled() && (success() || failure()) }}
       shell: bash
       run: |
-        .github/ci-cd-scripts/playwright-electron.sh ${{ matrix.os }}
+        if [[ ! -f "test-results/.last-run.json" ]]; then
+            # if no last run artifact, than run plawright normally
+            echo "run playwright normally"
+            if [[ "$IS_UBUNTU" == "true" ]]; then
+              xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn playwright test --config=playwright.electron.config.ts --grep=@electron || true
+            else
+              yarn playwright test --config=playwright.electron.config.ts --grep=@electron || true
+            fi
+            # # send to axiom
+            node playwrightProcess.mjs | tee /tmp/github-actions.log > /dev/null 2>&1
+        fi
+
+        retry=1
+        max_retrys=2
+
+        # retry failed tests, doing our own retries because using inbuilt playwright retries causes connection issues
+        while [[ $retry -le $max_retrys ]]; do
+            if [[ -f "test-results/.last-run.json" ]]; then
+                failed_tests=$(jq '.failedTests | length' test-results/.last-run.json)
+                if [[ $failed_tests -gt 0 ]]; then
+                    echo "retried=true" >>$GITHUB_OUTPUT
+                    echo "run playwright with last failed tests and retry $retry"
+                    if [[ "$IS_UBUNTU" == "true" ]]; then
+                      xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn playwright test --config=playwright.electron.config.ts --grep=@electron || true
+                    else
+                      yarn playwright test --config=playwright.electron.config.ts --grep=@electron || true
+                    fi
+                    # send to axiom
+                    node playwrightProcess.mjs | tee /tmp/github-actions.log > /dev/null 2>&1
+                    retry=$((retry + 1))
+                else
+                    echo "retried=false" >>$GITHUB_OUTPUT
+                    exit 0
+                fi
+            else
+                echo "retried=false" >>$GITHUB_OUTPUT
+                exit 0
+            fi
+        done
+
+        echo "retried=false" >>$GITHUB_OUTPUT
+
+        if [[ -f "test-results/.last-run.json" ]]; then
+            failed_tests=$(jq '.failedTests | length' test-results/.last-run.json)
+            if [[ $failed_tests -gt 0 ]]; then
+                # if it still fails after 3 retrys, then fail the job
+                exit 1
+            fi
+        fi
+        exit 0
       env:
         CI: true
-        FAIL_ON_CONSOLE_ERRORS: true
         NODE_ENV: development
         VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
         VITE_KC_SKIP_AUTH: true
@@ -341,16 +423,14 @@ jobs:
     - uses: actions/upload-artifact@v4
       if: ${{ !cancelled() && (success() || failure()) }}
       with:
-        name: test-results-electron-${{ matrix.os }}-${{ github.sha }}
+        name: test-results-electron-${{ github.sha }}
         path: test-results/
-        include-hidden-files: true
         retention-days: 30
         overwrite: true
     - uses: actions/upload-artifact@v4
       if: ${{ !cancelled() && (success() || failure()) }}
       with:
-        name: playwright-report-electron-${{ matrix.os }}-${{ github.sha }}
+        name: playwright-report-electron-${{ github.sha }}
         path: playwright-report/
-        include-hidden-files: true
         retention-days: 30
         overwrite: true

.gitignore

@@ -54,15 +54,19 @@ e2e/playwright/export-snapshots/*
 
 ## generated files
 src/**/*.typegen.ts
+src-tauri/gen
 
 src/wasm-lib/grackle/stdlib_cube_partial.json
 Mac_App_Distribution.provisionprofile
 
 *.tsbuildinfo
-src/wasm-lib/pkg
 
 venv
 .vite/
 
 # electron
 out/
+
+src-tauri/target
+electron-test-projects-dir
+electron-test-projects-dir-2

.prettierignore

@@ -5,7 +5,6 @@ coverage
 
 # Ignore Rust projects:
 *.rs
-*.hbs
 target
 src/wasm-lib/pkg
 src/wasm-lib/kcl/bindings

Info.plist

@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>CFBundleDocumentTypes</key>
-        <array>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.kcl</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>KCL</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Owner</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.toml</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>TOML</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.gltf</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>glTF</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.glb</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>glb</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.step</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>STEP</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.fbx</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>FBX</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>dev.zoo.sldprt</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>Solidworks Part</string>
-                <key>CFBundleTypeRole</key>
-                <string>Viewer</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>public.geometry-definition-format</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>OBJ</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>public.polygon-file-format</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>PLY</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>public.standard-tesselated-geometry-format</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>STL</string>
-                <key>CFBundleTypeRole</key>
-                <string>Editor</string>
-                <key>LSTypeIsPackage</key>
-                <false/>
-                <key>LSHandlerRank</key>
-                <string>Default</string>
-            </dict>
-            <dict>
-                <key>LSItemContentTypes</key>
-                <array>
-                    <string>public.folder</string>
-                </array>
-                <key>CFBundleTypeName</key>
-                <string>Folders</string>
-                <key>CFBundleTypeRole</key>
-                <string>Viewer</string>
-                <key>LSHandlerRank</key>
-                <string>Alternate</string>
-            </dict>
-        </array>
-        <key>UTExportedTypeDeclarations</key>
-        <array>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.kcl</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://zoo.dev/docs/kcl</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.source-code</string>
-                    <string>public.data</string>
-                    <string>public.text</string>
-                    <string>public.plain-text</string>
-                    <string>public.3d-content</string>
-                    <string>public.script</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>KCL (KittyCAD Language) document</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>kcl</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>text/vnd.zoo.kcl</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.gltf</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.text</string>
-                    <string>public.plain-text</string>
-                    <string>public.3d-content</string>
-                    <string>public.json</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>Graphics Library Transmission Format (glTF)</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>gltf</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>model/gltf+json</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.glb</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.3d-content</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>Graphics Library Transmission Format (glTF) binary</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>glb</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>model/gltf-binary</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.step</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://www.loc.gov/preservation/digital/formats/fdd/fdd000448.shtml</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.3d-content</string>
-                    <string>public.text</string>
-                    <string>public.plain-text</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>STEP-file, ISO 10303-21</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>step</string>
-                        <string>stp</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>model/step</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.sldprt</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://docs.fileformat.com/cad/sldprt/</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.3d-content</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>Solidworks Part</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>sldprt</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>model/vnd.solidworks.sldprt</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.fbx</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://en.wikipedia.org/wiki/FBX</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.3d-content</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>Autodesk Filmbox (FBX) format</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>fbx</string>
-                        <string>fbxb</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>model/vnd.autodesk.fbx</string>
-                    </array>
-                </dict>
-            </dict>
-            <dict>
-                <key>UTTypeIdentifier</key>
-                <string>dev.zoo.toml</string>
-                <key>UTTypeReferenceURL</key>
-                <string>https://toml.io/en/</string>
-                <key>UTTypeConformsTo</key>
-                <array>
-                    <string>public.data</string>
-                    <string>public.text</string>
-                    <string>public.plain-text</string>
-                </array>
-                <key>UTTypeDescription</key>
-                <string>Tom's Obvious Minimal Language</string>
-                <key>UTTypeTagSpecification</key>
-                <dict>
-                    <key>public.filename-extension</key>
-                    <array>
-                        <string>kcl</string>
-                    </array>
-                    <key>public.mime-type</key>
-                    <array>
-                        <string>text/toml</string>
-                    </array>
-                </dict>
-            </dict>
-        </array>
-    </dict>
-</plist>

Makefile

@@ -7,14 +7,6 @@ XSTATE_TYPEGENS := $(wildcard src/machines/*.typegen.ts)
 dev: node_modules public/wasm_lib_bg.wasm $(XSTATE_TYPEGENS)
 	yarn 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"
-	killall Xephyr
-
 $(XSTATE_TYPEGENS): $(TS_SRC)
 	yarn xstate typegen 'src/**/*.ts?(x)'
 

README.md

@@ -101,7 +101,7 @@ This will start the application and hot-reload on changed.
 
 Devtools can be opened with the usual Cmd/Ctrl-Shift-I.
 
-To build, run `yarn tron:package`.
+To build, run `yarn electron:package`.
 
 ## Checking out commits / Bisecting
 
@@ -110,6 +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 wasm-prep
 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
 ```
@@ -188,22 +189,12 @@ For more information on fuzzing you can check out
 
 ### Playwright tests
 
-You will need a `./e2e/playwright/playwright-secrets.env` file:
-
-```bash
-$ touch ./e2e/playwright/playwright-secrets.env
-$ cat ./e2e/playwright/playwright-secrets.env
-token=<dev.zoo.dev/account/api-tokens>
-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
-docker run --network host  --rm --init -it playwright/chrome:playwright-x.xx.x
+docker run --network host  --rm --init -it playwright/chrome:playwright-1.43.1
 ```
 
 and in another terminal, run:
@@ -212,27 +203,21 @@ and in another terminal, run:
 PW_TEST_CONNECT_WS_ENDPOINT=ws://127.0.0.1:4444/ yarn playwright test --project="Google Chrome" <test suite>
 ```
 
+An example of a `<test suite>` is: `e2e/playwright/flow-tests.spec.ts`
 
-#### Specific example
+YOU WILL NEED A PLAYWRIGHT-SECRETS.ENV FILE:
 
-open a terminal and run:
 
 ```bash
-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
+# ./e2e/playwright/playwright-secrets.env
+token=<your-token>
+snapshottoken=<your-snapshot-token>
 ```
+then replace "your-token" with a dev token from dev.zoo.dev/account/api-tokens
 
 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
 
 ```
@@ -304,7 +289,7 @@ yarn start
 and finally:
 
 ```
-yarn test:unit
+yarn test:nowatch
 ```
 
 For individual testing:
@@ -322,69 +307,6 @@ cd src/wasm-lib
 cargo test
 ```
 
-### 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`?
-
-To answer these questions the following commands will give you confidence to locate the issue.
-
-#### Static Analysis
-
-Part of the CI CD pipeline performs static analysis on the code. Use the following commands to mimic the CI CD jobs.
-
-The following set of commands should get us closer to one and done commands to instantly retest issues.
-
-```
-yarn test-setup
-```
-
-> Gotcha, are packages up to date and is the wasm built?
-
-
-```
-yarn tsc
-yarn fmt-check
-yarn lint
-yarn test:unit:local
-```
-
-> Gotcha: Our unit tests have integration tests in them. You need to run a localhost server to run the unit tests.
-
-#### E2E Tests
-
-**Playwright Browser**
-
-These E2E tests run in a browser (without electron).
-There are tests that are skipped if they are ran in a windows OS or Linux OS. We can use playwright tags to implement test skipping.
-
-Breaking down the command `yarn test:playwright:browser:chrome:windows`
-- The application is `playwright`
-- The runtime is a `browser`
-- The specific `browser` is `chrome`
-- The test should run in a `windows` environment. It will skip tests that are broken or flaky in the windows OS.
-
-```
-yarn test:playwright:browser:chrome
-yarn test:playwright:browser:chrome:windows
-yarn test:playwright:browser:chrome:ubuntu
-```
-
-**Playwright Electron**
-
-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
-yarn test:playwright:electron:windows:local
-yarn test:playwright:electron:macos:local
-yarn test:playwright:electron:ubuntu:local
-```
-
-> Why does it say local? The CI CD commands that run in the pipeline cannot be ran locally. A single command will not properly setup the testing environment locally.
-
 #### Some notes on CI
 
 The tests are broken into snapshot tests and non-snapshot tests, and they run in that order, they automatically commit new snap shots, so if you see an image commit check it was an intended change. If we have non-determinism in the snapshots such that they are always committing new images, hopefully this annoyance makes us fix them asap, if you notice this happening let Kurt know. But for the odd occasion `git reset --hard HEAD~ && git push -f` is your friend.
@@ -414,6 +336,25 @@ PS: for the debug panel, the following JSON is useful for snapping the camera
 
 </details>
 
+### Tauri e2e tests
+
+#### Windows (local only until the CI edge version mismatch is fixed)
+
+```
+yarn install
+yarn build:wasm-dev
+cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
+yarn vite build --mode development
+yarn tauri build --debug -b
+$env:KITTYCAD_API_TOKEN="<YOUR_KITTYCAD_API_TOKEN>"
+$env:VITE_KC_API_BASE_URL="https://api.dev.zoo.dev"
+$env:E2E_TAURI_ENABLED="true"
+$env:TS_NODE_COMPILER_OPTIONS='{"module": "commonjs"}'
+$env:E2E_APPLICATION=".\src-tauri\target\debug\Zoo Modeling App.exe"
+Stop-Process -Name msedgedriver
+yarn wdio run wdio.conf.ts
+```
+
 ## KCL
 
 For how to contribute to KCL, [see our KCL README](https://github.com/KittyCAD/modeling-app/tree/main/src/wasm-lib/kcl).

add-osx-cert.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env sh
+# From https://dev.to/rwwagner90/signing-electron-apps-with-github-actions-4cof
+
+KEY_CHAIN=build.keychain
+CERTIFICATE_P12=certificate.p12
+
+# Recreate the certificate from the secure environment variable
+echo $APPLE_CERTIFICATE | base64 --decode > $CERTIFICATE_P12
+
+#create a keychain
+security create-keychain -p actions $KEY_CHAIN
+
+# Make the keychain the default so identities are found
+security default-keychain -s $KEY_CHAIN
+
+# Unlock the keychain
+security unlock-keychain -p actions $KEY_CHAIN
+
+security import $CERTIFICATE_P12 -k $KEY_CHAIN -P $APPLE_CERTIFICATE_PASSWORD -T /usr/bin/codesign;
+
+security set-key-partition-list -S apple-tool:,apple: -s -k actions $KEY_CHAIN
+
+# remove certs
+rm -fr *.p12

docs/kcl/KNOWN-ISSUES.md

@@ -22,3 +22,8 @@ once fixed in engine will just start working here with no language changes.
 
 - **Chamfers**: Chamfers cannot intersect, you will get an error. Only simple
     chamfer cases work currently.
+
+    Sketching on the chamfered face does not currently work.
+
+- **Shell**: Shell sometimes does not work when arcs or fillets are involved.
+    We are tracking the engine side bug on this.

docs/kcl/index.md

@@ -32,21 +32,17 @@ layout: manual
 * [`chamfer`](kcl/chamfer)
 * [`circle`](kcl/circle)
 * [`close`](kcl/close)
-* [`cm`](kcl/cm)
 * [`cos`](kcl/cos)
 * [`e`](kcl/e)
 * [`extrude`](kcl/extrude)
 * [`fillet`](kcl/fillet)
 * [`floor`](kcl/floor)
-* [`ft`](kcl/ft)
 * [`getNextAdjacentEdge`](kcl/getNextAdjacentEdge)
 * [`getOppositeEdge`](kcl/getOppositeEdge)
 * [`getPreviousAdjacentEdge`](kcl/getPreviousAdjacentEdge)
 * [`helix`](kcl/helix)
 * [`hole`](kcl/hole)
-* [`hollow`](kcl/hollow)
 * [`import`](kcl/import)
-* [`inch`](kcl/inch)
 * [`int`](kcl/int)
 * [`lastSegX`](kcl/lastSegX)
 * [`lastSegY`](kcl/lastSegY)
@@ -56,17 +52,11 @@ layout: manual
 * [`line`](kcl/line)
 * [`lineTo`](kcl/lineTo)
 * [`ln`](kcl/ln)
-* [`loft`](kcl/loft)
 * [`log`](kcl/log)
 * [`log10`](kcl/log10)
 * [`log2`](kcl/log2)
-* [`m`](kcl/m)
-* [`map`](kcl/map)
 * [`max`](kcl/max)
 * [`min`](kcl/min)
-* [`mirror2d`](kcl/mirror2d)
-* [`mm`](kcl/mm)
-* [`offsetPlane`](kcl/offsetPlane)
 * [`patternCircular2d`](kcl/patternCircular2d)
 * [`patternCircular3d`](kcl/patternCircular3d)
 * [`patternLinear2d`](kcl/patternLinear2d)
@@ -78,8 +68,6 @@ layout: manual
 * [`profileStart`](kcl/profileStart)
 * [`profileStartX`](kcl/profileStartX)
 * [`profileStartY`](kcl/profileStartY)
-* [`reduce`](kcl/reduce)
-* [`rem`](kcl/rem)
 * [`revolve`](kcl/revolve)
 * [`segAng`](kcl/segAng)
 * [`segEndX`](kcl/segEndX)
@@ -94,7 +82,6 @@ layout: manual
 * [`tan`](kcl/tan)
 * [`tangentialArc`](kcl/tangentialArc)
 * [`tangentialArcTo`](kcl/tangentialArcTo)
-* [`tangentialArcToRelative`](kcl/tangentialArcToRelative)
 * [`tau`](kcl/tau)
 * [`toDegrees`](kcl/toDegrees)
 * [`toRadians`](kcl/toRadians)
@@ -102,4 +89,3 @@ layout: manual
 * [`xLineTo`](kcl/xLineTo)
 * [`yLine`](kcl/yLine)
 * [`yLineTo`](kcl/yLineTo)
-* [`yd`](kcl/yd)

docs/kcl/legAngX.md

@@ -16,23 +16,20 @@ legAngX(hypotenuse: number, leg: number) -> number
 
 * `utilities`
 
-
-### Arguments
-
-| Name | Type | Description | Required |
-|----------|------|-------------|----------|
-| `hypotenuse` | `number` |  | Yes |
-| `leg` | `number` |  | Yes |
-
-### Returns
-
-`number` 
-
-
 ### Examples
 
 ```js
 legAngX(5, 3)
 ```
 
+### Arguments
+
+* `hypotenuse`: `number` (REQUIRED)
+* `leg`: `number` (REQUIRED)
+
+### Returns
+
+`number`
+
+
 

docs/kcl/legAngY.md

@@ -16,23 +16,20 @@ legAngY(hypotenuse: number, leg: number) -> number
 
 * `utilities`
 
-
-### Arguments
-
-| Name | Type | Description | Required |
-|----------|------|-------------|----------|
-| `hypotenuse` | `number` |  | Yes |
-| `leg` | `number` |  | Yes |
-
-### Returns
-
-`number` 
-
-
 ### Examples
 
 ```js
 legAngY(5, 3)
 ```
 
+### Arguments
+
+* `hypotenuse`: `number` (REQUIRED)
+* `leg`: `number` (REQUIRED)
+
+### Returns
+
+`number`
+
+
 

docs/kcl/legLen.md

@@ -16,23 +16,20 @@ legLen(hypotenuse: number, leg: number) -> number
 
 * `utilities`
 
-
-### Arguments
-
-| Name | Type | Description | Required |
-|----------|------|-------------|----------|
-| `hypotenuse` | `number` |  | Yes |
-| `leg` | `number` |  | Yes |
-
-### Returns
-
-`number` 
-
-
 ### Examples
 
 ```js
 legLen(5, 3)
 ```
 
+### Arguments
+
+* `hypotenuse`: `number` (REQUIRED)
+* `leg`: `number` (REQUIRED)
+
+### Returns
+
+`number`
+
+