Fix error: unknown sketch function circle (#6012)

* chore: skeleton for building and creating menus. Need electron to renderer interface to dynamically set the menu

* chore: skeleton typing for communication between nodes and web side

* chore: more skeleton for the different roles within the menu options, need more type safety

* chore: adding more skeleton and templates of what the menus could be

* chore: implemented first pass for helpRole links

* fix: syntax issue stopped the build step

* feature: loading different menus based on your page

* feature: Home page file role implemented

* chore: handling the build workflow for the signin page

* fix: moving edit actionst to the edit menu

* chore: adding preferences to the file role

* chore: redoing help roles based on the question mark widget

* fix: auto fmt

* chore: examples of accelerator strings for Menu.MenuItems keyboard shortcuts!

* chore: oddly specific toggle API for disabling MenuItems from JS. No rules!

* fix: do not implement a custom label disable thingy, use id on menu and use the native APIga

* fix: auto fmt

* fix: adding some typechecks and auto fmt fixes

* fix: trying to fix custom type?

* fix: nvm we back, the lsp on my editor borked for a second

* fix: adding one more level to the custom type for the labels

* chore: cleaning up type definitions to read easier

* fix: resolving yarn lint errors

* chore: adding file sign out

* chore: adding more file bar actions

* chore: ready for PR draft

* fix: preemptive GC collectoin bug fix if somehow a user interacts with a menu while it is being GCed

* fix: linking the OG source

* fix: set application menu to null to avoid default electron menu

* chore: trying to add more typescript

* chore: BIG workflow changes... better typing, less IPC junk

* fix: remapping the icp functions to the cb option select...

* chore: all og events are rehooked up with new workflow pattern

* feat: adding more options to the native bar!

* fix: todo

* chore: cleaning up some menus and adding more

* fix: desktop vs browser and lint errors

* fix: typescript did not like sample electorn JS code for the basic templates with isMac conditionals...

* fix: PR clean up

* fix: more PR cleanup

* A snapshot a day keeps the bugs away! 📷🐛

* fix: added the new help menu to the default sign in and modeling page

* fix: disabled two menu actions within sign in page since they will not do anything.

* A snapshot a day keeps the bugs away! 📷🐛

* A snapshot a day keeps the bugs away! 📷🐛

* fix: mergining main, auto fixes

* A snapshot a day keeps the bugs away! 📷🐛

* A snapshot a day keeps the bugs away! 📷🐛

* A snapshot a day keeps the bugs away! 📷🐛

* A snapshot a day keeps the bugs away! 📷🐛

* fix: fixed ipc renderer off/remove listener bug

* A snapshot a day keeps the bugs away! 📷🐛

* A snapshot a day keeps the bugs away! 📷🐛

* A snapshot a day keeps the bugs away! 📷🐛

* A snapshot a day keeps the bugs away! 📷🐛

* fix: report a bug to refresha and report a bug

* fix: new type for webContents send payload that does not brick TS

* fix: removing import file from url since it is not working in the command palette for manual user input

* fix: removing old comment

* A snapshot a day keeps the bugs away! 📷🐛

* A snapshot a day keeps the bugs away! 📷🐛

* A snapshot a day keeps the bugs away! 📷🐛

* A snapshot a day keeps the bugs away! 📷🐛

* A snapshot a day keeps the bugs away! 📷🐛

* A snapshot a day keeps the bugs away! 📷🐛

* A snapshot a day keeps the bugs away! 📷🐛

* A snapshot a day keeps the bugs away! 📷🐛

* A snapshot a day keeps the bugs away! 📷🐛

* chore: adding some E2E tests.

* chore: added E2E tests for each file menu

* fix: auto fixes

* chore: adding more edit role E2E tests

* chore: e2e test

* chore: adding help role e2e test

* A snapshot a day keeps the bugs away! 📷🐛

* chore: e2e test for all the menu options you can interact with in the frontend

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.envrc

@@ -1 +1,3 @@
+source_up_if_exists
+
 use flake .

.github/workflows/e2e-tests.yml

@@ -1,7 +1,9 @@
 name: E2E Tests
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
+      - all-e2e # this bypasses `fixme()` using `orRunWhenFullSuiteEnabled()`
   pull_request:
   schedule:
     - cron: 0 * * * *  # hourly
@@ -15,7 +17,6 @@ permissions:
   pull-requests: write
   actions: read
 
-
 jobs:
 
   conditions:
@@ -67,14 +68,16 @@ jobs:
       - name: Display conditions
         shell: bash
         run: |
-          # For debugging purposes.
+          # For debugging purposes
           set -euo pipefail
+          echo "GITHUB_REF: $GITHUB_REF"
+          echo "GITHUB_HEAD_REF: $GITHUB_HEAD_REF"
+          echo "GITHUB_BASE_REF: $GITHUB_BASE_REF"
           echo "significant: ${{ steps.path-changes.outputs.significant }}"
           echo "should-run: ${{ steps.should-run.outputs.should-run }}"
 
-
   prepare-wasm:
-    # seperate job on Ubuntu to build or fetch the wasm blob once on the fastest runner
+    # separate job on Ubuntu to build or fetch the wasm blob once on the fastest runner
     runs-on: runs-on=${{ github.run_id }}/family=i7ie.2xlarge/image=ubuntu22-full-x64
     needs: conditions
     steps:
@@ -160,7 +163,6 @@ jobs:
           path: |
             rust/kcl-wasm-lib/pkg/kcl_wasm_lib*
 
-
   snapshots:
     name: playwright:snapshots:ubuntu
     runs-on: runs-on=${{ github.run_id }}/family=i7ie.2xlarge/image=ubuntu22-full-x64
@@ -243,7 +245,7 @@ jobs:
           retention-days: 30
           overwrite: true
 
-      - name: check for changes
+      - name: Check for changes
         if: ${{ needs.conditions.outputs.should-run == 'true' && github.ref != 'refs/heads/main' }}
         shell: bash
         id: git-check
@@ -255,7 +257,8 @@ jobs:
             fi
 
       - name: Commit changes, if any
-        if: ${{ needs.conditions.outputs.should-run == 'true' && steps.git-check.outputs.modified == 'true' }}
+        # TODO: find a more reliable way to detect visual changes
+        if: ${{ false && needs.conditions.outputs.should-run == 'true' && steps.git-check.outputs.modified == 'true' }}
         shell: bash
         run: |
           git add e2e/playwright/snapshot-tests.spec.ts-snapshots e2e/playwright/snapshots
@@ -341,7 +344,7 @@ jobs:
         run: yarn tronb:vite:dev
 
       - name: Install vector
-        if: contains(matrix.os, 'ubuntu')
+        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

.github/workflows/static-analysis.yml

@@ -141,13 +141,13 @@ jobs:
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
         run: yarn playwright install chromium --with-deps
 
-      - name: run unit tests
+      - name: Run unit tests
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
         run: xvfb-run -a yarn test:unit
         env:
           VITE_KC_DEV_TOKEN: ${{ secrets.KITTYCAD_API_TOKEN_DEV }}
 
-      - name: check for changes
+      - name: Check for changes
         if: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
         id: git-check
         run: |

.github/workflows/update-e2e-branch.yml

@@ -14,16 +14,32 @@ permissions:
 jobs:
   update-branch:
     runs-on: ubuntu-latest
-
     steps:
+      - uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ secrets.MODELING_APP_GH_APP_ID }}
+          private-key: ${{ secrets.MODELING_APP_GH_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+
       - uses: actions/checkout@v4
-      - shell: bash
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+
+      - name: Sync with main
         run: |
-          # checkout our branch
+          # Create the branch
           git checkout all-e2e || git checkout -b all-e2e
-          # fetch origin
+
+          # Reset to main
           git fetch origin
-          # reset to main
           git reset --hard origin/main
-          # force push it
+
+          # Get a new SHA to prevent overwriting the commit status on main
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git commit --amend --message="[all-e2e] $(git log --max-count=1 --pretty=%B)"
+
+          # Overwrite the branch
+          git remote set-url origin https://x-access-token:${{ steps.app-token.outputs.token }}@github.com/${{ github.repository }}.git
           git push --force origin all-e2e

Makefile

@@ -20,8 +20,12 @@ $(WASM_PACK):
 ###############################################################################
 # BUILD
 
-RUST_SOURCES := $(wildcard rust/*) $(wildcard rust/**/*)
+CARGO_SOURCES := rust/.cargo/config.toml $(wildcard rust/Cargo.*) $(wildcard rust/**/Cargo.*)
-TYPESCRIPT_SOURCES := $(wildcard src/**/*.tsx) $(wildcard src/**/*.ts)
+RUST_SOURCES := $(wildcard rust/**/*.rs)
+
+REACT_SOURCES := $(wildcard src/*.tsx) $(wildcard src/**/*.tsx)
+TYPESCRIPT_SOURCES := tsconfig.* $(wildcard src/*.ts) $(wildcard src/**/*.ts)
+VITE_SOURCES := $(wildcard vite.*) $(wildcard vite/**/*.tsx)
 
 .PHONY: build
 build: build-web build-desktop
@@ -32,13 +36,13 @@ build-web: public/kcl_wasm_lib_bg.wasm build/index.html
 .PHONY: build-desktop
 build-desktop: public/kcl_wasm_lib_bg.wasm .vite/build/main.js
 
-public/kcl_wasm_lib_bg.wasm: $(RUST_SOURCES)
+public/kcl_wasm_lib_bg.wasm: $(CARGO_SOURCES)$(RUST_SOURCES)
 	yarn build:wasm
 
-build/index.html: $(TYPESCRIPT_SOURCES)
+build/index.html: $(REACT_SOURCES) $(TYPESCRIPT_SOURCES) $(VITE_SOURCES)
 	yarn build:local
 
-.vite/build/main.js: $(TYPESCRIPT_SOURCES)
+.vite/build/main.js: $(REACT_SOURCES) $(TYPESCRIPT_SOURCES) $(VITE_SOURCES)
 	yarn tronb:vite:dev
 
 ###############################################################################
@@ -73,19 +77,29 @@ run-desktop: install build-desktop ## Start the desktop app
 ###############################################################################
 # TEST
 
-GREP ?= ""
+E2E_WORKERS ?= 1
+E2E_FAILURES ?= 1
+E2E_GREP ?= ""
 
 .PHONY: test
 test: test-unit test-e2e
 
 .PHONY: test-unit
 test-unit: install ## Run the unit tests
-	@ nc -z localhost 3000 || ( echo "Error: localhost:3000 not available, 'make run-web' first" && exit 1 )
+	@ curl -fs localhost:3000 >/dev/null || ( echo "Error: localhost:3000 not available, 'make run-web' first" && exit 1 )
 	yarn test:unit
 
 .PHONY: test-e2e
-test-e2e: install build-desktop ## Run the e2e tests
+test-e2e: test-e2e-desktop
-	yarn test:playwright:electron --workers=1 --grep=$(GREP)
+
+.PHONY: test-e2e-web
+test-e2e-web: install build-web ## Run the web e2e tests
+	@ curl -fs localhost:3000 >/dev/null || ( echo "Error: localhost:3000 not available, 'make run-web' first" && exit 1 )
+	yarn chrome:test --headed --workers=$(E2E_WORKERS) --max-failures=$(E2E_FAILURES) --grep=$(E2E_GREP)
+
+.PHONY: test-e2e-desktop
+test-e2e-desktop: install build-desktop ## Run the desktop e2e tests
+	yarn test:playwright:electron --workers=$(E2E_WORKERS) --max-failures=$(E2E_FAILURES) --grep=$(E2E_GREP)
 
 ###############################################################################
 # CLEAN

docs/kcl/circleThreePoint.md

@@ -10,10 +10,10 @@ Construct a circle derived from 3 points.
 
 ```js
 circleThreePoint(
+  sketchSurfaceOrGroup: SketchOrSurface,
   p1: [number],
   p2: [number],
   p3: [number],
-  sketchSurfaceOrGroup: SketchOrSurface,
   tag?: TagDeclarator,
 ): Sketch
 ```
@@ -23,10 +23,10 @@ circleThreePoint(
 
 | Name | Type | Description | Required |
 |----------|------|-------------|----------|
+| `sketchSurfaceOrGroup` | [`SketchOrSurface`](/docs/kcl/types/SketchOrSurface) | Plane or surface to sketch on. | Yes |
 | `p1` | [`[number]`](/docs/kcl/types/number) | 1st point to derive the circle. | Yes |
 | `p2` | [`[number]`](/docs/kcl/types/number) | 2nd point to derive the circle. | Yes |
 | `p3` | [`[number]`](/docs/kcl/types/number) | 3rd point to derive the circle. | Yes |
-| `sketchSurfaceOrGroup` | [`SketchOrSurface`](/docs/kcl/types/SketchOrSurface) | Plane or surface to sketch on. | Yes |
 | [`tag`](/docs/kcl/types/tag) | [`TagDeclarator`](/docs/kcl/types#tag-declaration) | Identifier for the circle to reference elsewhere. | No |
 
 ### Returns

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

@@ -15,7 +15,7 @@ std::math::E: number = 2.71828182845904523536028747135266250_
 ### Examples
 
 ```js
-exampleSketch = startSketchOn("XZ")
+exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> angledLine({
     angle = 30,

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

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

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

@@ -15,7 +15,7 @@ std::math::TAU: number = 6.28318530717958647692528676655900577_
 ### Examples
 
 ```js
-exampleSketch = startSketchOn("XZ")
+exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> angledLine({
     angle = 50,

docs/kcl/index.md

@@ -61,7 +61,6 @@ layout: manual
   * [`bezierCurve`](kcl/bezierCurve)
   * [`ceil`](kcl/ceil)
   * [`chamfer`](kcl/chamfer)
-  * [`circle`](kcl/circle)
   * [`circleThreePoint`](kcl/circleThreePoint)
   * [`close`](kcl/close)
   * [`cm`](kcl/cm)
@@ -74,7 +73,6 @@ layout: manual
   * [`getOppositeEdge`](kcl/getOppositeEdge)
   * [`getPreviousAdjacentEdge`](kcl/getPreviousAdjacentEdge)
   * [`helix`](kcl/helix)
-  * [`helixRevolutions`](kcl/helixRevolutions)
   * [`hole`](kcl/hole)
   * [`hollow`](kcl/hollow)
   * [`inch`](kcl/inch)
@@ -146,3 +144,5 @@ layout: manual
   * [`cos`](kcl/std-math-cos)
   * [`sin`](kcl/std-math-sin)
   * [`tan`](kcl/std-math-tan)
+* **std::sketch**
+  * [`circle`](kcl/std-sketch-circle)

docs/kcl/std-math-cos.md

@@ -9,7 +9,7 @@ Compute the cosine of a number (in radians).
 
 
 ```js
-cos(num: number(rad)): number(_)
+cos(@num: number(rad)): number(_)
 ```
 
 
@@ -27,7 +27,7 @@ cos(num: number(rad)): number(_)
 ### Examples
 
 ```js
-exampleSketch = startSketchOn("XZ")
+exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> angledLine({
     angle = 30,

docs/kcl/std-math-sin.md

@@ -9,7 +9,7 @@ Compute the sine of a number (in radians).
 
 
 ```js
-sin(num: number(rad)): number(_)
+sin(@num: number(rad)): number(_)
 ```
 
 
@@ -27,7 +27,7 @@ sin(num: number(rad)): number(_)
 ### Examples
 
 ```js
-exampleSketch = startSketchOn("XZ")
+exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> angledLine({
     angle = 50,

docs/kcl/std-math-tan.md

@@ -9,7 +9,7 @@ Compute the tangent of a number (in radians).
 
 
 ```js
-tan(num: number(rad)): number(_)
+tan(@num: number(rad)): number(_)
 ```
 
 
@@ -27,7 +27,7 @@ tan(num: number(rad)): number(_)
 ### Examples
 
 ```js
-exampleSketch = startSketchOn("XZ")
+exampleSketch = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> angledLine({
     angle = 50,

docs/kcl/types/HelixValue.md

@@ -21,6 +21,7 @@ A helix.
 | `revolutions` |[`number`](/docs/kcl/types/number)| Number of revolutions. | No |
 | `angleStart` |[`number`](/docs/kcl/types/number)| Start angle (in degrees). | No |
 | `ccw` |`boolean`| Is the helix rotation counter clockwise? | No |
+| `cylinderId` |[`string`](/docs/kcl/types/string)| The cylinder the helix was created on. | No |
 | `units` |[`UnitLen`](/docs/kcl/types/UnitLen)| A unit of length. | No |
 
 

docs/kcl/types/Point2d.md

@@ -10,8 +10,8 @@ A point in two dimensional space.
 type Point2d = [number; 2]
 ```
 
-`Point2d` is an alias for a two-element array of [number](/docs/kcl/types/number)s. To write a value
+[`Point2d`](/docs/kcl/types/Point2d) is an alias for a two-element array of [number](/docs/kcl/types/number)s. To write a value
-with type `Point2d`, use an array, e.g., `[0, 0]` or `[5.0, 3.14]`.
+with type [`Point2d`](/docs/kcl/types/Point2d), use an array, e.g., `[0, 0]` or `[5.0, 3.14]`.
 
 
 

docs/kcl/types/Point3d.md

@@ -10,8 +10,8 @@ A point in three dimensional space.
 type Point3d = [number; 3]
 ```
 
-`Point3d` is an alias for a three-element array of [number](/docs/kcl/types/number)s. To write a value
+[`Point3d`](/docs/kcl/types/Point3d) is an alias for a three-element array of [number](/docs/kcl/types/number)s. To write a value
-with type `Point3d`, use an array, e.g., `[0, 0, 0]` or `[5.0, 3.14, 6.8]`.
+with type [`Point3d`](/docs/kcl/types/Point3d), use an array, e.g., `[0, 0, 0]` or `[5.0, 3.14, 6.8]`.
 
 
 

docs/kcl/types/Sketch.md

@@ -17,7 +17,7 @@ mySketch = startSketchOn('XY')
     |> close()
 ```
 
-The `mySketch` variable will be an executed `Sketch` object. Executed being past
+The `mySketch` variable will be an executed [`Sketch`](/docs/kcl/types/Sketch) object. Executed being past
 tense, because the engine has already executed the commands to create the sketch.
 
 The previous sketch commands will never be executed again, in this case.

docs/kcl/types/Solid.md

@@ -18,7 +18,7 @@ myPart = startSketchOn('XY')
     |> extrude(length = 6)
 ```
 
-The `myPart` variable will be an executed `Solid` object. Executed being past
+The `myPart` variable will be an executed [`Solid`](/docs/kcl/types/Solid) object. Executed being past
 tense, because the engine has already executed the commands to create the solid.
 
 The previous solid commands will never be executed again, in this case.

e2e/playwright/code-pane-and-errors.spec.ts

@@ -21,7 +21,8 @@ test.describe('Code pane and errors', { tag: ['@skipWin'] }, () => {
     await page.addInitScript(() => {
       localStorage.setItem(
         'persistCode',
-        `// Extruded Triangle
+        `@settings(defaultLengthUnit = in)
+// Extruded Triangle
 sketch001 = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> line(end = [10, 0])

e2e/playwright/command-bar-tests.spec.ts

@@ -513,7 +513,8 @@ c = 3 + a`
     await homePage.openProject(projectName)
     // TODO: you probably shouldn't need an engine connection to add a parameter,
     // but you do because all modeling commands have that requirement
-    await scene.settled(cmdBar)
+    // Don't use scene.settled here
+    await expect(scene.startEditSketchBtn).toBeEnabled({ timeout: 15_000 })
 
     await test.step(`Create a parameter via command bar`, async () => {
       await cmdBar.cmdBarOpenBtn.click()
@@ -542,7 +543,12 @@ c = 3 + a`
     )
 
     const newValue = `2 * b + a`
+
     await test.step(`Edit the parameter via command bar`, async () => {
+      // TODO: make the command palette command registration more static, and the enabled state more dynamic
+      // so that we can just open the command palette and know all commands will be there.
+      await expect(scene.startEditSketchBtn).toBeEnabled()
+
       await cmdBar.cmdBarOpenBtn.click()
       await cmdBar.chooseCommand('edit parameter')
       await cmdBar.expectState({

e2e/playwright/file-tree.spec.ts

@@ -6,6 +6,7 @@ import {
   executorInputPath,
   getUtils,
   orRunWhenFullSuiteEnabled,
+  runningOnWindows,
 } from './test-utils'
 import { join } from 'path'
 import { FILE_EXT } from 'lib/constants'
@@ -15,6 +16,9 @@ test.describe('integrations tests', () => {
     'Creating a new file or switching file while in sketchMode should exit sketchMode',
     { tag: '@electron' },
     async ({ page, context, homePage, scene, editor, toolbar, cmdBar }) => {
+      if (runningOnWindows()) {
+        test.fixme(orRunWhenFullSuiteEnabled())
+      }
       await context.folderSetupFn(async (dir) => {
         const bracketDir = join(dir, 'test-sample')
         await fsp.mkdir(bracketDir, { recursive: true })

e2e/playwright/named-views.spec.ts

@@ -0,0 +1,292 @@
+import { test, expect } from './zoo-test'
+import { PROJECT_SETTINGS_FILE_NAME } from 'lib/constants'
+import * as fsp from 'fs/promises'
+import { join } from 'path'
+import {
+  createProject,
+  tomlToPerProjectSettings,
+  perProjectsettingsToToml,
+} from './test-utils'
+import { NamedView } from '@rust/kcl-lib/bindings/NamedView'
+
+// Helper function to determine if the file path on disk exists
+// Specifically this is used to check if project.toml exists on disk
+const fileExists = async (path: string) => {
+  return !!(await fsp
+    .stat(path)
+    .then((_) => true)
+    .catch((_) => false))
+}
+
+// Here are a few uuids.
+// When created named views rust will auto generate uuids and they will
+// never match the snapshots. Overwrite them in memory to these
+// values to have them match the snapshots.
+const uuid1: string = '0656fb1a-9640-473e-b334-591dc70c0138'
+const uuid2: string = 'c810cf04-c6cc-4a4a-8b11-17bf445dcab7'
+const uuid3: string = 'cfecbfee-48a6-4561-b96d-ffbe5678bb7d'
+
+// Look up the named view by name and then rewrite it with the same uuid each time
+const nameToUuid: Map<string, string> = new Map()
+nameToUuid.set('uuid1', uuid1)
+nameToUuid.set('uuid2', uuid2)
+nameToUuid.set('uuid3', uuid3)
+
+/**
+ * Given the project.toml string, overwrite the named views to be the constant uuid
+ * values to match the snapshots. The uuids are randomly generated
+ */
+function tomlStringOverWriteNamedViewUuids(toml: string): string {
+  const settings = tomlToPerProjectSettings(toml)
+  const namedViews = settings.settings?.app?.named_views
+  if (namedViews) {
+    const entries = Object.entries(namedViews)
+    const remappedNamedViews: { [key: string]: NamedView } = {}
+    entries.forEach(([_, value]) => {
+      if (value) {
+        // {name:'uuid1'} -> uuid1 lookup
+        const staticUuid = nameToUuid.get(value.name)
+        if (staticUuid) {
+          remappedNamedViews[staticUuid] = value
+        }
+      }
+    })
+    if (settings && settings.settings && settings.settings.app) {
+      settings.settings.app.named_views = remappedNamedViews
+    }
+  }
+  return perProjectsettingsToToml(settings)
+}
+
+test.describe('Named view tests', () => {
+  test('Verify project.toml is not created', async ({ page }, testInfo) => {
+    // Create project and load it
+    const projectName = 'named-views'
+    await createProject({ name: projectName, page })
+
+    // Generate file paths for project.toml
+    const projectDirName = testInfo.outputPath('electron-test-projects-dir')
+    const tempProjectSettingsFilePath = join(
+      projectDirName,
+      projectName,
+      PROJECT_SETTINGS_FILE_NAME
+    )
+
+    // project.toml should not exist on initial project creation
+    let exists = await fileExists(tempProjectSettingsFilePath)
+    expect(exists).toBe(false)
+  })
+  test('Verify named view gets created', async ({
+    cmdBar,
+    scene,
+    page,
+  }, testInfo) => {
+    const projectName = 'named-views'
+    const myNamedView = 'uuid1'
+
+    // Create and load project
+    await createProject({ name: projectName, page })
+    await scene.waitForExecutionDone()
+
+    // Create named view
+    const projectDirName = testInfo.outputPath('electron-test-projects-dir')
+    await cmdBar.openCmdBar()
+    await cmdBar.chooseCommand('create named view')
+    await cmdBar.argumentInput.fill(myNamedView)
+    await cmdBar.progressCmdBar(false)
+
+    // Generate paths for the project.toml
+    const tempProjectSettingsFilePath = join(
+      projectDirName,
+      projectName,
+      PROJECT_SETTINGS_FILE_NAME
+    )
+
+    // Expect project.toml to be generated on disk since a named view was created
+    await expect(async () => {
+      let exists = await fileExists(tempProjectSettingsFilePath)
+      expect(exists).toBe(true)
+    }).toPass()
+
+    // Read project.toml into memory
+    let tomlString = await fsp.readFile(tempProjectSettingsFilePath, 'utf-8')
+    // Rewrite the uuids in the named views to match snapshot otherwise they will be randomly generated from rust and break
+    tomlString = tomlStringOverWriteNamedViewUuids(tomlString)
+
+    // Write the entire tomlString to a snapshot.
+    // There are many key/value pairs to check this is a safer match.
+    expect(tomlString).toMatchSnapshot('verify-named-view-gets-created')
+  })
+  test('Verify named view gets deleted', async ({
+    cmdBar,
+    scene,
+    page,
+  }, testInfo) => {
+    const projectName = 'named-views'
+    const myNamedView1 = 'uuid1'
+    const myNamedView2 = 'uuid2'
+
+    // Create project and go into the project
+    await createProject({ name: projectName, page })
+    await scene.waitForExecutionDone()
+
+    // Create a new named view
+    await cmdBar.openCmdBar()
+    await cmdBar.chooseCommand('create named view')
+    await cmdBar.argumentInput.fill(myNamedView1)
+    await cmdBar.progressCmdBar(false)
+
+    // Generate file paths for project.toml
+    const projectDirName = testInfo.outputPath('electron-test-projects-dir')
+    const tempProjectSettingsFilePath = join(
+      projectDirName,
+      projectName,
+      PROJECT_SETTINGS_FILE_NAME
+    )
+
+    // Except the project.toml to be written to disk since a named view was created
+    await expect(async () => {
+      let exists = await fileExists(tempProjectSettingsFilePath)
+      expect(exists).toBe(true)
+    }).toPass()
+
+    // Read project.toml into memory
+    let tomlString = await fsp.readFile(tempProjectSettingsFilePath, 'utf-8')
+    // Rewrite the uuids in the named views to match snapshot otherwise they will be randomly generated from rust and break
+    tomlString = tomlStringOverWriteNamedViewUuids(tomlString)
+
+    // Write the entire tomlString to a snapshot.
+    // There are many key/value pairs to check this is a safer match.
+    expect(tomlString).toMatchSnapshot('verify-named-view-gets-created')
+
+    // Delete a named view
+    await cmdBar.openCmdBar()
+    await cmdBar.chooseCommand('delete named view')
+    cmdBar.selectOption({ name: myNamedView2 })
+    await cmdBar.progressCmdBar(false)
+
+    // Read project.toml into memory again since we deleted a named view
+    tomlString = await fsp.readFile(tempProjectSettingsFilePath, 'utf-8')
+    // Rewrite the uuids in the named views to match snapshot otherwise they will be randomly generated from rust and break
+    tomlString = tomlStringOverWriteNamedViewUuids(tomlString)
+
+    // // Write the entire tomlString to a snapshot.
+    // // There are many key/value pairs to check this is a safer match.
+    expect(tomlString).toMatchSnapshot('verify-named-view-gets-deleted')
+  })
+  test('Verify named view gets loaded', async ({
+    cmdBar,
+    scene,
+    page,
+  }, testInfo) => {
+    const projectName = 'named-views'
+    const myNamedView = 'uuid1'
+
+    // Create project and go into the project
+    await createProject({ name: projectName, page })
+    await scene.waitForExecutionDone()
+
+    // Create a new named view
+    await cmdBar.openCmdBar()
+    await cmdBar.chooseCommand('create named view')
+    await cmdBar.argumentInput.fill(myNamedView)
+    await cmdBar.progressCmdBar(false)
+
+    // Generate file paths for project.toml
+    const projectDirName = testInfo.outputPath('electron-test-projects-dir')
+    const tempProjectSettingsFilePath = join(
+      projectDirName,
+      projectName,
+      PROJECT_SETTINGS_FILE_NAME
+    )
+
+    // Except the project.toml to be written to disk since a named view was created
+    await expect(async () => {
+      let exists = await fileExists(tempProjectSettingsFilePath)
+      expect(exists).toBe(true)
+    }).toPass()
+
+    // Read project.toml into memory
+    let tomlString = await fsp.readFile(tempProjectSettingsFilePath, 'utf-8')
+    // Rewrite the uuids in the named views to match snapshot otherwise they will be randomly generated from rust and break
+    tomlString = tomlStringOverWriteNamedViewUuids(tomlString)
+
+    // Write the entire tomlString to a snapshot.
+    // There are many key/value pairs to check this is a safer match.
+    expect(tomlString).toMatchSnapshot('verify-named-view-gets-created')
+
+    // Create a load a named view
+    await cmdBar.openCmdBar()
+    await cmdBar.chooseCommand('load named view')
+    await cmdBar.argumentInput.fill(myNamedView)
+    await cmdBar.progressCmdBar(false)
+
+    // Check the toast appeared
+    await expect(
+      page.getByText(`Named view ${myNamedView} loaded.`)
+    ).toBeVisible()
+  })
+  test('Verify two named views get created', async ({
+    cmdBar,
+    scene,
+    page,
+  }, testInfo) => {
+    const projectName = 'named-views'
+    const myNamedView1 = 'uuid1'
+    const myNamedView2 = 'uuid2'
+
+    // Create and load project
+    await createProject({ name: projectName, page })
+    await scene.waitForExecutionDone()
+
+    // Create named view
+    const projectDirName = testInfo.outputPath('electron-test-projects-dir')
+    await cmdBar.openCmdBar()
+    await cmdBar.chooseCommand('create named view')
+    await cmdBar.argumentInput.fill(myNamedView1)
+    await cmdBar.progressCmdBar(false)
+
+    await page.waitForTimeout(1000)
+
+    const orbitMouseStart = { x: 800, y: 130 }
+    const orbitMouseEnd = { x: 0, y: 130 }
+    await page.mouse.move(orbitMouseStart.x, orbitMouseStart.y)
+    await page.mouse.down({ button: 'middle' })
+    await page.mouse.move(orbitMouseEnd.x, orbitMouseEnd.y, {
+      steps: 3,
+    })
+    await page.mouse.up({ button: 'middle' })
+
+    await page.waitForTimeout(1000)
+
+    await cmdBar.openCmdBar()
+    await cmdBar.chooseCommand('create named view')
+    await cmdBar.argumentInput.fill(myNamedView2)
+    await cmdBar.progressCmdBar(false)
+
+    // Wait a moment for the project.toml to get written to disk with the new view point
+    await page.waitForTimeout(1000)
+
+    // Generate paths for the project.toml
+    const tempProjectSettingsFilePath = join(
+      projectDirName,
+      projectName,
+      PROJECT_SETTINGS_FILE_NAME
+    )
+
+    // Expect project.toml to be generated on disk since a named view was created
+    await expect(async () => {
+      let exists = await fileExists(tempProjectSettingsFilePath)
+      expect(exists).toBe(true)
+    }).toPass()
+
+    // Read project.toml into memory
+    let tomlString = await fsp.readFile(tempProjectSettingsFilePath, 'utf-8')
+    // Rewrite the uuids in the named views to match snapshot otherwise they will be randomly generated from rust and break
+    tomlString = tomlStringOverWriteNamedViewUuids(tomlString)
+
+    // Write the entire tomlString to a snapshot.
+    // There are many key/value pairs to check this is a safer match.
+    expect(tomlString).toMatchSnapshot('verify-two-named-view-gets-created')
+  })
+})

e2e/playwright/named-views.spec.ts-snapshots/verify-named-view-gets-created-chromium-linux

@@ -0,0 +1,16 @@
+[settings]
+modeling = { }
+text_editor = { }
+command_bar = { }
+
+[settings.app.named_views.0656fb1a-9640-473e-b334-591dc70c0138]
+name = "uuid1"
+eye_offset = 1_378.0059
+fov_y = 45
+is_ortho = false
+ortho_scale_enabled = true
+ortho_scale_factor = 1.6
+pivot_position = [ 0, 0, 0 ]
+pivot_rotation = [ 0.5380994, 0.0, 0.0, 0.8428814 ]
+world_coord_system = "right_handed_up_z"
+version = 1

e2e/playwright/named-views.spec.ts-snapshots/verify-named-view-gets-deleted-chromium-linux

@@ -0,0 +1,16 @@
+[settings]
+modeling = { }
+text_editor = { }
+command_bar = { }
+
+[settings.app.named_views.0656fb1a-9640-473e-b334-591dc70c0138]
+name = "uuid1"
+eye_offset = 1_378.0059
+fov_y = 45
+is_ortho = false
+ortho_scale_enabled = true
+ortho_scale_factor = 1.6
+pivot_position = [ 0, 0, 0 ]
+pivot_rotation = [ 0.5380994, 0.0, 0.0, 0.8428814 ]
+world_coord_system = "right_handed_up_z"
+version = 1

e2e/playwright/named-views.spec.ts-snapshots/verify-two-named-view-gets-created-chromium-linux

@@ -0,0 +1,28 @@
+[settings]
+modeling = { }
+text_editor = { }
+command_bar = { }
+
+[settings.app.named_views.0656fb1a-9640-473e-b334-591dc70c0138]
+name = "uuid1"
+eye_offset = 1_378.0059
+fov_y = 45
+is_ortho = false
+ortho_scale_enabled = true
+ortho_scale_factor = 1.6
+pivot_position = [ 0, 0, 0 ]
+pivot_rotation = [ 0.5380994, 0.0, 0.0, 0.8428814 ]
+world_coord_system = "right_handed_up_z"
+version = 1
+
+[settings.app.named_views.c810cf04-c6cc-4a4a-8b11-17bf445dcab7]
+name = "uuid2"
+eye_offset = 1_378.0059
+fov_y = 45
+is_ortho = false
+ortho_scale_enabled = true
+ortho_scale_factor = 1.6
+pivot_position = [ 1_826.5239, 0.0, 0.0 ]
+pivot_rotation = [ 0.5380994, 0.0, 0.0, 0.8428814 ]
+world_coord_system = "right_handed_up_z"
+version = 1

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

@@ -0,0 +1,312 @@
+import { test, expect } from './zoo-test'
+
+/**
+ * Not all menu actions are tested. Some are default electron menu actions.
+ * Test file menu actions that trigger something in the frontend
+ */
+test.describe('Native file menu', { tag: ['@electron'] }, () => {
+  test.describe('Home page', () => {
+    test.describe('File role', () => {
+      test('File.Create project', async ({ tronApp, cmdBar, page }) => {
+        if (!tronApp) fail()
+        // Run electron snippet to find the Menu!
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) fail()
+          const newProject =
+            app.applicationMenu.getMenuItemById('File.New project')
+          if (!newProject) fail()
+          newProject.click()
+        })
+        // Check that the command bar is opened
+        await expect(cmdBar.cmdBarElement).toBeVisible()
+        // Check the placeholder project name exists
+        const actualArgument = await cmdBar.cmdBarElement
+          .getByTestId('cmd-bar-arg-value')
+          .inputValue()
+        const expectedArgument = 'project-$nnn'
+        expect(actualArgument).toBe(expectedArgument)
+      })
+      test('File.Open project', async ({ tronApp, cmdBar, page }) => {
+        if (!tronApp) fail()
+        // Run electron snippet to find the Menu!
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) fail()
+          const openProject =
+            app.applicationMenu.getMenuItemById('File.Open project')
+          if (!openProject) fail()
+          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 = 'Open project'
+        expect(actual).toBe(expected)
+      })
+      test('File.Preferences.User settings', async ({
+        tronApp,
+        cmdBar,
+        page,
+      }) => {
+        if (!tronApp) fail()
+        // Run electron snippet to find the Menu!
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) fail()
+          const userSettings = app.applicationMenu.getMenuItemById(
+            'File.Preferences.User settings'
+          )
+          if (!userSettings) fail()
+          userSettings.click()
+        })
+        const settings = page.getByTestId('settings-dialog-panel')
+        await expect(settings).toBeVisible()
+        // You are viewing the user tab
+        const actualText = settings.getByText(
+          'The overall appearance of the app'
+        )
+        await expect(actualText).toBeVisible()
+      })
+      test('File.Preferences.Keybindings', async ({
+        tronApp,
+        cmdBar,
+        page,
+      }) => {
+        if (!tronApp) fail()
+        // Run electron snippet to find the Menu!
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) fail()
+          const keybindings = app.applicationMenu.getMenuItemById(
+            'File.Preferences.Keybindings'
+          )
+          if (!keybindings) fail()
+          keybindings.click()
+        })
+        const settings = page.getByTestId('settings-dialog-panel')
+        await expect(settings).toBeVisible()
+        // You are viewing the keybindings tab
+        const enterSketchMode = settings.locator('#enter-sketch-mode')
+        await expect(enterSketchMode).toBeVisible()
+      })
+      test('File.Preferences.User default units', async ({
+        tronApp,
+        cmdBar,
+        page,
+      }) => {
+        if (!tronApp) fail()
+        // Run electron snippet to find the Menu!
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) fail()
+          const menu = app.applicationMenu.getMenuItemById(
+            'File.Preferences.User default units'
+          )
+          if (!menu) fail()
+          menu.click()
+        })
+        const settings = page.getByTestId('settings-dialog-panel')
+        await expect(settings).toBeVisible()
+        const defaultUnit = settings.locator('#defaultUnit')
+        await expect(defaultUnit).toBeVisible()
+      })
+      test('File.Preferences.Theme', async ({ tronApp, cmdBar, page }) => {
+        if (!tronApp) fail()
+        // Run electron snippet to find the Menu!
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) fail()
+          const menu = app.applicationMenu.getMenuItemById(
+            'File.Preferences.Theme'
+          )
+          if (!menu) fail()
+          menu.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 = 'Settings · app · theme'
+        expect(actual).toBe(expected)
+      })
+      test('File.Preferences.Theme color', async ({
+        tronApp,
+        cmdBar,
+        page,
+      }) => {
+        if (!tronApp) fail()
+        // Run electron snippet to find the Menu!
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) fail()
+          const menu = app.applicationMenu.getMenuItemById(
+            'File.Preferences.Theme color'
+          )
+          if (!menu) fail()
+          menu.click()
+        })
+        const settings = page.getByTestId('settings-dialog-panel')
+        await expect(settings).toBeVisible()
+        const defaultUnit = settings.locator('#themeColor')
+        await expect(defaultUnit).toBeVisible()
+      })
+      test('File.Preferences.Sign out', async ({ tronApp, cmdBar, page }) => {
+        if (!tronApp) fail()
+        // Run electron snippet to find the Menu!
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) fail()
+          const menu = app.applicationMenu.getMenuItemById('File.Sign out')
+          if (!menu) fail()
+          // FIXME: Add back when you can actually sign out
+          // menu.click()
+        })
+        // FIXME: When signing out during E2E the page is not bound correctly.
+        // It cannot find the button
+        // const signIn = page.getByTestId('sign-in-button')
+        // await expect(signIn).toBeVisible()
+      })
+    })
+
+    test.describe('Edit role', () => {
+      test('Edit.Rename project', async ({ tronApp, cmdBar, page }) => {
+        if (!tronApp) fail()
+        // Run electron snippet to find the Menu!
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) fail()
+          const menu = app.applicationMenu.getMenuItemById(
+            'Edit.Rename project'
+          )
+          if (!menu) fail()
+          menu.click()
+        })
+        // Check the placeholder project name exists
+        const actual = await cmdBar.cmdBarElement
+          .getByTestId('command-name')
+          .textContent()
+        const expected = 'Rename project'
+        expect(actual).toBe(expected)
+      })
+      test('Edit.Delete project', async ({ tronApp, cmdBar, page }) => {
+        if (!tronApp) fail()
+        // Run electron snippet to find the Menu!
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) fail()
+          const menu = app.applicationMenu.getMenuItemById(
+            'Edit.Delete project'
+          )
+          if (!menu) fail()
+          menu.click()
+        })
+        // Check the placeholder project name exists
+        const actual = await cmdBar.cmdBarElement
+          .getByTestId('command-name')
+          .textContent()
+        const expected = 'Delete project'
+        expect(actual).toBe(expected)
+      })
+      test('Edit.Change project directory', async ({
+        tronApp,
+        cmdBar,
+        page,
+      }) => {
+        if (!tronApp) fail()
+        // Run electron snippet to find the Menu!
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) fail()
+          const menu = app.applicationMenu.getMenuItemById(
+            'Edit.Change project directory'
+          )
+          if (!menu) fail()
+          menu.click()
+        })
+        const settings = page.getByTestId('settings-dialog-panel')
+        await expect(settings).toBeVisible()
+        const projectDirectory = settings.locator('#projectDirectory')
+        await expect(projectDirectory).toBeVisible()
+      })
+    })
+    test.describe('View role', () => {
+      test('View.Command Palette...', async ({ tronApp, cmdBar, page }) => {
+        if (!tronApp) fail()
+        // Run electron snippet to find the Menu!
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) fail()
+          const menu = app.applicationMenu.getMenuItemById(
+            'View.Command Palette...'
+          )
+          if (!menu) fail()
+          menu.click()
+        })
+        // Check the placeholder project name exists
+        const actual = cmdBar.cmdBarElement.getByTestId('cmd-bar-search')
+        await expect(actual).toBeVisible()
+      })
+    })
+    test.describe('Help role', () => {
+      test('Help.Show all commands', async ({ tronApp, cmdBar, page }) => {
+        if (!tronApp) fail()
+        // Run electron snippet to find the Menu!
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) fail()
+          const menu = app.applicationMenu.getMenuItemById(
+            'Help.Show all commands'
+          )
+          if (!menu) fail()
+          menu.click()
+        })
+        // Check the placeholder project name exists
+        const actual = cmdBar.cmdBarElement.getByTestId('cmd-bar-search')
+        await expect(actual).toBeVisible()
+      })
+      test('Help.KCL code samples', async ({ tronApp, cmdBar, page }) => {
+        if (!tronApp) fail()
+        // Run electron snippet to find the Menu!
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) fail()
+          const menu = app.applicationMenu.getMenuItemById(
+            'Help.KCL code samples'
+          )
+          if (!menu) fail()
+        })
+      })
+      test('Help.Refresh and report a bug', async ({
+        tronApp,
+        cmdBar,
+        page,
+      }) => {
+        if (!tronApp) fail()
+        // Run electron snippet to find the Menu!
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) fail()
+          const menu = app.applicationMenu.getMenuItemById(
+            'Help.Refresh and report a bug'
+          )
+          if (!menu) fail()
+          menu.click()
+        })
+        // Core dump and refresh magic number timeout
+        await page.waitForTimeout(7000)
+        const actual = page.getByText(
+          'No Projects found, ready to make your first one?'
+        )
+        await expect(actual).toBeVisible()
+      })
+      test('Help.Reset onboarding', async ({ tronApp, cmdBar, page }) => {
+        if (!tronApp) fail()
+        // Run electron snippet to find the Menu!
+        await tronApp.electron.evaluate(async ({ app }) => {
+          if (!app || !app.applicationMenu) fail()
+          const menu = app.applicationMenu.getMenuItemById(
+            'Help.Reset onboarding'
+          )
+          if (!menu) fail()
+          menu.click()
+        })
+
+        const actual = page.getByText(
+          `This is a hardware design tool that lets you edit visually, with code, or both. It's powered by the KittyCAD Design API, the first API created for anyone to build hardware design tools.`
+        )
+        await expect(actual).toBeVisible()
+      })
+    })
+  })
+})

e2e/playwright/point-click.spec.ts

@@ -1071,7 +1071,7 @@ openSketch = startSketchOn(XY)
     })
   })
 
