Fix kcl singleton

.github/workflows/cargo-bench.yml

@@ -26,12 +26,8 @@ name: cargo bench
 jobs:
   cargo-bench:
     name: cargo bench
-    runs-on:
-      - runs-on=${{ github.run_id }}
-      - runner=32cpu-linux-x64
-      - extras=s3-cache
+    runs-on: codspeed-macro
     steps:
-      - uses: runs-on/action@v1
       - uses: actions/checkout@v4
       - name: Use correct Rust toolchain
         shell: bash

.gitignore

@@ -53,14 +53,13 @@ e2e/playwright/export-snapshots/*
 
 /public/kcl-samples.zip
 /public/kcl-samples/.github
-/public/kcl-samples/screenshots/main.kcl
-/public/kcl-samples/step/main.kcl
 /test-results/
 /playwright-report/
 /blob-report/
 /playwright/.cache/
 /src/lang/std/artifactMapCache
 
+
 ## generated files
 src/**/*.typegen.ts
 

docs/kcl/std.json

@@ -248838,7 +248838,7 @@
     "keywordArguments": true,
     "args": [
       {
-        "name": "solidSet",
+        "name": "solid",
         "type": "SolidOrImportedGeometry",
         "schema": {
           "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
@@ -248948,26 +248948,6 @@
                   }
                 }
               }
-            },
-            {
-              "type": [
-                "object",
-                "array"
-              ],
-              "items": {
-                "$ref": "#/components/schemas/Solid"
-              },
-              "required": [
-                "type"
-              ],
-              "properties": {
-                "type": {
-                  "type": "string",
-                  "enum": [
-                    "solidSet"
-                  ]
-                }
-              }
             }
           ],
           "definitions": {
@@ -250510,7 +250490,7 @@
         },
         "required": true,
         "includeInSnippet": true,
-        "description": "The solid or set of solids to rotate.",
+        "description": "The solid to rotate.",
         "labelRequired": false
       },
       {
@@ -259938,26 +259918,6 @@
                 }
               }
             }
-          },
-          {
-            "type": [
-              "object",
-              "array"
-            ],
-            "items": {
-              "$ref": "#/components/schemas/Solid"
-            },
-            "required": [
-              "type"
-            ],
-            "properties": {
-              "type": {
-                "type": "string",
-                "enum": [
-                  "solidSet"
-                ]
-              }
-            }
           }
         ],
         "definitions": {
@@ -261507,8 +261467,7 @@
     "examples": [
       "// Rotate a pipe with roll, pitch, and yaw.\n\n\n// Create a path for the sweep.\nsweepPath = startSketchOn('XZ')\n  |> startProfileAt([0.05, 0.05], %)\n  |> line(end = [0, 7])\n  |> tangentialArc({ offset = 90, radius = 5 }, %)\n  |> line(end = [-3, 0])\n  |> tangentialArc({ offset = -90, radius = 5 }, %)\n  |> line(end = [0, 7])\n\n// Create a hole for the pipe.\npipeHole = startSketchOn('XY')\n  |> circle(center = [0, 0], radius = 1.5)\n\nsweepSketch = startSketchOn('XY')\n  |> circle(center = [0, 0], radius = 2)\n  |> hole(pipeHole, %)\n  |> sweep(path = sweepPath)\n  |> rotate(roll = 10, pitch = 10, yaw = 90)",
       "// Rotate a pipe about an axis with an angle.\n\n\n// Create a path for the sweep.\nsweepPath = startSketchOn('XZ')\n  |> startProfileAt([0.05, 0.05], %)\n  |> line(end = [0, 7])\n  |> tangentialArc({ offset = 90, radius = 5 }, %)\n  |> line(end = [-3, 0])\n  |> tangentialArc({ offset = -90, radius = 5 }, %)\n  |> line(end = [0, 7])\n\n// Create a hole for the pipe.\npipeHole = startSketchOn('XY')\n  |> circle(center = [0, 0], radius = 1.5)\n\nsweepSketch = startSketchOn('XY')\n  |> circle(center = [0, 0], radius = 2)\n  |> hole(pipeHole, %)\n  |> sweep(path = sweepPath)\n  |> rotate(axis = [0, 0, 1.0], angle = 90)",
-      "// Rotate an imported model.\n\n\nimport \"tests/inputs/cube.sldprt\" as cube\n\ncube\n  |> rotate(axis = [0, 0, 1.0], angle = 90)",
-      "// Sweep two sketches along the same path.\n\n\nsketch001 = startSketchOn('XY')\nrectangleSketch = startProfileAt([-200, 23.86], sketch001)\n  |> angledLine([0, 73.47], %, $rectangleSegmentA001)\n  |> angledLine([\n       segAng(rectangleSegmentA001) - 90,\n       50.61\n     ], %)\n  |> angledLine([\n       segAng(rectangleSegmentA001),\n       -segLen(rectangleSegmentA001)\n     ], %)\n  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n  |> close()\n\ncircleSketch = circle(sketch001, center = [200, -30.29], radius = 32.63)\n\nsketch002 = startSketchOn('YZ')\nsweepPath = startProfileAt([0, 0], sketch002)\n  |> yLine(length = 231.81)\n  |> tangentialArc({ radius = 80, offset = -90 }, %)\n  |> xLine(length = 384.93)\n\nparts = sweep([rectangleSketch, circleSketch], path = sweepPath)\n\n// Rotate the sweeps.\nrotate(parts, axis = [0, 0, 1.0], angle = 90)"
+      "// Rotate an imported model.\n\n\nimport \"tests/inputs/cube.sldprt\" as cube\n\ncube\n  |> rotate(axis = [0, 0, 1.0], angle = 90)"
     ]
   },
   {
@@ -261561,7 +261520,7 @@
     "keywordArguments": true,
     "args": [
       {
-        "name": "solidSet",
+        "name": "solid",
         "type": "SolidOrImportedGeometry",
         "schema": {
           "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
@@ -261671,26 +261630,6 @@
                   }
                 }
               }
-            },
-            {
-              "type": [
-                "object",
-                "array"
-              ],
-              "items": {
-                "$ref": "#/components/schemas/Solid"
-              },
-              "required": [
-                "type"
-              ],
-              "properties": {
-                "type": {
-                  "type": "string",
-                  "enum": [
-                    "solidSet"
-                  ]
-                }
-              }
             }
           ],
           "definitions": {
@@ -263233,7 +263172,7 @@
         },
         "required": true,
         "includeInSnippet": true,
-        "description": "The solid or set of solids to scale.",
+        "description": "The solid to scale.",
         "labelRequired": false
       },
       {
@@ -266454,26 +266393,6 @@
                 }
               }
             }
