Add back old window detection heuristic

.codespellrc

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

.github/ci-cd-scripts/start-vector-macos.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Install vector
-brew tap vectordotdev/brew && brew install vector
-
-# Configure vector
-mkdir -p /tmp/vector
-cp .github/workflows/vector.toml /tmp/vector.toml
-sed -i '' "s#OS_NAME#${OS_NAME}#g" /tmp/vector.toml
-sed -i '' "s#GITHUB_WORKFLOW#${GITHUB_WORKFLOW}#g" /tmp/vector.toml
-sed -i '' "s#GITHUB_REPOSITORY#${GITHUB_REPOSITORY}#g" /tmp/vector.toml
-sed -i '' "s#GITHUB_SHA#${GITHUB_SHA}#g" /tmp/vector.toml
-sed -i '' "s#GITHUB_REF_NAME#${GITHUB_REF_NAME}#g" /tmp/vector.toml
-sed -i '' "s#GH_ACTIONS_AXIOM_TOKEN#${GH_ACTIONS_AXIOM_TOKEN}#g" /tmp/vector.toml
-
-# Display settings
-echo
-echo 'Vector config:'
-cat /tmp/vector.toml
-echo
-
-# Start in the background
-$(brew --prefix)/opt/vector/bin/vector --config /tmp/vector.toml &

.github/ci-cd-scripts/start-vector-ubuntu.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Install vector
-curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev | bash -s -- -y
-
-# Configure vector
-mkdir -p /tmp/vector
-cp .github/workflows/vector.toml /tmp/vector.toml
-sed -i "s#OS_NAME#${OS_NAME}#g" /tmp/vector.toml
-sed -i "s#GITHUB_WORKFLOW#${GITHUB_WORKFLOW}#g" /tmp/vector.toml
-sed -i "s#GITHUB_REPOSITORY#${GITHUB_REPOSITORY}#g" /tmp/vector.toml
-sed -i "s#GITHUB_SHA#${GITHUB_SHA}#g" /tmp/vector.toml
-sed -i "s#GITHUB_REF_NAME#${GITHUB_REF_NAME}#g" /tmp/vector.toml
-sed -i "s#GH_ACTIONS_AXIOM_TOKEN#${GH_ACTIONS_AXIOM_TOKEN}#g" /tmp/vector.toml
-
-# Display settings
-echo
-echo 'Vector config:'
-cat /tmp/vector.toml
-echo
-
-# Start in background
-${HOME}/.vector/bin/vector --config /tmp/vector.toml &

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

@@ -24,7 +24,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           cache: false # Configured below.
-      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
         with:
           tool: wasm-pack
       - name: Rust Cache

.github/workflows/build-apps.yml

@@ -77,7 +77,7 @@ jobs:
         with:
           cache: false # Configured below.
 
-      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
         if: ${{ steps.wasm.outputs.should-build-wasm == 'true' }}
         with:
           tool: wasm-pack

.github/workflows/cargo-test.yml

@@ -34,11 +34,20 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           cache: false # Configured below.
-      - name: Start Vector
-        run: .github/ci-cd-scripts/start-vector-ubuntu.sh
-        env:
-          GH_ACTIONS_AXIOM_TOKEN: ${{ secrets.GH_ACTIONS_AXIOM_TOKEN }}
-          OS_NAME: ${{ env.OS_NAME }}
+      - name: Install vector
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh
+          chmod +x /tmp/vector.sh
+          /tmp/vector.sh -y -no-modify-path
+          mkdir -p /tmp/vector
+          cp .github/workflows/vector.toml /tmp/vector.toml
+          sed -i "s#GITHUB_WORKFLOW#${GITHUB_WORKFLOW}#g" /tmp/vector.toml
+          sed -i "s#GITHUB_REPOSITORY#${GITHUB_REPOSITORY}#g" /tmp/vector.toml
+          sed -i "s#GITHUB_SHA#${GITHUB_SHA}#g" /tmp/vector.toml
+          sed -i "s#GITHUB_REF_NAME#${GITHUB_REF_NAME}#g" /tmp/vector.toml
+          sed -i "s#GH_ACTIONS_AXIOM_TOKEN#${{secrets.GH_ACTIONS_AXIOM_TOKEN}}#g" /tmp/vector.toml
+          cat /tmp/vector.toml
+          ${HOME}/.vector/bin/vector --config /tmp/vector.toml &
       - uses: taiki-e/install-action@cargo-llvm-cov
       - uses: taiki-e/install-action@nextest
       - name: Install just

.github/workflows/e2e-tests.yml

@@ -140,7 +140,7 @@ jobs:
         with:
           cache: false # Configured below.
 
-      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
         if: ${{ needs.conditions.outputs.should-run == 'true' && steps.wasm.outputs.should-build-wasm == 'true' }}
         with:
           tool: wasm-pack
@@ -281,7 +281,7 @@ jobs:
         os:
           - "runs-on=${{ github.run_id }}/family=i7ie.2xlarge/image=ubuntu22-full-x64"
           - namespace-profile-macos-8-cores
-          - windows-latest-8-cores
+          - windows-latest
         shardIndex: [1, 2, 3, 4]
         shardTotal: [4]
         # Disable macos and windows tests on hourly e2e tests since we only care
@@ -292,7 +292,7 @@ jobs:
         exclude:
           - os: namespace-profile-macos-8-cores
             isScheduled: true
-          - os: windows-latest-8-cores
+          - os: windows-latest
             isScheduled: true
         # TODO: add ref here for main and latest release tag
     runs-on: ${{ matrix.os }}
@@ -339,12 +339,22 @@ jobs:
         if: needs.conditions.outputs.should-run == 'true'
         run: yarn tronb:vite:dev
 
-      - name: Start Vector
-        if: ${{ needs.conditions.outputs.should-run == 'true' && !contains(matrix.os, 'windows') }}
-        run: .github/ci-cd-scripts/start-vector-${{ env.OS_NAME }}.sh
-        env:
-          GH_ACTIONS_AXIOM_TOKEN: ${{ secrets.GH_ACTIONS_AXIOM_TOKEN }}
-          OS_NAME: ${{ env.OS_NAME }}
+      - name: Install vector
+        if: ${{ needs.conditions.outputs.should-run == 'true' && contains(matrix.os, 'ubuntu') }}
+        shell: bash
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev > /tmp/vector.sh
+          chmod +x /tmp/vector.sh
+          /tmp/vector.sh -y -no-modify-path
+          mkdir -p /tmp/vector
+          cp .github/workflows/vector.toml /tmp/vector.toml
+          sed -i "s#GITHUB_WORKFLOW#${GITHUB_WORKFLOW}#g" /tmp/vector.toml
+          sed -i "s#GITHUB_REPOSITORY#${GITHUB_REPOSITORY}#g" /tmp/vector.toml
+          sed -i "s#GITHUB_SHA#${GITHUB_SHA}#g" /tmp/vector.toml
+          sed -i "s#GITHUB_REF_NAME#${GITHUB_REF_NAME}#g" /tmp/vector.toml
+          sed -i "s#GH_ACTIONS_AXIOM_TOKEN#${{secrets.GH_ACTIONS_AXIOM_TOKEN}}#g" /tmp/vector.toml
+          cat /tmp/vector.toml
+          ${HOME}/.vector/bin/vector --config /tmp/vector.toml &
 
       - uses: actions/download-artifact@v4
         if: ${{ needs.conditions.outputs.should-run == 'true' && !cancelled() && (success() || failure()) }}
@@ -360,8 +370,8 @@ jobs:
         with:
           shell: bash
           command: .github/ci-cd-scripts/playwright-electron.sh ${{matrix.shardIndex}} ${{matrix.shardTotal}} ${{ env.OS_NAME }}
-          timeout_minutes: 30
-          max_attempts: 9
+          timeout_minutes: 45
+          max_attempts: 15
         env:
           FAIL_ON_CONSOLE_ERRORS: true
           token: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}

.github/workflows/static-analysis.yml

@@ -51,7 +51,7 @@ jobs:
         with:
           cache: false # Configured below.
 
-      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
         with:
           tool: wasm-pack
 
@@ -191,7 +191,7 @@ jobs:
           cache: 'yarn'
 
       - run: yarn install
-      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
         with:
           tool: wasm-pack
 
@@ -236,7 +236,7 @@ jobs:
           cache: 'yarn'
 
       - run: yarn install
-      - uses: taiki-e/install-action@d4635f2de61c8b8104d59cd4aede2060638378cc
+      - uses: taiki-e/install-action@37bdc826eaedac215f638a96472df572feab0f9b
         with:
           tool: wasm-pack
 

.github/workflows/vector.toml