-  test('Helix point-and-click', async ({
+  test('Helix point-and-click on default axis', async ({
     context,
     page,
     homePage,
@@ -1082,29 +1082,26 @@ openSketch = startSketchOn(XY)
   }) => {
     // One dumb hardcoded screen pixel value
     const testPoint = { x: 620, y: 257 }
-    const expectedOutput = `helix001 = helix(  revolutions = 1,  angleStart = 360,  counterClockWise = false,  radius = 5,  axis = 'X',  length = 5,)`
+    const expectedOutput = `helix001 = helix(  revolutions = 1,  angleStart = 360,  ccw = false,  radius = 5,  axis = 'X',  length = 5,)`
     const expectedLine = `revolutions=1,`
 
     await homePage.goToModelingScene()
 
-    // await test.step(`Look for the red of the default plane`, async () => {
-    //   await scene.expectPixelColor([96, 52, 52], testPoint, 15)
-    // })
     await test.step(`Go through the command bar flow`, async () => {
       await toolbar.helixButton.click()
       await cmdBar.expectState({
         stage: 'arguments',
-        currentArgKey: 'revolutions',
+        currentArgKey: 'axisOrEdge',
-        currentArgValue: '1',
+        currentArgValue: '',
         headerArguments: {
           AngleStart: '',
-          Axis: '',
+          AxisOrEdge: '',
           CounterClockWise: '',
           Length: '',
           Radius: '',
           Revolutions: '',
         },
-        highlightedHeaderArg: 'revolutions',
+        highlightedHeaderArg: 'axisOrEdge',
         commandName: 'Helix',
       })
       await cmdBar.progressCmdBar()
@@ -1114,6 +1111,7 @@ openSketch = startSketchOn(XY)
       await cmdBar.progressCmdBar()
       await cmdBar.progressCmdBar()
       await cmdBar.progressCmdBar()
+      await cmdBar.progressCmdBar()
     })
 
     await test.step(`Confirm code is added to the editor, scene has changed`, async () => {
@@ -1179,6 +1177,165 @@ openSketch = startSketchOn(XY)
     })
   })
 
+  const helixCases = [
+    {
+      selectionType: 'segment',
+      testPoint: { x: 513, y: 221 },
+      expectedOutput: `helix001 = helix(  revolutions = 20,  angleStart = 0,  ccw = true,  radius = 1,  axis = seg01,  length = 100,)`,
+      expectedEditedOutput: `helix001 = helix(  revolutions = 20,  angleStart = 0,  ccw = true,  radius = 1,  axis = seg01,  length = 50,)`,
+    },
+    {
+      selectionType: 'sweepEdge',
+      testPoint: { x: 564, y: 364 },
+      expectedOutput: `helix001 = helix(  revolutions = 20,  angleStart = 0,  ccw = true,  radius = 1,  axis =   getOppositeEdge(seg01),  length = 100,)`,
+      expectedEditedOutput: `helix001 = helix(  revolutions = 20,  angleStart = 0,  ccw = true,  radius = 1,  axis =   getOppositeEdge(seg01),  length = 50,)`,
+    },
+  ]
+  helixCases.map(
+    ({ selectionType, testPoint, expectedOutput, expectedEditedOutput }) => {
+      test(`Helix point-and-click around ${selectionType}`, async ({
+        context,
+        page,
+        homePage,
+        scene,
+        editor,
+        toolbar,
+        cmdBar,
+      }) => {
+        page.on('console', console.log)
+        const initialCode = `sketch001 = startSketchOn('XZ')
+  profile001 = startProfileAt([0, 0], sketch001)
+    |> yLine(length = 100)
+    |> line(endAbsolute = [100, 0])
+    |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+    |> close()
+  extrude001 = extrude(profile001, length = 100)`
+
+        // One dumb hardcoded screen pixel value
+        const [clickOnEdge] = scene.makeMouseHelpers(testPoint.x, testPoint.y)
+
+        await context.addInitScript((initialCode) => {
+          localStorage.setItem('persistCode', initialCode)
+        }, initialCode)
+        await page.setBodyDimensions({ width: 1000, height: 500 })
+        await homePage.goToModelingScene()
+
+        await test.step(`Go through the command bar flow`, async () => {
+          await toolbar.closePane('code')
+          await toolbar.helixButton.click()
+          await cmdBar.expectState({
+            stage: 'arguments',
+            currentArgKey: 'axisOrEdge',
+            currentArgValue: '',
+            headerArguments: {
+              AngleStart: '',
+              AxisOrEdge: '',
+              CounterClockWise: '',
+              Length: '',
+              Radius: '',
+              Revolutions: '',
+            },
+            highlightedHeaderArg: 'axisOrEdge',
+            commandName: 'Helix',
+          })
+          await cmdBar.selectOption({ name: 'Edge' }).click()
+          await clickOnEdge()
+          await cmdBar.progressCmdBar()
+          await cmdBar.argumentInput.focus()
+          await page.keyboard.insertText('20')
+          await cmdBar.progressCmdBar()
+          await page.keyboard.insertText('0')
+          await cmdBar.progressCmdBar()
+          await cmdBar.selectOption({ name: 'True' }).click()
+          await page.keyboard.insertText('1')
+          await cmdBar.progressCmdBar()
+          await page.keyboard.insertText('100')
+          await cmdBar.progressCmdBar()
+          await cmdBar.expectState({
+            stage: 'review',
+            headerArguments: {
+              AngleStart: '0',
+              AxisOrEdge: 'Edge',
+              Edge: `1 ${selectionType}`,
+              CounterClockWise: '',
+              Length: '100',
+              Radius: '1',
+              Revolutions: '20',
+            },
+            commandName: 'Helix',
+          })
+          await cmdBar.progressCmdBar()
+        })
+
+        await test.step(`Confirm code is added to the editor, scene has changed`, async () => {
+          await toolbar.openPane('code')
+          await editor.expectEditor.toContain(expectedOutput)
+          await toolbar.closePane('code')
+        })
+
+        await test.step(`Edit helix through the feature tree`, async () => {
+          await toolbar.openPane('feature-tree')
+          const operationButton = await toolbar.getFeatureTreeOperation(
+            'Helix',
+            0
+          )
+          await operationButton.dblclick()
+          const initialInput = '100'
+          const newInput = '50'
+          await cmdBar.expectState({
+            commandName: 'Helix',
+            stage: 'arguments',
+            currentArgKey: 'length',
+            currentArgValue: initialInput,
+            headerArguments: {
+              AngleStart: '0',
+              CounterClockWise: '',
+              Length: initialInput,
+              Radius: '1',
+              Revolutions: '20',
+            },
+            highlightedHeaderArg: 'length',
+          })
+          await expect(cmdBar.currentArgumentInput).toBeVisible()
+          await cmdBar.currentArgumentInput
+            .locator('.cm-content')
+            .fill(newInput)
+          await cmdBar.progressCmdBar()
+          await cmdBar.expectState({
+            stage: 'review',
+            headerArguments: {
+              AngleStart: '0',
+              CounterClockWise: '',
+              Length: newInput,
+              Radius: '1',
+              Revolutions: '20',
+            },
+            commandName: 'Helix',
+          })
+          await cmdBar.progressCmdBar()
+          await toolbar.closePane('feature-tree')
+          await toolbar.openPane('code')
+          await editor.expectEditor.toContain(expectedEditedOutput)
+          await toolbar.closePane('code')
+        })
+
+        await test.step('Delete helix via feature tree selection', async () => {
+          await toolbar.openPane('feature-tree')
+          const operationButton = await toolbar.getFeatureTreeOperation(
+            'Helix',
+            0
+          )
+          await operationButton.click({ button: 'left' })
+          await page.keyboard.press('Delete')
+          await editor.expectEditor.not.toContain(expectedEditedOutput)
+          await expect(
+            await toolbar.getFeatureTreeOperation('Helix', 0)
+          ).not.toBeVisible()
+        })
+      })
+    }
+  )
+
   const loftPointAndClickCases = [
     { shouldPreselect: true },
     { shouldPreselect: false },
@@ -1616,7 +1773,7 @@ extrude001 = extrude(sketch001, length = -12)
     const filletColor: [number, number, number] = [127, 127, 127]
     const backgroundColor: [number, number, number] = [30, 30, 30]
     const lowTolerance = 20
-    const highTolerance = 40
+    const highTolerance = 70 // TODO: understand why I needed that for edgeColorYellow on macos (local)
 
     // Setup
     await test.step(`Initial test setup`, async () => {
@@ -1703,6 +1860,54 @@ extrude001 = extrude(sketch001, length = -12)
       await scene.expectPixelColor(filletColor, firstEdgeLocation, lowTolerance)
     })
 
+    // Test 1.1: Edit fillet (segment type)
+    async function editFillet(
+      featureTreeIndex: number,
+      oldValue: string,
+      newValue: string
+    ) {
+      await toolbar.openPane('feature-tree')
+      const operationButton = await toolbar.getFeatureTreeOperation(
+        'Fillet',
+        featureTreeIndex
+      )
+      await operationButton.dblclick({ button: 'left' })
+      await cmdBar.expectState({
+        commandName: 'Fillet',
+        currentArgKey: 'radius',
+        currentArgValue: oldValue,
+        headerArguments: {
+          Radius: oldValue,
+        },
+        highlightedHeaderArg: 'radius',
+        stage: 'arguments',
+      })
+      await page.keyboard.insertText(newValue)
+      await cmdBar.progressCmdBar()
+      await cmdBar.expectState({
+        stage: 'review',
+        headerArguments: {
+          Radius: newValue,
+        },
+        commandName: 'Fillet',
+      })
+      await cmdBar.progressCmdBar()
+      await toolbar.closePane('feature-tree')
+    }
+
+    await test.step('Edit fillet via feature tree selection works', async () => {
+      const firstFilletFeatureTreeIndex = 0
+      const editedRadius = '1'
+      await editFillet(firstFilletFeatureTreeIndex, '5', editedRadius)
+      await editor.expectEditor.toContain(
+        firstFilletDeclaration.replace('radius = 5', 'radius = ' + editedRadius)
+      )
+
+      // Edit back to original radius
+      await editFillet(firstFilletFeatureTreeIndex, editedRadius, '5')
+      await editor.expectEditor.toContain(firstFilletDeclaration)
+    })
+
     // Test 2: Command bar flow without preselected edges
     await test.step(`Open fillet UI without selecting edges`, async () => {
       await page.waitForTimeout(100)
@@ -1787,6 +1992,23 @@ extrude001 = extrude(sketch001, length = -12)
       )
     })
 
+    // Test 2.1: Edit fillet (edgeSweep type)
+    await test.step('Edit fillet via feature tree selection works', async () => {
+      const secondFilletFeatureTreeIndex = 1
+      const editedRadius = '2'
+      await editFillet(secondFilletFeatureTreeIndex, '5', editedRadius)
+      await editor.expectEditor.toContain(
+        secondFilletDeclaration.replace(
+          'radius = 5',
+          'radius = ' + editedRadius
+        )
+      )
+
+      // Edit back to original radius
+      await editFillet(secondFilletFeatureTreeIndex, editedRadius, '5')
+      await editor.expectEditor.toContain(secondFilletDeclaration)
+    })
+
     // Test 3: Delete fillets
     await test.step('Delete fillet via feature tree selection', async () => {
       await test.step('Open Feature Tree Pane', async () => {
@@ -1809,6 +2031,43 @@ extrude001 = extrude(sketch001, length = -12)
     })
   })
 
+  test(`Fillet point-and-click edit rejected when not in pipe`, async ({
+    context,
+    page,
+    homePage,
+    scene,
+    toolbar,
+  }) => {
+    const initialCode = `sketch001 = startSketchOn(XY)
+profile001 = circle(
+  sketch001,
+  center = [0, 0],
+  radius = 100,
+  tag = $seg01,
+)
+extrude001 = extrude(profile001, length = 100)
+fillet001 = fillet(extrude001, radius = 5, tags = [getOppositeEdge(seg01)])
+`
+    await context.addInitScript((initialCode) => {
+      localStorage.setItem('persistCode', initialCode)
+    }, initialCode)
+    await page.setBodyDimensions({ width: 1000, height: 500 })
+    await homePage.goToModelingScene()
+    await scene.waitForExecutionDone()
+
+    await test.step('Double-click in feature tree and expect error toast', async () => {
+      await toolbar.openPane('feature-tree')
+      const operationButton = await toolbar.getFeatureTreeOperation('Fillet', 0)
+      await operationButton.dblclick({ button: 'left' })
+      await expect(
+        page.getByText(
+          'Only chamfer and fillet in pipe expressions are supported for edits'
+        )
+      ).toBeVisible()
+      await page.waitForTimeout(1000)
+    })
+  })
+
   test(`Fillet point-and-click delete`, async ({
     context,
     page,
@@ -2105,7 +2364,7 @@ extrude001 = extrude(sketch001, length = -12)
     const chamferColor: [number, number, number] = [168, 168, 168]
     const backgroundColor: [number, number, number] = [30, 30, 30]
     const lowTolerance = 20
-    const highTolerance = 40
+    const highTolerance = 70 // TODO: understand why I needed that for edgeColorYellow on macos (local)
 
     // Setup
     await test.step(`Initial test setup`, async () => {
@@ -2187,6 +2446,57 @@ extrude001 = extrude(sketch001, length = -12)
       )
     })
 
+    // Test 1.1: Edit sweep
+    async function editChamfer(
+      featureTreeIndex: number,
+      oldValue: string,
+      newValue: string
+    ) {
+      await toolbar.openPane('feature-tree')
+      const operationButton = await toolbar.getFeatureTreeOperation(
+        'Chamfer',
+        featureTreeIndex
+      )
+      await operationButton.dblclick({ button: 'left' })
+      await cmdBar.expectState({
+        commandName: 'Chamfer',
+        currentArgKey: 'length',
+        currentArgValue: oldValue,
+        headerArguments: {
+          Length: oldValue,
+        },
+        highlightedHeaderArg: 'length',
+        stage: 'arguments',
+      })
+      await page.keyboard.insertText(newValue)
+      await cmdBar.progressCmdBar()
+      await cmdBar.expectState({
+        stage: 'review',
+        headerArguments: {
+          Length: newValue,
+        },
+        commandName: 'Chamfer',
+      })
+      await cmdBar.progressCmdBar()
+      await toolbar.closePane('feature-tree')
+    }
+
+    await test.step('Edit chamfer via feature tree selection works', async () => {
+      const firstChamferFeatureTreeIndex = 0
+      const editedLength = '1'
+      await editChamfer(firstChamferFeatureTreeIndex, '5', editedLength)
+      await editor.expectEditor.toContain(
+        firstChamferDeclaration.replace(
+          'length = 5',
+          'length = ' + editedLength
+        )
+      )
+
+      // Edit back to original radius
+      await editChamfer(firstChamferFeatureTreeIndex, editedLength, '5')
+      await editor.expectEditor.toContain(firstChamferDeclaration)
+    })
+
     // Test 2: Command bar flow without preselected edges
     await test.step(`Open chamfer UI without selecting edges`, async () => {
       await page.waitForTimeout(100)
@@ -2271,6 +2581,23 @@ extrude001 = extrude(sketch001, length = -12)
       )
     })
 
+    // Test 2.1: Edit chamfer (edgeSweep type)
+    await test.step('Edit chamfer via feature tree selection works', async () => {
+      const secondChamferFeatureTreeIndex = 1
+      const editedLength = '2'
+      await editChamfer(secondChamferFeatureTreeIndex, '5', editedLength)
+      await editor.expectEditor.toContain(
+        secondChamferDeclaration.replace(
+          'length = 5',
+          'length = ' + editedLength
+        )
+      )
+
+      // Edit back to original length
+      await editChamfer(secondChamferFeatureTreeIndex, editedLength, '5')
+      await editor.expectEditor.toContain(secondChamferDeclaration)
+    })
+
     // Test 3: Delete chamfer via feature tree selection
     await test.step('Open Feature Tree Pane', async () => {
       await toolbar.openPane('feature-tree')

e2e/playwright/projects.spec.ts

@@ -8,6 +8,7 @@ import {
   createProject,
   getPlaywrightDownloadDir,
   orRunWhenFullSuiteEnabled,
+  runningOnWindows,
 } from './test-utils'
 import fsp from 'fs/promises'
 import fs from 'fs'
@@ -191,7 +192,7 @@ test(
 
       // error text on hover
       await page.hover('.cm-lint-marker-error')
-      const crypticErrorText = `Expected a tag declarator`
+      const crypticErrorText = `The arg tag was given, but it was the wrong type`
       await expect(page.getByText(crypticErrorText).first()).toBeVisible()
 
       // black pixel means the scene has been cleared.
@@ -351,6 +352,9 @@ test(
   'open a file in a project works and renders, open another file in the same project with errors, it should clear the scene',
   { tag: '@electron' },
   async ({ context, page }, testInfo) => {
+    if (runningOnWindows()) {
+      test.fixme(orRunWhenFullSuiteEnabled())
+    }
     await context.folderSetupFn(async (dir) => {
       const bracketDir = path.join(dir, 'bracket')
       await fsp.mkdir(bracketDir, { recursive: true })
@@ -409,7 +413,7 @@ test(
 
       // error text on hover
       await page.hover('.cm-lint-marker-error')
-      const crypticErrorText = `Expected a tag declarator`
+      const crypticErrorText = `The arg tag was given, but it was the wrong type`
       await expect(page.getByText(crypticErrorText).first()).toBeVisible()
 
       // black pixel means the scene has been cleared.
@@ -453,7 +457,7 @@ test(
 
     // error text on hover
     await page.hover('.cm-lint-marker-error')
-    const crypticErrorText = `Expected a tag declarator`
+    const crypticErrorText = `The arg tag was given, but it was the wrong type`
     await expect(page.getByText(crypticErrorText).first()).toBeVisible()
   }
 )
@@ -1328,6 +1332,9 @@ test(
   'Can load a file with CRLF line endings',
   { tag: '@electron' },
   async ({ context, page }, testInfo) => {
+    if (runningOnWindows()) {
+      test.fixme(orRunWhenFullSuiteEnabled())
+    }
     await context.folderSetupFn(async (dir) => {
       const routerTemplateDir = path.join(dir, 'router-template-slate')
       await fsp.mkdir(routerTemplateDir, { recursive: true })

e2e/playwright/snapshots/prompt-to-edit/prompt-to-edit-snapshot-tests-spec-ts--edit-with-ai-example-snapshots--change-colour.snap.json

@@ -29,5 +29,5 @@
       }
     }
   ],
-  "kcl_version": "0.2.52"
+  "kcl_version": "0.2.54"
 }

e2e/playwright/test-utils.test.ts

@@ -0,0 +1,99 @@
+import {
+  runningOnLinux,
+  runningOnMac,
+  runningOnWindows,
+  orRunWhenFullSuiteEnabled,
+} from './test-utils'
+
+describe('platform detection utilities', () => {
+  const originalPlatform = process.platform
+
+  afterAll(() => {
+    Object.defineProperty(process, 'platform', {
+      value: originalPlatform,
+    })
+  })
+
+  describe('runningOnLinux', () => {
+    it('returns true on Linux', () => {
+      Object.defineProperty(process, 'platform', {
+        value: 'linux',
+      })
+      expect(runningOnLinux()).toBe(true)
+    })
+
+    it('returns false on other platforms', () => {
+      Object.defineProperty(process, 'platform', {
+        value: 'darwin',
+      })
+      expect(runningOnLinux()).toBe(false)
+    })
+  })
+
+  describe('runningOnMac', () => {
+    it('returns true on Mac', () => {
+      Object.defineProperty(process, 'platform', {
+        value: 'darwin',
+      })
+      expect(runningOnMac()).toBe(true)
+    })
+
+    it('returns false on other platforms', () => {
+      Object.defineProperty(process, 'platform', {
+        value: 'linux',
+      })
+      expect(runningOnMac()).toBe(false)
+    })
+  })
+
+  describe('runningOnWindows', () => {
+    it('returns true on Windows', () => {
+      Object.defineProperty(process, 'platform', {
+        value: 'win32',
+      })
+      expect(runningOnWindows()).toBe(true)
+    })
+
+    it('returns false on other platforms', () => {
+      Object.defineProperty(process, 'platform', {
+        value: 'linux',
+      })
+      expect(runningOnWindows()).toBe(false)
+    })
+  })
+})
+
+describe('utility to bypass unreliable tests', () => {
+  const originalEnv = { ...process.env }
+
+  afterAll(() => {
+    process.env = { ...originalEnv }
+  })
+
+  it('always runs them on dedicated branch', () => {
+    process.env.GITHUB_EVENT_NAME = 'push'
+    process.env.GITHUB_REF = 'refs/heads/all-e2e'
+    process.env.GITHUB_HEAD_REF = ''
+    process.env.GITHUB_BASE_REF = ''
+    const shouldSkip = orRunWhenFullSuiteEnabled()
+    expect(shouldSkip).toBe(false)
+  })
+
+  it('skips them on the main branch', () => {
+    process.env.GITHUB_EVENT_NAME = 'push'
+    process.env.GITHUB_REF = 'refs/heads/main'
+    process.env.GITHUB_HEAD_REF = ''
+    process.env.GITHUB_BASE_REF = ''
+    const shouldSkip = orRunWhenFullSuiteEnabled()
+    expect(shouldSkip).toBe(true)
+  })
+
+  it('skips them on pull requests', () => {
+    process.env.GITHUB_EVENT_NAME = 'pull_request'
+    process.env.GITHUB_REF = 'refs/pull/5883/merge'
+    process.env.GITHUB_HEAD_REF = 'my-branch'
+    process.env.GITHUB_BASE_REF = 'main'
+    const shouldSkip = orRunWhenFullSuiteEnabled()
+    expect(shouldSkip).toBe(true)
+  })
+})

e2e/playwright/test-utils.ts

@@ -26,6 +26,7 @@ import { isArray } from 'lib/utils'
 import { reportRejection } from 'lib/trap'
 import { DeepPartial } from 'lib/types'
 import { Configuration } from 'lang/wasm'
+import { ProjectConfiguration } from '@rust/kcl-lib/bindings/ProjectConfiguration'
 
 const toNormalizedCode = (text: string) => {
   return text.replace(/\s+/g, '')
@@ -55,8 +56,21 @@ export const commonPoints = {
 export const editorSelector = '[role="textbox"][data-language="kcl"]'
 type PaneId = 'variables' | 'code' | 'files' | 'logs'
 
+export function runningOnLinux() {
+  return process.platform === 'linux'
+}
+
+export function runningOnMac() {
+  return process.platform === 'darwin'
+}
+
+export function runningOnWindows() {
+  return process.platform === 'win32'
+}
+
 export function orRunWhenFullSuiteEnabled() {
-  return process.env.GITHUB_HEAD_REF !== 'all-e2e'
+  const branch = process.env.GITHUB_REF?.replace('refs/heads/', '')
+  return branch !== 'all-e2e'
 }
 
 async function waitForPageLoadWithRetry(page: Page) {
@@ -748,7 +762,7 @@ export interface Paths {
 }
 
 export const doExport = async (
-  output: Models['OutputFormat_type'],
+  output: Models['OutputFormat3d_type'],
   rootDir: string,
   page: Page,
   exportFrom: 'dropdown' | 'sidebarButton' | 'commandBar' = 'dropdown'
@@ -1112,3 +1126,15 @@ export function settingsToToml(settings: DeepPartial<Configuration>) {
 export function tomlToSettings(toml: string): DeepPartial<Configuration> {
   return TOML.parse(toml)
 }
+
+export function tomlToPerProjectSettings(
+  toml: string
+): DeepPartial<ProjectConfiguration> {
+  return TOML.parse(toml)
+}
+
+export function perProjectsettingsToToml(
+  settings: DeepPartial<ProjectConfiguration>
+) {
+  return TOML.stringify(settings as any)
+}

e2e/playwright/testing-settings.spec.ts

@@ -746,6 +746,7 @@ test.describe('Testing settings', () => {
     })
     await page.setBodyDimensions({ width: 1200, height: 500 })
     await homePage.goToModelingScene()
+    await expect(toolbar.startSketchBtn).toBeEnabled({ timeout: 15_000 })
     await scene.settled(cmdBar)
     await page.waitForTimeout(1000)
 

interface.d.ts

@@ -3,6 +3,18 @@ import fsSync from 'node:fs'
 import path from 'path'
 import { dialog, shell } from 'electron'
 import { MachinesListing } from 'components/MachineManagerProvider'
+import type { Channel } from 'src/menu/channels'
+import { Menu, WebContents } from 'electron'
+import { ZooLabel, ZooMenuEvents } from 'menu/roles'
+import type { MenuActionIPC } from 'menu/rules'
+import type { WebContentSendPayload } from 'menu/channels'
+
+// Extend the interface with additional custom properties
+declare module 'electron' {
+  interface Menu {
+    label?: ZooLabel
+  }
+}
 
 type EnvFn = (value?: string) => string
 
@@ -44,6 +56,9 @@ export interface IElectronAPI {
   rm: typeof fs.rm
   stat: (path: string) => ReturnType<fs.stat>
   statIsDirectory: (path: string) => Promise<boolean>
+  canReadWriteDirectory: (
+    path: string
+  ) => Promise<{ value: boolean; error: unknown }>
   path: typeof path
   mkdir: typeof fs.mkdir
   join: typeof path.join
@@ -91,6 +106,14 @@ export interface IElectronAPI {
   appCheckForUpdates: () => Promise<unknown>
   getArgvParsed: () => any
   getAppTestProperty: (propertyName: string) => any
+
+  // Helper functions to create application Menus
+  createHomePageMenu: () => Promise<any>
+  createModelingPageMenu: () => Promise<any>
+  createFallbackMenu: () => Promise<any>
+  enableMenu(menuId: string): Promise<any>
+  disableMenu(menuId: string): Promise<any>
+  menuOn: (callback: (payload: WebContentSendPayload) => void) => any
 }
 
 declare global {

package.json

@@ -26,7 +26,7 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@headlessui/react": "^1.7.19",
     "@headlessui/tailwindcss": "^0.2.0",
-    "@kittycad/lib": "2.0.17",
+    "@kittycad/lib": "2.0.21",
     "@lezer/highlight": "^1.2.1",
     "@lezer/lr": "^1.4.1",
     "@react-hook/resize-observer": "^2.0.1",

packages/codemirror-lang-kcl/src/kcl.grammar

@@ -75,17 +75,14 @@ LabeledArgument { ArgumentLabel Equals expression }
 ArgumentList { "(" commaSep<LabeledArgument | expression> ")" }
 
 type[@isGroup=Type] {
-  @specialize[@name=PrimitiveType]<
+  PrimitiveType { identifier } |
-    identifier,
-    "bool" | "number" | "string" | "tag" | "Sketch" | "SketchSurface" | "Solid" | "Plane"
-  > |
   ArrayType { "[" type !member (";" Number "+"?)? "]" } |
   ObjectType { "{" commaSep<ObjectProperty { PropertyName ":" type }> "}" }
 }
 
 VariableDefinition { identifier }
 
-VariableName { identifier }
+VariableName { identifier ("::" identifier)*}
 
 ArgumentLabel { identifier }
 
@@ -137,7 +134,7 @@ commaSep1NoTrailingComma<term> { term ("," term)* }
   "(" ")"
   "{" "}"
   "[" "]"
-  "," "?" ":" "." ".." ";"
+  "," "?" ":" "." ".." ";" "::"
 }
 
 @external propSource kclHighlight from "./highlight"

packages/codemirror-lang-kcl/vitest.main.config.ts

@@ -18,7 +18,9 @@ const config = defineConfig({
     environment: 'node',
     reporters: process.env.GITHUB_ACTIONS
       ? ['dot', 'github-actions']
-      : ['verbose', 'hanging-process'],
+      : // Gotcha: 'hanging-process' is very noisey, turn off by default on localhost
+        // : ['verbose', 'hanging-process'],
+        ['verbose'],
     testTimeout: 1000,
     hookTimeout: 1000,
     teardownTimeout: 1000,

packages/codemirror-lsp-client/package.json

@@ -29,7 +29,7 @@
     "vscode-uri": "^3.1.0"
   },
   "devDependencies": {
-    "@types/node": "^22.13.10",
+    "@types/node": "^22.13.13",
     "ts-node": "^10.9.2"
   }
 }

packages/codemirror-lsp-client/yarn.lock

@@ -116,10 +116,10 @@
   resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
   integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
 
-"@types/node@^22.13.10":
+"@types/node@^22.13.13":
-  version "22.13.10"
+  version "22.13.13"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.13.10.tgz#df9ea358c5ed991266becc3109dc2dc9125d77e4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.13.13.tgz#5e7d110fb509b0d4a43fbf48fa9d6e0f83e1b1e7"
-  integrity sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==
+  integrity sha512-ClsL5nMwKaBRwPcCvH8E7+nU4GxHVx1axNvMZTFHMEfNI7oahimt26P5zjVCRrjiIWj6YFXfE1v3dEp94wLcGQ==
   dependencies:
     undici-types "~6.20.0"
 

playwright.config.ts

@@ -12,6 +12,7 @@ import { defineConfig, devices } from '@playwright/test'
 export default defineConfig({
   timeout: 120_000, // override the default 30s timeout
   testDir: './e2e/playwright',
+  testIgnore: '*.test.ts', // ignore unit tests
   /* Run tests in files in parallel */
   fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */

playwright.electron.config.ts

@@ -7,6 +7,7 @@ import { platform } from 'os'
 export default defineConfig({
   timeout: 120_000, // override the default 30s timeout
   testDir: './e2e/playwright',
+  testIgnore: '*.test.ts', // ignore unit tests
   /* Run tests in files in parallel */
   fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */

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

@@ -7,7 +7,7 @@
 // Define function
 fn rail8020(originStart, railHeight, railLength) {
   // Sketch side 1 of profile
-  sketch001 = startSketchOn('-XZ')
+  sketch001 = startSketchOn(-XZ)
     |> startProfileAt([
          originStart[0],
          0.1 * railHeight + originStart[1]
@@ -194,7 +194,7 @@ fn rail8020(originStart, railHeight, railLength) {
            .5 * railHeight + originStart[0],
            .5 * railHeight + originStart[1]
          ],
-         radius = .205 * railHeight / 2
+         radius = .205 * railHeight / 2,
        ), %)
     |> extrude(length = railLength)
     |> fillet(
@@ -216,7 +216,7 @@ fn rail8020(originStart, railHeight, railLength) {
            getNextAdjacentEdge(edge28),
            getNextAdjacentEdge(edge29),
            getNextAdjacentEdge(edge30)
-         ]
+         ],
        )
     |> fillet(
          radius = 0.03,
@@ -237,7 +237,7 @@ fn rail8020(originStart, railHeight, railLength) {
            getNextAdjacentEdge(edge26),
            getNextAdjacentEdge(edge31),
            getNextAdjacentEdge(edge32)
-         ]
+         ],
        )
   return sketch001
 }

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

@@ -15,14 +15,13 @@ padding = 1.5
 bearingDia = 3
 
 // (Needs to be updated). Sketch the block and extrude up to where the counterbore diameter starts.
-extrude001 = startSketchOn('XY')
+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)
-  
 extrude002 = startSketchOn(extrude001, 'end')
   |> circle(
        center = [
@@ -31,16 +30,8 @@ extrude002 = startSketchOn(extrude001, 'end')
        ],
        radius = cbDia / 2,
      )
-  |> patternLinear2d(
+  |> patternLinear2d(instances = 2, distance = length - padding, axis = [0, 1])
-      instances = 2,
+  |> patternLinear2d(instances = 2, distance = width - padding, axis = [1, 0])
-      distance = length - padding,
-      axis = [0, 1],
-     )
-  |> patternLinear2d(
-      instances = 2,
-      distance = width - padding,
-      axis = [1, 0],
-    )
   |> extrude(%, length = -cbDepth)
 
 extrude003 = startSketchOn(extrude001, 'start')
@@ -51,21 +42,10 @@ extrude003 = startSketchOn(extrude001, 'start')
        ],
        radius = holeDia / 2,
      )
-  |> patternLinear2d(
+  |> patternLinear2d(instances = 2, distance = length - padding, axis = [0, 1])
-      instances = 2,
+  |> patternLinear2d(instances = 2, distance = width - padding, axis = [1, 0])
-      distance = length - padding,
-      axis = [0, 1],
-    )
-  |> patternLinear2d(
-      instances = 2,
-      distance = width - padding,
-      axis = [1, 0],
-    )
   |> extrude(length = -height + cbDepth)
 
 extrude004 = startSketchOn(extrude001, 'end')
-  |> circle(
+  |> circle(center = [0, 0], radius = bearingDia / 2)
-      center = [0, 0],
-      radius = bearingDia/2,
-    )
   |> extrude(length = -height)

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

@@ -17,21 +17,15 @@ chainThickness = sphereDia / 8
 linkDiameter = sphereDia / 4
 
 // Sketch the inside bearing piece
-insideWallSketch = startSketchOn(offsetPlane("XY", offset = -overallThickness / 2))
+insideWallSketch = startSketchOn(offsetPlane(XY, offset = -overallThickness / 2))
-  |> circle(
+  |> circle(center = [0, 0], radius = shaftDia / 2 + wallThickness)
-       center = [0, 0],
+  |> hole(circle(center = [0, 0], radius = shaftDia / 2), %)
-       radius = shaftDia / 2 + wallThickness
-     )
-  |> hole(circle(
-       center = [0, 0],
-       radius = shaftDia / 2
-     ), %)
 
 // Extrude the inside bearing piece
 insideWall = extrude(insideWallSketch, length = overallThickness)
 
 // Create the sketch of one of the balls
-ballsSketch = startSketchOn("XY")
+ballsSketch = startSketchOn(XY)
   |> startProfileAt([shaftDia / 2 + wallThickness, 0.001], %)
   |> arc({
        angleEnd = 0,
@@ -47,11 +41,11 @@ balls = revolve(ballsSketch, axis = "X")
        axis = [0, 0, 1],
        center = [0, 0, 0],
        instances = nBalls,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 
 // Create the sketch for the chain around the balls
-chainSketch = startSketchOn("XY")
+chainSketch = startSketchOn(XY)
   |> startProfileAt([
        shaftDia / 2 + wallThickness + sphereDia / 2 - (chainWidth / 2),
        0.125 * sin(toRadians(60))
@@ -72,17 +66,17 @@ chainHead = revolve(chainSketch, axis = "X")
        axis = [0, 0, 1],
        center = [0, 0, 0],
        instances = nBalls,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 
 // Create the sketch for the links in between the chains
-linkSketch = startSketchOn("XZ")
+linkSketch = startSketchOn(XZ)
   |> circle(
        center = [
          shaftDia / 2 + wallThickness + sphereDia / 2,
          0
        ],
-       radius = linkDiameter / 2
+       radius = linkDiameter / 2,
      )
 
 // Revolve the link sketch
@@ -92,19 +86,13 @@ linkRevolve = revolve(linkSketch, axis = 'Y', angle = 360 / nBalls)
        axis = [0, 0, 1],
        center = [0, 0, 0],
        instances = nBalls,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 
 // Create the sketch for the outside walls
-outsideWallSketch = startSketchOn(offsetPlane("XY", offset = -overallThickness / 2))
+outsideWallSketch = startSketchOn(offsetPlane(XY, offset = -overallThickness / 2))
-  |> circle(
+  |> circle(center = [0, 0], radius = outsideDiameter / 2)
-       center = [0, 0],
+  |> hole(circle(center = [0, 0], radius = shaftDia / 2 + wallThickness + sphereDia), %)
-       radius = outsideDiameter / 2
-     )
-  |> hole(circle(
-       center = [0, 0],
-       radius = shaftDia / 2 + wallThickness + sphereDia
-     ), %)
 
 outsideWall = extrude(outsideWallSketch, length = overallThickness)
 

public/kcl-samples/bench/bench-parts.kcl

@@ -130,7 +130,7 @@ fn armRestProfile(plane, offset) {
 
 export fn armRest(plane, offset) {
   path = armRestPath(  offsetPlane(plane, offset = offset))
-  profile = armRestProfile(  offsetPlane("-XZ", offset = 20), offset)
+  profile = armRestProfile(  offsetPlane(-XZ, offset = 20), offset)
   sweep(profile, path = path)
   return 0
 }

public/kcl-samples/bench/main.kcl

@@ -16,19 +16,19 @@ import backSlats from "bench-parts.kcl"
 import armRest from "bench-parts.kcl"
 
 // Create the dividers, these hold the seat and back slats
-divider("YZ")
+divider(YZ)
-divider(offsetPlane("-YZ", offset = benchLength / 2))
+divider(offsetPlane(-YZ, offset = benchLength / 2))
-divider(offsetPlane("YZ", offset = benchLength / 2))
+divider(offsetPlane(YZ, offset = benchLength / 2))
 
 // Create the connectors to join the dividers
-connector(offsetPlane("YZ", offset = -benchLength / 2), benchLength)
+connector(offsetPlane(YZ, offset = -benchLength / 2), benchLength)
 
 // Create the seat slats
-seatSlats(offsetPlane("YZ", offset = -benchLength / 2 - dividerThickness / 2), benchLength + dividerThickness)
+seatSlats(offsetPlane(YZ, offset = -benchLength / 2 - (dividerThickness / 2)), benchLength + dividerThickness)
 
 // Create the back slats
-backSlats(offsetPlane("YZ", offset = -benchLength / 2 - dividerThickness / 2), benchLength + dividerThickness)
+backSlats(offsetPlane(YZ, offset = -benchLength / 2 - (dividerThickness / 2)), benchLength + dividerThickness)
 
 // Create the arm rests
-armRest("-YZ", benchLength / 2)
+armRest(-YZ, benchLength / 2)
-armRest("-YZ", -benchLength / 2)
+armRest(-YZ, -benchLength / 2)

public/kcl-samples/bracket/main.kcl

@@ -1,7 +1,6 @@
 // Shelf Bracket
 // This is a bracket that holds a shelf. It is made of aluminum and is designed to hold a force of 300 lbs. The bracket is 6 inches wide and the force is applied at the end of the shelf, 12 inches from the wall. The bracket has a factor of safety of 1.2. The legs of the bracket are 5 inches and 2 inches long. The thickness of the bracket is calculated from the constraints provided.
 
-
 // Define constants
 sigmaAllow = 35000 // psi (6061-T6 aluminum)
 width = 6 // inch
@@ -12,14 +11,16 @@ wallMountL = 2 // inches
 shelfDepth = 12 // Shelf is 12 inches in depth from the wall
 moment = shelfDepth * p // assume the force is applied at the end of the shelf to be conservative (lb-in)
 
+
 // Calculate required thickness of bracket
 thickness = sqrt(moment * factorOfSafety * 6 / (sigmaAllow * width)) // this is the calculation of two brackets holding up the shelf (inches)
 
+
 filletRadius = .25
 extFilletRadius = filletRadius + thickness
 mountingHoleDiameter = 0.5
 
-sketch001 = startSketchOn('XZ')
+sketch001 = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> xLine(length = shelfMountL - thickness, tag = $seg01)
   |> yLine(length = thickness, tag = $seg02)
@@ -29,48 +30,18 @@ sketch001 = startSketchOn('XZ')
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg06)
   |> close()
   |> extrude(%, length = width)
-  |> fillet(
+  |> fillet(radius = extFilletRadius, tags = [getNextAdjacentEdge(seg03)])
-       radius = extFilletRadius,
+  |> fillet(radius = filletRadius, tags = [getNextAdjacentEdge(seg06)])
-       tags = [getNextAdjacentEdge(seg03)],
+  |> fillet(radius = filletRadius, tags = [seg02, getOppositeEdge(seg02)])
-     )
+  |> fillet(radius = filletRadius, tags = [seg05, getOppositeEdge(seg05)])
-  |> fillet(
-       radius = filletRadius,
-       tags = [getNextAdjacentEdge(seg06)],
-     )
-  |> fillet(
-      radius = filletRadius,
-      tags = [seg02, getOppositeEdge(seg02)],
-    )
-  |> fillet(
-      radius = filletRadius,
-      tags = [seg05, getOppositeEdge(seg05)],
-    )
 
 sketch002 = startSketchOn(sketch001, seg03)
-  |> circle(
+  |> circle(center = [-1.25, 1], radius = mountingHoleDiameter / 2)
-    center = [-1.25, 1],
+  |> patternLinear2d(instances = 2, distance = 2.5, axis = [-1, 0])
-    radius = mountingHoleDiameter / 2,
+  |> patternLinear2d(instances = 2, distance = 4, axis = [0, 1])
-  )
-  |> patternLinear2d(
-    instances = 2,
-    distance = 2.5,
-    axis = [-1, 0],
-  )
-  |> patternLinear2d(
-    instances = 2,
-    distance = 4,
-    axis = [0, 1],
-  )
   |> extrude(%, length = -thickness - .01)
 
 sketch003 = startSketchOn(sketch001, seg04)
-  |> circle(
+  |> circle(center = [1, -1], radius = mountingHoleDiameter / 2)
-    center = [1, -1],
+  |> patternLinear2d(instances = 2, distance = 4, axis = [1, 0])
-    radius = mountingHoleDiameter / 2,
-  )
-  |> patternLinear2d(
-    instances = 2,
-    distance = 4,
-    axis = [1, 0],
-  )
   |> extrude(%, length = -thickness - 0.1)

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

@@ -1,16 +1,14 @@
 // Brake Caliper
 // Brake calipers are used to squeeze the brake pads against the rotor, causing larger and larger amounts of friction depending on how hard the brakes are pressed.
 
-
 // Set units
 @settings(defaultLengthUnit = in)
 
-
 // Import Constants
 import caliperTolerance, caliperPadLength, caliperThickness, caliperOuterEdgeRadius, caliperInnerEdgeRadius, rotorDiameter, rotorTotalThickness, yAxisOffset from "globals.kcl"
 
 // Sketch the brake caliper profile
-brakeCaliperSketch = startSketchOn('XY')
+brakeCaliperSketch = startSketchOn(XY)
   |> startProfileAt([
        rotorDiameter / 2 + caliperTolerance,
        0

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

@@ -1,39 +1,28 @@
 // Wheel rotor
 // A component of a disc brake system. It provides a surface for brake pads to press against, generating the friction needed to slow or stop the vehicle.
 
-
 // Set units
 @settings(defaultLengthUnit = in)
 
-
 // Import Constants
 import rotorDiameter, rotorInnerDiameter, rotorSinglePlateThickness, rotorInnerDiameterThickness, lugHolePatternDia, lugSpacing, rotorTotalThickness, spacerPatternDiameter, spacerDiameter, spacerLength, spacerCount, wheelDiameter, lugCount, yAxisOffset, drillAndSlotCount from "globals.kcl"
 
-rotorSketch = startSketchOn('XZ')
+rotorSketch = startSketchOn(XZ)
-  |> circle(
+  |> circle(center = [0, 0], radius = rotorDiameter / 2)
-       center = [0, 0],
-       radius = rotorDiameter / 2
-     )
 rotor = extrude(rotorSketch, length = rotorSinglePlateThickness)
   |> appearance(color = "#dbcd70", roughness = 90, metalness = 90)
 
 rotorBumpSketch = startSketchOn(rotor, 'end')
-  |> circle(
+  |> circle(center = [0, 0], radius = rotorInnerDiameter / 2)
-       center = [0, 0],
-       radius = rotorInnerDiameter / 2
-     )
 rotorBump = extrude(rotorBumpSketch, length = rotorInnerDiameterThickness)
 
 lugHoles = startSketchOn(rotorBump, 'end')
-  |> circle(
+  |> circle(center = [-lugSpacing / 2, 0], radius = 0.315)
-       center = [-lugSpacing / 2, 0],
-       radius = 0.315
-     )
   |> patternCircular2d(
        arcDegrees = 360,
        center = [0, 0],
        instances = lugCount,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
   |> extrude(%, length = -(rotorInnerDiameterThickness + rotorSinglePlateThickness))
   |> appearance(color = "#dbcd70", roughness = 90, metalness = 90)
@@ -44,35 +33,26 @@ centerSpacer = startSketchOn(rotor, 'start')
   |> extrude(%, length = spacerLength)
 
 secondaryRotorSketch = startSketchOn(centerSpacer, 'end')
-  |> circle(
+  |> circle(center = [0, 0], radius = rotorDiameter / 2)
-       center = [0, 0],
-       radius = rotorDiameter / 2
-     )
 secondRotor = extrude(secondaryRotorSketch, length = rotorSinglePlateThickness)
 
 lugHoles2 = startSketchOn(secondRotor, 'end')
-  |> circle(
+  |> circle(center = [-lugSpacing / 2, 0], radius = 0.315)
-       center = [-lugSpacing / 2, 0],
-       radius = 0.315
-     )
   |> patternCircular2d(
        arcDegrees = 360,
        center = [0, 0],
        instances = lugCount,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
   |> extrude(length = -rotorSinglePlateThickness)
 
 spacerSketch = startSketchOn(rotor, 'start')
-  |> circle(
+  |> circle(center = [spacerPatternDiameter / 2, 0], radius = spacerDiameter)
-       center = [spacerPatternDiameter / 2, 0],
-       radius = spacerDiameter
-     )
   |> patternCircular2d(
        arcDegrees = 360,
        center = [0, 0],
        instances = spacerCount,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 spacers = extrude(spacerSketch, length = spacerLength)
 
@@ -87,7 +67,7 @@ rotorSlottedSketch = startSketchOn(rotor, 'START')
        center = [0, 0],
        instances = drillAndSlotCount,
        arcDegrees = 360,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 rotorSlotted = extrude(rotorSlottedSketch, length = -rotorSinglePlateThickness / 2)
 
@@ -102,7 +82,7 @@ secondRotorSlottedSketch = startSketchOn(secondRotor, 'END')
        center = [0, 0],
        instances = drillAndSlotCount,
        arcDegrees = 360,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 
 extrude(secondRotorSlottedSketch, length = -rotorSinglePlateThickness / 2)

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

@@ -1,21 +1,22 @@
 // Tire
 // A tire is a critical component of a vehicle that provides the necessary traction and grip between the car and the road. It supports the vehicle's weight and absorbs shocks from road irregularities.
 
-
 // Set units
 @settings(defaultLengthUnit = in)
 
-
 // Import Constants
 import tireInnerDiameter, tireOuterDiameter, tireDepth, bendRadius, tireTreadWidth, tireTreadDepth, tireTreadOffset from "globals.kcl"
 
 // Create the sketch of the tire
-tireSketch = startSketchOn("XY")
+tireSketch = startSketchOn(XY)
   |> startProfileAt([tireInnerDiameter / 2, tireDepth / 2], %)
-  |> line(endAbsolute = [
+  |> line(
+       endAbsolute = [
          tireOuterDiameter / 2 - bendRadius,
          tireDepth / 2
-     ], tag = $edge1)
+       ],
+       tag = $edge1,
+     )
   |> tangentialArc({ offset = -90, radius = bendRadius }, %)
   |> line(endAbsolute = [
        tireOuterDiameter / 2,

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

@@ -1,69 +1,49 @@
 // Car Wheel
 // A sports car wheel with a circular lug pattern and spokes.
 
-
 // Set units
 @settings(defaultLengthUnit = in)
 
-
 // Import Constants
 import lugCount, lugSpacing, offset, backSpacing, wheelWidth, wheelDiameter, spokeCount, spokeGap, spokeAngle, spokeThickness from "globals.kcl"
 
 // Create the wheel center
-lugBase = startSketchOn('XZ')
+lugBase = startSketchOn(XZ)
-  |> circle(
+  |> circle(center = [0, 0], radius = (lugSpacing + 1.5) / 2)
-       center = [0, 0],
+  |> hole(circle(center = [0, 0], radius = (lugSpacing - 1.5) / 2), %)
-       radius = (lugSpacing + 1.5) / 2
-     )
-  |> hole(circle(
-       center = [0, 0],
-       radius = (lugSpacing - 1.5) / 2
-     ), %)
   |> extrude(length = wheelWidth / 20)
 
 // Extend the wheel center and bore holes to accomidate the lug heads
 lugExtrusion = startSketchOn(lugBase, 'END')
-  |> circle(
+  |> circle(center = [0, 0], radius = (lugSpacing + 1.5) / 2)
-       center = [0, 0],
+  |> hole(circle(center = [0, 0], radius = (lugSpacing - 1.5) / 2), %)
-       radius = (lugSpacing + 1.5) / 2
-     )
-  |> hole(circle(
-       center = [0, 0],
-       radius = (lugSpacing - 1.5) / 2
-     ), %)
   |> extrude(length = wheelWidth / 10)
 
 // Create the circular pattern for the lugs
 lugClearance = startSketchOn(lugExtrusion, 'END')
-  |> circle(
+  |> circle(center = [lugSpacing / 2, 0], radius = 1.2 / 2)
-       center = [lugSpacing / 2, 0],
-       radius = 1.2 / 2
-     )
   |> patternCircular2d(
        arcDegrees = 360,
        center = [0, 0],
        instances = lugCount,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
   |> extrude(length = -wheelWidth / 10)
 
 // Create the circular pattern for the lug holes
 lugHoles = startSketchOn(lugBase, 'END')
-  |> circle(
+  |> circle(center = [lugSpacing / 2, 0], radius = 16 * mm() / 2)
-       center = [lugSpacing / 2, 0],
-       radius = 16 * mm() / 2
-     )
   |> patternCircular2d(
        arcDegrees = 360,
        center = [0, 0],
        instances = lugCount,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
   |> extrude(length = -wheelWidth / 20)
   |> appearance(color = "#ffffff", metalness = 0, roughness = 0)
 
 // Add detail to the wheel center by revolving curved edge profiles
-wheelCenterInner = startSketchOn('XY')
+wheelCenterInner = startSketchOn(XY)
   |> startProfileAt([(lugSpacing - 1.5) / 2, 0], %)
   |> yLine(length = -wheelWidth / 10 - (wheelWidth / 20))
   |> bezierCurve({
@@ -77,7 +57,7 @@ wheelCenterInner = startSketchOn('XY')
   |> revolve(axis = 'y')
   |> appearance(color = "#ffffff", metalness = 0, roughness = 0)
 
-wheelCenterOuter = startSketchOn('XY')
+wheelCenterOuter = startSketchOn(XY)
   |> startProfileAt([(lugSpacing + 1.5) / 2, 0], %)
   |> yLine(length = -wheelWidth / 10 - (wheelWidth / 20))
   |> bezierCurve({
@@ -145,7 +125,7 @@ fn spoke(spokeGap, spokeAngle, spokeThickness) {
          center = [0, -2000, 0],
          instances = spokeCount,
          arcDegrees = 360,
-         rotateDuplicates = true
+         rotateDuplicates = true,
        )
     |> appearance(color = "#ffffff", metalness = 0, roughness = 0)
   return spokePattern
@@ -155,7 +135,7 @@ spoke(spokeGap, spokeAngle, spokeThickness)
 spoke(-spokeGap, -spokeAngle, -spokeThickness)
 
 // Define and revolve wheel exterior
-startSketchOn('XY')
+startSketchOn(XY)
   |> startProfileAt([
        wheelDiameter / 2,
        -wheelWidth + backSpacing + offset

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

@@ -20,7 +20,7 @@ export lugDiameter = 24 * mm()
 export lugHeadLength = lugDiameter * .5
 export lugThreadDiameter = lugDiameter / 2 * .85
 export lugLength = 30 * mm()
-export lugThreadDepth = lugLength - 12.7 * mm()
+export lugThreadDepth = lugLength - (12.7 * mm())
 
 // Car Rotor
 export rotorDiameter = 12

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

@@ -1,11 +1,9 @@
 // Lug Nut
 // lug Nuts are essential components used to create secure connections, whether for electrical purposes, like terminating wires or grounding, or for mechanical purposes, such as providing mounting points or reinforcing structural joints.
 
-
 // Set units
 @settings(defaultLengthUnit = in)
 
-
 // Import Constants
 import lugDiameter, lugHeadLength, lugThreadDiameter, lugLength, lugThreadDepth, lugSpacing from "globals.kcl"
 

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

@@ -4,12 +4,12 @@
 // Set units
 @settings(defaultLengthUnit = in)
 
-import 'car-wheel.kcl' as carWheel
+import "car-wheel.kcl" as carWheel
-import 'car-rotor.kcl' as carRotor
+import "car-rotor.kcl" as carRotor
 import "brake-caliper.kcl" as brakeCaliper
-import 'lug-nut.kcl' as lugNut
+import "lug-nut.kcl" as lugNut
-import 'car-tire.kcl' as carTire
+import "car-tire.kcl" as carTire
-import lugCount from 'globals.kcl'
+import lugCount from "globals.kcl"
 
 carRotor
   |> translate(translate = [0, 0.5, 0])
@@ -20,7 +20,7 @@ lugNut
        axis = [0, 1, 0],
        center = [0, 0, 0],
        instances = lugCount,
-     rotateDuplicates = false
+       rotateDuplicates = false,
      )
 brakeCaliper
   |> translate(translate = [0, 0.5, 0])

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

@@ -12,12 +12,12 @@ metalConstant = 50
 roughnessConstant = 50
 
 // Create planes for 6 sides of a cube
-bluePlane = offsetPlane('XY', offset = halfSize)
+bluePlane = offsetPlane(XY, offset = halfSize)
-yellowPlane = offsetPlane('XY', offset = -halfSize)
+yellowPlane = offsetPlane(XY, offset = -halfSize)
-greenPlane = offsetPlane('XZ', offset = -halfSize)
+greenPlane = offsetPlane(XZ, offset = -halfSize)
-purplePlane = offsetPlane('-XZ', offset = -halfSize)
+purplePlane = offsetPlane(-XZ, offset = -halfSize)
-redPlane = offsetPlane('YZ', offset = halfSize - extrudeLength)
+redPlane = offsetPlane(YZ, offset = halfSize - extrudeLength)
-tealPlane = offsetPlane('YZ', offset = -halfSize)
+tealPlane = offsetPlane(YZ, offset = -halfSize)
 
 // Sketch a rectangle centered at the origin of the profile
 fn sketchRectangle(profile, color) {

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

@@ -4,12 +4,11 @@
 // Set Units
 @settings(defaultLengthUnit = in)
 
-
 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) {
     helixAngleP = helixAngle * gHeight / gearHeight
-    gearProfile = startSketchOn(offsetPlane("XY", offset = gHeight))
+    gearProfile = startSketchOn(offsetPlane(XY, offset = gHeight))
       |> startProfileAt([
            gearPitch * 1.55 * cos(toRadians(helixAngleP)) + gearPitch * sin(toRadians(-helixAngleP)),
            gearPitch * 1.55 * sin(toRadians(helixAngleP)) + gearPitch * cos(toRadians(-helixAngleP))
@@ -31,10 +30,7 @@ fn cycloidalGear(gearPitch, gearHeight, holeDiameter, helixAngle) {
       |> tangentialArc({ radius = gearPitch, offset = -180 }, %)
       |> tangentialArcTo([profileStartX(%), profileStartY(%)], %)
       |> close(%)
-      |> hole(circle(
+      |> hole(circle(center = [0, 0], radius = holeDiameter / 2), %)
-           center = [0, 0],
-           radius = holeDiameter / 2
-         ), %)
     return gearProfile
   }
 

public/kcl-samples/dodecahedron/main.kcl

@@ -39,7 +39,7 @@ plane = {
 }
 
 // Create a regular pentagon inscribed in a circle of radius pentR
-bottomFace = startSketchOn('XY')
+bottomFace = startSketchOn(XY)
   |> polygon({
        radius = pentR,
        numSides = 5,
@@ -66,7 +66,7 @@ bottomBowl = patternCircular3d(
   axis = [0, 0, 1],
   center = [0, 0, 0],
   arcDegrees = 360,
-  rotateDuplicates = true
+  rotateDuplicates = true,
 )
 
 // pattern the bottom to create the top face
@@ -76,7 +76,7 @@ patternCircular3d(
   axis = [0, 1, 0],
   center = [0, 0, inscR],
   arcDegrees = 360,
-  rotateDuplicates = true
+  rotateDuplicates = true,
 )
 
 // pattern the bottom angled faces to create the top
@@ -86,5 +86,5 @@ patternCircular3d(
   axis = [0, 1, 0],
   center = [0, 0, inscR],
   arcDegrees = 360,
-  rotateDuplicates = true
+  rotateDuplicates = true,
 )

public/kcl-samples/enclosure/main.kcl

@@ -11,7 +11,7 @@ wallThickness = 3
 holeDia = 4
 
 // Model a box with base enclosure dimensions
-sketch001 = startSketchOn('XY')
+sketch001 = startSketchOn(XY)
   |> startProfileAt([0, 0], %)
   |> angledLine([0, width], %, $rectangleSegmentA001)
   |> angledLine([
@@ -32,14 +32,11 @@ extrude001 = extrude(sketch001, length = height)
          getNextAdjacentEdge(rectangleSegmentB001),
          getNextAdjacentEdge(rectangleSegmentC001),
          getNextAdjacentEdge(rectangleSegmentD001)
-       ]
+       ],
      )
 
   // Apply a shell to the enclosure base to create the internal storage
-  |> shell(
+  |> shell(faces = ["end"], thickness = wallThickness)
-       faces = ["end"],
-       thickness = wallThickness
-     )
 
 // Define a function to create the internal structure to secure a fastener at each corner
 fn function001(originStart) {
@@ -55,14 +52,8 @@ fn function001(originStart) {
 
   // Create a pillar with a fasterner hole at the center
   sketch002 = startSketchOn(plane001)
-    |> circle(
+    |> circle(center = [originStart[0], originStart[1]], radius = holeDia + wallThickness)
-         center = [originStart[0], originStart[1]],
+    |> hole(circle(center = [originStart[0], originStart[1]], radius = holeDia), %)
-         radius = holeDia + wallThickness
-       )
-    |> hole(circle(
-         center = [originStart[0], originStart[1]],
-         radius = holeDia
-       ), %)
   extrude002 = extrude(sketch002, length = height - wallThickness)
 
   return extrude002
@@ -87,7 +78,7 @@ function001([
 ])
 
 // Define lid position and outer surface
-sketch003 = startSketchOn('XY')
+sketch003 = startSketchOn(XY)
   |> startProfileAt([width * 1.2, 0], %)
   |> angledLine([0, width], %, $rectangleSegmentA002)
   |> angledLine([
@@ -105,28 +96,28 @@ sketch003 = startSketchOn('XY')
          width * 1.2 + wallThickness * 3 + holeDia,
          wallThickness * 3 + holeDia
        ],
-       radius = holeDia
+       radius = holeDia,
      ), %)
   |> hole(circle(
        center = [
          width * 1.2 + wallThickness * 3 + holeDia,
          length - (wallThickness * 3 + holeDia)
        ],
-       radius = holeDia
+       radius = holeDia,
      ), %)
   |> hole(circle(
        center = [
          width * 2.2 - (wallThickness * 3 + holeDia),
          wallThickness * 3 + holeDia
        ],
-       radius = holeDia
+       radius = holeDia,
      ), %)
   |> hole(circle(
        center = [
          width * 2.2 - (wallThickness * 3 + holeDia),
          length - (wallThickness * 3 + holeDia)
        ],
-       radius = holeDia
+       radius = holeDia,
      ), %)
 extrude003 = extrude(sketch003, length = wallThickness)
   |> fillet(
@@ -136,7 +127,7 @@ extrude003 = extrude(sketch003, length = wallThickness)
          getNextAdjacentEdge(rectangleSegmentB002),
          getNextAdjacentEdge(rectangleSegmentC002),
          getNextAdjacentEdge(rectangleSegmentD002)
-       ]
+       ],
      )
 
 // Define lid inner and sealing surfaces
@@ -161,28 +152,28 @@ sketch004 = startSketchOn(extrude003, 'END')
          width * 1.2 + wallThickness * 3 + holeDia,
          wallThickness * 3 + holeDia
        ],
-       radius = holeDia + wallThickness
+       radius = holeDia + wallThickness,
      ), %)
   |> hole(circle(
        center = [
          width * 1.2 + wallThickness * 3 + holeDia,
          length - (wallThickness * 3 + holeDia)
        ],
-       radius = holeDia + wallThickness
+       radius = holeDia + wallThickness,
      ), %)
   |> hole(circle(
        center = [
          width * 2.2 - (wallThickness * 3 + holeDia),
          wallThickness * 3 + holeDia
        ],
-       radius = holeDia + wallThickness
+       radius = holeDia + wallThickness,
      ), %)
   |> hole(circle(
        center = [
          width * 2.2 - (wallThickness * 3 + holeDia),
          length - (wallThickness * 3 + holeDia)
        ],
-       radius = holeDia + wallThickness
+       radius = holeDia + wallThickness,
      ), %)
 extrude004 = extrude(sketch004, length = wallThickness)
   |> fillet(
@@ -192,5 +183,5 @@ extrude004 = extrude(sketch004, length = wallThickness)
          getNextAdjacentEdge(rectangleSegmentB003),
          getNextAdjacentEdge(rectangleSegmentC003),
          getNextAdjacentEdge(rectangleSegmentD003)
-       ]
+       ],
      )

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

@@ -45,15 +45,9 @@ fn primaryTube(n, angle001, length001, length002, length003) {
        }, %)
 
   // Create the cross section of each tube and sweep them
-  sweepProfile = startSketchOn('XY')
+  sweepProfile = startSketchOn(XY)
-    |> circle(
+    |> circle(center = [pos001, 0], radius = primaryTubeDiameter / 2)
-         center = [pos001, 0],
+    |> hole(circle(center = [pos001, 0], radius = primaryTubeDiameter / 2 - wallThickness), %)
-         radius = primaryTubeDiameter / 2
-       )
-    |> hole(circle(
-         center = [pos001, 0],
-         radius = primaryTubeDiameter / 2 - wallThickness
-       ), %)
     |> sweep(path = sweepPath)
 
   return {  }
@@ -66,7 +60,7 @@ primaryTube(2, 24.3, 5, 5, 3)
 primaryTube(3, 25.2, 5, 5, 3)
 
 // Create the mounting flange for the header
-flangeSketch = startSketchOn('XY')
+flangeSketch = startSketchOn(XY)
   |> startProfileAt([3 + 1.3, -1.25], %)
   |> xLine(length = -2.6, tag = $seg01)
   |> tangentialArc({ radius = .3, offset = -40 }, %)
@@ -87,22 +81,10 @@ flangeSketch = startSketchOn('XY')
   |> close()
 
   // Create openings in the flange to accommodate each tube
-  |> hole(circle(
+  |> hole(circle(center = [0, 0], radius = primaryTubeDiameter / 2 - wallThickness), %)
-       center = [0, 0],
+  |> hole(circle(center = [2, 0], radius = primaryTubeDiameter / 2 - wallThickness), %)
-       radius = primaryTubeDiameter / 2 - wallThickness
+  |> hole(circle(center = [4, 0], radius = primaryTubeDiameter / 2 - wallThickness), %)
-     ), %)
+  |> hole(circle(center = [6, 0], radius = primaryTubeDiameter / 2 - wallThickness), %)
-  |> hole(circle(
-       center = [2, 0],
-       radius = primaryTubeDiameter / 2 - wallThickness
-     ), %)
-  |> hole(circle(
-       center = [4, 0],
-       radius = primaryTubeDiameter / 2 - wallThickness
-     ), %)
-  |> hole(circle(
-       center = [6, 0],
-       radius = primaryTubeDiameter / 2 - wallThickness
-     ), %)
 
   // Add mounting holes to the flange
   |> hole(circle(
@@ -110,28 +92,28 @@ flangeSketch = startSketchOn('XY')
          -primaryTubeDiameter * .6,
          -primaryTubeDiameter * .6
        ],
-       radius = 0.25 / 2
+       radius = 0.25 / 2,
      ), %)
   |> hole(circle(
        center = [
          primaryTubeDiameter * .6,
          primaryTubeDiameter * .6
        ],
-       radius = 0.25 / 2
+       radius = 0.25 / 2,
      ), %)
   |> hole(circle(
        center = [
          3 * 2 - (primaryTubeDiameter * .6),
          primaryTubeDiameter * .6
        ],
-       radius = 0.25 / 2
+       radius = 0.25 / 2,
      ), %)
   |> hole(circle(
        center = [
          3 * 2 + primaryTubeDiameter * .6,
          -primaryTubeDiameter * .6
        ],
-       radius = 0.25 / 2
+       radius = 0.25 / 2,
      ), %)
 
   // Extrude the flange and fillet the edges
@@ -141,12 +123,12 @@ flangeSketch = startSketchOn('XY')
        tags = [
          getNextAdjacentEdge(seg04),
          getNextAdjacentEdge(seg07)
-       ]
+       ],
      )
   |> fillet(
        radius = .25,
        tags = [
          getNextAdjacentEdge(seg03),
          getNextAdjacentEdge(seg08)
-       ]
+       ],
      )

public/kcl-samples/flange/main.kcl

@@ -21,41 +21,29 @@ nHoles = 4
 assertGreaterThan(nHoles, 1, "nHoles must be greater than 1")
 
 // Create the circular pattern for the mounting holes
-circles = startSketchOn('XY')
+circles = startSketchOn(XY)
-  |> circle(
+  |> circle(center = [mountingHolePlacementDiameter / 2, 0], radius = mountingHoleDia / 2)
-       center = [mountingHolePlacementDiameter / 2, 0],
-       radius = mountingHoleDia / 2
-     )
   |> patternCircular2d(
        arcDegrees = 360,
        center = [0, 0],
        instances = nHoles,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 
 // Create the base of the flange and add the mounting holes
-flangeBase = startSketchOn('XY')
+flangeBase = startSketchOn(XY)
-  |> circle(
+  |> circle(center = [0, 0], radius = baseDia / 2)
-       center = [0, 0],
-       radius = baseDia / 2
-     )
   |> hole(circles, %)
   |> extrude(length = baseThickness)
 
 // Create the extrusion on the top of the flange base
 topExtrusion = startSketchOn(flangeBase, 'end')
-  |> circle(
+  |> circle(center = [0, 0], radius = topTotalDiameter / 2)
-       center = [0, 0],
-       radius = topTotalDiameter / 2
-     )
   |> extrude(length = topTotalThickness)
 
 // Create the extrusion on the bottom of the flange base
 bottomExtrusion = startSketchOn(flangeBase, 'start')
-  |> circle(
+  |> circle(center = [0, 0], radius = bottomTotalDiameter / 2)
-       center = [0, 0],
-       radius = bottomTotalDiameter / 2
-     )
   |> extrude(length = bottomThickness)
 
 // Cut a hole through the entire body

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

@@ -62,7 +62,7 @@ bracketBody = bs
          getPreviousAdjacentEdge(bs.tags.edge2),
          getPreviousAdjacentEdge(bs.tags.edge3),
          getPreviousAdjacentEdge(bs.tags.edge6)
-       ]
+       ],
      )
 
 // define the tab plane
@@ -87,7 +87,7 @@ tabsR = startSketchOn(tabPlane)
          width / 2 + thk + tabWidth / 2,
          length / 2 + thk - (tabLength / (3 / 2))
        ],
-       radius = holeDiam / 2
+       radius = holeDiam / 2,
      ), %)
   |> extrude(length = -tabThk)
   |> fillet(
@@ -95,13 +95,9 @@ tabsR = startSketchOn(tabPlane)
        tags = [
          getNextAdjacentEdge(edge11),
          getNextAdjacentEdge(edge12)
-       ]
+       ],
-     )
-  |> patternLinear3d(
-       axis = [0, -1, 0],
-       instances = 2,
-       distance = length + 2 * thk - (tabLength * 4 / 3)
      )
+  |> patternLinear3d(axis = [0, -1, 0], instances = 2, distance = length + 2 * thk - (tabLength * 4 / 3))
 
 // build the tabs of the mounting bracket (left side)
 tabsL = startSketchOn(tabPlane)
@@ -115,7 +111,7 @@ tabsL = startSketchOn(tabPlane)
          -width / 2 - thk - (tabWidth / 2),
          length / 2 + thk - (tabLength / (3 / 2))
        ],
-       radius = holeDiam / 2
+       radius = holeDiam / 2,
      ), %)
   |> extrude(length = -tabThk)
   |> fillet(
@@ -123,13 +119,9 @@ tabsL = startSketchOn(tabPlane)
        tags = [
          getNextAdjacentEdge(edge21),
          getNextAdjacentEdge(edge22)
-       ]
+       ],
-     )
-  |> patternLinear3d(
-       axis = [0, -1, 0],
-       instances = 2,
-       distance = length + 2 * thk - (tabLength * 4 / 3)
      )
+  |> patternLinear3d(axis = [0, -1, 0], instances = 2, distance = length + 2 * thk - (tabLength * 4 / 3))
 
 // define a plane for retention bumps
 retPlane = {

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

@@ -44,7 +44,7 @@ fn slot(sketch1, start, end, width) {
 }
 
 // create a sketch on the "XY" plane
-sketch000 = startSketchOn('XY')
+sketch000 = startSketchOn(XY)
 
 // create a profile of the flipper
 flipperProfile = startProfileAt([-flipperLength, -32.0], sketch000)
@@ -83,11 +83,11 @@ fillet(
   tags = [
     getNextAdjacentEdge(backEdge),
     getPreviousAdjacentEdge(backEdge)
-  ]
+  ],
 )
 
 // create a sketch on the "XZ" plane offset by half the thickness
-sketch001 = startSketchOn(offsetPlane("XZ", offset = -handleWidth / 2))
+sketch001 = startSketchOn(offsetPlane(XZ, offset = -handleWidth / 2))
 
 // create a profile of the spatula handle
 handleProfile = startProfileAt([0.0, flipperThickness], sketch001)
@@ -109,7 +109,7 @@ fillet(
   tags = [
     getNextAdjacentEdge(handleBottomEdge),
     getNextAdjacentEdge(handleTopEdge)
-  ]
+  ],
 )
 
 // define a plane which is at the end of the handle

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

@@ -10,7 +10,7 @@ carafeHeight = 7.32
 handleThickness = 0.65
 
 // Upper ring of the metal structure
-sketch001 = startSketchOn('XZ')
+sketch001 = startSketchOn(XZ)
   |> startProfileAt([carafeDiameter / 2, 5.7], %)
   |> angledLine([0, 0.1], %, $rectangleSegmentA001)
   |> angledLine([
@@ -91,15 +91,12 @@ sketch002 = startSketchOn(plane001)
        center = [0, 0, 0],
        instances = 4,
        arcDegrees = 360,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 
 // Cross plate
-sketch003 = startSketchOn(offsetPlane('XY', offset = 1))
+sketch003 = startSketchOn(offsetPlane(XY, offset = 1))
-  |> circle(
+  |> circle(center = [0, 0], radius = carafeDiameter / 2 - 0.15)
-       center = [0, 0],
-       radius = carafeDiameter / 2 - 0.15
-     )
 
 extrude001 = extrude(sketch003, length = 0.050)
 
@@ -117,13 +114,13 @@ sketch004 = startSketchOn(extrude001, 'END')
        center = [0, 0],
        instances = 3,
        arcDegrees = 360,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 
 extrude002 = extrude(sketch004, length = -0.050)
 
 // Filter screen
-sketch005 = startSketchOn('XZ')
+sketch005 = startSketchOn(XZ)
   |> startProfileAt([0.15, 1.11], %)
   |> xLine(endAbsolute = carafeDiameter / 2 - 0.2)
   |> angledLineToX({
@@ -138,7 +135,7 @@ sketch005 = startSketchOn('XZ')
   |> revolve(axis = 'y')
 
 // Plunger and stem
-sketch006 = startSketchOn('XZ')
+sketch006 = startSketchOn(XZ)
   |> startProfileAt([0.1, 1], %)
   |> line(end = [0.1, 0])
   |> angledLineToX({ angle = 10, to = 0.05 }, %)
@@ -151,11 +148,8 @@ sketch006 = startSketchOn('XZ')
   |> revolve(axis = 'y')
 
 // Spiral plate
-sketch007 = startSketchOn(offsetPlane('XY', offset = 1.12))
+sketch007 = startSketchOn(offsetPlane(XY, offset = 1.12))
-  |> circle(
+  |> circle(center = [0, 0], radius = carafeDiameter / 2 - 0.24)
-       center = [0, 0],
-       radius = carafeDiameter / 2 - 0.24
-     )
   |> hole(circle(center = [0, 0], radius = .15), %)
 
 extrude003 = extrude(sketch007, length = 0.050)
@@ -167,7 +161,7 @@ sketch008 = startSketchOn(extrude003, 'END')
        center = [0, 0],
        instances = 8,
        arcDegrees = 360,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 
 extrude004 = extrude(sketch008, length = -0.050)
@@ -179,24 +173,21 @@ sketch009 = startSketchOn(extrude003, 'END')
        center = [0, 0],
        instances = 4,
        arcDegrees = 360,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 
 extrude005 = extrude(sketch009, length = -0.050)
 
 // Extrude a glass carafe body
-sketch010 = startSketchOn("XY")
+sketch010 = startSketchOn(XY)
-  |> circle(
+  |> circle(center = [0, 0], radius = carafeDiameter / 2)
-       center = [0, 0],
-       radius = carafeDiameter / 2
-     )
 
 // Perform a shell operation to hollow the carafe body with the top face removed
 extrude006 = extrude(sketch010, length = carafeHeight)
   |> shell(faces = ["end"], thickness = .07)
 
 // Draw and revolve the lid
-sketch011 = startSketchOn('XZ')
+sketch011 = startSketchOn(XZ)
   |> startProfileAt([0.2, carafeHeight - 0.7], %)
   |> xLine(length = carafeDiameter / 2 - 0.3)
   |> yLine(length = 0.7)
@@ -213,7 +204,7 @@ sketch011 = startSketchOn('XZ')
   |> revolve(axis = 'y')
 
 // Draw and extrude handle
-sketch012 = startSketchOn(offsetPlane('XZ', offset = handleThickness / 2))
+sketch012 = startSketchOn(offsetPlane(XZ, offset = handleThickness / 2))
   |> startProfileAt([2.3, 6.4], %)
   |> line(end = [0.56, 0])
   |> tangentialArcTo([4.1, 5.26], %)

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

@@ -12,7 +12,7 @@ height = 12
 minHeight = 10.875
 
 // Create the body of the rack
-rackBody = startSketchOn('XY')
+rackBody = startSketchOn(XY)
   |> startProfileAt([-length / 2, 0], %)
   |> line(end = [length, 0])
   |> line(end = [0, minHeight])
@@ -22,7 +22,7 @@ rackBody = startSketchOn('XY')
 
 // Create a function for sketch of a single tooth
 fn tooth() {
-  toothSketch = startSketchOn('XY')
+  toothSketch = startSketchOn(XY)
     |> startProfileAt([-length / 2 + 0.567672, minHeight], %)
     |> tangentialArcToRelative([0.157636, 0.110378], %)
     |> line(end = [0.329118, 0.904244])
@@ -38,14 +38,10 @@ fn tooth() {
 
 // Pattern the single tooth over the length of the rack body
 teeth = tooth()
-  |> patternLinear3d(
+  |> patternLinear3d(axis = [10, 0, 0], distance = 1.570796, instances = 63)
-       axis = [10, 0, 0],
-       distance = 1.570796,
-       instances = 63
-     )
 
 // Sketch and extrude the first end cap. This is a partial tooth
-endCapTooth = startSketchOn('XY')
+endCapTooth = startSketchOn(XY)
   |> startProfileAt([-length / 2, 11.849525], %)
   |> line(end = [0.314524, -0.864147])
   |> tangentialArcToRelative([0.157636, -0.110378], %)
@@ -54,7 +50,7 @@ endCapTooth = startSketchOn('XY')
   |> extrude(length = width)
 
 // Sketch and extrude the second end cap. This is a partial tooth
-endCapTooth2 = startSketchOn('XY')
+endCapTooth2 = startSketchOn(XY)
   |> startProfileAt([length / 2, 11.849525], %)
   |> line(end = [-0.314524, -0.864147])
   |> tangentialArcToRelative([-0.157636, -0.110378], %)

public/kcl-samples/gear/main.kcl

@@ -41,11 +41,8 @@ ys = map([0..cmo], fn (i) {
 })
 
 // Extrude the gear body
-body = startSketchOn('XY')
+body = startSketchOn(XY)
-  |> circle(
+  |> circle(center = [0, 0], radius = baseDiameter / 2)
-       center = [0, 0],
-       radius = baseDiameter / 2
-     )
   |> extrude(length = gearHeight)
 
 toothAngle = 360 / nTeeth / 1.5
@@ -63,7 +60,7 @@ fn rightInvolute(i, sg) {
 }
 
 // Draw gear teeth
-start = startSketchOn('XY')
+start = startSketchOn(XY)
   |> startProfileAt([xs[101], ys[101]], %)
 teeth = reduce([0..100], start, leftInvolute)
   |> arc({
@@ -79,7 +76,7 @@ teeth = reduce([0..100], start, leftInvolute)
        center = [0, 0, 0],
        instances = nTeeth,
        arcDegrees = 360,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 
 // Define the constants of the keyway and the bore hole

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

@@ -34,7 +34,7 @@ fn face(plane) {
 }
 
 // extrude a single side of the bin
-singleSide = extrude(face(offsetPlane("YZ", offset = cornerRadius)), length = binLength - (cornerRadius * 2), )
+singleSide = extrude(face(offsetPlane(YZ, offset = cornerRadius)), length = binLength - (cornerRadius * 2))
 
 // create the other sides of the bin by using a circular pattern
 sides = patternCircular3d(
@@ -43,7 +43,7 @@ sides = patternCircular3d(
   axis = [0, 0, 1],
   center = [binLength / 2, binLength / 2, 0],
   instances = 4,
-  rotateDuplicates = true
+  rotateDuplicates = true,
 )
 
 // define an axis axis000
@@ -55,7 +55,7 @@ axis000 = {
 }
 
 // create a single corner of the bin
-singleCorner = revolve(face(offsetPlane("YZ", offset = cornerRadius)), angle = -90, axis = axis000)
+singleCorner = revolve(face(offsetPlane(YZ, offset = cornerRadius)), angle = -90, axis = axis000)
 
 // create the corners of the bin
 corners = patternCircular3d(
@@ -64,7 +64,7 @@ corners = patternCircular3d(
   axis = [0, 0, 1],
   center = [binLength / 2, binLength / 2, 0],
   instances = 4,
-  rotateDuplicates = true
+  rotateDuplicates = true,
 )
 
 // create the baseplate by patterning sides
@@ -72,26 +72,18 @@ basePlateSides = patternLinear3d(
        sides,
        axis = [1.0, 0.0, 0.0],
        instances = countBinWidth,
-       distance = binLength
+       distance = binLength,
-     )
-  |> patternLinear3d(
-       axis = [0.0, 1.0, 0.0],
-       instances = countBinLength,
-       distance = binLength
      )
+  |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength)
 
 // create the corners of the baseplate by patterning the corners
 basePlateCorners = patternLinear3d(
        corners,
        axis = [1.0, 0.0, 0.0],
        instances = countBinWidth,
-       distance = binLength
+       distance = binLength,
-     )
-  |> patternLinear3d(
-       axis = [0.0, 1.0, 0.0],
-       instances = countBinLength,
-       distance = binLength
      )
+  |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength)
 
 // create the center cutout for the magnet profile
 fn magnetCenterCutout(plane) {
@@ -149,20 +141,17 @@ fn magnetBase(plane) {
 }
 
 // create sketch profile sketch000Profile002
-magnetsSketch = startSketchOn('XY')
+magnetsSketch = startSketchOn(XY)
-  |> circle(
+  |> circle(center = [cornerRadius * 2, cornerRadius * 2], radius = magOuterDiam / 2)
-       center = [cornerRadius * 2, cornerRadius * 2],
-       radius = magOuterDiam / 2
-     )
   |> patternCircular2d(
        center = [binLength / 2, binLength / 2],
        instances = 4,
        arcDegrees = 360,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 
 // create a profile with holes for the magnets
-magnetProfile = magnetBase("XY")
+magnetProfile = magnetBase(XY)
   |> hole(magnetsSketch, %)
 
 // create an extrusion of the magnet cutout with holes
@@ -177,11 +166,11 @@ magnetHolesExtrudeFillets = fillet(
     getPreviousAdjacentEdge(magnetHolesExtrude.sketch.tags.line001),
     getNextAdjacentEdge(magnetHolesExtrude.sketch.tags.line003),
     getPreviousAdjacentEdge(magnetHolesExtrude.sketch.tags.line003)
-  ]
+  ],
 )
 
 // create a profile without the holes for the magnets
-magnetProfileNoMagnets = magnetBase(offsetPlane("XY", offset = -magDepth))
+magnetProfileNoMagnets = magnetBase(offsetPlane(XY, offset = -magDepth))
 
 // create an extrusion of the magnet cutout without holes
 magnetCutoutExtrude = extrude(magnetProfileNoMagnets, length = -magDepth)
@@ -195,7 +184,7 @@ magnetCutoutExtrudeFillets = fillet(
     getPreviousAdjacentEdge(magnetCutoutExtrude.sketch.tags.line001),
     getNextAdjacentEdge(magnetCutoutExtrude.sketch.tags.line003),
     getPreviousAdjacentEdge(magnetCutoutExtrude.sketch.tags.line003)
-  ]
+  ],
 )
 
 // pattern the magnet cutouts with holes
@@ -203,23 +192,15 @@ patternLinear3d(
        magnetHolesExtrudeFillets,
        axis = [1.0, 0.0, 0.0],
        instances = countBinWidth,
-       distance = binLength
+       distance = binLength,
-     )
-  |> patternLinear3d(
-       axis = [0.0, 1.0, 0.0],
-       instances = countBinLength,
-       distance = binLength
      )
+  |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength)
 
 // pattern the magnet cutouts without holes
 patternLinear3d(
        magnetCutoutExtrudeFillets,
        axis = [1.0, 0.0, 0.0],
        instances = countBinWidth,
-       distance = binLength
+       distance = binLength,
-     )
-  |> patternLinear3d(
-       axis = [0.0, 1.0, 0.0],
-       instances = countBinLength,
-       distance = binLength
      )
+  |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength)

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

@@ -31,7 +31,7 @@ fn face(plane) {
 }
 
 // extrude a single side of the bin
-singleSide = extrude(face(offsetPlane("YZ", offset = cornerRadius)), length = binLength - (cornerRadius * 2))
+singleSide = extrude(face(offsetPlane(YZ, offset = cornerRadius)), length = binLength - (cornerRadius * 2))
 
 // create the other sides of the bin by using a circular pattern
 sides = patternCircular3d(
@@ -40,7 +40,7 @@ sides = patternCircular3d(
   axis = [0, 0, 1],
   center = [binLength / 2, binLength / 2, 0],
   instances = 4,
-  rotateDuplicates = true
+  rotateDuplicates = true,
 )
 
 // define an axis axis000
@@ -52,7 +52,7 @@ axis000 = {
 }
 
 // create a single corner of the bin
-singleCorner = revolve(face(offsetPlane("YZ", offset = cornerRadius)), angle = -90, axis = axis000)
+singleCorner = revolve(face(offsetPlane(YZ, offset = cornerRadius)), angle = -90, axis = axis000)
 
 // create the corners of the bin
 corners = patternCircular3d(
@@ -61,7 +61,7 @@ corners = patternCircular3d(
   axis = [0, 0, 1],
   center = [binLength / 2, binLength / 2, 0],
   instances = 4,
-  rotateDuplicates = true
+  rotateDuplicates = true,
 )
 
 // create the baseplate by patterning sides
@@ -69,23 +69,15 @@ basePlateSides = patternLinear3d(
        sides,
        axis = [1.0, 0.0, 0.0],
        instances = countBinWidth,
-       distance = binLength
+       distance = binLength,
-     )
-  |> patternLinear3d(
-       axis = [0.0, 1.0, 0.0],
-       instances = countBinLength,
-       distance = binLength
      )
+  |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength)
 
 // create the corners of the baseplate by patterning the corners
 basePlateCorners = patternLinear3d(
        corners,
        axis = [1.0, 0.0, 0.0],
        instances = countBinWidth,
-       distance = binLength
+       distance = binLength,
-     )
-  |> patternLinear3d(
-       axis = [0.0, 1.0, 0.0],
-       instances = countBinLength,
-       distance = binLength
      )
+  |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength)

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

@@ -47,7 +47,7 @@ fn face(plane) {
 }
 
 // extrude a single side of the bin
-singleSide = extrude(face(offsetPlane("YZ", offset = cornerRadius + binTol)), length = binLength - (cornerRadius * 2))
+singleSide = extrude(face(offsetPlane(YZ, offset = cornerRadius + binTol)), length = binLength - (cornerRadius * 2))
 
 // create the other sides of the bin by using a circular pattern
 sides = patternCircular3d(
@@ -60,7 +60,7 @@ sides = patternCircular3d(
     0
   ],
   instances = 4,
-  rotateDuplicates = true
+  rotateDuplicates = true,
 )
 
 // define an axis axis000
@@ -75,7 +75,7 @@ axis000 = {
 }
 
 // create a single corner of the bin
-singleCorner = revolve(face(offsetPlane("YZ", offset = cornerRadius + binTol)), angle = -90, axis = axis000)
+singleCorner = revolve(face(offsetPlane(YZ, offset = cornerRadius + binTol)), angle = -90, axis = axis000)
 
 // create the corners of the bin
 corners = patternCircular3d(
@@ -88,10 +88,10 @@ corners = patternCircular3d(
     0
   ],
   instances = 4,
-  rotateDuplicates = true
+  rotateDuplicates = true,
 )
 
-singleBinFill = startSketchOn("XY")
+singleBinFill = startSketchOn(XY)
   |> startProfileAt([
        binBaseLength + binTol,
        binBaseLength + binTol
@@ -108,7 +108,7 @@ singleBinFill = startSketchOn("XY")
          getPreviousAdjacentEdge(line000),
          getNextAdjacentEdge(line002),
          getPreviousAdjacentEdge(line002)
-       ]
+       ],
      )
 
 magCutout000 = startSketchOn(singleBinFill, "start")
@@ -117,7 +117,7 @@ magCutout000 = startSketchOn(singleBinFill, "start")
          -magOffset - binBaseLength - binTol,
          magOffset + binBaseLength + binTol
        ],
-       radius = magOuterDiam / 2
+       radius = magOuterDiam / 2,
      )
   |> patternCircular2d(
        arcDegrees = 360,
@@ -126,7 +126,7 @@ magCutout000 = startSketchOn(singleBinFill, "start")
          (binLength + 2 * binTol) / 2
        ],
        instances = 4,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
   |> extrude(length = -magDepth)
 
@@ -135,42 +135,30 @@ binSides = patternLinear3d(
        sides,
        axis = [1.0, 0.0, 0.0],
        instances = countBinWidth,
-       distance = binLength + binTol * 2
+       distance = binLength + binTol * 2,
-     )
-  |> patternLinear3d(
-       axis = [0.0, 1.0, 0.0],
-       instances = countBinLength,
-       distance = binLength + binTol * 2
      )
+  |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength + binTol * 2)
 
 // create the corners of the baseplate by patterning the corners
 binCorners = patternLinear3d(
        corners,
        axis = [1.0, 0.0, 0.0],
        instances = countBinWidth,
-       distance = binLength + binTol * 2
+       distance = binLength + binTol * 2,
-     )
-  |> patternLinear3d(
-       axis = [0.0, 1.0, 0.0],
-       instances = countBinLength,
-       distance = binLength + binTol * 2
      )
+  |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength + binTol * 2)
 
 // create the fill of the bin by patterning the corners
 binFill = patternLinear3d(
        singleBinFill,
        axis = [1.0, 0.0, 0.0],
        instances = countBinWidth,
-       distance = binLength + binTol * 2
+       distance = binLength + binTol * 2,
-     )
-  |> patternLinear3d(
-       axis = [0.0, 1.0, 0.0],
-       instances = countBinLength,
-       distance = binLength + binTol * 2
      )
+  |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength + binTol * 2)
 
 //
-binTop = startSketchOn(offsetPlane("XY", offset = height))
+binTop = startSketchOn(offsetPlane(XY, offset = height))
   |> startProfileAt([0, 0], %)
   |> xLine(length = (binLength + 2 * binTol) * countBinWidth, tag = $line010)
   |> yLine(length = (binLength + 2 * binTol) * countBinLength, tag = $line011)
@@ -184,7 +172,7 @@ binTop = startSketchOn(offsetPlane("XY", offset = height))
          getPreviousAdjacentEdge(line010),
          getNextAdjacentEdge(line012),
          getPreviousAdjacentEdge(line012)
-       ]
+       ],
      )
   |> shell(faces = ["end"], thickness = binThk)
 
@@ -265,7 +253,7 @@ lipLengths = patternCircular3d(
     0
   ],
   instances = 2,
-  rotateDuplicates = true
+  rotateDuplicates = true,
 )
 
 // create the other sides of the lips by using a circular pattern
@@ -279,7 +267,7 @@ lipWidths = patternCircular3d(
     0
   ],
   instances = 2,
-  rotateDuplicates = true
+  rotateDuplicates = true,
 )
 
 // define an axis axis000
@@ -307,7 +295,7 @@ lipCorners000 = patternCircular3d(
     0
   ],
   instances = 2,
-  rotateDuplicates = true
+  rotateDuplicates = true,
 )
 
 // create the corners of the bin
@@ -321,5 +309,5 @@ lipCorners001 = patternCircular3d(
     0
   ],
   instances = 2,
-  rotateDuplicates = true
+  rotateDuplicates = true,
 )

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

@@ -40,7 +40,7 @@ fn face(plane) {
 }
 
 // extrude a single side of the bin
-singleSide = extrude(face(offsetPlane("YZ", offset = cornerRadius + binTol)), length = binLength - (cornerRadius * 2), )
+singleSide = extrude(face(offsetPlane(YZ, offset = cornerRadius + binTol)), length = binLength - (cornerRadius * 2))
 
 // create the other sides of the bin by using a circular pattern
 sides = patternCircular3d(
@@ -53,7 +53,7 @@ sides = patternCircular3d(
     0
   ],
   instances = 4,
-  rotateDuplicates = true
+  rotateDuplicates = true,
 )
 
 // define an axis axis000
@@ -68,7 +68,7 @@ axis000 = {
 }
 
 // create a single corner of the bin
-singleCorner = revolve(face(offsetPlane("YZ", offset = cornerRadius + binTol)), angle = -90, axis = axis000)
+singleCorner = revolve(face(offsetPlane(YZ, offset = cornerRadius + binTol)), angle = -90, axis = axis000)
 
 // create the corners of the bin
 corners = patternCircular3d(
@@ -81,10 +81,10 @@ corners = patternCircular3d(
     0
   ],
   instances = 4,
-  rotateDuplicates = true
+  rotateDuplicates = true,
 )
 
-singleBinFill = startSketchOn("XY")
+singleBinFill = startSketchOn(XY)
   |> startProfileAt([
        binBaseLength + binTol,
        binBaseLength + binTol
@@ -101,7 +101,7 @@ singleBinFill = startSketchOn("XY")
          getPreviousAdjacentEdge(line000),
          getNextAdjacentEdge(line002),
          getPreviousAdjacentEdge(line002)
-       ]
+       ],
      )
 
 magCutout000 = startSketchOn(singleBinFill, "start")
@@ -110,7 +110,7 @@ magCutout000 = startSketchOn(singleBinFill, "start")
          -magOffset - binBaseLength - binTol,
          magOffset + binBaseLength + binTol
        ],
-       radius = magOuterDiam / 2
+       radius = magOuterDiam / 2,
      )
   |> patternCircular2d(
        arcDegrees = 360,
@@ -119,7 +119,7 @@ magCutout000 = startSketchOn(singleBinFill, "start")
          (binLength + 2 * binTol) / 2
        ],
        instances = 4,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
   |> extrude(length = -magDepth)
 
@@ -128,42 +128,30 @@ binSides = patternLinear3d(
        sides,
        axis = [1.0, 0.0, 0.0],
        instances = countBinWidth,
-       distance = binLength + binTol * 2
+       distance = binLength + binTol * 2,
-     )
-  |> patternLinear3d(
-       axis = [0.0, 1.0, 0.0],
-       instances = countBinLength,
-       distance = binLength + binTol * 2
      )
+  |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength + binTol * 2)
 
 // create the corners of the baseplate by patterning the corners
 binCorners = patternLinear3d(
        corners,
        axis = [1.0, 0.0, 0.0],
        instances = countBinWidth,
-       distance = binLength + binTol * 2
+       distance = binLength + binTol * 2,
-     )
-  |> patternLinear3d(
-       axis = [0.0, 1.0, 0.0],
-       instances = countBinLength,
-       distance = binLength + binTol * 2
      )
+  |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength + binTol * 2)
 
 // create the fill of the bin by patterning the corners
 binFill = patternLinear3d(
        singleBinFill,
        axis = [1.0, 0.0, 0.0],
        instances = countBinWidth,
-       distance = binLength + binTol * 2
+       distance = binLength + binTol * 2,
-     )
-  |> patternLinear3d(
-       axis = [0.0, 1.0, 0.0],
-       instances = countBinLength,
-       distance = binLength + binTol * 2
      )
+  |> patternLinear3d(axis = [0.0, 1.0, 0.0], instances = countBinLength, distance = binLength + binTol * 2)
 
 // create the top of the bin
-binTop = startSketchOn(offsetPlane("XY", offset = height))
+binTop = startSketchOn(offsetPlane(XY, offset = height))
   |> startProfileAt([0, 0], %)
   |> xLine(length = (binLength + 2 * binTol) * countBinWidth, tag = $line010)
   |> yLine(length = (binLength + 2 * binTol) * countBinLength, tag = $line011)
@@ -177,6 +165,6 @@ binTop = startSketchOn(offsetPlane("XY", offset = height))
          getPreviousAdjacentEdge(line010),
          getNextAdjacentEdge(line012),
          getPreviousAdjacentEdge(line012)
-       ]
+       ],
      )
   |> shell(faces = ["end"], thickness = binThk)

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