-          },
-          {
-            "type": [
-              "object",
-              "array"
-            ],
-            "items": {
-              "$ref": "#/components/schemas/Solid"
-            },
-            "required": [
-              "type"
-            ],
-            "properties": {
-              "type": {
-                "type": "string",
-                "enum": [
-                  "solidSet"
-                ]
-              }
-            }
           }
         ],
         "definitions": {
@@ -268022,8 +267941,7 @@
     "deprecated": false,
     "examples": [
       "// Scale a pipe.\n\n\n// Create a path for the sweep.\nsweepPath = startSketchOn('XZ')\n  |> startProfileAt([0.05, 0.05], %)\n  |> line(end = [0, 7])\n  |> tangentialArc({ offset = 90, radius = 5 }, %)\n  |> line(end = [-3, 0])\n  |> tangentialArc({ offset = -90, radius = 5 }, %)\n  |> line(end = [0, 7])\n\n// Create a hole for the pipe.\npipeHole = startSketchOn('XY')\n  |> circle(center = [0, 0], radius = 1.5)\n\nsweepSketch = startSketchOn('XY')\n  |> circle(center = [0, 0], radius = 2)\n  |> hole(pipeHole, %)\n  |> sweep(path = sweepPath)\n  |> scale(scale = [1.0, 1.0, 2.5])",
-      "// Scale an imported model.\n\n\nimport \"tests/inputs/cube.sldprt\" as cube\n\ncube\n  |> scale(scale = [1.0, 1.0, 2.5])",
-      "// Sweep two sketches along the same path.\n\n\nsketch001 = startSketchOn('XY')\nrectangleSketch = startProfileAt([-200, 23.86], sketch001)\n  |> angledLine([0, 73.47], %, $rectangleSegmentA001)\n  |> angledLine([\n       segAng(rectangleSegmentA001) - 90,\n       50.61\n     ], %)\n  |> angledLine([\n       segAng(rectangleSegmentA001),\n       -segLen(rectangleSegmentA001)\n     ], %)\n  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n  |> close()\n\ncircleSketch = circle(sketch001, center = [200, -30.29], radius = 32.63)\n\nsketch002 = startSketchOn('YZ')\nsweepPath = startProfileAt([0, 0], sketch002)\n  |> yLine(length = 231.81)\n  |> tangentialArc({ radius = 80, offset = -90 }, %)\n  |> xLine(length = 384.93)\n\nparts = sweep([rectangleSketch, circleSketch], path = sweepPath)\n\n// Scale the sweep.\nscale(parts, scale = [1.0, 1.0, 0.5])"
+      "// Scale an imported model.\n\n\nimport \"tests/inputs/cube.sldprt\" as cube\n\ncube\n  |> scale(scale = [1.0, 1.0, 2.5])"
     ]
   },
   {
@@ -317161,7 +317079,7 @@
     "keywordArguments": true,
     "args": [
       {
-        "name": "solidSet",
+        "name": "solid",
         "type": "SolidOrImportedGeometry",
         "schema": {
           "$schema": "https://spec.openapis.org/oas/3.0/schema/2019-04-02#/definitions/Schema",
@@ -317271,26 +317189,6 @@
                   }
                 }
               }
-            },
-            {
-              "type": [
-                "object",
-                "array"
-              ],
-              "items": {
-                "$ref": "#/components/schemas/Solid"
-              },
-              "required": [
-                "type"
-              ],
-              "properties": {
-                "type": {
-                  "type": "string",
-                  "enum": [
-                    "solidSet"
-                  ]
-                }
-              }
             }
           ],
           "definitions": {
@@ -318833,7 +318731,7 @@
         },
         "required": true,
         "includeInSnippet": true,
-        "description": "The solid or set of solids to move.",
+        "description": "The solid to move.",
         "labelRequired": false
       },
       {
@@ -322054,26 +321952,6 @@
                 }
               }
             }
-          },
-          {
-            "type": [
-              "object",
-              "array"
-            ],
-            "items": {
-              "$ref": "#/components/schemas/Solid"
-            },
-            "required": [
-              "type"
-            ],
-            "properties": {
-              "type": {
-                "type": "string",
-                "enum": [
-                  "solidSet"
-                ]
-              }
-            }
           }
         ],
         "definitions": {
@@ -323622,8 +323500,7 @@
     "deprecated": false,
     "examples": [
       "// Move a pipe.\n\n\n// Create a path for the sweep.\nsweepPath = startSketchOn('XZ')\n  |> startProfileAt([0.05, 0.05], %)\n  |> line(end = [0, 7])\n  |> tangentialArc({ offset = 90, radius = 5 }, %)\n  |> line(end = [-3, 0])\n  |> tangentialArc({ offset = -90, radius = 5 }, %)\n  |> line(end = [0, 7])\n\n// Create a hole for the pipe.\npipeHole = startSketchOn('XY')\n  |> circle(center = [0, 0], radius = 1.5)\n\nsweepSketch = startSketchOn('XY')\n  |> circle(center = [0, 0], radius = 2)\n  |> hole(pipeHole, %)\n  |> sweep(path = sweepPath)\n  |> translate(translate = [1.0, 1.0, 2.5])",
-      "// Move an imported model.\n\n\nimport \"tests/inputs/cube.sldprt\" as cube\n\ncube\n  |> translate(translate = [1.0, 1.0, 2.5])",
-      "// Sweep two sketches along the same path.\n\n\nsketch001 = startSketchOn('XY')\nrectangleSketch = startProfileAt([-200, 23.86], sketch001)\n  |> angledLine([0, 73.47], %, $rectangleSegmentA001)\n  |> angledLine([\n       segAng(rectangleSegmentA001) - 90,\n       50.61\n     ], %)\n  |> angledLine([\n       segAng(rectangleSegmentA001),\n       -segLen(rectangleSegmentA001)\n     ], %)\n  |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n  |> close()\n\ncircleSketch = circle(sketch001, center = [200, -30.29], radius = 32.63)\n\nsketch002 = startSketchOn('YZ')\nsweepPath = startProfileAt([0, 0], sketch002)\n  |> yLine(length = 231.81)\n  |> tangentialArc({ radius = 80, offset = -90 }, %)\n  |> xLine(length = 384.93)\n\nparts = sweep([rectangleSketch, circleSketch], path = sweepPath)\n\n// Move the sweeps.\ntranslate(parts, translate = [1.0, 1.0, 2.5])"
+      "// Move an imported model.\n\n\nimport \"tests/inputs/cube.sldprt\" as cube\n\ncube\n  |> translate(translate = [1.0, 1.0, 2.5])"
     ]
   },
   {

docs/kcl/types/SolidOrImportedGeometry.md

@@ -55,21 +55,6 @@ Data for an imported geometry.
 
 ----
 
-**Type:** `[object, array]`
-
-`[` [`Solid`](/docs/kcl/types/Solid) `]`
-
-
-
-## Properties
-
-| Property | Type | Description | Required |
-|----------|------|-------------|----------|
-| `type` |enum: `solidSet`|  | No |
-
-
-----
-
 
 
 

e2e/playwright/desktop-export.spec.ts

@@ -185,7 +185,7 @@ test(
             },
             { timeout: 15_000 }
           )
-          .toBeGreaterThan(70_000)
+          .toBeGreaterThan(100_000)
       })
     })
   }

e2e/playwright/fixtures/fixtureSetup.ts