@@ -8,7 +8,6 @@ include = ["/tmp/github-actions.log"]
 type = "remap"
 inputs = [ "github-actions-file" ]
 source = '''
-.platform = "OS_NAME"
 .action = "GITHUB_WORKFLOW"
 .repo = "GITHUB_REPOSITORY"
 .sha = "GITHUB_SHA"

docs/kcl/consts/std-math-PI.md

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

docs/kcl/index.md

@@ -65,15 +65,11 @@ layout: manual
   * [`chamfer`](kcl/chamfer)
   * [`circleThreePoint`](kcl/circleThreePoint)
   * [`close`](kcl/close)
+  * [`cm`](kcl/cm)
   * [`extrude`](kcl/extrude)
   * [`fillet`](kcl/fillet)
   * [`floor`](kcl/floor)
-  * [`fromCm`](kcl/fromCm)
-  * [`fromFt`](kcl/fromFt)
-  * [`fromInches`](kcl/fromInches)
-  * [`fromM`](kcl/fromM)
-  * [`fromMm`](kcl/fromMm)
-  * [`fromYd`](kcl/fromYd)
+  * [`ft`](kcl/ft)
   * [`getCommonEdge`](kcl/getCommonEdge)
   * [`getNextAdjacentEdge`](kcl/getNextAdjacentEdge)
   * [`getOppositeEdge`](kcl/getOppositeEdge)
@@ -81,6 +77,7 @@ layout: manual
   * [`helix`](kcl/std-helix)
   * [`hole`](kcl/hole)
   * [`hollow`](kcl/hollow)
+  * [`inch`](kcl/inch)
   * [`lastSegX`](kcl/lastSegX)
   * [`lastSegY`](kcl/lastSegY)
   * [`legAngX`](kcl/legAngX)
@@ -92,9 +89,11 @@ layout: manual
   * [`log`](kcl/log)
   * [`log10`](kcl/log10)
   * [`log2`](kcl/log2)
+  * [`m`](kcl/m)
   * [`map`](kcl/map)
   * [`max`](kcl/max)
   * [`min`](kcl/min)
+  * [`mm`](kcl/mm)
   * [`offsetPlane`](kcl/offsetPlane)
   * [`patternCircular2d`](kcl/patternCircular2d)
   * [`patternCircular3d`](kcl/patternCircular3d)
@@ -102,6 +101,7 @@ layout: manual
   * [`patternLinear3d`](kcl/patternLinear3d)
   * [`patternTransform`](kcl/patternTransform)
   * [`patternTransform2d`](kcl/patternTransform2d)
+  * [`polar`](kcl/polar)
   * [`polygon`](kcl/polygon)
   * [`pop`](kcl/pop)
   * [`pow`](kcl/pow)
@@ -137,12 +137,12 @@ layout: manual
   * [`translate`](kcl/translate)
   * [`xLine`](kcl/xLine)
   * [`yLine`](kcl/yLine)
+  * [`yd`](kcl/yd)
 * **std::math**
   * [`E`](kcl/consts/std-math-E)
   * [`PI`](kcl/consts/std-math-PI)
   * [`TAU`](kcl/consts/std-math-TAU)
   * [`cos`](kcl/std-math-cos)
-  * [`polar`](kcl/std-math-polar)
   * [`sin`](kcl/std-math-sin)
   * [`tan`](kcl/std-math-tan)
 * **std::sketch**

docs/kcl/settings.md

@@ -6,7 +6,7 @@ layout: manual
 
 # KCL Settings
 
-There are three levels of settings available in Zoo Design Studio:
+There are three levels of settings available in the KittyCAD Design Studiolication:
 
 1. [User Settings](/docs/kcl/settings/user): Global settings that apply to all projects, stored in `user.toml`
 2. [Project Settings](/docs/kcl/settings/project): Settings specific to a project, stored in `project.toml`
@@ -14,7 +14,7 @@ There are three levels of settings available in Zoo Design Studio:
 
 ## Configuration Files
 
-Zoo Design Studio uses TOML files for configuration:
+The KittyCAD Design Studio uses TOML files for configuration:
 
 * **User Settings**: `user.toml` - See [complete documentation](/docs/kcl/settings/user)
 * **Project Settings**: `project.toml` - See [complete documentation](/docs/kcl/settings/project)

docs/kcl/settings/user.md

@@ -96,7 +96,7 @@ Permanently dismiss the banner warning to download the desktop app. This setting
 
 ##### stream_idle_mode
 
-When the user is idle, teardown the stream after some time.
+When the user is idle, and this is true, the stream will be torn down.
 
 
 **Default:** None

docs/kcl/std.json

@@ -79599,6 +79599,34 @@
       "exampleSketch = startSketchOn(-XZ)\n  |> startProfileAt([0, 0], %)\n  |> line(end = [10, 0])\n  |> line(end = [0, 10])\n  |> close()\n\nexample = extrude(exampleSketch, length = 10)"
     ]
   },
+  {
+    "name": "cm",
+    "summary": "Centimeters conversion factor for current projects units.",
+    "description": "No matter what units the current project uses, this function will always return the conversion factor to centimeters.\n\nFor example, if the current project uses inches, this function will return `0.393701`. If the current project uses millimeters, this function will return `10`. If the current project uses centimeters, this function will return `1`.\n\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the project settings. Otherwise, it is a bad pattern to use this function.\n\nWe merely provide these functions for convenience and readability, as `10 * cm()` is more readable that your intent is \"I want 10 centimeters\" than `10 * 10`, if the project settings are in millimeters.",
+    "tags": [
+      "units"
+    ],
+    "keywordArguments": false,
+    "args": [],
+    "returnValue": {
+      "name": "",
+      "type": "number",
+      "schema": {
+        "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
+        "title": "double",
+        "type": "number",
+        "format": "double"
+      },
+      "required": true,
+      "includeInSnippet": true,
+      "labelRequired": true
+    },
+    "unpublished": false,
+    "deprecated": false,
+    "examples": [
+      "totalWidth = 10 * cm()"
+    ]
+  },
   {
     "name": "e",
     "summary": "Return the value of Euler’s number `e`.",
@@ -97462,28 +97490,14 @@
     ]
   },
   {
-    "name": "fromCm",
-    "summary": "Converts a number from centimeters to the current default unit.",
-    "description": "No matter what units the current file uses, this function will always return a number equivalent to the input in centimeters.\n\nFor example, if the current file uses inches, `fromCm(1)` will return `0.393701`. If the current file uses millimeters, `fromCm(1)` will return `10`. If the current file uses centimeters, `fromCm(1)` will return `1`.\n\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the file settings. Otherwise, it is a bad pattern to use this function.\n\nWe merely provide these functions for convenience and readability, as `fromCm(10)` is more readable that your intent is \"I want 10 centimeters\" than `10 * 10`, if the file settings are in millimeters.",
+    "name": "ft",
+    "summary": "Feet conversion factor for current projects units.",
+    "description": "No matter what units the current project uses, this function will always return the conversion factor to feet.\n\nFor example, if the current project uses inches, this function will return `12`. If the current project uses millimeters, this function will return `304.8`. If the current project uses feet, this function will return `1`.\n\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the project settings. Otherwise, it is a bad pattern to use this function.\n\nWe merely provide these functions for convenience and readability, as `10 * ft()` is more readable that your intent is \"I want 10 feet\" than `10 * 304.8`, if the project settings are in millimeters.",
     "tags": [
       "units"
     ],
     "keywordArguments": false,
-    "args": [
-      {
-        "name": "input",
-        "type": "number",
-        "schema": {
-          "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-          "title": "double",
-          "type": "number",
-          "format": "double"
-        },
-        "required": true,
-        "includeInSnippet": true,
-        "labelRequired": true
-      }
-    ],
+    "args": [],
     "returnValue": {
       "name": "",
       "type": "number",
@@ -97500,217 +97514,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "totalWidth = fromCm(10)"
-    ]
-  },
-  {
-    "name": "fromFt",
-    "summary": "Converts a number from feet to the current default unit.",
-    "description": "No matter what units the current file uses, this function will always return a number equivalent to the input in feet.\n\nFor example, if the current file uses inches, `fromFt(1)` will return `12`. If the current file uses millimeters, `fromFt(1)` will return `304.8`. If the current file uses feet, `fromFt(1)` will return `1`.\n\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the file settings. Otherwise, it is a bad pattern to use this function.\n\nWe merely provide these functions for convenience and readability, as `fromFt(10)` is more readable that your intent is \"I want 10 feet\" than `10 * 304.8`, if the file settings are in millimeters.",
-    "tags": [
-      "units"
-    ],
-    "keywordArguments": false,
-    "args": [
-      {
-        "name": "input",
-        "type": "number",
-        "schema": {
-          "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-          "title": "double",
-          "type": "number",
-          "format": "double"
-        },
-        "required": true,
-        "includeInSnippet": true,
-        "labelRequired": true
-      }
-    ],
-    "returnValue": {
-      "name": "",
-      "type": "number",
-      "schema": {
-        "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-        "title": "double",
-        "type": "number",
-        "format": "double"
-      },
-      "required": true,
-      "includeInSnippet": true,
-      "labelRequired": true
-    },
-    "unpublished": false,
-    "deprecated": false,
-    "examples": [
-      "totalWidth = fromFt(10)"
-    ]
-  },
-  {
-    "name": "fromInches",
-    "summary": "Converts a number from inches to the current default unit.",
-    "description": "No matter what units the current file uses, this function will always return a number equivalent to the input in inches.\n\nFor example, if the current file uses inches, `fromInches(1)` will return `1`. If the current file uses millimeters, `fromInches(1)` will return `25.4`.\n\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the file settings. Otherwise, it is a bad pattern to use this function.\n\nWe merely provide these functions for convenience and readability, as `fromInches(10)` is more readable that your intent is \"I want 10 inches\" than `10 * 25.4`, if the file settings are in millimeters.",
-    "tags": [
-      "units"
-    ],
-    "keywordArguments": false,
-    "args": [
-      {
-        "name": "input",
-        "type": "number",
-        "schema": {
-          "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-          "title": "double",
-          "type": "number",
-          "format": "double"
-        },
-        "required": true,
-        "includeInSnippet": true,
-        "labelRequired": true
-      }
-    ],
-    "returnValue": {
-      "name": "",
-      "type": "number",
-      "schema": {
-        "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-        "title": "double",
-        "type": "number",
-        "format": "double"
-      },
-      "required": true,
-      "includeInSnippet": true,
-      "labelRequired": true
-    },
-    "unpublished": false,
-    "deprecated": false,
-    "examples": [
-      "totalWidth = fromInches(10)"
-    ]
-  },
-  {
-    "name": "fromM",
-    "summary": "Converts a number from meters to the current default unit.",
-    "description": "No matter what units the current file uses, this function will always return a number equivalent to the input in meters.\n\nFor example, if the current file uses inches, `fromM(1)` will return `39.3701`. If the current file uses millimeters, `fromM(1)` will return `1000`. If the current file uses meters, `fromM(1)` will return `1`.\n\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the file settings. Otherwise, it is a bad pattern to use this function.\n\nWe merely provide these functions for convenience and readability, as `fromM(10)` is more readable that your intent is \"I want 10 meters\" than `10 * 1000`, if the file settings are in millimeters.",
-    "tags": [
-      "units"
-    ],
-    "keywordArguments": false,
-    "args": [
-      {
-        "name": "input",
-        "type": "number",
-        "schema": {
-          "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-          "title": "double",
-          "type": "number",
-          "format": "double"
-        },
-        "required": true,
-        "includeInSnippet": true,
-        "labelRequired": true
-      }
-    ],
-    "returnValue": {
-      "name": "",
-      "type": "number",
-      "schema": {
-        "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-        "title": "double",
-        "type": "number",
-        "format": "double"
-      },
-      "required": true,
-      "includeInSnippet": true,
-      "labelRequired": true
-    },
-    "unpublished": false,
-    "deprecated": false,
-    "examples": [
-      "totalWidth = 10 * fromM(10)"
-    ]
-  },
-  {
-    "name": "fromMm",
-    "summary": "Converts a number from mm to the current default unit.",
-    "description": "No matter what units the current file uses, this function will always return a number equivalent to the input in millimeters.\n\nFor example, if the current file uses inches, `fromMm(1)` will return `1/25.4`. If the current file uses millimeters, `fromMm(1)` will return `1`.\n\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the file settings. Otherwise, it is a bad pattern to use this function.\n\nWe merely provide these functions for convenience and readability, as `fromMm(10)` is more readable that your intent is \"I want 10 millimeters\" than `10 * (1/25.4)`, if the file settings are in inches.",
-    "tags": [
-      "units"
-    ],
-    "keywordArguments": false,
-    "args": [
-      {
-        "name": "input",
-        "type": "number",
-        "schema": {
-          "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-          "title": "double",
-          "type": "number",
-          "format": "double"
-        },
-        "required": true,
-        "includeInSnippet": true,
-        "labelRequired": true
-      }
-    ],
-    "returnValue": {
-      "name": "",
-      "type": "number",
-      "schema": {
-        "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-        "title": "double",
-        "type": "number",
-        "format": "double"
-      },
-      "required": true,
-      "includeInSnippet": true,
-      "labelRequired": true
-    },
-    "unpublished": false,
-    "deprecated": false,
-    "examples": [
-      "totalWidth = fromMm(10)"
-    ]
-  },
-  {
-    "name": "fromYd",
-    "summary": "Converts a number from yards to the current default unit.",
-    "description": "No matter what units the current file uses, this function will always return a number equivalent to the input in yards.\n\nFor example, if the current file uses inches, `fromYd(1)` will return `36`. If the current file uses millimeters, `fromYd(1)` will return `914.4`. If the current file uses yards, `fromYd(1)` will return `1`.\n\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the file settings. Otherwise, it is a bad pattern to use this function.\n\nWe merely provide these functions for convenience and readability, as `fromYd(10)` is more readable that your intent is \"I want 10 yards\" than `10 * 914.4`, if the file settings are in millimeters.",
-    "tags": [
-      "units"
-    ],
-    "keywordArguments": false,
-    "args": [
-      {
-        "name": "input",
-        "type": "number",
-        "schema": {
-          "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-          "title": "double",
-          "type": "number",
-          "format": "double"
-        },
-        "required": true,
-        "includeInSnippet": true,
-        "labelRequired": true
-      }
-    ],
-    "returnValue": {
-      "name": "",
-      "type": "number",
-      "schema": {
-        "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-        "title": "double",
-        "type": "number",
-        "format": "double"
-      },
-      "required": true,
-      "includeInSnippet": true,
-      "labelRequired": true
-    },
-    "unpublished": false,
-    "deprecated": false,
-    "examples": [
-      "totalWidth = fromYd(10)"
+      "totalWidth = 10 * ft()"
     ]
   },
   {
@@ -106565,6 +106369,34 @@
       "import height, buildSketch from \"common.kcl\"\n\nplane = XZ\nmargin = 2\ns1 = buildSketch(plane, [0, 0])\ns2 = buildSketch(plane, [0, height() + margin])"
     ]
   },
+  {
+    "name": "inch",
+    "summary": "Inches conversion factor for current projects units.",
+    "description": "No matter what units the current project uses, this function will always return the conversion factor to inches.\n\nFor example, if the current project uses inches, this function will return `1`. If the current project uses millimeters, this function will return `25.4`.\n\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the project settings. Otherwise, it is a bad pattern to use this function.\n\nWe merely provide these functions for convenience and readability, as `10 * inch()` is more readable that your intent is \"I want 10 inches\" than `10 * 25.4`, if the project settings are in millimeters.",
+    "tags": [
+      "units"
+    ],
+    "keywordArguments": false,
+    "args": [],
+    "returnValue": {
+      "name": "",
+      "type": "number",
+      "schema": {
+        "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
+        "title": "double",
+        "type": "number",
+        "format": "double"
+      },
+      "required": true,
+      "includeInSnippet": true,
+      "labelRequired": true
+    },
+    "unpublished": false,
+    "deprecated": false,
+    "examples": [
+      "totalWidth = 10 * inch()"
+    ]
+  },
   {
     "name": "int",
     "summary": "Convert a number to an integer.",
@@ -111489,7 +111321,7 @@
       "type": "number",
       "schema": {
         "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-        "title": "TyF64",
+        "title": "double",
         "type": "number",
         "format": "double"
       },
@@ -113173,7 +113005,7 @@
       "type": "number",
       "schema": {
         "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-        "title": "TyF64",
+        "title": "double",
         "type": "number",
         "format": "double"
       },
@@ -134529,6 +134361,34 @@
       "exampleSketch = startSketchOn(XZ)\n  |> startProfileAt([0, 0], %)\n  |> line(end = [log2(100), 0])\n  |> line(end = [5, 8])\n  |> line(end = [-10, 0])\n  |> close()\n\nexample = extrude(exampleSketch, length = 5)"
     ]
   },
+  {
+    "name": "m",
+    "summary": "Meters conversion factor for current projects units.",
+    "description": "No matter what units the current project uses, this function will always return the conversion factor to meters.\n\nFor example, if the current project uses inches, this function will return `39.3701`. If the current project uses millimeters, this function will return `1000`. If the current project uses meters, this function will return `1`.\n\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the project settings. Otherwise, it is a bad pattern to use this function.\n\nWe merely provide these functions for convenience and readability, as `10 * m()` is more readable that your intent is \"I want 10 meters\" than `10 * 1000`, if the project settings are in millimeters.",
+    "tags": [
+      "units"
+    ],
+    "keywordArguments": false,
+    "args": [],
+    "returnValue": {
+      "name": "",
+      "type": "number",
+      "schema": {
+        "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
+        "title": "double",
+        "type": "number",
+        "format": "double"
+      },
+      "required": true,
+      "includeInSnippet": true,
+      "labelRequired": true
+    },
+    "unpublished": false,
+    "deprecated": false,
+    "examples": [
+      "totalWidth = 10 * m()"
+    ]
+  },
   {
     "name": "map",
     "summary": "Apply a function to every element of a list.",
@@ -141993,6 +141853,34 @@
       "exampleSketch = startSketchOn(XZ)\n  |> startProfileAt([0, 0], %)\n  |> angledLine({\n       angle = 70,\n       length = min(15, 31, 4, 13, 22)\n     }, %)\n  |> line(end = [20, 0])\n  |> close()\n\nexample = extrude(exampleSketch, length = 5)"
     ]
   },
+  {
+    "name": "mm",
+    "summary": "Millimeters conversion factor for current projects units.",
+    "description": "No matter what units the current project uses, this function will always return the conversion factor to millimeters.\n\nFor example, if the current project uses inches, this function will return `(1/25.4)`. If the current project uses millimeters, this function will return `1`.\n\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the project settings. Otherwise, it is a bad pattern to use this function.\n\nWe merely provide these functions for convenience and readability, as `10 * mm()` is more readable that your intent is \"I want 10 millimeters\" than `10 * (1/25.4)`, if the project settings are in inches.",
+    "tags": [
+      "units"
+    ],
+    "keywordArguments": false,
+    "args": [],
+    "returnValue": {
+      "name": "",
+      "type": "number",
+      "schema": {
+        "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
+        "title": "double",
+        "type": "number",
+        "format": "double"
+      },
+      "required": true,
+      "includeInSnippet": true,
+      "labelRequired": true
+    },
+    "unpublished": false,
+    "deprecated": false,
+    "examples": [
+      "totalWidth = 10 * mm()"
+    ]
+  },
   {
     "name": "offsetPlane",
     "summary": "Offset a plane by a distance along its normal.",
@@ -201649,6 +201537,76 @@
       "circumference = 70\n\nexampleSketch = startSketchOn(XZ)\n  |> circle(center = [0, 0], radius = circumference / (2 * pi()))\n\nexample = extrude(exampleSketch, length = 5)"
     ]
   },
+  {
+    "name": "polar",
+    "summary": "Convert polar/sphere (azimuth, elevation, distance) coordinates to cartesian (x/y/z grid) coordinates.",
+    "description": "",
+    "tags": [],
+    "keywordArguments": false,
+    "args": [
+      {
+        "name": "data",
+        "type": "PolarCoordsData",
+        "schema": {
+          "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
+          "title": "PolarCoordsData",
+          "description": "Data for polar coordinates.",
+          "type": "object",
+          "required": [
+            "angle",
+            "length"
+          ],
+          "properties": {
+            "angle": {
+              "description": "The angle of the line (in degrees).",
+              "type": "number",
+              "format": "double"
+            },
+            "length": {
+              "description": "The length of the line.",
+              "allOf": [
+                {
+                  "$ref": "#/components/schemas/TyF64"
+                }
+              ]
+            }
+          },
+          "definitions": {
+            "TyF64": {
+              "type": "number",
+              "format": "double"
+            }
+          }
+        },
+        "required": true,
+        "includeInSnippet": true,
+        "labelRequired": true
+      }
+    ],
+    "returnValue": {
+      "name": "",
+      "type": "[number]",
+      "schema": {
+        "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
+        "title": "Array_size_2_of_double",
+        "type": "array",
+        "items": {
+          "type": "number",
+          "format": "double"
+        },
+        "maxItems": 2,
+        "minItems": 2
+      },
+      "required": true,
+      "includeInSnippet": true,
+      "labelRequired": true
+    },
+    "unpublished": false,
+    "deprecated": false,
+    "examples": [
+      "exampleSketch = startSketchOn(XZ)\n  |> startProfileAt([0, 0], %)\n  |> line(end = polar({ angle = 30, length = 5 }), tag = $thing)\n  |> line(end = [0, 5])\n  |> line(end = [segEndX(thing), 0])\n  |> line(end = [-20, 10])\n  |> close()\n\nexample = extrude(exampleSketch, length = 5)"
+    ]
+  },
   {
     "name": "polygon",
     "summary": "Create a regular polygon with the specified number of sides that is either inscribed or circumscribed around a circle of the specified radius.",
@@ -258566,19 +258524,14 @@
       "type": "[number]",
       "schema": {
         "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-        "title": "Array_size_2_of_TyF64",
+        "title": "Array_size_2_of_double",
         "type": "array",
         "items": {
-          "$ref": "#/components/schemas/TyF64"
+          "type": "number",
+          "format": "double"
         },
         "maxItems": 2,
-        "minItems": 2,
-        "definitions": {
-          "TyF64": {
-            "type": "number",
-            "format": "double"
-          }
-        }
+        "minItems": 2
       },
       "required": true,
       "includeInSnippet": true,
@@ -258624,7 +258577,7 @@
       "type": "number",
       "schema": {
         "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-        "title": "TyF64",
+        "title": "double",
         "type": "number",
         "format": "double"
       },
@@ -258672,7 +258625,7 @@
       "type": "number",
       "schema": {
         "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-        "title": "TyF64",
+        "title": "double",
         "type": "number",
         "format": "double"
       },
@@ -258720,7 +258673,7 @@
       "type": "number",
       "schema": {
         "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-        "title": "TyF64",
+        "title": "double",
         "type": "number",
         "format": "double"
       },
@@ -258768,19 +258721,14 @@
       "type": "[number]",
       "schema": {
         "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-        "title": "Array_size_2_of_TyF64",
+        "title": "Array_size_2_of_double",
         "type": "array",
         "items": {
-          "$ref": "#/components/schemas/TyF64"
+          "type": "number",
+          "format": "double"
         },
         "maxItems": 2,
-        "minItems": 2,
-        "definitions": {
-          "TyF64": {
-            "type": "number",
-            "format": "double"
-          }
-        }
+        "minItems": 2
       },
       "required": true,
       "includeInSnippet": true,
@@ -258826,7 +258774,7 @@
       "type": "number",
       "schema": {
         "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-        "title": "TyF64",
+        "title": "double",
         "type": "number",
         "format": "double"
       },
@@ -258874,7 +258822,7 @@
       "type": "number",
       "schema": {
         "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
-        "title": "TyF64",
+        "title": "double",
         "type": "number",
         "format": "double"
       },
@@ -336223,5 +336171,33 @@
     "examples": [
       "exampleSketch = startSketchOn(XZ)\n  |> startProfileAt([0, 0], %)\n  |> yLine(length = 15)\n  |> angledLine({ angle = 30, length = 15 }, %)\n  |> line(end = [8, -10])\n  |> yLine(length = -5)\n  |> close()\n\nexample = extrude(exampleSketch, length = 10)"
     ]
+  },
+  {
+    "name": "yd",
+    "summary": "Yards conversion factor for current projects units.",
+    "description": "No matter what units the current project uses, this function will always return the conversion factor to yards.\n\nFor example, if the current project uses inches, this function will return `36`. If the current project uses millimeters, this function will return `914.4`. If the current project uses yards, this function will return `1`.\n\n**Caution**: This function is only intended to be used when you absolutely MUST have different units in your code than the project settings. Otherwise, it is a bad pattern to use this function.\n\nWe merely provide these functions for convenience and readability, as `10 * yd()` is more readable that your intent is \"I want 10 yards\" than `10 * 914.4`, if the project settings are in millimeters.",
+    "tags": [
+      "units"
+    ],
+    "keywordArguments": false,
+    "args": [],
+    "returnValue": {
+      "name": "",
+      "type": "number",
+      "schema": {
+        "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
+        "title": "double",
+        "type": "number",
+        "format": "double"
+      },
+      "required": true,
+      "includeInSnippet": true,
+      "labelRequired": true
+    },
+    "unpublished": false,
+    "deprecated": false,
+    "examples": [
+      "totalWidth = 10 * yd()"
+    ]
   }
 ]

docs/kcl/types/PolarCoordsData.md

@@ -0,0 +1,22 @@
+---
+title: "PolarCoordsData"
+excerpt: "Data for polar coordinates."
+layout: manual
+---
+
+Data for polar coordinates.
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `angle` |[`number`](/docs/kcl/types/number)| The angle of the line (in degrees). | No |
+| `length` |[`number`](/docs/kcl/types/number)| The length of the line. | No |
+
+

e2e/playwright/boolean.spec.ts

@@ -38,7 +38,7 @@ test.describe('Point and click for boolean workflows', () => {
         path.resolve(
           __dirname,
           '../../',
-          './rust/kcl-lib/e2e/executor/inputs/boolean-setup-with-sketch-on-faces.kcl'
+          './rust/kcl-lib/e2e/executor/inputs/boolean-setup-with'
         ),
         'utf-8'
       )

e2e/playwright/desktop-export.spec.ts

@@ -32,41 +32,54 @@ test(
     })
     await page.setBodyDimensions({ width: 1200, height: 500 })
 
-    await test.step('on open of project', async () => {
-      // Open the project
-      const projectName = page.getByText(`bracket`)
-      await expect(projectName).toBeVisible()
-      await projectName.click()
-      await scene.settled(cmdBar)
+    page.on('console', console.log)
 
-      // Expect zero errors in gutter
+    await test.step('on open of project', async () => {
+      await expect(page.getByText(`bracket`)).toBeVisible()
+
+      // open the project
+      await page.getByText(`bracket`).click()
+
+      // expect zero errors in guter
       await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
 
-      // Click the export button
+      // export the model
       const exportButton = page.getByTestId('export-pane-button')
       await expect(exportButton).toBeVisible()
+
+      // Wait for the model to finish loading
+      await scene.settled(cmdBar)
+
+      const gltfOption = page.getByText('glTF')
+      const submitButton = page.getByText('Confirm Export')
+      const exportingToastMessage = page.getByText(`Exporting...`)
+      const errorToastMessage = page.getByText(`Error while exporting`)
+      const engineErrorToastMessage = page.getByText(`Nothing to export`)
+      const alreadyExportingToastMessage = page.getByText(`Already exporting`)
+      // The open file's name is `main.kcl`, so the export file name should be `main.gltf`
+      const exportFileName = `main.gltf`
+
+      // Click the export button
       await exportButton.click()
 
-      // Select the first format option
-      const gltfOption = cmdBar.selectOption({ name: 'glTF' })
-      const exportFileName = `main.gltf` // source file is named `main.kcl`
       await expect(gltfOption).toBeVisible()
+      await expect(page.getByText('STL')).toBeVisible()
+
       await page.keyboard.press('Enter')
 
       // Click the checkbox
-      const submitButton = page.getByText('Confirm Export')
       await expect(submitButton).toBeVisible()
+
+      await page.waitForTimeout(500)
+
       await page.keyboard.press('Enter')
 
+      // Find the toast.
       // Look out for the toast message
-      const exportingToastMessage = page.getByText(`Exporting...`)
-      const alreadyExportingToastMessage = page.getByText(`Already exporting`)
       await expect(exportingToastMessage).toBeVisible()
       await expect(alreadyExportingToastMessage).not.toBeVisible()
 
-      // Expect it to succeed
-      const errorToastMessage = page.getByText(`Error while exporting`)
-      const engineErrorToastMessage = page.getByText(`Nothing to export`)
+      // Expect it to succeed.
       await expect(errorToastMessage).not.toBeVisible()
       await expect(engineErrorToastMessage).not.toBeVisible()
 
@@ -74,7 +87,6 @@ test(
       await expect(successToastMessage).toBeVisible()
       await expect(exportingToastMessage).not.toBeVisible()
 
-      // Check for the exported file
       const firstFileFullPath = path.resolve(
         getPlaywrightDownloadDir(tronApp.projectDirName),
         exportFileName
@@ -101,50 +113,59 @@ test(
       const u = await getUtils(page)
       await u.openFilePanel()
 
-      // Click on the other file
       const otherKclButton = page.getByRole('button', { name: 'other.kcl' })
+
+      // Click the file
       await otherKclButton.click()
 
       // Close the file pane
       await u.closeFilePanel()
+
       await scene.settled(cmdBar)
 
-      // Expect zero errors in gutter
+      // expect zero errors in guter
       await expect(page.locator('.cm-lint-marker-error')).not.toBeVisible()
 
-      // Click the export button
+      // export the model
       const exportButton = page.getByTestId('export-pane-button')
       await expect(exportButton).toBeVisible()
+
+      const gltfOption = page.getByText('glTF')
+      const submitButton = page.getByText('Confirm Export')
+      const exportingToastMessage = page.getByText(`Exporting...`)
+      const errorToastMessage = page.getByText(`Error while exporting`)
+      const engineErrorToastMessage = page.getByText(`Nothing to export`)
+      const alreadyExportingToastMessage = page.getByText(`Already exporting`)
+      // The open file's name is `other.kcl`, so the export file name should be `other.gltf`
+      const exportFileName = `other.gltf`
+
+      // Click the export button
       await exportButton.click()
 
-      // Select the first format option
-      const gltfOption = cmdBar.selectOption({ name: 'glTF' })
-      const exportFileName = `other.gltf` // source file is named `other.kcl`
       await expect(gltfOption).toBeVisible()
+      await expect(page.getByText('STL')).toBeVisible()
+
       await page.keyboard.press('Enter')
 
       // Click the checkbox
-      const submitButton = page.getByText('Confirm Export')
       await expect(submitButton).toBeVisible()
+
       await page.keyboard.press('Enter')
 
+      // Find the toast.
       // Look out for the toast message
-      const exportingToastMessage = page.getByText(`Exporting...`)
-      const alreadyExportingToastMessage = page.getByText(`Already exporting`)
       await expect(exportingToastMessage).toBeVisible()
-      await expect(alreadyExportingToastMessage).not.toBeVisible()
-
-      // Expect it to succeed
-      const errorToastMessage = page.getByText(`Error while exporting`)
-      const engineErrorToastMessage = page.getByText(`Nothing to export`)
-      await expect(errorToastMessage).not.toBeVisible()
-      await expect(engineErrorToastMessage).not.toBeVisible()
 
       const successToastMessage = page.getByText(`Exported successfully`)
-      await expect(successToastMessage).toBeVisible()
-      await expect(exportingToastMessage).not.toBeVisible()
+      await test.step('Check the success toast message shows and nothing else', async () =>
+        Promise.all([
+          expect(alreadyExportingToastMessage).not.toBeVisible(),
+          expect(errorToastMessage).not.toBeVisible(),
+          expect(engineErrorToastMessage).not.toBeVisible(),
+          expect(successToastMessage).toBeVisible(),
+          expect(exportingToastMessage).not.toBeVisible(),
+        ]))
 
-      // Check for the exported file=
       const secondFileFullPath = path.resolve(
         getPlaywrightDownloadDir(tronApp.projectDirName),
         exportFileName

e2e/playwright/editor-tests.spec.ts

@@ -1319,38 +1319,4 @@ sketch001 = startSketchOn(XZ)
     const element = page.locator('[data-overlay-index="1"]')
     await expect(element).toHaveAttribute('data-overlay-visible', 'true')
   })
-
-  test(`Only show axis planes when there are no errors`, async ({
-    page,
-    homePage,
-    scene,
-    cmdBar,
-  }) => {
-    await page.addInitScript(async () => {
-      localStorage.setItem(
-        'persistCode',
-        `sketch001 = startSketchOn(XZ)
-    profile001 = circle(sketch001, center = [-100.0, -100.0], radius = 50.0)
-
-    sketch002 = startSketchOn(XZ)
-    profile002 = circle(sketch002, center = [-100.0, 100.0], radius = 50.0)
-    extrude001 = extrude(profile002, length = 0)` // length = 0 is causing the error
-      )
-    })
-
-    const viewportSize = { width: 1200, height: 800 }
-    await page.setBodyDimensions(viewportSize)
-
-    await homePage.goToModelingScene()
-
-    await scene.connectionEstablished()
-    await scene.settled(cmdBar)
-
-    await scene.expectPixelColor(
-      TEST_COLORS.DARK_MODE_BKGD,
-      // This is a position where the blue part of the axis plane is visible if its rendered
-      { x: viewportSize.width * 0.75, y: viewportSize.height * 0.2 },
-      15
-    )
-  })
 })

e2e/playwright/fixtures/fixtureSetup.ts

@@ -154,6 +154,7 @@ export class ElectronZoo {
     if (!this.electron) {
       this.electron = await electron.launch(options)
 
+      this.page = await this.electron.firstWindow()
       // Mac takes quite a long time to create the first window in CI.
       // Turns out we can't trust firstWindow() either. So loop.
       let timeoutId: ReturnType<typeof setTimeout>

e2e/playwright/fixtures/toolbarFixture.ts

@@ -44,7 +44,6 @@ export class ToolbarFixture {
   featureTreePane!: Locator
   gizmo!: Locator
   gizmoDisabled!: Locator
-  insertButton!: Locator
 
   constructor(page: Page) {
     this.page = page
@@ -79,8 +78,6 @@ export class ToolbarFixture {
     // element or two different elements can represent these states.
     this.gizmo = page.getByTestId('gizmo')
     this.gizmoDisabled = page.getByTestId('gizmo-disabled')
-
-    this.insertButton = page.getByTestId('insert-pane-button')
   }
 
   get logoLink() {

e2e/playwright/native-file-menu.spec.ts

@@ -1,5 +1,4 @@
 import { throwTronAppMissing } from '@e2e/playwright/lib/electron-helpers'
-import { orRunWhenFullSuiteEnabled } from '@e2e/playwright/test-utils'
 import { expect, test } from '@e2e/playwright/zoo-test'
 
 /**
@@ -570,43 +569,6 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
         const expected = 'Open sample'
         expect(actual).toBe(expected)
       })
-      test('Modeling.File.Insert from project file', async ({
-        tronApp,
-        cmdBar,
-        page,
-        homePage,
-        scene,
-      }) => {
-        if (!tronApp) {
-          throwTronAppMissing()
-          return
-        }
-        await homePage.goToModelingScene()
-        await scene.settled(cmdBar)
-
-        // Run electron snippet to find the Menu!
-        await page.waitForTimeout(100) // wait for createModelingPageMenu() to run
-        await tronApp.electron.evaluate(async ({ app }) => {
-          if (!app || !app.applicationMenu) {
-            throw new Error('app or app.applicationMenu is missing')
-          }
-          const openProject = app.applicationMenu.getMenuItemById(
-            'File.Insert from project file'
-          )
-          if (!openProject) {
-            throw new Error('File.Insert from project file')
-          }
-          openProject.click()
-        })
-        // Check that the command bar is opened
-        await expect(cmdBar.cmdBarElement).toBeVisible()
-        // Check the placeholder project name exists
-        const actual = await cmdBar.cmdBarElement
-          .getByTestId('command-name')
-          .textContent()
-        const expected = 'Insert'
-        expect(actual).toBe(expected)
-      })
       test('Modeling.File.Export current part', async ({
         tronApp,
         cmdBar,
@@ -2295,8 +2257,6 @@ test.describe('Native file menu', { tag: ['@electron'] }, () => {
         scene,
         toolbar,
       }) => {
-        // TODO: this test has been dead dead on the idle stream branch
-        test.fixme(orRunWhenFullSuiteEnabled())
         if (!tronApp) {
           throwTronAppMissing()
           return

e2e/playwright/point-click-assemblies.spec.ts

@@ -1,115 +0,0 @@
-import * as fsp from 'fs/promises'
-import path from 'path'
-
-import { executorInputPath } from '@e2e/playwright/test-utils'
-import { test } from '@e2e/playwright/zoo-test'
-
-// test file is for testing point an click code gen functionality that's assemblies related
-test.describe('Point-and-click assemblies tests', () => {
-  test(
-    `Insert kcl part into assembly as whole module import`,
-    { tag: ['@electron'] },
-    async ({
-      context,
-      page,
-      homePage,
-      scene,
-      editor,
-      toolbar,
-      cmdBar,
-      tronApp,
-    }) => {
-      if (!tronApp) {
-        fail()
-      }
-
-      // One dumb hardcoded screen pixel value
-      const testPoint = { x: 575, y: 200 }
-      const initialColor: [number, number, number] = [50, 50, 50]
-      const partColor: [number, number, number] = [150, 150, 150]
-      const tolerance = 50
-
-      await test.step('Setup parts and expect empty assembly scene', async () => {
-        const projectName = 'assembly'
-        await context.folderSetupFn(async (dir) => {
-          const bracketDir = path.join(dir, projectName)
-          await fsp.mkdir(bracketDir, { recursive: true })
-          await Promise.all([
-            fsp.copyFile(
-              executorInputPath('cylinder-inches.kcl'),
-              path.join(bracketDir, 'cylinder.kcl')
-            ),
-            fsp.copyFile(
-              executorInputPath('e2e-can-sketch-on-chamfer.kcl'),
-              path.join(bracketDir, 'bracket.kcl')
-            ),
-            fsp.writeFile(path.join(bracketDir, 'main.kcl'), ''),
-          ])
-        })
-        await page.setBodyDimensions({ width: 1000, height: 500 })
-        await homePage.openProject(projectName)
-        await scene.settled(cmdBar)
-        await scene.expectPixelColor(initialColor, testPoint, tolerance)
-      })
-
-      await test.step('Insert first part into the assembly', async () => {
-        await toolbar.insertButton.click()
-        await cmdBar.selectOption({ name: 'cylinder.kcl' }).click()
-        await cmdBar.expectState({
-          stage: 'arguments',
-          currentArgKey: 'localName',
-          currentArgValue: '',
-          headerArguments: { Path: 'cylinder.kcl', LocalName: '' },
-          highlightedHeaderArg: 'localName',
-          commandName: 'Insert',
-        })
-        await page.keyboard.insertText('cylinder')
-        await cmdBar.progressCmdBar()
-        await cmdBar.expectState({
-          stage: 'review',
-          headerArguments: { Path: 'cylinder.kcl', LocalName: 'cylinder' },
-          commandName: 'Insert',
-        })
-        await cmdBar.progressCmdBar()
-        await editor.expectEditor.toContain(
-          `
-        import "cylinder.kcl" as cylinder
-        cylinder
-      `,
-          { shouldNormalise: true }
-        )
-        await scene.expectPixelColor(partColor, testPoint, tolerance)
-      })
-
-      await test.step('Insert second part into the assembly', async () => {
-        await toolbar.insertButton.click()
-        await cmdBar.selectOption({ name: 'bracket.kcl' }).click()
-        await cmdBar.expectState({
-          stage: 'arguments',
-          currentArgKey: 'localName',
-          currentArgValue: '',
-          headerArguments: { Path: 'bracket.kcl', LocalName: '' },
-          highlightedHeaderArg: 'localName',
-          commandName: 'Insert',
-        })
-        await page.keyboard.insertText('bracket')
-        await cmdBar.progressCmdBar()
-        await cmdBar.expectState({
-          stage: 'review',
-          headerArguments: { Path: 'bracket.kcl', LocalName: 'bracket' },
-          commandName: 'Insert',
-        })
-        await cmdBar.progressCmdBar()
-        await editor.expectEditor.toContain(
-          `
-        import "cylinder.kcl" as cylinder
-        import "bracket.kcl" as bracket
-        cylinder
-        bracket
-      `,
-          { shouldNormalise: true }
-        )
-      })
-    }
-  )
-})

e2e/playwright/point-click.spec.ts

@@ -3766,17 +3766,16 @@ extrude001 = extrude(profile001, length = 100)
     // One dumb hardcoded screen pixel value
     const testPoint = { x: 500, y: 250 }
     const initialColor: [number, number, number] = [123, 123, 123]
-    const tolerance = 50
 
     await test.step(`Confirm extrude exists with default appearance`, async () => {
       await toolbar.closePane('code')
-      await scene.expectPixelColor(initialColor, testPoint, tolerance)
+      await scene.expectPixelColor(initialColor, testPoint, 15)
     })
 
     async function setApperanceAndCheck(
       option: string,
       hex: string,
-      shapeColor?: [number, number, number]
+      shapeColor: [number, number, number]
     ) {
       await toolbar.openPane('feature-tree')
       const enterAppearanceFlow = async (stepName: string) =>
@@ -3825,9 +3824,7 @@ extrude001 = extrude(profile001, length = 100)
       })
       await cmdBar.progressCmdBar()
       await toolbar.closePane('feature-tree')
-      if (shapeColor) {
-        await scene.expectPixelColor(shapeColor, testPoint, tolerance)
-      }
+      await scene.expectPixelColor(shapeColor, testPoint, 10)
       await toolbar.openPane('code')
       if (hex === 'default') {
         const anyAppearanceDeclaration = `|> appearance(`
@@ -3846,17 +3843,16 @@ extrude001 = extrude(profile001, length = 100)
     }
 
     await test.step(`Go through the Set Appearance flow for all options`, async () => {
-      await setApperanceAndCheck('Red', '#FF0000', [180, 30, 30])
-      // Not checking the scene color every time cause that's not really deterministic. Red seems reliable though
-      await setApperanceAndCheck('Green', '#00FF00')
-      await setApperanceAndCheck('Blue', '#0000FF')
-      await setApperanceAndCheck('Turquoise', '#00FFFF')
-      await setApperanceAndCheck('Purple', '#FF00FF')
-      await setApperanceAndCheck('Yellow', '#FFFF00')
-      await setApperanceAndCheck('Black', '#000000')
-      await setApperanceAndCheck('Dark Grey', '#080808')
-      await setApperanceAndCheck('Light Grey', '#D3D3D3')
-      await setApperanceAndCheck('White', '#FFFFFF')
+      await setApperanceAndCheck('Red', '#FF0000', [180, 0, 0])
+      await setApperanceAndCheck('Green', '#00FF00', [0, 180, 0])
+      await setApperanceAndCheck('Blue', '#0000FF', [0, 0, 180])
+      await setApperanceAndCheck('Turquoise', '#00FFFF', [0, 180, 180])
+      await setApperanceAndCheck('Purple', '#FF00FF', [180, 0, 180])
+      await setApperanceAndCheck('Yellow', '#FFFF00', [180, 180, 0])
+      await setApperanceAndCheck('Black', '#000000', [0, 0, 0])
+      await setApperanceAndCheck('Dark Grey', '#080808', [0x33, 0x33, 0x33])
+      await setApperanceAndCheck('Light Grey', '#D3D3D3', [176, 176, 176])
+      await setApperanceAndCheck('White', '#FFFFFF', [184, 184, 184])
       await setApperanceAndCheck(
         'Default (clear appearance)',
         'default',

e2e/playwright/storageStates.ts

@@ -80,8 +80,7 @@ export const TEST_SETTINGS_CORRUPTED = {
   },
 } satisfies Partial<SaveSettingsPayload>
 
-export const TEST_CODE_GIZMO = `@settings(defaultLengthUnit = in)
-part001 = startSketchOn(XZ)
+export const TEST_CODE_GIZMO = `part001 = startSketchOn(XZ)
 |> startProfileAt([20, 0], %)
 |> line(end = [7.13, 4 + 0])
 |> angledLine({ angle: 3 + 0, length: 3.14 + 0 }, %)

e2e/playwright/testing-gizmo.spec.ts

@@ -8,37 +8,37 @@ test.describe('Testing Gizmo', { tag: ['@skipWin'] }, () => {
   const cases = [
     {
       testDescription: 'top view',
-      clickPosition: { x: 951, y: 385 },
+      clickPosition: { x: 951, y: 347 },
       expectedCameraPosition: { x: 800, y: -152, z: 4886.02 },
       expectedCameraTarget: { x: 800, y: -152, z: 26 },
     },
     {
       testDescription: 'bottom view',
-      clickPosition: { x: 951, y: 429 },
+      clickPosition: { x: 951, y: 391 },
       expectedCameraPosition: { x: 800, y: -152, z: -4834.02 },
       expectedCameraTarget: { x: 800, y: -152, z: 26 },
     },
     {
       testDescription: 'right view',
-      clickPosition: { x: 929, y: 417 },
+      clickPosition: { x: 929, y: 379 },
       expectedCameraPosition: { x: 5660.02, y: -152, z: 26 },
       expectedCameraTarget: { x: 800, y: -152, z: 26 },
     },
     {
       testDescription: 'left view',
-      clickPosition: { x: 974, y: 397 },
+      clickPosition: { x: 974, y: 359 },
       expectedCameraPosition: { x: -4060.02, y: -152, z: 26 },
       expectedCameraTarget: { x: 800, y: -152, z: 26 },
     },
     {
       testDescription: 'back view',
-      clickPosition: { x: 967, y: 421 },
+      clickPosition: { x: 967, y: 383 },
       expectedCameraPosition: { x: 800, y: 4708.02, z: 26 },
       expectedCameraTarget: { x: 800, y: -152, z: 26 },
     },
     {
       testDescription: 'front view',
-      clickPosition: { x: 935, y: 393 },
+      clickPosition: { x: 935, y: 355 },
       expectedCameraPosition: { x: 800, y: -5012.02, z: 26 },
       expectedCameraTarget: { x: 800, y: -152, z: 26 },
     },

e2e/playwright/testing-perspective-toggle.spec.ts

@@ -2,11 +2,7 @@ import { getUtils, orRunWhenFullSuiteEnabled } from '@e2e/playwright/test-utils'
 import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Test toggling perspective', () => {
-  test('via command palette and toggle', async ({
-    page,
-    homePage,
-    toolbar,
-  }) => {
+  test('via command palette and toggle', async ({ page, homePage }) => {
     test.fixme(orRunWhenFullSuiteEnabled())
     const u = await getUtils(page)
 
@@ -18,7 +14,7 @@ test.describe('Test toggling perspective', () => {
       y: screenHeight * 0.2,
     }
     const backgroundColor: [number, number, number] = [29, 29, 29]
-    const xzPlaneColor: [number, number, number] = [72, 55, 96]
+    const xzPlaneColor: [number, number, number] = [82, 55, 96]
     const locationToHaveColor = async (color: [number, number, number]) => {
       return u.getGreatestPixDiff(checkedScreenLocation, color)
     }
@@ -30,29 +26,9 @@ test.describe('Test toggling perspective', () => {
     const commandToast = page.getByText(
       `Set camera projection to "orthographic"`
     )
-
-    const checkSettingValue = async () => {
-      const settingsButton = page.getByRole('link', {
-        name: 'Settings',
-        exact: false,
-      })
-
-      let settingValue: string | null = null
-
-      await test.step(`Check the setting value`, async () => {
-        await settingsButton.click()
-        const userTab = page.getByRole('radio', { name: 'User' })
-        await userTab.click()
-        await expect(userTab).toBeChecked()
-        const setting = page.locator('#cameraProjection').first()
-        await expect(setting).toBeAttached()
-        await setting.scrollIntoViewIfNeeded()
-        settingValue = await setting.getByRole('combobox').inputValue()
-        await page.getByTestId('settings-close-button').click()
-      })
-
-      return settingValue
-    }
+    const projectionToggle = page.getByRole('switch', {
+      name: 'Camera projection: ',
+    })
 
     await test.step('Setup', async () => {
       await page.setBodyDimensions({ width: screenWidth, height: screenHeight })
@@ -63,8 +39,8 @@ test.describe('Test toggling perspective', () => {
           timeout: 5000,
           message: 'This spot should have the background color',
         })
-        .toBeLessThan(30)
-      expect(await checkSettingValue()).toBe('perspective')
+        .toBeLessThan(15)
+      await expect(projectionToggle).toHaveAttribute('aria-checked', 'true')
     })
 
     // Extremely wild note: flicking between ortho and persp actually changes
@@ -83,22 +59,33 @@ test.describe('Test toggling perspective', () => {
           timeout: 5000,
           message: 'This spot should have the XZ plane color',
         })
-        .toBeLessThan(30)
-      expect(await checkSettingValue()).toBe('orthographic')
+        .toBeLessThan(15)
+      await expect(projectionToggle).toHaveAttribute('aria-checked', 'false')
     })
 
     await test.step(`Refresh the page and ensure the stream is loaded in ortho`, async () => {
       await page.reload()
-      await expect(toolbar.startSketchBtn).toBeEnabled({ timeout: 15_000 })
+      await page.waitForTimeout(1000)
       await u.closeKclCodePanel()
       await expect
         .poll(async () => locationToHaveColor(xzPlaneColor), {
           timeout: 5000,
           message: 'This spot should have the XZ plane color',
         })
-        .toBeLessThan(30)
+        .toBeLessThan(15)
       await expect(commandToast).not.toBeVisible()
-      expect(await checkSettingValue()).toBe('orthographic')
+      await expect(projectionToggle).toHaveAttribute('aria-checked', 'false')
+    })
+
+    await test.step(`Switch to perspective via toggle`, async () => {
+      await projectionToggle.click()
+      await expect(projectionToggle).toHaveAttribute('aria-checked', 'true')
+      await expect
+        .poll(async () => locationToHaveColor(backgroundColor), {
+          timeout: 5000,
+          message: 'This spot should have the background color',
+        })
+        .toBeLessThan(15)
     })
   })
 })

e2e/playwright/testing-samples-loading.spec.ts

@@ -8,8 +8,8 @@ import { expect, test } from '@e2e/playwright/zoo-test'
 
 test.describe('Testing in-app sample loading', () => {
   /**
-   * Note this test implicitly depends on the KCL sample "parametric-bearing-pillow-block",
-   * its title, and its units settings. https://github.com/KittyCAD/kcl-samples/blob/main/parametric-bearing-pillow-block/main.kcl
+   * Note this test implicitly depends on the KCL sample "a-parametric-bearing-pillow-block",
+   * its title, and its units settings. https://github.com/KittyCAD/kcl-samples/blob/main/a-parametric-bearing-pillow-block/main.kcl
    */
   // We have no more web tests
   test.skip('Web: should overwrite current code, cannot create new file', async ({
@@ -30,8 +30,8 @@ test.describe('Testing in-app sample loading', () => {
 
     // Locators and constants
     const newSample = {
-      file: 'parametric-bearing-pillow-block' + FILE_EXT,
-      title: 'Parametric Bearing Pillow Block',
+      file: 'a-parametric-bearing-pillow-block' + FILE_EXT,
+      title: 'A Parametric Bearing Pillow Block',
     }
     const commandBarButton = page.getByRole('button', { name: 'Commands' })
     const samplesCommandOption = page.getByRole('option', {
@@ -73,7 +73,7 @@ test.describe('Testing in-app sample loading', () => {
 
   /**
    * Note this test implicitly depends on the KCL samples:
-   * "parametric-bearing-pillow-block": https://github.com/KittyCAD/kcl-samples/blob/main/parametric-bearing-pillow-block/main.kcl
+   * "a-parametric-bearing-pillow-block": https://github.com/KittyCAD/kcl-samples/blob/main/a-parametric-bearing-pillow-block/main.kcl
    * "gear-rack": https://github.com/KittyCAD/kcl-samples/blob/main/gear-rack/main.kcl
    */
   test(
@@ -91,8 +91,8 @@ test.describe('Testing in-app sample loading', () => {
 
       // Locators and constants
       const sampleOne = {
-        file: 'parametric-bearing-pillow-block' + FILE_EXT,
-        title: 'Parametric Bearing Pillow Block',
+        file: 'a-parametric-bearing-pillow-block' + FILE_EXT,
+        title: 'A Parametric Bearing Pillow Block',
       }
       const sampleTwo = {
         file: 'gear-rack' + FILE_EXT,

e2e/playwright/testing-selections.spec.ts

@@ -662,8 +662,8 @@ part001 = startSketchOn(XZ)
               for (const rgb of RGBs) {
                 const [r, g, b] = rgb
                 const RGAverage = (r + g) / 2
-                const isRedGreenSameIsh = Math.abs(r - g) < 10
-                const isBlueLessThanRG = RGAverage - b > 40
+                const isRedGreenSameIsh = Math.abs(r - g) < 3
+                const isBlueLessThanRG = RGAverage - b > 45
                 const isYellowy = isRedGreenSameIsh && isBlueLessThanRG
                 if (isYellowy) return true
               }

e2e/playwright/various.spec.ts

@@ -612,12 +612,3 @@ profile001 = startProfileAt([-12.34, 12.34], sketch002)
 const sketch002 = extrude(sketch002, length = ${[5, 5]} + 7)`
   await expect(page.locator('.cm-content')).toHaveText(result2.regExp)
 })
-
-test.fixme(
-  `Opening a share link in the web isn't blocked by the web warning banner`,
-  async () => {
-    // This test is not able to be run right now since we don't have a web-only setup for Playwright.
-    // @franknoirot can implement it when that testing infra is set up. It should be a test to cover the fix from
-    // modeling-app issue #6172.
-  }
-)

electron-builder.yml

@@ -4,7 +4,6 @@ directories:
   buildResources: assets
 files:
   - .vite/**
-  - "!node_modules/win-ca/pem/**"
 mac:
   category: public.app-category.developer-tools
   artifactName: "${productName}-${version}-${arch}-${os}.${ext}"

flake.nix

@@ -19,14 +19,9 @@
         (self: super: {
           rustToolchain = super. rust-bin.stable.latest.default.override {
             targets = [ "wasm32-unknown-unknown" ];
-            extensions = [ "rustfmt" "llvm-tools-preview" "rust-src" ];
+            extensions = [ "rustfmt" "llvm-tools-preview" ];
           };
         })
-        (self: super: {
-          cargo-llvm-cov = super.cargo-llvm-cov.overrideAttrs(oa: {
-            doCheck = false; doInstallCheck = false;
-          });
-        })
       ];
 
       # Systems supported
@@ -39,7 +34,7 @@
 
       # Helper to provide system-specific attributes
       forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f {
-        pkgs = import nixpkgs { inherit overlays system; config.allowBroken = true; };
+        pkgs = import nixpkgs { inherit overlays system; };
       });
 
     in
@@ -67,7 +62,7 @@
             electron
             playwright-driver.browsers
           ]) ++ pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
-            libiconv
+            libiconv 
             darwin.apple_sdk.frameworks.Security
           ]);
 

package.json

@@ -26,7 +26,7 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@headlessui/react": "^1.7.19",
     "@headlessui/tailwindcss": "^0.2.2",
-    "@kittycad/lib": "2.0.28",
+    "@kittycad/lib": "2.0.26",
     "@lezer/highlight": "^1.2.1",
     "@lezer/lr": "^1.4.1",
     "@react-hook/resize-observer": "^2.0.1",
@@ -59,14 +59,13 @@
     "react-modal-promise": "^1.0.2",
     "react-router-dom": "^6.28.0",
     "sketch-helpers": "^0.0.4",
-    "three": "^0.175.0",
+    "three": "^0.174.0",
     "ua-parser-js": "^1.0.37",
     "uuid": "^11.1.0",
     "vscode-jsonrpc": "^8.2.1",
     "vscode-languageserver-protocol": "^3.17.5",
     "vscode-uri": "^3.1.0",
     "web-vitals": "^3.5.2",
-    "win-ca": "^3.5.1",
     "xstate": "^5.19.2",
     "yargs": "^17.7.2"
   },
@@ -173,13 +172,13 @@
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/preset-env": "^7.26.9",
-    "@electron-forge/cli": "^7.8.0",
-    "@electron-forge/plugin-fuses": "^7.8.0",
-    "@electron-forge/plugin-vite": "^7.8.0",
+    "@electron-forge/cli": "^7.7.0",
+    "@electron-forge/plugin-fuses": "^7.7.0",
+    "@electron-forge/plugin-vite": "^7.7.0",
     "@electron/fuses": "^1.8.0",
     "@electron/notarize": "^2.5.0",
     "@iarna/toml": "^2.2.5",
-    "@lezer/generator": "^1.7.3",
+    "@lezer/generator": "^1.7.2",
     "@nabla/vite-plugin-eslint": "^2.0.5",
     "@playwright/test": "^1.51.1",
     "@testing-library/jest-dom": "^5.14.1",
@@ -190,17 +189,17 @@
     "@types/isomorphic-fetch": "^0.0.39",
     "@types/minimist": "^1.2.5",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^22.14.0",
+    "@types/node": "^22.13.14",
     "@types/pixelmatch": "^5.2.6",
     "@types/pngjs": "^6.0.4",
     "@types/react": "^18.3.4",
     "@types/react-dom": "^18.3.1",
     "@types/react-modal": "^3.16.3",
-    "@types/three": "^0.175.0",
+    "@types/three": "^0.174.0",
     "@types/ua-parser-js": "^0.7.39",
     "@types/uuid": "^9.0.8",
-    "@types/wicg-file-system-access": "^2023.10.6",
-    "@types/ws": "^8.18.1",
+    "@types/wicg-file-system-access": "^2023.10.5",
+    "@types/ws": "^8.18.0",
     "@vitejs/plugin-react": "^4.3.4",
     "@vitest/web-worker": "^1.5.0",
     "@xstate/cli": "^0.5.17",
@@ -213,7 +212,7 @@
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jest": "^28.11.0",
     "eslint-plugin-jsx-a11y": "^6.10.2",
-    "eslint-plugin-react": "^7.37.5",
+    "eslint-plugin-react": "^7.37.4",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-perf": "^3.3.3",
     "eslint-plugin-suggest-no-throw": "^1.0.0",
@@ -232,9 +231,9 @@
     "setimmediate": "^1.0.5",
     "tailwindcss": "^3.4.17",
     "ts-node": "^10.0.0",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.29.0",
-    "vite": "^5.4.17",
+    "typescript": "^5.8.2",
+    "typescript-eslint": "^8.26.1",
+    "vite": "^5.4.16",
     "vite-plugin-package-version": "^1.1.0",
     "vite-plugin-top-level-await": "^1.5.0",
     "vite-tsconfig-paths": "^4.3.2",

packages/codemirror-lang-kcl/package.json

@@ -19,17 +19,17 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "@codemirror/language": "^6.10.3",
-    "@codemirror/state": "^6.5.2",
+    "@codemirror/state": "^6.4.1",
     "@lezer/highlight": "^1.2.1",
     "typescript": "^5.7.2"
   },
   "devDependencies": {
-    "@lezer/generator": "^1.7.3",
+    "@lezer/generator": "^1.7.2",
     "@rollup/plugin-typescript": "^12.1.2",
     "rollup": "^4.29.1",
     "rollup-plugin-dts": "^6.1.1",
-    "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^3.1.1"
+    "vite-tsconfig-paths": "^4.3.2",
+    "vitest": "^2.1.9"
   },
   "files": [
     "dist/"

packages/codemirror-lang-kcl/yarn.lock

@@ -28,10 +28,10 @@
     "@lezer/lr" "^1.0.0"
     style-mod "^4.0.0"
 
-"@codemirror/state@^6.0.0", "@codemirror/state@^6.5.0", "@codemirror/state@^6.5.2":
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.5.2.tgz#8eca3a64212a83367dc85475b7d78d5c9b7076c6"
-  integrity sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==
+"@codemirror/state@^6.0.0", "@codemirror/state@^6.4.1", "@codemirror/state@^6.5.0":
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.5.0.tgz#e98dde85620618651543152fe1c2483300a0ccc9"
+  integrity sha512-MwBHVK60IiIHDcoMet78lxt6iw5gJOGSbNbOIVBHWVXIH4/Nq1+GQgLLGgI1KlnN86WDXsPudVaqYHKBIx7Eyw==
   dependencies:
     "@marijn/find-cluster-break" "^1.0.0"
 
@@ -44,130 +44,120 @@
     style-mod "^4.1.0"
     w3c-keyname "^2.2.4"
 
-"@esbuild/aix-ppc64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz#b87036f644f572efb2b3c75746c97d1d2d87ace8"
-  integrity sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==
+"@esbuild/aix-ppc64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f"
+  integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==
 
-"@esbuild/android-arm64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.2.tgz#5ca7dc20a18f18960ad8d5e6ef5cf7b0a256e196"
-  integrity sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==
+"@esbuild/android-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052"
+  integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==
 
-"@esbuild/android-arm@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.2.tgz#3c49f607b7082cde70c6ce0c011c362c57a194ee"
-  integrity sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==
+"@esbuild/android-arm@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28"
+  integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==
 
-"@esbuild/android-x64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.2.tgz#8a00147780016aff59e04f1036e7cb1b683859e2"
-  integrity sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==
+"@esbuild/android-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e"
+  integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==
 
-"@esbuild/darwin-arm64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.2.tgz#486efe7599a8d90a27780f2bb0318d9a85c6c423"
-  integrity sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==
+"@esbuild/darwin-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a"
+  integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==
 
-"@esbuild/darwin-x64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.2.tgz#95ee222aacf668c7a4f3d7ee87b3240a51baf374"
-  integrity sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==
+"@esbuild/darwin-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22"
+  integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==
 
-"@esbuild/freebsd-arm64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.2.tgz#67efceda8554b6fc6a43476feba068fb37fa2ef6"
-  integrity sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==
+"@esbuild/freebsd-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e"
+  integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==
 
-"@esbuild/freebsd-x64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.2.tgz#88a9d7ecdd3adadbfe5227c2122d24816959b809"
-  integrity sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==
+"@esbuild/freebsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261"
+  integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==
 
-"@esbuild/linux-arm64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz#87be1099b2bbe61282333b084737d46bc8308058"
-  integrity sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==
+"@esbuild/linux-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b"
+  integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==
 
-"@esbuild/linux-arm@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.2.tgz#72a285b0fe64496e191fcad222185d7bf9f816f6"
-  integrity sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==
+"@esbuild/linux-arm@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9"
+  integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==
 
-"@esbuild/linux-ia32@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.2.tgz#337a87a4c4dd48a832baed5cbb022be20809d737"
-  integrity sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==
+"@esbuild/linux-ia32@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2"
+  integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==
 
-"@esbuild/linux-loong64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.2.tgz#1b81aa77103d6b8a8cfa7c094ed3d25c7579ba2a"
-  integrity sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==
+"@esbuild/linux-loong64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df"
+  integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==
 
-"@esbuild/linux-mips64el@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.2.tgz#afbe380b6992e7459bf7c2c3b9556633b2e47f30"
-  integrity sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==
+"@esbuild/linux-mips64el@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe"
+  integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==
 
-"@esbuild/linux-ppc64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.2.tgz#6bf8695cab8a2b135cca1aa555226dc932d52067"
-  integrity sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==
+"@esbuild/linux-ppc64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4"
+  integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==
 
-"@esbuild/linux-riscv64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.2.tgz#43c2d67a1a39199fb06ba978aebb44992d7becc3"
-  integrity sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==
+"@esbuild/linux-riscv64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc"
+  integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==
 
-"@esbuild/linux-s390x@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.2.tgz#419e25737ec815c6dce2cd20d026e347cbb7a602"
-  integrity sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==
+"@esbuild/linux-s390x@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de"
+  integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==
 
-"@esbuild/linux-x64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.2.tgz#22451f6edbba84abe754a8cbd8528ff6e28d9bcb"
-  integrity sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==
+"@esbuild/linux-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0"
+  integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==
 
-"@esbuild/netbsd-arm64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.2.tgz#744affd3b8d8236b08c5210d828b0698a62c58ac"
-  integrity sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==
+"@esbuild/netbsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047"
+  integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==
 
-"@esbuild/netbsd-x64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.2.tgz#dbbe7521fd6d7352f34328d676af923fc0f8a78f"
-  integrity sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==
+"@esbuild/openbsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70"
+  integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==
 
-"@esbuild/openbsd-arm64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.2.tgz#f9caf987e3e0570500832b487ce3039ca648ce9f"
-  integrity sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==
+"@esbuild/sunos-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b"
+  integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==
 
-"@esbuild/openbsd-x64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.2.tgz#d2bb6a0f8ffea7b394bb43dfccbb07cabd89f768"
-  integrity sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==
+"@esbuild/win32-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d"
+  integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==
 
-"@esbuild/sunos-x64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.2.tgz#49b437ed63fe333b92137b7a0c65a65852031afb"
-  integrity sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==
+"@esbuild/win32-ia32@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b"
+  integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==
 
-"@esbuild/win32-arm64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.2.tgz#081424168463c7d6c7fb78f631aede0c104373cf"
-  integrity sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==
-
-"@esbuild/win32-ia32@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.2.tgz#3f9e87143ddd003133d21384944a6c6cadf9693f"
-  integrity sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==
-
-"@esbuild/win32-x64@0.25.2":
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.2.tgz#839f72c2decd378f86b8f525e1979a97b920c67d"
-  integrity sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==
+"@esbuild/win32-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c"
+  integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==
 
 "@jridgewell/sourcemap-codec@^1.5.0":
   version "1.5.0"
@@ -179,10 +169,10 @@
   resolved "https://registry.yarnpkg.com/@lezer/common/-/common-1.2.3.tgz#138fcddab157d83da557554851017c6c1e5667fd"
   integrity sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==
 
-"@lezer/generator@^1.7.3":
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/@lezer/generator/-/generator-1.7.3.tgz#8bf9e99c7690dd31327425ca46706a380413f54d"
-  integrity sha512-vAI2O1tPF8QMMgp+bdUeeJCneJNkOZvqsrtyb4ohnFVFdboSqPwBEacnt0HH4E+5h+qsIwTHUSAhffU4hzKl1A==
+"@lezer/generator@^1.7.2":
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/@lezer/generator/-/generator-1.7.2.tgz#a491c91eb9f117ea803e748fa97574514156a2a3"
+  integrity sha512-CwgULPOPPmH54tv4gki18bElLCdJ1+FBC+nGVSVD08vFWDsMjS7KEjNTph9JOypDnet90ujN3LzQiW3CyVODNQ==
   dependencies:
     "@lezer/common" "^1.1.0"
     "@lezer/lr" "^1.3.0"
@@ -228,264 +218,159 @@
   resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.29.1.tgz#9bd38df6a29afb7f0336d988bc8112af0c8816c0"
   integrity sha512-ssKhA8RNltTZLpG6/QNkCSge+7mBQGUqJRisZ2MDQcEGaK93QESEgWK2iOpIDZ7k9zPVkG5AS3ksvD5ZWxmItw==
 
-"@rollup/rollup-android-arm-eabi@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.39.0.tgz#1d8cc5dd3d8ffe569d8f7f67a45c7909828a0f66"
-  integrity sha512-lGVys55Qb00Wvh8DMAocp5kIcaNzEFTmGhfFd88LfaogYTRKrdxgtlO5H6S49v2Nd8R2C6wLOal0qv6/kCkOwA==
-
 "@rollup/rollup-android-arm64@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.29.1.tgz#bd1a98390e15b76eeef907175a37c5f0f9e4d214"
   integrity sha512-CaRfrV0cd+NIIcVVN/jx+hVLN+VRqnuzLRmfmlzpOzB87ajixsN/+9L5xNmkaUUvEbI5BmIKS+XTwXsHEb65Ew==
 
-"@rollup/rollup-android-arm64@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.39.0.tgz#9c136034d3d9ed29d0b138c74dd63c5744507fca"
-  integrity sha512-It9+M1zE31KWfqh/0cJLrrsCPiF72PoJjIChLX+rEcujVRCb4NLQ5QzFkzIZW8Kn8FTbvGQBY5TkKBau3S8cCQ==
-
 "@rollup/rollup-darwin-arm64@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.29.1.tgz#bc6fa8a2cc77b5f367424e5e994e3537524e6879"
   integrity sha512-2ORr7T31Y0Mnk6qNuwtyNmy14MunTAMx06VAPI6/Ju52W10zk1i7i5U3vlDRWjhOI5quBcrvhkCHyF76bI7kEw==
 
-"@rollup/rollup-darwin-arm64@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.39.0.tgz#830d07794d6a407c12b484b8cf71affd4d3800a6"
-  integrity sha512-lXQnhpFDOKDXiGxsU9/l8UEGGM65comrQuZ+lDcGUx+9YQ9dKpF3rSEGepyeR5AHZ0b5RgiligsBhWZfSSQh8Q==
-
 "@rollup/rollup-darwin-x64@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.29.1.tgz#76059c91f06b17406347b127df10f065283b2e61"
   integrity sha512-j/Ej1oanzPjmN0tirRd5K2/nncAhS9W6ICzgxV+9Y5ZsP0hiGhHJXZ2JQ53iSSjj8m6cRY6oB1GMzNn2EUt6Ng==
 
-"@rollup/rollup-darwin-x64@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.39.0.tgz#b26f0f47005c1fa5419a880f323ed509dc8d885c"
-  integrity sha512-mKXpNZLvtEbgu6WCkNij7CGycdw9cJi2k9v0noMb++Vab12GZjFgUXD69ilAbBh034Zwn95c2PNSz9xM7KYEAQ==
-
 "@rollup/rollup-freebsd-arm64@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.29.1.tgz#83178315c0be4b4c8c1fd835e1952d2dc1eb4e6e"
   integrity sha512-91C//G6Dm/cv724tpt7nTyP+JdN12iqeXGFM1SqnljCmi5yTXriH7B1r8AD9dAZByHpKAumqP1Qy2vVNIdLZqw==
 
-"@rollup/rollup-freebsd-arm64@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.39.0.tgz#2b60c81ac01ff7d1bc8df66aee7808b6690c6d19"
-  integrity sha512-jivRRlh2Lod/KvDZx2zUR+I4iBfHcu2V/BA2vasUtdtTN2Uk3jfcZczLa81ESHZHPHy4ih3T/W5rPFZ/hX7RtQ==
-
 "@rollup/rollup-freebsd-x64@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.29.1.tgz#1ef24fa0576bf7899a0a0a649156606dbd7a0d46"
   integrity sha512-hEioiEQ9Dec2nIRoeHUP6hr1PSkXzQaCUyqBDQ9I9ik4gCXQZjJMIVzoNLBRGet+hIUb3CISMh9KXuCcWVW/8w==
 
-"@rollup/rollup-freebsd-x64@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.39.0.tgz#4826af30f4d933d82221289068846c9629cc628c"
-  integrity sha512-8RXIWvYIRK9nO+bhVz8DwLBepcptw633gv/QT4015CpJ0Ht8punmoHU/DuEd3iw9Hr8UwUV+t+VNNuZIWYeY7Q==
-
 "@rollup/rollup-linux-arm-gnueabihf@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.29.1.tgz#443a6f5681bf4611caae42988994a6d8ee676216"
   integrity sha512-Py5vFd5HWYN9zxBv3WMrLAXY3yYJ6Q/aVERoeUFwiDGiMOWsMs7FokXihSOaT/PMWUty/Pj60XDQndK3eAfE6A==
 
-"@rollup/rollup-linux-arm-gnueabihf@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.39.0.tgz#a1f4f963d5dcc9e5575c7acf9911824806436bf7"
-  integrity sha512-mz5POx5Zu58f2xAG5RaRRhp3IZDK7zXGk5sdEDj4o96HeaXhlUwmLFzNlc4hCQi5sGdR12VDgEUqVSHer0lI9g==
-
 "@rollup/rollup-linux-arm-musleabihf@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.29.1.tgz#9738b27184102228637a683e5f35b22ea352394f"
   integrity sha512-RiWpGgbayf7LUcuSNIbahr0ys2YnEERD4gYdISA06wa0i8RALrnzflh9Wxii7zQJEB2/Eh74dX4y/sHKLWp5uQ==
 
-"@rollup/rollup-linux-arm-musleabihf@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.39.0.tgz#e924b0a8b7c400089146f6278446e6b398b75a06"
-  integrity sha512-+YDwhM6gUAyakl0CD+bMFpdmwIoRDzZYaTWV3SDRBGkMU/VpIBYXXEvkEcTagw/7VVkL2vA29zU4UVy1mP0/Yw==
-
 "@rollup/rollup-linux-arm64-gnu@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.29.1.tgz#b5e9d5e30ff36a19bedd29c715ba18a1889ff269"
   integrity sha512-Z80O+taYxTQITWMjm/YqNoe9d10OX6kDh8X5/rFCMuPqsKsSyDilvfg+vd3iXIqtfmp+cnfL1UrYirkaF8SBZA==
 
-"@rollup/rollup-linux-arm64-gnu@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.39.0.tgz#cb43303274ec9a716f4440b01ab4e20c23aebe20"
-  integrity sha512-EKf7iF7aK36eEChvlgxGnk7pdJfzfQbNvGV/+l98iiMwU23MwvmV0Ty3pJ0p5WQfm3JRHOytSIqD9LB7Bq7xdQ==
-
 "@rollup/rollup-linux-arm64-musl@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.29.1.tgz#1d8f68f0829b57f746ec03432ad046f1af014a98"
   integrity sha512-fOHRtF9gahwJk3QVp01a/GqS4hBEZCV1oKglVVq13kcK3NeVlS4BwIFzOHDbmKzt3i0OuHG4zfRP0YoG5OF/rA==
 
-"@rollup/rollup-linux-arm64-musl@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.39.0.tgz#531c92533ce3d167f2111bfcd2aa1a2041266987"
-  integrity sha512-vYanR6MtqC7Z2SNr8gzVnzUul09Wi1kZqJaek3KcIlI/wq5Xtq4ZPIZ0Mr/st/sv/NnaPwy/D4yXg5x0B3aUUA==
-
 "@rollup/rollup-linux-loongarch64-gnu@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.29.1.tgz#07027feb883408e74a3002c8e50caaedd288ae38"
   integrity sha512-5a7q3tnlbcg0OodyxcAdrrCxFi0DgXJSoOuidFUzHZ2GixZXQs6Tc3CHmlvqKAmOs5eRde+JJxeIf9DonkmYkw==
 
-"@rollup/rollup-linux-loongarch64-gnu@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.39.0.tgz#53403889755d0c37c92650aad016d5b06c1b061a"
-  integrity sha512-NMRUT40+h0FBa5fb+cpxtZoGAggRem16ocVKIv5gDB5uLDgBIwrIsXlGqYbLwW8YyO3WVTk1FkFDjMETYlDqiw==
-
 "@rollup/rollup-linux-powerpc64le-gnu@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.29.1.tgz#544ce1b0847a9c1240425e86f33daceac7ec4e12"
   integrity sha512-9b4Mg5Yfz6mRnlSPIdROcfw1BU22FQxmfjlp/CShWwO3LilKQuMISMTtAu/bxmmrE6A902W2cZJuzx8+gJ8e9w==
 
-"@rollup/rollup-linux-powerpc64le-gnu@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.39.0.tgz#f669f162e29094c819c509e99dbeced58fc708f9"
-  integrity sha512-0pCNnmxgduJ3YRt+D+kJ6Ai/r+TaePu9ZLENl+ZDV/CdVczXl95CbIiwwswu4L+K7uOIGf6tMo2vm8uadRaICQ==
-
 "@rollup/rollup-linux-riscv64-gnu@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.29.1.tgz#64be13d51852ec1e2dfbd25d997ed5f42f35ea6d"
   integrity sha512-G5pn0NChlbRM8OJWpJFMX4/i8OEU538uiSv0P6roZcbpe/WfhEO+AT8SHVKfp8qhDQzaz7Q+1/ixMy7hBRidnQ==
 
-"@rollup/rollup-linux-riscv64-gnu@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.39.0.tgz#4bab37353b11bcda5a74ca11b99dea929657fd5f"
-  integrity sha512-t7j5Zhr7S4bBtksT73bO6c3Qa2AV/HqiGlj9+KB3gNF5upcVkx+HLgxTm8DK4OkzsOYqbdqbLKwvGMhylJCPhQ==
-
-"@rollup/rollup-linux-riscv64-musl@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.39.0.tgz#4d66be1ce3cfd40a7910eb34dddc7cbd4c2dd2a5"
-  integrity sha512-m6cwI86IvQ7M93MQ2RF5SP8tUjD39Y7rjb1qjHgYh28uAPVU8+k/xYWvxRO3/tBN2pZkSMa5RjnPuUIbrwVxeA==
-
 "@rollup/rollup-linux-s390x-gnu@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.29.1.tgz#31f51e1e05c6264552d03875d9e2e673f0fd86e3"
   integrity sha512-WM9lIkNdkhVwiArmLxFXpWndFGuOka4oJOZh8EP3Vb8q5lzdSCBuhjavJsw68Q9AKDGeOOIHYzYm4ZFvmWez5g==
 
-"@rollup/rollup-linux-s390x-gnu@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.39.0.tgz#7181c329395ed53340a0c59678ad304a99627f6d"
-  integrity sha512-iRDJd2ebMunnk2rsSBYlsptCyuINvxUfGwOUldjv5M4tpa93K8tFMeYGpNk2+Nxl+OBJnBzy2/JCscGeO507kA==
-
 "@rollup/rollup-linux-x64-gnu@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.29.1.tgz#f4c95b26f4ad69ebdb64b42f0ae4da2a0f617958"
   integrity sha512-87xYCwb0cPGZFoGiErT1eDcssByaLX4fc0z2nRM6eMtV9njAfEE6OW3UniAoDhX4Iq5xQVpE6qO9aJbCFumKYQ==
 
-"@rollup/rollup-linux-x64-gnu@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.39.0.tgz#00825b3458094d5c27cb4ed66e88bfe9f1e65f90"
-  integrity sha512-t9jqYw27R6Lx0XKfEFe5vUeEJ5pF3SGIM6gTfONSMb7DuG6z6wfj2yjcoZxHg129veTqU7+wOhY6GX8wmf90dA==
-
 "@rollup/rollup-linux-x64-musl@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.29.1.tgz#ab7be89192f72beb9ea6e2386186fefde4f69d82"
   integrity sha512-xufkSNppNOdVRCEC4WKvlR1FBDyqCSCpQeMMgv9ZyXqqtKBfkw1yfGMTUTs9Qsl6WQbJnsGboWCp7pJGkeMhKA==
 
-"@rollup/rollup-linux-x64-musl@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.39.0.tgz#81caac2a31b8754186f3acc142953a178fcd6fba"
-  integrity sha512-ThFdkrFDP55AIsIZDKSBWEt/JcWlCzydbZHinZ0F/r1h83qbGeenCt/G/wG2O0reuENDD2tawfAj2s8VK7Bugg==
-
 "@rollup/rollup-win32-arm64-msvc@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.29.1.tgz#7f12efb8240b238346951559998802722944421e"
   integrity sha512-F2OiJ42m77lSkizZQLuC+jiZ2cgueWQL5YC9tjo3AgaEw+KJmVxHGSyQfDUoYR9cci0lAywv2Clmckzulcq6ig==
 
-"@rollup/rollup-win32-arm64-msvc@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.39.0.tgz#3a3f421f5ce9bd99ed20ce1660cce7cee3e9f199"
-  integrity sha512-jDrLm6yUtbOg2TYB3sBF3acUnAwsIksEYjLeHL+TJv9jg+TmTwdyjnDex27jqEMakNKf3RwwPahDIt7QXCSqRQ==
-
 "@rollup/rollup-win32-ia32-msvc@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.29.1.tgz#353d14d6eee943004d129796e4feddd3aa260921"
   integrity sha512-rYRe5S0FcjlOBZQHgbTKNrqxCBUmgDJem/VQTCcTnA2KCabYSWQDrytOzX7avb79cAAweNmMUb/Zw18RNd4mng==
 
-"@rollup/rollup-win32-ia32-msvc@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.39.0.tgz#a44972d5cdd484dfd9cf3705a884bf0c2b7785a7"
-  integrity sha512-6w9uMuza+LbLCVoNKL5FSLE7yvYkq9laSd09bwS0tMjkwXrmib/4KmoJcrKhLWHvw19mwU+33ndC69T7weNNjQ==
-
 "@rollup/rollup-win32-x64-msvc@4.29.1":
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.29.1.tgz#c82f04a09ba481e13857d6f2516e072aaa51b7f4"
   integrity sha512-+10CMg9vt1MoHj6x1pxyjPSMjHTIlqs8/tBztXvPAx24SKs9jwVnKqHJumlH/IzhaPUaj3T6T6wfZr8okdXaIg==
 
-"@rollup/rollup-win32-x64-msvc@4.39.0":
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.39.0.tgz#bfe0214e163f70c4fec1c8f7bb8ce266f4c05b7e"
-  integrity sha512-yAkUOkIKZlK5dl7u6dg897doBgLXmUHhIINM2c+sND3DZwnrdQkkSiDh7N75Ll4mM4dxSkYfXqU9fW3lLkMFug==
-
 "@types/estree@1.0.6", "@types/estree@^1.0.0":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
   integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
 
-"@types/estree@1.0.7":
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.7.tgz#4158d3105276773d5b7695cd4834b1722e4f37a8"
-  integrity sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==
-
-"@vitest/expect@3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-3.1.1.tgz#d64ddfdcf9e877d805e1eee67bd845bf0708c6c2"
-  integrity sha512-q/zjrW9lgynctNbwvFtQkGK9+vvHA5UzVi2V8APrp1C6fG6/MuYYkmlx4FubuqLycCeSdHD5aadWfua/Vr0EUA==
+"@vitest/expect@2.1.9":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-2.1.9.tgz#b566ea20d58ea6578d8dc37040d6c1a47ebe5ff8"
+  integrity sha512-UJCIkTBenHeKT1TTlKMJWy1laZewsRIzYighyYiJKZreqtdxSos/S1t+ktRMQWu2CKqaarrkeszJx1cgC5tGZw==
   dependencies:
-    "@vitest/spy" "3.1.1"
-    "@vitest/utils" "3.1.1"
-    chai "^5.2.0"
-    tinyrainbow "^2.0.0"
+    "@vitest/spy" "2.1.9"
+    "@vitest/utils" "2.1.9"
+    chai "^5.1.2"
+    tinyrainbow "^1.2.0"
 
-"@vitest/mocker@3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@vitest/mocker/-/mocker-3.1.1.tgz#7689d99f87498684c71e9fe9defdbd13ffb7f1ac"
-  integrity sha512-bmpJJm7Y7i9BBELlLuuM1J1Q6EQ6K5Ye4wcyOpOMXMcePYKSIYlpcrCm4l/O6ja4VJA5G2aMJiuZkZdnxlC3SA==
+"@vitest/mocker@2.1.9":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/mocker/-/mocker-2.1.9.tgz#36243b27351ca8f4d0bbc4ef91594ffd2dc25ef5"
+  integrity sha512-tVL6uJgoUdi6icpxmdrn5YNo3g3Dxv+IHJBr0GXHaEdTcw3F+cPKnsXFhli6nO+f/6SDKPHEK1UN+k+TQv0Ehg==
   dependencies:
-    "@vitest/spy" "3.1.1"
+    "@vitest/spy" "2.1.9"
     estree-walker "^3.0.3"
-    magic-string "^0.30.17"
+    magic-string "^0.30.12"
 
-"@vitest/pretty-format@3.1.1", "@vitest/pretty-format@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@vitest/pretty-format/-/pretty-format-3.1.1.tgz#5b4d577771daccfced47baf3bf026ad59b52c283"
-  integrity sha512-dg0CIzNx+hMMYfNmSqJlLSXEmnNhMswcn3sXO7Tpldr0LiGmg3eXdLLhwkv2ZqgHb/d5xg5F7ezNFRA1fA13yA==
+"@vitest/pretty-format@2.1.9", "@vitest/pretty-format@^2.1.9":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/pretty-format/-/pretty-format-2.1.9.tgz#434ff2f7611689f9ce70cd7d567eceb883653fdf"
+  integrity sha512-KhRIdGV2U9HOUzxfiHmY8IFHTdqtOhIzCpd8WRdJiE7D/HUcZVD0EgQCVjm+Q9gkUXWgBvMmTtZgIG48wq7sOQ==
   dependencies:
-    tinyrainbow "^2.0.0"
+    tinyrainbow "^1.2.0"
 
-"@vitest/runner@3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-3.1.1.tgz#76b598700737089d66c74272b2e1c94ca2891a49"
-  integrity sha512-X/d46qzJuEDO8ueyjtKfxffiXraPRfmYasoC4i5+mlLEJ10UvPb0XH5M9C3gWuxd7BAQhpK42cJgJtq53YnWVA==
+"@vitest/runner@2.1.9":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-2.1.9.tgz#cc18148d2d797fd1fd5908d1f1851d01459be2f6"
+  integrity sha512-ZXSSqTFIrzduD63btIfEyOmNcBmQvgOVsPNPe0jYtESiXkhd8u2erDLnMxmGrDCwHCCHE7hxwRDCT3pt0esT4g==
   dependencies:
-    "@vitest/utils" "3.1.1"
-    pathe "^2.0.3"
+    "@vitest/utils" "2.1.9"
+    pathe "^1.1.2"
 
-"@vitest/snapshot@3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-3.1.1.tgz#42b6aa0d0e2b3b48b95a5c76efdcc66a44cb11f3"
-  integrity sha512-bByMwaVWe/+1WDf9exFxWWgAixelSdiwo2p33tpqIlM14vW7PRV5ppayVXtfycqze4Qhtwag5sVhX400MLBOOw==
+"@vitest/snapshot@2.1.9":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-2.1.9.tgz#24260b93f798afb102e2dcbd7e61c6dfa118df91"
+  integrity sha512-oBO82rEjsxLNJincVhLhaxxZdEtV0EFHMK5Kmx5sJ6H9L183dHECjiefOAdnqpIgT5eZwT04PoggUnW88vOBNQ==
   dependencies:
-    "@vitest/pretty-format" "3.1.1"
-    magic-string "^0.30.17"
-    pathe "^2.0.3"
+    "@vitest/pretty-format" "2.1.9"
+    magic-string "^0.30.12"
+    pathe "^1.1.2"
 
-"@vitest/spy@3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-3.1.1.tgz#deca0b025e151302ab514f38390fd7777e294837"
-  integrity sha512-+EmrUOOXbKzLkTDwlsc/xrwOlPDXyVk3Z6P6K4oiCndxz7YLpp/0R0UsWVOKT0IXWjjBJuSMk6D27qipaupcvQ==
+"@vitest/spy@2.1.9":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-2.1.9.tgz#cb28538c5039d09818b8bfa8edb4043c94727c60"
+  integrity sha512-E1B35FwzXXTs9FHNK6bDszs7mtydNi5MIfUWpceJ8Xbfb1gBMscAnwLbEu+B44ed6W3XjL9/ehLPHR1fkf1KLQ==
   dependencies:
     tinyspy "^3.0.2"
 
-"@vitest/utils@3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-3.1.1.tgz#2893c30219ab6bdf109f07ce5cd287fe8058438d"
-  integrity sha512-1XIjflyaU2k3HMArJ50bwSh3wKWPD6Q47wz/NUSmRV0zNywPc4w79ARjg/i/aNINHwA+mIALhUVqD9/aUvZNgg==
+"@vitest/utils@2.1.9":
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-2.1.9.tgz#4f2486de8a54acf7ecbf2c5c24ad7994a680a6c1"
+  integrity sha512-v0psaMSkNJ3A2NMrUEHFRzJtDPFn+/VWZ5WxImB21T9fjucJRmS7xCS3ppEnARb9y11OAzaD+P2Ps+b+BGX5iQ==
   dependencies:
-    "@vitest/pretty-format" "3.1.1"
-    loupe "^3.1.3"
-    tinyrainbow "^2.0.0"
+    "@vitest/pretty-format" "2.1.9"
+    loupe "^3.1.2"
+    tinyrainbow "^1.2.0"
 
 assertion-error@^2.0.1:
   version "2.0.1"
@@ -497,10 +382,10 @@ cac@^6.7.14:
   resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959"
   integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==
 
-chai@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-5.2.0.tgz#1358ee106763624114addf84ab02697e411c9c05"
-  integrity sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==
+chai@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-5.1.2.tgz#3afbc340b994ae3610ca519a6c70ace77ad4378d"
+  integrity sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==
   dependencies:
     assertion-error "^2.0.1"
     check-error "^2.1.1"
@@ -513,7 +398,7 @@ check-error@^2.1.1:
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-2.1.1.tgz#87eb876ae71ee388fa0471fe423f494be1d96ccc"
   integrity sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==
 
-debug@^4.1.1, debug@^4.4.0:
+debug@^4.1.1, debug@^4.3.7:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
   integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
@@ -525,41 +410,39 @@ deep-eql@^5.0.1:
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-5.0.2.tgz#4b756d8d770a9257300825d52a2c2cff99c3a341"
   integrity sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==
 
-es-module-lexer@^1.6.0:
+es-module-lexer@^1.5.4:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.6.0.tgz#da49f587fd9e68ee2404fe4e256c0c7d3a81be21"
   integrity sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==
 
-esbuild@^0.25.0:
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.2.tgz#55a1d9ebcb3aa2f95e8bba9e900c1a5061bc168b"
-  integrity sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==
+esbuild@^0.21.3:
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d"
+  integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==
   optionalDependencies:
-    "@esbuild/aix-ppc64" "0.25.2"
-    "@esbuild/android-arm" "0.25.2"
-    "@esbuild/android-arm64" "0.25.2"
-    "@esbuild/android-x64" "0.25.2"
-    "@esbuild/darwin-arm64" "0.25.2"
-    "@esbuild/darwin-x64" "0.25.2"
-    "@esbuild/freebsd-arm64" "0.25.2"
-    "@esbuild/freebsd-x64" "0.25.2"
-    "@esbuild/linux-arm" "0.25.2"
-    "@esbuild/linux-arm64" "0.25.2"
-    "@esbuild/linux-ia32" "0.25.2"
-    "@esbuild/linux-loong64" "0.25.2"
-    "@esbuild/linux-mips64el" "0.25.2"
-    "@esbuild/linux-ppc64" "0.25.2"
-    "@esbuild/linux-riscv64" "0.25.2"
-    "@esbuild/linux-s390x" "0.25.2"
-    "@esbuild/linux-x64" "0.25.2"
-    "@esbuild/netbsd-arm64" "0.25.2"
-    "@esbuild/netbsd-x64" "0.25.2"
-    "@esbuild/openbsd-arm64" "0.25.2"
-    "@esbuild/openbsd-x64" "0.25.2"
-    "@esbuild/sunos-x64" "0.25.2"
-    "@esbuild/win32-arm64" "0.25.2"
-    "@esbuild/win32-ia32" "0.25.2"
-    "@esbuild/win32-x64" "0.25.2"
+    "@esbuild/aix-ppc64" "0.21.5"
+    "@esbuild/android-arm" "0.21.5"
+    "@esbuild/android-arm64" "0.21.5"
+    "@esbuild/android-x64" "0.21.5"
+    "@esbuild/darwin-arm64" "0.21.5"
+    "@esbuild/darwin-x64" "0.21.5"
+    "@esbuild/freebsd-arm64" "0.21.5"
+    "@esbuild/freebsd-x64" "0.21.5"
+    "@esbuild/linux-arm" "0.21.5"
+    "@esbuild/linux-arm64" "0.21.5"
+    "@esbuild/linux-ia32" "0.21.5"
+    "@esbuild/linux-loong64" "0.21.5"
+    "@esbuild/linux-mips64el" "0.21.5"
+    "@esbuild/linux-ppc64" "0.21.5"
+    "@esbuild/linux-riscv64" "0.21.5"
+    "@esbuild/linux-s390x" "0.21.5"
+    "@esbuild/linux-x64" "0.21.5"
+    "@esbuild/netbsd-x64" "0.21.5"
+    "@esbuild/openbsd-x64" "0.21.5"
+    "@esbuild/sunos-x64" "0.21.5"
+    "@esbuild/win32-arm64" "0.21.5"
+    "@esbuild/win32-ia32" "0.21.5"
+    "@esbuild/win32-x64" "0.21.5"
 
 estree-walker@^2.0.2:
   version "2.0.2"
@@ -573,10 +456,10 @@ estree-walker@^3.0.3:
   dependencies:
     "@types/estree" "^1.0.0"
 
-expect-type@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-1.2.1.tgz#af76d8b357cf5fa76c41c09dafb79c549e75f71f"
-  integrity sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw==
+expect-type@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-1.1.0.tgz#a146e414250d13dfc49eafcfd1344a4060fa4c75"
+  integrity sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==
 
 fsevents@~2.3.2, fsevents@~2.3.3:
   version "2.3.3"
@@ -612,17 +495,12 @@ js-tokens@^4.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-loupe@^3.1.0:
+loupe@^3.1.0, loupe@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/loupe/-/loupe-3.1.2.tgz#c86e0696804a02218f2206124c45d8b15291a240"
   integrity sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==
 
-loupe@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/loupe/-/loupe-3.1.3.tgz#042a8f7986d77f3d0f98ef7990a2b2fef18b0fd2"
-  integrity sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==
-
-magic-string@^0.30.10, magic-string@^0.30.17:
+magic-string@^0.30.10, magic-string@^0.30.12:
   version "0.30.17"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.17.tgz#450a449673d2460e5bbcfba9a61916a1714c7453"
   integrity sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==
@@ -634,20 +512,20 @@ ms@^2.1.3:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-nanoid@^3.3.8:
-  version "3.3.11"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
-  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
+nanoid@^3.3.7:
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
+  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
 
 path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
-pathe@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/pathe/-/pathe-2.0.3.tgz#3ecbec55421685b70a9da872b2cff3e1cbed1716"
-  integrity sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==
+pathe@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.2.tgz#6c4cb47a945692e48a1ddd6e4094d170516437ec"
+  integrity sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==
 
 pathval@^2.0.0:
   version "2.0.0"
@@ -664,12 +542,12 @@ picomatch@^4.0.2:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab"
   integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==
 
-postcss@^8.5.3:
-  version "8.5.3"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.3.tgz#1463b6f1c7fb16fe258736cba29a2de35237eafb"
-  integrity sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==
+postcss@^8.4.43:
+  version "8.4.49"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
+  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
   dependencies:
-    nanoid "^3.3.8"
+    nanoid "^3.3.7"
     picocolors "^1.1.1"
     source-map-js "^1.2.1"
 
@@ -691,7 +569,7 @@ rollup-plugin-dts@^6.1.1:
   optionalDependencies:
     "@babel/code-frame" "^7.24.2"
 
-rollup@^4.29.1:
+rollup@^4.20.0, rollup@^4.29.1:
   version "4.29.1"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.29.1.tgz#a9aaaece817e5f778489e5bf82e379cc8a5c05bc"
   integrity sha512-RaJ45M/kmJUzSWDs1Nnd5DdV4eerC98idtUOVr6FfKcgxqvjwHmxc5upLF9qZU9EpsVzzhleFahrT3shLuJzIw==
@@ -719,35 +597,6 @@ rollup@^4.29.1:
     "@rollup/rollup-win32-x64-msvc" "4.29.1"
     fsevents "~2.3.2"
 
-rollup@^4.30.1:
-  version "4.39.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.39.0.tgz#9dc1013b70c0e2cb70ef28350142e9b81b3f640c"
-  integrity sha512-thI8kNc02yNvnmJp8dr3fNWJ9tCONDhp6TV35X6HkKGGs9E6q7YWCHbe5vKiTa7TAiNcFEmXKj3X/pG2b3ci0g==
-  dependencies:
-    "@types/estree" "1.0.7"
-  optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.39.0"
-    "@rollup/rollup-android-arm64" "4.39.0"
-    "@rollup/rollup-darwin-arm64" "4.39.0"
-    "@rollup/rollup-darwin-x64" "4.39.0"
-    "@rollup/rollup-freebsd-arm64" "4.39.0"
-    "@rollup/rollup-freebsd-x64" "4.39.0"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.39.0"
-    "@rollup/rollup-linux-arm-musleabihf" "4.39.0"
-    "@rollup/rollup-linux-arm64-gnu" "4.39.0"
-    "@rollup/rollup-linux-arm64-musl" "4.39.0"
-    "@rollup/rollup-linux-loongarch64-gnu" "4.39.0"
-    "@rollup/rollup-linux-powerpc64le-gnu" "4.39.0"
-    "@rollup/rollup-linux-riscv64-gnu" "4.39.0"
-    "@rollup/rollup-linux-riscv64-musl" "4.39.0"
-    "@rollup/rollup-linux-s390x-gnu" "4.39.0"
-    "@rollup/rollup-linux-x64-gnu" "4.39.0"
-    "@rollup/rollup-linux-x64-musl" "4.39.0"
-    "@rollup/rollup-win32-arm64-msvc" "4.39.0"
-    "@rollup/rollup-win32-ia32-msvc" "4.39.0"
-    "@rollup/rollup-win32-x64-msvc" "4.39.0"
-    fsevents "~2.3.2"
-
 siginfo@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/siginfo/-/siginfo-2.0.0.tgz#32e76c70b79724e3bb567cb9d543eb858ccfaf30"
@@ -763,10 +612,10 @@ stackback@0.0.2:
   resolved "https://registry.yarnpkg.com/stackback/-/stackback-0.0.2.tgz#1ac8a0d9483848d1695e418b6d031a3c3ce68e3b"
   integrity sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==
 
-std-env@^3.8.1:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.9.0.tgz#1a6f7243b339dca4c9fd55e1c7504c77ef23e8f1"
-  integrity sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==
+std-env@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.8.0.tgz#b56ffc1baf1a29dcc80a3bdf11d7fca7c315e7d5"
+  integrity sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==
 
 style-mod@^4.0.0, style-mod@^4.1.0:
   version "4.1.2"
@@ -783,20 +632,20 @@ tinybench@^2.9.0:
   resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.9.0.tgz#103c9f8ba6d7237a47ab6dd1dcff77251863426b"
   integrity sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==
 
-tinyexec@^0.3.2:
+tinyexec@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-0.3.2.tgz#941794e657a85e496577995c6eef66f53f42b3d2"
   integrity sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==
 
-tinypool@^1.0.2:
+tinypool@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-1.0.2.tgz#706193cc532f4c100f66aa00b01c42173d9051b2"
   integrity sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==
 
-tinyrainbow@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/tinyrainbow/-/tinyrainbow-2.0.0.tgz#9509b2162436315e80e3eee0fcce4474d2444294"
-  integrity sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==
+tinyrainbow@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/tinyrainbow/-/tinyrainbow-1.2.0.tgz#5c57d2fc0fb3d1afd78465c33ca885d04f02abb5"
+  integrity sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==
 
 tinyspy@^3.0.2:
   version "3.0.2"
@@ -813,61 +662,61 @@ typescript@^5.7.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6"
   integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==
 
-vite-node@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-3.1.1.tgz#ad186c07859a6e5fca7c7f563e55fb11b16557bc"
-  integrity sha512-V+IxPAE2FvXpTCHXyNem0M+gWm6J7eRyWPR6vYoG/Gl+IscNOjXzztUhimQgTxaAoUoj40Qqimaa0NLIOOAH4w==
+vite-node@2.1.9:
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-2.1.9.tgz#549710f76a643f1c39ef34bdb5493a944e4f895f"
+  integrity sha512-AM9aQ/IPrW/6ENLQg3AGY4K1N2TGZdR5e4gu/MmmR2xR3Ll1+dib+nook92g4TV3PXVyeyxdWwtaCAiUL0hMxA==
   dependencies:
     cac "^6.7.14"
-    debug "^4.4.0"
-    es-module-lexer "^1.6.0"
-    pathe "^2.0.3"
-    vite "^5.0.0 || ^6.0.0"
+    debug "^4.3.7"
+    es-module-lexer "^1.5.4"
+    pathe "^1.1.2"
+    vite "^5.0.0"
 
-vite-tsconfig-paths@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/vite-tsconfig-paths/-/vite-tsconfig-paths-5.1.4.tgz#d9a71106a7ff2c1c840c6f1708042f76a9212ed4"
-  integrity sha512-cYj0LRuLV2c2sMqhqhGpaO3LretdtMn/BVX4cPLanIZuwwrkVl+lK84E/miEXkCHWXuq65rhNN4rXsBcOB3S4w==
+vite-tsconfig-paths@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz#321f02e4b736a90ff62f9086467faf4e2da857a9"
+  integrity sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==
   dependencies:
     debug "^4.1.1"
     globrex "^0.1.2"
     tsconfck "^3.0.3"
 
-"vite@^5.0.0 || ^6.0.0":
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-6.2.5.tgz#d093b5fe8eb96e594761584a966ab13f24457820"
-  integrity sha512-j023J/hCAa4pRIUH6J9HemwYfjB5llR2Ps0CWeikOtdR8+pAURAk0DoJC5/mm9kd+UgdnIy7d6HE4EAvlYhPhA==
+vite@^5.0.0:
+  version "5.4.16"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.16.tgz#471983257a890ef33f2700cbbbc2134f2d08abf1"
+  integrity sha512-Y5gnfp4NemVfgOTDQAunSD4346fal44L9mszGGY/e+qxsRT5y1sMlS/8tiQ8AFAp+MFgYNSINdfEchJiPm41vQ==
   dependencies:
-    esbuild "^0.25.0"
-    postcss "^8.5.3"
-    rollup "^4.30.1"
+    esbuild "^0.21.3"
+    postcss "^8.4.43"
+    rollup "^4.20.0"
   optionalDependencies:
     fsevents "~2.3.3"
 
-vitest@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/vitest/-/vitest-3.1.1.tgz#39fa2356e510513fccdc5d16465a9fc066ef1fc6"
-  integrity sha512-kiZc/IYmKICeBAZr9DQ5rT7/6bD9G7uqQEki4fxazi1jdVl2mWGzedtBs5s6llz59yQhVb7FFY2MbHzHCnT79Q==
+vitest@^2.1.9:
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/vitest/-/vitest-2.1.9.tgz#7d01ffd07a553a51c87170b5e80fea3da7fb41e7"
+  integrity sha512-MSmPM9REYqDGBI8439mA4mWhV5sKmDlBKWIYbA3lRb2PTHACE0mgKwA8yQ2xq9vxDTuk4iPrECBAEW2aoFXY0Q==
   dependencies:
-    "@vitest/expect" "3.1.1"
-    "@vitest/mocker" "3.1.1"
-    "@vitest/pretty-format" "^3.1.1"
-    "@vitest/runner" "3.1.1"
-    "@vitest/snapshot" "3.1.1"
-    "@vitest/spy" "3.1.1"
-    "@vitest/utils" "3.1.1"
-    chai "^5.2.0"
-    debug "^4.4.0"
-    expect-type "^1.2.0"
-    magic-string "^0.30.17"
-    pathe "^2.0.3"
-    std-env "^3.8.1"
+    "@vitest/expect" "2.1.9"
+    "@vitest/mocker" "2.1.9"
+    "@vitest/pretty-format" "^2.1.9"
+    "@vitest/runner" "2.1.9"
+    "@vitest/snapshot" "2.1.9"
+    "@vitest/spy" "2.1.9"
+    "@vitest/utils" "2.1.9"
+    chai "^5.1.2"
+    debug "^4.3.7"
+    expect-type "^1.1.0"
+    magic-string "^0.30.12"
+    pathe "^1.1.2"
+    std-env "^3.8.0"
     tinybench "^2.9.0"
-    tinyexec "^0.3.2"
-    tinypool "^1.0.2"
-    tinyrainbow "^2.0.0"
-    vite "^5.0.0 || ^6.0.0"
-    vite-node "3.1.1"
+    tinyexec "^0.3.1"
+    tinypool "^1.0.1"
+    tinyrainbow "^1.2.0"
+    vite "^5.0.0"
+    vite-node "2.1.9"
     why-is-node-running "^2.3.0"
 
 w3c-keyname@^2.2.4:

packages/codemirror-lsp-client/package.json

@@ -24,12 +24,12 @@
     "@lezer/highlight": "^1.2.1",
     "@ts-stack/markdown": "^1.5.0",
     "json-rpc-2.0": "^1.7.0",
-    "typescript": "^5.8.3",
+    "typescript": "^5.8.2",
     "vscode-languageserver-protocol": "^3.17.5",
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
-    "@types/node": "^22.14.0",
+    "@types/node": "^22.13.13",
     "ts-node": "^10.9.2"
   }
 }

packages/codemirror-lsp-client/yarn.lock

@@ -116,12 +116,12 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
   integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
 
-"@types/node@^22.14.0":
-  version "22.14.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.14.0.tgz#d3bfa3936fef0dbacd79ea3eb17d521c628bb47e"
-  integrity sha512-Kmpl+z84ILoG+3T/zQFyAJsU6EPTmOCj8/2+83fSN6djd6I4o7uOuGIH6vq3PrjY5BGitSbFuMN18j3iknubbA==
+"@types/node@^22.13.13":
+  version "22.13.13"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.13.13.tgz#5e7d110fb509b0d4a43fbf48fa9d6e0f83e1b1e7"
+  integrity sha512-ClsL5nMwKaBRwPcCvH8E7+nU4GxHVx1axNvMZTFHMEfNI7oahimt26P5zjVCRrjiIWj6YFXfE1v3dEp94wLcGQ==
   dependencies:
-    undici-types "~6.21.0"
+    undici-types "~6.20.0"
 
 acorn-walk@^8.1.1:
   version "8.3.3"
@@ -189,15 +189,15 @@ tslib@^2.3.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
   integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
 
-typescript@^5.8.3:
-  version "5.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.3.tgz#92f8a3e5e3cf497356f4178c34cd65a7f5e8440e"
-  integrity sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==
+typescript@^5.8.2:
+  version "5.8.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.2.tgz#8170b3702f74b79db2e5a96207c15e65807999e4"
+  integrity sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==
 
-undici-types@~6.21.0:
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
-  integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
+undici-types@~6.20.0:
+  version "6.20.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433"
+  integrity sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==
 
 v8-compile-cache-lib@^3.0.1:
   version "3.0.1"

public/kcl-samples/80-20-rail/main.kcl

@@ -4,7 +4,7 @@
 // Set units
 @settings(defaultLengthUnit = in)
 
-// Create a function to make the 80-20 rail
+// Define function
 fn rail8020(originStart, railHeight, railLength) {
   // Sketch side 1 of profile
   sketch001 = startSketchOn(-XZ)

public/kcl-samples/README.md

@@ -25,6 +25,8 @@ When you submit a PR to add or modify KCL samples, images and STEP files will be
 ---
 #### [80-20-rail](80-20-rail/main.kcl) ([screenshot](screenshots/80-20-rail.png))
 [![80-20-rail](screenshots/80-20-rail.png)](80-20-rail/main.kcl)
+#### [a-parametric-bearing-pillow-block](a-parametric-bearing-pillow-block/main.kcl) ([screenshot](screenshots/a-parametric-bearing-pillow-block.png))
+[![a-parametric-bearing-pillow-block](screenshots/a-parametric-bearing-pillow-block.png)](a-parametric-bearing-pillow-block/main.kcl)
 #### [ball-bearing](ball-bearing/main.kcl) ([screenshot](screenshots/ball-bearing.png))
 [![ball-bearing](screenshots/ball-bearing.png)](ball-bearing/main.kcl)
 #### [bench](bench/main.kcl) ([screenshot](screenshots/bench.png))
@@ -81,8 +83,6 @@ When you submit a PR to add or modify KCL samples, images and STEP files will be
 [![mounting-plate](screenshots/mounting-plate.png)](mounting-plate/main.kcl)
 #### [multi-axis-robot](multi-axis-robot/main.kcl) ([screenshot](screenshots/multi-axis-robot.png))
 [![multi-axis-robot](screenshots/multi-axis-robot.png)](multi-axis-robot/main.kcl)
-#### [parametric-bearing-pillow-block](parametric-bearing-pillow-block/main.kcl) ([screenshot](screenshots/parametric-bearing-pillow-block.png))
-[![parametric-bearing-pillow-block](screenshots/parametric-bearing-pillow-block.png)](parametric-bearing-pillow-block/main.kcl)
 #### [pipe](pipe/main.kcl) ([screenshot](screenshots/pipe.png))
 [![pipe](screenshots/pipe.png)](pipe/main.kcl)
 #### [pipe-flange-assembly](pipe-flange-assembly/main.kcl) ([screenshot](screenshots/pipe-flange-assembly.png))

public/kcl-samples/a-parametric-bearing-pillow-block/main.kcl

@@ -1,10 +1,10 @@
-// Parametric Bearing Pillow Block
+// A Parametric Bearing Pillow Block
 // A bearing pillow block, also known as a plummer block or pillow block bearing, is a pedestal used to provide support for a rotating shaft with the help of compatible bearings and various accessories. Housing a bearing, the pillow block provides a secure and stable foundation that allows the shaft to rotate smoothly within its machinery setup. These components are essential in a wide range of mechanical systems and machinery, playing a key role in reducing friction and supporting radial and axial loads.
 
 // Set units
 @settings(defaultLengthUnit = in)
 
-// Define parameters
+// Define constants such as length, width, height, counter-bore depth and diameter, bearing diameter, hole location padding, and more
 length = 6
 width = 4
 height = 1
@@ -14,15 +14,15 @@ holeDia = .375
 padding = 1.5
 bearingDia = 3
 
-// Sketch the block body
-body = startSketchOn(XY)
+// (Needs to be updated). Sketch the block and extrude up to where the counterbore diameter starts.
+extrude001 = startSketchOn(XY)
   |> startProfileAt([-width / 2, -length / 2], %)
   |> line(endAbsolute = [width / 2, -length / 2])
   |> line(endAbsolute = [width / 2, length / 2])
   |> line(endAbsolute = [-width / 2, length / 2])
   |> close()
   |> extrude(length = height)
-counterBoreHoles = startSketchOn(body, 'end')
+extrude002 = startSketchOn(extrude001, 'end')
   |> circle(
        center = [
          -(width / 2 - (padding / 2)),
@@ -34,7 +34,7 @@ counterBoreHoles = startSketchOn(body, 'end')
   |> patternLinear2d(instances = 2, distance = width - padding, axis = [1, 0])
   |> extrude(%, length = -cbDepth)
 
-boltHoles = startSketchOn(body, 'start')
+extrude003 = startSketchOn(extrude001, 'start')
   |> circle(
        center = [
          -(width / 2 - (padding / 2)),
@@ -46,6 +46,6 @@ boltHoles = startSketchOn(body, 'start')
   |> patternLinear2d(instances = 2, distance = width - padding, axis = [1, 0])
   |> extrude(length = -height + cbDepth)
 
-centerHole = startSketchOn(body, 'end')
+extrude004 = startSketchOn(extrude001, 'end')
   |> circle(center = [0, 0], radius = bearingDia / 2)
   |> extrude(length = -height)

public/kcl-samples/ball-bearing/main.kcl

@@ -4,7 +4,7 @@
 // Set units
 @settings(defaultLengthUnit = in)
 
-// Define parameters
+// Define constants like ball diameter, inside diamter, overhange length, and thickness
 outsideDiameter = 1.625
 sphereDia = 0.25
 shaftDia = 0.75
@@ -95,3 +95,5 @@ outsideWallSketch = startSketchOn(offsetPlane(XY, offset = -overallThickness / 2
   |> hole(circle(center = [0, 0], radius = shaftDia / 2 + wallThickness + sphereDia), %)
 
 outsideWall = extrude(outsideWallSketch, length = overallThickness)
+
+// https://www.mcmaster.com/60355K185/

public/kcl-samples/car-wheel-assembly/brake-caliper.kcl

@@ -4,8 +4,8 @@
 // Set units
 @settings(defaultLengthUnit = in)
 
-// Import parameters
-import caliperTolerance, caliperPadLength, caliperThickness, caliperOuterEdgeRadius, caliperInnerEdgeRadius, rotorDiameter, rotorTotalThickness, yAxisOffset from "parameters.kcl"
+// Import Constants
+import caliperTolerance, caliperPadLength, caliperThickness, caliperOuterEdgeRadius, caliperInnerEdgeRadius, rotorDiameter, rotorTotalThickness, yAxisOffset from "globals.kcl"
 
 // Sketch the brake caliper profile
 brakeCaliperSketch = startSketchOn(XY)

public/kcl-samples/car-wheel-assembly/car-rotor.kcl

@@ -4,8 +4,8 @@
 // Set units
 @settings(defaultLengthUnit = in)
 
-// Import parameters
-import rotorDiameter, rotorInnerDiameter, rotorSinglePlateThickness, rotorInnerDiameterThickness, lugHolePatternDia, lugSpacing, rotorTotalThickness, spacerPatternDiameter, spacerDiameter, spacerLength, spacerCount, wheelDiameter, lugCount, yAxisOffset, drillAndSlotCount from "parameters.kcl"
+// Import Constants
+import rotorDiameter, rotorInnerDiameter, rotorSinglePlateThickness, rotorInnerDiameterThickness, lugHolePatternDia, lugSpacing, rotorTotalThickness, spacerPatternDiameter, spacerDiameter, spacerLength, spacerCount, wheelDiameter, lugCount, yAxisOffset, drillAndSlotCount from "globals.kcl"
 
 rotorSketch = startSketchOn(XZ)
   |> circle(center = [0, 0], radius = rotorDiameter / 2)

public/kcl-samples/car-wheel-assembly/car-tire.kcl

@@ -4,8 +4,8 @@
 // Set units
 @settings(defaultLengthUnit = in)
 
-// Import parameters
-import tireInnerDiameter, tireOuterDiameter, tireDepth, bendRadius, tireTreadWidth, tireTreadDepth, tireTreadOffset from "parameters.kcl"
+// Import Constants
+import tireInnerDiameter, tireOuterDiameter, tireDepth, bendRadius, tireTreadWidth, tireTreadDepth, tireTreadOffset from "globals.kcl"
 
 // Create the sketch of the tire
 tireSketch = startSketchOn(XY)

public/kcl-samples/car-wheel-assembly/car-wheel.kcl

@@ -4,8 +4,8 @@
 // Set units
 @settings(defaultLengthUnit = in)
 
-// Import parameters
-import lugCount, lugSpacing, offset, backSpacing, wheelWidth, wheelDiameter, spokeCount, spokeGap, spokeAngle, spokeThickness from "parameters.kcl"
+// Import Constants
+import lugCount, lugSpacing, offset, backSpacing, wheelWidth, wheelDiameter, spokeCount, spokeGap, spokeAngle, spokeThickness from "globals.kcl"
 
 // Create the wheel center
 lugBase = startSketchOn(XZ)
@@ -32,7 +32,7 @@ lugClearance = startSketchOn(lugExtrusion, 'END')
 
 // Create the circular pattern for the lug holes
 lugHoles = startSketchOn(lugBase, 'END')
-  |> circle(center = [lugSpacing / 2, 0], radius = fromMm(16) / 2)
+  |> circle(center = [lugSpacing / 2, 0], radius = 16 * mm() / 2)
   |> patternCircular2d(
        arcDegrees = 360,
        center = [0, 0],

public/kcl-samples/car-wheel-assembly/globals.kcl

@@ -1,12 +1,12 @@
-// Car wheel assembly parameters
+// Car wheel assembly global constants
 
 // Set units
 @settings(defaultLengthUnit = in)
 
-// Car wheel
+// Car Wheel
 export lugCount = 5
-export lugSpacing = fromMm(114.3)
-export offset = fromMm(-35)
+export lugSpacing = 114.3 * mm()
+export offset = -35 * mm()
 export backSpacing = 6.38
 export wheelWidth = 9.5
 export wheelDiameter = 19
@@ -16,13 +16,13 @@ export spokeAngle = 0.02
 export spokeThickness = 0.95
 
 // Lug Nut
-export lugDiameter = fromMm(24)
+export lugDiameter = 24 * mm()
 export lugHeadLength = lugDiameter * .5
 export lugThreadDiameter = lugDiameter / 2 * .85
-export lugLength = fromMm(30)
-export lugThreadDepth = lugLength - fromMm(12.7)
+export lugLength = 30 * mm()
+export lugThreadDepth = lugLength - (12.7 * mm())
 
-// Car rotor
+// Car Rotor
 export rotorDiameter = 12
 export rotorInnerDiameter = 6
 export rotorSinglePlateThickness = 0.25
@@ -36,7 +36,7 @@ export spacerCount = 16
 export yAxisOffset = 0.5
 export drillAndSlotCount = 5
 
-// Car tire
+// Car Tire
 export tireInnerDiameter = 19
 export tireOuterDiameter = 24
 export tireDepth = 11.02
@@ -45,7 +45,7 @@ export tireTreadWidth = 0.39
 export tireTreadDepth = 0.39
 export tireTreadOffset = 3.15
 
-// Brake caliper
+// Brake Caliper
 export caliperTolerance = 0.050
 export caliperPadLength = 1.6
 export caliperThickness = 0.39

public/kcl-samples/car-wheel-assembly/lug-nut.kcl

@@ -4,14 +4,14 @@
 // Set units
 @settings(defaultLengthUnit = in)
 
-// Import parameters
-import lugDiameter, lugHeadLength, lugThreadDiameter, lugLength, lugThreadDepth, lugSpacing from "parameters.kcl"
+// Import Constants
+import lugDiameter, lugHeadLength, lugThreadDiameter, lugLength, lugThreadDepth, lugSpacing from "globals.kcl"
 
 customPlane = {
   plane = {
     origin = {
       x = lugSpacing / 2,
-      y = fromMm(-30),
+      y = -30 * mm(),
       z = 0
     },
     xAxis = { x = 1, y = 0, z = 0 },
@@ -26,7 +26,7 @@ fn lug(plane, length, diameter) {
     |> angledLineOfYLength({ angle = 70, length = lugHeadLength }, %)
     |> xLine(endAbsolute = lugDiameter / 2)
     |> yLine(endAbsolute = lugLength)
-    |> tangentialArc({ offset = 90, radius = fromMm(3) }, %)
+    |> tangentialArc({ offset = 90, radius = 3 * mm() }, %)
     |> xLine(endAbsolute = 0 + .001, tag = $c1)
     |> yLine(endAbsolute = lugThreadDepth)
     |> xLine(endAbsolute = lugThreadDiameter)

public/kcl-samples/car-wheel-assembly/main.kcl

@@ -4,24 +4,16 @@
 // Set units
 @settings(defaultLengthUnit = in)
 
-// Import parts
 import "car-wheel.kcl" as carWheel
 import "car-rotor.kcl" as carRotor
 import "brake-caliper.kcl" as brakeCaliper
 import "lug-nut.kcl" as lugNut
 import "car-tire.kcl" as carTire
+import lugCount from "globals.kcl"
 
-// Import parameters
-import * from "parameters.kcl"
-
-// Place the car rotor
 carRotor
   |> translate(x = 0, y = 0.5, z = 0)
-
-// Place the car wheel
 carWheel
-
-// Place the lug nuts
 lugNut
   |> patternCircular3d(
        arcDegrees = 360,
@@ -30,10 +22,6 @@ lugNut
        instances = lugCount,
        rotateDuplicates = false,
      )
-
-// Place the brake caliper
 brakeCaliper
   |> translate(x = 0, y = 0.5, z = 0)
-
-// Place the car tire
 carTire

public/kcl-samples/color-cube/main.kcl

@@ -1,10 +1,10 @@
 // Color Cube
 // This is a color cube centered about the origin. It is used to help determine orientation in the scene.
 
-// Set units
+// Set unit
 @settings(defaultLengthUnit = mm)
 
-// Parameters referenced in drawRectangle
+// Globals referenced in drawRectangle
 size = 100
 halfSize = size / 2
 extrudeLength = 1.0

public/kcl-samples/cycloidal-gear/main.kcl

@@ -1,10 +1,9 @@
 // Cycloidal Gear
 // A cycloidal gear is a gear with a continuous, curved tooth profile. They are used in watchmaking and high precision robotics actuation
 
-// Set units
+// Set Units
 @settings(defaultLengthUnit = in)
 
-// Create a function for the cycloidal gear
 fn cycloidalGear(gearPitch, gearHeight, holeDiameter, helixAngle) {
   // Create a function to draw the gear profile as a sketch. Rotate each profile about the gear's axis by an helix angle proportional to the total gear height
   fn gearSketch(gHeight) {
@@ -45,5 +44,4 @@ fn cycloidalGear(gearPitch, gearHeight, holeDiameter, helixAngle) {
   return gearLoft
 }
 
-// Call the cycloidal gear function
 cycloidalGear(.3, 1.5, 0.297, -80)

public/kcl-samples/dodecahedron/main.kcl

@@ -9,19 +9,19 @@
 circR = 25
 
 // Calculated parameters
-// Thickness of the dodecahedron
+// thickness of the dodecahedron
 wallThickness = circR * 0.2
 
-// Angle between faces in radians
+// angle between faces in radians
 dihedral = acos(-(sqrt(5) / 5))
 
-// Inscribed radius
+// inscribed radius
 inscR = circR / 15 * sqrt(75 + 30 * sqrt(5))
 
-// Pentagon edge length
+// pentagon edge length
 edgeL = 4 * circR / (sqrt(3) * (1 + sqrt(5)))
 
-// Pentagon radius
+// pentagon radius
 pentR = edgeL / 2 / sin(toRadians(36))
 
 // Define a plane for the bottom angled face
@@ -69,7 +69,7 @@ bottomBowl = patternCircular3d(
   rotateDuplicates = true,
 )
 
-// Pattern the bottom to create the top face
+// pattern the bottom to create the top face
 patternCircular3d(
   bottom,
   instances = 2,
@@ -79,7 +79,7 @@ patternCircular3d(
   rotateDuplicates = true,
 )
 
-// Pattern the bottom angled faces to create the top
+// pattern the bottom angled faces to create the top
 patternCircular3d(
   bottomBowl,
   instances = 2,

public/kcl-samples/dual-basin-utility-sink/main.kcl

@@ -1,10 +1,10 @@
 // Dual-Basin Utility Sink
 // A stainless steel sink unit with dual rectangular basins and six under-counter storage compartments.
 
-// Set units
+// set units
 @settings(defaultLengthUnit = mm)
 
-// Define parameters
+// globals
 tableHeight = 850
 tableWidth = 3400
 tableDepth = 400

public/kcl-samples/enclosure/main.kcl

@@ -4,7 +4,6 @@
 // Set units
 @settings(defaultLengthUnit = mm)
 
-// Define parameters
 length = 175
 width = 125
 height = 70

public/kcl-samples/exhaust-manifold/main.kcl

@@ -1,10 +1,10 @@
 // Exhaust Manifold
 // A welded exhaust header for an inline 4-cylinder engine
 
-// Set units
+// Set Units
 @settings(defaultLengthUnit = in)
 
-// Define parameters
+// Define Constants
 primaryTubeDiameter = 1.625
 wallThickness = 0.080
 plateHeight = 0.125

public/kcl-samples/flange/main.kcl

@@ -4,7 +4,7 @@
 // Set units
 @settings(defaultLengthUnit = in)
 
-// Define parameters
+// Define constants
 mountingHoleDia = .625
 baseDia = 4.625
 pipeDia = 1.25

public/kcl-samples/focusrite-scarlett-mounting-bracket/main.kcl

@@ -4,7 +4,7 @@
 // Set units
 @settings(defaultLengthUnit = mm)
 
-// define parameters
+// define constants in mm
 radius = 6.0
 width = 144.0
 length = 80.0
@@ -15,7 +15,7 @@ tabLength = 25
 tabWidth = 12
 tabThk = 4
 
-// Define a rectangular shape func
+// define a rectangular shape func
 fn rectShape(pos, w, l) {
   rr = startSketchOn('xy')
     |> startProfileAt([pos[0] - (w / 2), pos[1] - (l / 2)], %)
@@ -26,7 +26,7 @@ fn rectShape(pos, w, l) {
   return rr
 }
 
-// Define the bracket plane
+// define the bracket plane
 bracketPlane = {
   plane = {
     origin = { x = 0, y = length / 2 + thk, z = 0 },
@@ -36,7 +36,7 @@ bracketPlane = {
   }
 }
 
-// Build the bracket sketch around the body
+// build the bracket sketch around the body
 fn bracketSketch(w, d, t) {
   s = startSketchOn(bracketPlane)
     |> startProfileAt([-w / 2 - t, d + t], %)
@@ -51,7 +51,7 @@ fn bracketSketch(w, d, t) {
   return s
 }
 
-// Build the body of the bracket
+// build the body of the bracket
 bs = bracketSketch(width, depth, thk)
 bracketBody = bs
   |> extrude(length = length + 2 * thk)
@@ -65,7 +65,7 @@ bracketBody = bs
        ],
      )
 
-// Define the tab plane
+// define the tab plane
 tabPlane = {
   plane = {
     origin = { x = 0, y = 0, z = depth + thk },
@@ -75,7 +75,7 @@ tabPlane = {
   }
 }
 
-// Build the tabs of the mounting bracket (right side)
+// build the tabs of the mounting bracket (right side)
 tabsR = startSketchOn(tabPlane)
   |> startProfileAt([width / 2 + thk, length / 2 + thk], %)
   |> line(end = [tabWidth, -tabLength / 3], tag = $edge11)
@@ -99,7 +99,7 @@ tabsR = startSketchOn(tabPlane)
      )
   |> patternLinear3d(axis = [0, -1, 0], instances = 2, distance = length + 2 * thk - (tabLength * 4 / 3))
 
-// Build the tabs of the mounting bracket (left side)
+// build the tabs of the mounting bracket (left side)
 tabsL = startSketchOn(tabPlane)
   |> startProfileAt([-width / 2 - thk, length / 2 + thk], %)
   |> line(end = [-tabWidth, -tabLength / 3], tag = $edge21)
@@ -123,7 +123,7 @@ tabsL = startSketchOn(tabPlane)
      )
   |> patternLinear3d(axis = [0, -1, 0], instances = 2, distance = length + 2 * thk - (tabLength * 4 / 3))
 
-// Define a plane for retention bumps
+// define a plane for retention bumps
 retPlane = {
   plane = {
     origin = { x = -width / 2 + 20, y = 0, z = 0 },
@@ -133,7 +133,7 @@ retPlane = {
   }
 }
 
-// Build the retention bump in the front
+// build the retention bump in the front
 retFront = startSketchOn(retPlane)
   |> startProfileAt([-length / 2 - thk, 0], %)
   |> line(end = [0, thk])
@@ -141,7 +141,7 @@ retFront = startSketchOn(retPlane)
   |> close()
   |> extrude(length = width - 40)
 
-// Build the retention bump in the back
+// build the retention bump in the back
 retBack = startSketchOn(retPlane)
   |> startProfileAt([length / 2 + thk, 0], %)
   |> line(end = [0, thk])

public/kcl-samples/food-service-spatula/main.kcl

@@ -4,7 +4,7 @@
 // Set units
 @settings(defaultLengthUnit = mm)
 
-// Define parameters
+// Define constants in millimeters (mm)
 flipperThickness = 3.5
 flipperLength = 70.0
 handleWidth = 15.0
@@ -16,7 +16,7 @@ gripHeight = 20.0
 gripFilletRadius = 3.0
 gripSlotWidth = 8.0
 
-// Function for drawing slots on a sketch given the start and end points as well as a width
+// function for drawing slots on a sketch given the start and end points as well as a width
 fn slot(sketch1, start, end, width) {
   angle = if start[0] == end[0] {
     if end[1] > start[1] {
@@ -43,10 +43,10 @@ fn slot(sketch1, start, end, width) {
   return slotSketch
 }
 
-// Create a sketch on the "XY" plane
+// create a sketch on the "XY" plane
 sketch000 = startSketchOn(XY)
 
-// Create a profile of the flipper
+// create a profile of the flipper
 flipperProfile = startProfileAt([-flipperLength, -32.0], sketch000)
   |> line(end = [flipperLength, 2.0])
   |> yLine(length = 60.0, tag = $backEdge)
@@ -58,25 +58,25 @@ flipperProfile = startProfileAt([-flipperLength, -32.0], sketch000)
      }, %)
   |> close()
 
-// Create a profile of the middle
+// create a profile of the middle
 slotProfile000 = slot(sketch000, [-25, 0], [-55, 0], flipperSlotWidth)
 
-// Create a profile of the top slot
+// create a profile of the top slot
 slotProfile001 = slot(sketch000, [-25, 18], [-55, 19], flipperSlotWidth)
 
-// Create a profile of the bottom slot
+// create a profile of the bottom slot
 slotProfile002 = slot(sketch000, [-25, -18], [-55, -19], flipperSlotWidth)
 
-// Create a profile with slots for the spatula
+// create a profile with slots for the spatula
 spatulaProfile = flipperProfile
   |> hole(slotProfile000, %)
   |> hole(slotProfile001, %)
   |> hole(slotProfile002, %)
 
-// Extrude the profile to create the spatula flipper
+// extrude the profile to create the spatula flipper
 flipper = extrude(spatulaProfile, length = flipperThickness)
 
-// Fillet the edges of the flipper
+// fillet the edges of the flipper
 fillet(
   flipper,
   radius = flipperFilletRadius,
@@ -86,10 +86,10 @@ fillet(
   ],
 )
 
-// Create a sketch on the "XZ" plane offset by half the thickness
+// create a sketch on the "XZ" plane offset by half the thickness
 sketch001 = startSketchOn(offsetPlane(XZ, offset = -handleWidth / 2))
 
-// Create a profile of the spatula handle
+// create a profile of the spatula handle
 handleProfile = startProfileAt([0.0, flipperThickness], sketch001)
   |> line(end = [31.819805, 31.819805], tag = $handleBottomEdge)
   |> line(end = [140.953893, 51.303021])
@@ -99,10 +99,10 @@ handleProfile = startProfileAt([0.0, flipperThickness], sketch001)
   |> xLine(length = 7.071068)
   |> close()
 
-// Create an extrusion extrude001
+// create an extrusion extrude001
 handle = extrude(handleProfile, length = handleWidth)
 
-// Fillet the bend of the spatula handle
+// fillet the bend of the spatula handle
 fillet(
   handle,
   radius = 4,
@@ -112,7 +112,7 @@ fillet(
   ],
 )
 
-// Define a plane which is at the end of the handle
+// define a plane which is at the end of the handle
 handlePlane = {
   plane = {
     origin = [208.593833, 0.0, 75.921946],
@@ -122,10 +122,10 @@ handlePlane = {
   }
 }
 
-// Create a sketch on the handle plane
+// create a sketch on the handle plane
 sketch002 = startSketchOn(handlePlane)
 
-// Create a profile of the grip
+// create a profile of the grip
 gripProfile = startProfileAt([-26.806746, -10.0], sketch002)
   |> xLine(length = gripWidth - (2 * gripFilletRadius))
   |> arc({
@@ -153,14 +153,14 @@ gripProfile = startProfileAt([-26.806746, -10.0], sketch002)
      }, %)
   |> close()
 
-// Extrude the grip profile to create the grip
+// extrude the grip profile to create the grip
 grip = extrude(gripProfile, length = -gripLength)
 
-// Create a sketch on the grip for the hole
+// create a sketch on the grip for the hole
 sketch003 = startSketchOn(grip, gripEdgeTop)
 
-// Create a profile for the grip hole
+// create a profile for the grip hole
 gripHoleProfile = slot(sketch003, [0, 200], [0, 210], gripSlotWidth)
 
-// Cut a hole in the grip
+// cut a hole in the grip
 extrude(gripHoleProfile, length = -gripWidth - 20)

public/kcl-samples/french-press/main.kcl

@@ -4,7 +4,7 @@
 // Set units
 @settings(defaultLengthUnit = in)
 
-// Define parameters
+// Define constants
 carafeDiameter = 4.41
 carafeHeight = 7.32
 handleThickness = 0.65

public/kcl-samples/gear-rack/main.kcl

@@ -1,10 +1,10 @@
 // 100mm Gear Rack
 // A flat bar or rail that is engraved with teeth along its length. These teeth are designed to mesh with the teeth of a gear, known as a pinion. When the pinion, a small cylindrical gear, rotates, its teeth engage with the teeth on the rack, causing the rack to move linearly. Conversely, linear motion applied to the rack will cause the pinion to rotate.
 
-// Set units
+// Set Units
 @settings(defaultLengthUnit = mm)
 
-// Define parameters
+// Define constants
 length = 100
 pitchHeight = 11.5
 width = 5

public/kcl-samples/gear/main.kcl

@@ -1,10 +1,10 @@
 // Spur Gear
 // A rotating machine part having cut teeth or, in the case of a cogwheel, inserted teeth (called cogs), which mesh with another toothed part to transmit torque. Geared devices can change the speed, torque, and direction of a power source. The two elements that define a gear are its circular shape and the teeth that are integrated into its outer edge, which are designed to fit into the teeth of another gear.
 
-// Set units
+// Set Units
 @settings(defaultLengthUnit = in)
 
-// Define parameters
+// Define constants
 nTeeth = 21
 module = 0.5
 pitchDiameter = module * nTeeth
@@ -97,11 +97,11 @@ keyWay = startSketchOn(body, 'END')
   |> xLine(length = -keywayDepth)
   |> arc({
        angleEnd = 180,
-       angleStart = -1 * toDegrees(startAngle) + 360,
+       angleStart = -1 * 180 / PI * startAngle + 360,
        radius = holeRadius
      }, %)
   |> arc({
-       angleEnd = toDegrees(startAngle),
+       angleEnd = 180 / PI * startAngle,
        angleStart = 180,
        radius = holeRadius
      }, %)

public/kcl-samples/gridfinity-baseplate-magnets/main.kcl

@@ -4,7 +4,7 @@
 // Set units in millimeters (mm)
 @settings(defaultLengthUnit = mm)
 
-// Define parameters
+// Define constants
 binLength = 42.0
 cornerRadius = 4.0
 firstStep = 0.7
@@ -21,7 +21,7 @@ countBinLength = 3
 // The total height of the baseplate is a summation of the vertical heights of the baseplate steps
 height = firstStep + secondStep + thirdStep
 
-// Define a function which builds the profile of the baseplate bin
+// define a function which builds the profile of the baseplate bin
 fn face(plane) {
   faceSketch = startSketchOn(plane)
     |> startProfileAt([0, 0], %)
@@ -33,10 +33,10 @@ fn face(plane) {
   return faceSketch
 }
 
-// Extrude a single side of the bin
+// extrude a single side of the bin
 singleSide = extrude(face(offsetPlane(YZ, offset = cornerRadius)), length = binLength - (cornerRadius * 2))
 
-// Create the other sides of the bin by using a circular pattern
+// create the other sides of the bin by using a circular pattern
 sides = patternCircular3d(
   singleSide,
   arcDegrees = 360,
@@ -46,16 +46,16 @@ sides = patternCircular3d(
   rotateDuplicates = true,
 )
 
-// Define an axis axis000
+// define an axis axis000
 axis000 = {
   direction = [0.0, 1.0],
   origin = [cornerRadius, cornerRadius]
 }
 
-// Create a single corner of the bin
+// create a single corner of the bin
 singleCorner = revolve(face(offsetPlane(YZ, offset = cornerRadius)), angle = -90, axis = axis000)
 
-// Create the corners of the bin
+// create the corners of the bin
 corners = patternCircular3d(
   singleCorner,
   arcDegrees = 360,
@@ -65,7 +65,7 @@ corners = patternCircular3d(
   rotateDuplicates = true,
 )
 
-// Create the baseplate by patterning sides
+// create the baseplate by patterning sides
 basePlateSides = patternLinear3d(
        sides,
        axis = [1.0, 0.0, 0.0],
@@ -74,7 +74,7 @@ basePlateSides = patternLinear3d(
      )
   |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength)
 
-// Create the corners of the baseplate by patterning the corners
+// create the corners of the baseplate by patterning the corners
 basePlateCorners = patternLinear3d(
        corners,
        axis = [1.0, 0.0, 0.0],
@@ -83,7 +83,7 @@ basePlateCorners = patternLinear3d(
      )
   |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength)
 
-// Create the center cutout for the magnet profile
+// create the center cutout for the magnet profile
 fn magnetCenterCutout(plane) {
   magnetSketch = startSketchOn(plane)
     |> startProfileAt([
@@ -126,7 +126,7 @@ fn magnetCenterCutout(plane) {
   return magnetSketch
 }
 
-// Create the outside profile of the magnets
+// create the outside profile of the magnets
 fn magnetBase(plane) {
   magnetBaseSketch = startSketchOn(plane)
     |> startProfileAt([0, 0], %)
@@ -138,7 +138,7 @@ fn magnetBase(plane) {
   return magnetBaseSketch
 }
 
-// Create sketch profile sketch000Profile002
+// create sketch profile sketch000Profile002
 magnetsSketch = startSketchOn(XY)
   |> circle(center = [cornerRadius * 2, cornerRadius * 2], radius = magOuterDiam / 2)
   |> patternCircular2d(
@@ -148,14 +148,14 @@ magnetsSketch = startSketchOn(XY)
        rotateDuplicates = true,
      )
 
-// Create a profile with holes for the magnets
+// create a profile with holes for the magnets
 magnetProfile = magnetBase(XY)
   |> hole(magnetsSketch, %)
 
-// Create an extrusion of the magnet cutout with holes
+// create an extrusion of the magnet cutout with holes
 magnetHolesExtrude = extrude(magnetProfile, length = -magDepth)
 
-// Add a fillet to the extrusion
+// add a fillet to the extrusion
 magnetHolesExtrudeFillets = fillet(
   magnetHolesExtrude,
   radius = cornerRadius,
@@ -167,13 +167,13 @@ magnetHolesExtrudeFillets = fillet(
   ],
 )
 
-// Create a profile without the holes for the magnets
+// create a profile without the holes for the magnets
 magnetProfileNoMagnets = magnetBase(offsetPlane(XY, offset = -magDepth))
 
-// Create an extrusion of the magnet cutout without holes
+// create an extrusion of the magnet cutout without holes
 magnetCutoutExtrude = extrude(magnetProfileNoMagnets, length = -magDepth)
 
-// Add a fillet to the extrusion
+// add a fillet to the extrusion
 magnetCutoutExtrudeFillets = fillet(
   magnetCutoutExtrude,
   radius = cornerRadius,
@@ -185,7 +185,7 @@ magnetCutoutExtrudeFillets = fillet(
   ],
 )
 
-// Pattern the magnet cutouts with holes
+// pattern the magnet cutouts with holes
 patternLinear3d(
        magnetHolesExtrudeFillets,
        axis = [1.0, 0.0, 0.0],
@@ -194,7 +194,7 @@ patternLinear3d(
      )
   |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength)
 
-// Pattern the magnet cutouts without holes
+// pattern the magnet cutouts without holes
 patternLinear3d(
        magnetCutoutExtrudeFillets,
        axis = [1.0, 0.0, 0.0],

public/kcl-samples/gridfinity-baseplate/main.kcl

@@ -4,7 +4,7 @@
 // Set units in millimeters (mm)
 @settings(defaultLengthUnit = mm)
 
-// Define parameters
+// Define constants
 binLength = 42.0
 cornerRadius = 4.0
 firstStep = 0.7
@@ -18,7 +18,7 @@ countBinLength = 3
 // The total height of the baseplate is a summation of the vertical heights of the baseplate steps
 height = firstStep + secondStep + thirdStep
 
-// Define a function which builds the profile of the baseplate bin
+// define a function which builds the profile of the baseplate bin
 fn face(plane) {
   faceSketch = startSketchOn(plane)
     |> startProfileAt([0, 0], %)
@@ -30,10 +30,10 @@ fn face(plane) {
   return faceSketch
 }
 
-// Extrude a single side of the bin
+// extrude a single side of the bin
 singleSide = extrude(face(offsetPlane(YZ, offset = cornerRadius)), length = binLength - (cornerRadius * 2))
 
-// Create the other sides of the bin by using a circular pattern
+// create the other sides of the bin by using a circular pattern
 sides = patternCircular3d(
   singleSide,
   arcDegrees = 360,
@@ -43,16 +43,16 @@ sides = patternCircular3d(
   rotateDuplicates = true,
 )
 
-// Define an axis axis000
+// define an axis axis000
 axis000 = {
   direction = [0.0, 1.0],
   origin = [cornerRadius, cornerRadius]
 }
 
-// Create a single corner of the bin
+// create a single corner of the bin
 singleCorner = revolve(face(offsetPlane(YZ, offset = cornerRadius)), angle = -90, axis = axis000)
 
-// Create the corners of the bin
+// create the corners of the bin
 corners = patternCircular3d(
   singleCorner,
   arcDegrees = 360,
@@ -62,7 +62,7 @@ corners = patternCircular3d(
   rotateDuplicates = true,
 )
 
-// Create the baseplate by patterning sides
+// create the baseplate by patterning sides
 basePlateSides = patternLinear3d(
        sides,
        axis = [1.0, 0.0, 0.0],
@@ -71,7 +71,7 @@ basePlateSides = patternLinear3d(
      )
   |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength)
 
-// Create the corners of the baseplate by patterning the corners
+// create the corners of the baseplate by patterning the corners
 basePlateCorners = patternLinear3d(
        corners,
        axis = [1.0, 0.0, 0.0],

public/kcl-samples/gridfinity-bins-stacking-lip/main.kcl

@@ -4,7 +4,7 @@
 // Set units in millimeters (mm)
 @settings(defaultLengthUnit = mm)
 
-// Define parameters
+// Define constants
 binLength = 41.5
 binHeight = 7.0
 binBaseLength = 2.95
@@ -33,7 +33,7 @@ countBinHeight = 1
 height = firstStep + secondStep + thirdStep
 lipHeight = lipStep1 + lipStep2 + lipStep3 + lipStep4 + lipStep5
 
-// Define a function which builds the profile of the baseplate bin
+// define a function which builds the profile of the baseplate bin
 fn face(plane) {
   faceSketch = startSketchOn(plane)
     |> startProfileAt([binBaseLength + binTol, 0], %)
@@ -46,10 +46,10 @@ fn face(plane) {
   return faceSketch
 }
 
-// Extrude a single side of the bin
+// extrude a single side of the bin
 singleSide = extrude(face(offsetPlane(YZ, offset = cornerRadius + binTol)), length = binLength - (cornerRadius * 2))
 
-// Create the other sides of the bin by using a circular pattern
+// create the other sides of the bin by using a circular pattern
 sides = patternCircular3d(
   singleSide,
   arcDegrees = 360,
@@ -63,7 +63,7 @@ sides = patternCircular3d(
   rotateDuplicates = true,
 )
 
-// Define an axis axis000
+// define an axis axis000
 axis000 = {
   direction = [0.0, 1.0],
   origin = [
@@ -72,10 +72,10 @@ axis000 = {
   ]
 }
 
-// Create a single corner of the bin
+// create a single corner of the bin
 singleCorner = revolve(face(offsetPlane(YZ, offset = cornerRadius + binTol)), angle = -90, axis = axis000)
 
-// Create the corners of the bin
+// create the corners of the bin
 corners = patternCircular3d(
   singleCorner,
   arcDegrees = 360,
@@ -128,7 +128,7 @@ magCutout000 = startSketchOn(singleBinFill, "start")
      )
   |> extrude(length = -magDepth)
 
-// Create the baseplate by patterning sides
+// create the baseplate by patterning sides
 binSides = patternLinear3d(
        sides,
        axis = [1.0, 0.0, 0.0],
@@ -137,7 +137,7 @@ binSides = patternLinear3d(
      )
   |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength + binTol * 2)
 
-// Create the corners of the baseplate by patterning the corners
+// create the corners of the baseplate by patterning the corners
 binCorners = patternLinear3d(
        corners,
        axis = [1.0, 0.0, 0.0],
@@ -146,7 +146,7 @@ binCorners = patternLinear3d(
      )
   |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength + binTol * 2)
 
-// Create the fill of the bin by patterning the corners
+// create the fill of the bin by patterning the corners
 binFill = patternLinear3d(
        singleBinFill,
        axis = [1.0, 0.0, 0.0],
@@ -155,6 +155,7 @@ binFill = patternLinear3d(
      )
   |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength + binTol * 2)
 
+//
 binTop = startSketchOn(offsetPlane(XY, offset = height))
   |> startProfileAt([0, 0], %)
   |> xLine(length = (binLength + 2 * binTol) * countBinWidth, tag = $line010)
@@ -173,7 +174,7 @@ binTop = startSketchOn(offsetPlane(XY, offset = height))
      )
   |> shell(faces = ["end"], thickness = binThk)
 
-// Define a function which builds the profile of the baseplate bin
+// define a function which builds the profile of the baseplate bin
 fn lipFace(plane) {
   faceSketch = startSketchOn(plane)
     |> startProfileAt([0, 0], %)
@@ -233,13 +234,13 @@ plane002 = {
   }
 }
 
-// Extrude a single side of the lip of the bin
+// extrude a single side of the lip of the bin
 lipSingleLength = extrude(lipFace(plane000), length = binLength * countBinWidth - (2 * cornerRadius) + 2 * binTol * countBinWidth)
 
-// Extrude a single side of the lip of the bin
+// extrude a single side of the lip of the bin
 lipSingleWidth = extrude(lipFace(plane001), length = binLength * countBinLength - (2 * cornerRadius) + 2 * binTol * countBinLength)
 
-// Create the other sides of the lips by using a circular pattern
+// create the other sides of the lips by using a circular pattern
 lipLengths = patternCircular3d(
   lipSingleLength,
   arcDegrees = 360,
@@ -253,7 +254,7 @@ lipLengths = patternCircular3d(
   rotateDuplicates = true,
 )
 
-// Create the other sides of the lips by using a circular pattern
+// create the other sides of the lips by using a circular pattern
 lipWidths = patternCircular3d(
   lipSingleWidth,
   arcDegrees = 360,
@@ -267,19 +268,19 @@ lipWidths = patternCircular3d(
   rotateDuplicates = true,
 )
 
-// Define an axis axis000
+// define an axis axis000
 axis001 = {
   direction = [0.0, 1.0],
   origin = [cornerRadius, cornerRadius]
 }
 
-// Create a single corner of the bin
+// create a single corner of the bin
 lipSingleLengthCorner = revolve(lipFace(plane000), angle = -90, axis = axis001)
 
-// Create a single corner of the bin
+// create a single corner of the bin
 lipSingleWidthCorner = revolve(lipFace(plane002), angle = 90, axis = axis001)
 
-// Create the corners of the bin
+// create the corners of the bin
 lipCorners000 = patternCircular3d(
   lipSingleLengthCorner,
   arcDegrees = 360,
@@ -293,7 +294,7 @@ lipCorners000 = patternCircular3d(
   rotateDuplicates = true,
 )
 
-// Create the corners of the bin
+// create the corners of the bin
 lipCorners001 = patternCircular3d(
   lipSingleWidthCorner,
   arcDegrees = 360,

public/kcl-samples/gridfinity-bins/main.kcl

@@ -4,7 +4,7 @@
 // Set units in millimeters (mm)
 @settings(defaultLengthUnit = mm)
 
-// Define parameters
+// Define constants
 binLength = 41.5
 binHeight = 7.0
 binBaseLength = 2.95
@@ -26,7 +26,7 @@ countBinHeight = 2
 // The total height of the baseplate is a summation of the vertical heights of the baseplate steps
 height = firstStep + secondStep + thirdStep
 
-// Define a function which builds the profile of the baseplate bin
+// define a function which builds the profile of the baseplate bin
 fn face(plane) {
   faceSketch = startSketchOn(plane)
     |> startProfileAt([binBaseLength + binTol, 0], %)
@@ -39,10 +39,10 @@ fn face(plane) {
   return faceSketch
 }
 
-// Extrude a single side of the bin
+// extrude a single side of the bin
 singleSide = extrude(face(offsetPlane(YZ, offset = cornerRadius + binTol)), length = binLength - (cornerRadius * 2))
 
-// Create the other sides of the bin by using a circular pattern
+// create the other sides of the bin by using a circular pattern
 sides = patternCircular3d(
   singleSide,
   arcDegrees = 360,
@@ -56,7 +56,7 @@ sides = patternCircular3d(
   rotateDuplicates = true,
 )
 
-// Define an axis axis000
+// define an axis axis000
 axis000 = {
   direction = [0.0, 1.0],
   origin = [
@@ -65,10 +65,10 @@ axis000 = {
   ]
 }
 
-// Create a single corner of the bin
+// create a single corner of the bin
 singleCorner = revolve(face(offsetPlane(YZ, offset = cornerRadius + binTol)), angle = -90, axis = axis000)
 
-// Create the corners of the bin
+// create the corners of the bin
 corners = patternCircular3d(
   singleCorner,
   arcDegrees = 360,
@@ -121,7 +121,7 @@ magCutout000 = startSketchOn(singleBinFill, "start")
      )
   |> extrude(length = -magDepth)
 
-// Create the baseplate by patterning sides
+// create the baseplate by patterning sides
 binSides = patternLinear3d(
        sides,
        axis = [1.0, 0.0, 0.0],
@@ -130,7 +130,7 @@ binSides = patternLinear3d(
      )
   |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength + binTol * 2)
 
-// Create the corners of the baseplate by patterning the corners
+// create the corners of the baseplate by patterning the corners
 binCorners = patternLinear3d(
        corners,
        axis = [1.0, 0.0, 0.0],
@@ -139,7 +139,7 @@ binCorners = patternLinear3d(
      )
   |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength + binTol * 2)
 
-// Create the fill of the bin by patterning the corners
+// create the fill of the bin by patterning the corners
 binFill = patternLinear3d(
        singleBinFill,
        axis = [1.0, 0.0, 0.0],
@@ -148,7 +148,7 @@ binFill = patternLinear3d(
      )
   |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength + binTol * 2)
 
-// Create the top of the bin
+// create the top of the bin
 binTop = startSketchOn(offsetPlane(XY, offset = height))
   |> startProfileAt([0, 0], %)
   |> xLine(length = (binLength + 2 * binTol) * countBinWidth, tag = $line010)

public/kcl-samples/hex-nut/main.kcl

@@ -1,10 +1,10 @@
-// Hex Nut
+// Hex nut
 // A hex nut is a type of fastener with a threaded hole and a hexagonal outer shape, used in a wide variety of applications to secure parts together. The hexagonal shape allows for a greater torque to be applied with wrenches or tools, making it one of the most common nut types in hardware.
 
 // Set Units
 @settings(defaultLengthUnit = in)
 
-// Define parameters (5/16" - 24 thread size)
+// Define constants (5/16" - 24 thread size)
 wallToWallLength = 0.5
 thickness = 0.266
 diameter = 0.3125

public/kcl-samples/i-beam/main.kcl

@@ -1,11 +1,11 @@
 // I-beam
 // A structural metal beam with an I shaped cross section. Often used in construction and architecture
 
-// Set units
+// Set Units
 @settings(defaultLengthUnit = in)
 
-// Define parameters
-beamLength = fromFt(6)
+// Define Beam Dimensions
+beamLength = 6 * ft()
 beamHeight = 4
 flangeWidth = 2.663
 flangeThickness = 0.293
@@ -13,7 +13,7 @@ webThickness = 0.193
 rootRadius = 0.457
 
 // Sketch a quadrant of the beam cross section, then mirror for symmetry across each axis. Extrude to the appropriate length
-iBeam = startSketchOn(-XZ)
+sketch001 = startSketchOn(-XZ)
   |> startProfileAt([0, beamHeight / 2], %)
   |> xLine(length = flangeWidth / 2)
   |> yLine(length = -flangeThickness)

public/kcl-samples/keyboard/main.kcl

@@ -1,10 +1,10 @@
 // Zoo Keyboard
 // A custom keyboard with Zoo brand lettering
 
-// Set units
+// Set Units
 @settings(defaultLengthUnit = in)
 
-// Define parameters
+// Define constants
 baseColor = "#0f0f0f"
 highlightColor1 = "#b0b0b0"
 highlightColor2 = "#23af93"

public/kcl-samples/kitt/main.kcl

@@ -1,7 +1,7 @@
 // Kitt
 // The beloved KittyCAD mascot in a voxelized style.
 
-// Pixel box function
+// pixel box function
 fn pixelBox(kitExtrude, extrudeTag, positionY, positionZ, width, height, depth) {
   pixelBoxBody = startSketchOn(kitExtrude, extrudeTag)
     |> startProfileAt([positionY, positionZ], %)

public/kcl-samples/lego/main.kcl

@@ -4,8 +4,8 @@
 // Set Units
 @settings(defaultLengthUnit = in)
 
-// Define parameters
-lbumps = 3 // number of bumps long
+// Define constants
+lbumps = 4 // number of bumps long
 wbumps = 2 // number of bumps wide
 pitch = 8.0
 clearance = 0.1

public/kcl-samples/makeup-mirror/main.kcl

@@ -1,19 +1,19 @@
 // Makeup Mirror
 // A circular vanity mirror mounted on a swiveling arm with pivot joints, used for personal grooming.
 
-// Set units
+// Settings
 @settings(defaultLengthUnit = mm)
 
-// Hinge parameters
+// hinge
 hingeRadius = 8
 hingeHeight = hingeRadius * 3
 hingeGap = 0.5
 
-// Arm parameters
+// arm
 armLength = 170
 armRadius = 5
 
-// Mirror parameters
+// mirror
 mirrorRadius = 170 / 2
 mirrorThickness = 10
 archToMirrorGap = 5
@@ -21,7 +21,7 @@ archThickness = 1
 archRadius = mirrorRadius + archToMirrorGap
 
 // Geometry
-// Add a function to create the hinge
+// hinge
 fn hingeFn(x, y, z) {
   hingeBody = startSketchOn(offsetPlane(XY, offset = z))
     |> circle(center = [x, y], radius = hingeRadius)
@@ -39,7 +39,7 @@ hingePartB3 = hingeFn(armLength, 0, hingeHeight * 2 + hingeGap * 2)
 hingePartC2 = hingeFn(armLength, -armLength, hingeHeight * 2 + hingeGap * 2)
 hingePartC3 = hingeFn(armLength, -armLength, hingeHeight * 3 + hingeGap * 3)
 
-// Add a function to create the arm
+// arm
 fn armFn(plane, offset, altitude) {
   armBody = startSketchOn(plane)
     |> circle(center = [offset, altitude], radius = armRadius)
@@ -50,7 +50,7 @@ fn armFn(plane, offset, altitude) {
 armPartA = armFn(YZ, 0, hingeHeight * 1.5 + hingeGap)
 armPartB = armFn(XZ, armLength, hingeHeight * 2.5 + hingeGap * 2)
 
-// Add a function to create the mirror
+// mirror
 fn mirrorFn(plane, offsetX, offsetY, altitude, radius, tiefe, gestellR, gestellD) {
   armPlane = startSketchOn(  offsetPlane(plane, offset = offsetY - (tiefe / 2)))
   armBody = circle(armPlane, center = [offsetX, altitude], radius = radius)

public/kcl-samples/manifest.json

@@ -6,6 +6,13 @@
     "title": "80/20 Rail",
     "description": "An 80/20 extruded aluminum linear rail. T-slot profile adjustable by profile height, rail length, and origin position"
   },
+  {
+    "file": "main.kcl",
+    "pathFromProjectDirectoryToFirstFile": "a-parametric-bearing-pillow-block/main.kcl",
+    "multipleFiles": false,
+    "title": "A Parametric Bearing Pillow Block",
+    "description": "A bearing pillow block, also known as a plummer block or pillow block bearing, is a pedestal used to provide support for a rotating shaft with the help of compatible bearings and various accessories. Housing a bearing, the pillow block provides a secure and stable foundation that allows the shaft to rotate smoothly within its machinery setup. These components are essential in a wide range of mechanical systems and machinery, playing a key role in reducing friction and supporting radial and axial loads."
+  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "ball-bearing/main.kcl",
@@ -150,7 +157,7 @@
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "hex-nut/main.kcl",
     "multipleFiles": false,
-    "title": "Hex Nut",
+    "title": "Hex nut",
     "description": "A hex nut is a type of fastener with a threaded hole and a hexagonal outer shape, used in a wide variety of applications to secure parts together. The hexagonal shape allows for a greater torque to be applied with wrenches or tools, making it one of the most common nut types in hardware."
   },
   {
@@ -202,19 +209,12 @@
     "title": "Robot Arm",
     "description": "A 4 axis robotic arm for industrial use. These machines can be used for assembly, packaging, organization of goods, and quality inspection processes"
   },
-  {
-    "file": "main.kcl",
-    "pathFromProjectDirectoryToFirstFile": "parametric-bearing-pillow-block/main.kcl",
-    "multipleFiles": false,
-    "title": "Parametric Bearing Pillow Block",
-    "description": "A bearing pillow block, also known as a plummer block or pillow block bearing, is a pedestal used to provide support for a rotating shaft with the help of compatible bearings and various accessories. Housing a bearing, the pillow block provides a secure and stable foundation that allows the shaft to rotate smoothly within its machinery setup. These components are essential in a wide range of mechanical systems and machinery, playing a key role in reducing friction and supporting radial and axial loads."
-  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "pipe/main.kcl",
     "multipleFiles": false,
     "title": "Pipe",
-    "description": "Piping for the pipe flange assembly"
+    "description": "A tubular section or hollow cylinder, usually but not necessarily of circular cross-section, used mainly to convey substances that can flow."
   },
   {
     "file": "main.kcl",
@@ -248,7 +248,7 @@
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "router-template-slate/main.kcl",
     "multipleFiles": false,
-    "title": "Router Template for a Slate",
+    "title": "Router template for a slate",
     "description": "A guide for routing a slate for a cross bar."
   },
   {

public/kcl-samples/mounting-plate/main.kcl

@@ -1,10 +1,10 @@
 // Mounting Plate
 // A flat piece of material, often metal or plastic, that serves as a support or base for attaching, securing, or mounting various types of equipment, devices, or components.
 
-// Set units
+// Set Units
 @settings(defaultLengthUnit = in)
 
-// Define parameters
+// Define constants
 plateLength = 10
 plateWidth = 6
 filletRadius = 0.5

public/kcl-samples/multi-axis-robot/main.kcl

@@ -4,7 +4,6 @@
 // Set Units
 @settings(defaultLengthUnit = in)
 
-// Import parts
 import "robot-arm-base.kcl" as robotArmBase
 import "robot-rotating-base.kcl" as rotatingBase
 import "robot-arm-j2.kcl" as j2RobotArm

public/kcl-samples/pipe-flange-assembly/1120t74-pipe.kcl

@@ -1,23 +1,25 @@
 // Pipe
-// Piping for the pipe flange assembly
+// piping for the pipe flange assembly
 
-// Set units
+// set units
 @settings(defaultLengthUnit = in)
 
-// Import parameters
-import pipeInnerDiameter, pipeOuterDiameter, pipeLength from "parameters.kcl"
+// import constants
+import pipeInnerDiameter, pipeOuterDiameter, pipeLength from "globals.kcl"
 
-// Create a function to make the pipe. Export
+// create a function to make the pipe
 export fn pipe() {
-  // Create the pipe base
+  // create the pipe base
   pipeBase = startSketchOn(XZ)
     |> circle(%, center = [0, 0], radius = pipeOuterDiameter / 2)
     |> extrude(%, length = pipeLength)
 
-  // Extrude a hole through the length of the pipe
+  // extrude a hole through the length of the pipe
   pipe = startSketchOn(pipeBase, 'end')
     |> circle(center = [0, 0], radius = pipeInnerDiameter / 2)
     |> extrude(%, length = -pipeLength)
     |> appearance(color = "#a24ed0")
   return pipe
 }
+
+// https://www.mcmaster.com/1120T74/

public/kcl-samples/pipe-flange-assembly/68095k348-flange.kcl

@@ -1,15 +1,15 @@
-// Flange
-// Flange used for mating two pipes together in the pipe flange assembly.
+// 68095k348 flange
+// flange used for mating two pipes together in the pipe flange assembly.
 
-// Set units
+// set units
 @settings(defaultLengthUnit = in)
 
-// Import parameters
-import pipeDiameter, mountingHoleDiameter, mountingHolePlacementDiameter, flangeDiameter, flangeTotalThickness, flangeBackHeight, flangeFrontHeight, flangeBaseThickness, flangeBackDiameter, flangeFrontDiameter from "parameters.kcl"
+// import constants
+import pipeDiameter, mountingHoleDiameter, mountingHolePlacementDiameter, flangeDiameter, flangeTotalThickness, flangeBackHeight, flangeFrontHeight, flangeBaseThickness, flangeBackDiameter, flangeFrontDiameter from "globals.kcl"
 
-// Create a function to create the flange. We must create a function since we are using multiple flanges.
+// create a function to create the flange
 export fn flange() {
-  // Sketch the mounting hole pattern
+  // sketch the mounting hole pattern
   mountingHoles = startSketchOn(XY)
     |> circle(%, center = [0, mountingHolePlacementDiameter / 2], radius = mountingHoleDiameter / 2)
     |> patternCircular2d(
@@ -20,13 +20,13 @@ export fn flange() {
          rotateDuplicates = false,
        )
 
-  // Create the flange base
+  // create the flange base
   flangeBase = startSketchOn(XY)
     |> circle(%, center = [0, 0], radius = flangeDiameter / 2)
     |> hole(mountingHoles, %)
     |> extrude(%, length = flangeBaseThickness)
 
-  // Create both the raised portions on the front and back of the flange base
+  // create both the raised portions on the front and back of the flange base
   flangeBack = startSketchOn(flangeBase, 'start')
     |> circle(%, center = [0, 0], radius = flangeBackDiameter / 2)
     |> extrude(%, length = flangeBackHeight)
@@ -34,7 +34,7 @@ export fn flange() {
     |> circle(%, center = [0, 0], radius = flangeFrontDiameter / 2)
     |> extrude(%, length = flangeFrontHeight)
 
-  // Create the circular cut in the center for the pipe
+  // create the circular cut in the center for the pipe
   pipeCut = startSketchOn(flangeFront, 'end')
     |> circle(%, center = [0, 0], radius = pipeDiameter / 2)
     |> extrude(%, length = -flangeTotalThickness)
@@ -42,3 +42,5 @@ export fn flange() {
 
   return pipeCut
 }
+
+// https://www.mcmaster.com/68095K348/

public/kcl-samples/pipe-flange-assembly/91251a404-bolt.kcl

@@ -1,13 +1,13 @@
-// Socket Head Cap Screw
+// 91251A404 Socket Head Cap Screw
 // screw for mating the flanges together in the pipe flange assembly
 
-// Set units
+// set units
 @settings(defaultLengthUnit = in)
 
-// Import parameters
-import boltDiameter, boltLength, boltHeadLength, boltHeadDiameter, boltHexDrive, boltHexFlatLength, boltThreadLength from "parameters.kcl"
+// import constants
+import boltDiameter, boltLength, boltHeadLength, boltHeadDiameter, boltHexDrive, boltHexFlatLength, boltThreadLength from "globals.kcl"
 
-// Create a function to make a the bolt
+// create a function to make a the bolt
 export fn bolt() {
   // Create the head of the cap screw
   boltHead = startSketchOn(XZ)
@@ -52,3 +52,5 @@ export fn bolt() {
 
   return boltBody
 }
+
+// https://www.mcmaster.com/91251a404/

public/kcl-samples/pipe-flange-assembly/9472k188-gasket.kcl

@@ -1,19 +1,26 @@
-// Gasket
-// Gasket for the pipe flange assembly. A gasket is a mechanical seal that fills the space between two or more mating surfaces, preventing leaks of liquids or gases under compression
+// 9472K188 Gasket
+// gasket for the pipe flange assembly. A gasket is a mechanical seal that fills the space between two or more mating surfaces, preventing leaks of liquids or gases under compression
 
-// Set units
+// set units
 @settings(defaultLengthUnit = in)
 
-// Import parameters
-import gasketOutsideDiameter, gasketInnerDiameter, gasketThickness from "parameters.kcl"
+// import constants
+import gasketOutsideDiameter, gasketInnerDiameter, gasketThickness from "globals.kcl"
 
-// Create the base of the gasket
-gasketBase = startSketchOn(XY)
-  |> circle(%, center = [0, 0], radius = gasketOutsideDiameter / 2)
-  |> extrude(%, length = gasketThickness)
+// create a function to make the gasket
+export fn gasket() {
+  // create the base of the gasket
+  gasketBase = startSketchOn(XY)
+    |> circle(%, center = [0, 0], radius = gasketOutsideDiameter / 2)
+    |> extrude(%, length = gasketThickness)
 
-// Extrude a circular hole through the gasket base
-startSketchOn(gasketBase, 'end')
-  |> circle(%, center = [0, 0], radius = gasketInnerDiameter / 2)
-  |> extrude(%, length = -gasketThickness)
-  |> appearance(%, color = "#d0cb3e")
+  // extrude a circular hole through the gasket base
+  gasket = startSketchOn(gasketBase, 'end')
+    |> circle(%, center = [0, 0], radius = gasketInnerDiameter / 2)
+    |> extrude(%, length = -gasketThickness)
+    |> appearance(%, color = "#d0cb3e")
+
+  return gasket
+}
+
+// https://www.mcmaster.com/9472K616/

public/kcl-samples/pipe-flange-assembly/95479a127-hex-nut.kcl

@@ -1,15 +1,15 @@
-// Hex Nut
-// Hex nut for the screws in the pipe flange assembly.
+// 95479A127 Hex Nut
+// hex nut for the screws in the pipe flange assembly.
 
-// Set units
+// set units
 @settings(defaultLengthUnit = in)
 
-// Import parameters
-import hexNutDiameter, hexNutFlatToFlat, hexNutThickness, hexNutFlatLength from "parameters.kcl"
+// import constants
+import hexNutDiameter, hexNutFlatToFlat, hexNutThickness, hexNutFlatLength from "globals.kcl"
 
-// Create a function to make the hex nut. Must be a function since multiple hex nuts are used
+// create a function to make the hex nut
 export fn hexNut() {
-  // Create the base of the hex nut
+  // create the base of the hex nut
   hexNutBase = startSketchOn(XY)
     |> startProfileAt([
          hexNutFlatToFlat / 2,
@@ -38,7 +38,7 @@ export fn hexNut() {
     |> close()
     |> extrude(length = hexNutThickness)
 
-  // Create the hole in the center of the hex nut
+  // create the hole in the center of the hex nut
   hexNut = startSketchOn(hexNutBase, 'end')
     |> circle(center = [0, 0], radius = hexNutDiameter / 2)
     |> extrude(%, length = -hexNutThickness)
@@ -46,3 +46,4 @@ export fn hexNut() {
 
   return hexNut
 }
+// https://www.mcmaster.com/95479A127/

public/kcl-samples/pipe-flange-assembly/98017a257-washer.kcl

@@ -1,20 +1,20 @@
 // 98017A257 Washer
-// Washer for the screws in the pipe flange assembly.
+// washer for the screws in the pipe flange assembly.
 
-// Set units
+// set units
 @settings(defaultLengthUnit = in)
 
-// Import parameters
-import washerInnerDia, washerOuterDia, washerThickness from "parameters.kcl"
+// import constants
+import washerInnerDia, washerOuterDia, washerThickness from "globals.kcl"
 
-// Create a function to make the washer. Must be a function since multiple washers are used.
+// create a function to make the washer
 export fn washer() {
-  // Create the base of the washer
+  // create the base of the washer
   washerBase = startSketchOn(XY)
     |> circle(center = [0, 0], radius = washerOuterDia / 2)
     |> extrude(length = washerThickness)
 
-  // Extrude a hole through the washer
+  // extrude a hole through the washer
   washer = startSketchOn(washerBase, 'end')
     |> circle(center = [0, 0], radius = washerInnerDia / 2)
     |> extrude(%, length = -washerThickness)
@@ -22,3 +22,5 @@ export fn washer() {
 
   return washer
 }
+
+// https://www.mcmaster.com/98017A257/

public/kcl-samples/pipe-flange-assembly/globals.kcl

@@ -1,9 +1,9 @@
-// Parameters
+// Globals
 
-// Set units
+// set units
 @settings(defaultLengthUnit = in)
 
-// Flange (68095K348)
+// flange (68095K348)
 export pipeDiameter = 2.440
 export mountingHoleDiameter = 0.750
 export mountingHolePlacementDiameter = 4.750
@@ -17,12 +17,12 @@ export flangeBaseThickness = flangeTotalThickness - flangeBackHeight - flangeFro
 export flangeBackDiameter = 3.620
 export flangeFrontDiameter = 3.060
 
-// Washer (98017A257)
+// washer (98017A257)
 export washerInnerDia = 0.640
 export washerOuterDia = 1.188
 export washerThickness = 0.032
 
-// Bolt (91251A404)
+// bolt (91251A404)
 export boltDiameter = 0.625
 export boltLength = 2.500
 export boltHeadLength = boltDiameter
@@ -31,18 +31,18 @@ export boltHexDrive = 1 / 2
 export boltHexFlatLength = boltHexDrive / (2 * cos(toRadians(30)))
 export boltThreadLength = 1.750
 
-// Hex nut (95479A127)
+// hex nut (95479A127)
 export hexNutDiameter = 5 / 8
 export hexNutFlatToFlat = 15 / 16
 export hexNutThickness = 35 / 64
 export hexNutFlatLength = hexNutFlatToFlat / (2 * cos(toRadians(30)))
 
-// Gasket (9472K188)
+// gasket (9472K188)
 export gasketOutsideDiameter = 4.125
 export gasketInnerDiameter = 2.375
 export gasketThickness = 0.031
 
-// Pipe (1120T74)
+// pipe (1120T74)
 export pipeInnerDiameter = 2.0
 export pipeOuterDiameter = 2.375
 export pipeLength = 6

public/kcl-samples/pipe-flange-assembly/main.kcl

@@ -1,31 +1,31 @@
 // Pipe and Flange Assembly
 // A crucial component in various piping systems, designed to facilitate the connection, disconnection, and access to piping for inspection, cleaning, and modifications. This assembly combines pipes (long cylindrical conduits) with flanges (plate-like fittings) to create a secure yet detachable joint.
 
-// Set units
+// set units
 @settings(defaultLengthUnit = in)
 
-// Import parameters
-import * from "parameters.kcl"
+// import constants
+import * from "globals.kcl"
 
-// Import parts
-import "9472k188-gasket.kcl" as gasket
+// import parts
 import flange from "68095k348-flange.kcl"
+import gasket from "9472k188-gasket.kcl"
 import washer from "98017a257-washer.kcl"
 import bolt from "91251a404-bolt.kcl"
 import hexNut from "95479a127-hex-nut.kcl"
 import pipe from "1120t74-pipe.kcl"
 
-// Place flanges
+// place flanges
 flange()
 flange()
   |> rotate(axis = [0, 1, 0], angle = 180)
   |> translate(x = 0, y = 0, z = flangeBackHeight * 2 + gasketThickness)
 
-// Place gasket between the flanges
-gasket
+// place gasket between the flanges
+gasket()
   |> translate(x = 0, y = 0, z = -flangeBackHeight - gasketThickness)
 
-// Place eight washers (four front, four back)
+// place eight washers (four front, four back)
 washer()
   |> translate(x = mountingHolePlacementDiameter / 2, y = 0, z = flangeBaseThickness)
   |> patternCircular3d(
@@ -43,7 +43,7 @@ washer()
        axis = [0, 0, 1],
      )
 
-// Place four bolts
+// place four bolts
 bolt()
   |> translate(x = mountingHolePlacementDiameter / 2, y = 0, z = flangeBaseThickness + washerThickness)
   |> rotate(roll = 90, pitch = 0, yaw = 0)
@@ -56,7 +56,7 @@ bolt()
        rotateDuplicates = false,
      )
 
-// Place four hex nuts
+// place four hex nuts
 hexNut()
   |> translate(x = mountingHolePlacementDiameter / 2, y = 0, z = -(flangeBackHeight * 2 + gasketThickness + flangeBaseThickness + washerThickness + hexNutThickness))
   |> patternCircular3d(
@@ -68,7 +68,7 @@ hexNut()
        rotateDuplicates = false,
      )
 
-// Place both pieces of pipe
+// place both pieces of pipe
 pipe()
   |> rotate(
        %,

public/kcl-samples/pipe-with-bend/main.kcl

@@ -4,24 +4,24 @@
 // Set units
 @settings(defaultLengthUnit = in)
 
-// Define parameters
+// Define constants
 innerDiameter = 10
 outerDiameter = 20
 bendRadius = 30
 bendAngle = 90
 
-// Create a sketch in the 'XZ' plane
+// create a sketch in the 'XZ' plane
 sketch000 = startSketchOn(XZ)
 
-// Create a profile for the outer diameter
+// create a profile for the outer diameter
 outerProfile = circle(sketch000, center = [bendRadius, 0], radius = outerDiameter / 2)
 
-// Create a profile for the inner diameter
+// create a profile for the inner diameter
 innerProfile = circle(sketch000, center = [bendRadius, 0], radius = innerDiameter / 2)
 
-// Create the profile of the pipe
+// create the profile of the pipe
 pipeProfile = outerProfile
   |> hole(innerProfile, %)
 
-// Revolve the pipe profile at the desired angle
+// revolve the pipe profile at the desired angle
 pipe = revolve(pipeProfile, axis = Y, angle = bendAngle)

public/kcl-samples/pipe/main.kcl

@@ -1,21 +1,36 @@
 // Pipe
-// Piping for the pipe flange assembly
+// A tubular section or hollow cylinder, usually but not necessarily of circular cross-section, used mainly to convey substances that can flow.
 
-// Set units
+// Set Units
 @settings(defaultLengthUnit = in)
 
-// Define parameters
-pipeInnerDiameter = 2.0
-pipeOuterDiameter = 2.375
-pipeLength = 6
+// Define constants
+pipeTotalLength = 20
+pipeLargeDiaLength = 1
+pipeLargeDia = 1
+pipeSmallDia = .75
+thickness = 0.125
+pipeTransitionAngle = 60
+pipeTransitionLength = 0.5
+pipeSmallDiaLength = pipeTotalLength - pipeTransitionLength - pipeLargeDiaLength
 
-// Create the pipe base
-pipeBase = startSketchOn(XZ)
-  |> circle(%, center = [0, 0], radius = pipeOuterDiameter / 2)
-  |> extrude(%, length = pipeLength)
+// Create the sketch to be revolved around the y-axis. Use the small diameter, large diameter, length, and thickness to define the sketch.
+pipeSketch = startSketchOn(XY)
+  |> startProfileAt([pipeSmallDia - (thickness / 2), 38], %)
+  |> line(end = [thickness, 0])
+  |> line(end = [0, -pipeSmallDiaLength])
+  |> angledLineOfYLength({
+       angle = -60,
+       length = pipeTransitionLength
+     }, %)
+  |> line(end = [0, -pipeLargeDiaLength])
+  |> xLine(length = -thickness)
+  |> line(end = [0, pipeLargeDiaLength])
+  |> angledLineToX({
+       angle = -pipeTransitionAngle + 180,
+       to = pipeSmallDia - (thickness / 2)
+     }, %)
+  |> close()
 
-// Extrude a hole through the length of the pipe
-pipe = startSketchOn(pipeBase, 'end')
-  |> circle(center = [0, 0], radius = pipeInnerDiameter / 2)
-  |> extrude(%, length = -pipeLength)
-  |> appearance(color = "#a24ed0")
+// Revolve the sketch to create the pipe
+pipe = revolve(pipeSketch, axis = Y)

public/kcl-samples/poopy-shoe/main.kcl

@@ -4,7 +4,6 @@
 // Set units
 @settings(defaultLengthUnit = in)
 
-// Define parameters
 wallThickness = 0.125
 wallsWidth = 3
 height = 5.125
@@ -13,7 +12,6 @@ backLength = 6
 exitHeight = 1
 frontLength = 7
 
-// Create the curved portion that catches the printer poop
 sketch001 = startSketchOn(-YZ)
   |> startProfileAt([wallsWidth / 2, 0], %)
   |> xLine(length = wallThickness / 2)
@@ -80,7 +78,6 @@ sketch003 = startSketchOn(customPlane)
   |> close()
   |> extrude(length = wallThickness)
 
-// Create the right side wall of the tub
 sketch004 = startSketchOn(sketch002, 'END')
   |> startProfileAt([0, 0], %)
   |> yLine(endAbsolute = height)

public/kcl-samples/router-template-cross-bar/main.kcl

@@ -1,23 +1,18 @@
 // Router template for a cross bar
 // A guide for routing a notch into a cross bar.
 
-// Set units
+// Set Units
 @settings(defaultLengthUnit = mm)
 
-// Define parameters
 routerDiameter = 12.7
-templateDiameter = fromInches(11 / 16)
+templateDiameter = 11 / 16 * inch()
+templateGap = (templateDiameter - routerDiameter) / 2 - 0.5
 slateWidthHalf = 41.5 / 2
 minClampingDistance = 50 + 30
 templateThickness = 10
 radius = 10
 depth = 30
-
-// Calculated parameters
-templateGap = (templateDiameter - routerDiameter) / 2 - 0.5
 distanceToInsideEdge = slateWidthHalf + templateThickness + templateGap
-
-// Create the first sketch
 sketch001 = startSketchOn(XZ)
   |> startProfileAt([0, depth + templateGap], %)
   |> xLine(length = slateWidthHalf - radius, tag = $seg01)
@@ -49,12 +44,9 @@ sketch001 = startSketchOn(XZ)
      }, %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-
-// Extrude the first sketch
 extrude001 = extrude(sketch001, length = 5)
 
-// Create the second sketch
-sketch002 = startSketchOn(extrude001, 'START')
+sketch003 = startSketchOn(extrude001, 'START')
   |> startProfileAt([distanceToInsideEdge, 0], %)
   |> angledLine([180, templateThickness], %, $rectangleSegmentA002)
   |> angledLine([
@@ -67,12 +59,9 @@ sketch002 = startSketchOn(extrude001, 'START')
      ], %, $rectangleSegmentC002)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
+extrude003 = extrude(sketch003, length = 13)
 
-// Extrude the second sketch
-extrude002 = extrude(sketch002, length = 13)
-
-// Create the third sketch
-sketch003 = startSketchOn(extrude001, 'START')
+sketch002 = startSketchOn(extrude001, 'START')
   |> startProfileAt([-distanceToInsideEdge, 0], %)
   |> angledLine([0, templateThickness], %, $rectangleSegmentA001)
   |> angledLine([
@@ -86,10 +75,8 @@ sketch003 = startSketchOn(extrude001, 'START')
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 
-// Extrude the third sketch
-extrude003 = extrude(sketch003, length = 13)
+extrude002 = extrude(sketch002, length = 13)
 
-// Create the fourth sketch
 sketch004 = startSketchOn(extrude002, 'END')
   |> startProfileAt([-distanceToInsideEdge, 0], %)
   |> angledLine([0, distanceToInsideEdge * 2], %, $rectangleSegmentA003)
@@ -103,6 +90,4 @@ sketch004 = startSketchOn(extrude002, 'END')
      ], %, $rectangleSegmentC003)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-
-// Extrude the fourth sketch
 extrude004 = extrude(sketch004, length = 4)

public/kcl-samples/router-template-slate/main.kcl

@@ -1,20 +1,18 @@
-// Router Template for a Slate
+// Router template for a slate
 // A guide for routing a slate for a cross bar.
 
-// Set units
+// Set Units
 @settings(defaultLengthUnit = mm)
 
-// Define parameters
+// Define constants
 routerDiameter = 12.7
-templateDiameter = fromInches(11 / 16)
+templateDiameter = 11 / 16 * inch()
+templateGap = (templateDiameter - routerDiameter) / 2 - 0.5
 slateWidthHalf = 41.5 / 2
 minClampingDistance = 50 + 30
 templateThickness = 10
 radius = 10
 depth = 30
-
-// Calculated parameters
-templateGap = (templateDiameter - routerDiameter) / 2 - 0.5
 length001 = slateWidthHalf - radius
 length002 = depth + minClampingDistance
 

public/kcl-samples/sheet-metal-bracket/main.kcl

@@ -1,7 +1,7 @@
 // Sheet Metal Bracket
 // A component typically made from flat sheet metal through various manufacturing processes such as bending, punching, cutting, and forming. These brackets are used to support, attach, or mount other hardware components, often providing a structural or functional base for assembly.
 
-// Set units
+// Set Units
 @settings(defaultLengthUnit = in)
 
 // Input bolt pattern dimensions to mount the bracket
@@ -14,13 +14,13 @@ componentBoltDiameter = 3 / 16
 componentBoltPatternX = 2
 componentBoltPatternY = 3
 
-// Define bracket parameters such as sheet metal thickness, bend radius, flange length, etc.
+// Define bracket constants such as sheet metal thickness, bend radius, flange length, etc.
 hatHeight = 2.5
 bendAngle = 75
 thickness = 0.125
 interiorBendRadius = 0.125
 
-// Calculate remaining parameters
+// Calculate Remaining Parameters
 exteriorBendRadius = interiorBendRadius + thickness
 overhang = 3 * mountingBoltDiameter
 flangeLength = 6 * mountingBoltDiameter