@@ -11,7 +11,7 @@ diameter = 0.3125
 
 // Define a function for the hex nut
 fn hexNut(start, thk, innerDia) {
-  hexNutSketch = startSketchOn('-XZ')
+  hexNutSketch = startSketchOn(-XZ)
     |> startProfileAt([start[0] + innerDia, start[1]], %)
     |> angledLine({ angle = 240, length = innerDia }, %)
     |> angledLine({ angle = 180, length = innerDia }, %)
@@ -19,10 +19,7 @@ fn hexNut(start, thk, innerDia) {
     |> angledLine({ angle = 60, length = innerDia }, %)
     |> angledLine({ angle = 0, length = innerDia * .90 }, %)
     |> close()
-    |> hole(circle(
+    |> hole(circle(center = [start[0], start[1]], radius = innerDia / 2), %)
-         center = [start[0], start[1]],
-         radius = innerDia / 2
-       ), %)
     |> extrude(length = thk)
   return hexNutSketch
 }

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

@@ -1,21 +1,24 @@
 // I-beam
-// A structural metal beam with an I shaped cross section. Often used in construction
+// A structural metal beam with an I shaped cross section. Often used in construction and architecture
 
 // Set Units
 @settings(defaultLengthUnit = in)
 
 // Define Beam Dimensions
-beamLength = 24
+beamLength = 6*ft()
-beamWidth = 2.663
 beamHeight = 4
-wallThickness = 0.293
+flangeWidth = 2.663
+flangeThickness = 0.293
+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
-sketch001 = startSketchOn('-XZ')
+sketch001 = startSketchOn(-XZ)
   |> startProfileAt([0, beamHeight / 2], %)
-  |> xLine(length = beamWidth/2)
+  |> xLine(length = flangeWidth / 2)
-  |> yLine(length = -wallThickness)
+  |> yLine(length = -flangeThickness)
-  |> xLine(endAbsolute = wallThickness/2)
+  |> xLine(endAbsolute = webThickness / 2 + rootRadius)
+  |> tangentialArc({ radius = rootRadius, offset = 90 }, %)
   |> yLine(endAbsolute = 0)
   |> mirror2d({ axis = 'X' }, %)
   |> mirror2d({ axis = 'Y' }, %)

public/kcl-samples/keyboard/main.kcl

@@ -19,7 +19,7 @@ row5 = row4 + keyHeight + spacing
 row6 = row5 + keyHeight + spacing
 
 // Sketch the side profile of the keyboard base and extrude to total width
-sketch001 = startSketchOn('YZ')
+sketch001 = startSketchOn(YZ)
   |> startProfileAt([0, 0], %)
   |> line(end = [-0.14, 0.68], tag = $seg01)
   |> angledLine([7, row6 + 3 * spacing + keyHeight], %, $seg02)

public/kcl-samples/kitt/main.kcl

@@ -20,7 +20,7 @@ kitBodyWidth = 26
 kitBodyHeight = 25
 kitBodyDepth = 18
 
-kitBody = startSketchOn('XZ')
+kitBody = startSketchOn(XZ)
   |> startProfileAt([-kitBodyWidth / 2, kitBodyElevation], %)
   |> line(end = [0, kitBodyHeight])
   |> line(end = [kitBodyWidth, 0], tag = $seg01)
@@ -159,7 +159,7 @@ kitShoeHeight = 3
 fn kitLeg(offsetFront, offsetSide) {
   kitShoeOffsetFront = kitShoeLength / 2 - (kitBodyDepth / 2) - offsetFront
 
-  kitFootPrint = startSketchOn('XY')
+  kitFootPrint = startSketchOn(XY)
     |> startProfileAt([offsetSide, kitShoeOffsetFront], %)
     |> line(end = [kitShoeWidth, 0])
     |> line(end = [0, -kitShoeLength])

public/kcl-samples/lego/main.kcl

@@ -26,7 +26,7 @@ assertGreaterThan(lbumps, 1, "lbumps must be greater than 1")
 assertGreaterThan(wbumps, 1, "wbumps must be greater than 1")
 
 // Make the base
-base = startSketchOn('XY')
+base = startSketchOn(XY)
   |> startProfileAt([-totalWidth / 2, -totalLength / 2], %)
   |> line(end = [totalWidth, 0])
   |> line(end = [0, totalLength])
@@ -53,18 +53,10 @@ peg = startSketchOn(base, 'end')
          -(pitch * (wbumps - 1) / 2),
          -(pitch * (lbumps - 1) / 2)
        ],
-       radius = bumpDiam / 2
+       radius = bumpDiam / 2,
-     )
-  |> patternLinear2d(
-       axis = [1, 0],
-       instances = wbumps,
-       distance = pitch
-     )
-  |> patternLinear2d(
-       axis = [0, 1],
-       instances = lbumps,
-       distance = pitch
      )