@@ -90,9 +90,8 @@ export class ElectronZoo {
 
   constructor() {}
 
-  // Help remote end by signaling we're done with the connection.
-  // If it takes longer than 10s to stop, just resolve.
   async makeAvailableAgain() {
+    // Help remote end by signaling we're done with the connection.
     await this.page.evaluate(async () => {
       return new Promise((resolve) => {
         if (!window.engineCommandManager.engineConnection?.state?.type) {
@@ -100,9 +99,7 @@ export class ElectronZoo {
         }
 
         window.engineCommandManager.tearDown()
-
         // Keep polling (per js event tick) until state is Disconnected.
-        const timeA = Date.now()
         const checkDisconnected = () => {
           // It's possible we never even created an engineConnection
           // e.g. never left Projects view.
@@ -112,11 +109,6 @@ export class ElectronZoo {
           ) {
             return resolve(undefined)
           }
-
-          if (Date.now() - timeA > 10000) {
-            return resolve(undefined)
-          }
-
           setTimeout(checkDisconnected, 0)
         }
         checkDisconnected()
@@ -138,7 +130,6 @@ export class ElectronZoo {
     const that = this
 
     const options = {
-      timeout: 120000,
       args: ['.', '--no-sandbox'],
       env: {
         ...process.env,
@@ -164,28 +155,8 @@ export class ElectronZoo {
     // Do this once and then reuse window on subsequent calls.
     if (!this.electron) {
       this.electron = await electron.launch(options)
-
-      // Mac takes quite a long time to create the first window in CI.
-      // Turns out we can't trust firstWindow() either. So loop.
-      let timeoutId: ReturnType<typeof setTimeout>
-      const tryToGetWindowPage = () =>
-        new Promise((resolve) => {
-          const fn = () => {
-            this.page = this.electron.windows()[0]
-            timeoutId = setTimeout(() => {
-              if (this.page) {
-                clearTimeout(timeoutId)
-                return resolve(undefined)
-              }
-              fn()
-            }, 0)
-          }
-          fn()
-        })
-
-      await tryToGetWindowPage()
-
       this.context = this.electron.context()
+      this.page = await this.electron.firstWindow()
       await this.context.tracing.start({ screenshots: true, snapshots: true })
     }
 
@@ -333,13 +304,16 @@ const fixturesForElectron = {
     use: FnUse,
     testInfo: TestInfo
   ) => {
+    await tronApp.createInstanceIfMissing(testInfo)
     await use(tronApp.page)
+    await tronApp?.makeAvailableAgain()
   },
   context: async (
     { tronApp }: { tronApp: ElectronZoo },
     use: FnUse,
     testInfo: TestInfo
   ) => {
+    await tronApp.createInstanceIfMissing(testInfo)
     await use(tronApp.context)
   },
 }

e2e/playwright/point-click.spec.ts

@@ -1408,7 +1408,7 @@ sketch002 = startSketchOn('XZ')
     })
 
     await test.step(`Confirm code is added to the editor, scene has changed`, async () => {
-      // await scene.expectPixelColor([135, 64, 73], testPoint, 15) // FIXME
+      await scene.expectPixelColor([135, 64, 73], testPoint, 15)
       await editor.expectEditor.toContain(sweepDeclaration)
       await editor.expectState({
         diagnostics: [],

e2e/playwright/prompt-to-edit.spec.ts

@@ -233,7 +233,7 @@ test.describe('Prompt-to-edit tests', { tag: '@skipWin' }, () => {
       await cmdBar.openCmdBar('promptToEdit')
       await page
         .getByTestId('cmd-bar-arg-value')
-        .fill('Please rename to mySketch001')
+        .fill('Please rename to mySketch')
       await page.waitForTimeout(100)
       await cmdBar.progressCmdBar()
       await expect(submittingToast).toBeVisible()
@@ -244,10 +244,10 @@ test.describe('Prompt-to-edit tests', { tag: '@skipWin' }, () => {
     })
 
     await test.step('verify rename change and accept it', async () => {
-      await editor.expectEditor.toContain('mySketch001 = startSketchOn')
+      await editor.expectEditor.toContain('mySketch = startSketchOn')
       await editor.expectEditor.not.toContain('sketch002 = startSketchOn')
       await editor.expectEditor.toContain(
-        'extrude002 = extrude(mySketch001, length = 50)'
+        'extrude002 = extrude(mySketch, length = 50)'
       )
 
       await acceptBtn.click()

e2e/playwright/test-network-and-connection-issues.spec.ts

@@ -84,6 +84,7 @@ test.describe('Test network and connection issues', () => {
     'Engine disconnect & reconnect in sketch mode',
     { tag: '@skipLocalEngine' },
     async ({ page, homePage }) => {
+      // TODO: Don't skip Mac for these. After `window.engineCommandManager.tearDown` is working in Safari, these should work on webkit
       const networkToggle = page.getByTestId('network-toggle')
 
       const u = await getUtils(page)

e2e/playwright/text-to-cad-tests.spec.ts

@@ -430,8 +430,7 @@ test.describe('Text-to-CAD tests', { tag: ['@skipWin'] }, () => {
     await expect(page.getByText(promptWithNewline)).toBeVisible()
   })
 
-  // This will be fine once greg makes prompt at top of file deterministic
-  test.fixme(
+  test(
     'can do many at once and get many prompts back, and interact with many',
     { tag: ['@skipWin'] },
     async ({ page, homePage }) => {
@@ -492,15 +491,8 @@ test.describe('Text-to-CAD tests', { tag: ['@skipWin'] }, () => {
       // Click the button.
       await copyToClipboardButton.first().click()
 
-      // Do NOT do AI tests like this: "Expect the code to be pasted."
-      // Reason: AI tests are NONDETERMINISTIC. Thus we need to be as most
-      // general as we can for the assertion.
-      // We can use Kolmogorov complexity as a measurement of the
-      // "probably most minimal version of this program" to have a lower
-      // bound to work with. It is completely by feel because there are
-      // no proofs that any program is its smallest self.
-      const code2x8 = await page.locator('.cm-content').innerText()
-      await expect(code2x8.length).toBeGreaterThan(249)
+      // Expect the code to be pasted.
+      await expect(page.locator('.cm-content')).toContainText(`2x8`)
 
       // Ensure the final toast remains.
       await expect(page.getByText(`a 2x10 lego`)).not.toBeVisible()
@@ -513,8 +505,7 @@ test.describe('Text-to-CAD tests', { tag: ['@skipWin'] }, () => {
       await copyToClipboardButton.click()
 
       // Expect the code to be pasted.
-      const code2x4 = await page.locator('.cm-content').innerText()
-      await expect(code2x4.length).toBeGreaterThan(249)
+      await expect(page.locator('.cm-content')).toContainText(`2x4`)
     }
   )
 

e2e/playwright/zoo-test.ts

@@ -45,9 +45,7 @@ const playwrightTestFnWithFixtures_ = playwrightTestFn.extend<{
       return
     }
 
-    await electronZooInstance.createInstanceIfMissing(testInfo)
     await use(electronZooInstance)
-    await electronZooInstance.makeAvailableAgain()
   },
 })
 

package.json

@@ -93,7 +93,7 @@
     "fetch:wasm:windows": "./scripts/get-latest-wasm-bundle.ps1",
     "fetch:samples": "rm -rf public/kcl-samples* && curl -L -o public/kcl-samples.zip https://github.com/KittyCAD/kcl-samples/archive/refs/heads/achalmers/kw-args-xylineto.zip && unzip -o public/kcl-samples.zip -d public && mv public/kcl-samples-* public/kcl-samples",
     "build:wasm-dev": "yarn wasm-prep && (cd rust && wasm-pack build kcl-wasm-lib --dev --target web --out-dir pkg && cargo test -p kcl-lib export_bindings) && yarn isomorphic-copy-wasm && yarn fmt",
-    "build:wasm:nocopy": "yarn wasm-prep && cd rust && RUSTFLAGS='--cfg getrandom_backend=\"wasm_js\"' wasm-pack build kcl-wasm-lib --release  --target web --out-dir pkg && cargo test -p kcl-lib export_bindings",
+    "build:wasm:nocopy": "yarn wasm-prep && cd rust && wasm-pack build kcl-wasm-lib --release  --target web --out-dir pkg && cargo test -p kcl-lib export_bindings",
     "build:wasm": "yarn build:wasm:nocopy && cp rust/kcl-wasm-lib/pkg/kcl_wasm_lib_bg.wasm public && yarn fmt",
     "build:wasm:windows": "yarn install:wasm-pack:cargo && yarn build:wasm:nocopy && ./scripts/copy-wasm.ps1  && yarn fmt",
     "remove-importmeta": "sed -i 's/import.meta.url/window.location.origin/g' \"./rust/kcl-wasm-lib/pkg/kcl_wasm_lib.js\"; sed -i '' 's/import.meta.url/window.location.origin/g' \"./rust/kcl-wasm-lib/pkg/kcl_wasm_lib.js\" || echo \"sed for both mac and linux\"",

public/kcl-samples/3d-boaty/main.kcl

@@ -1,4 +1,4 @@
-// Bench
+// 3D Boaty
 // This is a slight remix of Depep1's original 3D Boaty (https://www.printables.com/model/1141963-3d-boaty). This is a tool used for benchmarking 3D FDM printers for bed adhesion, overhangs, bridging and top surface quality. The name of this file is a bit of misnomer, the shape of the object is a typical park bench.
 
 // Set units in millimeters (mm)
@@ -8,12 +8,12 @@
 benchLength = 56
 
 // Import various constants and functions from our library
-import dividerThickness from "bench-parts.kcl"
-import divider from "bench-parts.kcl"
-import connector from "bench-parts.kcl"
-import seatSlats from "bench-parts.kcl"
-import backSlats from "bench-parts.kcl"
-import armRest from "bench-parts.kcl"
+import dividerThickness from "boat-parts.kcl"
+import divider from "boat-parts.kcl"
+import connector from "boat-parts.kcl"
+import seatSlats from "boat-parts.kcl"
+import backSlats from "boat-parts.kcl"
+import armRest from "boat-parts.kcl"
 
 // Create the dividers, these hold the seat and back slats
 divider("YZ")

public/kcl-samples/README.md

@@ -23,14 +23,14 @@ KCL samples conform to a set of style guidelines to ensure consistency and reada
 When you submit a PR to add or modify KCL samples, images and STEP files will be generated and added to the repository automatically.
 
 ---
+#### [3d-boaty](3d-boaty/main.kcl) ([step](step/3d-boaty.step)) ([screenshot](screenshots/3d-boaty.png))
+[![3d-boaty](screenshots/3d-boaty.png)](3d-boaty/main.kcl)
 #### [80-20-rail](80-20-rail/main.kcl) ([step](step/80-20-rail.step)) ([screenshot](screenshots/80-20-rail.png))
 [![80-20-rail](screenshots/80-20-rail.png)](80-20-rail/main.kcl)
 #### [a-parametric-bearing-pillow-block](a-parametric-bearing-pillow-block/main.kcl) ([step](step/a-parametric-bearing-pillow-block.step)) ([screenshot](screenshots/a-parametric-bearing-pillow-block.png))
 [![a-parametric-bearing-pillow-block](screenshots/a-parametric-bearing-pillow-block.png)](a-parametric-bearing-pillow-block/main.kcl)
 #### [ball-bearing](ball-bearing/main.kcl) ([step](step/ball-bearing.step)) ([screenshot](screenshots/ball-bearing.png))
 [![ball-bearing](screenshots/ball-bearing.png)](ball-bearing/main.kcl)
-#### [bench](bench/main.kcl) ([step](step/bench.step)) ([screenshot](screenshots/bench.png))
-[![bench](screenshots/bench.png)](bench/main.kcl)
 #### [bracket](bracket/main.kcl) ([step](step/bracket.step)) ([screenshot](screenshots/bracket.png))
 [![bracket](screenshots/bracket.png)](bracket/main.kcl)
 #### [car-wheel-assembly](car-wheel-assembly/main.kcl) ([step](step/car-wheel-assembly.step)) ([screenshot](screenshots/car-wheel-assembly.png))
@@ -45,8 +45,10 @@ When you submit a PR to add or modify KCL samples, images and STEP files will be
 [![enclosure](screenshots/enclosure.png)](enclosure/main.kcl)
 #### [exhaust-manifold](exhaust-manifold/main.kcl) ([step](step/exhaust-manifold.step)) ([screenshot](screenshots/exhaust-manifold.png))
 [![exhaust-manifold](screenshots/exhaust-manifold.png)](exhaust-manifold/main.kcl)
-#### [flange](flange/main.kcl) ([step](step/flange.step)) ([screenshot](screenshots/flange.png))
-[![flange](screenshots/flange.png)](flange/main.kcl)
+#### [flange-with-patterns](flange-with-patterns/main.kcl) ([step](step/flange-with-patterns.step)) ([screenshot](screenshots/flange-with-patterns.png))
+[![flange-with-patterns](screenshots/flange-with-patterns.png)](flange-with-patterns/main.kcl)
+#### [flange-xy](flange-xy/main.kcl) ([step](step/flange-xy.step)) ([screenshot](screenshots/flange-xy.png))
+[![flange-xy](screenshots/flange-xy.png)](flange-xy/main.kcl)
 #### [focusrite-scarlett-mounting-bracket](focusrite-scarlett-mounting-bracket/main.kcl) ([step](step/focusrite-scarlett-mounting-bracket.step)) ([screenshot](screenshots/focusrite-scarlett-mounting-bracket.png))
 [![focusrite-scarlett-mounting-bracket](screenshots/focusrite-scarlett-mounting-bracket.png)](focusrite-scarlett-mounting-bracket/main.kcl)
 #### [food-service-spatula](food-service-spatula/main.kcl) ([step](step/food-service-spatula.step)) ([screenshot](screenshots/food-service-spatula.png))

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

@@ -15,57 +15,90 @@ padding = 1.5
 bearingDia = 3
 
 // (Needs to be updated). Sketch the block and extrude up to where the counterbore diameter starts.
-extrude001 = startSketchOn('XY')
+block = 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 = [
+  |> hole(circle(
+       center = [
          -(width / 2 - (padding / 2)),
          -(length / 2 - (padding / 2))
-      ],
-      radius = cbDia / 2,
-     )
-  |> patternLinear2d(
-      instances = 2,
-      distance = length - padding,
-      axis = [0, 1],
-     )
-  |> patternLinear2d(
-      instances = 2,
-      distance = width - padding,
-      axis = [1, 0],
-    )
-  |> extrude(%, length = -cbDepth)
+       ],
+       radius = holeDia / 2
+     ), %)
+  |> hole(circle(
+       center = [
+         -(width / 2 - (padding / 2)),
+         length / 2 - (padding / 2)
+       ],
+       radius = holeDia / 2
+     ), %)
+  |> hole(circle(
+       center = [
+         width / 2 - (padding / 2),
+         length / 2 - (padding / 2)
+       ],
+       radius = holeDia / 2
+     ), %)
+  |> hole(circle(
+       center = [
+         width / 2 - (padding / 2),
+         -(length / 2 - (padding / 2))
+       ],
+       radius = holeDia / 2
+     ), %)
+  |> hole(circle(
+       center = [0, 0],
+       radius = bearingDia / 2
+     ), %)
+  |> extrude(length = height - cbDepth)
 
-extrude003 = startSketchOn(extrude001, 'start')
-  |> circle(
-        center = [
-           -(width / 2 - (padding / 2)),
-           -(length / 2 - (padding / 2))
-        ],
-        radius = holeDia / 2,
-     )
-  |> patternLinear2d(
-      instances = 2,
-      distance = length - padding,
-      axis = [0, 1],
-    )
-  |> patternLinear2d(
-      instances = 2,
-      distance = width - padding,
-      axis = [1, 0],
-    )
-  |> extrude(length = -height + cbDepth)
-
-extrude004 = startSketchOn(extrude001, 'end')
-  |> circle(
-      center = [0, 0],
-      radius = bearingDia/2,
-    )
-  |> extrude(length = -height)
+// Create a second sketch that creates the counterbore diameters and extrude the rest of the way to get the total height. Note: You cannot use startSketchOn(block, 'end'). The extrude lives outside the bounds, and the engine will not execute. This is a known issue.
+secondHalf = startSketchOn({
+       plane = {
+         origin = { x = 0, y = 0, z = height - cbDepth },
+         xAxis = { x = 1, y = 0, z = 0 },
+         yAxis = { x = 0, y = 1, z = 0 },
+         zAxis = { x = 0, y = 0, z = 1 }
+       }
+     })
+  |> startProfileAt([-width / 2, -length / 2], %)
+  |> line(endAbsolute = [width / 2, -length / 2])
+  |> line(endAbsolute = [width / 2, length / 2])
+  |> line(endAbsolute = [-width / 2, length / 2])
+  |> close()
+  |> hole(circle(
+       center = [
+         -(width / 2 - (padding / 2)),
+         -(length / 2 - (padding / 2))
+       ],
+       radius = cbDia / 2
+     ), %)
+  |> hole(circle(
+       center = [
+         -(width / 2 - (padding / 2)),
+         length / 2 - (padding / 2)
+       ],
+       radius = cbDia / 2
+     ), %)
+  |> hole(circle(
+       center = [
+         width / 2 - (padding / 2),
+         length / 2 - (padding / 2)
+       ],
+       radius = cbDia / 2
+     ), %)
+  |> hole(circle(
+       center = [
+         width / 2 - (padding / 2),
+         -(length / 2 - (padding / 2))
+       ],
+       radius = cbDia / 2
+     ), %)
+  |> hole(circle(
+       center = [0, 0],
+       radius = bearingDia / 2
+     ), %)
+  |> extrude(length = cbDepth)

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

@@ -16,8 +16,21 @@ chainWidth = sphereDia / 2
 chainThickness = sphereDia / 8
 linkDiameter = sphereDia / 4
 
+customPlane = {
+  plane = {
+    origin = {
+      x = 0,
+      y = 0,
+      z = -overallThickness / 2
+    },
+    xAxis = { x = 1, y = 0, z = 0 },
+    yAxis = { x = 0, y = 1, z = 0 },
+    zAxis = { x = 0, y = 0, z = 1 }
+  }
+}
+
 // Sketch the inside bearing piece
-insideWallSketch = startSketchOn(offsetPlane("XY", offset = -overallThickness / 2))
+insideWallSketch = startSketchOn(customPlane)
   |> circle(
        center = [0, 0],
        radius = shaftDia / 2 + wallThickness
@@ -96,7 +109,7 @@ linkRevolve = revolve({ axis = 'Y', angle = 360 / nBalls }, linkSketch)
      )
 
 // Create the sketch for the outside walls
-outsideWallSketch = startSketchOn(offsetPlane("XY", offset = -overallThickness / 2))
+outsideWallSketch = startSketchOn(customPlane)
   |> circle(
        center = [0, 0],
        radius = outsideDiameter / 2

public/kcl-samples/bracket/main.kcl

@@ -1,76 +1,113 @@
 // 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.
 
+// Set units
+@settings(defaultLengthUnit = in)
 
 // Define constants
 sigmaAllow = 35000 // psi (6061-T6 aluminum)
-width = 6 // inch
+width = 6
 p = 300 // Force on shelf - lbs
 factorOfSafety = 1.2 // FOS of 1.2
-shelfMountL = 5 // inches
-wallMountL = 2 // inches
+shelfMountL = 5
+wallMountL = 2
 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)
 
+
+filletRadius = .375
+extFilletRadius = .25
+mountingHoleDiameter = 0.5
+
 // 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')
+// Sketch the bracket body and fillet the inner and outer edges of the bend
+bracketLeg1Sketch = startSketchOn('XY')
   |> startProfileAt([0, 0], %)
-  |> xLine(length = shelfMountL - thickness, tag = $seg01)
-  |> yLine(length = thickness, tag = $seg02)
-  |> xLine(length = -shelfMountL, tag = $seg03)
-  |> yLine(length = -wallMountL, tag = $seg04)
-  |> xLine(length = thickness, tag = $seg05)
-  |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg06)
+  |> line(end = [shelfMountL - filletRadius, 0], tag = $fillet1)
+  |> line(end = [0, width], tag = $fillet2)
+  |> line(end = [-shelfMountL + filletRadius, 0])
   |> close()
-  |> extrude(%, length = width)
+  |> hole(circle(
+       center = [1, 1],
+       radius = mountingHoleDiameter / 2
+     ), %)
+  |> hole(circle(
+       center = [shelfMountL - 1.5, width - 1],
+       radius = mountingHoleDiameter / 2
+     ), %)
+  |> hole(circle(
+       center = [1, width - 1],
+       radius = mountingHoleDiameter / 2
+     ), %)
+  |> hole(circle(
+       center = [shelfMountL - 1.5, 1],
+       radius = mountingHoleDiameter / 2
+     ), %)
+
+// Extrude the leg 2 bracket sketch
+bracketLeg1Extrude = extrude(bracketLeg1Sketch, length = thickness)
   |> fillet(
        radius = extFilletRadius,
-       tags = [getNextAdjacentEdge(seg03)],
+       tags = [
+         getNextAdjacentEdge(fillet1),
+         getNextAdjacentEdge(fillet2)
+       ]
      )
+
+// Sketch the fillet arc
+filletSketch = startSketchOn('XZ')
+  |> startProfileAt([0, 0], %)
+  |> line(end = [0, thickness])
+  |> arc({
+       angleEnd = 180,
+       angleStart = 90,
+       radius = filletRadius + thickness
+     }, %)
+  |> line(end = [thickness, 0])
+  |> arc({
+       angleEnd = 90,
+       angleStart = 180,
+       radius = filletRadius
+     }, %)
+
+// Sketch the bend
+filletExtrude = extrude(filletSketch, length = -width)
+
+// Create a custom plane for the leg that sits on the wall
+customPlane = {
+  plane = {
+    origin = { x = -filletRadius, y = 0, z = 0 },
+    xAxis = { x = 0, y = 1, z = 0 },
+    yAxis = { x = 0, y = 0, z = 1 },
+    zAxis = { x = 1, y = 0, z = 0 }
+  }
+}
+
+// Create a sketch for the second leg
+bracketLeg2Sketch = startSketchOn(customPlane)
+  |> startProfileAt([0, -filletRadius], %)
+  |> line(end = [width, 0])
+  |> line(end = [0, -wallMountL], tag = $fillet3)
+  |> line(end = [-width, 0], tag = $fillet4)
+  |> close()
+  |> hole(circle(
+       center = [1, -1.5],
+       radius = mountingHoleDiameter / 2
+     ), %)
+  |> hole(circle(
+       center = [5, -1.5],
+       radius = mountingHoleDiameter / 2
+     ), %)
+
+// Extrude the second leg
+bracketLeg2Extrude = extrude(bracketLeg2Sketch, length = -thickness)
   |> fillet(
-       radius = filletRadius,
-       tags = [getNextAdjacentEdge(seg06)],
+       radius = extFilletRadius,
+       tags = [
+         getNextAdjacentEdge(fillet3),
+         getNextAdjacentEdge(fillet4)
+       ]
      )
-  |> fillet(
-      radius = filletRadius,
-      tags = [seg02, getOppositeEdge(seg02)],
-    )
-  |> fillet(
-      radius = filletRadius,
-      tags = [seg05, getOppositeEdge(seg05)],
-    )
-
-sketch002 = startSketchOn(sketch001, seg03)
-  |> circle(
-    center = [-1.25, 1],
-    radius = mountingHoleDiameter / 2,
-  )
-  |> 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(
-    center = [1, -1],
-    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

@@ -9,8 +9,18 @@
 // Import Constants
 import caliperTolerance, caliperPadLength, caliperThickness, caliperOuterEdgeRadius, caliperInnerEdgeRadius, rotorDiameter, rotorTotalThickness, yAxisOffset from "globals.kcl"
 
+// Create the plane for the brake caliper. This is so it can match up with the rotor model.
+brakeCaliperPlane = {
+  plane = {
+    origin = { x = 0, y = yAxisOffset, z = 0 },
+    xAxis = { x = 1, y = 0, z = 0 },
+    yAxis = { x = 0, y = 1, z = 0 },
+    zAxis = { x = 0, y = 0, z = 1 }
+  }
+}
+
 // Sketch the brake caliper profile
-brakeCaliperSketch = startSketchOn('XY')
+brakeCaliperSketch = startSketchOn(brakeCaliperPlane)
   |> startProfileAt([
        rotorDiameter / 2 + caliperTolerance,
        0

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

@@ -9,61 +9,64 @@
 // Import Constants
 import rotorDiameter, rotorInnerDiameter, rotorSinglePlateThickness, rotorInnerDiameterThickness, lugHolePatternDia, lugSpacing, rotorTotalThickness, spacerPatternDiameter, spacerDiameter, spacerLength, spacerCount, wheelDiameter, lugCount, yAxisOffset, drillAndSlotCount from "globals.kcl"
 
-rotorSketch = startSketchOn('XZ')
+rotorPlane = {
+  plane = {
+    origin = { x = 0, y = yAxisOffset, z = 0 },
+    xAxis = { x = -1, y = 0, z = 0 },
+    yAxis = { x = 0, y = 0, z = 1 },
+    zAxis = { x = 0, y = 1, z = 0 }
+  }
+}
+fn lugPattern(plane) {
+  lugHolePattern = circle(
+         plane,
+         center = [-lugSpacing / 2, 0],
+         radius = 0.315
+       )
+    |> patternCircular2d(
+         arcDegrees = 360,
+         center = [0, 0],
+         instances = lugCount,
+         rotateDuplicates = true
+       )
+  return lugHolePattern
+}
+rotorSketch = startSketchOn(rotorPlane)
   |> circle(
        center = [0, 0],
        radius = rotorDiameter / 2
      )
+  |> hole(lugPattern(%), %)
 rotor = extrude(rotorSketch, length = rotorSinglePlateThickness)
   |> appearance(color = "#dbcd70", roughness = 90, metalness = 90)
-
-rotorBumpSketch = startSketchOn(rotor, 'end')
+rotorBumpSketch = startSketchOn(rotorPlane)
   |> circle(
        center = [0, 0],
        radius = rotorInnerDiameter / 2
      )
-rotorBump = extrude(rotorBumpSketch, length = rotorInnerDiameterThickness)
-
-lugHoles = startSketchOn(rotorBump, 'end')
-  |> circle(
-       center = [-lugSpacing / 2, 0],
-       radius = 0.315
-     )
-  |> patternCircular2d(
-       arcDegrees = 360,
-       center = [0, 0],
-       instances = lugCount,
-       rotateDuplicates = true
-     )
-  |> extrude(%, length = -(rotorInnerDiameterThickness + rotorSinglePlateThickness))
+  |> hole(lugPattern(%), %)
+rotorBump = extrude(rotorBumpSketch, length = -rotorInnerDiameterThickness)
   |> appearance(color = "#dbcd70", roughness = 90, metalness = 90)
-
-// (update when boolean is available)
-centerSpacer = startSketchOn(rotor, 'start')
-  |> circle(%, center = [0, 0], radius = .25)
-  |> extrude(%, length = spacerLength)
-
-secondaryRotorSketch = startSketchOn(centerSpacer, 'end')
+rotorSecondaryPlatePlane = {
+  plane = {
+    origin = {
+      x = 0,
+      y = yAxisOffset + rotorTotalThickness * 0.75,
+      z = 0
+    },
+    xAxis = { x = -1, y = 0, z = 0 },
+    yAxis = { x = 0, y = 0, z = 1 },
+    zAxis = { x = 0, y = 1, z = 0 }
+  }
+}
+secondaryRotorSketch = startSketchOn(rotorSecondaryPlatePlane)
   |> circle(
        center = [0, 0],
        radius = rotorDiameter / 2
      )
+  |> hole(lugPattern(%), %)
 secondRotor = extrude(secondaryRotorSketch, length = rotorSinglePlateThickness)
-
-lugHoles2 = startSketchOn(secondRotor, 'end')
-  |> circle(
-       center = [-lugSpacing / 2, 0],
-       radius = 0.315
-     )
-  |> patternCircular2d(
-       arcDegrees = 360,
-       center = [0, 0],
-       instances = lugCount,
-       rotateDuplicates = true
-     )
-  |> extrude(length = -rotorSinglePlateThickness)
-
-spacerSketch = startSketchOn(rotor, 'start')
+spacerSketch = startSketchOn(rotorSecondaryPlatePlane)
   |> circle(
        center = [spacerPatternDiameter / 2, 0],
        radius = spacerDiameter
@@ -74,8 +77,8 @@ spacerSketch = startSketchOn(rotor, 'start')
        instances = spacerCount,
        rotateDuplicates = true
      )
-spacers = extrude(spacerSketch, length = spacerLength)
-
+spacers = extrude(spacerSketch, length = -spacerLength)
+  |> appearance(color = "#dbcd70", roughness = 90, metalness = 90)
 rotorSlottedSketch = startSketchOn(rotor, 'START')
   |> startProfileAt([2.17, 2.56], %)
   |> xLine(length = 0.12)
@@ -104,6 +107,5 @@ secondRotorSlottedSketch = startSketchOn(secondRotor, 'END')
        arcDegrees = 360,
        rotateDuplicates = true
      )
-
-extrude(secondRotorSlottedSketch, length = -rotorSinglePlateThickness / 2)
+secondRotorSlotted = extrude(secondRotorSlottedSketch, length = -rotorSinglePlateThickness / 2)
   |> appearance(color = "#dbcd70", roughness = 90, metalness = 90)

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

@@ -12,7 +12,6 @@ import 'car-tire.kcl' as carTire
 import lugCount from 'globals.kcl'
 
 carRotor
-  |> translate(translate = [0, 0.5, 0])
 carWheel
 lugNut
   |> patternCircular3d(
@@ -23,5 +22,4 @@ lugNut
      rotateDuplicates = false
    )
 brakeCaliper
-  |> translate(translate = [0, 0.5, 0])
 carTire

public/kcl-samples/flange-with-patterns/main.kcl

@@ -8,6 +8,7 @@
 mountingHoleDia = .625
 baseDia = 4.625
 pipeDia = 1.25
+thickness = .625
 totalThickness = 0.813
 topTotalDiameter = 2.313
 bottomThickness = 0.06
@@ -15,6 +16,7 @@ bottomTotalDiameter = 2.5
 mountingHolePlacementDiameter = 3.5
 baseThickness = .625
 topTotalThickness = totalThickness - (bottomThickness + baseThickness)
+holeLocator = baseDia - 8
 nHoles = 4
 
 // Add assertion so nHoles are always greater than 1
@@ -40,25 +42,42 @@ flangeBase = startSketchOn('XY')
        radius = baseDia / 2
      )
   |> hole(circles, %)
+  |> hole(circle(
+       center = [0, 0],
+       radius = pipeDia / 2
+     ), %)
   |> extrude(length = baseThickness)
 
+// Plane for top face
+topFacePlane = {
+  plane = {
+    origin = { x = 0, y = 0, z = baseThickness },
+    xAxis = { x = 1, y = 0, z = 0 },
+    yAxis = { x = 0, y = 1, z = 0 },
+    zAxis = { x = 0, y = 0, z = 1 }
+  }
+}
+
 // Create the extrusion on the top of the flange base
-topExtrusion = startSketchOn(flangeBase, 'end')
+topExtrusion = startSketchOn(topFacePlane)
   |> circle(
        center = [0, 0],
        radius = topTotalDiameter / 2
      )
+  |> hole(circle(
+       center = [0, 0],
+       radius = pipeDia / 2
+     ), %)
   |> extrude(length = topTotalThickness)
 
 // Create the extrusion on the bottom of the flange base
-bottomExtrusion = startSketchOn(flangeBase, 'start')
+bottomExtrusion = startSketchOn("XY")
   |> circle(
        center = [0, 0],
        radius = bottomTotalDiameter / 2
      )
-  |> extrude(length = bottomThickness)
-
-// Cut a hole through the entire body
-pipeHole = startSketchOn(topExtrusion, 'end')
-  |> circle(center = [0, 0], radius = pipeDia/2)
-  |> extrude(%, length = -(topTotalThickness + baseThickness + bottomThickness))
+  |> hole(circle(
+       center = [0, 0],
+       radius = pipeDia / 2
+     ), %)
+  |> extrude(length = -bottomThickness)

public/kcl-samples/flange-xy/main.kcl

@@ -0,0 +1,87 @@
+// Flange with XY coordinates
+// A flange is a flat rim, collar, or rib, typically forged or cast, that is used to strengthen an object, guide it, or attach it to another object. Flanges are known for their use in various applications, including piping, plumbing, and mechanical engineering, among others.
+
+// Set units
+@settings(defaultLengthUnit = in)
+
+// Define constants
+mountingHoleDia = .625
+baseDia = 4.625
+pipeDia = 1.25
+thickness = .625
+totalThickness = 0.813
+topTotalDiameter = 2.313
+bottomThickness = 0.06
+bottomTotalDiameter = 2.5
+mountingHolePlacementDiameter = 3.5
+baseThickness = .625
+topTotalThickness = totalThickness - (bottomThickness + baseThickness)
+holeLocator = baseDia - 8
+nHoles = 4
+
+// Add assertion so nHoles are always greater than 1
+assertGreaterThan(nHoles, 1, "nHoles must be greater than 1")
+
+// Create the flange base and the six mounting holes
+flangeBase = startSketchOn('XY')
+  |> circle(
+       center = [0, 0],
+       radius = baseDia / 2
+     )
+  |> hole(circle(
+       center = [mountingHolePlacementDiameter / 2, 0],
+       radius = mountingHoleDia / 2
+     ), %)
+  |> hole(circle(
+       center = [0, mountingHolePlacementDiameter / 2],
+       radius = mountingHoleDia / 2
+     ), %)
+  |> hole(circle(
+       center = [-mountingHolePlacementDiameter / 2, 0],
+       radius = mountingHoleDia / 2
+     ), %)
+  |> hole(circle(
+       center = [0, -mountingHolePlacementDiameter / 2],
+       radius = mountingHoleDia / 2
+     ), %)
+  |> hole(circle(
+       center = [0, 0],
+       radius = pipeDia / 2
+     ), %)
+  |> extrude(length = baseThickness)
+
+// Plane for top face
+topFacePlane = {
+  plane = {
+    origin = { x = 0, y = 0, z = baseThickness },
+    xAxis = { x = 1, y = 0, z = 0 },
+    yAxis = { x = 0, y = 1, z = 0 },
+    zAxis = { x = 0, y = 0, z = 1 }
+  }
+}
+
+// Create the extrusion on the top of the flange base
+topExtrusion = startSketchOn(topFacePlane, 'end')
+  |> circle(
+       center = [0, 0],
+       radius = topTotalDiameter / 2
+     )
+  |> hole(circle(
+       center = [0, 0],
+       radius = pipeDia / 2
+     ), %)
+  |> extrude(length = topTotalThickness)
+
+// Create the extrusion on the bottom of the flange base
+bottomExtrusion = startSketchOn("XY")
+  |> circle(
+       center = [0, 0],
+       radius = bottomTotalDiameter / 2
+     )
+  |> hole(circle(
+       center = [0, 0],
+       radius = pipeDia / 2
+     ), %)
+  |> extrude(length = -bottomThickness)
+
+// https://www.mcmaster.com/44685K193/

public/kcl-samples/lego/main.kcl

@@ -5,8 +5,8 @@
 @settings(defaultLengthUnit = in)
 
 // Define constants
-lbumps = 10 // number of bumps long
-wbumps = 5 // number of bumps wide
+lbumps = 5 // number of bumps long
+wbumps = 3 // number of bumps wide
 pitch = 8.0
 clearance = 0.1
 bumpDiam = 4.8
@@ -25,8 +25,28 @@ wSegments = totalWidth / wbumps
 assertGreaterThan(lbumps, 1, "lbumps must be greater than 1")
 assertGreaterThan(wbumps, 1, "wbumps must be greater than 1")
 
+// Create the plane for the pegs. This is a hack so that the pegs can be patterned along the face of the lego base.
+pegFace = {
+  plane = {
+    origin = { x = 0, y = 0, z = height },
+    xAxis = { x = 1, y = 0, z = 0 },
+    yAxis = { x = 0, y = 1, z = 0 },
+    zAxis = { x = 0, y = 0, z = 1 }
+  }
+}
+
+// Create the plane for the tubes underneath the lego. This is a hack so that the tubes can be patterned underneath the lego.
+tubeFace = {
+  plane = {
+    origin = { x = 0, y = 0, z = height - t },
+    xAxis = { x = 1, y = 0, z = 0 },
+    yAxis = { x = 0, y = 1, z = 0 },
+    zAxis = { x = 0, y = 0, z = 1 }
+  }
+}
+
 // Make the base
-base = startSketchOn('XY')
+s = startSketchOn('XY')
   |> startProfileAt([-totalWidth / 2, -totalLength / 2], %)
   |> line(end = [totalWidth, 0])
   |> line(end = [0, totalLength])
@@ -34,8 +54,8 @@ base = startSketchOn('XY')
   |> close()
   |> extrude(length = height)
 
-// Sketch and extrude a rectangular shape to create the shell underneath the lego. Will replace with shell function when able to call a face created from shell.
-shellExtrude = startSketchOn(base, "start")
+// Sketch and extrude a rectangular shape to create the shell underneath the lego. This is a hack until we have a shell function.
+shellExtrude = startSketchOn(s, "start")
   |> startProfileAt([
        -(totalWidth / 2 - t),
        -(totalLength / 2 - t)
@@ -47,7 +67,7 @@ shellExtrude = startSketchOn(base, "start")
   |> extrude(length = -(height - t))
 
 // Create the pegs on the top of the base
-peg = startSketchOn(base, 'end')
+peg = startSketchOn(s, 'end')
   |> circle(
        center = [
          -(pitch * (wbumps - 1) / 2),
@@ -68,7 +88,7 @@ peg = startSketchOn(base, 'end')
   |> extrude(length = bumpHeight)
 
 // Create the pegs on the bottom of the base
-tubePattern = startSketchOn(shellExtrude, 'start')
+tubePattern = startSketchOn(tubeFace)
   |> circle(
        center = [
          -(pitch * (wbumps - 1) / 2 - (pitch / 2)),
@@ -86,4 +106,4 @@ tubePattern = startSketchOn(shellExtrude, 'start')
        instances = lbumps - 1,
        distance = pitch
      )
-  |> extrude(length = bumpHeight)
+  |> extrude(length = -bumpHeight)

public/kcl-samples/manifest.json

@@ -1,4 +1,11 @@
 [
+  {
+    "file": "main.kcl",
+    "pathFromProjectDirectoryToFirstFile": "3d-boaty/main.kcl",
+    "multipleFiles": true,
+    "title": "3D Boaty",
+    "description": "This is a slight remix of Depep1's original 3D Boaty (https://www.printables.com/model/1141963-3d-boaty). This is a tool used for benchmarking 3D FDM printers for bed adhesion, overhangs, bridging and top surface quality. The name of this file is a bit of misnomer, the shape of the object is a typical park bench."
+  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "80-20-rail/main.kcl",
@@ -20,13 +27,6 @@
     "title": "Ball Bearing",
     "description": "A ball bearing is a type of rolling-element bearing that uses balls to maintain the separation between the bearing races. The primary purpose of a ball bearing is to reduce rotational friction and support radial and axial loads."
   },
-  {
-    "file": "main.kcl",
-    "pathFromProjectDirectoryToFirstFile": "bench/main.kcl",
-    "multipleFiles": true,
-    "title": "Bench",
-    "description": "This is a slight remix of Depep1's original 3D Boaty (https://www.printables.com/model/1141963-3d-boaty). This is a tool used for benchmarking 3D FDM printers for bed adhesion, overhangs, bridging and top surface quality. The name of this file is a bit of misnomer, the shape of the object is a typical park bench."
-  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "bracket/main.kcl",
@@ -78,11 +78,18 @@
   },
   {
     "file": "main.kcl",
-    "pathFromProjectDirectoryToFirstFile": "flange/main.kcl",
+    "pathFromProjectDirectoryToFirstFile": "flange-with-patterns/main.kcl",
     "multipleFiles": false,
     "title": "Flange",
     "description": "A flange is a flat rim, collar, or rib, typically forged or cast, that is used to strengthen an object, guide it, or attach it to another object. Flanges are known for their use in various applications, including piping, plumbing, and mechanical engineering, among others."
   },
+  {
+    "file": "main.kcl",
+    "pathFromProjectDirectoryToFirstFile": "flange-xy/main.kcl",
+    "multipleFiles": false,
+    "title": "Flange with XY coordinates",
+    "description": "A flange is a flat rim, collar, or rib, typically forged or cast, that is used to strengthen an object, guide it, or attach it to another object. Flanges are known for their use in various applications, including piping, plumbing, and mechanical engineering, among others."
+  },
   {
     "file": "main.kcl",
     "pathFromProjectDirectoryToFirstFile": "focusrite-scarlett-mounting-bracket/main.kcl",

public/kcl-samples/step/3d-boaty.step

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

public/kcl-samples/step/dodecahedron.step

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

public/kcl-samples/step/enclosure.step

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

public/kcl-samples/step/flange-with-patterns.step

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

public/kcl-samples/step/flange-xy.step

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

public/kcl-samples/step/gear.step

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

public/kcl-samples/step/kitt.step

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

public/kcl-samples/step/pipe.step

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

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

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

public/kcl-samples/step/socket-head-cap-screw.step

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

public/kcl-samples/step/walkie-talkie.step

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

public/kcl-samples/step/washer.step

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;

rust/.cargo/config.toml

@@ -1,5 +1,2 @@
 [alias]
 kcl-language-server-release = "run --manifest-path ./kcl-language-server-release/Cargo.toml --"
-
-[target.wasm32-unknown-unknown]
-rustflags = ["--cfg", "getrandom_backend=\"wasm_js\""]

rust/Cargo.toml

@@ -34,8 +34,8 @@ clap = { version = "4.5.31", features = ["derive"] }
 dashmap = { version = "6.1.0" }
 http = "1"
 indexmap = "2.7.0"
-kittycad = { version = "0.3.33", default-features = false, features = ["js", "requests"] }
-kittycad-modeling-cmds = { version = "0.2.105", features = ["ts-rs", "websocket"] }
+kittycad = { version = "0.3.28", default-features = false, features = ["js", "requests"] }
+kittycad-modeling-cmds = { version = "0.2.100", features = ["ts-rs", "websocket"] }
 lazy_static = "1.5.0"
 miette = "7.5.0"
 pyo3 = { version = "0.24.0" }

rust/kcl-bumper/Cargo.toml

@@ -1,7 +1,7 @@
 
 [package]
 name = "kcl-bumper"
-version = "0.1.50"
+version = "0.1.49"
 edition = "2021"
 repository = "https://github.com/KittyCAD/modeling-api"
 rust-version = "1.76"

rust/kcl-derive-docs/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-derive-docs"
 description = "A tool for generating documentation from Rust derive macros"
-version = "0.1.50"
+version = "0.1.49"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"

rust/kcl-directory-test-macro/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-directory-test-macro"
 description = "A tool for generating tests from a directory of kcl files"
-version = "0.1.50"
+version = "0.1.49"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"

rust/kcl-language-server-release/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kcl-language-server-release"
-version = "0.1.50"
+version = "0.1.49"
 edition = "2021"
 authors = ["KittyCAD Inc <kcl@kittycad.io>"]
 publish = false

rust/kcl-language-server/Cargo.toml

@@ -2,7 +2,7 @@
 name = "kcl-language-server"
 description = "A language server for KCL."
 authors = ["KittyCAD Inc <kcl@kittycad.io>"]
-version = "0.2.50"
+version = "0.2.49"
 edition = "2021"
 license = "MIT"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

rust/kcl-lib/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "kcl-lib"
 description = "KittyCAD Language implementation and tools"
-version = "0.2.50"
+version = "0.2.49"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/KittyCAD/modeling-app"
@@ -152,9 +152,7 @@ harness = false
 [[test]]
 name = "executor"
 path = "e2e/executor/main.rs"
-required-features = ["engine"]
 
 [[test]]
 name = "modify"
 path = "e2e/modify/main.rs"
-required-features = ["engine"]

rust/kcl-lib/e2e/executor/outputs/helix_defaults_negative_extrude_output.step

@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION((('zoo.dev export')), '2;1');
-FILE_NAME('dump.step', '2021-01-01T00:00:00+00:00', ('Author unknown'), ('Organization unknown'), 'zoo.dev beta', 'zoo.dev', 'Authorization unknown');
+FILE_NAME('test.step', '2021-01-01T00:00:00Z', ('Test'), ('Zoo'), 'zoo.dev beta', 'zoo.dev', 'Test');
 FILE_SCHEMA(('AP203_CONFIGURATION_CONTROLLED_3D_DESIGN_OF_MECHANICAL_PARTS_AND_ASSEMBLIES_MIM_LF'));
 ENDSEC;
 DATA;