+  |> patternLinear2d(axis = [1, 0], instances = wbumps, distance = pitch)
+  |> patternLinear2d(axis = [0, 1], instances = lbumps, distance = pitch)
   |> extrude(length = bumpHeight)
 
 // Create the pegs on the bottom of the base
@@ -74,16 +66,8 @@ tubePattern = startSketchOn(shellExtrude, 'start')
          -(pitch * (wbumps - 1) / 2 - (pitch / 2)),
          -(pitch * (lbumps - 1) / 2 - (pitch / 2))
        ],
-       radius = bumpDiam / 2
+       radius = bumpDiam / 2,
-     )
-  |> patternLinear2d(
-       axis = [1, 0],
-       instances = wbumps - 1,
-       distance = pitch
-     )
-  |> patternLinear2d(
-       axis = [0, 1],
-       instances = lbumps - 1,
-       distance = pitch
      )
+  |> patternLinear2d(axis = [1, 0], instances = wbumps - 1, distance = pitch)
+  |> patternLinear2d(axis = [0, 1], instances = lbumps - 1, distance = pitch)
   |> extrude(length = bumpHeight)

public/kcl-samples/manifest.json

@@ -158,7 +158,7 @@
     "pathFromProjectDirectoryToFirstFile": "i-beam/main.kcl",
     "multipleFiles": false,
     "title": "I-beam",
-    "description": "A structural metal beam with an I shaped cross section. Often used in construction"
+    "description": "A structural metal beam with an I shaped cross section. Often used in construction and architecture"
   },
   {
     "file": "main.kcl",

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

@@ -13,7 +13,7 @@ centerHoleDiameter = 2
 
 // Create a function that defines the body width and length of the mounting plate. Tag the corners so they can be passed through the fillet function.
 fn rectShape(pos, w, l) {
-  rr = startSketchOn('XY')
+  rr = startSketchOn(XY)
     |> startProfileAt([pos[0] - (w / 2), pos[1] - (l / 2)], %)
     |> line(endAbsolute = [pos[0] + w / 2, pos[1] - (l / 2)], tag = $edge1)
     |> line(endAbsolute = [pos[0] + w / 2, pos[1] + l / 2], tag = $edge2)
@@ -34,33 +34,30 @@ part = rs
          -plateWidth / 2 + holeIndex,
          plateLength / 2 - holeIndex
        ],
-       radius = holeRadius
+       radius = holeRadius,
      ), %)
   |> hole(circle(
        center = [
          plateWidth / 2 - holeIndex,
          plateLength / 2 - holeIndex
        ],
-       radius = holeRadius
+       radius = holeRadius,
      ), %)
   |> hole(circle(
        center = [
          -plateWidth / 2 + holeIndex,
          -plateLength / 2 + holeIndex
        ],
-       radius = holeRadius
+       radius = holeRadius,
      ), %)
   |> hole(circle(
        center = [
          plateWidth / 2 - holeIndex,
          -plateLength / 2 + holeIndex
        ],
-       radius = holeRadius
+       radius = holeRadius,
-     ), %)
-  |> hole(circle(
-       center = [0, 0],
-       radius = centerHoleDiameter
      ), %)
+  |> hole(circle(center = [0, 0], radius = centerHoleDiameter), %)
   |> extrude(length = plateThickness)
   |> fillet(
        radius = filletRadius,
@@ -69,5 +66,5 @@ part = rs
          getPreviousAdjacentEdge(rs.tags.edge2),
          getPreviousAdjacentEdge(rs.tags.edge3),
          getPreviousAdjacentEdge(rs.tags.edge4)
-       ]
+       ],
      )

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

@@ -4,10 +4,10 @@
 // Set Units
 @settings(defaultLengthUnit = in)
 
-import 'robot-arm-base.kcl' as robotArmBase
+import "robot-arm-base.kcl" as robotArmBase
-import 'robot-rotating-base.kcl' as rotatingBase
+import "robot-rotating-base.kcl" as rotatingBase
-import 'robot-arm-j2.kcl' as j2RobotArm
+import "robot-arm-j2.kcl" as j2RobotArm
-import 'robot-arm-j3.kcl' as j3RobotArm
+import "robot-arm-j3.kcl" as j3RobotArm
 
 robotArmBase
 rotatingBase

public/kcl-samples/multi-axis-robot/robot-arm-base.kcl

@@ -1,15 +1,13 @@
 // Robot Arm Base
 
-
 // Set Units
 @settings(defaultLengthUnit = in)
 
-
 // Import Constants
 import basePlateRadius, basePlateThickness, baseChamfer, baseHeight from "globals.kcl"
 
 // Base Plate
-sketch001 = startSketchOn('XY')
+sketch001 = startSketchOn(XY)
   |> startProfileAt([-basePlateRadius, -basePlateRadius], %)
   |> angledLine([0, 2 * basePlateRadius], %, $rectangleSegmentA001)
   |> angledLine([
@@ -30,17 +28,14 @@ extrude001 = extrude(sketch001, length = basePlateThickness)
          getNextAdjacentEdge(rectangleSegmentB001),
          getNextAdjacentEdge(rectangleSegmentC001),
          getNextAdjacentEdge(rectangleSegmentD001)
-       ]
+       ],
      )
 
 // Base Motor for actuating first joint
 sketch002 = startSketchOn(extrude001, 'END')
   |> circle(center = [0, 0], radius = 4, tag = $referenceEdge)
 extrude002 = extrude(sketch002, length = baseHeight - basePlateThickness - 1.5)
-  |> fillet(
+  |> fillet(radius = 0.1, tags = [getOppositeEdge(referenceEdge)])
-       radius = 0.1,
-       tags = [getOppositeEdge(referenceEdge)]
-     )
 sketch003 = startSketchOn(extrude002, 'END')
   |> circle(center = [0, 0], radius = 0.5)
 extrude003 = extrude(sketch003, length = 1)
@@ -52,13 +47,13 @@ sketch4A = startSketchOn(extrude001, 'END')
          -basePlateRadius + 1,
          -basePlateRadius + baseChamfer + 0.5
        ],
-       radius = 0.4
+       radius = 0.4,
      )
   |> patternCircular2d(
        arcDegrees = 360,
        center = [0, 0],
        instances = 4,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 
 extrude4A = extrude(sketch4A, length = -basePlateThickness)
@@ -69,13 +64,13 @@ sketch4B = startSketchOn(extrude001, 'END')
          -basePlateRadius + 0.5 + baseChamfer,
          -basePlateRadius + 1
        ],
-       radius = 0.4
+       radius = 0.4,
      )
   |> patternCircular2d(
        arcDegrees = 360,
        center = [0, 0],
        instances = 4,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 
 extrude(sketch4B, length = -basePlateThickness)

public/kcl-samples/multi-axis-robot/robot-arm-j2.kcl

@@ -1,10 +1,8 @@
 // J2 Axis for Robot Arm
 
-
 // Set Units
 @settings(defaultLengthUnit = in)
 
-
 import axisJ1, axisJ2, axisJ2ArmWidth, axisJ2ArmLength, axisJ2ArmThickness, plane003 from "globals.kcl"
 
 // Create Body of J2 Robot Arm
@@ -35,10 +33,7 @@ sketch012 = startSketchOn(extrude011, 'START')
   |> circle(center = [-1.75, 8], radius = 1.9, tag = $referenceEdge4)
 
 extrude012 = extrude(sketch012, length = 0.15)
-  |> fillet(
+  |> fillet(radius = 0.1, tags = [getOppositeEdge(referenceEdge4)])
-       radius = 0.1,
-       tags = [getOppositeEdge(referenceEdge4)]
-     )
 sketch013 = startSketchOn(extrude011, 'START')
   |> circle(
        center = [
@@ -46,13 +41,11 @@ sketch013 = startSketchOn(extrude011, 'START')
          8 + axisJ2ArmLength * sin(toRadians(axisJ2))
        ],
        radius = 1.9,
-     tag = $referenceEdge5)
+       tag = $referenceEdge5,
+     )
 
 extrude013 = extrude(sketch013, length = 1)
-  |> fillet(
+  |> fillet(radius = 0.1, tags = [getOppositeEdge(referenceEdge5)])
-       radius = 0.1,
-       tags = [getOppositeEdge(referenceEdge5)]
-     )
 
 // Draw Bolt Patterns on J2 Robot Arm
 sketch014 = startSketchOn(extrude012, 'END')
@@ -61,7 +54,7 @@ sketch014 = startSketchOn(extrude012, 'END')
        center = [-1.75, 8],
        instances = 8,
        arcDegrees = 360,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 
 extrude014 = extrude(sketch014, length = 0.15)
@@ -72,7 +65,7 @@ sketch015 = startSketchOn(extrude013, 'END')
          -1.75 - ((axisJ2ArmLength - 1) * cos(toRadians(axisJ2))),
          8 + (axisJ2ArmLength - 1.5) * sin(toRadians(axisJ2))
        ],
-       radius = 0.2
+       radius = 0.2,
      )
   |> patternCircular2d(
        center = [
@@ -81,7 +74,7 @@ sketch015 = startSketchOn(extrude013, 'END')
        ],
        instances = 4,
        arcDegrees = 360,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 
 extrude015 = extrude(sketch015, length = 0.15)
@@ -92,7 +85,7 @@ sketch016 = startSketchOn(extrude011, 'END')
          1.75 + axisJ2ArmLength * cos(toRadians(axisJ2)),
          8 + axisJ2ArmLength * sin(toRadians(axisJ2))
        ],
-       radius = 0.3
+       radius = 0.3,
      )
 
 extrude(sketch016, length = 1)

public/kcl-samples/multi-axis-robot/robot-arm-j3.kcl

@@ -1,10 +1,8 @@
 // J3 Robot Arm
 
-
 // Set Units
 @settings(defaultLengthUnit = in)
 
-
 import plane002, axisJ2, axisJ3C, axisJ4, axisJ2ArmLength, axisJ3CArmLength, axisJ3CArmWidth, axisJ3CArmThickness from "globals.kcl"
 
 // Create Body of J3 Robot Arm
@@ -38,13 +36,11 @@ sketch018 = startSketchOn(extrude017, 'END')
          8 + axisJ2ArmLength * sin(toRadians(axisJ2))
        ],
        radius = 3.7 / 2,
-     tag = $referenceEdge6)
+       tag = $referenceEdge6,
+     )
 
 extrude018 = extrude(sketch018, length = 0.15)
-  |> fillet(
+  |> fillet(radius = 0.1, tags = [getOppositeEdge(referenceEdge6)])
-       radius = 0.1,
-       tags = [getOppositeEdge(referenceEdge6)]
-     )
 
 // Draw Bolt Pattern on J3 Robot Arm
 sketch019 = startSketchOn(extrude018, 'END')
@@ -53,7 +49,7 @@ sketch019 = startSketchOn(extrude018, 'END')
          1.75 + (axisJ2ArmLength - 1) * cos(toRadians(axisJ2)),
          8 + (axisJ2ArmLength - 1.5) * sin(toRadians(axisJ2))
        ],
-       radius = 0.2
+       radius = 0.2,
      )
   |> patternCircular2d(
        center = [
@@ -62,7 +58,7 @@ sketch019 = startSketchOn(extrude018, 'END')
        ],
        instances = 8,
        arcDegrees = 360,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 
 extrude019 = extrude(sketch019, length = 0.15)
@@ -74,7 +70,7 @@ sketch020 = startSketchOn(extrude017, 'START')
          -1.75 - (axisJ2ArmLength * cos(toRadians(axisJ2))) - (axisJ3CArmLength * cos(toRadians(axisJ3C))),
          8 + axisJ2ArmLength * sin(toRadians(axisJ2)) + axisJ3CArmLength * sin(toRadians(axisJ3C))
        ],
-       radius = axisJ3CArmWidth / 2
+       radius = axisJ3CArmWidth / 2,
      )
 extrude020 = extrude(sketch020, length = -0.5)
 
@@ -84,7 +80,7 @@ sketch021 = startSketchOn(extrude017, 'END')
          1.75 + axisJ2ArmLength * cos(toRadians(axisJ2)) + axisJ3CArmLength * cos(toRadians(axisJ3C)),
          8 + axisJ2ArmLength * sin(toRadians(axisJ2)) + axisJ3CArmLength * sin(toRadians(axisJ3C))
        ],
-       radius = axisJ3CArmWidth / 2.01
+       radius = axisJ3CArmWidth / 2.01,
      )
 
 extrude021 = extrude(sketch021, length = -0.5)

public/kcl-samples/multi-axis-robot/robot-rotating-base.kcl

@@ -1,20 +1,15 @@
 // Robot Rotating Base
 
-
 // Set Units
 @settings(defaultLengthUnit = in)
 
-
 import axisJ1, baseHeight, plane001, plane002 from "globals.kcl"
 
 // Create Rotating Base
 sketch005 = startSketchOn(plane001)
   |> circle(center = [0, 0], radius = 3.9, tag = $referenceEdge1)
 extrude005 = extrude(sketch005, length = 1.5 - 0.1)
-  |> fillet(
+  |> fillet(radius = 0.1, tags = [getOppositeEdge(referenceEdge1)])
-       radius = 0.1,
-       tags = [getOppositeEdge(referenceEdge1)]
-     )
   |> appearance(color = "#4f7d54", metalness = 90, roughness = 90)
 
 sketch006 = startSketchOn(plane002)
@@ -38,12 +33,10 @@ sketch007 = startSketchOn(extrude006, 'END')
          8
        ],
        radius = 2.75,
-       tag = $referenceEdge2)
+       tag = $referenceEdge2,
-extrude007 = extrude(sketch007, length = 1.5)
-  |> fillet(
-       radius = 0.1,
-       tags = [getOppositeEdge(referenceEdge2)]
      )
+extrude007 = extrude(sketch007, length = 1.5)
+  |> fillet(radius = 0.1, tags = [getOppositeEdge(referenceEdge2)])
 
 // Draw Bolt Pattern on Rotating Base
 sketch008 = startSketchOn(extrude007, 'END')
@@ -52,7 +45,7 @@ sketch008 = startSketchOn(extrude007, 'END')
          1.75 * cos(toRadians(axisJ1)) / abs(cos(toRadians(axisJ1))),
          6.75
        ],
-       radius = 0.2
+       radius = 0.2,
      )
   |> patternCircular2d(
        center = [
@@ -61,7 +54,7 @@ sketch008 = startSketchOn(extrude007, 'END')
        ],
        instances = 4,
        arcDegrees = 360,
-       rotateDuplicates = true
+       rotateDuplicates = true,
      )
 extrude008 = extrude(sketch008, length = 0.2)
 
@@ -72,12 +65,10 @@ sketch009 = startSketchOn(extrude007, 'END')
          8
        ],
        radius = 0.5,
-     tag = $referenceEdge3)
+       tag = $referenceEdge3,
-extrude009 = extrude(sketch009, length = 0.15)
-  |> fillet(
-       radius = 0.1,
-       tags = [getOppositeEdge(referenceEdge3)]
      )
+extrude009 = extrude(sketch009, length = 0.15)
+  |> fillet(radius = 0.1, tags = [getOppositeEdge(referenceEdge3)])
   |> appearance(color = "#4f7d54", metalness = 90, roughness = 90)
 
 sketch010 = startSketchOn(plane002)

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

@@ -1,16 +1,16 @@
-// 1120t74 Pipe
+// Pipe
-
+// piping for the pipe flange assembly
-// import constants
-import pipeInnerDiameter, pipeOuterDiameter, pipeLength from "globals.kcl"
 
 // set units
 @settings(defaultLengthUnit = in)
 
+// import constants
+import pipeInnerDiameter, pipeOuterDiameter, pipeLength from "globals.kcl"
+
 // create a function to make the pipe
 export fn pipe() {
-
   // create the pipe base
-  pipeBase = startSketchOn('XZ')
+  pipeBase = startSketchOn(XZ)
     |> circle(%, center = [0, 0], radius = pipeOuterDiameter / 2)
     |> extrude(%, length = pipeLength)