clean up sketch mode cmd (#6397)

* Fix CSG commands to be included in the artifact graph

* Update output

.github/workflows/e2e-tests.yml

@@ -285,7 +285,8 @@ jobs:
         # TODO: enable namespace-profile-windows-latest once available
         os:
           - "runs-on=${{ github.run_id }}/family=i7ie.2xlarge/image=ubuntu22-full-x64"
-          - namespace-profile-macos-6-cores
+          # TODO: renable this when macoOS runner seem more stable
+          # - namespace-profile-macos-6-cores
           - windows-latest-8-cores
         shardIndex: [1, 2, 3, 4]
         shardTotal: [4]

.helix/languages.toml

@@ -5,6 +5,6 @@ command = "vscode-eslint-language-server"
 [[language]]
 name = "typescript"
 auto-format = true
-formatter = { command = "node_modules/.bin/prettier", args = ["--parser", "typescript"] }
+formatter = { command = "./node_modules/@biomejs/biome/bin/biome", args = ["format", "--write", "--stdin-file-path=foo.ts"] }
-language-servers = [ { name = "eslint", only-features = [ "diagnostics" ] }, "typescript-language-server" ]
+# language-servers = [ { name = "eslint", only-features = [ "diagnostics" ] }, "typescript-language-server" ]
 

docs/kcl/extrude.md

@@ -42,11 +42,7 @@ extrude(
 example = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> line(end = [10, 0])
-  |> arc({
+  |> arc(angleStart = 120, angleEnd = 0, radius = 5)
-       angleStart = 120,
-       angleEnd = 0,
-       radius = 5
-     }, %)
   |> line(end = [5, 0])
   |> line(end = [0, 10])
   |> bezierCurve({
@@ -64,11 +60,7 @@ example = startSketchOn(XZ)
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([-10, 0], %)
-  |> arc({
+  |> arc(angleStart = 120, angleEnd = -60, radius = 5)
-       angleStart = 120,
-       angleEnd = -60,
-       radius = 5
-     }, %)
   |> line(end = [10, 0])
   |> line(end = [5, 0])
   |> bezierCurve({
@@ -88,11 +80,7 @@ example = extrude(exampleSketch, length = 10)
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([-10, 0], %)
-  |> arc({
+  |> arc(angleStart = 120, angleEnd = -60, radius = 5)
-       angleStart = 120,
-       angleEnd = -60,
-       radius = 5
-     }, %)
   |> line(end = [10, 0])
   |> line(end = [5, 0])
   |> bezierCurve({
@@ -112,11 +100,7 @@ example = extrude(exampleSketch, length = 20, symmetric = true)
 ```js
 exampleSketch = startSketchOn(XZ)
   |> startProfileAt([-10, 0], %)
-  |> arc({
+  |> arc(angleStart = 120, angleEnd = -60, radius = 5)
-       angleStart = 120,
-       angleEnd = -60,
-       radius = 5
-     }, %)
   |> line(end = [10, 0])
   |> line(end = [5, 0])
   |> bezierCurve({

docs/kcl/index.md

@@ -48,7 +48,6 @@ layout: manual
   * [`angledLineThatIntersects`](kcl/angledLineThatIntersects)
   * [`appearance`](kcl/appearance)
   * [`arc`](kcl/arc)
-  * [`arcTo`](kcl/arcTo)
   * [`asin`](kcl/asin)
   * [`assert`](kcl/assert)
   * [`assertEqual`](kcl/assertEqual)

docs/kcl/tangentToEnd.md

@@ -73,7 +73,7 @@ rectangleExtrude = extrude(rectangleSketch, length = 10)
 ```js
 bottom = startSketchOn(XY)
   |> startProfileAt([0, 0], %)
-  |> arcTo({ end = [10, 10], interior = [5, 1] }, %, $arc1)
+  |> arc(endAbsolute = [10, 10], interiorAbsolute = [5, 1], tag = $arc1)
   |> angledLine(angle = tangentToEnd(arc1), length = 20)
   |> close()
 ```

docs/kcl/types/Path.md

@@ -141,8 +141,8 @@ A base path.
 |----------|------|-------------|----------|
 | `type` |enum: `ArcThreePoint`|  | No |
 | `p1` |`[number, number]`| Point 1 of the arc (base on the end of previous segment) | No |
-| `p2` |`[number, number]`| Point 2 of the arc (interior kwarg) | No |
+| `p2` |`[number, number]`| Point 2 of the arc (interiorAbsolute kwarg) | No |
-| `p3` |`[number, number]`| Point 3 of the arc (end kwarg) | No |
+| `p3` |`[number, number]`| Point 3 of the arc (endAbsolute kwarg) | No |
 | `from` |`[number, number]`| The from point. | No |
 | `to` |`[number, number]`| The to point. | No |
 | `units` |[`UnitLen`](/docs/kcl/types/UnitLen)| A unit of length. | No |

e2e/playwright/lib/console-error-whitelist.ts

@@ -63,6 +63,16 @@ export const isErrorWhitelisted = (exception: Error) => {
         'e2e/playwright/can-create-sketches-on-all-planes-and-their-back-sides.spec.ts XY',
       project: 'Google Chrome',
     },
+    {
+      name: 'fE',
+      message: 'engine: Failed to wait for promise from send modeling command: JsValue("no connection to send on")',
+      stack: `fE: engine: Failed to wait for promise from send modeling command: JsValue("no connection to send on")
+     at ET (file:///home/runner/_work/modeling-app/modeling-app/.vite/renderer/main_window/assets/index-BvtRFNLF.js:49875:12)
+     at WGe.clearSceneAndBustCache (file:///home/runner/_work/modeling-app/modeling-app/.vite/renderer/main_window/assets/index-BvtRFNLF.js:91886:19)
+     at async a.onEngineConnectionOpened (file:///home/runner/_work/modeling-app/modeling-app/.vite/renderer/main_window/assets/index-BvtRFNLF.js:91483:9)`,
+      foundInSpec: 'e2e/playwright/testing-constraints.spec.ts is frequent but could be any spec',
+      project: 'Google Chrome',
+    },
     {
       name: 'RangeError',
       message: 'Position 160 is out of range for changeset of length 0',

e2e/playwright/sketch-tests.spec.ts

@@ -45,11 +45,7 @@ test.describe('Sketch tests', { tag: ['@skipWin'] }, () => {
 
     screwHole = startSketchOn(XY)
   ${startProfileAt1}
-  |> arc({
+  |> arc(angleStart = 0, angleEnd = 360, radius = screwRadius)
-        radius = screwRadius,
-        angleStart = 0,
-        angleEnd = 360
-      }, %)
 
     part001 = startSketchOn(XY)
   ${startProfileAt2}
@@ -66,11 +62,7 @@ test.describe('Sketch tests', { tag: ['@skipWin'] }, () => {
   |> tangentialArc(endAbsolute = [width / 2, 0])
   |> xLine(length = -width / 4 + wireRadius)
   |> yLine(length = wireOffset)
-  |> arc({
+  |> arc(angleStart = 0, angleEnd = 180, radius = wireRadius)
-        radius = wireRadius,
-        angleStart = 0,
-        angleEnd = 180
-      }, %)
   |> yLine(length = -wireOffset)
   |> xLine(length = -width / 4)
   |> close()
@@ -214,15 +206,8 @@ sketch001 = startProfileAt([12.34, -12.34], sketch002)
       |> startProfileAt([4.61, -14.01], %)
       |> line(end = [12.73, -0.09])
       |> tangentialArc(endAbsolute = [24.95, -5.38])
-      |> arcTo({
+      |> arc(interiorAbsolute = [20.18, -1.7], endAbsolute = [11.82, -1.16])
-          interior = [20.18, -1.7],
+      |> arc(angleStart = -89.36, angleEnd = 135.81, radius = 5.92)
-          end = [11.82, -1.16]
-        }, %)
-      |> arc({
-          radius = 5.92,
-          angleStart = -89.36,
-          angleEnd = 135.81
-        }, %)
       |> close()`
         )
       })
@@ -264,15 +249,8 @@ sketch001 = startProfileAt([12.34, -12.34], sketch002)
       |> startProfileAt([4.61, -14.01], %)
       |> line(end = [12.73, -0.09])
       |> tangentialArc(endAbsolute = [24.95, -5.38])
-      |> arcTo({
+      |> arc(interiorAbsolute = [20.18, -1.7], endAbsolute = [11.82, -1.16])
-          interior = [20.18, -1.7],
+      |> arc(angleStart = -89.36, angleEnd = 135.81, radius = 5.92)
-          end = [11.82, -1.16]
-        }, %)
-      |> arc({
-          radius = 5.92,
-          angleStart = -89.36,
-          angleEnd = 135.81
-        }, %)
       |> close()
 `)
       } else {
@@ -338,7 +316,7 @@ sketch001 = startProfileAt([12.34, -12.34], sketch002)
         await expect(page.locator('.cm-content')).not.toHaveText(prevContent)
       }
 
-      // drag arcTo interior handle (three point arc)
+      // drag arcTo interiorAbsolute handle (three point arc)
       const arcToHandle = await u.getBoundingBox('[data-overlay-index="2"]')
       await page.mouse.move(arcToHandle.x, arcToHandle.y - 5)
       await page.mouse.down()
@@ -410,15 +388,8 @@ sketch001 = startProfileAt([12.34, -12.34], sketch002)
   |> startProfileAt([6.44, -12.07], %)
   |> line(end = [14.72, 1.97])
   |> tangentialArc(endAbsolute = [26.92, -3.32])
-  |> arcTo({
+  |> arc(interiorAbsolute = [18.11, -3.73], endAbsolute = [9.77, -3.19])
-       interior = [18.11, -3.73],
+  |> arc(angleStart = -58.29, angleEnd = 161.17, radius = 3.75)
-       end = [9.77, -3.19]
-     }, %)
-  |> arc({
-       radius = 3.75,
-       angleStart = -58.29,
-       angleEnd = 161.17
-     }, %)
   |> close()
 `)
     }
@@ -948,7 +919,9 @@ profile001 = startProfileAt([${roundOff(scale * 69.6)}, ${roundOff(
 
       await page.mouse.move(pointA[0] - 12, pointA[1] + 12, { steps: 10 })
       const pointNotQuiteA = [pointA[0] - 7, pointA[1] + 7]
-      await page.mouse.move(pointNotQuiteA[0], pointNotQuiteA[1], { steps: 10 })
+      await page.mouse.move(pointNotQuiteA[0], pointNotQuiteA[1], {
+        steps: 10,
+      })
 
       await page.mouse.click(pointNotQuiteA[0], pointNotQuiteA[1], {
         delay: 200,
@@ -1500,12 +1473,12 @@ profile002 = startProfileAt([117.2, 56.08], sketch001)
         await circle3Point1()
         await page.waitForTimeout(200)
         await circle3Point2()
-        await editor.expectEditor.toContain('arcTo({')
+        await editor.expectEditor.toContain('arc(')
       })
 
       await test.step('equip line tool and verify three-point-arc code is removed after second click', async () => {
         await toolbar.lineBtn.click()
-        await editor.expectEditor.not.toContain('arcTo({')
+        await editor.expectEditor.not.toContain('arc(')
       })
 
       const [cornerRectPoint1] = scene.makeMouseHelpers(600, 300)
@@ -1542,9 +1515,9 @@ profile002 = startProfileAt([117.2, 56.08], sketch001)
         await continueProfile2Clk()
         await page.waitForTimeout(200)
         await circle3Point1()
-        await editor.expectEditor.toContain('arcTo({')
+        await editor.expectEditor.toContain('arc(')
         await toolbar.lineBtn.click()
-        await editor.expectEditor.not.toContain('arcTo({')
+        await editor.expectEditor.not.toContain('arc(')
         await editor.expectEditor.toContain('profile002')
       })
     }
@@ -1841,7 +1814,9 @@ profile003 = startProfileAt([206.63, -56.73], sketch001)
       await page.waitForTimeout(300)
 
       // Verify the three-point arc was created correctly
-      await editor.expectEditor.toContain(`|> arcTo(`)
+      await editor.expectEditor.toContain(`arc(`)
+      await editor.expectEditor.toContain(`interiorAbsolute`)
+      await editor.expectEditor.toContain(`endAbsolute`)
 
       // Switch back to line tool to continue
       await toolbar.lineBtn.click()
@@ -2061,10 +2036,7 @@ profile003 = startProfileAt([206.63, -56.73], sketch001)
       // Verify the first three-point arc was created correctly
       await editor.expectEditor.toContain(
         `profile011 = startProfileAt([13.56, -9.97], sketch001)
-  |> arcTo({
+  |> arc(interiorAbsolute = [15.19, -6.51], endAbsolute = [19.33, -11.19])`,
-       interior = [15.19, -6.51],
-       end = [19.33, -11.19]
-     }, %)`,
         { shouldNormalise: true }
       )
 
@@ -2081,14 +2053,8 @@ profile003 = startProfileAt([206.63, -56.73], sketch001)
 
       // Verify the second three-point arc was created correctly
       await editor.expectEditor.toContain(
-        `  |> arcTo({
+        `  |> arc(interiorAbsolute = [19.8, 1.7], endAbsolute = [21.7, 2.92])
-       interior = [19.8, 1.7],
+  |> arc(interiorAbsolute = [27.47, 1.42], endAbsolute = [27.57, 1.52])`,
-       end = [21.7, 2.92]
-     }, %)
-  |> arcTo({
-       interior = [27.47, 1.42],
-       end = [27.57, 1.52]
-     }, %)`,
         { shouldNormalise: true }
       )
     })
@@ -2863,33 +2829,29 @@ test.describe(`Click based selection don't brick the app when clicked out of ran
         `sketch001 = startSketchOn(XZ)
   |> startProfileAt([0, 0], %)
   |> line(end = [3.14, 3.14])
-  |> arcTo({
+  |> arc(
-  end = [4, 2],
+       interiorAbsolute = [1, 2],
-  interior = [1, 2]
+       endAbsolute = [4, 2]
-  }, %)
+     )`
-`
       )
     })
 
     await homePage.goToModelingScene()
     await scene.settled(cmdBar)
 
+    const formattedArc = `arc(interiorAbsolute = [1, 2], endAbsolute = [4, 2])`
     await test.step(`format the code`, async () => {
       // doesn't contain condensed version
-      await editor.expectEditor.not.toContain(
+      await editor.expectEditor.not.toContain(formattedArc)
-        `arcTo({ end = [4, 2], interior = [1, 2] }, %)`
-      )
       // click the code to enter sketch mode
-      await page.getByText(`arcTo`).click()
+      await page.getByText(`arc`).click()
       // Format the code.
       await page.locator('#code-pane button:first-child').click()
       await page.locator('button:has-text("Format code")').click()
     })
 
     await test.step(`Ensure the code reformatted`, async () => {
-      await editor.expectEditor.toContain(
+      await editor.expectEditor.toContain(formattedArc)
-        `arcTo({ end = [4, 2], interior = [1, 2] }, %)`
-      )
     })
 
     const [arcClick, arcHover] = scene.makeMouseHelpers(699, 337)
@@ -2900,7 +2862,7 @@ test.describe(`Click based selection don't brick the app when clicked out of ran
       await editor.expectState({
         activeLines: ['sketch001=startSketchOn(XZ)'],
         diagnostics: [],
-        highlightedCode: 'arcTo({end = [4, 2], interior = [1, 2]}, %)',
+        highlightedCode: 'arc(interiorAbsolute = [1, 2], endAbsolute = [4, 2])',
       })
     })
 
@@ -2922,7 +2884,7 @@ test.describe(`Click based selection don't brick the app when clicked out of ran
       await editor.expectState({
         activeLines: [],
         diagnostics: [],
-        highlightedCode: 'arcTo({end = [4, 2], interior = [1, 2]}, %)',
+        highlightedCode: 'arc(interiorAbsolute = [1, 2], endAbsolute = [4, 2])',
       })
     })
   })
@@ -3036,10 +2998,7 @@ profile001 = startProfileAt([0, 0], sketch001)
   |> line(end = [191.39, 191.39])
   |> tangentialArc(endAbsolute = [287.08, 95.69], tag = $seg01)
   |> angledLine(angle = tangentToEnd(seg01), length = 135.34)
-  |> arcTo({
+  |> arc(interiorAbsolute = [191.39, -95.69], endAbsolute = [287.08, -95.69], tag = $seg02)
-       interior = [191.39, -95.69],
-       end = [287.08, -95.69]
-     }, %, $seg02)
   |> angledLine(angle = tangentToEnd(seg02) + turns::HALF_TURN, length = 270.67)
 `.replaceAll('\n', '')
     )

e2e/playwright/snapshot-tests.spec.ts

@@ -1154,11 +1154,7 @@ sweepPath = startSketchOn(XZ)
 
 sweepSketch = startSketchOn(XY)
   |> startProfileAt([2, 0], %)
-  |> arc({
+  |> arc(angleStart = 0, angleEnd = 360, radius = 2)
-       angleEnd = 360,
-       angleStart = 0,
-       radius = 2
-     }, %)
   |> sweep(path = sweepPath)
   |> appearance(
        color = "#bb00ff",
@@ -1186,6 +1182,7 @@ sweepSketch = startSketchOn(XY)
     scene,
     cmdBar,
   }) => {
+    test.fixme(orRunWhenFullSuiteEnabled())
     const u = await getUtils(page)
     await context.addInitScript(async () => {
       localStorage.setItem(
@@ -1203,11 +1200,7 @@ sweepPath = startSketchOn(XZ)
 
 sweepSketch = startSketchOn(XY)
   |> startProfileAt([2, 0], %)
-  |> arc({
+  |> arc(angleStart = 0, angleEnd = 360, radius = 2)
-       angleEnd = 360,
-       angleStart = 0,
-       radius = 2
-     }, %)
   |> sweep(path = sweepPath)
   |> appearance(
        color = "#bb00ff",

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.61"
+  "kcl_version": "0.2.62"
 }

e2e/playwright/testing-segment-overlays.spec.ts

@@ -785,16 +785,12 @@ test.describe('Testing segment overlays', { tag: ['@skipWin'] }, () => {
 sketch001 = startSketchOn(XZ)
 profile001 = startProfileAt([56.37, 120.33], sketch001)
   |> line(end = [162.86, 106.48])
-  |> arcTo({
+  |> arc(
-       interior = [360.16, 231.76],
+       interiorAbsolute = [360.16, 231.76],
-       end = [391.48, 131.54]
+       endAbsolute = [391.48, 131.54],
-     }, %)
+     )
   |> yLine(-131.54, %)
-  |> arc({
+  |> arc(angleStart = 33.53, angleEnd = -141.07, radius = 126.46)
-       radius = 126.46,
-       angleStart = 33.53,
-       angleEnd = -141.07
-     }, %)
 `
         )
         localStorage.setItem('disableAxis', 'true')
@@ -820,43 +816,25 @@ profile001 = startProfileAt([56.37, 120.33], sketch001)
 
       const arcTo = await u.getBoundingBox('[data-overlay-index="1"]')
       let ang = await u.getAngle('[data-overlay-index="1"]')
-      console.log('arcTo interior x')
+      console.log('arcTo interiorAbsolute x')
       await clickUnconstrained({
         hoverPos: { x: arcTo.x, y: arcTo.y },
         constraintType: 'xAbsolute',
-        expectBeforeUnconstrained: `arcTo({
+        expectBeforeUnconstrained: `arc(interiorAbsolute = [360.16, 231.76], endAbsolute = [391.48, 131.54])`,
-       interior = [360.16, 231.76],
+        expectAfterUnconstrained: `arc(interiorAbsolute = [360.16, 231.76], endAbsolute = [391.48, 131.54])`,
-       end = [391.48, 131.54]
+        expectFinal: `arc(interiorAbsolute = [xAbs001, 231.76], endAbsolute = [391.48, 131.54])`,
-     }, %)`,
-        expectAfterUnconstrained: `arcTo({
-       interior = [360.16, 231.76],
-       end = [391.48, 131.54]
-     }, %)`,
-        expectFinal: `arcTo({
-       interior = [xAbs001, 231.76],
-       end = [391.48, 131.54]
-     }, %)`,
         ang: ang,
         steps: 6,
         locator: '[data-overlay-toolbar-index="1"]',
       })
 
-      console.log('arcTo interior y')
+      console.log('arcTo interiorAbsolute y')
       await clickUnconstrained({
         hoverPos: { x: arcTo.x, y: arcTo.y },
         constraintType: 'yAbsolute',
-        expectBeforeUnconstrained: `arcTo({
+        expectBeforeUnconstrained: `arc(interiorAbsolute = [xAbs001, 231.76], endAbsolute = [391.48, 131.54])`,
-       interior = [xAbs001, 231.76],
+        expectAfterUnconstrained: `arc(interiorAbsolute = [xAbs001, yAbs001], endAbsolute = [391.48, 131.54])`,
-       end = [391.48, 131.54]
+        expectFinal: `arc(interiorAbsolute = [xAbs001, 231.76], endAbsolute = [391.48, 131.54])`,
-     }, %)`,
-        expectAfterUnconstrained: `arcTo({
-       interior = [xAbs001, yAbs001],
-       end = [391.48, 131.54]
-     }, %)`,
-        expectFinal: `arcTo({
-       interior = [xAbs001, 231.76],
-       end = [391.48, 131.54]
-     }, %)`,
         ang: ang,
         steps: 10,
         locator: '[data-overlay-toolbar-index="1"]',
@@ -866,18 +844,9 @@ profile001 = startProfileAt([56.37, 120.33], sketch001)
       await clickConstrained({
         hoverPos: { x: arcTo.x, y: arcTo.y },
         constraintType: 'xAbsolute',
-        expectBeforeUnconstrained: `arcTo({
+        expectBeforeUnconstrained: `arc(interiorAbsolute = [xAbs001, 231.76], endAbsolute = [391.48, 131.54])`,
-       interior = [xAbs001, 231.76],
+        expectAfterUnconstrained: `arc(interiorAbsolute = [xAbs001, 231.76], endAbsolute = [391.48, 131.54])`,
-       end = [391.48, 131.54]
+        expectFinal: `arc(interiorAbsolute = [xAbs001, 231.76], endAbsolute = [xAbs002, 131.54])`,
-     }, %)`,
-        expectAfterUnconstrained: `arcTo({
-       interior = [xAbs001, 231.76],
-       end = [391.48, 131.54]
-     }, %)`,
-        expectFinal: `arcTo({
-       interior = [xAbs001, 231.76],
-       end = [xAbs002, 131.54]
-     }, %)`,
         ang: ang + 180,
         steps: 6,
         locator: '[data-overlay-toolbar-index="1"]',
@@ -887,18 +856,9 @@ profile001 = startProfileAt([56.37, 120.33], sketch001)
       await clickUnconstrained({
         hoverPos: { x: arcTo.x, y: arcTo.y },
         constraintType: 'yAbsolute',
-        expectBeforeUnconstrained: `arcTo({
+        expectBeforeUnconstrained: `arc(interiorAbsolute = [xAbs001, 231.76], endAbsolute = [xAbs002, 131.54])`,
-       interior = [xAbs001, 231.76],
+        expectAfterUnconstrained: `arc(interiorAbsolute = [xAbs001, 231.76], endAbsolute = [xAbs002, yAbs002])`,
-       end = [xAbs002, 131.54]
+        expectFinal: `arc(interiorAbsolute = [xAbs001, 231.76], endAbsolute = [xAbs002, 131.54])`,
-     }, %)`,
-        expectAfterUnconstrained: `arcTo({
-       interior = [xAbs001, 231.76],
-       end = [xAbs002, yAbs002]
-     }, %)`,
-        expectFinal: `arcTo({
-       interior = [xAbs001, 231.76],
-       end = [xAbs002, 131.54]
-     }, %)`,
         ang: ang + 180,
         steps: 10,
         locator: '[data-overlay-toolbar-index="1"]',
@@ -1045,15 +1005,8 @@ part001 = startSketchOn(XZ)
   |> angledLine(angle = 89, endAbsoluteY = 9.14 + 0)
   |> angledLineThatIntersects(angle = 4.14, intersectTag = a, offset = 9)
   |> tangentialArc(endAbsolute = [3.14 + 13, 1.14])
-  |> arcTo({
+  |> arc(interiorAbsolute = [16.25, 5.12], endAbsolute = [21.61, 4.15])
-       interior = [16.25, 5.12],
+  |> arc(angleStart = 40.27, angleEnd = -38.05, radius = 9.03)
-       end = [21.61, 4.15]
-     }, %)
-  |> arc({
-       radius = 9.03,
-       angleStart = 40.27,
-       angleEnd = -38.05
-     }, %)
 
       `
         )
@@ -1087,11 +1040,7 @@ part001 = startSketchOn(XZ)
 
       await deleteSegmentSequence({
         hoverPos: { x: segmentToDelete.x, y: segmentToDelete.y },
-        codeToBeDeleted: `arc({
+        codeToBeDeleted: `arc(angleStart = 40.27, angleEnd = -38.05, radius = 9.03)`,
-       radius = 9.03,
-       angleStart = 40.27,
-       angleEnd = -38.05
-     }, %)`,
         stdLibFnName: 'arc',
         ang: ang + 180,
         steps: 6,
@@ -1101,11 +1050,8 @@ part001 = startSketchOn(XZ)
       ang = await u.getAngle('[data-overlay-index="13"]')
       await deleteSegmentSequence({
         hoverPos: { x: segmentToDelete.x, y: segmentToDelete.y },
-        codeToBeDeleted: `arcTo({
+        codeToBeDeleted: `arc(interiorAbsolute = [16.25, 5.12], endAbsolute = [21.61, 4.15])`,
-       interior = [16.25, 5.12],
+        stdLibFnName: 'arc',
-       end = [21.61, 4.15]
-     }, %)`,
-        stdLibFnName: 'arcTo',
         ang: ang,
         steps: 6,
         locator: '[data-overlay-toolbar-index="13"]',

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

@@ -12,22 +12,10 @@ fn rail8020(originStart, railHeight, railLength) {
          originStart[0],
          0.1 * railHeight + originStart[1]
        ], %)
-    |> arc({
+    |> arc(angleStart = 180, angleEnd = 270, radius = 0.1 * railHeight)
-         angleStart = 180,
+    |> arc(angleStart = 180, angleEnd = 0, radius = 0.072 / 4 * railHeight)
-         angleEnd = 270,
-         radius = 0.1 * railHeight
-       }, %)
-    |> arc({
-         angleStart = 180,
-         angleEnd = 0,
-         radius = 0.072 / 4 * railHeight
-       }, %)
     |> xLine(length = 0.1 * railHeight)
-    |> arc({
+    |> arc(angleStart = 180, angleEnd = 0, radius = 0.072 / 4 * railHeight)
-         angleStart = 180,
-         angleEnd = 0,
-         radius = 0.072 / 4 * railHeight
-       }, %)
     |> xLine(length = 0.06 * railHeight, tag = $edge1)
     |> yLine(length = 0.087 * railHeight, tag = $edge2)
     |> xLine(length = -0.183 * railHeight, tag = $edge3)
@@ -37,35 +25,15 @@ fn rail8020(originStart, railHeight, railLength) {
     |> xLine(length = -0.183 * railHeight, tag = $edge7)
     |> yLine(length = -0.087 * railHeight, tag = $edge8)
     |> xLine(length = 0.06 * railHeight)
-    |> arc({
+    |> arc(angleStart = 180, angleEnd = 0, radius = 0.072 / 4 * railHeight)
-         angleStart = 180,
-         angleEnd = 0,
-         radius = 0.072 / 4 * railHeight
-       }, %)
     |> xLine(length = 0.1 * railHeight)
-    |> arc({
+    |> arc(angleStart = 180, angleEnd = 0, radius = 0.072 / 4 * railHeight)
-         angleStart = 180,
+    |> arc(angleStart = -90, angleEnd = 0, radius = 0.1 * railHeight)
-         angleEnd = 0,
-         radius = 0.072 / 4 * railHeight
-       }, %)
-    |> arc({
-         angleStart = -90,
-         angleEnd = 0,
-         radius = 0.1 * railHeight
-       }, %)
 
     // Sketch side 2 of profile
-    |> arc({
+    |> arc(angleStart = 270, angleEnd = 90, radius = 0.072 / 4 * railHeight)
-         angleStart = 270,
-         angleEnd = 90,
-         radius = 0.072 / 4 * railHeight
-       }, %)
     |> yLine(length = 0.1 * railHeight)
-    |> arc({
+    |> arc(angleStart = 270, angleEnd = 90, radius = 0.072 / 4 * railHeight)
-         angleStart = 270,
-         angleEnd = 90,
-         radius = 0.072 / 4 * railHeight
-       }, %)
     |> yLine(length = 0.06 * railHeight, tag = $edge9)
     |> xLine(length = -0.087 * railHeight, tag = $edge10)
     |> yLine(length = -0.183 * railHeight, tag = $edge11) // edge11
@@ -75,35 +43,15 @@ fn rail8020(originStart, railHeight, railLength) {
     |> yLine(length = -0.183 * railHeight, tag = $edge15) // 15
     |> xLine(length = 0.087 * railHeight, tag = $edge16)
     |> yLine(length = 0.06 * railHeight)
-    |> arc({
+    |> arc(angleStart = 270, angleEnd = 90, radius = 0.072 / 4 * railHeight)
-         angleStart = 270,
-         angleEnd = 90,
-         radius = 0.072 / 4 * railHeight
-       }, %)
     |> yLine(length = 0.1 * railHeight)
-    |> arc({
+    |> arc(angleStart = 270, angleEnd = 90, radius = 0.072 / 4 * railHeight)
-         angleStart = 270,
-         angleEnd = 90,
-         radius = 0.072 / 4 * railHeight
-       }, %)
 
     // Sketch side 3 of profile
-    |> arc({
+    |> arc(angleStart = 0, angleEnd = 90, radius = 0.1 * railHeight)
-         angleStart = 0,
+    |> arc(angleStart = 0, angleEnd = -180, radius = 0.072 / 4 * railHeight)
-         angleEnd = 90,
-         radius = 0.1 * railHeight
-       }, %)
-    |> arc({
-         angleStart = 0,
-         angleEnd = -180,
-         radius = 0.072 / 4 * railHeight
-       }, %)
     |> xLine(length = -0.1 * railHeight)
-    |> arc({
+    |> arc(angleStart = 0, angleEnd = -180, radius = 0.072 / 4 * railHeight)
-         angleStart = 0,
-         angleEnd = -180,
-         radius = 0.072 / 4 * railHeight
-       }, %)
     |> xLine(length = -0.06 * railHeight, tag = $edge17)
     |> yLine(length = -0.087 * railHeight, tag = $edge18)
     |> xLine(length = 0.183 * railHeight, tag = $edge19)
@@ -113,35 +61,15 @@ fn rail8020(originStart, railHeight, railLength) {
     |> xLine(length = 0.183 * railHeight, tag = $edge23)
     |> yLine(length = 0.087 * railHeight, tag = $edge24)
     |> xLine(length = -0.06 * railHeight)
-    |> arc({
+    |> arc(angleStart = 0, angleEnd = -180, radius = 0.072 / 4 * railHeight)
-         angleStart = 0,
-         angleEnd = -180,
-         radius = 0.072 / 4 * railHeight
-       }, %)
     |> xLine(length = -0.1 * railHeight)
-    |> arc({
+    |> arc(angleStart = 0, angleEnd = -180, radius = 0.072 / 4 * railHeight)
-         angleStart = 0,
+    |> arc(angleStart = 90, angleEnd = 180, radius = 0.1 * railHeight)
-         angleEnd = -180,
-         radius = 0.072 / 4 * railHeight
-       }, %)
-    |> arc({
-         angleStart = 90,
-         angleEnd = 180,
-         radius = 0.1 * railHeight
-       }, %)
 
     // Sketch side 4 of profile
-    |> arc({
+    |> arc(angleStart = 90, angleEnd = -90, radius = 0.072 / 4 * railHeight)
-         angleStart = 90,
-         angleEnd = -90,
-         radius = 0.072 / 4 * railHeight
-       }, %)
     |> yLine(length = -0.1 * railHeight)
-    |> arc({
+    |> arc(angleStart = 90, angleEnd = -90, radius = 0.072 / 4 * railHeight)
-         angleStart = 90,
-         angleEnd = -90,
-         radius = 0.072 / 4 * railHeight
-       }, %)
     |> yLine(length = -0.06 * railHeight, tag = $edge25)
     |> xLine(length = 0.087 * railHeight, tag = $edge26)
     |> yLine(length = 0.183 * railHeight, tag = $edge27)
@@ -151,17 +79,9 @@ fn rail8020(originStart, railHeight, railLength) {
     |> yLine(length = 0.183 * railHeight, tag = $edge31)
     |> xLine(length = -0.087 * railHeight, tag = $edge32)
     |> yLine(length = -0.06 * railHeight)
-    |> arc({
+    |> arc(angleStart = 90, angleEnd = -90, radius = 0.072 / 4 * railHeight)
-         angleStart = 90,
-         angleEnd = -90,
-         radius = 0.072 / 4 * railHeight
-       }, %)
     |> yLine(length = -0.1 * railHeight)
-    |> arc({
+    |> arc(angleStart = 90, angleEnd = -90, radius = 0.072 / 4 * railHeight)
-         angleStart = 90,
-         angleEnd = -90,
-         radius = 0.072 / 4 * railHeight
-       }, %)
     |> close()
 
     // Sketch center hole of profile

public/kcl-samples/axial-fan/fan.kcl

@@ -39,38 +39,34 @@ fn fanBlade(offsetHeight, startAngle) {
          15 * cos(toRadians(startAngle)),
          15 * sin(toRadians(startAngle))
        ], %)
-    |> arc({
+    |> arc(angleStart = startAngle, angleEnd = startAngle + 14, radius = 15)
-         angleStart = startAngle,
+    |> arc(
-         angleEnd = startAngle + 14,
+         endAbsolute = [
-         radius = 15
-       }, %)
-    |> arcTo({
-         end = [
            fanSize * 22 / 50 * cos(toRadians(startAngle - 20)),
            fanSize * 22 / 50 * sin(toRadians(startAngle - 20))
          ],
-         interior = [
+         interiorAbsolute = [
            fanSize * 11 / 50 * cos(toRadians(startAngle + 3)),
            fanSize * 11 / 50 * sin(toRadians(startAngle + 3))
-         ]
+         ],
-       }, %)
+       )
-    |> arcTo({
+    |> arc(
-         end = [
+         endAbsolute = [
            fanSize * 22 / 50 * cos(toRadians(startAngle - 24)),
            fanSize * 22 / 50 * sin(toRadians(startAngle - 24))
          ],
-         interior = [
+         interiorAbsolute = [
            fanSize * 22 / 50 * cos(toRadians(startAngle - 22)),
            fanSize * 22 / 50 * sin(toRadians(startAngle - 22))
-         ]
+         ],
-       }, %)
+       )
-    |> arcTo({
+    |> arc(
-         end = [profileStartX(%), profileStartY(%)],
+         endAbsolute = [profileStartX(%), profileStartY(%)],
-         interior = [
+         interiorAbsolute = [
            fanSize * 11 / 50 * cos(toRadians(startAngle - 5)),
            fanSize * 11 / 50 * sin(toRadians(startAngle - 5))
-         ]
+         ],
-       }, %)
+       )
     |> close()
   return fanBlade
 }

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

@@ -27,11 +27,7 @@ insideWall = extrude(insideWallSketch, length = overallThickness)
 // Create the sketch of one of the balls
 ballsSketch = startSketchOn(XY)
   |> startProfileAt([shaftDia / 2 + wallThickness, 0.001], %)
-  |> arc({
+  |> arc(angleStart = 180, angleEnd = 0, radius = sphereDia / 2)
-       angleEnd = 0,
-       angleStart = 180,
-       radius = sphereDia / 2
-     }, %)
   |> close()
 
 // Revolve the ball to make a sphere and pattern around the inside wall
@@ -50,11 +46,7 @@ chainSketch = startSketchOn(XY)
        shaftDia / 2 + wallThickness + sphereDia / 2 - (chainWidth / 2),
        0.125 * sin(toRadians(60))
      ], %)
-  |> arc({
+  |> arc(angleStart = 120, angleEnd = 60, radius = sphereDia / 2)
-       angleEnd = 60,
-       angleStart = 120,
-       radius = sphereDia / 2
-     }, %)
   |> line(end = [0, chainThickness])
   |> line(end = [-chainWidth, 0])
   |> close()

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

@@ -107,11 +107,7 @@ fn armRestPath(plane) {
   sketch005 = startSketchOn(plane)
     |> startProfileAt([20, 33], %)
     |> xLine(length = -20)
-    |> arc({
+    |> arc(angleStart = 90, angleEnd = 180, radius = 10)
-         angleStart = 90,
-         angleEnd = 180,
-         radius = 10
-       }, %)
   return sketch005
 }
 

public/kcl-samples/bottle/main.kcl

@@ -16,10 +16,7 @@ wallThickness = 4
 bottleBody = startSketchOn(XY)
   |> startProfileAt([-bottleLength / 2, 0], %)
   |> yLine(length = bottleWidth / 3)
-  |> arcTo({
+  |> arc(endAbsolute = [bottleLength / 2, bottleWidth / 3], interiorAbsolute = [0, bottleWidth / 2])
-       end = [bottleLength / 2, bottleWidth / 3],
-       interior = [0, bottleWidth / 2]
-     }, %)
   |> yLine(endAbsolute = 0)
   |> mirror2d(axis = X)
   |> close()

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

@@ -14,11 +14,7 @@ fn cycloidalGear(gearPitch, gearHeight, holeDiameter, helixAngle) {
            gearPitch * 1.55 * cos(toRadians(helixAngleP)) + gearPitch * sin(toRadians(-helixAngleP)),
            gearPitch * 1.55 * sin(toRadians(helixAngleP)) + gearPitch * cos(toRadians(-helixAngleP))
          ], %)
-      |> arc({
+      |> arc(angleStart = 90 + helixAngleP, angleEnd = -90 + helixAngleP, radius = gearPitch)
-           angleStart = 90 + helixAngleP,
-           angleEnd = -90 + helixAngleP,
-           radius = gearPitch
-         }, %)
       |> tangentialArc(radius = gearPitch * 1.67, angle = 60)
       |> tangentialArc(radius = gearPitch, angle = -180)
       |> tangentialArc(radius = gearPitch * 1.67, angle = 60)

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

@@ -51,11 +51,7 @@ flipperProfile = startProfileAt([-flipperLength, -32.0], flipperSketch)
   |> line(end = [flipperLength, 2.0])
   |> yLine(length = 60.0, tag = $backEdge)
   |> line(end = [-flipperLength, 2.0])
-  |> arc({
+  |> arc(angleStart = 163.087610, angleEnd = 196.912390, radius = 110.0)
-       angleEnd = 196.912390,
-       angleStart = 163.087610,
-       radius = 110.0
-     }, %)
   |> close()
 
 // Create a profile of the middle
@@ -126,29 +122,13 @@ gripSketch = startSketchOn(handlePlane)
 // Create a profile of the grip
 gripProfile = startProfileAt([-26.806746, -10.0], gripSketch)
   |> xLine(length = gripWidth - (2 * gripFilletRadius))
-  |> arc({
+  |> arc(angleStart = -90.0, angleEnd = 0.0, radius = gripFilletRadius)
-       angleStart = -90.0,
-       angleEnd = 0.0,
-       radius = gripFilletRadius
-     }, %)
   |> yLine(length = gripHeight - (2 * gripFilletRadius))
-  |> arc({
+  |> arc(angleStart = 0.0, angleEnd = 90.0, radius = gripFilletRadius)
-       angleStart = 0.0,
-       angleEnd = 90.0,
-       radius = gripFilletRadius
-     }, %)
   |> xLine(length = -(gripWidth - (2 * gripFilletRadius)))
-  |> arc({
+  |> arc(angleStart = 90.0, angleEnd = 180.0, radius = gripFilletRadius)
-       angleStart = 90.0,
-       angleEnd = 180.0,
-       radius = gripFilletRadius
-     }, %)
   |> yLine(length = -(gripHeight - (2 * gripFilletRadius)), tag = $gripEdgeTop)
-  |> arc({
+  |> arc(angleStart = 180.0, angleEnd = 270.0, radius = gripFilletRadius)
-       angleStart = 180.0,
-       angleEnd = 270.0,
-       radius = gripFilletRadius
-     }, %)
   |> close()
 
 // Extrude the grip profile to create the grip

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

@@ -32,43 +32,19 @@ sketch002 = startSketchOn(plane001)
   |> startProfileAt([carafeDiameter / 2, 5.7], %)
   |> xLine(length = 0.1)
   |> yLine(length = -5.2, tag = $edge1)
-  |> arc({
+  |> arc(angleStart = 180, angleEnd = 205, radius = 0.3)
-       angleStart = 180,
-       angleEnd = 205,
-       radius = 0.3
-     }, %)
   |> angledLine(angle = -60, length = 0.6, tag = $edge2)
-  |> arc({
+  |> arc(angleStart = 30, angleEnd = -120, radius = 0.6)
-       angleStart = 30,
-       angleEnd = -120,
-       radius = 0.6
-     }, %)
   |> angledLine(angle = 150, endAbsoluteY = -0.2, tag = $edge3)
-  |> arc({
+  |> arc(angleStart = 60, angleEnd = 90, radius = 0.5)
-       angleStart = 60,
-       angleEnd = 90,
-       radius = 0.5
-     }, %)
   |> xLine(endAbsolute = 0.1, tag = $edgeLen)
   |> yLine(length = 0.1)
   |> xLine(length = segLen(edgeLen) + 0.035, tag = $edge4)
-  |> arc({
+  |> arc(angleStart = 90, angleEnd = 60, radius = 0.6)
-       angleStart = 90,
-       angleEnd = 60,
-       radius = 0.6
-     }, %)
   |> angledLine(angle = 150, length = -segLen(edge3) + 0.035, tag = $edge5)
-  |> arc({
+  |> arc(angleStart = -120, angleEnd = 30, radius = 0.5)
-       angleStart = -120,
-       angleEnd = 30,
-       radius = 0.5
-     }, %)
   |> angledLine(angle = -60, length = -segLen(edge2) + 0.035, tag = $edge6)
-  |> arc({
+  |> arc(angleStart = 205, angleEnd = 180, radius = 0.6)
-       angleStart = 205,
-       angleEnd = 180,
-       radius = 0.6
-     }, %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
   |> extrude(length = 0.75)
@@ -89,11 +65,7 @@ extrude001 = extrude(sketch003, length = 0.050)
 sketch004 = startSketchOn(extrude001, face = END)
   |> startProfileAt([0.3, 0.17], %)
   |> yLine(length = 1.2)
-  |> arc({
+  |> arc(angleStart = 90, angleEnd = -30, radius = 1.2)
-       angleStart = 90,
-       angleEnd = -30,
-       radius = 1.2
-     }, %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
   |> patternCircular2d(

public/kcl-samples/gear/main.kcl

@@ -63,11 +63,7 @@ fn rightInvolute(i, sg) {
 start = startSketchOn(XY)
   |> startProfileAt([xs[101], ys[101]], %)
 teeth = reduce([0..100], start, leftInvolute)
-  |> arc({
+  |> arc(angleStart = 0, angleEnd = toothAngle, radius = baseDiameter / 2)
-       angleStart = 0,
-       angleEnd = toothAngle,
-       radius = baseDiameter / 2
-     }, %)
   |> reduce([1..101], %, rightInvolute)
   |> close()
   |> extrude(length = gearHeight)
@@ -95,15 +91,7 @@ keyWay = startSketchOn(body, face = END)
   |> xLine(length = keywayDepth)
   |> yLine(length = -keywayWidth)
   |> xLine(length = -keywayDepth)
-  |> arc({
+  |> arc(angleStart = -1 * toDegrees(startAngle) + 360, angleEnd = 180, radius = holeRadius)
-       angleEnd = 180,
+  |> arc(angleStart = 180, angleEnd = toDegrees(startAngle), radius = holeRadius)
-       angleStart = -1 * toDegrees(startAngle) + 360,
-       radius = holeRadius
-     }, %)
-  |> arc({
-       angleEnd = toDegrees(startAngle),
-       angleStart = 180,
-       radius = holeRadius
-     }, %)
   |> close()
   |> extrude(length = -gearHeight)

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

@@ -91,35 +91,19 @@ fn magnetCenterCutout(plane) {
          2 * magOuterDiam
        ], %)
     |> xLine(length = 2 * magOuterDiam - (firstStep + thirdStep) - (magOuterDiam / 2))
-    |> arc({
+    |> arc(angleStart = 90.0, angleEnd = 0.0, radius = magOuterDiam / 2)
-         angleStart = 90.0,
-         angleEnd = 0.0,
-         radius = magOuterDiam / 2
-       }, %)
     |> yLine(length = -(2 * magOuterDiam - (firstStep + thirdStep) - (magOuterDiam / 2)))
     |> xLine(length = binLength - (4 * magOuterDiam))
     |> yLine(length = 2 * magOuterDiam - (firstStep + thirdStep) - (magOuterDiam / 2))
-    |> arc({
+    |> arc(angleStart = 180.0, angleEnd = 90.0, radius = magOuterDiam / 2)
-         angleStart = 180.0,
-         angleEnd = 90.0,
-         radius = magOuterDiam / 2
-       }, %)
     |> xLine(length = 2 * magOuterDiam - (firstStep + thirdStep) - (magOuterDiam / 2))
     |> yLine(length = binLength - (4 * magOuterDiam))
     |> xLine(length = -(2 * magOuterDiam - (firstStep + thirdStep) - (magOuterDiam / 2)))
-    |> arc({
+    |> arc(angleStart = 270.0, angleEnd = 180.0, radius = magOuterDiam / 2)
-         angleStart = 270.0,
-         angleEnd = 180.0,
-         radius = magOuterDiam / 2
-       }, %)
     |> yLine(length = 2 * magOuterDiam - (firstStep + thirdStep) - (magOuterDiam / 2))
     |> xLine(length = -(binLength - (4 * magOuterDiam)), tag = $line012)
     |> yLine(length = -(2 * magOuterDiam - (firstStep + thirdStep) - (magOuterDiam / 2)))
-    |> arc({
+    |> arc(angleStart = 360.0, angleEnd = 270.0, radius = magOuterDiam / 2)
-         angleStart = 360.0,
-         angleEnd = 270.0,
-         radius = magOuterDiam / 2
-       }, %)
     |> xLine(length = -(2 * magOuterDiam - (firstStep + thirdStep) - (magOuterDiam / 2)))
     |> yLine(length = -(binLength - (4 * magOuterDiam)))
     |> close()

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

@@ -179,11 +179,12 @@ fn lipFace(plane) {
     |> startProfileAt([0, 0], %)
     // |> yLine(length = lipHeight, tag = $line100)
     |> line(end = [0.0, 5.792893], tag = $line000)
-    |> arc({
+    |> arc(
          angleStart = 180.0,
          angleEnd = 45.0,
-         radius = 0.500000
+         radius = 0.500000,
-       }, %, $arc000)
+         tag = $arc000,
+       )
     // |> angledLine(angle = -45, lengthY = lipStep5 )
     |> line(end = [1.046447, -1.046447], tag = $line001)
     |> yLine(length = -lipStep4)

public/kcl-samples/keyboard/main.kcl

@@ -66,11 +66,7 @@ plane001 = {
 fn keyFn(originStart, keyWidth, keyHeight, repeats, color) {
   sketch002 = startSketchOn(plane001)
   profile002 = startProfileAt([originStart[0], originStart[1]], sketch002)
-    |> arc({
+    |> arc(angleStart = 180, angleEnd = 270, radius = 0.1)
-         angleStart = 180,
-         angleEnd = 270,
-         radius = 0.1
-       }, %)
     |> angledLine(angle = 0, length = keyWidth - .2, tag = $rectangleSegmentA001)
     |> tangentialArc(radius = 0.1, angle = 90)
     |> angledLine(angle = segAng(rectangleSegmentA001) + 90, length = keyHeight - .2, tag = $rectangleSegmentB001)
@@ -167,17 +163,9 @@ fn o(origin, scale, depth) {
          .788 * scale + origin[0],
          .921 * scale + origin[1]
        ], %)
-    |> arc({
+    |> arc(angleStart = 47.15 + 6, angleEnd = 47.15 - 6 + 180, radius = .525 * scale)
-         angleStart = 47.15 + 6,
-         angleEnd = 47.15 - 6 + 180,
-         radius = .525 * scale
-       }, %)
     |> angledLine(angle = 47.15, length = .24 * scale)
-    |> arc({
+    |> arc(angleStart = 47.15 - 11 + 180, angleEnd = 47.15 + 11, radius = .288 * scale)
-         angleStart = 47.15 - 11 + 180,
-         angleEnd = 47.15 + 11,
-         radius = .288 * scale
-       }, %)
     |> close()
     |> extrude(length = -depth)
     |> appearance(color = baseColor)
@@ -187,17 +175,9 @@ fn o(origin, scale, depth) {
          .16 * scale + origin[0],
          .079 * scale + origin[1]
        ], %)
-    |> arc({
+    |> arc(angleStart = 47.15 + 6 - 180, angleEnd = 47.15 - 6, radius = .525 * scale)
-         angleStart = 47.15 + 6 - 180,
-         angleEnd = 47.15 - 6,
-         radius = .525 * scale
-       }, %)
     |> angledLine(angle = 47.15, length = -.24 * scale)
-    |> arc({
+    |> arc(angleStart = 47.15 - 11, angleEnd = 47.15 + 11 - 180, radius = .288 * scale)
-         angleStart = 47.15 - 11,
-         angleEnd = 47.15 + 11 - 180,
-         radius = .288 * scale
-       }, %)
     |> close()
     |> extrude(length = -depth)
     |> appearance(color = baseColor)

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

@@ -58,18 +58,15 @@ fn mirrorFn(plane, offsetX, offsetY, altitude, radius, tiefe, gestellR, gestellD
 
   archBody = startProfileAt([offsetX - gestellR, altitude], armPlane)
     |> xLine(length = gestellD)
-    |> arcTo({
+    |> arc(interiorAbsolute = [offsetX, altitude - gestellR], endAbsolute = [offsetX + gestellR, altitude])
-         interior = [offsetX, altitude - gestellR],
-         end = [offsetX + gestellR, altitude]
-       }, %)
     |> xLine(length = gestellD)
-    |> arcTo({
+    |> arc(
-         interior = [
+         interiorAbsolute = [
            offsetX,
            altitude - gestellR - gestellD
          ],
-         end = [profileStartX(%), profileStartY(%)]
+         endAbsolute = [profileStartX(%), profileStartY(%)],
-       }, %)
+       )
     |> close()
     |> extrude(length = tiefe)
   return armBody

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

@@ -11,17 +11,9 @@ sketch011 = startSketchOn(plane003)
        1.75 - (axisJ2ArmWidth / 2 * sin(toRadians(axisJ2))),
        8 + axisJ2ArmWidth / 2 * cos(toRadians(axisJ2))
      ], %)
-  |> arc({
+  |> arc(angleStart = 90 + axisJ2, angleEnd = 270 + axisJ2, radius = axisJ2ArmWidth / 2)
-       angleStart = 90 + axisJ2,
-       angleEnd = 270 + axisJ2,
-       radius = axisJ2ArmWidth / 2
-     }, %)
   |> angledLine(angle = axisJ2, length = axisJ2ArmLength)
-  |> arc({
+  |> arc(angleStart = -90 + axisJ2, angleEnd = 90 + axisJ2, radius = axisJ2ArmWidth / 2)
-       angleStart = -90 + axisJ2,
-       angleEnd = 90 + axisJ2,
-       radius = axisJ2ArmWidth / 2
-     }, %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 extrude011 = extrude(sketch011, length = -axisJ2ArmThickness)

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

@@ -11,17 +11,9 @@ sketch017 = startSketchOn(plane002)
        1.75 + axisJ2ArmLength * cos(toRadians(axisJ2)) - (axisJ3CArmWidth / 2 * sin(toRadians(axisJ3C))),
        8 + axisJ2ArmLength * sin(toRadians(axisJ2)) + axisJ3CArmWidth / 2 * cos(toRadians(axisJ3C))
      ], %)
-  |> arc({
+  |> arc(angleStart = 90 + axisJ3C, angleEnd = 270 + axisJ3C, radius = axisJ3CArmWidth / 2)
-       angleStart = 90 + axisJ3C,
-       angleEnd = 270 + axisJ3C,
-       radius = axisJ3CArmWidth / 2
-     }, %)
   |> angledLine(angle = axisJ3C, length = axisJ3CArmLength)
-  |> arc({
+  |> arc(angleStart = 270 + axisJ3C, angleEnd = 90 + axisJ3C, radius = axisJ3CArmWidth / 2)
-       angleStart = 270 + axisJ3C,
-       angleEnd = 90 + axisJ3C,
-       radius = axisJ3CArmWidth / 2
-     }, %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg01)
   |> close()
 extrude017 = extrude(sketch017, length = axisJ3CArmThickness)
@@ -97,11 +89,7 @@ sketch023 = startSketchOn(extrude022, face = START)
        8 + axisJ2ArmLength * sin(toRadians(axisJ2)) + axisJ3CArmLength * sin(toRadians(axisJ3C))
      ], %)
   |> angledLine(angle = axisJ3C + axisJ4 / 2, length = grabberLength / 4)
-  |> arc({
+  |> arc(angleStart = 150 + axisJ3C + axisJ4 / 2, angleEnd = 30 + axisJ3C + axisJ4 / 2, radius = grabberLength / 3)
-       angleStart = 150 + axisJ3C + axisJ4 / 2,
-       angleEnd = 30 + axisJ3C + axisJ4 / 2,
-       radius = grabberLength / 3
-     }, %)
   |> angledLine(angle = axisJ3C + axisJ4 / 2, length = grabberLength / 6)
   |> angledLine(angle = axisJ3C + axisJ4 / 2 + 132, length = grabberLength / 3.5)
   |> angledLine(angle = axisJ3C + axisJ4 / 2 + 160, length = grabberLength / 3.5)
@@ -118,11 +106,7 @@ sketch024 = startSketchOn(extrude022, face = START)
        8 + axisJ2ArmLength * sin(toRadians(axisJ2)) + axisJ3CArmLength * sin(toRadians(axisJ3C))
      ], %)
   |> angledLine(angle = axisJ3C - (axisJ4 / 2), length = grabberLength / 4)
-  |> arc({
+  |> arc(angleStart = 210 + axisJ3C - (axisJ4 / 2), angleEnd = 330 + axisJ3C - (axisJ4 / 2), radius = grabberLength / 3)
-       angleStart = 210 + axisJ3C - (axisJ4 / 2),
-       angleEnd = 330 + axisJ3C - (axisJ4 / 2),
-       radius = grabberLength / 3
-     }, %)
   |> angledLine(angle = axisJ3C - (axisJ4 / 2), length = grabberLength / 6)
   |> angledLine(angle = axisJ3C - (axisJ4 / 2) - 132, length = grabberLength / 3.5)
   |> angledLine(angle = axisJ3C - (axisJ4 / 2) - 160, length = grabberLength / 3.5)

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

@@ -15,11 +15,7 @@ extrude005 = extrude(sketch005, length = 1.5 - 0.1)
 sketch006 = startSketchOn(plane002)
   |> startProfileAt([3.5, baseHeight], %)
   |> angledLine(angle = 60, length = 1.75)
-  |> arc({
+  |> arc(angleStart = -30, angleEnd = -30 + 180, radius = 3)
-       angleStart = -30,
-       angleEnd = -30 + 180,
-       radius = 3
-     }, %)
   |> angledLine(angle = 60, endAbsoluteY = baseHeight)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()

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

@@ -21,11 +21,12 @@ distanceToInsideEdge = slateWidthHalf + templateThickness + templateGap
 sketch001 = startSketchOn(XZ)
   |> startProfileAt([0, depth + templateGap], %)
   |> xLine(length = slateWidthHalf - radius, tag = $seg01)
-  |> arc({
+  |> arc(
-       angleEnd = 0,
        angleStart = 90,
-       radius = 10 + templateGap
+       angleEnd = 0,
-     }, %, $seg09)
+       radius = 10 + templateGap,
+       tag = $seg09,
+     )
   |> yLine(endAbsolute = -templateThickness, tag = $seg03)
   |> xLine(length = templateThickness, tag = $seg07)
   |> yLine(endAbsolute = (segEndY(seg01) + templateThickness) / 2 - templateThickness, tag = $seg02)
@@ -42,11 +43,7 @@ sketch001 = startSketchOn(XZ)
   |> yLine(length = -segLen(seg02))
   |> xLine(length = segLen(seg07))
   |> yLine(length = segLen(seg03))
-  |> arc({
+  |> arc(angleStart = 180, angleEnd = 90, radius = 10 + templateGap)
-       angleEnd = 90,
-       angleStart = 180,
-       radius = 10 + templateGap
-     }, %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 

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

@@ -22,11 +22,7 @@ length002 = depth + minClampingDistance
 sketch001 = startSketchOn(XZ)
   |> startProfileAt([0, depth - templateGap], %)
   |> xLine(length = length001, tag = $seg01)
-  |> arc({
+  |> arc(angleStart = 90, angleEnd = 0, radius = radius - templateGap)
-       angleEnd = 0,
-       angleStart = 90,
-       radius = radius - templateGap
-     }, %)
   |> yLine(endAbsolute = -templateGap * 2 - (templateDiameter / 2), tag = $seg05)
   |> xLine(endAbsolute = slateWidthHalf + templateThickness, tag = $seg04)
   |> yLine(length = -length002, tag = $seg03)
@@ -36,11 +32,7 @@ sketch001 = startSketchOn(XZ)
   |> yLine(length = segLen(seg03))
   |> xLine(length = segLen(seg04))
   |> yLine(length = segLen(seg05))
-  |> arc({
+  |> arc(angleStart = 180, angleEnd = 90, radius = radius - templateGap)
-       angleEnd = 90,
-       angleStart = 180,
-       radius = radius - templateGap
-     }, %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 

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

@@ -12,11 +12,7 @@ startSketchOn(XZ)
   |> startProfileAt([0.0001, 0], %)
   |> xLine(length = knobDiameter / 2)
   |> yLine(length = knobHeight - 0.05)
-  |> arc({
+  |> arc(angleStart = 0, angleEnd = 90, radius = .05)
-       angleStart = 0,
-       angleEnd = 90,
-       radius = .05
-     }, %)
   |> xLine(endAbsolute = 0.0001)
   |> close()
   |> revolve(axis = Y)

public/kcl-samples/walkie-talkie/zoo-logo.kcl

@@ -33,17 +33,9 @@ export fn oLogo(surface, origin, scale) {
          .788 * scale + origin[0],
          .921 * scale + origin[1]
        ], %)
-    |> arc({
+    |> arc(angleStart = 47.15 + 6, angleEnd = 47.15 - 6 + 180, radius = .525 * scale)
-         angleStart = 47.15 + 6,
-         angleEnd = 47.15 - 6 + 180,
-         radius = .525 * scale
-       }, %)
     |> angledLine(angle = 47.15, length = .24 * scale)
-    |> arc({
+    |> arc(angleStart = 47.15 - 11 + 180, angleEnd = 47.15 + 11, radius = .288 * scale)
-         angleStart = 47.15 - 11 + 180,
-         angleEnd = 47.15 + 11,
-         radius = .288 * scale
-       }, %)
     |> close()
   return oSketch001
 }
@@ -54,17 +46,9 @@ export fn oLogo2(surface, origin, scale) {
          .16 * scale + origin[0],
          .079 * scale + origin[1]
        ], %)
-    |> arc({
+    |> arc(angleStart = 47.15 + 6 - 180, angleEnd = 47.15 - 6, radius = .525 * scale)
-         angleStart = 47.15 + 6 - 180,
-         angleEnd = 47.15 - 6,
-         radius = .525 * scale
-       }, %)
     |> angledLine(angle = 47.15, length = -.24 * scale)
-    |> arc({
+    |> arc(angleStart = 47.15 - 11, angleEnd = 47.15 + 11 - 180, radius = .288 * scale)
-         angleStart = 47.15 - 11,
-         angleEnd = 47.15 + 11 - 180,
-         radius = .288 * scale
-       }, %)
     |> close()
   return oSketch002
 }

rust/kcl-lib/e2e/executor/inputs/close_arc.kcl

@@ -4,6 +4,6 @@ const height = 3
 
 const body = startSketchOn(XY)
       |> startProfileAt([center[0]+radius, center[1]], %)
-      |> arc({angleEnd: 360, angleStart: 0, radius}, %)
+      |> arc(angleEnd = 360, angleStart = 0, radius = radius)
       |> close()
       |> extrude(length = height)

rust/kcl-lib/e2e/executor/inputs/pentagon_fillet_sugar.kcl

@@ -1,7 +1,6 @@
 let triangleHeight = 200
 let plumbusLen = 100
 let radius = 80
-let circ = {angle_start: 0, angle_end: 360, radius: radius}
 
 let triangleLen = 500
 const p = startSketchOn(XY)
@@ -14,7 +13,12 @@ const p = startSketchOn(XY)
 fn circl = (x, face) => {
 return startSketchOn(p, face = face)
   |> startProfileAt([x + radius, triangleHeight/2], %)
-  |> arc(circ, %,  $arc_tag)
+    |> arc(
+         angleStart = 0,
+         angleEnd = 360,
+         radius = radius,
+         tag = $arc_tag,
+       )
   |> close()
 }
 

rust/kcl-lib/e2e/executor/inputs/router-template-slate.kcl

@@ -12,11 +12,11 @@ const length002 = depth + minClampingDistance
 const sketch001 = startSketchOn(XZ)
   |> startProfileAt([0, depth - templateGap], %)
   |> xLine(length = length001, tag = $seg01)
-  |> arc({
+  |> arc(
-       angleEnd: 0,
+       angleEnd = 0,
-       angleStart: 90,
+       angleStart = 90,
-       radius: radius - templateGap
+       radius = radius - templateGap
-     }, %)
+     )
   |> yLine(endAbsolute = -templateGap * 2 - (templateDiameter / 2), tag = $seg05)
   |> xLine(endAbsolute = slateWidthHalf + templateThickness, tag = $seg04)
   |> yLine(length = -length002, tag = $seg03)
@@ -25,11 +25,11 @@ const sketch001 = startSketchOn(XZ)
   |> yLine(length = segLen(seg03, %))
   |> xLine(length = segLen(seg04, %))
   |> yLine(length = segLen(seg05, %))
-  |> arc({
+  |> arc(
-       angleEnd: 90,
+       angleEnd = 90,
-       angleStart: 180,
+       angleStart = 180,
-       radius: radius - templateGap
+       radius = radius - templateGap
-     }, %)
+     )
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 const extrude001 = extrude(sketch001, length = 5)

rust/kcl-lib/e2e/executor/inputs/server-rack-heavy.kcl

@@ -48,11 +48,11 @@ fn caster = (originStart) => {
 
   const sketch002c = startSketchOn(sketch001c, face = 'START')
     |> startProfileAt([-originStart[0], 2.2 + originStart[1]], %)
-    |> arc({
+    |> arc(
-         angle_start: 30,
+         angle_start = 30,
-         angle_end: 330,
+         angle_end = 330,
-         radius: 3.2 / 2
+         radius = 3.2 / 2
-       }, %)
+       )
     |> close()
     |> extrude(length = 3.1)
 
@@ -378,17 +378,9 @@ const sketch017w = startSketchOn(plane002)
        depth - 1 - (3.7 * cos(23 * pi() / 180)),
        60.65 + 3.7 * sin(23 * pi() / 180) + 1.75 / 2
      ], %)
-  |> arc({
+  |> arc(angleStart = -23, angleEnd = 180 - 23, radius = 7 / 2 + 2)
-       angleStart: -23,
-       angleEnd: 180 - 23,
-       radius: 7 / 2 + 2
-     }, %)
   |> angledLine(angle = -23 + 180, length = -1 )
-  |> arc({
+  |> arc(angleStart = 180 - 23, angleEnd = -23, radius = 7 / 2 + 1)
-       angleStart: 180 - 23,
-       angleEnd: -23,
-       radius: 7 / 2 + 1
-     }, %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 const extrude017w = extrude(sketch017w, length = 1)
@@ -398,17 +390,9 @@ const sketch018w = startSketchOn(plane002)
        depth - 1 - (19.3 * cos(23 * pi() / 180)),
        60.65 + 19.3 * sin(23 * pi() / 180) + 1.75 / 2
      ], %)
-  |> arc({
+  |> arc(angleStart = -23, angleEnd = 180 - 23, radius = 7 / 2 + 2)
-       angleStart: -23,
-       angleEnd: 180 - 23,
-       radius: 7 / 2 + 2
-     }, %)
   |> angledLine(angle = -23 + 180, length = -1 )
-  |> arc({
+  |> arc(angleStart = 180 - 23, angleEnd = -23, radius = 7 / 2 + 1)
-       angleStart: 180 - 23,
-       angleEnd: -23,
-       radius: 7 / 2 + 1
-     }, %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 const extrude018w = extrude(sketch018w, length = 1)
@@ -627,17 +611,9 @@ const extrude002fl = extrude(sketch002fl, length = thickness)
 // Bend
 const sketch003fl = startSketchOn(planeXYfl)
   |> startProfileAt([0 + thickness + bendRad+originStart[1], originStart[0]], %)
-  |> arc({
+  |> arc(angleStart = 270, angleEnd = 180, radius = bendRad + thickness)
-       angleStart: 270,
-       angleEnd: 180,
-       radius: bendRad + thickness
-     }, %)
   |> xLine(length = thickness)
-  |> arc({
+  |> arc(angleStart = 180, angleEnd = 270, radius = bendRad)
-       angleStart: 180,
-       angleEnd: 270,
-       radius: bendRad
-     }, %)
   |> yLine(length = -thickness)
   |> close()
 
@@ -853,17 +829,9 @@ const sketch003fr = startSketchOn(planeXYfr)
        bendRad + originStart[1] + width - 2 - thickness - bendRad,
        originStart[0] + bendRad + thickness
      ], %)
-  |> arc({
+  |> arc(angleStart = 0, angleEnd = -90, radius = bendRad)
-       angleStart: 0,
-       angleEnd: -90,
-       radius: bendRad
-     }, %)
   |> yLine(length = -thickness)
-  |> arc({
+  |> arc(angleStart = -90, angleEnd = 0, radius = bendRad + thickness)
-       angleStart: -90,
-       angleEnd: 0,
-       radius: bendRad + thickness
-     }, %)
   |> close()
 
 const extrude003fr = extrude(sketch003fr, length = railHeight * 1.75)
@@ -1093,17 +1061,9 @@ const sketch003rr = startSketchOn(planeXYrr)
        bendRad + originStart[1] + width - 2-bendRad,
        originStart[0]-bendRad
      ], %)
-  |> arc({
+  |> arc(angleStart = 0, angleEnd = 90, radius = bendRad+thickness)
-       angleStart: 0,
-       angleEnd: 90,
-       radius: bendRad+thickness
-     }, %)
   |> yLine(length = -thickness)
-    |> arc({
+    |> arc(angleStart = 90, angleEnd = 0, radius = bendRad)
-       angleStart: 90,
-       angleEnd: 0,
-       radius: bendRad
-     }, %)
   |> close()
 
 const extrude003rr = extrude(sketch003rr, length = railHeight * 1.75)
@@ -1332,17 +1292,9 @@ const sketch003rl = startSketchOn(planeXYrl)
        bendRad + originStart[1] + thickness,
        originStart[0]
      ], %)
-  |> arc({
+  |> arc(angleStart = 90, angleEnd = 180, radius = bendRad)
-       angleStart: 90,
-       angleEnd: 180,
-       radius: bendRad
-     }, %)
   |> xLine(length = -thickness)
-  |> arc({
+  |> arc(angleStart = 180, angleEnd = 90, radius = bendRad + thickness)
-       angleStart: 180,
-       angleEnd: 90,
-       radius: bendRad + thickness
-     }, %)
   |> close()
 
 const extrude003rl = extrude(sketch003rl, length = railHeight * 1.75)

rust/kcl-lib/e2e/executor/inputs/server-rack-lite.kcl

@@ -46,11 +46,11 @@ fn caster = (originStart) => {
 
   const sketch002c = startSketchOn(sketch001c, face = 'START')
     |> startProfileAt([-originStart[0], 2.2 + originStart[1]], %)
-    |> arc({
+    |> arc(
-         angle_start: 30,
+         angle_start = 30,
-         angle_end: 330,
+         angle_end = 330,
-         radius: 3.2 / 2
+         radius = 3.2 / 2
-       }, %)
+       )
     |> close()
     |> extrude(length = 3.1)
 
@@ -368,17 +368,9 @@ const sketch017w = startSketchOn(plane002)
        depth - 1 - (3.7 * cos(23 * pi() / 180)),
        60.65 + 3.7 * sin(23 * pi() / 180) + 1.75 / 2
      ], %)
-  |> arc({
+  |> arc(angleStart = -23, angleEnd = 180 - 23, radius = 7 / 2 + 2)
-       angleStart: -23,
-       angleEnd: 180 - 23,
-       radius: 7 / 2 + 2
-     }, %)
   |> angledLine(angle = -23 + 180, length = -1 )
-  |> arc({
+  |> arc(angleStart = 180 - 23, angleEnd = -23, radius = 7 / 2 + 1)
-       angleStart: 180 - 23,
-       angleEnd: -23,
-       radius: 7 / 2 + 1
-     }, %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 const extrude017w = extrude(sketch017w, length = 1)
@@ -388,17 +380,9 @@ const sketch018w = startSketchOn(plane002)
        depth - 1 - (19.3 * cos(23 * pi() / 180)),
        60.65 + 19.3 * sin(23 * pi() / 180) + 1.75 / 2
      ], %)
-  |> arc({
+  |> arc(angleStart = -23, angleEnd = 180 - 23, radius = 7 / 2 + 2)
-       angleStart: -23,
-       angleEnd: 180 - 23,
-       radius: 7 / 2 + 2
-     }, %)
   |> angledLine(angle = -23 + 180, length = -1 )
-  |> arc({
+  |> arc(angleStart = 180 - 23, angleEnd = -23, radius = 7 / 2 + 1)
-       angleStart: 180 - 23,
-       angleEnd: -23,
-       radius: 7 / 2 + 1
-     }, %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 const extrude018w = extrude(sketch018w, length = 1)
@@ -628,17 +612,9 @@ const sketch003fl = startSketchOn(planeXYfl)
        0 + thickness + bendRad + originStart[1],
        originStart[0]
      ], %)
-  |> arc({
+  |> arc(angleStart = 270, angleEnd = 180, radius = bendRad + thickness)
-       angleStart: 270,
-       angleEnd: 180,
-       radius: bendRad + thickness
-     }, %)
   |> xLine(length = thickness)
-  |> arc({
+  |> arc(angleStart = 180, angleEnd = 270, radius = bendRad)
-       angleStart: 180,
-       angleEnd: 270,
-       radius: bendRad
-     }, %)
   |> yLine(length = -thickness)
   |> close()
 
@@ -761,17 +737,9 @@ const sketch003fr = startSketchOn(planeXYfr)
        bendRad + originStart[1] + width - 2 - thickness - bendRad,
        originStart[0] + bendRad + thickness
      ], %)
-  |> arc({
+  |> arc(angleStart = 0, angleEnd = -90, radius = bendRad)
-       angleStart: 0,
-       angleEnd: -90,
-       radius: bendRad
-     }, %)
   |> yLine(length = -thickness)
-  |> arc({
+  |> arc(angleStart = -90, angleEnd = 0, radius = bendRad + thickness)
-       angleStart: -90,
-       angleEnd: 0,
-       radius: bendRad + thickness
-     }, %)
   |> close()
 
 const extrude003fr = extrude(sketch003fr, length = railHeight * 1.75)
@@ -893,17 +861,9 @@ const sketch003rr = startSketchOn(planeXYrr)
        bendRad + originStart[1] + width - 2 - bendRad,
        originStart[0] - bendRad
      ], %)
-  |> arc({
+  |> arc(angleStart = 0, angleEnd = 90, radius = bendRad + thickness)
-       angleStart: 0,
-       angleEnd: 90,
-       radius: bendRad + thickness
-     }, %)
   |> yLine(length = -thickness)
-  |> arc({
+  |> arc(angleStart = 90, angleEnd = 0, radius = bendRad)
-       angleStart: 90,
-       angleEnd: 0,
-       radius: bendRad
-     }, %)
   |> close()
 
 const extrude003rr = extrude(sketch003rr, length = railHeight * 1.75)
@@ -1024,17 +984,9 @@ const sketch003rl = startSketchOn(planeXYrl)
        bendRad + originStart[1] + thickness,
        originStart[0]
      ], %)
-  |> arc({
+  |> arc(angleStart = 90, angleEnd = 180, radius = bendRad)
-       angleStart: 90,
-       angleEnd: 180,
-       radius: bendRad
-     }, %)
   |> xLine(length = -thickness)
-  |> arc({
+  |> arc(angleStart = 180, angleEnd = 90, radius = bendRad + thickness)
-       angleStart: 180,
-       angleEnd: 90,
-       radius: bendRad + thickness
-     }, %)
   |> close()
 
 const extrude003rl = extrude(sketch003rl, length = railHeight * 1.75)

rust/kcl-lib/e2e/executor/main.rs

@@ -290,7 +290,7 @@ async fn optional_params() {
     fn other_circle = (pos, radius, tag?) => {
       sg = startSketchOn(XY)
         |> startProfileAt(pos, %)
-        |> arc({angleEnd = 360, angleStart = 0, radius}, %)
+        |> arc(angleEnd = 360, angleStart = 0, radius = radius)
         |> close()
         |> extrude(length = 2)
 
@@ -1191,11 +1191,12 @@ async fn kcl_test_plumbus_fillets() {
     let code = r#"fn make_circle = (ext, face, pos, radius) => {
   sg = startSketchOn(ext, face = face)
   |> startProfileAt([pos[0] + radius, pos[1]], %)
-  |> arc({
+  |> arc(
        angleEnd = 360,
        angleStart = 0,
-       radius = radius
+       radius = radius,
-     }, %, $arc1)
+       tag = $arc1,
+     )
   |> close()
 
   return sg
@@ -1769,11 +1770,11 @@ async fn kcl_test_extrude_custom_plane() {
 async fn kcl_test_arc_error_same_start_end() {
     let code = r#"startSketchOn(XY)
   |> startProfileAt([10, 0], %)
-  |> arc({
+  |> arc(
-       angleStart: 180,
+       angleStart = 180,
-       angleEnd: 180,
+       angleEnd = 180,
-       radius= 1.5
+       radius = 1.5
-     }, %)
+     )
   |> close()
   |> patternCircular2d(
        arcDegrees = 360,
@@ -1784,11 +1785,9 @@ async fn kcl_test_arc_error_same_start_end() {
 "#;
 
     let result = execute_and_snapshot(code, None).await;
-    assert!(result.is_err());
+    let err = result.expect_err("Code should have failed due to end angle === start angle");
-    assert_eq!(
+    let err = err.as_kcl_error().unwrap();
-        result.err().unwrap().to_string(),
+    assert_eq!(err.message(), "Arc start and end angles must be different");
-        r#"type: KclErrorDetails { source_ranges: [SourceRange([55, 136, 0])], message: "Arc start and end angles must be different" }"#
-    );
 }
 
 #[tokio::test(flavor = "multi_thread")]

rust/kcl-lib/src/docs/mod.rs

@@ -964,11 +964,7 @@ mod tests {
         let snippet = arc_fn.to_autocomplete_snippet().unwrap();
         assert_eq!(
             snippet,
-            r#"arc({
+            r#"arc(${0:%}, angleStart = ${1:3.14}, angleEnd = ${2:3.14}, radius = ${3:3.14})"#
-	angleStart = ${0:3.14},
-	angleEnd = ${1:3.14},
-	radius = ${2:3.14},
-}, ${3:%})"#
         );
     }
 

rust/kcl-lib/src/execution/artifact.rs

@@ -1122,32 +1122,36 @@ fn artifacts_to_update(
 
             let mut new_solid_ids = vec![id];
 
+            // Make sure we don't ever create a duplicate ID since merge_ids
+            // can't handle it.
+            let not_cmd_id = move |solid_id: &ArtifactId| *solid_id != id;
+
             match response {
                 OkModelingCmdResponse::BooleanIntersection(intersection) => intersection
                     .extra_solid_ids
                     .iter()
                     .copied()
                     .map(ArtifactId::new)
+                    .filter(not_cmd_id)
                     .for_each(|id| new_solid_ids.push(id)),
                 OkModelingCmdResponse::BooleanSubtract(subtract) => subtract
                     .extra_solid_ids
                     .iter()
                     .copied()
                     .map(ArtifactId::new)
+                    .filter(not_cmd_id)
                     .for_each(|id| new_solid_ids.push(id)),
                 OkModelingCmdResponse::BooleanUnion(union) => union
                     .extra_solid_ids
                     .iter()
                     .copied()
                     .map(ArtifactId::new)
+                    .filter(not_cmd_id)
                     .for_each(|id| new_solid_ids.push(id)),
                 _ => {}
             }
             let return_arr = new_solid_ids
                 .into_iter()
-                // Extra solid IDs may include the command's ID.  Make sure we
-                // don't create a duplicate.
-                .filter(|solid_id| *solid_id != id)
                 .map(|solid_id| {
                     Artifact::CompositeSolid(CompositeSolid {
                         id: solid_id,

rust/kcl-lib/src/execution/geometry.rs

@@ -1114,10 +1114,10 @@ pub enum Path {
         /// Point 1 of the arc (base on the end of previous segment)
         #[ts(type = "[number, number]")]
         p1: [f64; 2],
-        /// Point 2 of the arc (interior kwarg)
+        /// Point 2 of the arc (interiorAbsolute kwarg)
         #[ts(type = "[number, number]")]
         p2: [f64; 2],
-        /// Point 3 of the arc (end kwarg)
+        /// Point 3 of the arc (endAbsolute kwarg)
         #[ts(type = "[number, number]")]
         p3: [f64; 2],
     },

rust/kcl-lib/src/lsp/tests.rs

@@ -1643,11 +1643,7 @@ sphere = startSketchOn(XZ)
        0 - 0.05
      ], %)
   |> line(end = [sphereDia - 0.1, 0])
-  |> arc({
+  |> arc(angle_start = 0, angle_end = -180, radius = sphereDia / 2 - 0.05)
-       angle_start: 0,
-       angle_end: -180,
-       radius: sphereDia / 2 - 0.05
-     }, %)
   |> close()
   |> revolve({ axis = X }, %)
   |> patternCircular3d(
@@ -1706,7 +1702,7 @@ outsideRevolve = startSketchOn(XZ)
         tower_lsp::lsp_types::Range {
             start: tower_lsp::lsp_types::Position { line: 0, character: 0 },
             end: tower_lsp::lsp_types::Position {
-                line: 60,
+                line: 56,
                 character: 29
             }
         }
@@ -1743,11 +1739,7 @@ sphere = startSketchOn(XZ)
        0 - 0.05
      ], %)
   |> line(end = [sphereDia - 0.1, 0])
-  |> arc({
+  |> arc(angle_start = 0, angle_end = -180, radius = sphereDia / 2 - 0.05)
-       angle_start = 0,
-       angle_end = -180,
-       radius = sphereDia / 2 - 0.05
-     }, %)
   |> close()
   |> revolve({ axis = X }, %)
   |> patternCircular3d(

rust/kcl-lib/src/parsing/parser.rs

@@ -5326,17 +5326,6 @@ mod snapshot_tests {
             c: 3
         }"
     );
-    snapshot_test!(
-        ba,
-        r#"
-sketch001 = startSketchOn('XY')
-  // |> arc({
-  //   angleEnd: 270,
-  //   angleStart: 450,
-  // }, %)
-  |> startProfileAt(%)
-"#
-    );
     snapshot_test!(
         bb,
         r#"

rust/kcl-lib/src/std/args.rs

@@ -1120,39 +1120,6 @@ impl<'a> FromKclValue<'a> for FaceTag {
     }
 }
 
-impl<'a> FromKclValue<'a> for super::sketch::ArcData {
-    fn from_kcl_val(arg: &'a KclValue) -> Option<Self> {
-        let obj = arg.as_object()?;
-        let case1 = || {
-            let angle_start = obj.get("angleStart")?.as_ty_f64()?;
-            let angle_end = obj.get("angleEnd")?.as_ty_f64()?;
-            let_field_of!(obj, radius, TyF64);
-            Some(Self::AnglesAndRadius {
-                angle_start,
-                angle_end,
-                radius,
-            })
-        };
-        let case2 = || {
-            let obj = arg.as_object()?;
-            let_field_of!(obj, to);
-            let_field_of!(obj, center);
-            let_field_of!(obj, radius, TyF64);
-            Some(Self::CenterToRadius { center, to, radius })
-        };
-        case1().or_else(case2)
-    }
-}
-
-impl<'a> FromKclValue<'a> for super::sketch::ArcToData {
-    fn from_kcl_val(arg: &'a KclValue) -> Option<Self> {
-        let obj = arg.as_object()?;
-        let_field_of!(obj, end);
-        let_field_of!(obj, interior);
-        Some(Self { end, interior })
-    }
-}
-
 impl<'a> FromKclValue<'a> for super::sketch::TangentialArcData {
     fn from_kcl_val(arg: &'a KclValue) -> Option<Self> {
         let obj = arg.as_object()?;

rust/kcl-lib/src/std/extrude.rs

@@ -64,11 +64,11 @@ pub async fn extrude(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
 /// example = startSketchOn('XZ')
 ///   |> startProfileAt([0, 0], %)
 ///   |> line(end = [10, 0])
-///   |> arc({
+///   |> arc(
 ///     angleStart = 120,
 ///     angleEnd = 0,
 ///     radius = 5,
-///   }, %)
+///   )
 ///   |> line(end = [5, 0])
 ///   |> line(end = [0, 10])
 ///   |> bezierCurve({
@@ -84,11 +84,11 @@ pub async fn extrude(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
 /// ```no_run
 /// exampleSketch = startSketchOn('XZ')
 ///   |> startProfileAt([-10, 0], %)
-///   |> arc({
+///   |> arc(
 ///     angleStart = 120,
 ///     angleEnd = -60,
 ///     radius = 5,
-///   }, %)
+///   )
 ///   |> line(end = [10, 0])
 ///   |> line(end = [5, 0])
 ///   |> bezierCurve({
@@ -106,11 +106,11 @@ pub async fn extrude(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
 /// ```no_run
 /// exampleSketch = startSketchOn('XZ')
 ///   |> startProfileAt([-10, 0], %)
-///   |> arc({
+///   |> arc(
 ///     angleStart = 120,
 ///     angleEnd = -60,
 ///     radius = 5,
-///   }, %)
+///   )
 ///   |> line(end = [10, 0])
 ///   |> line(end = [5, 0])
 ///   |> bezierCurve({
@@ -128,11 +128,11 @@ pub async fn extrude(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
 /// ```no_run
 /// exampleSketch = startSketchOn('XZ')
 ///   |> startProfileAt([-10, 0], %)
-///   |> arc({
+///   |> arc(
 ///     angleStart = 120,
 ///     angleEnd = -60,
 ///     radius = 5,
-///   }, %)
+///   )
 ///   |> line(end = [10, 0])
 ///   |> line(end = [5, 0])
 ///   |> bezierCurve({

rust/kcl-lib/src/std/mod.rs

@@ -84,7 +84,6 @@ lazy_static! {
         Box::new(crate::std::sketch::ProfileStart),
         Box::new(crate::std::sketch::Close),
         Box::new(crate::std::sketch::Arc),
-        Box::new(crate::std::sketch::ArcTo),
         Box::new(crate::std::sketch::TangentialArc),
         Box::new(crate::std::sketch::BezierCurve),
         Box::new(crate::std::sketch::Hole),

rust/kcl-lib/src/std/segment.rs

@@ -529,10 +529,11 @@ pub async fn tangent_to_end(exec_state: &mut ExecState, args: Args) -> Result<Kc
 /// ```no_run
 /// bottom = startSketchOn("XY")
 ///   |> startProfileAt([0, 0], %)
-///   |> arcTo({
+///   |> arc(
-///        end: [10, 10],
+///        endAbsolute = [10, 10],
-///        interior: [5, 1]
+///        interiorAbsolute = [5, 1],
-///      }, %, $arc1)
+///        tag = $arc1,
+///      )
 ///   |> angledLine(angle = tangentToEnd(arc1), length = 20)
 ///   |> close()
 /// ```

rust/kcl-lib/src/std/sketch.rs

@@ -24,7 +24,7 @@ use crate::{
     std::{
         args::{Args, TyF64},
         utils::{
-            arc_angles, arc_center_and_end, get_tangential_arc_to_info, get_x_component, get_y_component,
+            arc_center_and_end, get_tangential_arc_to_info, get_x_component, get_y_component,
             intersection_with_parallel_line, TangentialArcInfoInput,
         },
     },
@@ -104,7 +104,7 @@ pub async fn involute_circular(exec_state: &mut ExecState, args: Args) -> Result
     let end_radius: TyF64 = args.get_kw_arg_typed("endRadius", &RuntimeType::length(), exec_state)?;
     let angle: TyF64 = args.get_kw_arg_typed("angle", &RuntimeType::angle(), exec_state)?;
     let reverse = args.get_kw_arg_opt("reverse")?;
-    let tag = args.get_kw_arg_opt("tag")?;
+    let tag = args.get_kw_arg_opt(NEW_TAG_KW)?;
     let new_sketch = inner_involute_circular(
         sketch,
         start_radius.n,
@@ -1636,51 +1636,31 @@ pub(crate) async fn inner_close(
     Ok(new_sketch)
 }
 
-/// Data to draw an arc.
-#[derive(Debug, Clone, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
-#[ts(export)]
-#[serde(rename_all = "camelCase", untagged)]
-pub enum ArcData {
-    /// Angles and radius with an optional tag.
-    AnglesAndRadius {
-        /// The start angle.
-        #[serde(rename = "angleStart")]
-        #[schemars(range(min = -360.0, max = 360.0))]
-        angle_start: TyF64,
-        /// The end angle.
-        #[serde(rename = "angleEnd")]
-        #[schemars(range(min = -360.0, max = 360.0))]
-        angle_end: TyF64,
-        /// The radius.
-        radius: TyF64,
-    },
-    /// Center, to and radius with an optional tag.
-    CenterToRadius {
-        /// The center.
-        center: [TyF64; 2],
-        /// The to point.
-        to: [TyF64; 2],
-        /// The radius.
-        radius: TyF64,
-    },
-}
-
-/// Data to draw a three point arc (arcTo).
-#[derive(Debug, Clone, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
-#[ts(export)]
-#[serde(rename_all = "camelCase")]
-pub struct ArcToData {
-    /// End point of the arc. A point in 3D space
-    pub end: [TyF64; 2],
-    /// Interior point of the arc. A point in 3D space
-    pub interior: [TyF64; 2],
-}
-
 /// Draw an arc.
 pub async fn arc(exec_state: &mut ExecState, args: Args) -> Result<KclValue, KclError> {
-    let (data, sketch, tag): (ArcData, Sketch, Option<TagNode>) = args.get_data_and_sketch_and_tag(exec_state)?;
+    let sketch =
+        args.get_unlabeled_kw_arg_typed("sketch", &RuntimeType::Primitive(PrimitiveType::Sketch), exec_state)?;
 
-    let new_sketch = inner_arc(data, sketch, tag, exec_state, args).await?;
+    let angle_start: Option<TyF64> = args.get_kw_arg_opt_typed("angleStart", &RuntimeType::degrees(), exec_state)?;
+    let angle_end: Option<TyF64> = args.get_kw_arg_opt_typed("angleEnd", &RuntimeType::degrees(), exec_state)?;
+    let radius: Option<TyF64> = args.get_kw_arg_opt_typed("radius", &RuntimeType::length(), exec_state)?;
+    let end_absolute: Option<[TyF64; 2]> =
+        args.get_kw_arg_opt_typed("endAbsolute", &RuntimeType::point2d(), exec_state)?;
+    let interior_absolute: Option<[TyF64; 2]> =
+        args.get_kw_arg_opt_typed("interiorAbsolute", &RuntimeType::point2d(), exec_state)?;
+    let tag = args.get_kw_arg_opt(NEW_TAG_KW)?;
+    let new_sketch = inner_arc(
+        sketch,
+        angle_start,
+        angle_end,
+        radius,
+        interior_absolute,
+        end_absolute,
+        tag,
+        exec_state,
+        args,
+    )
+    .await?;
     Ok(KclValue::Sketch {
         value: Box::new(new_sketch),
     })
@@ -1701,74 +1681,167 @@ pub async fn arc(exec_state: &mut ExecState, args: Args) -> Result<KclValue, Kcl
 /// exampleSketch = startSketchOn(XZ)
 ///   |> startProfileAt([0, 0], %)
 ///   |> line(end = [10, 0])
-///   |> arc({
+///   |> arc(
 ///        angleStart = 0,
 ///        angleEnd = 280,
 ///        radius = 16
-///      }, %)
+///      )
+///   |> close()
+/// example = extrude(exampleSketch, length = 10)
+/// ```
+/// ```no_run
+/// exampleSketch = startSketchOn(XZ)
+///   |> startProfileAt([0, 0], %)
+///   |> arc(
+///         endAbsolute = [10,0],
+///         interiorAbsolute = [5,5]
+///      )
 ///   |> close()
 /// example = extrude(exampleSketch, length = 10)
 /// ```
 #[stdlib {
     name = "arc",
+    keywords = true,
+    unlabeled_first = true,
+    args = {
+        sketch = { docs = "Which sketch should this path be added to?" },
+        angle_start = { docs = "Where along the circle should this arc start?", include_in_snippet = true },
+        angle_end = { docs = "Where along the circle should this arc end?", include_in_snippet = true },
+        radius = { docs = "How large should the circle be?", include_in_snippet = true },
+        interior_absolute = { docs = "Any point between the arc's start and end? Requires `endAbsolute`. Incompatible with `angleStart` or `angleEnd`" },
+        end_absolute = { docs = "Where should this arc end? Requires `interiorAbsolute`. Incompatible with `angleStart` or `angleEnd`" },
+        tag = { docs = "Create a new tag which refers to this line"},
+    }
 }]
+#[allow(clippy::too_many_arguments)]
 pub(crate) async fn inner_arc(
-    data: ArcData,
     sketch: Sketch,
+    angle_start: Option<TyF64>,
+    angle_end: Option<TyF64>,
+    radius: Option<TyF64>,
+    interior_absolute: Option<[TyF64; 2]>,
+    end_absolute: Option<[TyF64; 2]>,
     tag: Option<TagNode>,
     exec_state: &mut ExecState,
     args: Args,
 ) -> Result<Sketch, KclError> {
     let from: Point2d = sketch.current_pen_position()?;
+    let id = exec_state.next_uuid();
 
-    let (center, angle_start, angle_end, radius, end) = match &data {
+    // Relative case
-        ArcData::AnglesAndRadius {
+    match (angle_start, angle_end, radius, interior_absolute, end_absolute) {
-            angle_start,
+        (Some(angle_start), Some(angle_end), Some(radius), None, None) => {
-            angle_end,
+            relative_arc(&args, id, exec_state, sketch, from, angle_start, angle_end, radius, tag).await
-            radius,
+        }
-        } => {
+        (None, None, None, Some(interior_absolute), Some(end_absolute)) => {
+            absolute_arc(&args, id, exec_state, sketch, from, interior_absolute, end_absolute, tag).await
+        }
+        _ => {
+            Err(KclError::Type(KclErrorDetails {
+                message:
+                    "Invalid combination of arguments. Either provide (angleStart, angleEnd, radius) or (endAbsolute, interiorAbsolute)"
+                        .to_string(),
+                source_ranges: vec![args.source_range],
+            }))
+        }
+    }
+}
+
+#[allow(clippy::too_many_arguments)]
+pub async fn absolute_arc(
+    args: &Args,
+    id: uuid::Uuid,
+    exec_state: &mut ExecState,
+    sketch: Sketch,
+    from: Point2d,
+    interior_absolute: [TyF64; 2],
+    end_absolute: [TyF64; 2],
+    tag: Option<TagNode>,
+) -> Result<Sketch, KclError> {
+    // The start point is taken from the path you are extending.
+    args.batch_modeling_cmd(
+        id,
+        ModelingCmd::from(mcmd::ExtendPath {
+            path: sketch.id.into(),
+            segment: PathSegment::ArcTo {
+                end: kcmc::shared::Point3d {
+                    x: LengthUnit(end_absolute[0].n),
+                    y: LengthUnit(end_absolute[1].n),
+                    z: LengthUnit(0.0),
+                },
+                interior: kcmc::shared::Point3d {
+                    x: LengthUnit(interior_absolute[0].n),
+                    y: LengthUnit(interior_absolute[1].n),
+                    z: LengthUnit(0.0),
+                },
+                relative: false,
+            },
+        }),
+    )
+    .await?;
+
+    let start = [from.x, from.y];
+    let end = end_absolute.clone();
+    let untyped_end = untype_point(end);
+
+    let current_path = Path::ArcThreePoint {
+        base: BasePath {
+            from: from.into(),
+            to: untyped_end.0,
+            tag: tag.clone(),
+            units: sketch.units,
+            geo_meta: GeoMeta {
+                id,
+                metadata: args.source_range.into(),
+            },
+        },
+        p1: start,
+        p2: untype_point(interior_absolute).0,
+        p3: untyped_end.0,
+    };
+
+    let mut new_sketch = sketch.clone();
+    if let Some(tag) = &tag {
+        new_sketch.add_tag(tag, &current_path, exec_state);
+    }
+
+    new_sketch.paths.push(current_path);
+
+    Ok(new_sketch)
+}
+
+#[allow(clippy::too_many_arguments)]
+pub async fn relative_arc(
+    args: &Args,
+    id: uuid::Uuid,
+    exec_state: &mut ExecState,
+    sketch: Sketch,
+    from: Point2d,
+    angle_start: TyF64,
+    angle_end: TyF64,
+    radius: TyF64,
+    tag: Option<TagNode>,
+) -> Result<Sketch, KclError> {
     let a_start = Angle::from_degrees(angle_start.n);
     let a_end = Angle::from_degrees(angle_end.n);
     let (center, end) = arc_center_and_end(from.into(), a_start, a_end, radius.n);
-            (center, a_start, a_end, radius.n, end)
-        }
-        ArcData::CenterToRadius { center, to, radius } => {
-            let (angle_start, angle_end) = arc_angles(
-                from.into(),
-                untype_point(to.clone()).0,
-                untype_point(center.clone()).0,
-                radius.n,
-                args.source_range,
-            )?;
-            (
-                untype_point(center.clone()).0,
-                angle_start,
-                angle_end,
-                radius.n,
-                untype_point(to.clone()).0,
-            )
-        }
-    };
-
     if angle_start == angle_end {
         return Err(KclError::Type(KclErrorDetails {
             message: "Arc start and end angles must be different".to_string(),
             source_ranges: vec![args.source_range],
         }));
     }
-    let ccw = angle_start < angle_end;
+    let ccw = angle_start.n < angle_end.n;
-
-    let id = exec_state.next_uuid();
 
     args.batch_modeling_cmd(
         id,
         ModelingCmd::from(mcmd::ExtendPath {
             path: sketch.id.into(),
             segment: PathSegment::Arc {
-                start: angle_start,
+                start: a_start,
-                end: angle_end,
+                end: a_end,
                 center: KPoint2d::from(center).map(LengthUnit),
-                radius: LengthUnit(radius),
+                radius: LengthUnit(radius.n),
                 relative: false,
             },
         }),
@@ -1787,7 +1860,7 @@ pub(crate) async fn inner_arc(
             },
         },
         center,
-        radius,
+        radius: radius.n,
         ccw,
     };
 
@@ -1800,98 +1873,6 @@ pub(crate) async fn inner_arc(
 
     Ok(new_sketch)
 }
-
-/// Draw a three point arc.
-pub async fn arc_to(exec_state: &mut ExecState, args: Args) -> Result<KclValue, KclError> {
-    let (data, sketch, tag): (ArcToData, Sketch, Option<TagNode>) = args.get_data_and_sketch_and_tag(exec_state)?;
-
-    let new_sketch = inner_arc_to(data, sketch, tag, exec_state, args).await?;
-    Ok(KclValue::Sketch {
-        value: Box::new(new_sketch),
-    })
-}
-
-/// Draw a three point arc.
-///
-/// The arc is constructed such that the start point is the current position of the sketch and two more points defined as the end and interior point.
-/// The interior point is placed between the start point and end point. The radius of the arc will be controlled by how far the interior point is placed from
-/// the start and end.
-///
-/// ```no_run
-/// exampleSketch = startSketchOn(XZ)
-///   |> startProfileAt([0, 0], %)
-///   |> arcTo({
-///         end = [10,0],
-///         interior = [5,5]
-///      }, %)
-///   |> close()
-/// example = extrude(exampleSketch, length = 10)
-/// ```
-#[stdlib {
-    name = "arcTo",
-}]
-pub(crate) async fn inner_arc_to(
-    data: ArcToData,
-    sketch: Sketch,
-    tag: Option<TagNode>,
-    exec_state: &mut ExecState,
-    args: Args,
-) -> Result<Sketch, KclError> {
-    let from: Point2d = sketch.current_pen_position()?;
-    let id = exec_state.next_uuid();
-
-    // The start point is taken from the path you are extending.
-    args.batch_modeling_cmd(
-        id,
-        ModelingCmd::from(mcmd::ExtendPath {
-            path: sketch.id.into(),
-            segment: PathSegment::ArcTo {
-                end: kcmc::shared::Point3d {
-                    x: LengthUnit(data.end[0].n),
-                    y: LengthUnit(data.end[1].n),
-                    z: LengthUnit(0.0),
-                },
-                interior: kcmc::shared::Point3d {
-                    x: LengthUnit(data.interior[0].n),
-                    y: LengthUnit(data.interior[1].n),
-                    z: LengthUnit(0.0),
-                },
-                relative: false,
-            },
-        }),
-    )
-    .await?;
-
-    let start = [from.x, from.y];
-    let interior = data.interior;
-    let end = data.end.clone();
-
-    let current_path = Path::ArcThreePoint {
-        base: BasePath {
-            from: from.into(),
-            to: untype_point(data.end).0,
-            tag: tag.clone(),
-            units: sketch.units,
-            geo_meta: GeoMeta {
-                id,
-                metadata: args.source_range.into(),
-            },
-        },
-        p1: start,
-        p2: untype_point(interior).0,
-        p3: untype_point(end).0,
-    };
-
-    let mut new_sketch = sketch.clone();
-    if let Some(tag) = &tag {
-        new_sketch.add_tag(tag, &current_path, exec_state);
-    }
-
-    new_sketch.paths.push(current_path);
-
-    Ok(new_sketch)
-}
-
 /// Draw a tangential arc to a specific point.
 pub async fn tangential_arc(exec_state: &mut ExecState, args: Args) -> Result<KclValue, KclError> {
     let sketch =

rust/kcl-lib/tests/import_async/artifact_graph_flowchart.snap.md

@@ -108,7 +108,7 @@ flowchart LR
     112["Segment<br>[1250, 1288, 0]"]
     113["Segment<br>[1250, 1288, 0]"]
     114["Segment<br>[1250, 1288, 0]"]
-    115["Segment<br>[1651, 1753, 0]"]
+    115["Segment<br>[1651, 1749, 0]"]
     116["Segment<br>[1478, 1508, 0]"]
     117["Segment<br>[1478, 1508, 0]"]
     118["Segment<br>[1478, 1508, 0]"]
@@ -210,17 +210,17 @@ flowchart LR
     214["Segment<br>[1478, 1508, 0]"]
     215["Segment<br>[1478, 1508, 0]"]
     216["Segment<br>[1478, 1508, 0]"]
-    217["Segment<br>[1799, 1806, 0]"]
+    217["Segment<br>[1795, 1802, 0]"]
     218[Solid2d]
   end
   subgraph path220 [Path]
-    220["Path<br>[2287, 2387, 0]"]
+    220["Path<br>[2283, 2383, 0]"]
-    221["Segment<br>[2393, 2420, 0]"]
+    221["Segment<br>[2389, 2416, 0]"]
-    222["Segment<br>[2426, 2454, 0]"]
+    222["Segment<br>[2422, 2450, 0]"]
-    223["Segment<br>[2460, 2488, 0]"]
+    223["Segment<br>[2456, 2484, 0]"]
-    224["Segment<br>[2494, 2614, 0]"]
+    224["Segment<br>[2490, 2606, 0]"]
-    225["Segment<br>[2620, 2729, 0]"]
+    225["Segment<br>[2612, 2717, 0]"]
-    226["Segment<br>[2735, 2742, 0]"]
+    226["Segment<br>[2723, 2730, 0]"]
     227[Solid2d]
   end
   1["Plane<br>[168, 185, 0]"]
@@ -232,8 +232,8 @@ flowchart LR
   10["SweepEdge Opposite"]
   11["SweepEdge Adjacent"]
   12["Plane<br>[1539, 1556, 0]"]
-  219["Sweep Extrusion<br>[1812, 1840, 0]"]
+  219["Sweep Extrusion<br>[1808, 1836, 0]"]
-  228["Sweep Extrusion<br>[2748, 2777, 0]"]
+  228["Sweep Extrusion<br>[2736, 2765, 0]"]
   229[Wall]
   230[Wall]
   231[Wall]
@@ -246,7 +246,7 @@ flowchart LR
   238["SweepEdge Adjacent"]
   239["SweepEdge Opposite"]
   240["SweepEdge Adjacent"]
-  241["StartSketchOnFace<br>[2250, 2281, 0]"]
+  241["StartSketchOnFace<br>[2246, 2277, 0]"]
   2 --- 3
   3 --- 4
   3 ---- 6

rust/kcl-lib/tests/import_async/ast.snap

@@ -3242,22 +3242,15 @@ description: Result of parsing import_async.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "0",
@@ -3271,18 +3264,15 @@ description: Result of parsing import_async.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleEnd",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "abs_path": false,
                       "commentStart": 0,
                       "end": 0,
@@ -3300,18 +3290,15 @@ description: Result of parsing import_async.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "left": {
@@ -3349,18 +3336,6 @@ description: Result of parsing import_async.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -3379,8 +3354,9 @@ description: Result of parsing import_async.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
@@ -4452,47 +4428,15 @@ description: Result of parsing import_async.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": "angleEnd",
-                          "start": 0,
-                          "type": "Identifier"
-                        },
-                        "start": 0,
-                        "type": "ObjectProperty",
-                        "value": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "raw": "180",
-                          "start": 0,
-                          "type": "Literal",
-                          "type": "Literal",
-                          "value": {
-                            "value": 180.0,
-                            "suffix": "None"
-                          }
-                        }
-                      },
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "left": {
@@ -4582,18 +4526,37 @@ description: Result of parsing import_async.kcl
                     }
                   },
                   {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
-                        "key": {
+                      "name": "angleEnd",
+                      "start": 0,
+                      "type": "Identifier"
+                    },
+                    "arg": {
+                      "commentStart": 0,
+                      "end": 0,
+                      "raw": "180",
+                      "start": 0,
+                      "type": "Literal",
+                      "type": "Literal",
+                      "value": {
+                        "value": 180.0,
+                        "suffix": "None"
+                      }
+                    }
+                  },
+                  {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "abs_path": false,
                       "commentStart": 0,
                       "end": 0,
@@ -4611,18 +4574,6 @@ description: Result of parsing import_async.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -4641,28 +4592,44 @@ description: Result of parsing import_async.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
                   {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
-                    "properties": [
+                      "name": "angleStart",
+                      "start": 0,
+                      "type": "Identifier"
+                    },
+                    "arg": {
+                      "commentStart": 0,
+                      "end": 0,
+                      "raw": "180",
+                      "start": 0,
+                      "type": "Literal",
+                      "type": "Literal",
+                      "value": {
+                        "value": 180.0,
+                        "suffix": "None"
+                      }
+                    }
+                  },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleEnd",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "arguments": [
                         {
                           "abs_path": false,
@@ -4704,43 +4671,15 @@ description: Result of parsing import_async.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": "angleStart",
-                          "start": 0,
-                          "type": "Identifier"
-                        },
-                        "start": 0,
-                        "type": "ObjectProperty",
-                        "value": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "raw": "180",
-                          "start": 0,
-                          "type": "Literal",
-                          "type": "Literal",
-                          "value": {
-                            "value": 180.0,
-                            "suffix": "None"
-                          }
-                        }
-                      },
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "abs_path": false,
                       "commentStart": 0,
                       "end": 0,
@@ -4758,18 +4697,6 @@ description: Result of parsing import_async.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -4788,8 +4715,9 @@ description: Result of parsing import_async.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [],

rust/kcl-lib/tests/import_async/input.kcl

@@ -68,11 +68,11 @@ fn rightInvolute(i, sg) {
 start = startSketchOn(XY)
   |> startProfileAt([xs[101], ys[101]], %)
 teeth = reduce([0..100], start, leftInvolute)
-  |> arc({
+  |> arc(
        angleStart = 0,
        angleEnd = toothAngle,
-       radius = baseDiameter / 2
+       radius = baseDiameter / 2,
-     }, %)
+     )
   |> reduce([1..101], %, rightInvolute)
   |> close()
   |> extrude(length = gearHeight)
@@ -100,16 +100,16 @@ keyWay = startSketchOn(body, face = END)
   |> xLine(length = keywayDepth)
   |> yLine(length = -keywayWidth)
   |> xLine(length = -keywayDepth)
-  |> arc({
+  |> arc(
-       angleEnd = 180,
        angleStart = -1 * toDegrees(startAngle) + 360,
-       radius = holeRadius
+       angleEnd = 180,
-     }, %)
+       radius = holeRadius,
-  |> arc({
+     )
-       angleEnd = toDegrees(startAngle),
+  |> arc(
        angleStart = 180,
-       radius = holeRadius
+       angleEnd = toDegrees(startAngle),
-     }, %)
+       radius = holeRadius,
+     )
   |> close()
   |> extrude(length = -gearHeight)
 

rust/kcl-lib/tests/import_async/unparsed.snap

@@ -71,11 +71,7 @@ fn rightInvolute(i, sg) {
 start = startSketchOn(XY)
   |> startProfileAt([xs[101], ys[101]], %)
 teeth = reduce([0..100], start, leftInvolute)
-  |> arc({
+  |> arc(angleStart = 0, angleEnd = toothAngle, radius = baseDiameter / 2)
-       angleStart = 0,
-       angleEnd = toothAngle,
-       radius = baseDiameter / 2
-     }, %)
   |> reduce([1..101], %, rightInvolute)
   |> close()
   |> extrude(length = gearHeight)
@@ -103,16 +99,8 @@ keyWay = startSketchOn(body, face = END)
   |> xLine(length = keywayDepth)
   |> yLine(length = -keywayWidth)
   |> xLine(length = -keywayDepth)
-  |> arc({
+  |> arc(angleStart = -1 * toDegrees(startAngle) + 360, angleEnd = 180, radius = holeRadius)
-       angleEnd = 180,
+  |> arc(angleStart = 180, angleEnd = toDegrees(startAngle), radius = holeRadius)
-       angleStart = -1 * toDegrees(startAngle) + 360,
-       radius = holeRadius
-     }, %)
-  |> arc({
-       angleEnd = toDegrees(startAngle),
-       angleStart = 180,
-       radius = holeRadius
-     }, %)
   |> close()
   |> extrude(length = -gearHeight)
 

rust/kcl-lib/tests/intersect_cubes/artifact_graph_flowchart.snap.md

@@ -48,6 +48,7 @@ flowchart LR
   42["SweepEdge Adjacent"]
   43["SweepEdge Opposite"]
   44["SweepEdge Adjacent"]
+  45["CompositeSolid Intersect<br>[448, 477, 0]"]
   1 --- 2
   2 --- 3
   2 --- 4
@@ -114,4 +115,6 @@ flowchart LR
   30 --- 42
   30 --- 43
   30 --- 44
+  2 <--x 45
+  24 <--x 45
 ```

rust/kcl-lib/tests/kcl_samples/80-20-rail/artifact_graph_flowchart.snap.md

@@ -2,80 +2,80 @@
 flowchart LR
   subgraph path2 [Path]
     2["Path<br>[349, 446, 0]"]
-    3["Segment<br>[454, 559, 0]"]
+    3["Segment<br>[454, 518, 0]"]
-    4["Segment<br>[567, 676, 0]"]
+    4["Segment<br>[526, 594, 0]"]
-    5["Segment<br>[684, 716, 0]"]
+    5["Segment<br>[602, 634, 0]"]
-    6["Segment<br>[724, 833, 0]"]
+    6["Segment<br>[642, 710, 0]"]
-    7["Segment<br>[841, 888, 0]"]
+    7["Segment<br>[718, 765, 0]"]
-    8["Segment<br>[896, 944, 0]"]
+    8["Segment<br>[773, 821, 0]"]
-    9["Segment<br>[952, 1001, 0]"]
+    9["Segment<br>[829, 878, 0]"]
-    10["Segment<br>[1009, 1107, 0]"]
+    10["Segment<br>[886, 984, 0]"]
-    11["Segment<br>[1115, 1163, 0]"]
+    11["Segment<br>[992, 1040, 0]"]
-    12["Segment<br>[1171, 1260, 0]"]
+    12["Segment<br>[1048, 1137, 0]"]
-    13["Segment<br>[1268, 1317, 0]"]
+    13["Segment<br>[1145, 1194, 0]"]
-    14["Segment<br>[1325, 1374, 0]"]
+    14["Segment<br>[1202, 1251, 0]"]
-    15["Segment<br>[1382, 1415, 0]"]
+    15["Segment<br>[1259, 1292, 0]"]
-    16["Segment<br>[1423, 1532, 0]"]
+    16["Segment<br>[1300, 1368, 0]"]
-    17["Segment<br>[1540, 1572, 0]"]
+    17["Segment<br>[1376, 1408, 0]"]
-    18["Segment<br>[1580, 1689, 0]"]
+    18["Segment<br>[1416, 1484, 0]"]
-    19["Segment<br>[1697, 1800, 0]"]
+    19["Segment<br>[1492, 1554, 0]"]
-    20["Segment<br>[1841, 1951, 0]"]
+    20["Segment<br>[1595, 1664, 0]"]
-    21["Segment<br>[1959, 1991, 0]"]
+    21["Segment<br>[1672, 1704, 0]"]
-    22["Segment<br>[1999, 2109, 0]"]
+    22["Segment<br>[1712, 1781, 0]"]
-    23["Segment<br>[2117, 2164, 0]"]
+    23["Segment<br>[1789, 1836, 0]"]
-    24["Segment<br>[2172, 2222, 0]"]
+    24["Segment<br>[1844, 1894, 0]"]
-    25["Segment<br>[2230, 2280, 0]"]
+    25["Segment<br>[1902, 1952, 0]"]
-    26["Segment<br>[2298, 2408, 0]"]
+    26["Segment<br>[1970, 2080, 0]"]
-    27["Segment<br>[2426, 2475, 0]"]
+    27["Segment<br>[2098, 2147, 0]"]
-    28["Segment<br>[2489, 2584, 0]"]
+    28["Segment<br>[2161, 2256, 0]"]
-    29["Segment<br>[2598, 2648, 0]"]
+    29["Segment<br>[2270, 2320, 0]"]
-    30["Segment<br>[2662, 2711, 0]"]
+    30["Segment<br>[2334, 2383, 0]"]
-    31["Segment<br>[2719, 2752, 0]"]
+    31["Segment<br>[2391, 2424, 0]"]
-    32["Segment<br>[2760, 2870, 0]"]
+    32["Segment<br>[2432, 2501, 0]"]
-    33["Segment<br>[2878, 2910, 0]"]
+    33["Segment<br>[2509, 2541, 0]"]
-    34["Segment<br>[2918, 3028, 0]"]
+    34["Segment<br>[2549, 2618, 0]"]
-    35["Segment<br>[3069, 3171, 0]"]
+    35["Segment<br>[2659, 2720, 0]"]
-    36["Segment<br>[3179, 3289, 0]"]
+    36["Segment<br>[2728, 2797, 0]"]
-    37["Segment<br>[3297, 3330, 0]"]
+    37["Segment<br>[2805, 2838, 0]"]
-    38["Segment<br>[3338, 3448, 0]"]
+    38["Segment<br>[2846, 2915, 0]"]
-    39["Segment<br>[3456, 3505, 0]"]
+    39["Segment<br>[2923, 2972, 0]"]
-    40["Segment<br>[3513, 3563, 0]"]
+    40["Segment<br>[2980, 3030, 0]"]
-    41["Segment<br>[3571, 3620, 0]"]
+    41["Segment<br>[3038, 3087, 0]"]
-    42["Segment<br>[3628, 3737, 0]"]
+    42["Segment<br>[3095, 3204, 0]"]
-    43["Segment<br>[3745, 3795, 0]"]
+    43["Segment<br>[3212, 3262, 0]"]
-    44["Segment<br>[3803, 3899, 0]"]
+    44["Segment<br>[3270, 3366, 0]"]
-    45["Segment<br>[3907, 3956, 0]"]
+    45["Segment<br>[3374, 3423, 0]"]
-    46["Segment<br>[3964, 4013, 0]"]
+    46["Segment<br>[3431, 3480, 0]"]
-    47["Segment<br>[4021, 4055, 0]"]
+    47["Segment<br>[3488, 3522, 0]"]
-    48["Segment<br>[4063, 4173, 0]"]
+    48["Segment<br>[3530, 3599, 0]"]
-    49["Segment<br>[4181, 4214, 0]"]
+    49["Segment<br>[3607, 3640, 0]"]
-    50["Segment<br>[4222, 4332, 0]"]
+    50["Segment<br>[3648, 3717, 0]"]
-    51["Segment<br>[4340, 4444, 0]"]
+    51["Segment<br>[3725, 3788, 0]"]
-    52["Segment<br>[4485, 4595, 0]"]
+    52["Segment<br>[3829, 3898, 0]"]
-    53["Segment<br>[4603, 4636, 0]"]
+    53["Segment<br>[3906, 3939, 0]"]
-    54["Segment<br>[4644, 4754, 0]"]
+    54["Segment<br>[3947, 4016, 0]"]
-    55["Segment<br>[4762, 4811, 0]"]
+    55["Segment<br>[4024, 4073, 0]"]
-    56["Segment<br>[4819, 4868, 0]"]
+    56["Segment<br>[4081, 4130, 0]"]
-    57["Segment<br>[4876, 4925, 0]"]
+    57["Segment<br>[4138, 4187, 0]"]
-    58["Segment<br>[4933, 5033, 0]"]
+    58["Segment<br>[4195, 4295, 0]"]
-    59["Segment<br>[5041, 5091, 0]"]
+    59["Segment<br>[4303, 4353, 0]"]
-    60["Segment<br>[5099, 5188, 0]"]
+    60["Segment<br>[4361, 4450, 0]"]
-    61["Segment<br>[5196, 5245, 0]"]
+    61["Segment<br>[4458, 4507, 0]"]
-    62["Segment<br>[5253, 5303, 0]"]
+    62["Segment<br>[4515, 4565, 0]"]
-    63["Segment<br>[5311, 5345, 0]"]
+    63["Segment<br>[4573, 4607, 0]"]
-    64["Segment<br>[5353, 5463, 0]"]
+    64["Segment<br>[4615, 4684, 0]"]
-    65["Segment<br>[5471, 5504, 0]"]
+    65["Segment<br>[4692, 4725, 0]"]
-    66["Segment<br>[5512, 5622, 0]"]
+    66["Segment<br>[4733, 4802, 0]"]
-    67["Segment<br>[5630, 5637, 0]"]
+    67["Segment<br>[4810, 4817, 0]"]
     68[Solid2d]
   end
   subgraph path69 [Path]
-    69["Path<br>[5688, 5866, 0]"]
+    69["Path<br>[4868, 5046, 0]"]
-    70["Segment<br>[5688, 5866, 0]"]
+    70["Segment<br>[4868, 5046, 0]"]
     71[Solid2d]
   end
   1["Plane<br>[323, 341, 0]"]
-  72["Sweep Extrusion<br>[5878, 5906, 0]"]
+  72["Sweep Extrusion<br>[5058, 5086, 0]"]
   73[Wall]
   74[Wall]
   75[Wall]
@@ -270,38 +270,38 @@ flowchart LR
   264["SweepEdge Adjacent"]
   265["SweepEdge Opposite"]
   266["SweepEdge Adjacent"]
-  267["EdgeCut Fillet<br>[5914, 6619, 0]"]
+  267["EdgeCut Fillet<br>[5094, 5799, 0]"]
-  268["EdgeCut Fillet<br>[5914, 6619, 0]"]
+  268["EdgeCut Fillet<br>[5094, 5799, 0]"]
-  269["EdgeCut Fillet<br>[5914, 6619, 0]"]
+  269["EdgeCut Fillet<br>[5094, 5799, 0]"]
-  270["EdgeCut Fillet<br>[5914, 6619, 0]"]
+  270["EdgeCut Fillet<br>[5094, 5799, 0]"]
-  271["EdgeCut Fillet<br>[5914, 6619, 0]"]
+  271["EdgeCut Fillet<br>[5094, 5799, 0]"]
-  272["EdgeCut Fillet<br>[5914, 6619, 0]"]
+  272["EdgeCut Fillet<br>[5094, 5799, 0]"]
-  273["EdgeCut Fillet<br>[5914, 6619, 0]"]
+  273["EdgeCut Fillet<br>[5094, 5799, 0]"]
-  274["EdgeCut Fillet<br>[5914, 6619, 0]"]
+  274["EdgeCut Fillet<br>[5094, 5799, 0]"]
-  275["EdgeCut Fillet<br>[5914, 6619, 0]"]
+  275["EdgeCut Fillet<br>[5094, 5799, 0]"]
-  276["EdgeCut Fillet<br>[5914, 6619, 0]"]
+  276["EdgeCut Fillet<br>[5094, 5799, 0]"]
-  277["EdgeCut Fillet<br>[5914, 6619, 0]"]
+  277["EdgeCut Fillet<br>[5094, 5799, 0]"]
-  278["EdgeCut Fillet<br>[5914, 6619, 0]"]
+  278["EdgeCut Fillet<br>[5094, 5799, 0]"]
-  279["EdgeCut Fillet<br>[5914, 6619, 0]"]
+  279["EdgeCut Fillet<br>[5094, 5799, 0]"]
-  280["EdgeCut Fillet<br>[5914, 6619, 0]"]
+  280["EdgeCut Fillet<br>[5094, 5799, 0]"]
-  281["EdgeCut Fillet<br>[5914, 6619, 0]"]
+  281["EdgeCut Fillet<br>[5094, 5799, 0]"]
-  282["EdgeCut Fillet<br>[5914, 6619, 0]"]
+  282["EdgeCut Fillet<br>[5094, 5799, 0]"]
-  283["EdgeCut Fillet<br>[6627, 7331, 0]"]
+  283["EdgeCut Fillet<br>[5807, 6511, 0]"]
-  284["EdgeCut Fillet<br>[6627, 7331, 0]"]
+  284["EdgeCut Fillet<br>[5807, 6511, 0]"]
-  285["EdgeCut Fillet<br>[6627, 7331, 0]"]
+  285["EdgeCut Fillet<br>[5807, 6511, 0]"]
-  286["EdgeCut Fillet<br>[6627, 7331, 0]"]
+  286["EdgeCut Fillet<br>[5807, 6511, 0]"]
-  287["EdgeCut Fillet<br>[6627, 7331, 0]"]
+  287["EdgeCut Fillet<br>[5807, 6511, 0]"]
-  288["EdgeCut Fillet<br>[6627, 7331, 0]"]
+  288["EdgeCut Fillet<br>[5807, 6511, 0]"]
-  289["EdgeCut Fillet<br>[6627, 7331, 0]"]
+  289["EdgeCut Fillet<br>[5807, 6511, 0]"]
-  290["EdgeCut Fillet<br>[6627, 7331, 0]"]
+  290["EdgeCut Fillet<br>[5807, 6511, 0]"]
-  291["EdgeCut Fillet<br>[6627, 7331, 0]"]
+  291["EdgeCut Fillet<br>[5807, 6511, 0]"]
-  292["EdgeCut Fillet<br>[6627, 7331, 0]"]
+  292["EdgeCut Fillet<br>[5807, 6511, 0]"]
-  293["EdgeCut Fillet<br>[6627, 7331, 0]"]
+  293["EdgeCut Fillet<br>[5807, 6511, 0]"]
-  294["EdgeCut Fillet<br>[6627, 7331, 0]"]
+  294["EdgeCut Fillet<br>[5807, 6511, 0]"]
-  295["EdgeCut Fillet<br>[6627, 7331, 0]"]
+  295["EdgeCut Fillet<br>[5807, 6511, 0]"]
-  296["EdgeCut Fillet<br>[6627, 7331, 0]"]
+  296["EdgeCut Fillet<br>[5807, 6511, 0]"]
-  297["EdgeCut Fillet<br>[6627, 7331, 0]"]
+  297["EdgeCut Fillet<br>[5807, 6511, 0]"]
-  298["EdgeCut Fillet<br>[6627, 7331, 0]"]
+  298["EdgeCut Fillet<br>[5807, 6511, 0]"]
   1 --- 2
   1 --- 69
   2 --- 3

rust/kcl-lib/tests/kcl_samples/80-20-rail/ops.snap

@@ -10,7 +10,7 @@ description: Operations executed 80-20-rail.kcl
       "name": "rail8020",
       "functionSourceRange": [
         239,
-        7352,
+        6532,
         0
       ],
       "unlabeledArg": null,

rust/kcl-lib/tests/kcl_samples/axial-fan/artifact_graph_flowchart.snap.md

@@ -136,25 +136,25 @@ flowchart LR
   end
   subgraph path243 [Path]
     243["Path<br>[1100, 1212, 7]"]
-    244["Segment<br>[1220, 1330, 7]"]
+    244["Segment<br>[1220, 1289, 7]"]
-    245["Segment<br>[1338, 1672, 7]"]
+    245["Segment<br>[1297, 1641, 7]"]
-    246["Segment<br>[1680, 2016, 7]"]
+    246["Segment<br>[1649, 1995, 7]"]
-    247["Segment<br>[2024, 2255, 7]"]
+    247["Segment<br>[2003, 2244, 7]"]
-    248["Segment<br>[2263, 2270, 7]"]
+    248["Segment<br>[2252, 2259, 7]"]
     249[Solid2d]
   end
   subgraph path251 [Path]
     251["Path<br>[1100, 1212, 7]"]
-    252["Segment<br>[1220, 1330, 7]"]
+    252["Segment<br>[1220, 1289, 7]"]
-    253["Segment<br>[1338, 1672, 7]"]
+    253["Segment<br>[1297, 1641, 7]"]
-    254["Segment<br>[1680, 2016, 7]"]
+    254["Segment<br>[1649, 1995, 7]"]
-    255["Segment<br>[2024, 2255, 7]"]
+    255["Segment<br>[2003, 2244, 7]"]
-    256["Segment<br>[2263, 2270, 7]"]
+    256["Segment<br>[2252, 2259, 7]"]
     257[Solid2d]
   end
   subgraph path259 [Path]
     259["Path<br>[1100, 1212, 7]"]
-    264["Segment<br>[2263, 2270, 7]"]
+    264["Segment<br>[2252, 2259, 7]"]
     265[Solid2d]
   end
   1["Plane<br>[300, 317, 5]"]
@@ -311,7 +311,7 @@ flowchart LR
   261["SweepEdge Opposite"]
   262["SweepEdge Opposite"]
   263["SweepEdge Opposite"]
-  266["Sweep Loft<br>[2389, 2509, 7]"]
+  266["Sweep Loft<br>[2378, 2498, 7]"]
   267[Wall]
   268[Wall]
   269[Wall]

rust/kcl-lib/tests/kcl_samples/axial-fan/ops.snap

@@ -1079,7 +1079,7 @@ description: Operations executed axial-fan.kcl
       "name": "fanBlade",
       "functionSourceRange": [
         997,
-        2290,
+        2279,
         7
       ],
       "unlabeledArg": null,
@@ -1358,7 +1358,7 @@ description: Operations executed axial-fan.kcl
       "name": "fanBlade",
       "functionSourceRange": [
         997,
-        2290,
+        2279,
         7
       ],
       "unlabeledArg": null,
@@ -1637,7 +1637,7 @@ description: Operations executed axial-fan.kcl
       "name": "fanBlade",
       "functionSourceRange": [
         997,
-        2290,
+        2279,
         7
       ],
       "unlabeledArg": null,

rust/kcl-lib/tests/kcl_samples/ball-bearing/artifact_graph_flowchart.snap.md

@@ -12,31 +12,31 @@ flowchart LR
   end
   subgraph path15 [Path]
     15["Path<br>[970, 1026, 0]"]
-    16["Segment<br>[1032, 1124, 0]"]
+    16["Segment<br>[1032, 1091, 0]"]
-    17["Segment<br>[1130, 1137, 0]"]
+    17["Segment<br>[1097, 1104, 0]"]
     18[Solid2d]
   end
   subgraph path24 [Path]
-    24["Path<br>[1507, 1640, 0]"]
+    24["Path<br>[1474, 1607, 0]"]
-    25["Segment<br>[1646, 1739, 0]"]
+    25["Segment<br>[1613, 1673, 0]"]
-    26["Segment<br>[1745, 1776, 0]"]
+    26["Segment<br>[1679, 1710, 0]"]
-    27["Segment<br>[1782, 1810, 0]"]
+    27["Segment<br>[1716, 1744, 0]"]
-    28["Segment<br>[1816, 1823, 0]"]
+    28["Segment<br>[1750, 1757, 0]"]
     29[Solid2d]
   end
   subgraph path40 [Path]
-    40["Path<br>[2157, 2299, 0]"]
+    40["Path<br>[2091, 2233, 0]"]
-    41["Segment<br>[2157, 2299, 0]"]
+    41["Segment<br>[2091, 2233, 0]"]
     42[Solid2d]
   end
   subgraph path50 [Path]
-    50["Path<br>[2693, 2746, 0]"]
+    50["Path<br>[2627, 2680, 0]"]
-    51["Segment<br>[2693, 2746, 0]"]
+    51["Segment<br>[2627, 2680, 0]"]
     52[Solid2d]
   end
   subgraph path53 [Path]
-    53["Path<br>[2757, 2831, 0]"]
+    53["Path<br>[2691, 2765, 0]"]
-    54["Segment<br>[2757, 2831, 0]"]
+    54["Segment<br>[2691, 2765, 0]"]
     55[Solid2d]
   end
   1["Plane<br>[610, 657, 0]"]
@@ -47,12 +47,12 @@ flowchart LR
   12["SweepEdge Opposite"]
   13["SweepEdge Adjacent"]
   14["Plane<br>[947, 964, 0]"]
-  19["Sweep Revolve<br>[1219, 1249, 0]"]
+  19["Sweep Revolve<br>[1186, 1216, 0]"]
   20[Wall]
   21[Wall]
   22["SweepEdge Adjacent"]
-  23["Plane<br>[1484, 1501, 0]"]
+  23["Plane<br>[1451, 1468, 0]"]
-  30["Sweep Revolve<br>[1865, 1895, 0]"]
+  30["Sweep Revolve<br>[1799, 1829, 0]"]
   31[Wall]
   32[Wall]
   33[Wall]
@@ -61,22 +61,22 @@ flowchart LR
   36["SweepEdge Adjacent"]
   37["SweepEdge Adjacent"]
   38["SweepEdge Adjacent"]
-  39["Plane<br>[2134, 2151, 0]"]
+  39["Plane<br>[2068, 2085, 0]"]
-  43["Sweep Revolve<br>[2342, 2393, 0]"]
+  43["Sweep Revolve<br>[2276, 2327, 0]"]
   44[Wall]
   45["Cap Start"]
   46["Cap End"]
   47["SweepEdge Opposite"]
   48["SweepEdge Adjacent"]
-  49["Plane<br>[2639, 2686, 0]"]
+  49["Plane<br>[2573, 2620, 0]"]
-  56["Sweep Extrusion<br>[2851, 2904, 0]"]
+  56["Sweep Extrusion<br>[2785, 2838, 0]"]
   57[Wall]
   58["Cap Start"]
   59["Cap End"]
   60["SweepEdge Opposite"]
   61["SweepEdge Adjacent"]
   62["StartSketchOnPlane<br>[596, 658, 0]"]
-  63["StartSketchOnPlane<br>[2625, 2687, 0]"]
+  63["StartSketchOnPlane<br>[2559, 2621, 0]"]
   1 --- 2
   1 --- 5
   2 --- 3

rust/kcl-lib/tests/kcl_samples/ball-bearing/ast.snap

@@ -1120,47 +1120,15 @@ description: Result of parsing ball-bearing.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": "angleEnd",
-                          "start": 0,
-                          "type": "Identifier"
-                        },
-                        "start": 0,
-                        "type": "ObjectProperty",
-                        "value": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "raw": "0",
-                          "start": 0,
-                          "type": "Literal",
-                          "type": "Literal",
-                          "value": {
-                            "value": 0.0,
-                            "suffix": "None"
-                          }
-                        }
-                      },
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "180",
@@ -1174,18 +1142,37 @@ description: Result of parsing ball-bearing.kcl
                     }
                   },
                   {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
-                        "key": {
+                      "name": "angleEnd",
+                      "start": 0,
+                      "type": "Identifier"
+                    },
+                    "arg": {
+                      "commentStart": 0,
+                      "end": 0,
+                      "raw": "0",
+                      "start": 0,
+                      "type": "Literal",
+                      "type": "Literal",
+                      "value": {
+                        "value": 0.0,
+                        "suffix": "None"
+                      }
+                    }
+                  },
+                  {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "left": {
@@ -1223,18 +1210,6 @@ description: Result of parsing ball-bearing.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1253,8 +1228,9 @@ description: Result of parsing ball-bearing.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [],
@@ -1959,47 +1935,15 @@ description: Result of parsing ball-bearing.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": "angleEnd",
-                          "start": 0,
-                          "type": "Identifier"
-                        },
-                        "start": 0,
-                        "type": "ObjectProperty",
-                        "value": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "raw": "60",
-                          "start": 0,
-                          "type": "Literal",
-                          "type": "Literal",
-                          "value": {
-                            "value": 60.0,
-                            "suffix": "None"
-                          }
-                        }
-                      },
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "120",
@@ -2013,18 +1957,37 @@ description: Result of parsing ball-bearing.kcl
                     }
                   },
                   {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
-                        "key": {
+                      "name": "angleEnd",
+                      "start": 0,
+                      "type": "Identifier"
+                    },
+                    "arg": {
+                      "commentStart": 0,
+                      "end": 0,
+                      "raw": "60",
+                      "start": 0,
+                      "type": "Literal",
+                      "type": "Literal",
+                      "value": {
+                        "value": 60.0,
+                        "suffix": "None"
+                      }
+                    }
+                  },
+                  {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "left": {
@@ -2062,18 +2025,6 @@ description: Result of parsing ball-bearing.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -2092,8 +2043,9 @@ description: Result of parsing ball-bearing.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [

rust/kcl-lib/tests/kcl_samples/bench/artifact_graph_flowchart.snap.md

@@ -203,33 +203,33 @@ flowchart LR
   subgraph path650 [Path]
     650["Path<br>[3265, 3292, 5]"]
     651["Segment<br>[3300, 3319, 5]"]
-    652["Segment<br>[3327, 3417, 5]"]
+    652["Segment<br>[3327, 3376, 5]"]
   end
   subgraph path654 [Path]
-    654["Path<br>[3517, 3550, 5]"]
+    654["Path<br>[3476, 3509, 5]"]
-    655["Segment<br>[3558, 3577, 5]"]
+    655["Segment<br>[3517, 3536, 5]"]
-    656["Segment<br>[3585, 3607, 5]"]
+    656["Segment<br>[3544, 3566, 5]"]
-    657["Segment<br>[3615, 3638, 5]"]
+    657["Segment<br>[3574, 3597, 5]"]
-    658["Segment<br>[3646, 3666, 5]"]
+    658["Segment<br>[3605, 3625, 5]"]
-    659["Segment<br>[3674, 3698, 5]"]
+    659["Segment<br>[3633, 3657, 5]"]
-    660["Segment<br>[3706, 3729, 5]"]
+    660["Segment<br>[3665, 3688, 5]"]
-    661["Segment<br>[3737, 3744, 5]"]
+    661["Segment<br>[3696, 3703, 5]"]
     662[Solid2d]
   end
   subgraph path688 [Path]
     688["Path<br>[3265, 3292, 5]"]
     689["Segment<br>[3300, 3319, 5]"]
-    690["Segment<br>[3327, 3417, 5]"]
+    690["Segment<br>[3327, 3376, 5]"]
   end
   subgraph path692 [Path]
-    692["Path<br>[3517, 3550, 5]"]
+    692["Path<br>[3476, 3509, 5]"]
-    693["Segment<br>[3558, 3577, 5]"]
+    693["Segment<br>[3517, 3536, 5]"]
-    694["Segment<br>[3585, 3607, 5]"]
+    694["Segment<br>[3544, 3566, 5]"]
-    695["Segment<br>[3615, 3638, 5]"]
+    695["Segment<br>[3574, 3597, 5]"]
-    696["Segment<br>[3646, 3666, 5]"]
+    696["Segment<br>[3605, 3625, 5]"]
-    697["Segment<br>[3674, 3698, 5]"]
+    697["Segment<br>[3633, 3657, 5]"]
-    698["Segment<br>[3706, 3729, 5]"]
+    698["Segment<br>[3665, 3688, 5]"]
-    699["Segment<br>[3737, 3744, 5]"]
+    699["Segment<br>[3696, 3703, 5]"]
     700[Solid2d]
   end
   1["Plane<br>[333, 353, 5]"]
@@ -704,9 +704,9 @@ flowchart LR
   646["SweepEdge Opposite"]
   647["SweepEdge Adjacent"]
   648["Sweep Extrusion<br>[3160, 3184, 5]"]
-  649["Plane<br>[3825, 3860, 5]"]
+  649["Plane<br>[3784, 3819, 5]"]
-  653["Plane<br>[3891, 3920, 5]"]
+  653["Plane<br>[3850, 3879, 5]"]
-  663["Sweep Sweep<br>[3932, 3959, 5]"]
+  663["Sweep Sweep<br>[3891, 3918, 5]"]
   664[Wall]
   665[Wall]
   666[Wall]
@@ -730,9 +730,9 @@ flowchart LR
   684["SweepEdge Adjacent"]
   685["SweepEdge Opposite"]
   686["SweepEdge Adjacent"]
-  687["Plane<br>[3825, 3860, 5]"]
+  687["Plane<br>[3784, 3819, 5]"]
-  691["Plane<br>[3891, 3920, 5]"]
+  691["Plane<br>[3850, 3879, 5]"]
-  701["Sweep Sweep<br>[3932, 3959, 5]"]
+  701["Sweep Sweep<br>[3891, 3918, 5]"]
   702[Wall]
   703[Wall]
   704[Wall]
@@ -765,9 +765,9 @@ flowchart LR
   731["StartSketchOnPlane<br>[2172, 2192, 5]"]
   732["StartSketchOnPlane<br>[2681, 2701, 5]"]
   733["StartSketchOnPlane<br>[3237, 3257, 5]"]
-  734["StartSketchOnPlane<br>[3489, 3509, 5]"]
+  734["StartSketchOnPlane<br>[3448, 3468, 5]"]
   735["StartSketchOnPlane<br>[3237, 3257, 5]"]
-  736["StartSketchOnPlane<br>[3489, 3509, 5]"]
+  736["StartSketchOnPlane<br>[3448, 3468, 5]"]
   1 --- 2
   2 --- 3
   2 --- 4

rust/kcl-lib/tests/kcl_samples/bench/ops.snap

@@ -1209,8 +1209,8 @@ description: Operations executed bench.kcl
       "type": "FunctionCall",
       "name": "armRest",
       "functionSourceRange": [
-        3784,
+        3743,
-        3972,
+        3931,
         5
       ],
       "unlabeledArg": null,
@@ -1255,7 +1255,7 @@ description: Operations executed bench.kcl
       "name": "armRestPath",
       "functionSourceRange": [
         3213,
-        3438,
+        3397,
         5
       ],
       "unlabeledArg": null,
@@ -1317,8 +1317,8 @@ description: Operations executed bench.kcl
       "type": "FunctionCall",
       "name": "armRestProfile",
       "functionSourceRange": [
-        3457,
+        3416,
-        3765,
+        3724,
         5
       ],
       "unlabeledArg": null,
@@ -1378,8 +1378,8 @@ description: Operations executed bench.kcl
       "type": "FunctionCall",
       "name": "armRest",
       "functionSourceRange": [
-        3784,
+        3743,
-        3972,
+        3931,
         5
       ],
       "unlabeledArg": null,
@@ -1424,7 +1424,7 @@ description: Operations executed bench.kcl
       "name": "armRestPath",
       "functionSourceRange": [
         3213,
-        3438,
+        3397,
         5
       ],
       "unlabeledArg": null,
@@ -1486,8 +1486,8 @@ description: Operations executed bench.kcl
       "type": "FunctionCall",
       "name": "armRestProfile",
       "functionSourceRange": [
-        3457,
+        3416,
-        3765,
+        3724,
         5
       ],
       "unlabeledArg": null,

rust/kcl-lib/tests/kcl_samples/bottle/artifact_graph_flowchart.snap.md

@@ -3,25 +3,25 @@ flowchart LR
   subgraph path2 [Path]
     2["Path<br>[337, 378, 0]"]
     3["Segment<br>[384, 415, 0]"]
-    4["Segment<br>[421, 528, 0]"]
+    4["Segment<br>[421, 516, 0]"]
-    5["Segment<br>[534, 556, 0]"]
+    5["Segment<br>[522, 544, 0]"]
-    6["Segment<br>[586, 593, 0]"]
+    6["Segment<br>[574, 581, 0]"]
     7[Solid2d]
   end
   subgraph path10 [Path]
-    10["Path<br>[750, 800, 0]"]
+    10["Path<br>[738, 788, 0]"]
-    11["Segment<br>[750, 800, 0]"]
+    11["Segment<br>[738, 788, 0]"]
     12[Solid2d]
   end
   1["Plane<br>[314, 331, 0]"]
-  8["Sweep Extrusion<br>[599, 641, 0]"]
+  8["Sweep Extrusion<br>[587, 629, 0]"]
-  9["Plane<br>[750, 800, 0]"]
+  9["Plane<br>[738, 788, 0]"]
-  13["Sweep Extrusion<br>[806, 833, 0]"]
+  13["Sweep Extrusion<br>[794, 821, 0]"]
   14[Wall]
   15["Cap End"]
   16["SweepEdge Opposite"]
   17["SweepEdge Adjacent"]
-  18["StartSketchOnFace<br>[707, 744, 0]"]
+  18["StartSketchOnFace<br>[695, 732, 0]"]
   1 --- 2
   2 --- 3
   2 --- 4

rust/kcl-lib/tests/kcl_samples/bottle/ast.snap

@@ -430,22 +430,15 @@ description: Result of parsing bottle.kcl
               {
                 "arguments": [
                   {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
-                    "properties": [
+                      "name": "endAbsolute",
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": "end",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "elements": [
                         {
@@ -528,18 +521,15 @@ description: Result of parsing bottle.kcl
                     }
                   },
                   {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
-                        "key": {
+                      "name": "interiorAbsolute",
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": "interior",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "elements": [
                         {
@@ -598,18 +588,6 @@ description: Result of parsing bottle.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -617,7 +595,7 @@ description: Result of parsing bottle.kcl
                   "name": {
                     "commentStart": 0,
                     "end": 0,
-                    "name": "arcTo",
+                    "name": "arc",
                     "start": 0,
                     "type": "Identifier"
                   },
@@ -628,8 +606,9 @@ description: Result of parsing bottle.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [

rust/kcl-lib/tests/kcl_samples/cycloidal-gear/artifact_graph_flowchart.snap.md

@@ -2,44 +2,44 @@
 flowchart LR
   subgraph path2 [Path]
     2["Path<br>[631, 865, 0]"]
-    3["Segment<br>[875, 1008, 0]"]
+    3["Segment<br>[875, 959, 0]"]
-    4["Segment<br>[1018, 1070, 0]"]
+    4["Segment<br>[969, 1021, 0]"]
-    5["Segment<br>[1080, 1127, 0]"]
+    5["Segment<br>[1031, 1078, 0]"]
-    6["Segment<br>[1137, 1189, 0]"]
+    6["Segment<br>[1088, 1140, 0]"]
-    7["Segment<br>[1199, 1246, 0]"]
+    7["Segment<br>[1150, 1197, 0]"]
-    8["Segment<br>[1256, 1321, 0]"]
+    8["Segment<br>[1207, 1272, 0]"]
-    9["Segment<br>[1331, 1339, 0]"]
+    9["Segment<br>[1282, 1290, 0]"]
     10[Solid2d]
   end
   subgraph path11 [Path]
-    11["Path<br>[1354, 1404, 0]"]
+    11["Path<br>[1305, 1355, 0]"]
-    12["Segment<br>[1354, 1404, 0]"]
+    12["Segment<br>[1305, 1355, 0]"]
     13[Solid2d]
   end
   subgraph path15 [Path]
     15["Path<br>[631, 865, 0]"]
-    16["Segment<br>[875, 1008, 0]"]
+    16["Segment<br>[875, 959, 0]"]
-    17["Segment<br>[1018, 1070, 0]"]
+    17["Segment<br>[969, 1021, 0]"]
-    18["Segment<br>[1080, 1127, 0]"]
+    18["Segment<br>[1031, 1078, 0]"]
-    19["Segment<br>[1137, 1189, 0]"]
+    19["Segment<br>[1088, 1140, 0]"]
-    20["Segment<br>[1199, 1246, 0]"]
+    20["Segment<br>[1150, 1197, 0]"]
-    21["Segment<br>[1256, 1321, 0]"]
+    21["Segment<br>[1207, 1272, 0]"]
-    22["Segment<br>[1331, 1339, 0]"]
+    22["Segment<br>[1282, 1290, 0]"]
     23[Solid2d]
   end
   subgraph path24 [Path]
-    24["Path<br>[1354, 1404, 0]"]
+    24["Path<br>[1305, 1355, 0]"]
-    25["Segment<br>[1354, 1404, 0]"]
+    25["Segment<br>[1305, 1355, 0]"]
     26[Solid2d]
   end
   subgraph path28 [Path]
     28["Path<br>[631, 865, 0]"]
-    35["Segment<br>[1331, 1339, 0]"]
+    35["Segment<br>[1282, 1290, 0]"]
     36[Solid2d]
   end
   subgraph path37 [Path]
-    37["Path<br>[1354, 1404, 0]"]
+    37["Path<br>[1305, 1355, 0]"]
-    38["Segment<br>[1354, 1404, 0]"]
+    38["Segment<br>[1305, 1355, 0]"]
     39[Solid2d]
   end
   1["Plane<br>[587, 620, 0]"]
@@ -51,7 +51,7 @@ flowchart LR
   32["SweepEdge Opposite"]
   33["SweepEdge Opposite"]
   34["SweepEdge Opposite"]
-  40["Sweep Loft<br>[1534, 1623, 0]"]
+  40["Sweep Loft<br>[1485, 1574, 0]"]
   41[Wall]
   42[Wall]
   43[Wall]

rust/kcl-lib/tests/kcl_samples/cycloidal-gear/ast.snap

@@ -691,22 +691,15 @@ description: Result of parsing cycloidal-gear.kcl
                                   {
                                     "arguments": [
                                       {
-                                        "commentStart": 0,
+                                        "type": "LabeledArg",
-                                        "end": 0,
+                                        "label": {
-                                        "properties": [
-                                          {
-                                            "commentStart": 0,
-                                            "end": 0,
-                                            "key": {
                                           "commentStart": 0,
                                           "end": 0,
                                           "name": "angleStart",
                                           "start": 0,
                                           "type": "Identifier"
                                         },
-                                            "start": 0,
+                                        "arg": {
-                                            "type": "ObjectProperty",
-                                            "value": {
                                           "commentStart": 0,
                                           "end": 0,
                                           "left": {
@@ -744,18 +737,15 @@ description: Result of parsing cycloidal-gear.kcl
                                         }
                                       },
                                       {
-                                            "commentStart": 0,
+                                        "type": "LabeledArg",
-                                            "end": 0,
+                                        "label": {
-                                            "key": {
                                           "commentStart": 0,
                                           "end": 0,
                                           "name": "angleEnd",
                                           "start": 0,
                                           "type": "Identifier"
                                         },
-                                            "start": 0,
+                                        "arg": {
-                                            "type": "ObjectProperty",
-                                            "value": {
                                           "commentStart": 0,
                                           "end": 0,
                                           "left": {
@@ -801,18 +791,15 @@ description: Result of parsing cycloidal-gear.kcl
                                         }
                                       },
                                       {
-                                            "commentStart": 0,
+                                        "type": "LabeledArg",
-                                            "end": 0,
+                                        "label": {
-                                            "key": {
                                           "commentStart": 0,
                                           "end": 0,
                                           "name": "radius",
                                           "start": 0,
                                           "type": "Identifier"
                                         },
-                                            "start": 0,
+                                        "arg": {
-                                            "type": "ObjectProperty",
-                                            "value": {
                                           "abs_path": false,
                                           "commentStart": 0,
                                           "end": 0,
@@ -830,18 +817,6 @@ description: Result of parsing cycloidal-gear.kcl
                                         }
                                       }
                                     ],
-                                        "start": 0,
-                                        "type": "ObjectExpression",
-                                        "type": "ObjectExpression"
-                                      },
-                                      {
-                                        "commentStart": 0,
-                                        "end": 0,
-                                        "start": 0,
-                                        "type": "PipeSubstitution",
-                                        "type": "PipeSubstitution"
-                                      }
-                                    ],
                                     "callee": {
                                       "abs_path": false,
                                       "commentStart": 0,
@@ -860,8 +835,9 @@ description: Result of parsing cycloidal-gear.kcl
                                     "commentStart": 0,
                                     "end": 0,
                                     "start": 0,
-                                    "type": "CallExpression",
+                                    "type": "CallExpressionKw",
-                                    "type": "CallExpression"
+                                    "type": "CallExpressionKw",
+                                    "unlabeled": null
                                   },
                                   {
                                     "arguments": [

rust/kcl-lib/tests/kcl_samples/cycloidal-gear/ops.snap

@@ -10,7 +10,7 @@ description: Operations executed cycloidal-gear.kcl
       "name": "cycloidalGear",
       "functionSourceRange": [
         265,
-        1644,
+        1595,
         0
       ],
       "unlabeledArg": null,
@@ -25,7 +25,7 @@ description: Operations executed cycloidal-gear.kcl
       "name": "gearSketch",
       "functionSourceRange": [
         491,
-        1435,
+        1386,
         0
       ],
       "unlabeledArg": null,
@@ -186,7 +186,7 @@ description: Operations executed cycloidal-gear.kcl
       "name": "gearSketch",
       "functionSourceRange": [
         491,
-        1435,
+        1386,
         0
       ],
       "unlabeledArg": null,
@@ -347,7 +347,7 @@ description: Operations executed cycloidal-gear.kcl
       "name": "gearSketch",
       "functionSourceRange": [
         491,
-        1435,
+        1386,
         0
       ],
       "unlabeledArg": null,

rust/kcl-lib/tests/kcl_samples/food-service-spatula/artifact_graph_flowchart.snap.md

@@ -5,8 +5,8 @@ flowchart LR
     3["Segment<br>[1505, 1537, 0]"]
     4["Segment<br>[1543, 1580, 0]"]
     5["Segment<br>[1586, 1619, 0]"]
-    6["Segment<br>[1625, 1725, 0]"]
+    6["Segment<br>[1625, 1692, 0]"]
-    7["Segment<br>[1731, 1738, 0]"]
+    7["Segment<br>[1698, 1705, 0]"]
     8[Solid2d]
   end
   subgraph path9 [Path]
@@ -37,27 +37,27 @@ flowchart LR
     29[Solid2d]
   end
   subgraph path49 [Path]
-    49["Path<br>[2741, 2794, 0]"]
+    49["Path<br>[2708, 2761, 0]"]
-    50["Segment<br>[2800, 2859, 0]"]
+    50["Segment<br>[2767, 2826, 0]"]
-    51["Segment<br>[2865, 2900, 0]"]
+    51["Segment<br>[2832, 2867, 0]"]
-    52["Segment<br>[2906, 2939, 0]"]
+    52["Segment<br>[2873, 2906, 0]"]
-    53["Segment<br>[2945, 3004, 0]"]
+    53["Segment<br>[2912, 2971, 0]"]
-    54["Segment<br>[3010, 3046, 0]"]
+    54["Segment<br>[2977, 3013, 0]"]
-    55["Segment<br>[3052, 3076, 0]"]
+    55["Segment<br>[3019, 3043, 0]"]
-    56["Segment<br>[3082, 3089, 0]"]
+    56["Segment<br>[3049, 3056, 0]"]
     57[Solid2d]
   end
   subgraph path83 [Path]
-    83["Path<br>[3684, 3731, 0]"]
+    83["Path<br>[3651, 3698, 0]"]
-    84["Segment<br>[3737, 3787, 0]"]
+    84["Segment<br>[3704, 3754, 0]"]
-    85["Segment<br>[3793, 3892, 0]"]
+    85["Segment<br>[3760, 3826, 0]"]
-    86["Segment<br>[3898, 3949, 0]"]
+    86["Segment<br>[3832, 3883, 0]"]
-    87["Segment<br>[3955, 4053, 0]"]
+    87["Segment<br>[3889, 3954, 0]"]
-    88["Segment<br>[4059, 4112, 0]"]
+    88["Segment<br>[3960, 4013, 0]"]
-    89["Segment<br>[4118, 4218, 0]"]
+    89["Segment<br>[4019, 4086, 0]"]
-    90["Segment<br>[4224, 4298, 0]"]
+    90["Segment<br>[4092, 4166, 0]"]
-    91["Segment<br>[4304, 4405, 0]"]
+    91["Segment<br>[4172, 4240, 0]"]
-    92["Segment<br>[4411, 4418, 0]"]
+    92["Segment<br>[4246, 4253, 0]"]
     93[Solid2d]
   end
   subgraph path121 [Path]
@@ -70,7 +70,7 @@ flowchart LR
     127[Solid2d]
   end
   1["Plane<br>[1374, 1391, 0]"]
-  30["Sweep Extrusion<br>[2313, 2363, 0]"]
+  30["Sweep Extrusion<br>[2280, 2330, 0]"]
   31[Wall]
   32[Wall]
   33[Wall]
@@ -88,8 +88,8 @@ flowchart LR
   45["SweepEdge Adjacent"]
   46["SweepEdge Opposite"]
   47["SweepEdge Adjacent"]
-  48["Plane<br>[2638, 2680, 0]"]
+  48["Plane<br>[2605, 2647, 0]"]
-  58["Sweep Extrusion<br>[3123, 3167, 0]"]
+  58["Sweep Extrusion<br>[3090, 3134, 0]"]
   59[Wall]
   60[Wall]
   61[Wall]
@@ -113,8 +113,8 @@ flowchart LR
   79["SweepEdge Adjacent"]
   80["SweepEdge Opposite"]
   81["SweepEdge Adjacent"]
-  82["Plane<br>[3610, 3636, 0]"]
+  82["Plane<br>[3577, 3603, 0]"]
-  94["Sweep Extrusion<br>[4474, 4516, 0]"]
+  94["Sweep Extrusion<br>[4309, 4351, 0]"]
   95[Wall]
   96[Wall]
   97[Wall]
@@ -141,7 +141,7 @@ flowchart LR
   118["SweepEdge Adjacent"]
   119["SweepEdge Opposite"]
   120["SweepEdge Adjacent"]
-  128["Sweep Extrusion<br>[4751, 4801, 0]"]
+  128["Sweep Extrusion<br>[4586, 4636, 0]"]
   129[Wall]
   130[Wall]
   131[Wall]
@@ -154,12 +154,12 @@ flowchart LR
   138["SweepEdge Adjacent"]
   139["SweepEdge Opposite"]
   140["SweepEdge Adjacent"]
-  141["EdgeCut Fillet<br>[2400, 2541, 0]"]
+  141["EdgeCut Fillet<br>[2367, 2508, 0]"]
-  142["EdgeCut Fillet<br>[2400, 2541, 0]"]
+  142["EdgeCut Fillet<br>[2367, 2508, 0]"]
-  143["EdgeCut Fillet<br>[3210, 3341, 0]"]
+  143["EdgeCut Fillet<br>[3177, 3308, 0]"]
-  144["EdgeCut Fillet<br>[3210, 3341, 0]"]
+  144["EdgeCut Fillet<br>[3177, 3308, 0]"]
-  145["StartSketchOnPlane<br>[2624, 2681, 0]"]
+  145["StartSketchOnPlane<br>[2591, 2648, 0]"]
-  146["StartSketchOnFace<br>[4575, 4614, 0]"]
+  146["StartSketchOnFace<br>[4410, 4449, 0]"]
   1 --- 2
   1 --- 9
   1 --- 16

rust/kcl-lib/tests/kcl_samples/food-service-spatula/ast.snap

@@ -2690,47 +2690,15 @@ description: Result of parsing food-service-spatula.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": "angleEnd",
-                          "start": 0,
-                          "type": "Identifier"
-                        },
-                        "start": 0,
-                        "type": "ObjectProperty",
-                        "value": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "raw": "196.912390",
-                          "start": 0,
-                          "type": "Literal",
-                          "type": "Literal",
-                          "value": {
-                            "value": 196.91239,
-                            "suffix": "None"
-                          }
-                        }
-                      },
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "163.087610",
@@ -2744,18 +2712,37 @@ description: Result of parsing food-service-spatula.kcl
                     }
                   },
                   {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
-                        "key": {
+                      "name": "angleEnd",
+                      "start": 0,
+                      "type": "Identifier"
+                    },
+                    "arg": {
+                      "commentStart": 0,
+                      "end": 0,
+                      "raw": "196.912390",
+                      "start": 0,
+                      "type": "Literal",
+                      "type": "Literal",
+                      "value": {
+                        "value": 196.91239,
+                        "suffix": "None"
+                      }
+                    }
+                  },
+                  {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "110.0",
@@ -2769,18 +2756,6 @@ description: Result of parsing food-service-spatula.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -2799,8 +2774,9 @@ description: Result of parsing food-service-spatula.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [],
@@ -5419,22 +5395,15 @@ description: Result of parsing food-service-spatula.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "argument": {
                         "commentStart": 0,
                         "end": 0,
@@ -5456,18 +5425,15 @@ description: Result of parsing food-service-spatula.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleEnd",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "0.0",
@@ -5481,18 +5447,15 @@ description: Result of parsing food-service-spatula.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "abs_path": false,
                       "commentStart": 0,
                       "end": 0,
@@ -5510,18 +5473,6 @@ description: Result of parsing food-service-spatula.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -5540,8 +5491,9 @@ description: Result of parsing food-service-spatula.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
@@ -5641,22 +5593,15 @@ description: Result of parsing food-service-spatula.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "0.0",
@@ -5670,18 +5615,15 @@ description: Result of parsing food-service-spatula.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleEnd",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "90.0",
@@ -5695,18 +5637,15 @@ description: Result of parsing food-service-spatula.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "abs_path": false,
                       "commentStart": 0,
                       "end": 0,
@@ -5724,18 +5663,6 @@ description: Result of parsing food-service-spatula.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -5754,8 +5681,9 @@ description: Result of parsing food-service-spatula.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
@@ -5863,22 +5791,15 @@ description: Result of parsing food-service-spatula.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "90.0",
@@ -5892,18 +5813,15 @@ description: Result of parsing food-service-spatula.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleEnd",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "180.0",
@@ -5917,18 +5835,15 @@ description: Result of parsing food-service-spatula.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "abs_path": false,
                       "commentStart": 0,
                       "end": 0,
@@ -5946,18 +5861,6 @@ description: Result of parsing food-service-spatula.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -5976,8 +5879,9 @@ description: Result of parsing food-service-spatula.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
@@ -6103,22 +6007,15 @@ description: Result of parsing food-service-spatula.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "180.0",
@@ -6132,18 +6029,15 @@ description: Result of parsing food-service-spatula.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleEnd",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "270.0",
@@ -6157,18 +6051,15 @@ description: Result of parsing food-service-spatula.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "abs_path": false,
                       "commentStart": 0,
                       "end": 0,
@@ -6186,18 +6077,6 @@ description: Result of parsing food-service-spatula.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -6216,8 +6095,9 @@ description: Result of parsing food-service-spatula.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [],

rust/kcl-lib/tests/kcl_samples/food-service-spatula/program_memory.snap

@@ -583,9 +583,9 @@ description: Variables in memory after executing food-service-spatula.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4285,
+            "commentStart": 4153,
-            "end": 4297,
+            "end": 4165,
-            "start": 4285,
+            "start": 4153,
             "type": "TagDeclarator",
             "value": "gripEdgeTop"
           },
@@ -745,9 +745,9 @@ description: Variables in memory after executing food-service-spatula.kcl
               7.0
             ],
             "tag": {
-              "commentStart": 4285,
+              "commentStart": 4153,
-              "end": 4297,
+              "end": 4165,
-              "start": 4285,
+              "start": 4153,
               "type": "TagDeclarator",
               "value": "gripEdgeTop"
             },
@@ -1108,9 +1108,9 @@ description: Variables in memory after executing food-service-spatula.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 4285,
+                "commentStart": 4153,
-                "end": 4297,
+                "end": 4165,
-                "start": 4285,
+                "start": 4153,
                 "type": "TagDeclarator",
                 "value": "gripEdgeTop"
               },
@@ -1270,9 +1270,9 @@ description: Variables in memory after executing food-service-spatula.kcl
                   7.0
                 ],
                 "tag": {
-                  "commentStart": 4285,
+                  "commentStart": 4153,
-                  "end": 4297,
+                  "end": 4165,
-                  "start": 4285,
+                  "start": 4153,
                   "type": "TagDeclarator",
                   "value": "gripEdgeTop"
                 },
@@ -1598,9 +1598,9 @@ description: Variables in memory after executing food-service-spatula.kcl
             7.0
           ],
           "tag": {
-            "commentStart": 4285,
+            "commentStart": 4153,
-            "end": 4297,
+            "end": 4165,
-            "start": 4285,
+            "start": 4153,
             "type": "TagDeclarator",
             "value": "gripEdgeTop"
           },
@@ -1811,9 +1811,9 @@ description: Variables in memory after executing food-service-spatula.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 2841,
+            "commentStart": 2808,
-            "end": 2858,
+            "end": 2825,
-            "start": 2841,
+            "start": 2808,
             "type": "TagDeclarator",
             "value": "handleBottomEdge"
           },
@@ -1838,9 +1838,9 @@ description: Variables in memory after executing food-service-spatula.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 2989,
+            "commentStart": 2956,
-            "end": 3003,
+            "end": 2970,
-            "start": 2989,
+            "start": 2956,
             "type": "TagDeclarator",
             "value": "handleTopEdge"
           },
@@ -1882,9 +1882,9 @@ description: Variables in memory after executing food-service-spatula.kcl
               3.5
             ],
             "tag": {
-              "commentStart": 2841,
+              "commentStart": 2808,
-              "end": 2858,
+              "end": 2825,
-              "start": 2841,
+              "start": 2808,
               "type": "TagDeclarator",
               "value": "handleBottomEdge"
             },
@@ -1945,9 +1945,9 @@ description: Variables in memory after executing food-service-spatula.kcl
               91.3213
             ],
             "tag": {
-              "commentStart": 2989,
+              "commentStart": 2956,
-              "end": 3003,
+              "end": 2970,
-              "start": 2989,
+              "start": 2956,
               "type": "TagDeclarator",
               "value": "handleTopEdge"
             },
@@ -2303,9 +2303,9 @@ description: Variables in memory after executing food-service-spatula.kcl
             3.5
           ],
           "tag": {
-            "commentStart": 2841,
+            "commentStart": 2808,
-            "end": 2858,
+            "end": 2825,
-            "start": 2841,
+            "start": 2808,
             "type": "TagDeclarator",
             "value": "handleBottomEdge"
           },
@@ -2366,9 +2366,9 @@ description: Variables in memory after executing food-service-spatula.kcl
             91.3213
           ],
           "tag": {
-            "commentStart": 2989,
+            "commentStart": 2956,
-            "end": 3003,
+            "end": 2970,
-            "start": 2989,
+            "start": 2956,
             "type": "TagDeclarator",
             "value": "handleTopEdge"
           },
@@ -2658,9 +2658,9 @@ description: Variables in memory after executing food-service-spatula.kcl
             "id": "[uuid]",
             "sourceRange": [],
             "tag": {
-              "commentStart": 4285,
+              "commentStart": 4153,
-              "end": 4297,
+              "end": 4165,
-              "start": 4285,
+              "start": 4153,
               "type": "TagDeclarator",
               "value": "gripEdgeTop"
             },
@@ -2820,9 +2820,9 @@ description: Variables in memory after executing food-service-spatula.kcl
                 7.0
               ],
               "tag": {
-                "commentStart": 4285,
+                "commentStart": 4153,
-                "end": 4297,
+                "end": 4165,
-                "start": 4285,
+                "start": 4153,
                 "type": "TagDeclarator",
                 "value": "gripEdgeTop"
               },

rust/kcl-lib/tests/kcl_samples/french-press/artifact_graph_flowchart.snap.md

@@ -13,111 +13,111 @@ flowchart LR
     18["Path<br>[971, 1015, 0]"]
     19["Segment<br>[1021, 1040, 0]"]
     20["Segment<br>[1046, 1080, 0]"]
-    21["Segment<br>[1086, 1170, 0]"]
+    21["Segment<br>[1086, 1137, 0]"]
-    22["Segment<br>[1176, 1227, 0]"]
+    22["Segment<br>[1143, 1194, 0]"]
-    23["Segment<br>[1233, 1317, 0]"]
+    23["Segment<br>[1200, 1251, 0]"]
-    24["Segment<br>[1323, 1381, 0]"]
+    24["Segment<br>[1257, 1315, 0]"]
-    25["Segment<br>[1387, 1469, 0]"]
+    25["Segment<br>[1321, 1370, 0]"]
-    26["Segment<br>[1475, 1515, 0]"]
+    26["Segment<br>[1376, 1416, 0]"]
-    27["Segment<br>[1521, 1540, 0]"]
+    27["Segment<br>[1422, 1441, 0]"]
-    28["Segment<br>[1546, 1599, 0]"]
+    28["Segment<br>[1447, 1500, 0]"]
-    29["Segment<br>[1605, 1687, 0]"]
+    29["Segment<br>[1506, 1555, 0]"]
-    30["Segment<br>[1693, 1763, 0]"]
+    30["Segment<br>[1561, 1631, 0]"]
-    31["Segment<br>[1769, 1853, 0]"]
+    31["Segment<br>[1637, 1688, 0]"]
-    32["Segment<br>[1859, 1929, 0]"]
+    32["Segment<br>[1694, 1764, 0]"]
-    33["Segment<br>[1935, 2019, 0]"]
+    33["Segment<br>[1770, 1821, 0]"]
-    34["Segment<br>[2025, 2081, 0]"]
+    34["Segment<br>[1827, 1883, 0]"]
-    35["Segment<br>[2087, 2094, 0]"]
+    35["Segment<br>[1889, 1896, 0]"]
     36[Solid2d]
   end
   subgraph path89 [Path]
-    89["Path<br>[2361, 2420, 0]"]
+    89["Path<br>[2163, 2222, 0]"]
-    90["Segment<br>[2361, 2420, 0]"]
+    90["Segment<br>[2163, 2222, 0]"]
     91[Solid2d]
   end
   subgraph path98 [Path]
-    98["Path<br>[2526, 2556, 0]"]
+    98["Path<br>[2328, 2358, 0]"]
-    99["Segment<br>[2562, 2581, 0]"]
+    99["Segment<br>[2364, 2383, 0]"]
-    100["Segment<br>[2587, 2670, 0]"]
+    100["Segment<br>[2389, 2439, 0]"]
-    101["Segment<br>[2676, 2732, 0]"]
+    101["Segment<br>[2445, 2501, 0]"]
-    102["Segment<br>[2738, 2745, 0]"]
+    102["Segment<br>[2507, 2514, 0]"]
     103[Solid2d]
   end
   subgraph path117 [Path]
-    117["Path<br>[2983, 3014, 0]"]
+    117["Path<br>[2752, 2783, 0]"]
-    118["Segment<br>[3020, 3065, 0]"]
+    118["Segment<br>[2789, 2834, 0]"]
-    119["Segment<br>[3071, 3148, 0]"]
+    119["Segment<br>[2840, 2917, 0]"]
-    120["Segment<br>[3154, 3193, 0]"]
+    120["Segment<br>[2923, 2962, 0]"]
-    121["Segment<br>[3199, 3245, 0]"]
+    121["Segment<br>[2968, 3014, 0]"]
-    122["Segment<br>[3251, 3276, 0]"]
+    122["Segment<br>[3020, 3045, 0]"]
-    123["Segment<br>[3282, 3338, 0]"]
+    123["Segment<br>[3051, 3107, 0]"]
-    124["Segment<br>[3344, 3351, 0]"]
+    124["Segment<br>[3113, 3120, 0]"]
     125[Solid2d]
   end
   subgraph path140 [Path]
-    140["Path<br>[3431, 3458, 0]"]
+    140["Path<br>[3200, 3227, 0]"]
-    141["Segment<br>[3464, 3484, 0]"]
+    141["Segment<br>[3233, 3253, 0]"]
-    142["Segment<br>[3490, 3533, 0]"]
+    142["Segment<br>[3259, 3302, 0]"]
-    143["Segment<br>[3539, 3557, 0]"]
+    143["Segment<br>[3308, 3326, 0]"]
-    144["Segment<br>[3563, 3583, 0]"]
+    144["Segment<br>[3332, 3352, 0]"]
-    145["Segment<br>[3589, 3609, 0]"]
+    145["Segment<br>[3358, 3378, 0]"]
-    146["Segment<br>[3615, 3655, 0]"]
+    146["Segment<br>[3384, 3424, 0]"]
-    147["Segment<br>[3661, 3717, 0]"]
+    147["Segment<br>[3430, 3486, 0]"]
-    148["Segment<br>[3723, 3730, 0]"]
+    148["Segment<br>[3492, 3499, 0]"]
     149[Solid2d]
   end
   subgraph path166 [Path]
-    166["Path<br>[3834, 3893, 0]"]
+    166["Path<br>[3603, 3662, 0]"]
-    167["Segment<br>[3834, 3893, 0]"]
+    167["Segment<br>[3603, 3662, 0]"]
     168[Solid2d]
   end
   subgraph path169 [Path]
-    169["Path<br>[3904, 3941, 0]"]
+    169["Path<br>[3673, 3710, 0]"]
-    170["Segment<br>[3904, 3941, 0]"]
+    170["Segment<br>[3673, 3710, 0]"]
     171[Solid2d]
   end
   subgraph path178 [Path]
-    178["Path<br>[4088, 4126, 0]"]
+    178["Path<br>[3857, 3895, 0]"]
-    179["Segment<br>[4088, 4126, 0]"]
+    179["Segment<br>[3857, 3895, 0]"]
     180[Solid2d]
   end
   subgraph path192 [Path]
-    192["Path<br>[4404, 4442, 0]"]
+    192["Path<br>[4173, 4211, 0]"]
-    193["Segment<br>[4404, 4442, 0]"]
+    193["Segment<br>[4173, 4211, 0]"]
     194[Solid2d]
   end
   subgraph path203 [Path]
-    203["Path<br>[4694, 4746, 0]"]
+    203["Path<br>[4463, 4515, 0]"]
-    204["Segment<br>[4694, 4746, 0]"]
+    204["Segment<br>[4463, 4515, 0]"]
     205[Solid2d]
   end
   subgraph path213 [Path]
-    213["Path<br>[4991, 5035, 0]"]
+    213["Path<br>[4760, 4804, 0]"]
-    214["Segment<br>[5041, 5081, 0]"]
+    214["Segment<br>[4810, 4850, 0]"]
-    215["Segment<br>[5087, 5106, 0]"]
+    215["Segment<br>[4856, 4875, 0]"]
-    216["Segment<br>[5112, 5131, 0]"]
+    216["Segment<br>[4881, 4900, 0]"]
-    217["Segment<br>[5137, 5156, 0]"]
+    217["Segment<br>[4906, 4925, 0]"]
-    218["Segment<br>[5162, 5187, 0]"]
+    218["Segment<br>[4931, 4956, 0]"]
-    219["Segment<br>[5193, 5333, 0]"]
+    219["Segment<br>[4962, 5102, 0]"]
-    220["Segment<br>[5339, 5395, 0]"]
+    220["Segment<br>[5108, 5164, 0]"]
-    221["Segment<br>[5401, 5408, 0]"]
+    221["Segment<br>[5170, 5177, 0]"]
     222[Solid2d]
   end
   subgraph path239 [Path]
-    239["Path<br>[5538, 5567, 0]"]
+    239["Path<br>[5307, 5336, 0]"]
-    240["Segment<br>[5573, 5594, 0]"]
+    240["Segment<br>[5342, 5363, 0]"]
-    241["Segment<br>[5600, 5640, 0]"]
+    241["Segment<br>[5369, 5409, 0]"]
-    242["Segment<br>[5646, 5686, 0]"]
+    242["Segment<br>[5415, 5455, 0]"]
-    243["Segment<br>[5692, 5733, 0]"]
+    243["Segment<br>[5461, 5502, 0]"]
-    244["Segment<br>[5739, 5761, 0]"]
+    244["Segment<br>[5508, 5530, 0]"]
-    245["Segment<br>[5767, 5788, 0]"]
+    245["Segment<br>[5536, 5557, 0]"]
-    246["Segment<br>[5794, 5819, 0]"]
+    246["Segment<br>[5563, 5588, 0]"]
-    247["Segment<br>[5825, 5865, 0]"]
+    247["Segment<br>[5594, 5634, 0]"]
-    248["Segment<br>[5871, 5912, 0]"]
+    248["Segment<br>[5640, 5681, 0]"]
-    249["Segment<br>[5918, 5959, 0]"]
+    249["Segment<br>[5687, 5728, 0]"]
-    250["Segment<br>[5965, 5986, 0]"]
+    250["Segment<br>[5734, 5755, 0]"]
-    251["Segment<br>[5992, 6048, 0]"]
+    251["Segment<br>[5761, 5817, 0]"]
-    252["Segment<br>[6054, 6061, 0]"]
+    252["Segment<br>[5823, 5830, 0]"]
     253[Solid2d]
   end
   1["Plane<br>[242, 259, 0]"]
@@ -130,7 +130,7 @@ flowchart LR
   15["SweepEdge Adjacent"]
   16["SweepEdge Adjacent"]
   17["Plane<br>[942, 965, 0]"]
-  37["Sweep Extrusion<br>[2100, 2122, 0]"]
+  37["Sweep Extrusion<br>[1902, 1924, 0]"]
   38[Wall]
   39[Wall]
   40[Wall]
@@ -181,14 +181,14 @@ flowchart LR
   85["SweepEdge Adjacent"]
   86["SweepEdge Opposite"]
   87["SweepEdge Adjacent"]
-  88["Plane<br>[2327, 2354, 0]"]
+  88["Plane<br>[2129, 2156, 0]"]
-  92["Sweep Extrusion<br>[2435, 2469, 0]"]
+  92["Sweep Extrusion<br>[2237, 2271, 0]"]
   93[Wall]
   94["Cap Start"]
   95["Cap End"]
   96["SweepEdge Opposite"]
   97["SweepEdge Adjacent"]
-  104["Sweep Extrusion<br>[2894, 2929, 0]"]
+  104["Sweep Extrusion<br>[2663, 2698, 0]"]
   105[Wall]
   106[Wall]
   107[Wall]
@@ -198,10 +198,10 @@ flowchart LR
   111["SweepEdge Adjacent"]
   112["SweepEdge Opposite"]
   113["SweepEdge Adjacent"]
-  114["Sweep Extrusion<br>[2894, 2929, 0]"]
+  114["Sweep Extrusion<br>[2663, 2698, 0]"]
-  115["Sweep Extrusion<br>[2894, 2929, 0]"]
+  115["Sweep Extrusion<br>[2663, 2698, 0]"]
-  116["Plane<br>[2960, 2977, 0]"]
+  116["Plane<br>[2729, 2746, 0]"]
-  126["Sweep Revolve<br>[3357, 3374, 0]"]
+  126["Sweep Revolve<br>[3126, 3143, 0]"]
   127[Wall]
   128[Wall]
   129[Wall]
@@ -214,8 +214,8 @@ flowchart LR
   136["SweepEdge Adjacent"]
   137["SweepEdge Adjacent"]
   138["SweepEdge Adjacent"]
-  139["Plane<br>[3408, 3425, 0]"]
+  139["Plane<br>[3177, 3194, 0]"]
-  150["Sweep Revolve<br>[3736, 3753, 0]"]
+  150["Sweep Revolve<br>[3505, 3522, 0]"]
   151[Wall]
   152[Wall]
   153[Wall]
@@ -230,40 +230,40 @@ flowchart LR
   162["SweepEdge Adjacent"]
   163["SweepEdge Adjacent"]
   164["SweepEdge Adjacent"]
-  165["Plane<br>[3797, 3827, 0]"]
+  165["Plane<br>[3566, 3596, 0]"]
-  172["Sweep Extrusion<br>[3960, 3994, 0]"]
+  172["Sweep Extrusion<br>[3729, 3763, 0]"]
   173[Wall]
   174["Cap Start"]
   175["Cap End"]
   176["SweepEdge Opposite"]
   177["SweepEdge Adjacent"]
-  181["Sweep Extrusion<br>[4275, 4310, 0]"]
+  181["Sweep Extrusion<br>[4044, 4079, 0]"]
   182[Wall]
   183["SweepEdge Opposite"]
   184["SweepEdge Adjacent"]
-  185["Sweep Extrusion<br>[4275, 4310, 0]"]
+  185["Sweep Extrusion<br>[4044, 4079, 0]"]
-  186["Sweep Extrusion<br>[4275, 4310, 0]"]
+  186["Sweep Extrusion<br>[4044, 4079, 0]"]
-  187["Sweep Extrusion<br>[4275, 4310, 0]"]
+  187["Sweep Extrusion<br>[4044, 4079, 0]"]
-  188["Sweep Extrusion<br>[4275, 4310, 0]"]
+  188["Sweep Extrusion<br>[4044, 4079, 0]"]
-  189["Sweep Extrusion<br>[4275, 4310, 0]"]
+  189["Sweep Extrusion<br>[4044, 4079, 0]"]
-  190["Sweep Extrusion<br>[4275, 4310, 0]"]
+  190["Sweep Extrusion<br>[4044, 4079, 0]"]
-  191["Sweep Extrusion<br>[4275, 4310, 0]"]
+  191["Sweep Extrusion<br>[4044, 4079, 0]"]
-  195["Sweep Extrusion<br>[4591, 4626, 0]"]
+  195["Sweep Extrusion<br>[4360, 4395, 0]"]
   196[Wall]
   197["SweepEdge Opposite"]
   198["SweepEdge Adjacent"]
-  199["Sweep Extrusion<br>[4591, 4626, 0]"]
+  199["Sweep Extrusion<br>[4360, 4395, 0]"]
-  200["Sweep Extrusion<br>[4591, 4626, 0]"]
+  200["Sweep Extrusion<br>[4360, 4395, 0]"]
-  201["Sweep Extrusion<br>[4591, 4626, 0]"]
+  201["Sweep Extrusion<br>[4360, 4395, 0]"]
-  202["Plane<br>[4671, 4688, 0]"]
+  202["Plane<br>[4440, 4457, 0]"]
-  206["Sweep Extrusion<br>[4842, 4883, 0]"]
+  206["Sweep Extrusion<br>[4611, 4652, 0]"]
   207[Wall]
   208["Cap Start"]
   209["Cap End"]
   210["SweepEdge Opposite"]
   211["SweepEdge Adjacent"]
-  212["Plane<br>[4968, 4985, 0]"]
+  212["Plane<br>[4737, 4754, 0]"]
-  223["Sweep Revolve<br>[5414, 5431, 0]"]
+  223["Sweep Revolve<br>[5183, 5200, 0]"]
   224[Wall]
   225[Wall]
   226[Wall]
@@ -278,8 +278,8 @@ flowchart LR
   235["SweepEdge Adjacent"]
   236["SweepEdge Adjacent"]
   237["SweepEdge Adjacent"]
-  238["Plane<br>[5486, 5531, 0]"]
+  238["Plane<br>[5255, 5300, 0]"]
-  254["Sweep Extrusion<br>[6075, 6120, 0]"]
+  254["Sweep Extrusion<br>[5844, 5889, 0]"]
   255[Wall]
   256[Wall]
   257[Wall]
@@ -318,12 +318,12 @@ flowchart LR
   290["SweepEdge Adjacent"]
   291["SweepEdge Opposite"]
   292["SweepEdge Adjacent"]
-  293["StartSketchOnPlane<br>[2313, 2355, 0]"]
+  293["StartSketchOnPlane<br>[2115, 2157, 0]"]
-  294["StartSketchOnFace<br>[2483, 2520, 0]"]
+  294["StartSketchOnFace<br>[2285, 2322, 0]"]
-  295["StartSketchOnPlane<br>[3783, 3828, 0]"]
+  295["StartSketchOnPlane<br>[3552, 3597, 0]"]
-  296["StartSketchOnFace<br>[4045, 4082, 0]"]
+  296["StartSketchOnFace<br>[3814, 3851, 0]"]
-  297["StartSketchOnFace<br>[4361, 4398, 0]"]
+  297["StartSketchOnFace<br>[4130, 4167, 0]"]
-  298["StartSketchOnPlane<br>[5472, 5532, 0]"]
+  298["StartSketchOnPlane<br>[5241, 5301, 0]"]
   1 --- 2
   2 --- 3
   2 --- 4

rust/kcl-lib/tests/kcl_samples/french-press/ast.snap

@@ -1406,22 +1406,15 @@ description: Result of parsing french-press.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "180",
@@ -1435,18 +1428,15 @@ description: Result of parsing french-press.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleEnd",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "205",
@@ -1460,18 +1450,15 @@ description: Result of parsing french-press.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "0.3",
@@ -1485,18 +1472,6 @@ description: Result of parsing french-press.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1515,8 +1490,9 @@ description: Result of parsing french-press.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
@@ -1616,22 +1592,15 @@ description: Result of parsing french-press.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "30",
@@ -1645,18 +1614,15 @@ description: Result of parsing french-press.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleEnd",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "argument": {
                         "commentStart": 0,
                         "end": 0,
@@ -1678,18 +1644,15 @@ description: Result of parsing french-press.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "0.6",
@@ -1703,18 +1666,6 @@ description: Result of parsing french-press.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1733,8 +1684,9 @@ description: Result of parsing french-press.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
@@ -1834,22 +1786,15 @@ description: Result of parsing french-press.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "60",
@@ -1863,18 +1808,15 @@ description: Result of parsing french-press.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleEnd",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "90",
@@ -1888,18 +1830,15 @@ description: Result of parsing french-press.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "0.5",
@@ -1913,18 +1852,6 @@ description: Result of parsing french-press.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1943,8 +1870,9 @@ description: Result of parsing french-press.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
@@ -2174,22 +2102,15 @@ description: Result of parsing french-press.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "90",
@@ -2203,18 +2124,15 @@ description: Result of parsing french-press.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleEnd",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "60",
@@ -2228,18 +2146,15 @@ description: Result of parsing french-press.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "0.6",
@@ -2253,18 +2168,6 @@ description: Result of parsing french-press.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -2283,8 +2186,9 @@ description: Result of parsing french-press.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
@@ -2432,22 +2336,15 @@ description: Result of parsing french-press.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "argument": {
                         "commentStart": 0,
                         "end": 0,
@@ -2469,18 +2366,15 @@ description: Result of parsing french-press.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleEnd",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "30",
@@ -2494,18 +2388,15 @@ description: Result of parsing french-press.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "0.5",
@@ -2519,18 +2410,6 @@ description: Result of parsing french-press.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -2549,8 +2428,9 @@ description: Result of parsing french-press.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
@@ -2706,22 +2586,15 @@ description: Result of parsing french-press.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "205",
@@ -2735,18 +2608,15 @@ description: Result of parsing french-press.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleEnd",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "180",
@@ -2760,18 +2630,15 @@ description: Result of parsing french-press.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "0.6",
@@ -2785,18 +2652,6 @@ description: Result of parsing french-press.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -2815,8 +2670,9 @@ description: Result of parsing french-press.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
@@ -3758,22 +3614,15 @@ description: Result of parsing french-press.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "90",
@@ -3787,18 +3636,15 @@ description: Result of parsing french-press.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleEnd",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "argument": {
                         "commentStart": 0,
                         "end": 0,
@@ -3820,18 +3666,15 @@ description: Result of parsing french-press.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "1.2",
@@ -3845,18 +3688,6 @@ description: Result of parsing french-press.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -3875,8 +3706,9 @@ description: Result of parsing french-press.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [

rust/kcl-lib/tests/kcl_samples/french-press/program_memory.snap

@@ -4983,9 +4983,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1220,
+                "commentStart": 1187,
-                "end": 1226,
+                "end": 1193,
-                "start": 1220,
+                "start": 1187,
                 "type": "TagDeclarator",
                 "value": "edge2"
               },
@@ -5003,9 +5003,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1374,
+                "commentStart": 1308,
-                "end": 1380,
+                "end": 1314,
-                "start": 1374,
+                "start": 1308,
                 "type": "TagDeclarator",
                 "value": "edge3"
               },
@@ -5023,9 +5023,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1506,
+                "commentStart": 1407,
-                "end": 1514,
+                "end": 1415,
-                "start": 1506,
+                "start": 1407,
                 "type": "TagDeclarator",
                 "value": "edgeLen"
               },
@@ -5043,9 +5043,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1592,
+                "commentStart": 1493,
-                "end": 1598,
+                "end": 1499,
-                "start": 1592,
+                "start": 1493,
                 "type": "TagDeclarator",
                 "value": "edge4"
               },
@@ -5063,9 +5063,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1756,
+                "commentStart": 1624,
-                "end": 1762,
+                "end": 1630,
-                "start": 1756,
+                "start": 1624,
                 "type": "TagDeclarator",
                 "value": "edge5"
               },
@@ -5083,9 +5083,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1922,
+                "commentStart": 1757,
-                "end": 1928,
+                "end": 1763,
-                "start": 1922,
+                "start": 1757,
                 "type": "TagDeclarator",
                 "value": "edge6"
               },
@@ -5189,9 +5189,9 @@ description: Variables in memory after executing french-press.kcl
                   0.3732
                 ],
                 "tag": {
-                  "commentStart": 1220,
+                  "commentStart": 1187,
-                  "end": 1226,
+                  "end": 1193,
-                  "start": 1220,
+                  "start": 1187,
                   "type": "TagDeclarator",
                   "value": "edge2"
                 },
@@ -5239,9 +5239,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.966
                 ],
                 "tag": {
-                  "commentStart": 1374,
+                  "commentStart": 1308,
-                  "end": 1380,
+                  "end": 1314,
-                  "start": 1374,
+                  "start": 1308,
                   "type": "TagDeclarator",
                   "value": "edge3"
                 },
@@ -5289,9 +5289,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.133
                 ],
                 "tag": {
-                  "commentStart": 1506,
+                  "commentStart": 1407,
-                  "end": 1514,
+                  "end": 1415,
-                  "start": 1506,
+                  "start": 1407,
                   "type": "TagDeclarator",
                   "value": "edgeLen"
                 },
@@ -5333,9 +5333,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.033
                 ],
                 "tag": {
-                  "commentStart": 1592,
+                  "commentStart": 1493,
-                  "end": 1598,
+                  "end": 1499,
-                  "start": 1592,
+                  "start": 1493,
                   "type": "TagDeclarator",
                   "value": "edge4"
                 },
@@ -5383,9 +5383,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.1134
                 ],
                 "tag": {
-                  "commentStart": 1756,
+                  "commentStart": 1624,
-                  "end": 1762,
+                  "end": 1630,
-                  "start": 1756,
+                  "start": 1624,
                   "type": "TagDeclarator",
                   "value": "edge5"
                 },
@@ -5433,9 +5433,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.1789
                 ],
                 "tag": {
-                  "commentStart": 1922,
+                  "commentStart": 1757,
-                  "end": 1928,
+                  "end": 1763,
-                  "start": 1922,
+                  "start": 1757,
                   "type": "TagDeclarator",
                   "value": "edge6"
                 },
@@ -5654,9 +5654,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1220,
+                "commentStart": 1187,
-                "end": 1226,
+                "end": 1193,
-                "start": 1220,
+                "start": 1187,
                 "type": "TagDeclarator",
                 "value": "edge2"
               },
@@ -5674,9 +5674,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1374,
+                "commentStart": 1308,
-                "end": 1380,
+                "end": 1314,
-                "start": 1374,
+                "start": 1308,
                 "type": "TagDeclarator",
                 "value": "edge3"
               },
@@ -5694,9 +5694,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1506,
+                "commentStart": 1407,
-                "end": 1514,
+                "end": 1415,
-                "start": 1506,
+                "start": 1407,
                 "type": "TagDeclarator",
                 "value": "edgeLen"
               },
@@ -5714,9 +5714,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1592,
+                "commentStart": 1493,
-                "end": 1598,
+                "end": 1499,
-                "start": 1592,
+                "start": 1493,
                 "type": "TagDeclarator",
                 "value": "edge4"
               },
@@ -5734,9 +5734,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1756,
+                "commentStart": 1624,
-                "end": 1762,
+                "end": 1630,
-                "start": 1756,
+                "start": 1624,
                 "type": "TagDeclarator",
                 "value": "edge5"
               },
@@ -5754,9 +5754,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1922,
+                "commentStart": 1757,
-                "end": 1928,
+                "end": 1763,
-                "start": 1922,
+                "start": 1757,
                 "type": "TagDeclarator",
                 "value": "edge6"
               },
@@ -5860,9 +5860,9 @@ description: Variables in memory after executing french-press.kcl
                   0.3732
                 ],
                 "tag": {
-                  "commentStart": 1220,
+                  "commentStart": 1187,
-                  "end": 1226,
+                  "end": 1193,
-                  "start": 1220,
+                  "start": 1187,
                   "type": "TagDeclarator",
                   "value": "edge2"
                 },
@@ -5910,9 +5910,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.966
                 ],
                 "tag": {
-                  "commentStart": 1374,
+                  "commentStart": 1308,
-                  "end": 1380,
+                  "end": 1314,
-                  "start": 1374,
+                  "start": 1308,
                   "type": "TagDeclarator",
                   "value": "edge3"
                 },
@@ -5960,9 +5960,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.133
                 ],
                 "tag": {
-                  "commentStart": 1506,
+                  "commentStart": 1407,
-                  "end": 1514,
+                  "end": 1415,
-                  "start": 1506,
+                  "start": 1407,
                   "type": "TagDeclarator",
                   "value": "edgeLen"
                 },
@@ -6004,9 +6004,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.033
                 ],
                 "tag": {
-                  "commentStart": 1592,
+                  "commentStart": 1493,
-                  "end": 1598,
+                  "end": 1499,
-                  "start": 1592,
+                  "start": 1493,
                   "type": "TagDeclarator",
                   "value": "edge4"
                 },
@@ -6054,9 +6054,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.1134
                 ],
                 "tag": {
-                  "commentStart": 1756,
+                  "commentStart": 1624,
-                  "end": 1762,
+                  "end": 1630,
-                  "start": 1756,
+                  "start": 1624,
                   "type": "TagDeclarator",
                   "value": "edge5"
                 },
@@ -6104,9 +6104,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.1789
                 ],
                 "tag": {
-                  "commentStart": 1922,
+                  "commentStart": 1757,
-                  "end": 1928,
+                  "end": 1763,
-                  "start": 1922,
+                  "start": 1757,
                   "type": "TagDeclarator",
                   "value": "edge6"
                 },
@@ -6325,9 +6325,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1220,
+                "commentStart": 1187,
-                "end": 1226,
+                "end": 1193,
-                "start": 1220,
+                "start": 1187,
                 "type": "TagDeclarator",
                 "value": "edge2"
               },
@@ -6345,9 +6345,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1374,
+                "commentStart": 1308,
-                "end": 1380,
+                "end": 1314,
-                "start": 1374,
+                "start": 1308,
                 "type": "TagDeclarator",
                 "value": "edge3"
               },
@@ -6365,9 +6365,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1506,
+                "commentStart": 1407,
-                "end": 1514,
+                "end": 1415,
-                "start": 1506,
+                "start": 1407,
                 "type": "TagDeclarator",
                 "value": "edgeLen"
               },
@@ -6385,9 +6385,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1592,
+                "commentStart": 1493,
-                "end": 1598,
+                "end": 1499,
-                "start": 1592,
+                "start": 1493,
                 "type": "TagDeclarator",
                 "value": "edge4"
               },
@@ -6405,9 +6405,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1756,
+                "commentStart": 1624,
-                "end": 1762,
+                "end": 1630,
-                "start": 1756,
+                "start": 1624,
                 "type": "TagDeclarator",
                 "value": "edge5"
               },
@@ -6425,9 +6425,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1922,
+                "commentStart": 1757,
-                "end": 1928,
+                "end": 1763,
-                "start": 1922,
+                "start": 1757,
                 "type": "TagDeclarator",
                 "value": "edge6"
               },
@@ -6531,9 +6531,9 @@ description: Variables in memory after executing french-press.kcl
                   0.3732
                 ],
                 "tag": {
-                  "commentStart": 1220,
+                  "commentStart": 1187,
-                  "end": 1226,
+                  "end": 1193,
-                  "start": 1220,
+                  "start": 1187,
                   "type": "TagDeclarator",
                   "value": "edge2"
                 },
@@ -6581,9 +6581,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.966
                 ],
                 "tag": {
-                  "commentStart": 1374,
+                  "commentStart": 1308,
-                  "end": 1380,
+                  "end": 1314,
-                  "start": 1374,
+                  "start": 1308,
                   "type": "TagDeclarator",
                   "value": "edge3"
                 },
@@ -6631,9 +6631,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.133
                 ],
                 "tag": {
-                  "commentStart": 1506,
+                  "commentStart": 1407,
-                  "end": 1514,
+                  "end": 1415,
-                  "start": 1506,
+                  "start": 1407,
                   "type": "TagDeclarator",
                   "value": "edgeLen"
                 },
@@ -6675,9 +6675,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.033
                 ],
                 "tag": {
-                  "commentStart": 1592,
+                  "commentStart": 1493,
-                  "end": 1598,
+                  "end": 1499,
-                  "start": 1592,
+                  "start": 1493,
                   "type": "TagDeclarator",
                   "value": "edge4"
                 },
@@ -6725,9 +6725,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.1134
                 ],
                 "tag": {
-                  "commentStart": 1756,
+                  "commentStart": 1624,
-                  "end": 1762,
+                  "end": 1630,
-                  "start": 1756,
+                  "start": 1624,
                   "type": "TagDeclarator",
                   "value": "edge5"
                 },
@@ -6775,9 +6775,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.1789
                 ],
                 "tag": {
-                  "commentStart": 1922,
+                  "commentStart": 1757,
-                  "end": 1928,
+                  "end": 1763,
-                  "start": 1922,
+                  "start": 1757,
                   "type": "TagDeclarator",
                   "value": "edge6"
                 },
@@ -6996,9 +6996,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1220,
+                "commentStart": 1187,
-                "end": 1226,
+                "end": 1193,
-                "start": 1220,
+                "start": 1187,
                 "type": "TagDeclarator",
                 "value": "edge2"
               },
@@ -7016,9 +7016,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1374,
+                "commentStart": 1308,
-                "end": 1380,
+                "end": 1314,
-                "start": 1374,
+                "start": 1308,
                 "type": "TagDeclarator",
                 "value": "edge3"
               },
@@ -7036,9 +7036,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1506,
+                "commentStart": 1407,
-                "end": 1514,
+                "end": 1415,
-                "start": 1506,
+                "start": 1407,
                 "type": "TagDeclarator",
                 "value": "edgeLen"
               },
@@ -7056,9 +7056,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1592,
+                "commentStart": 1493,
-                "end": 1598,
+                "end": 1499,
-                "start": 1592,
+                "start": 1493,
                 "type": "TagDeclarator",
                 "value": "edge4"
               },
@@ -7076,9 +7076,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1756,
+                "commentStart": 1624,
-                "end": 1762,
+                "end": 1630,
-                "start": 1756,
+                "start": 1624,
                 "type": "TagDeclarator",
                 "value": "edge5"
               },
@@ -7096,9 +7096,9 @@ description: Variables in memory after executing french-press.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 1922,
+                "commentStart": 1757,
-                "end": 1928,
+                "end": 1763,
-                "start": 1922,
+                "start": 1757,
                 "type": "TagDeclarator",
                 "value": "edge6"
               },
@@ -7202,9 +7202,9 @@ description: Variables in memory after executing french-press.kcl
                   0.3732
                 ],
                 "tag": {
-                  "commentStart": 1220,
+                  "commentStart": 1187,
-                  "end": 1226,
+                  "end": 1193,
-                  "start": 1220,
+                  "start": 1187,
                   "type": "TagDeclarator",
                   "value": "edge2"
                 },
@@ -7252,9 +7252,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.966
                 ],
                 "tag": {
-                  "commentStart": 1374,
+                  "commentStart": 1308,
-                  "end": 1380,
+                  "end": 1314,
-                  "start": 1374,
+                  "start": 1308,
                   "type": "TagDeclarator",
                   "value": "edge3"
                 },
@@ -7302,9 +7302,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.133
                 ],
                 "tag": {
-                  "commentStart": 1506,
+                  "commentStart": 1407,
-                  "end": 1514,
+                  "end": 1415,
-                  "start": 1506,
+                  "start": 1407,
                   "type": "TagDeclarator",
                   "value": "edgeLen"
                 },
@@ -7346,9 +7346,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.033
                 ],
                 "tag": {
-                  "commentStart": 1592,
+                  "commentStart": 1493,
-                  "end": 1598,
+                  "end": 1499,
-                  "start": 1592,
+                  "start": 1493,
                   "type": "TagDeclarator",
                   "value": "edge4"
                 },
@@ -7396,9 +7396,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.1134
                 ],
                 "tag": {
-                  "commentStart": 1756,
+                  "commentStart": 1624,
-                  "end": 1762,
+                  "end": 1630,
-                  "start": 1756,
+                  "start": 1624,
                   "type": "TagDeclarator",
                   "value": "edge5"
                 },
@@ -7446,9 +7446,9 @@ description: Variables in memory after executing french-press.kcl
                   -0.1789
                 ],
                 "tag": {
-                  "commentStart": 1922,
+                  "commentStart": 1757,
-                  "end": 1928,
+                  "end": 1763,
-                  "start": 1922,
+                  "start": 1757,
                   "type": "TagDeclarator",
                   "value": "edge6"
                 },
@@ -8538,9 +8538,9 @@ description: Variables in memory after executing french-press.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 3142,
+            "commentStart": 2911,
-            "end": 3147,
+            "end": 2916,
-            "start": 3142,
+            "start": 2911,
             "type": "TagDeclarator",
             "value": "seg1"
           },
@@ -8608,9 +8608,9 @@ description: Variables in memory after executing french-press.kcl
               1.11
             ],
             "tag": {
-              "commentStart": 3142,
+              "commentStart": 2911,
-              "end": 3147,
+              "end": 2916,
-              "start": 3142,
+              "start": 2911,
               "type": "TagDeclarator",
               "value": "seg1"
             },

rust/kcl-lib/tests/kcl_samples/gear/artifact_graph_flowchart.snap.md

@@ -108,7 +108,7 @@ flowchart LR
     111["Segment<br>[1537, 1575, 0]"]
     112["Segment<br>[1537, 1575, 0]"]
     113["Segment<br>[1537, 1575, 0]"]
-    114["Segment<br>[1938, 2040, 0]"]
+    114["Segment<br>[1938, 2007, 0]"]
     115["Segment<br>[1765, 1795, 0]"]
     116["Segment<br>[1765, 1795, 0]"]
     117["Segment<br>[1765, 1795, 0]"]
@@ -210,17 +210,17 @@ flowchart LR
     213["Segment<br>[1765, 1795, 0]"]
     214["Segment<br>[1765, 1795, 0]"]
     215["Segment<br>[1765, 1795, 0]"]
-    216["Segment<br>[2086, 2093, 0]"]
+    216["Segment<br>[2053, 2060, 0]"]
     217[Solid2d]
   end
   subgraph path219 [Path]
-    219["Path<br>[2574, 2674, 0]"]
+    219["Path<br>[2541, 2641, 0]"]
-    220["Segment<br>[2680, 2707, 0]"]
+    220["Segment<br>[2647, 2674, 0]"]
-    221["Segment<br>[2713, 2741, 0]"]
+    221["Segment<br>[2680, 2708, 0]"]
-    222["Segment<br>[2747, 2775, 0]"]
+    222["Segment<br>[2714, 2742, 0]"]
-    223["Segment<br>[2781, 2901, 0]"]
+    223["Segment<br>[2748, 2835, 0]"]
-    224["Segment<br>[2907, 3016, 0]"]
+    224["Segment<br>[2841, 2917, 0]"]
-    225["Segment<br>[3022, 3029, 0]"]
+    225["Segment<br>[2923, 2930, 0]"]
     226[Solid2d]
   end
   1["Plane<br>[1299, 1316, 0]"]
@@ -231,8 +231,8 @@ flowchart LR
   9["SweepEdge Opposite"]
   10["SweepEdge Adjacent"]
   11["Plane<br>[1826, 1843, 0]"]
-  218["Sweep Extrusion<br>[2099, 2127, 0]"]
+  218["Sweep Extrusion<br>[2066, 2094, 0]"]
-  227["Sweep Extrusion<br>[3035, 3064, 0]"]
+  227["Sweep Extrusion<br>[2936, 2965, 0]"]
   228[Wall]
   229[Wall]
   230[Wall]
@@ -245,7 +245,7 @@ flowchart LR
   237["SweepEdge Adjacent"]
   238["SweepEdge Opposite"]
   239["SweepEdge Adjacent"]
-  240["StartSketchOnFace<br>[2537, 2568, 0]"]
+  240["StartSketchOnFace<br>[2504, 2535, 0]"]
   1 --- 2
   2 --- 3
   2 ---- 5

rust/kcl-lib/tests/kcl_samples/gear/ast.snap

@@ -3081,22 +3081,15 @@ description: Result of parsing gear.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "0",
@@ -3110,18 +3103,15 @@ description: Result of parsing gear.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleEnd",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "abs_path": false,
                       "commentStart": 0,
                       "end": 0,
@@ -3139,18 +3129,15 @@ description: Result of parsing gear.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "left": {
@@ -3188,18 +3175,6 @@ description: Result of parsing gear.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -3218,8 +3193,9 @@ description: Result of parsing gear.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
@@ -4291,47 +4267,15 @@ description: Result of parsing gear.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": "angleEnd",
-                          "start": 0,
-                          "type": "Identifier"
-                        },
-                        "start": 0,
-                        "type": "ObjectProperty",
-                        "value": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "raw": "180",
-                          "start": 0,
-                          "type": "Literal",
-                          "type": "Literal",
-                          "value": {
-                            "value": 180.0,
-                            "suffix": "None"
-                          }
-                        }
-                      },
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "left": {
@@ -4421,18 +4365,37 @@ description: Result of parsing gear.kcl
                     }
                   },
                   {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
-                        "key": {
+                      "name": "angleEnd",
+                      "start": 0,
+                      "type": "Identifier"
+                    },
+                    "arg": {
+                      "commentStart": 0,
+                      "end": 0,
+                      "raw": "180",
+                      "start": 0,
+                      "type": "Literal",
+                      "type": "Literal",
+                      "value": {
+                        "value": 180.0,
+                        "suffix": "None"
+                      }
+                    }
+                  },
+                  {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "abs_path": false,
                       "commentStart": 0,
                       "end": 0,
@@ -4450,18 +4413,6 @@ description: Result of parsing gear.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -4480,28 +4431,44 @@ description: Result of parsing gear.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
                   {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
-                    "properties": [
+                      "name": "angleStart",
+                      "start": 0,
+                      "type": "Identifier"
+                    },
+                    "arg": {
+                      "commentStart": 0,
+                      "end": 0,
+                      "raw": "180",
+                      "start": 0,
+                      "type": "Literal",
+                      "type": "Literal",
+                      "value": {
+                        "value": 180.0,
+                        "suffix": "None"
+                      }
+                    }
+                  },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleEnd",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "arguments": [
                         {
                           "abs_path": false,
@@ -4543,43 +4510,15 @@ description: Result of parsing gear.kcl
                     }
                   },
                   {
-                        "commentStart": 0,
+                    "type": "LabeledArg",
-                        "end": 0,
+                    "label": {
-                        "key": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": "angleStart",
-                          "start": 0,
-                          "type": "Identifier"
-                        },
-                        "start": 0,
-                        "type": "ObjectProperty",
-                        "value": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "raw": "180",
-                          "start": 0,
-                          "type": "Literal",
-                          "type": "Literal",
-                          "value": {
-                            "value": 180.0,
-                            "suffix": "None"
-                          }
-                        }
-                      },
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "abs_path": false,
                       "commentStart": 0,
                       "end": 0,
@@ -4597,18 +4536,6 @@ description: Result of parsing gear.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -4627,8 +4554,9 @@ description: Result of parsing gear.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [],

rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/artifact_graph_flowchart.snap.md

@@ -19,66 +19,66 @@ flowchart LR
     34[Solid2d]
   end
   subgraph path54 [Path]
-    54["Path<br>[4747, 4827, 0]"]
+    54["Path<br>[4583, 4663, 0]"]
-    55["Segment<br>[4747, 4827, 0]"]
+    55["Segment<br>[4583, 4663, 0]"]
     56[Solid2d]
   end
   subgraph path58 [Path]
-    58["Path<br>[4378, 4403, 0]"]
+    58["Path<br>[4214, 4239, 0]"]
-    59["Segment<br>[4411, 4452, 0]"]
+    59["Segment<br>[4247, 4288, 0]"]
-    60["Segment<br>[4460, 4501, 0]"]
+    60["Segment<br>[4296, 4337, 0]"]
-    61["Segment<br>[4509, 4562, 0]"]
+    61["Segment<br>[4345, 4398, 0]"]
-    62["Segment<br>[4570, 4591, 0]"]
+    62["Segment<br>[4406, 4427, 0]"]
     63[Solid2d]
   end
   subgraph path65 [Path]
     65["Path<br>[2723, 2810, 0]"]
     66["Segment<br>[2818, 2897, 0]"]
-    67["Segment<br>[2905, 3011, 0]"]
+    67["Segment<br>[2905, 2970, 0]"]
-    68["Segment<br>[3019, 3101, 0]"]
+    68["Segment<br>[2978, 3060, 0]"]
-    69["Segment<br>[3109, 3155, 0]"]
+    69["Segment<br>[3068, 3114, 0]"]
-    70["Segment<br>[3163, 3242, 0]"]
+    70["Segment<br>[3122, 3201, 0]"]
-    71["Segment<br>[3250, 3358, 0]"]
+    71["Segment<br>[3209, 3276, 0]"]
-    72["Segment<br>[3366, 3445, 0]"]
+    72["Segment<br>[3284, 3363, 0]"]
-    73["Segment<br>[3453, 3499, 0]"]
+    73["Segment<br>[3371, 3417, 0]"]
-    74["Segment<br>[3507, 3589, 0]"]
+    74["Segment<br>[3425, 3507, 0]"]
-    75["Segment<br>[3597, 3706, 0]"]
+    75["Segment<br>[3515, 3583, 0]"]
-    76["Segment<br>[3714, 3793, 0]"]
+    76["Segment<br>[3591, 3670, 0]"]
-    77["Segment<br>[3801, 3866, 0]"]
+    77["Segment<br>[3678, 3743, 0]"]
-    78["Segment<br>[3874, 3956, 0]"]
+    78["Segment<br>[3751, 3833, 0]"]
-    79["Segment<br>[3964, 4073, 0]"]
+    79["Segment<br>[3841, 3909, 0]"]
-    80["Segment<br>[4081, 4163, 0]"]
+    80["Segment<br>[3917, 3999, 0]"]
-    81["Segment<br>[4171, 4220, 0]"]
+    81["Segment<br>[4007, 4056, 0]"]
-    82["Segment<br>[4228, 4235, 0]"]
+    82["Segment<br>[4064, 4071, 0]"]
     83[Solid2d]
   end
   subgraph path100 [Path]
-    100["Path<br>[4378, 4403, 0]"]
+    100["Path<br>[4214, 4239, 0]"]
-    101["Segment<br>[4411, 4452, 0]"]
+    101["Segment<br>[4247, 4288, 0]"]
-    102["Segment<br>[4460, 4501, 0]"]
+    102["Segment<br>[4296, 4337, 0]"]
-    103["Segment<br>[4509, 4562, 0]"]
+    103["Segment<br>[4345, 4398, 0]"]
-    104["Segment<br>[4570, 4591, 0]"]
+    104["Segment<br>[4406, 4427, 0]"]
     105[Solid2d]
   end
   subgraph path106 [Path]
     106["Path<br>[2723, 2810, 0]"]
     107["Segment<br>[2818, 2897, 0]"]
-    108["Segment<br>[2905, 3011, 0]"]
+    108["Segment<br>[2905, 2970, 0]"]
-    109["Segment<br>[3019, 3101, 0]"]
+    109["Segment<br>[2978, 3060, 0]"]
-    110["Segment<br>[3109, 3155, 0]"]
+    110["Segment<br>[3068, 3114, 0]"]
-    111["Segment<br>[3163, 3242, 0]"]
+    111["Segment<br>[3122, 3201, 0]"]
-    112["Segment<br>[3250, 3358, 0]"]
+    112["Segment<br>[3209, 3276, 0]"]
-    113["Segment<br>[3366, 3445, 0]"]
+    113["Segment<br>[3284, 3363, 0]"]
-    114["Segment<br>[3453, 3499, 0]"]
+    114["Segment<br>[3371, 3417, 0]"]
-    115["Segment<br>[3507, 3589, 0]"]
+    115["Segment<br>[3425, 3507, 0]"]
-    116["Segment<br>[3597, 3706, 0]"]
+    116["Segment<br>[3515, 3583, 0]"]
-    117["Segment<br>[3714, 3793, 0]"]
+    117["Segment<br>[3591, 3670, 0]"]
-    118["Segment<br>[3801, 3866, 0]"]
+    118["Segment<br>[3678, 3743, 0]"]
-    119["Segment<br>[3874, 3956, 0]"]
+    119["Segment<br>[3751, 3833, 0]"]
-    120["Segment<br>[3964, 4073, 0]"]
+    120["Segment<br>[3841, 3909, 0]"]
-    121["Segment<br>[4081, 4163, 0]"]
+    121["Segment<br>[3917, 3999, 0]"]
-    122["Segment<br>[4171, 4220, 0]"]
+    122["Segment<br>[4007, 4056, 0]"]
-    123["Segment<br>[4228, 4235, 0]"]
+    123["Segment<br>[4064, 4071, 0]"]
     124[Solid2d]
   end
   1["Plane<br>[1217, 1255, 0]"]
@@ -119,10 +119,10 @@ flowchart LR
   50["SweepEdge Adjacent"]
   51["SweepEdge Opposite"]
   52["SweepEdge Adjacent"]
-  53["Plane<br>[4724, 4741, 0]"]
+  53["Plane<br>[4560, 4577, 0]"]
-  57["Plane<br>[4350, 4370, 0]"]
+  57["Plane<br>[4186, 4206, 0]"]
   64["Plane<br>[2695, 2715, 0]"]
-  84["Sweep Extrusion<br>[5170, 5212, 0]"]
+  84["Sweep Extrusion<br>[5006, 5048, 0]"]
   85[Wall]
   86[Wall]
   87[Wall]
@@ -137,8 +137,8 @@ flowchart LR
   96["SweepEdge Adjacent"]
   97["SweepEdge Opposite"]
   98["SweepEdge Adjacent"]
-  99["Plane<br>[5706, 5741, 0]"]
+  99["Plane<br>[5542, 5577, 0]"]
-  125["Sweep Extrusion<br>[5824, 5875, 0]"]
+  125["Sweep Extrusion<br>[5660, 5711, 0]"]
   126[Wall]
   127[Wall]
   128[Wall]
@@ -153,17 +153,17 @@ flowchart LR
   137["SweepEdge Adjacent"]
   138["SweepEdge Opposite"]
   139["SweepEdge Adjacent"]
-  140["EdgeCut Fillet<br>[5275, 5614, 0]"]
+  140["EdgeCut Fillet<br>[5111, 5450, 0]"]
-  141["EdgeCut Fillet<br>[5275, 5614, 0]"]
+  141["EdgeCut Fillet<br>[5111, 5450, 0]"]
-  142["EdgeCut Fillet<br>[5275, 5614, 0]"]
+  142["EdgeCut Fillet<br>[5111, 5450, 0]"]
-  143["EdgeCut Fillet<br>[5275, 5614, 0]"]
+  143["EdgeCut Fillet<br>[5111, 5450, 0]"]
-  144["EdgeCut Fillet<br>[5939, 6283, 0]"]
+  144["EdgeCut Fillet<br>[5775, 6119, 0]"]
-  145["EdgeCut Fillet<br>[5939, 6283, 0]"]
+  145["EdgeCut Fillet<br>[5775, 6119, 0]"]
-  146["EdgeCut Fillet<br>[5939, 6283, 0]"]
+  146["EdgeCut Fillet<br>[5775, 6119, 0]"]
-  147["EdgeCut Fillet<br>[5939, 6283, 0]"]
+  147["EdgeCut Fillet<br>[5775, 6119, 0]"]
   148["StartSketchOnPlane<br>[894, 914, 0]"]
   149["StartSketchOnPlane<br>[894, 914, 0]"]
-  150["StartSketchOnPlane<br>[4350, 4370, 0]"]
+  150["StartSketchOnPlane<br>[4186, 4206, 0]"]
   151["StartSketchOnPlane<br>[2695, 2715, 0]"]
   1 --- 2
   2 --- 3

rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/ast.snap

@@ -3062,22 +3062,15 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                         {
                           "arguments": [
                             {
-                              "commentStart": 0,
+                              "type": "LabeledArg",
-                              "end": 0,
+                              "label": {
-                              "properties": [
-                                {
-                                  "commentStart": 0,
-                                  "end": 0,
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleStart",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "raw": "90.0",
@@ -3091,18 +3084,15 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleEnd",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "raw": "0.0",
@@ -3116,18 +3106,15 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "radius",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "left": {
@@ -3165,18 +3152,6 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                               }
                             }
                           ],
-                              "start": 0,
-                              "type": "ObjectExpression",
-                              "type": "ObjectExpression"
-                            },
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -3195,8 +3170,9 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": null
                         },
                         {
                           "arguments": [
@@ -3630,22 +3606,15 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                         {
                           "arguments": [
                             {
-                              "commentStart": 0,
+                              "type": "LabeledArg",
-                              "end": 0,
+                              "label": {
-                              "properties": [
-                                {
-                                  "commentStart": 0,
-                                  "end": 0,
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleStart",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "raw": "180.0",
@@ -3659,18 +3628,15 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleEnd",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "raw": "90.0",
@@ -3684,18 +3650,15 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "radius",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "left": {
@@ -3733,18 +3696,6 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                               }
                             }
                           ],
-                              "start": 0,
-                              "type": "ObjectExpression",
-                              "type": "ObjectExpression"
-                            },
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -3763,8 +3714,9 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": null
                         },
                         {
                           "arguments": [
@@ -4198,22 +4150,15 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                         {
                           "arguments": [
                             {
-                              "commentStart": 0,
+                              "type": "LabeledArg",
-                              "end": 0,
+                              "label": {
-                              "properties": [
-                                {
-                                  "commentStart": 0,
-                                  "end": 0,
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleStart",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "raw": "270.0",
@@ -4227,18 +4172,15 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleEnd",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "raw": "180.0",
@@ -4252,18 +4194,15 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "radius",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "left": {
@@ -4301,18 +4240,6 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                               }
                             }
                           ],
-                              "start": 0,
-                              "type": "ObjectExpression",
-                              "type": "ObjectExpression"
-                            },
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -4331,8 +4258,9 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": null
                         },
                         {
                           "arguments": [
@@ -4792,22 +4720,15 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                         {
                           "arguments": [
                             {
-                              "commentStart": 0,
+                              "type": "LabeledArg",
-                              "end": 0,
+                              "label": {
-                              "properties": [
-                                {
-                                  "commentStart": 0,
-                                  "end": 0,
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleStart",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "raw": "360.0",
@@ -4821,18 +4742,15 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleEnd",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "raw": "270.0",
@@ -4846,18 +4764,15 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "radius",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "left": {
@@ -4895,18 +4810,6 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                               }
                             }
                           ],
-                              "start": 0,
-                              "type": "ObjectExpression",
-                              "type": "ObjectExpression"
-                            },
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -4925,8 +4828,9 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": null
                         },
                         {
                           "arguments": [

rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/ops.snap

@@ -1107,8 +1107,8 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
       "type": "FunctionCall",
       "name": "magnetBase",
       "functionSourceRange": [
-        4319,
+        4155,
-        4661,
+        4497,
         0
       ],
       "unlabeledArg": null,
@@ -1138,7 +1138,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
       "name": "magnetCenterCutout",
       "functionSourceRange": [
         2668,
-        4259,
+        4095,
         0
       ],
       "unlabeledArg": null,
@@ -1366,8 +1366,8 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
       "type": "FunctionCall",
       "name": "magnetBase",
       "functionSourceRange": [
-        4319,
+        4155,
-        4661,
+        4497,
         0
       ],
       "unlabeledArg": null,
@@ -1397,7 +1397,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
       "name": "magnetCenterCutout",
       "functionSourceRange": [
         2668,
-        4259,
+        4095,
         0
       ],
       "unlabeledArg": null,

rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/program_memory.snap

@@ -11475,9 +11475,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4443,
+            "commentStart": 4279,
-            "end": 4451,
+            "end": 4287,
-            "start": 4443,
+            "start": 4279,
             "type": "TagDeclarator",
             "value": "line001"
           },
@@ -11488,9 +11488,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4492,
+            "commentStart": 4328,
-            "end": 4500,
+            "end": 4336,
-            "start": 4492,
+            "start": 4328,
             "type": "TagDeclarator",
             "value": "line002"
           },
@@ -11501,9 +11501,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4553,
+            "commentStart": 4389,
-            "end": 4561,
+            "end": 4397,
-            "start": 4553,
+            "start": 4389,
             "type": "TagDeclarator",
             "value": "line003"
           },
@@ -11514,9 +11514,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4582,
+            "commentStart": 4418,
-            "end": 4590,
+            "end": 4426,
-            "start": 4582,
+            "start": 4418,
             "type": "TagDeclarator",
             "value": "line004"
           },
@@ -11537,9 +11537,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               0.0
             ],
             "tag": {
-              "commentStart": 4443,
+              "commentStart": 4279,
-              "end": 4451,
+              "end": 4287,
-              "start": 4443,
+              "start": 4279,
               "type": "TagDeclarator",
               "value": "line001"
             },
@@ -11562,9 +11562,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               0.0
             ],
             "tag": {
-              "commentStart": 4492,
+              "commentStart": 4328,
-              "end": 4500,
+              "end": 4336,
-              "start": 4492,
+              "start": 4328,
               "type": "TagDeclarator",
               "value": "line002"
             },
@@ -11587,9 +11587,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               42.0
             ],
             "tag": {
-              "commentStart": 4553,
+              "commentStart": 4389,
-              "end": 4561,
+              "end": 4397,
-              "start": 4553,
+              "start": 4389,
               "type": "TagDeclarator",
               "value": "line003"
             },
@@ -11612,9 +11612,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               42.0
             ],
             "tag": {
-              "commentStart": 4582,
+              "commentStart": 4418,
-              "end": 4590,
+              "end": 4426,
-              "start": 4582,
+              "start": 4418,
               "type": "TagDeclarator",
               "value": "line004"
             },
@@ -11731,9 +11731,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4443,
+            "commentStart": 4279,
-            "end": 4451,
+            "end": 4287,
-            "start": 4443,
+            "start": 4279,
             "type": "TagDeclarator",
             "value": "line001"
           },
@@ -11744,9 +11744,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4492,
+            "commentStart": 4328,
-            "end": 4500,
+            "end": 4336,
-            "start": 4492,
+            "start": 4328,
             "type": "TagDeclarator",
             "value": "line002"
           },
@@ -11757,9 +11757,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4553,
+            "commentStart": 4389,
-            "end": 4561,
+            "end": 4397,
-            "start": 4553,
+            "start": 4389,
             "type": "TagDeclarator",
             "value": "line003"
           },
@@ -11770,9 +11770,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4582,
+            "commentStart": 4418,
-            "end": 4590,
+            "end": 4426,
-            "start": 4582,
+            "start": 4418,
             "type": "TagDeclarator",
             "value": "line004"
           },
@@ -11793,9 +11793,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               0.0
             ],
             "tag": {
-              "commentStart": 4443,
+              "commentStart": 4279,
-              "end": 4451,
+              "end": 4287,
-              "start": 4443,
+              "start": 4279,
               "type": "TagDeclarator",
               "value": "line001"
             },
@@ -11818,9 +11818,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               0.0
             ],
             "tag": {
-              "commentStart": 4492,
+              "commentStart": 4328,
-              "end": 4500,
+              "end": 4336,
-              "start": 4492,
+              "start": 4328,
               "type": "TagDeclarator",
               "value": "line002"
             },
@@ -11843,9 +11843,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               42.0
             ],
             "tag": {
-              "commentStart": 4553,
+              "commentStart": 4389,
-              "end": 4561,
+              "end": 4397,
-              "start": 4553,
+              "start": 4389,
               "type": "TagDeclarator",
               "value": "line003"
             },
@@ -11868,9 +11868,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               42.0
             ],
             "tag": {
-              "commentStart": 4582,
+              "commentStart": 4418,
-              "end": 4590,
+              "end": 4426,
-              "start": 4582,
+              "start": 4418,
               "type": "TagDeclarator",
               "value": "line004"
             },
@@ -12061,9 +12061,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4443,
+            "commentStart": 4279,
-            "end": 4451,
+            "end": 4287,
-            "start": 4443,
+            "start": 4279,
             "type": "TagDeclarator",
             "value": "line001"
           },
@@ -12074,9 +12074,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4492,
+            "commentStart": 4328,
-            "end": 4500,
+            "end": 4336,
-            "start": 4492,
+            "start": 4328,
             "type": "TagDeclarator",
             "value": "line002"
           },
@@ -12087,9 +12087,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4553,
+            "commentStart": 4389,
-            "end": 4561,
+            "end": 4397,
-            "start": 4553,
+            "start": 4389,
             "type": "TagDeclarator",
             "value": "line003"
           },
@@ -12100,9 +12100,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4582,
+            "commentStart": 4418,
-            "end": 4590,
+            "end": 4426,
-            "start": 4582,
+            "start": 4418,
             "type": "TagDeclarator",
             "value": "line004"
           },
@@ -12123,9 +12123,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               0.0
             ],
             "tag": {
-              "commentStart": 4443,
+              "commentStart": 4279,
-              "end": 4451,
+              "end": 4287,
-              "start": 4443,
+              "start": 4279,
               "type": "TagDeclarator",
               "value": "line001"
             },
@@ -12148,9 +12148,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               0.0
             ],
             "tag": {
-              "commentStart": 4492,
+              "commentStart": 4328,
-              "end": 4500,
+              "end": 4336,
-              "start": 4492,
+              "start": 4328,
               "type": "TagDeclarator",
               "value": "line002"
             },
@@ -12173,9 +12173,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               42.0
             ],
             "tag": {
-              "commentStart": 4553,
+              "commentStart": 4389,
-              "end": 4561,
+              "end": 4397,
-              "start": 4553,
+              "start": 4389,
               "type": "TagDeclarator",
               "value": "line003"
             },
@@ -12198,9 +12198,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               42.0
             ],
             "tag": {
-              "commentStart": 4582,
+              "commentStart": 4418,
-              "end": 4590,
+              "end": 4426,
-              "start": 4582,
+              "start": 4418,
               "type": "TagDeclarator",
               "value": "line004"
             },
@@ -12317,9 +12317,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4443,
+            "commentStart": 4279,
-            "end": 4451,
+            "end": 4287,
-            "start": 4443,
+            "start": 4279,
             "type": "TagDeclarator",
             "value": "line001"
           },
@@ -12330,9 +12330,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4492,
+            "commentStart": 4328,
-            "end": 4500,
+            "end": 4336,
-            "start": 4492,
+            "start": 4328,
             "type": "TagDeclarator",
             "value": "line002"
           },
@@ -12343,9 +12343,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4553,
+            "commentStart": 4389,
-            "end": 4561,
+            "end": 4397,
-            "start": 4553,
+            "start": 4389,
             "type": "TagDeclarator",
             "value": "line003"
           },
@@ -12356,9 +12356,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 4582,
+            "commentStart": 4418,
-            "end": 4590,
+            "end": 4426,
-            "start": 4582,
+            "start": 4418,
             "type": "TagDeclarator",
             "value": "line004"
           },
@@ -12379,9 +12379,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               0.0
             ],
             "tag": {
-              "commentStart": 4443,
+              "commentStart": 4279,
-              "end": 4451,
+              "end": 4287,
-              "start": 4443,
+              "start": 4279,
               "type": "TagDeclarator",
               "value": "line001"
             },
@@ -12404,9 +12404,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               0.0
             ],
             "tag": {
-              "commentStart": 4492,
+              "commentStart": 4328,
-              "end": 4500,
+              "end": 4336,
-              "start": 4492,
+              "start": 4328,
               "type": "TagDeclarator",
               "value": "line002"
             },
@@ -12429,9 +12429,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               42.0
             ],
             "tag": {
-              "commentStart": 4553,
+              "commentStart": 4389,
-              "end": 4561,
+              "end": 4397,
-              "start": 4553,
+              "start": 4389,
               "type": "TagDeclarator",
               "value": "line003"
             },
@@ -12454,9 +12454,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               42.0
             ],
             "tag": {
-              "commentStart": 4582,
+              "commentStart": 4418,
-              "end": 4590,
+              "end": 4426,
-              "start": 4582,
+              "start": 4418,
               "type": "TagDeclarator",
               "value": "line004"
             },
@@ -12651,9 +12651,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             0.0
           ],
           "tag": {
-            "commentStart": 4443,
+            "commentStart": 4279,
-            "end": 4451,
+            "end": 4287,
-            "start": 4443,
+            "start": 4279,
             "type": "TagDeclarator",
             "value": "line001"
           },
@@ -12676,9 +12676,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             0.0
           ],
           "tag": {
-            "commentStart": 4492,
+            "commentStart": 4328,
-            "end": 4500,
+            "end": 4336,
-            "start": 4492,
+            "start": 4328,
             "type": "TagDeclarator",
             "value": "line002"
           },
@@ -12701,9 +12701,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             42.0
           ],
           "tag": {
-            "commentStart": 4553,
+            "commentStart": 4389,
-            "end": 4561,
+            "end": 4397,
-            "start": 4553,
+            "start": 4389,
             "type": "TagDeclarator",
             "value": "line003"
           },
@@ -12726,9 +12726,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             42.0
           ],
           "tag": {
-            "commentStart": 4582,
+            "commentStart": 4418,
-            "end": 4590,
+            "end": 4426,
-            "start": 4582,
+            "start": 4418,
             "type": "TagDeclarator",
             "value": "line004"
           },
@@ -12842,9 +12842,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             0.0
           ],
           "tag": {
-            "commentStart": 4443,
+            "commentStart": 4279,
-            "end": 4451,
+            "end": 4287,
-            "start": 4443,
+            "start": 4279,
             "type": "TagDeclarator",
             "value": "line001"
           },
@@ -12867,9 +12867,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             0.0
           ],
           "tag": {
-            "commentStart": 4492,
+            "commentStart": 4328,
-            "end": 4500,
+            "end": 4336,
-            "start": 4492,
+            "start": 4328,
             "type": "TagDeclarator",
             "value": "line002"
           },
@@ -12892,9 +12892,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             42.0
           ],
           "tag": {
-            "commentStart": 4553,
+            "commentStart": 4389,
-            "end": 4561,
+            "end": 4397,
-            "start": 4553,
+            "start": 4389,
             "type": "TagDeclarator",
             "value": "line003"
           },
@@ -12917,9 +12917,9 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             42.0
           ],
           "tag": {
-            "commentStart": 4582,
+            "commentStart": 4418,
-            "end": 4590,
+            "end": 4426,
-            "start": 4582,
+            "start": 4418,
             "type": "TagDeclarator",
             "value": "line004"
           },

rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/artifact_graph_flowchart.snap.md

@@ -44,49 +44,49 @@ flowchart LR
   subgraph path119 [Path]
     119["Path<br>[5326, 5351, 0]"]
     120["Segment<br>[5411, 5454, 0]"]
-    121["Segment<br>[5462, 5571, 0]"]
+    121["Segment<br>[5462, 5582, 0]"]
-    122["Segment<br>[5634, 5683, 0]"]
+    122["Segment<br>[5645, 5694, 0]"]
-    123["Segment<br>[5691, 5716, 0]"]
+    123["Segment<br>[5702, 5727, 0]"]
-    124["Segment<br>[5724, 5767, 0]"]
+    124["Segment<br>[5735, 5778, 0]"]
-    125["Segment<br>[5775, 5800, 0]"]
+    125["Segment<br>[5786, 5811, 0]"]
-    126["Segment<br>[5808, 5852, 0]"]
+    126["Segment<br>[5819, 5863, 0]"]
-    127["Segment<br>[5860, 5867, 0]"]
+    127["Segment<br>[5871, 5878, 0]"]
     128[Solid2d]
   end
   subgraph path157 [Path]
     157["Path<br>[5326, 5351, 0]"]
     158["Segment<br>[5411, 5454, 0]"]
-    159["Segment<br>[5462, 5571, 0]"]
+    159["Segment<br>[5462, 5582, 0]"]
-    160["Segment<br>[5634, 5683, 0]"]
+    160["Segment<br>[5645, 5694, 0]"]
-    161["Segment<br>[5691, 5716, 0]"]
+    161["Segment<br>[5702, 5727, 0]"]
-    162["Segment<br>[5724, 5767, 0]"]
+    162["Segment<br>[5735, 5778, 0]"]
-    163["Segment<br>[5775, 5800, 0]"]
+    163["Segment<br>[5786, 5811, 0]"]
-    164["Segment<br>[5808, 5852, 0]"]
+    164["Segment<br>[5819, 5863, 0]"]
-    165["Segment<br>[5860, 5867, 0]"]
+    165["Segment<br>[5871, 5878, 0]"]
     166[Solid2d]
   end
   subgraph path195 [Path]
     195["Path<br>[5326, 5351, 0]"]
     196["Segment<br>[5411, 5454, 0]"]
-    197["Segment<br>[5462, 5571, 0]"]
+    197["Segment<br>[5462, 5582, 0]"]
-    198["Segment<br>[5634, 5683, 0]"]
+    198["Segment<br>[5645, 5694, 0]"]
-    199["Segment<br>[5691, 5716, 0]"]
+    199["Segment<br>[5702, 5727, 0]"]
-    200["Segment<br>[5724, 5767, 0]"]
+    200["Segment<br>[5735, 5778, 0]"]
-    201["Segment<br>[5775, 5800, 0]"]
+    201["Segment<br>[5786, 5811, 0]"]
-    202["Segment<br>[5808, 5852, 0]"]
+    202["Segment<br>[5819, 5863, 0]"]
-    203["Segment<br>[5860, 5867, 0]"]
+    203["Segment<br>[5871, 5878, 0]"]
     204[Solid2d]
   end
   subgraph path233 [Path]
     233["Path<br>[5326, 5351, 0]"]
     234["Segment<br>[5411, 5454, 0]"]
-    235["Segment<br>[5462, 5571, 0]"]
+    235["Segment<br>[5462, 5582, 0]"]
-    236["Segment<br>[5634, 5683, 0]"]
+    236["Segment<br>[5645, 5694, 0]"]
-    237["Segment<br>[5691, 5716, 0]"]
+    237["Segment<br>[5702, 5727, 0]"]
-    238["Segment<br>[5724, 5767, 0]"]
+    238["Segment<br>[5735, 5778, 0]"]
-    239["Segment<br>[5775, 5800, 0]"]
+    239["Segment<br>[5786, 5811, 0]"]
-    240["Segment<br>[5808, 5852, 0]"]
+    240["Segment<br>[5819, 5863, 0]"]
-    241["Segment<br>[5860, 5867, 0]"]
+    241["Segment<br>[5871, 5878, 0]"]
     242[Solid2d]
   end
   1["Plane<br>[1541, 1588, 0]"]
@@ -176,7 +176,7 @@ flowchart LR
   116["EdgeCut Fillet<br>[4915, 5148, 0]"]
   117["EdgeCut Fillet<br>[4915, 5148, 0]"]
   118["Plane<br>[5298, 5318, 0]"]
-  129["Sweep Extrusion<br>[6542, 6654, 0]"]
+  129["Sweep Extrusion<br>[6553, 6665, 0]"]
   130[Wall]
   131[Wall]
   132[Wall]
@@ -204,7 +204,7 @@ flowchart LR
   154["SweepEdge Opposite"]
   155["SweepEdge Adjacent"]
   156["Plane<br>[5298, 5318, 0]"]
-  167["Sweep Extrusion<br>[6720, 6834, 0]"]
+  167["Sweep Extrusion<br>[6731, 6845, 0]"]
   168[Wall]
   169[Wall]
   170[Wall]
@@ -232,7 +232,7 @@ flowchart LR
   192["SweepEdge Opposite"]
   193["SweepEdge Adjacent"]
   194["Plane<br>[5298, 5318, 0]"]
-  205["Sweep Revolve<br>[7660, 7715, 0]"]
+  205["Sweep Revolve<br>[7671, 7726, 0]"]
   206[Wall]
   207[Wall]
   208[Wall]
@@ -260,7 +260,7 @@ flowchart LR
   230["SweepEdge Opposite"]
   231["SweepEdge Adjacent"]
   232["Plane<br>[5298, 5318, 0]"]
-  243["Sweep Revolve<br>[7777, 7831, 0]"]
+  243["Sweep Revolve<br>[7788, 7842, 0]"]
   244[Wall]
   245[Wall]
   246[Wall]

rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/ast.snap

@@ -6890,22 +6890,15 @@ description: Result of parsing gridfinity-bins-stacking-lip.kcl
                         {
                           "arguments": [
                             {
-                              "commentStart": 0,
+                              "type": "LabeledArg",
-                              "end": 0,
+                              "label": {
-                              "properties": [
-                                {
-                                  "commentStart": 0,
-                                  "end": 0,
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleStart",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "raw": "180.0",
@@ -6919,18 +6912,15 @@ description: Result of parsing gridfinity-bins-stacking-lip.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleEnd",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "raw": "45.0",
@@ -6944,18 +6934,15 @@ description: Result of parsing gridfinity-bins-stacking-lip.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "radius",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "raw": "0.500000",
@@ -6967,20 +6954,17 @@ description: Result of parsing gridfinity-bins-stacking-lip.kcl
                                   "suffix": "None"
                                 }
                               }
-                                }
-                              ],
-                              "start": 0,
-                              "type": "ObjectExpression",
-                              "type": "ObjectExpression"
                             },
                             {
+                              "type": "LabeledArg",
+                              "label": {
                                 "commentStart": 0,
                                 "end": 0,
+                                "name": "tag",
                                 "start": 0,
-                              "type": "PipeSubstitution",
+                                "type": "Identifier"
-                              "type": "PipeSubstitution"
                               },
-                            {
+                              "arg": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "start": 0,
@@ -6988,6 +6972,7 @@ description: Result of parsing gridfinity-bins-stacking-lip.kcl
                                 "type": "TagDeclarator",
                                 "value": "arc000"
                               }
+                            }
                           ],
                           "callee": {
                             "abs_path": false,
@@ -7007,8 +6992,9 @@ description: Result of parsing gridfinity-bins-stacking-lip.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": null
                         },
                         {
                           "arguments": [

rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/ops.snap

@@ -1652,7 +1652,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
       "name": "lipFace",
       "functionSourceRange": [
         5273,
-        5889,
+        5900,
         0
       ],
       "unlabeledArg": null,
@@ -1894,7 +1894,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
       "name": "lipFace",
       "functionSourceRange": [
         5273,
-        5889,
+        5900,
         0
       ],
       "unlabeledArg": null,
@@ -2434,7 +2434,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
       "name": "lipFace",
       "functionSourceRange": [
         5273,
-        5889,
+        5900,
         0
       ],
       "unlabeledArg": null,
@@ -2751,7 +2751,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
       "name": "lipFace",
       "functionSourceRange": [
         5273,
-        5889,
+        5900,
         0
       ],
       "unlabeledArg": null,

rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/program_memory.snap

@@ -14906,9 +14906,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 5563,
+                "commentStart": 5565,
-                "end": 5570,
+                "end": 5572,
-                "start": 5563,
+                "start": 5565,
                 "type": "TagDeclarator",
                 "value": "arc000"
               },
@@ -14919,9 +14919,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 5674,
+                "commentStart": 5685,
-                "end": 5682,
+                "end": 5693,
-                "start": 5674,
+                "start": 5685,
                 "type": "TagDeclarator",
                 "value": "line001"
               },
@@ -15008,9 +15008,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
                 ],
                 "radius": 0.5,
                 "tag": {
-                  "commentStart": 5563,
+                  "commentStart": 5565,
-                  "end": 5570,
+                  "end": 5572,
-                  "start": 5563,
+                  "start": 5565,
                   "type": "TagDeclarator",
                   "value": "arc000"
                 },
@@ -15033,9 +15033,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
                   6.1464
                 ],
                 "tag": {
-                  "commentStart": 5674,
+                  "commentStart": 5685,
-                  "end": 5682,
+                  "end": 5693,
-                  "start": 5674,
+                  "start": 5685,
                   "type": "TagDeclarator",
                   "value": "line001"
                 },
@@ -15256,9 +15256,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 5563,
+                "commentStart": 5565,
-                "end": 5570,
+                "end": 5572,
-                "start": 5563,
+                "start": 5565,
                 "type": "TagDeclarator",
                 "value": "arc000"
               },
@@ -15269,9 +15269,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 5674,
+                "commentStart": 5685,
-                "end": 5682,
+                "end": 5693,
-                "start": 5674,
+                "start": 5685,
                 "type": "TagDeclarator",
                 "value": "line001"
               },
@@ -15358,9 +15358,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
                 ],
                 "radius": 0.5,
                 "tag": {
-                  "commentStart": 5563,
+                  "commentStart": 5565,
-                  "end": 5570,
+                  "end": 5572,
-                  "start": 5563,
+                  "start": 5565,
                   "type": "TagDeclarator",
                   "value": "arc000"
                 },
@@ -15383,9 +15383,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
                   6.1464
                 ],
                 "tag": {
-                  "commentStart": 5674,
+                  "commentStart": 5685,
-                  "end": 5682,
+                  "end": 5693,
-                  "start": 5674,
+                  "start": 5685,
                   "type": "TagDeclarator",
                   "value": "line001"
                 },
@@ -15611,9 +15611,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 5563,
+                "commentStart": 5565,
-                "end": 5570,
+                "end": 5572,
-                "start": 5563,
+                "start": 5565,
                 "type": "TagDeclarator",
                 "value": "arc000"
               },
@@ -15624,9 +15624,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 5674,
+                "commentStart": 5685,
-                "end": 5682,
+                "end": 5693,
-                "start": 5674,
+                "start": 5685,
                 "type": "TagDeclarator",
                 "value": "line001"
               },
@@ -15713,9 +15713,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
                 ],
                 "radius": 0.5,
                 "tag": {
-                  "commentStart": 5563,
+                  "commentStart": 5565,
-                  "end": 5570,
+                  "end": 5572,
-                  "start": 5563,
+                  "start": 5565,
                   "type": "TagDeclarator",
                   "value": "arc000"
                 },
@@ -15738,9 +15738,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
                   6.1464
                 ],
                 "tag": {
-                  "commentStart": 5674,
+                  "commentStart": 5685,
-                  "end": 5682,
+                  "end": 5693,
-                  "start": 5674,
+                  "start": 5685,
                   "type": "TagDeclarator",
                   "value": "line001"
                 },
@@ -15961,9 +15961,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 5563,
+                "commentStart": 5565,
-                "end": 5570,
+                "end": 5572,
-                "start": 5563,
+                "start": 5565,
                 "type": "TagDeclarator",
                 "value": "arc000"
               },
@@ -15974,9 +15974,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 5674,
+                "commentStart": 5685,
-                "end": 5682,
+                "end": 5693,
-                "start": 5674,
+                "start": 5685,
                 "type": "TagDeclarator",
                 "value": "line001"
               },
@@ -16063,9 +16063,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
                 ],
                 "radius": 0.5,
                 "tag": {
-                  "commentStart": 5563,
+                  "commentStart": 5565,
-                  "end": 5570,
+                  "end": 5572,
-                  "start": 5563,
+                  "start": 5565,
                   "type": "TagDeclarator",
                   "value": "arc000"
                 },
@@ -16088,9 +16088,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
                   6.1464
                 ],
                 "tag": {
-                  "commentStart": 5674,
+                  "commentStart": 5685,
-                  "end": 5682,
+                  "end": 5693,
-                  "start": 5674,
+                  "start": 5685,
                   "type": "TagDeclarator",
                   "value": "line001"
                 },
@@ -16332,9 +16332,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 5563,
+                "commentStart": 5565,
-                "end": 5570,
+                "end": 5572,
-                "start": 5563,
+                "start": 5565,
                 "type": "TagDeclarator",
                 "value": "arc000"
               },
@@ -16345,9 +16345,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 5674,
+                "commentStart": 5685,
-                "end": 5682,
+                "end": 5693,
-                "start": 5674,
+                "start": 5685,
                 "type": "TagDeclarator",
                 "value": "line001"
               },
@@ -16434,9 +16434,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
                 ],
                 "radius": 0.5,
                 "tag": {
-                  "commentStart": 5563,
+                  "commentStart": 5565,
-                  "end": 5570,
+                  "end": 5572,
-                  "start": 5563,
+                  "start": 5565,
                   "type": "TagDeclarator",
                   "value": "arc000"
                 },
@@ -16459,9 +16459,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
                   6.1464
                 ],
                 "tag": {
-                  "commentStart": 5674,
+                  "commentStart": 5685,
-                  "end": 5682,
+                  "end": 5693,
-                  "start": 5674,
+                  "start": 5685,
                   "type": "TagDeclarator",
                   "value": "line001"
                 },
@@ -16682,9 +16682,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 5563,
+                "commentStart": 5565,
-                "end": 5570,
+                "end": 5572,
-                "start": 5563,
+                "start": 5565,
                 "type": "TagDeclarator",
                 "value": "arc000"
               },
@@ -16695,9 +16695,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 5674,
+                "commentStart": 5685,
-                "end": 5682,
+                "end": 5693,
-                "start": 5674,
+                "start": 5685,
                 "type": "TagDeclarator",
                 "value": "line001"
               },
@@ -16784,9 +16784,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
                 ],
                 "radius": 0.5,
                 "tag": {
-                  "commentStart": 5563,
+                  "commentStart": 5565,
-                  "end": 5570,
+                  "end": 5572,
-                  "start": 5563,
+                  "start": 5565,
                   "type": "TagDeclarator",
                   "value": "arc000"
                 },
@@ -16809,9 +16809,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
                   6.1464
                 ],
                 "tag": {
-                  "commentStart": 5674,
+                  "commentStart": 5685,
-                  "end": 5682,
+                  "end": 5693,
-                  "start": 5674,
+                  "start": 5685,
                   "type": "TagDeclarator",
                   "value": "line001"
                 },
@@ -17047,9 +17047,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 5563,
+            "commentStart": 5565,
-            "end": 5570,
+            "end": 5572,
-            "start": 5563,
+            "start": 5565,
             "type": "TagDeclarator",
             "value": "arc000"
           },
@@ -17060,9 +17060,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 5674,
+            "commentStart": 5685,
-            "end": 5682,
+            "end": 5693,
-            "start": 5674,
+            "start": 5685,
             "type": "TagDeclarator",
             "value": "line001"
           },
@@ -17149,9 +17149,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
             ],
             "radius": 0.5,
             "tag": {
-              "commentStart": 5563,
+              "commentStart": 5565,
-              "end": 5570,
+              "end": 5572,
-              "start": 5563,
+              "start": 5565,
               "type": "TagDeclarator",
               "value": "arc000"
             },
@@ -17174,9 +17174,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               6.1464
             ],
             "tag": {
-              "commentStart": 5674,
+              "commentStart": 5685,
-              "end": 5682,
+              "end": 5693,
-              "start": 5674,
+              "start": 5685,
               "type": "TagDeclarator",
               "value": "line001"
             },
@@ -17397,9 +17397,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 5563,
+            "commentStart": 5565,
-            "end": 5570,
+            "end": 5572,
-            "start": 5563,
+            "start": 5565,
             "type": "TagDeclarator",
             "value": "arc000"
           },
@@ -17410,9 +17410,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 5674,
+            "commentStart": 5685,
-            "end": 5682,
+            "end": 5693,
-            "start": 5674,
+            "start": 5685,
             "type": "TagDeclarator",
             "value": "line001"
           },
@@ -17499,9 +17499,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
             ],
             "radius": 0.5,
             "tag": {
-              "commentStart": 5563,
+              "commentStart": 5565,
-              "end": 5570,
+              "end": 5572,
-              "start": 5563,
+              "start": 5565,
               "type": "TagDeclarator",
               "value": "arc000"
             },
@@ -17524,9 +17524,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               6.1464
             ],
             "tag": {
-              "commentStart": 5674,
+              "commentStart": 5685,
-              "end": 5682,
+              "end": 5693,
-              "start": 5674,
+              "start": 5685,
               "type": "TagDeclarator",
               "value": "line001"
             },
@@ -17747,9 +17747,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 5563,
+            "commentStart": 5565,
-            "end": 5570,
+            "end": 5572,
-            "start": 5563,
+            "start": 5565,
             "type": "TagDeclarator",
             "value": "arc000"
           },
@@ -17760,9 +17760,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 5674,
+            "commentStart": 5685,
-            "end": 5682,
+            "end": 5693,
-            "start": 5674,
+            "start": 5685,
             "type": "TagDeclarator",
             "value": "line001"
           },
@@ -17849,9 +17849,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
             ],
             "radius": 0.5,
             "tag": {
-              "commentStart": 5563,
+              "commentStart": 5565,
-              "end": 5570,
+              "end": 5572,
-              "start": 5563,
+              "start": 5565,
               "type": "TagDeclarator",
               "value": "arc000"
             },
@@ -17874,9 +17874,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               6.1464
             ],
             "tag": {
-              "commentStart": 5674,
+              "commentStart": 5685,
-              "end": 5682,
+              "end": 5693,
-              "start": 5674,
+              "start": 5685,
               "type": "TagDeclarator",
               "value": "line001"
             },
@@ -18097,9 +18097,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 5563,
+            "commentStart": 5565,
-            "end": 5570,
+            "end": 5572,
-            "start": 5563,
+            "start": 5565,
             "type": "TagDeclarator",
             "value": "arc000"
           },
@@ -18110,9 +18110,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 5674,
+            "commentStart": 5685,
-            "end": 5682,
+            "end": 5693,
-            "start": 5674,
+            "start": 5685,
             "type": "TagDeclarator",
             "value": "line001"
           },
@@ -18199,9 +18199,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
             ],
             "radius": 0.5,
             "tag": {
-              "commentStart": 5563,
+              "commentStart": 5565,
-              "end": 5570,
+              "end": 5572,
-              "start": 5563,
+              "start": 5565,
               "type": "TagDeclarator",
               "value": "arc000"
             },
@@ -18224,9 +18224,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               6.1464
             ],
             "tag": {
-              "commentStart": 5674,
+              "commentStart": 5685,
-              "end": 5682,
+              "end": 5693,
-              "start": 5674,
+              "start": 5685,
               "type": "TagDeclarator",
               "value": "line001"
             },
@@ -18515,9 +18515,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 5563,
+                "commentStart": 5565,
-                "end": 5570,
+                "end": 5572,
-                "start": 5563,
+                "start": 5565,
                 "type": "TagDeclarator",
                 "value": "arc000"
               },
@@ -18528,9 +18528,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 5674,
+                "commentStart": 5685,
-                "end": 5682,
+                "end": 5693,
-                "start": 5674,
+                "start": 5685,
                 "type": "TagDeclarator",
                 "value": "line001"
               },
@@ -18617,9 +18617,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
                 ],
                 "radius": 0.5,
                 "tag": {
-                  "commentStart": 5563,
+                  "commentStart": 5565,
-                  "end": 5570,
+                  "end": 5572,
-                  "start": 5563,
+                  "start": 5565,
                   "type": "TagDeclarator",
                   "value": "arc000"
                 },
@@ -18642,9 +18642,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
                   6.1464
                 ],
                 "tag": {
-                  "commentStart": 5674,
+                  "commentStart": 5685,
-                  "end": 5682,
+                  "end": 5693,
-                  "start": 5674,
+                  "start": 5685,
                   "type": "TagDeclarator",
                   "value": "line001"
                 },
@@ -18865,9 +18865,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 5563,
+                "commentStart": 5565,
-                "end": 5570,
+                "end": 5572,
-                "start": 5563,
+                "start": 5565,
                 "type": "TagDeclarator",
                 "value": "arc000"
               },
@@ -18878,9 +18878,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 5674,
+                "commentStart": 5685,
-                "end": 5682,
+                "end": 5693,
-                "start": 5674,
+                "start": 5685,
                 "type": "TagDeclarator",
                 "value": "line001"
               },
@@ -18967,9 +18967,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
                 ],
                 "radius": 0.5,
                 "tag": {
-                  "commentStart": 5563,
+                  "commentStart": 5565,
-                  "end": 5570,
+                  "end": 5572,
-                  "start": 5563,
+                  "start": 5565,
                   "type": "TagDeclarator",
                   "value": "arc000"
                 },
@@ -18992,9 +18992,9 @@ description: Variables in memory after executing gridfinity-bins-stacking-lip.kc
                   6.1464
                 ],
                 "tag": {
-                  "commentStart": 5674,
+                  "commentStart": 5685,
-                  "end": 5682,
+                  "end": 5693,
-                  "start": 5674,
+                  "start": 5685,
                   "type": "TagDeclarator",
                   "value": "line001"
                 },

rust/kcl-lib/tests/kcl_samples/keyboard/artifact_graph_flowchart.snap.md

@@ -31,327 +31,327 @@ flowchart LR
   end
   subgraph path61 [Path]
     61["Path<br>[1993, 2052, 0]"]
-    62["Segment<br>[2060, 2152, 0]"]
+    62["Segment<br>[2060, 2111, 0]"]
-    63["Segment<br>[2160, 2234, 0]"]
+    63["Segment<br>[2119, 2193, 0]"]
-    64["Segment<br>[2242, 2281, 0]"]
+    64["Segment<br>[2201, 2240, 0]"]
-    65["Segment<br>[2289, 2396, 0]"]
+    65["Segment<br>[2248, 2355, 0]"]
-    66["Segment<br>[2404, 2443, 0]"]
+    66["Segment<br>[2363, 2402, 0]"]
-    67["Segment<br>[2451, 2568, 0]"]
+    67["Segment<br>[2410, 2527, 0]"]
-    68["Segment<br>[2576, 2615, 0]"]
+    68["Segment<br>[2535, 2574, 0]"]
-    69["Segment<br>[2623, 2708, 0]"]
+    69["Segment<br>[2582, 2667, 0]"]
-    70["Segment<br>[2716, 2723, 0]"]
+    70["Segment<br>[2675, 2682, 0]"]
     71[Solid2d]
   end
   subgraph path100 [Path]
     100["Path<br>[1993, 2052, 0]"]
-    101["Segment<br>[2060, 2152, 0]"]
+    101["Segment<br>[2060, 2111, 0]"]
-    102["Segment<br>[2160, 2234, 0]"]
+    102["Segment<br>[2119, 2193, 0]"]
-    103["Segment<br>[2242, 2281, 0]"]
+    103["Segment<br>[2201, 2240, 0]"]
-    104["Segment<br>[2289, 2396, 0]"]
+    104["Segment<br>[2248, 2355, 0]"]
-    105["Segment<br>[2404, 2443, 0]"]
+    105["Segment<br>[2363, 2402, 0]"]
-    106["Segment<br>[2451, 2568, 0]"]
+    106["Segment<br>[2410, 2527, 0]"]
-    107["Segment<br>[2576, 2615, 0]"]
+    107["Segment<br>[2535, 2574, 0]"]
-    108["Segment<br>[2623, 2708, 0]"]
+    108["Segment<br>[2582, 2667, 0]"]
-    109["Segment<br>[2716, 2723, 0]"]
+    109["Segment<br>[2675, 2682, 0]"]
     110[Solid2d]
   end
   subgraph path139 [Path]
     139["Path<br>[1993, 2052, 0]"]
-    140["Segment<br>[2060, 2152, 0]"]
+    140["Segment<br>[2060, 2111, 0]"]
-    141["Segment<br>[2160, 2234, 0]"]
+    141["Segment<br>[2119, 2193, 0]"]
-    142["Segment<br>[2242, 2281, 0]"]
+    142["Segment<br>[2201, 2240, 0]"]
-    143["Segment<br>[2289, 2396, 0]"]
+    143["Segment<br>[2248, 2355, 0]"]
-    144["Segment<br>[2404, 2443, 0]"]
+    144["Segment<br>[2363, 2402, 0]"]
-    145["Segment<br>[2451, 2568, 0]"]
+    145["Segment<br>[2410, 2527, 0]"]
-    146["Segment<br>[2576, 2615, 0]"]
+    146["Segment<br>[2535, 2574, 0]"]
-    147["Segment<br>[2623, 2708, 0]"]
+    147["Segment<br>[2582, 2667, 0]"]
-    148["Segment<br>[2716, 2723, 0]"]
+    148["Segment<br>[2675, 2682, 0]"]
     149[Solid2d]
   end
   subgraph path178 [Path]
     178["Path<br>[1993, 2052, 0]"]
-    179["Segment<br>[2060, 2152, 0]"]
+    179["Segment<br>[2060, 2111, 0]"]
-    180["Segment<br>[2160, 2234, 0]"]
+    180["Segment<br>[2119, 2193, 0]"]
-    181["Segment<br>[2242, 2281, 0]"]
+    181["Segment<br>[2201, 2240, 0]"]
-    182["Segment<br>[2289, 2396, 0]"]
+    182["Segment<br>[2248, 2355, 0]"]
-    183["Segment<br>[2404, 2443, 0]"]
+    183["Segment<br>[2363, 2402, 0]"]
-    184["Segment<br>[2451, 2568, 0]"]
+    184["Segment<br>[2410, 2527, 0]"]
-    185["Segment<br>[2576, 2615, 0]"]
+    185["Segment<br>[2535, 2574, 0]"]
-    186["Segment<br>[2623, 2708, 0]"]
+    186["Segment<br>[2582, 2667, 0]"]
-    187["Segment<br>[2716, 2723, 0]"]
+    187["Segment<br>[2675, 2682, 0]"]
     188[Solid2d]
   end
   subgraph path217 [Path]
     217["Path<br>[1993, 2052, 0]"]
-    218["Segment<br>[2060, 2152, 0]"]
+    218["Segment<br>[2060, 2111, 0]"]
-    219["Segment<br>[2160, 2234, 0]"]
+    219["Segment<br>[2119, 2193, 0]"]
-    220["Segment<br>[2242, 2281, 0]"]
+    220["Segment<br>[2201, 2240, 0]"]
-    221["Segment<br>[2289, 2396, 0]"]
+    221["Segment<br>[2248, 2355, 0]"]
-    222["Segment<br>[2404, 2443, 0]"]
+    222["Segment<br>[2363, 2402, 0]"]
-    223["Segment<br>[2451, 2568, 0]"]
+    223["Segment<br>[2410, 2527, 0]"]
-    224["Segment<br>[2576, 2615, 0]"]
+    224["Segment<br>[2535, 2574, 0]"]
-    225["Segment<br>[2623, 2708, 0]"]
+    225["Segment<br>[2582, 2667, 0]"]
-    226["Segment<br>[2716, 2723, 0]"]
+    226["Segment<br>[2675, 2682, 0]"]
     227[Solid2d]
   end
   subgraph path256 [Path]
     256["Path<br>[1993, 2052, 0]"]
-    257["Segment<br>[2060, 2152, 0]"]
+    257["Segment<br>[2060, 2111, 0]"]
-    258["Segment<br>[2160, 2234, 0]"]
+    258["Segment<br>[2119, 2193, 0]"]
-    259["Segment<br>[2242, 2281, 0]"]
+    259["Segment<br>[2201, 2240, 0]"]
-    260["Segment<br>[2289, 2396, 0]"]
+    260["Segment<br>[2248, 2355, 0]"]
-    261["Segment<br>[2404, 2443, 0]"]
+    261["Segment<br>[2363, 2402, 0]"]
-    262["Segment<br>[2451, 2568, 0]"]
+    262["Segment<br>[2410, 2527, 0]"]
-    263["Segment<br>[2576, 2615, 0]"]
+    263["Segment<br>[2535, 2574, 0]"]
-    264["Segment<br>[2623, 2708, 0]"]
+    264["Segment<br>[2582, 2667, 0]"]
-    265["Segment<br>[2716, 2723, 0]"]
+    265["Segment<br>[2675, 2682, 0]"]
     266[Solid2d]
   end
   subgraph path295 [Path]
     295["Path<br>[1993, 2052, 0]"]
-    296["Segment<br>[2060, 2152, 0]"]
+    296["Segment<br>[2060, 2111, 0]"]
-    297["Segment<br>[2160, 2234, 0]"]
+    297["Segment<br>[2119, 2193, 0]"]
-    298["Segment<br>[2242, 2281, 0]"]
+    298["Segment<br>[2201, 2240, 0]"]
-    299["Segment<br>[2289, 2396, 0]"]
+    299["Segment<br>[2248, 2355, 0]"]
-    300["Segment<br>[2404, 2443, 0]"]
+    300["Segment<br>[2363, 2402, 0]"]
-    301["Segment<br>[2451, 2568, 0]"]
+    301["Segment<br>[2410, 2527, 0]"]
-    302["Segment<br>[2576, 2615, 0]"]
+    302["Segment<br>[2535, 2574, 0]"]
-    303["Segment<br>[2623, 2708, 0]"]
+    303["Segment<br>[2582, 2667, 0]"]
-    304["Segment<br>[2716, 2723, 0]"]
+    304["Segment<br>[2675, 2682, 0]"]
     305[Solid2d]
   end
   subgraph path334 [Path]
     334["Path<br>[1993, 2052, 0]"]
-    335["Segment<br>[2060, 2152, 0]"]
+    335["Segment<br>[2060, 2111, 0]"]
-    336["Segment<br>[2160, 2234, 0]"]
+    336["Segment<br>[2119, 2193, 0]"]
-    337["Segment<br>[2242, 2281, 0]"]
+    337["Segment<br>[2201, 2240, 0]"]
-    338["Segment<br>[2289, 2396, 0]"]
+    338["Segment<br>[2248, 2355, 0]"]
-    339["Segment<br>[2404, 2443, 0]"]
+    339["Segment<br>[2363, 2402, 0]"]
-    340["Segment<br>[2451, 2568, 0]"]
+    340["Segment<br>[2410, 2527, 0]"]
-    341["Segment<br>[2576, 2615, 0]"]
+    341["Segment<br>[2535, 2574, 0]"]
-    342["Segment<br>[2623, 2708, 0]"]
+    342["Segment<br>[2582, 2667, 0]"]
-    343["Segment<br>[2716, 2723, 0]"]
+    343["Segment<br>[2675, 2682, 0]"]
     344[Solid2d]
   end
   subgraph path373 [Path]
     373["Path<br>[1993, 2052, 0]"]
-    374["Segment<br>[2060, 2152, 0]"]
+    374["Segment<br>[2060, 2111, 0]"]
-    375["Segment<br>[2160, 2234, 0]"]
+    375["Segment<br>[2119, 2193, 0]"]
-    376["Segment<br>[2242, 2281, 0]"]
+    376["Segment<br>[2201, 2240, 0]"]
-    377["Segment<br>[2289, 2396, 0]"]
+    377["Segment<br>[2248, 2355, 0]"]
-    378["Segment<br>[2404, 2443, 0]"]
+    378["Segment<br>[2363, 2402, 0]"]
-    379["Segment<br>[2451, 2568, 0]"]
+    379["Segment<br>[2410, 2527, 0]"]
-    380["Segment<br>[2576, 2615, 0]"]
+    380["Segment<br>[2535, 2574, 0]"]
-    381["Segment<br>[2623, 2708, 0]"]
+    381["Segment<br>[2582, 2667, 0]"]
-    382["Segment<br>[2716, 2723, 0]"]
+    382["Segment<br>[2675, 2682, 0]"]
     383[Solid2d]
   end
   subgraph path412 [Path]
     412["Path<br>[1993, 2052, 0]"]
-    413["Segment<br>[2060, 2152, 0]"]
+    413["Segment<br>[2060, 2111, 0]"]
-    414["Segment<br>[2160, 2234, 0]"]
+    414["Segment<br>[2119, 2193, 0]"]
-    415["Segment<br>[2242, 2281, 0]"]
+    415["Segment<br>[2201, 2240, 0]"]
-    416["Segment<br>[2289, 2396, 0]"]
+    416["Segment<br>[2248, 2355, 0]"]
-    417["Segment<br>[2404, 2443, 0]"]
+    417["Segment<br>[2363, 2402, 0]"]
-    418["Segment<br>[2451, 2568, 0]"]
+    418["Segment<br>[2410, 2527, 0]"]
-    419["Segment<br>[2576, 2615, 0]"]
+    419["Segment<br>[2535, 2574, 0]"]
-    420["Segment<br>[2623, 2708, 0]"]
+    420["Segment<br>[2582, 2667, 0]"]
-    421["Segment<br>[2716, 2723, 0]"]
+    421["Segment<br>[2675, 2682, 0]"]
     422[Solid2d]
   end
   subgraph path451 [Path]
     451["Path<br>[1993, 2052, 0]"]
-    452["Segment<br>[2060, 2152, 0]"]
+    452["Segment<br>[2060, 2111, 0]"]
-    453["Segment<br>[2160, 2234, 0]"]
+    453["Segment<br>[2119, 2193, 0]"]
-    454["Segment<br>[2242, 2281, 0]"]
+    454["Segment<br>[2201, 2240, 0]"]
-    455["Segment<br>[2289, 2396, 0]"]
+    455["Segment<br>[2248, 2355, 0]"]
-    456["Segment<br>[2404, 2443, 0]"]
+    456["Segment<br>[2363, 2402, 0]"]
-    457["Segment<br>[2451, 2568, 0]"]
+    457["Segment<br>[2410, 2527, 0]"]
-    458["Segment<br>[2576, 2615, 0]"]
+    458["Segment<br>[2535, 2574, 0]"]
-    459["Segment<br>[2623, 2708, 0]"]
+    459["Segment<br>[2582, 2667, 0]"]
-    460["Segment<br>[2716, 2723, 0]"]
+    460["Segment<br>[2675, 2682, 0]"]
     461[Solid2d]
   end
   subgraph path490 [Path]
     490["Path<br>[1993, 2052, 0]"]
-    491["Segment<br>[2060, 2152, 0]"]
+    491["Segment<br>[2060, 2111, 0]"]
-    492["Segment<br>[2160, 2234, 0]"]
+    492["Segment<br>[2119, 2193, 0]"]
-    493["Segment<br>[2242, 2281, 0]"]
+    493["Segment<br>[2201, 2240, 0]"]
-    494["Segment<br>[2289, 2396, 0]"]
+    494["Segment<br>[2248, 2355, 0]"]
-    495["Segment<br>[2404, 2443, 0]"]
+    495["Segment<br>[2363, 2402, 0]"]
-    496["Segment<br>[2451, 2568, 0]"]
+    496["Segment<br>[2410, 2527, 0]"]
-    497["Segment<br>[2576, 2615, 0]"]
+    497["Segment<br>[2535, 2574, 0]"]
-    498["Segment<br>[2623, 2708, 0]"]
+    498["Segment<br>[2582, 2667, 0]"]
-    499["Segment<br>[2716, 2723, 0]"]
+    499["Segment<br>[2675, 2682, 0]"]
     500[Solid2d]
   end
   subgraph path529 [Path]
     529["Path<br>[1993, 2052, 0]"]
-    530["Segment<br>[2060, 2152, 0]"]
+    530["Segment<br>[2060, 2111, 0]"]
-    531["Segment<br>[2160, 2234, 0]"]
+    531["Segment<br>[2119, 2193, 0]"]
-    532["Segment<br>[2242, 2281, 0]"]
+    532["Segment<br>[2201, 2240, 0]"]
-    533["Segment<br>[2289, 2396, 0]"]
+    533["Segment<br>[2248, 2355, 0]"]
-    534["Segment<br>[2404, 2443, 0]"]
+    534["Segment<br>[2363, 2402, 0]"]
-    535["Segment<br>[2451, 2568, 0]"]
+    535["Segment<br>[2410, 2527, 0]"]
-    536["Segment<br>[2576, 2615, 0]"]
+    536["Segment<br>[2535, 2574, 0]"]
-    537["Segment<br>[2623, 2708, 0]"]
+    537["Segment<br>[2582, 2667, 0]"]
-    538["Segment<br>[2716, 2723, 0]"]
+    538["Segment<br>[2675, 2682, 0]"]
     539[Solid2d]
   end
   subgraph path568 [Path]
     568["Path<br>[1993, 2052, 0]"]
-    569["Segment<br>[2060, 2152, 0]"]
+    569["Segment<br>[2060, 2111, 0]"]
-    570["Segment<br>[2160, 2234, 0]"]
+    570["Segment<br>[2119, 2193, 0]"]
-    571["Segment<br>[2242, 2281, 0]"]
+    571["Segment<br>[2201, 2240, 0]"]
-    572["Segment<br>[2289, 2396, 0]"]
+    572["Segment<br>[2248, 2355, 0]"]
-    573["Segment<br>[2404, 2443, 0]"]
+    573["Segment<br>[2363, 2402, 0]"]
-    574["Segment<br>[2451, 2568, 0]"]
+    574["Segment<br>[2410, 2527, 0]"]
-    575["Segment<br>[2576, 2615, 0]"]
+    575["Segment<br>[2535, 2574, 0]"]
-    576["Segment<br>[2623, 2708, 0]"]
+    576["Segment<br>[2582, 2667, 0]"]
-    577["Segment<br>[2716, 2723, 0]"]
+    577["Segment<br>[2675, 2682, 0]"]
     578[Solid2d]
   end
   subgraph path607 [Path]
     607["Path<br>[1993, 2052, 0]"]
-    608["Segment<br>[2060, 2152, 0]"]
+    608["Segment<br>[2060, 2111, 0]"]
-    609["Segment<br>[2160, 2234, 0]"]
+    609["Segment<br>[2119, 2193, 0]"]
-    610["Segment<br>[2242, 2281, 0]"]
+    610["Segment<br>[2201, 2240, 0]"]
-    611["Segment<br>[2289, 2396, 0]"]
+    611["Segment<br>[2248, 2355, 0]"]
-    612["Segment<br>[2404, 2443, 0]"]
+    612["Segment<br>[2363, 2402, 0]"]
-    613["Segment<br>[2451, 2568, 0]"]
+    613["Segment<br>[2410, 2527, 0]"]
-    614["Segment<br>[2576, 2615, 0]"]
+    614["Segment<br>[2535, 2574, 0]"]
-    615["Segment<br>[2623, 2708, 0]"]
+    615["Segment<br>[2582, 2667, 0]"]
-    616["Segment<br>[2716, 2723, 0]"]
+    616["Segment<br>[2675, 2682, 0]"]
     617[Solid2d]
   end
   subgraph path646 [Path]
     646["Path<br>[1993, 2052, 0]"]
-    647["Segment<br>[2060, 2152, 0]"]
+    647["Segment<br>[2060, 2111, 0]"]
-    648["Segment<br>[2160, 2234, 0]"]
+    648["Segment<br>[2119, 2193, 0]"]
-    649["Segment<br>[2242, 2281, 0]"]
+    649["Segment<br>[2201, 2240, 0]"]
-    650["Segment<br>[2289, 2396, 0]"]
+    650["Segment<br>[2248, 2355, 0]"]
-    651["Segment<br>[2404, 2443, 0]"]
+    651["Segment<br>[2363, 2402, 0]"]
-    652["Segment<br>[2451, 2568, 0]"]
+    652["Segment<br>[2410, 2527, 0]"]
-    653["Segment<br>[2576, 2615, 0]"]
+    653["Segment<br>[2535, 2574, 0]"]
-    654["Segment<br>[2623, 2708, 0]"]
+    654["Segment<br>[2582, 2667, 0]"]
-    655["Segment<br>[2716, 2723, 0]"]
+    655["Segment<br>[2675, 2682, 0]"]
     656[Solid2d]
   end
   subgraph path685 [Path]
     685["Path<br>[1993, 2052, 0]"]
-    686["Segment<br>[2060, 2152, 0]"]
+    686["Segment<br>[2060, 2111, 0]"]
-    687["Segment<br>[2160, 2234, 0]"]
+    687["Segment<br>[2119, 2193, 0]"]
-    688["Segment<br>[2242, 2281, 0]"]
+    688["Segment<br>[2201, 2240, 0]"]
-    689["Segment<br>[2289, 2396, 0]"]
+    689["Segment<br>[2248, 2355, 0]"]
-    690["Segment<br>[2404, 2443, 0]"]
+    690["Segment<br>[2363, 2402, 0]"]
-    691["Segment<br>[2451, 2568, 0]"]
+    691["Segment<br>[2410, 2527, 0]"]
-    692["Segment<br>[2576, 2615, 0]"]
+    692["Segment<br>[2535, 2574, 0]"]
-    693["Segment<br>[2623, 2708, 0]"]
+    693["Segment<br>[2582, 2667, 0]"]
-    694["Segment<br>[2716, 2723, 0]"]
+    694["Segment<br>[2675, 2682, 0]"]
     695[Solid2d]
   end
   subgraph path724 [Path]
     724["Path<br>[1993, 2052, 0]"]
-    725["Segment<br>[2060, 2152, 0]"]
+    725["Segment<br>[2060, 2111, 0]"]
-    726["Segment<br>[2160, 2234, 0]"]
+    726["Segment<br>[2119, 2193, 0]"]
-    727["Segment<br>[2242, 2281, 0]"]
+    727["Segment<br>[2201, 2240, 0]"]
-    728["Segment<br>[2289, 2396, 0]"]
+    728["Segment<br>[2248, 2355, 0]"]
-    729["Segment<br>[2404, 2443, 0]"]
+    729["Segment<br>[2363, 2402, 0]"]
-    730["Segment<br>[2451, 2568, 0]"]
+    730["Segment<br>[2410, 2527, 0]"]
-    731["Segment<br>[2576, 2615, 0]"]
+    731["Segment<br>[2535, 2574, 0]"]
-    732["Segment<br>[2623, 2708, 0]"]
+    732["Segment<br>[2582, 2667, 0]"]
-    733["Segment<br>[2716, 2723, 0]"]
+    733["Segment<br>[2675, 2682, 0]"]
     734[Solid2d]
   end
   subgraph path763 [Path]
     763["Path<br>[1993, 2052, 0]"]
-    764["Segment<br>[2060, 2152, 0]"]
+    764["Segment<br>[2060, 2111, 0]"]
-    765["Segment<br>[2160, 2234, 0]"]
+    765["Segment<br>[2119, 2193, 0]"]
-    766["Segment<br>[2242, 2281, 0]"]
+    766["Segment<br>[2201, 2240, 0]"]
-    767["Segment<br>[2289, 2396, 0]"]
+    767["Segment<br>[2248, 2355, 0]"]
-    768["Segment<br>[2404, 2443, 0]"]
+    768["Segment<br>[2363, 2402, 0]"]
-    769["Segment<br>[2451, 2568, 0]"]
+    769["Segment<br>[2410, 2527, 0]"]
-    770["Segment<br>[2576, 2615, 0]"]
+    770["Segment<br>[2535, 2574, 0]"]
-    771["Segment<br>[2623, 2708, 0]"]
+    771["Segment<br>[2582, 2667, 0]"]
-    772["Segment<br>[2716, 2723, 0]"]
+    772["Segment<br>[2675, 2682, 0]"]
     773[Solid2d]
   end
   subgraph path802 [Path]
     802["Path<br>[1993, 2052, 0]"]
-    803["Segment<br>[2060, 2152, 0]"]
+    803["Segment<br>[2060, 2111, 0]"]
-    804["Segment<br>[2160, 2234, 0]"]
+    804["Segment<br>[2119, 2193, 0]"]
-    805["Segment<br>[2242, 2281, 0]"]
+    805["Segment<br>[2201, 2240, 0]"]
-    806["Segment<br>[2289, 2396, 0]"]
+    806["Segment<br>[2248, 2355, 0]"]
-    807["Segment<br>[2404, 2443, 0]"]
+    807["Segment<br>[2363, 2402, 0]"]
-    808["Segment<br>[2451, 2568, 0]"]
+    808["Segment<br>[2410, 2527, 0]"]
-    809["Segment<br>[2576, 2615, 0]"]
+    809["Segment<br>[2535, 2574, 0]"]
-    810["Segment<br>[2623, 2708, 0]"]
+    810["Segment<br>[2582, 2667, 0]"]
-    811["Segment<br>[2716, 2723, 0]"]
+    811["Segment<br>[2675, 2682, 0]"]
     812[Solid2d]
   end
   subgraph path841 [Path]
     841["Path<br>[1993, 2052, 0]"]
-    842["Segment<br>[2060, 2152, 0]"]
+    842["Segment<br>[2060, 2111, 0]"]
-    843["Segment<br>[2160, 2234, 0]"]
+    843["Segment<br>[2119, 2193, 0]"]
-    844["Segment<br>[2242, 2281, 0]"]
+    844["Segment<br>[2201, 2240, 0]"]
-    845["Segment<br>[2289, 2396, 0]"]
+    845["Segment<br>[2248, 2355, 0]"]
-    846["Segment<br>[2404, 2443, 0]"]
+    846["Segment<br>[2363, 2402, 0]"]
-    847["Segment<br>[2451, 2568, 0]"]
+    847["Segment<br>[2410, 2527, 0]"]
-    848["Segment<br>[2576, 2615, 0]"]
+    848["Segment<br>[2535, 2574, 0]"]
-    849["Segment<br>[2623, 2708, 0]"]
+    849["Segment<br>[2582, 2667, 0]"]
-    850["Segment<br>[2716, 2723, 0]"]
+    850["Segment<br>[2675, 2682, 0]"]
     851[Solid2d]
   end
   subgraph path880 [Path]
-    880["Path<br>[4955, 5042, 0]"]
+    880["Path<br>[4914, 5001, 0]"]
-    881["Segment<br>[5050, 5079, 0]"]
+    881["Segment<br>[5009, 5038, 0]"]
-    882["Segment<br>[5087, 5115, 0]"]
+    882["Segment<br>[5046, 5074, 0]"]
-    883["Segment<br>[5123, 5201, 0]"]
+    883["Segment<br>[5082, 5160, 0]"]
-    884["Segment<br>[5209, 5256, 0]"]
+    884["Segment<br>[5168, 5215, 0]"]
-    885["Segment<br>[5264, 5292, 0]"]
+    885["Segment<br>[5223, 5251, 0]"]
-    886["Segment<br>[5300, 5329, 0]"]
+    886["Segment<br>[5259, 5288, 0]"]
-    887["Segment<br>[5337, 5366, 0]"]
+    887["Segment<br>[5296, 5325, 0]"]
-    888["Segment<br>[5374, 5440, 0]"]
+    888["Segment<br>[5333, 5399, 0]"]
-    889["Segment<br>[5448, 5476, 0]"]
+    889["Segment<br>[5407, 5435, 0]"]
-    890["Segment<br>[5484, 5513, 0]"]
+    890["Segment<br>[5443, 5472, 0]"]
-    891["Segment<br>[5521, 5583, 0]"]
+    891["Segment<br>[5480, 5542, 0]"]
-    892["Segment<br>[5591, 5619, 0]"]
+    892["Segment<br>[5550, 5578, 0]"]
-    893["Segment<br>[5627, 5661, 0]"]
+    893["Segment<br>[5586, 5620, 0]"]
-    894["Segment<br>[5669, 5699, 0]"]
+    894["Segment<br>[5628, 5658, 0]"]
-    895["Segment<br>[5707, 5775, 0]"]
+    895["Segment<br>[5666, 5734, 0]"]
-    896["Segment<br>[5783, 5790, 0]"]
+    896["Segment<br>[5742, 5749, 0]"]
     897[Solid2d]
   end
   subgraph path950 [Path]
-    950["Path<br>[5990, 6088, 0]"]
+    950["Path<br>[5949, 6047, 0]"]
-    951["Segment<br>[6096, 6215, 0]"]
+    951["Segment<br>[6055, 6133, 0]"]
-    952["Segment<br>[6223, 6270, 0]"]
+    952["Segment<br>[6141, 6188, 0]"]
-    953["Segment<br>[6278, 6399, 0]"]
+    953["Segment<br>[6196, 6276, 0]"]
-    954["Segment<br>[6407, 6414, 0]"]
+    954["Segment<br>[6284, 6291, 0]"]
     955[Solid2d]
   end
   subgraph path972 [Path]
-    972["Path<br>[6522, 6619, 0]"]
+    972["Path<br>[6399, 6496, 0]"]
-    973["Segment<br>[6627, 6746, 0]"]
+    973["Segment<br>[6504, 6582, 0]"]
-    974["Segment<br>[6754, 6802, 0]"]
+    974["Segment<br>[6590, 6638, 0]"]
-    975["Segment<br>[6810, 6931, 0]"]
+    975["Segment<br>[6646, 6726, 0]"]
-    976["Segment<br>[6939, 6946, 0]"]
+    976["Segment<br>[6734, 6741, 0]"]
     977[Solid2d]
   end
   subgraph path994 [Path]
-    994["Path<br>[5990, 6088, 0]"]
+    994["Path<br>[5949, 6047, 0]"]
-    995["Segment<br>[6096, 6215, 0]"]
+    995["Segment<br>[6055, 6133, 0]"]
-    996["Segment<br>[6223, 6270, 0]"]
+    996["Segment<br>[6141, 6188, 0]"]
-    997["Segment<br>[6278, 6399, 0]"]
+    997["Segment<br>[6196, 6276, 0]"]
-    998["Segment<br>[6407, 6414, 0]"]
+    998["Segment<br>[6284, 6291, 0]"]
     999[Solid2d]
   end
   subgraph path1016 [Path]
-    1016["Path<br>[6522, 6619, 0]"]
+    1016["Path<br>[6399, 6496, 0]"]
-    1017["Segment<br>[6627, 6746, 0]"]
+    1017["Segment<br>[6504, 6582, 0]"]
-    1018["Segment<br>[6754, 6802, 0]"]
+    1018["Segment<br>[6590, 6638, 0]"]
-    1019["Segment<br>[6810, 6931, 0]"]
+    1019["Segment<br>[6646, 6726, 0]"]
-    1020["Segment<br>[6939, 6946, 0]"]
+    1020["Segment<br>[6734, 6741, 0]"]
     1021[Solid2d]
   end
   1["Plane<br>[532, 549, 0]"]
@@ -395,7 +395,7 @@ flowchart LR
   58["SweepEdge Opposite"]
   59["SweepEdge Adjacent"]
   60["Plane<br>[1954, 1977, 0]"]
-  72["Sweep Extrusion<br>[2731, 2757, 0]"]
+  72["Sweep Extrusion<br>[2690, 2716, 0]"]
   73[Wall]
   74[Wall]
   75[Wall]
@@ -423,7 +423,7 @@ flowchart LR
   97["SweepEdge Opposite"]
   98["SweepEdge Adjacent"]
   99["Plane<br>[1954, 1977, 0]"]
-  111["Sweep Extrusion<br>[2731, 2757, 0]"]
+  111["Sweep Extrusion<br>[2690, 2716, 0]"]
   112[Wall]
   113[Wall]
   114[Wall]
@@ -451,7 +451,7 @@ flowchart LR
   136["SweepEdge Opposite"]
   137["SweepEdge Adjacent"]
   138["Plane<br>[1954, 1977, 0]"]
-  150["Sweep Extrusion<br>[2731, 2757, 0]"]
+  150["Sweep Extrusion<br>[2690, 2716, 0]"]
   151[Wall]
   152[Wall]
   153[Wall]
@@ -479,7 +479,7 @@ flowchart LR
   175["SweepEdge Opposite"]
   176["SweepEdge Adjacent"]
   177["Plane<br>[1954, 1977, 0]"]
-  189["Sweep Extrusion<br>[2731, 2757, 0]"]
+  189["Sweep Extrusion<br>[2690, 2716, 0]"]
   190[Wall]
   191[Wall]
   192[Wall]
@@ -507,7 +507,7 @@ flowchart LR
   214["SweepEdge Opposite"]
   215["SweepEdge Adjacent"]
   216["Plane<br>[1954, 1977, 0]"]
-  228["Sweep Extrusion<br>[2731, 2757, 0]"]
+  228["Sweep Extrusion<br>[2690, 2716, 0]"]
   229[Wall]
   230[Wall]
   231[Wall]
@@ -535,7 +535,7 @@ flowchart LR
   253["SweepEdge Opposite"]
   254["SweepEdge Adjacent"]
   255["Plane<br>[1954, 1977, 0]"]
-  267["Sweep Extrusion<br>[2731, 2757, 0]"]
+  267["Sweep Extrusion<br>[2690, 2716, 0]"]
   268[Wall]
   269[Wall]
   270[Wall]
@@ -563,7 +563,7 @@ flowchart LR
   292["SweepEdge Opposite"]
   293["SweepEdge Adjacent"]
   294["Plane<br>[1954, 1977, 0]"]
-  306["Sweep Extrusion<br>[2731, 2757, 0]"]
+  306["Sweep Extrusion<br>[2690, 2716, 0]"]
   307[Wall]
   308[Wall]
   309[Wall]
@@ -591,7 +591,7 @@ flowchart LR
   331["SweepEdge Opposite"]
   332["SweepEdge Adjacent"]
   333["Plane<br>[1954, 1977, 0]"]
-  345["Sweep Extrusion<br>[2731, 2757, 0]"]
+  345["Sweep Extrusion<br>[2690, 2716, 0]"]
   346[Wall]
   347[Wall]
   348[Wall]
@@ -619,7 +619,7 @@ flowchart LR
   370["SweepEdge Opposite"]
   371["SweepEdge Adjacent"]
   372["Plane<br>[1954, 1977, 0]"]
-  384["Sweep Extrusion<br>[2731, 2757, 0]"]
+  384["Sweep Extrusion<br>[2690, 2716, 0]"]
   385[Wall]
   386[Wall]
   387[Wall]
@@ -647,7 +647,7 @@ flowchart LR
   409["SweepEdge Opposite"]
   410["SweepEdge Adjacent"]
   411["Plane<br>[1954, 1977, 0]"]
-  423["Sweep Extrusion<br>[2731, 2757, 0]"]
+  423["Sweep Extrusion<br>[2690, 2716, 0]"]
   424[Wall]
   425[Wall]
   426[Wall]
@@ -675,7 +675,7 @@ flowchart LR
   448["SweepEdge Opposite"]
   449["SweepEdge Adjacent"]
   450["Plane<br>[1954, 1977, 0]"]
-  462["Sweep Extrusion<br>[2731, 2757, 0]"]
+  462["Sweep Extrusion<br>[2690, 2716, 0]"]
   463[Wall]
   464[Wall]
   465[Wall]
@@ -703,7 +703,7 @@ flowchart LR
   487["SweepEdge Opposite"]
   488["SweepEdge Adjacent"]
   489["Plane<br>[1954, 1977, 0]"]
-  501["Sweep Extrusion<br>[2731, 2757, 0]"]
+  501["Sweep Extrusion<br>[2690, 2716, 0]"]
   502[Wall]
   503[Wall]
   504[Wall]
@@ -731,7 +731,7 @@ flowchart LR
   526["SweepEdge Opposite"]
   527["SweepEdge Adjacent"]
   528["Plane<br>[1954, 1977, 0]"]
-  540["Sweep Extrusion<br>[2731, 2757, 0]"]
+  540["Sweep Extrusion<br>[2690, 2716, 0]"]
   541[Wall]
   542[Wall]
   543[Wall]
@@ -759,7 +759,7 @@ flowchart LR
   565["SweepEdge Opposite"]
   566["SweepEdge Adjacent"]
   567["Plane<br>[1954, 1977, 0]"]
-  579["Sweep Extrusion<br>[2731, 2757, 0]"]
+  579["Sweep Extrusion<br>[2690, 2716, 0]"]
   580[Wall]
   581[Wall]
   582[Wall]
@@ -787,7 +787,7 @@ flowchart LR
   604["SweepEdge Opposite"]
   605["SweepEdge Adjacent"]
   606["Plane<br>[1954, 1977, 0]"]
-  618["Sweep Extrusion<br>[2731, 2757, 0]"]
+  618["Sweep Extrusion<br>[2690, 2716, 0]"]
   619[Wall]
   620[Wall]
   621[Wall]
@@ -815,7 +815,7 @@ flowchart LR
   643["SweepEdge Opposite"]
   644["SweepEdge Adjacent"]
   645["Plane<br>[1954, 1977, 0]"]
-  657["Sweep Extrusion<br>[2731, 2757, 0]"]
+  657["Sweep Extrusion<br>[2690, 2716, 0]"]
   658[Wall]
   659[Wall]
   660[Wall]
@@ -843,7 +843,7 @@ flowchart LR
   682["SweepEdge Opposite"]
   683["SweepEdge Adjacent"]
   684["Plane<br>[1954, 1977, 0]"]
-  696["Sweep Extrusion<br>[2731, 2757, 0]"]
+  696["Sweep Extrusion<br>[2690, 2716, 0]"]
   697[Wall]
   698[Wall]
   699[Wall]
@@ -871,7 +871,7 @@ flowchart LR
   721["SweepEdge Opposite"]
   722["SweepEdge Adjacent"]
   723["Plane<br>[1954, 1977, 0]"]
-  735["Sweep Extrusion<br>[2731, 2757, 0]"]
+  735["Sweep Extrusion<br>[2690, 2716, 0]"]
   736[Wall]
   737[Wall]
   738[Wall]
@@ -899,7 +899,7 @@ flowchart LR
   760["SweepEdge Opposite"]
   761["SweepEdge Adjacent"]
   762["Plane<br>[1954, 1977, 0]"]
-  774["Sweep Extrusion<br>[2731, 2757, 0]"]
+  774["Sweep Extrusion<br>[2690, 2716, 0]"]
   775[Wall]
   776[Wall]
   777[Wall]
@@ -927,7 +927,7 @@ flowchart LR
   799["SweepEdge Opposite"]
   800["SweepEdge Adjacent"]
   801["Plane<br>[1954, 1977, 0]"]
-  813["Sweep Extrusion<br>[2731, 2757, 0]"]
+  813["Sweep Extrusion<br>[2690, 2716, 0]"]
   814[Wall]
   815[Wall]
   816[Wall]
@@ -955,7 +955,7 @@ flowchart LR
   838["SweepEdge Opposite"]
   839["SweepEdge Adjacent"]
   840["Plane<br>[1954, 1977, 0]"]
-  852["Sweep Extrusion<br>[2731, 2757, 0]"]
+  852["Sweep Extrusion<br>[2690, 2716, 0]"]
   853[Wall]
   854[Wall]
   855[Wall]
@@ -982,8 +982,8 @@ flowchart LR
   876["SweepEdge Adjacent"]
   877["SweepEdge Opposite"]
   878["SweepEdge Adjacent"]
-  879["Plane<br>[4924, 4947, 0]"]
+  879["Plane<br>[4883, 4906, 0]"]
-  898["Sweep Extrusion<br>[5798, 5822, 0]"]
+  898["Sweep Extrusion<br>[5757, 5781, 0]"]
   899[Wall]
   900[Wall]
   901[Wall]
@@ -1034,8 +1034,8 @@ flowchart LR
   946["SweepEdge Adjacent"]
   947["SweepEdge Opposite"]
   948["SweepEdge Adjacent"]
-  949["Plane<br>[5959, 5982, 0]"]
+  949["Plane<br>[5918, 5941, 0]"]
-  956["Sweep Extrusion<br>[6422, 6446, 0]"]
+  956["Sweep Extrusion<br>[6299, 6323, 0]"]
   957[Wall]
   958[Wall]
   959[Wall]
@@ -1050,8 +1050,8 @@ flowchart LR
   968["SweepEdge Adjacent"]
   969["SweepEdge Opposite"]
   970["SweepEdge Adjacent"]
-  971["Plane<br>[6491, 6514, 0]"]
+  971["Plane<br>[6368, 6391, 0]"]
-  978["Sweep Extrusion<br>[6954, 6978, 0]"]
+  978["Sweep Extrusion<br>[6749, 6773, 0]"]
   979[Wall]
   980[Wall]
   981[Wall]
@@ -1066,8 +1066,8 @@ flowchart LR
   990["SweepEdge Adjacent"]
   991["SweepEdge Opposite"]
   992["SweepEdge Adjacent"]
-  993["Plane<br>[5959, 5982, 0]"]
+  993["Plane<br>[5918, 5941, 0]"]
-  1000["Sweep Extrusion<br>[6422, 6446, 0]"]
+  1000["Sweep Extrusion<br>[6299, 6323, 0]"]
   1001[Wall]
   1002[Wall]
   1003[Wall]
@@ -1082,8 +1082,8 @@ flowchart LR
   1012["SweepEdge Adjacent"]
   1013["SweepEdge Opposite"]
   1014["SweepEdge Adjacent"]
-  1015["Plane<br>[6491, 6514, 0]"]
+  1015["Plane<br>[6368, 6391, 0]"]
-  1022["Sweep Extrusion<br>[6954, 6978, 0]"]
+  1022["Sweep Extrusion<br>[6749, 6773, 0]"]
   1023[Wall]
   1024[Wall]
   1025[Wall]

rust/kcl-lib/tests/kcl_samples/keyboard/ast.snap

@@ -2868,22 +2868,15 @@ description: Result of parsing keyboard.kcl
                         {
                           "arguments": [
                             {
-                              "commentStart": 0,
+                              "type": "LabeledArg",
-                              "end": 0,
+                              "label": {
-                              "properties": [
-                                {
-                                  "commentStart": 0,
-                                  "end": 0,
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleStart",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "raw": "180",
@@ -2897,18 +2890,15 @@ description: Result of parsing keyboard.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleEnd",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "raw": "270",
@@ -2922,18 +2912,15 @@ description: Result of parsing keyboard.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "radius",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "raw": "0.1",
@@ -2947,18 +2934,6 @@ description: Result of parsing keyboard.kcl
                               }
                             }
                           ],
-                              "start": 0,
-                              "type": "ObjectExpression",
-                              "type": "ObjectExpression"
-                            },
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -2977,8 +2952,9 @@ description: Result of parsing keyboard.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": null
                         },
                         {
                           "arguments": [
@@ -10125,22 +10101,15 @@ description: Result of parsing keyboard.kcl
                         {
                           "arguments": [
                             {
-                              "commentStart": 0,
+                              "type": "LabeledArg",
-                              "end": 0,
+                              "label": {
-                              "properties": [
-                                {
-                                  "commentStart": 0,
-                                  "end": 0,
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleStart",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "left": {
@@ -10174,18 +10143,15 @@ description: Result of parsing keyboard.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleEnd",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "left": {
@@ -10239,18 +10205,15 @@ description: Result of parsing keyboard.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "radius",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "left": {
@@ -10288,18 +10251,6 @@ description: Result of parsing keyboard.kcl
                               }
                             }
                           ],
-                              "start": 0,
-                              "type": "ObjectExpression",
-                              "type": "ObjectExpression"
-                            },
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -10318,8 +10269,9 @@ description: Result of parsing keyboard.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": null
                         },
                         {
                           "arguments": [
@@ -10417,22 +10369,15 @@ description: Result of parsing keyboard.kcl
                         {
                           "arguments": [
                             {
-                              "commentStart": 0,
+                              "type": "LabeledArg",
-                              "end": 0,
+                              "label": {
-                              "properties": [
-                                {
-                                  "commentStart": 0,
-                                  "end": 0,
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleStart",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "left": {
@@ -10486,18 +10431,15 @@ description: Result of parsing keyboard.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleEnd",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "left": {
@@ -10531,18 +10473,15 @@ description: Result of parsing keyboard.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "radius",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "left": {
@@ -10580,18 +10519,6 @@ description: Result of parsing keyboard.kcl
                               }
                             }
                           ],
-                              "start": 0,
-                              "type": "ObjectExpression",
-                              "type": "ObjectExpression"
-                            },
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -10610,8 +10537,9 @@ description: Result of parsing keyboard.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": null
                         },
                         {
                           "arguments": [],
@@ -11003,22 +10931,15 @@ description: Result of parsing keyboard.kcl
                         {
                           "arguments": [
                             {
-                              "commentStart": 0,
+                              "type": "LabeledArg",
-                              "end": 0,
+                              "label": {
-                              "properties": [
-                                {
-                                  "commentStart": 0,
-                                  "end": 0,
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleStart",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "left": {
@@ -11072,18 +10993,15 @@ description: Result of parsing keyboard.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleEnd",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "left": {
@@ -11117,18 +11035,15 @@ description: Result of parsing keyboard.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "radius",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "left": {
@@ -11166,18 +11081,6 @@ description: Result of parsing keyboard.kcl
                               }
                             }
                           ],
-                              "start": 0,
-                              "type": "ObjectExpression",
-                              "type": "ObjectExpression"
-                            },
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -11196,8 +11099,9 @@ description: Result of parsing keyboard.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": null
                         },
                         {
                           "arguments": [
@@ -11303,22 +11207,15 @@ description: Result of parsing keyboard.kcl
                         {
                           "arguments": [
                             {
-                              "commentStart": 0,
+                              "type": "LabeledArg",
-                              "end": 0,
+                              "label": {
-                              "properties": [
-                                {
-                                  "commentStart": 0,
-                                  "end": 0,
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleStart",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "left": {
@@ -11352,18 +11249,15 @@ description: Result of parsing keyboard.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "angleEnd",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "left": {
@@ -11417,18 +11311,15 @@ description: Result of parsing keyboard.kcl
                               }
                             },
                             {
-                                  "commentStart": 0,
+                              "type": "LabeledArg",
-                                  "end": 0,
+                              "label": {
-                                  "key": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "name": "radius",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "end": 0,
                                 "left": {
@@ -11466,18 +11357,6 @@ description: Result of parsing keyboard.kcl
                               }
                             }
                           ],
-                              "start": 0,
-                              "type": "ObjectExpression",
-                              "type": "ObjectExpression"
-                            },
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -11496,8 +11375,9 @@ description: Result of parsing keyboard.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": null
                         },
                         {
                           "arguments": [],

rust/kcl-lib/tests/kcl_samples/keyboard/ops.snap

@@ -212,7 +212,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -544,7 +544,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -876,7 +876,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -1208,7 +1208,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -1540,7 +1540,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -1872,7 +1872,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -2204,7 +2204,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -2536,7 +2536,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -2868,7 +2868,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -3200,7 +3200,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -3532,7 +3532,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -3864,7 +3864,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -4196,7 +4196,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -4528,7 +4528,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -4860,7 +4860,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -5192,7 +5192,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -5524,7 +5524,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -5856,7 +5856,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -6188,7 +6188,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -6520,7 +6520,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -6852,7 +6852,7 @@ description: Operations executed keyboard.kcl
       "name": "keyFn",
       "functionSourceRange": [
         1887,
-        3015,
+        2974,
         0
       ],
       "unlabeledArg": null,
@@ -7201,8 +7201,8 @@ description: Operations executed keyboard.kcl
       "type": "FunctionCall",
       "name": "z",
       "functionSourceRange": [
-        4893,
+        4852,
-        5872,
+        5831,
         0
       ],
       "unlabeledArg": null,
@@ -7438,8 +7438,8 @@ description: Operations executed keyboard.kcl
       "type": "FunctionCall",
       "name": "o",
       "functionSourceRange": [
-        5919,
+        5878,
-        7028,
+        6823,
         0
       ],
       "unlabeledArg": null,
@@ -7894,8 +7894,8 @@ description: Operations executed keyboard.kcl
       "type": "FunctionCall",
       "name": "o",
       "functionSourceRange": [
-        5919,
+        5878,
-        7028,
+        6823,
         0
       ],
       "unlabeledArg": null,

rust/kcl-lib/tests/kcl_samples/makeup-mirror/artifact_graph_flowchart.snap.md

@@ -53,10 +53,10 @@ flowchart LR
   subgraph path101 [Path]
     101["Path<br>[1785, 1841, 0]"]
     102["Segment<br>[1849, 1873, 0]"]
-    103["Segment<br>[1881, 1999, 0]"]
+    103["Segment<br>[1881, 1981, 0]"]
-    104["Segment<br>[2007, 2031, 0]"]
+    104["Segment<br>[1989, 2013, 0]"]
-    105["Segment<br>[2039, 2207, 0]"]
+    105["Segment<br>[2021, 2199, 0]"]
-    106["Segment<br>[2215, 2222, 0]"]
+    106["Segment<br>[2207, 2214, 0]"]
     107[Solid2d]
   end
   1["Plane<br>[547, 574, 0]"]
@@ -129,7 +129,7 @@ flowchart LR
   98["Cap End"]
   99["SweepEdge Opposite"]
   100["SweepEdge Adjacent"]
-  108["Sweep Extrusion<br>[2230, 2253, 0]"]
+  108["Sweep Extrusion<br>[2222, 2245, 0]"]
   109[Wall]
   110[Wall]
   111[Wall]

rust/kcl-lib/tests/kcl_samples/makeup-mirror/ast.snap

@@ -2873,22 +2873,15 @@ description: Result of parsing makeup-mirror.kcl
                         {
                           "arguments": [
                             {
+                              "type": "LabeledArg",
+                              "label": {
                                 "commentStart": 0,
                                 "end": 0,
-                              "properties": [
+                                "name": "interiorAbsolute",
-                                {
-                                  "commentStart": 0,
-                                  "end": 0,
-                                  "key": {
-                                    "commentStart": 0,
-                                    "end": 0,
-                                    "name": "interior",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "elements": [
                                   {
@@ -2955,18 +2948,15 @@ description: Result of parsing makeup-mirror.kcl
                               }
                             },
                             {
+                              "type": "LabeledArg",
+                              "label": {
                                 "commentStart": 0,
                                 "end": 0,
-                                  "key": {
+                                "name": "endAbsolute",
-                                    "commentStart": 0,
-                                    "end": 0,
-                                    "name": "end",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "elements": [
                                   {
@@ -3033,18 +3023,6 @@ description: Result of parsing makeup-mirror.kcl
                               }
                             }
                           ],
-                              "start": 0,
-                              "type": "ObjectExpression",
-                              "type": "ObjectExpression"
-                            },
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -3052,7 +3030,7 @@ description: Result of parsing makeup-mirror.kcl
                             "name": {
                               "commentStart": 0,
                               "end": 0,
-                              "name": "arcTo",
+                              "name": "arc",
                               "start": 0,
                               "type": "Identifier"
                             },
@@ -3063,8 +3041,9 @@ description: Result of parsing makeup-mirror.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": null
                         },
                         {
                           "arguments": [
@@ -3120,22 +3099,15 @@ description: Result of parsing makeup-mirror.kcl
                         {
                           "arguments": [
                             {
+                              "type": "LabeledArg",
+                              "label": {
                                 "commentStart": 0,
                                 "end": 0,
-                              "properties": [
+                                "name": "interiorAbsolute",
-                                {
-                                  "commentStart": 0,
-                                  "end": 0,
-                                  "key": {
-                                    "commentStart": 0,
-                                    "end": 0,
-                                    "name": "interior",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "elements": [
                                   {
@@ -3226,18 +3198,15 @@ description: Result of parsing makeup-mirror.kcl
                               }
                             },
                             {
+                              "type": "LabeledArg",
+                              "label": {
                                 "commentStart": 0,
                                 "end": 0,
-                                  "key": {
+                                "name": "endAbsolute",
-                                    "commentStart": 0,
-                                    "end": 0,
-                                    "name": "end",
                                 "start": 0,
                                 "type": "Identifier"
                               },
-                                  "start": 0,
+                              "arg": {
-                                  "type": "ObjectProperty",
-                                  "value": {
                                 "commentStart": 0,
                                 "elements": [
                                   {
@@ -3310,18 +3279,6 @@ description: Result of parsing makeup-mirror.kcl
                               }
                             }
                           ],
-                              "start": 0,
-                              "type": "ObjectExpression",
-                              "type": "ObjectExpression"
-                            },
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -3329,7 +3286,7 @@ description: Result of parsing makeup-mirror.kcl
                             "name": {
                               "commentStart": 0,
                               "end": 0,
-                              "name": "arcTo",
+                              "name": "arc",
                               "start": 0,
                               "type": "Identifier"
                             },
@@ -3340,8 +3297,9 @@ description: Result of parsing makeup-mirror.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": null
                         },
                         {
                           "arguments": [],

rust/kcl-lib/tests/kcl_samples/makeup-mirror/ops.snap

@@ -805,7 +805,7 @@ description: Operations executed makeup-mirror.kcl
       "name": "mirrorFn",
       "functionSourceRange": [
         1510,
-        2272,
+        2264,
         0
       ],
       "unlabeledArg": null,

rust/kcl-lib/tests/kcl_samples/multi-axis-robot/artifact_graph_flowchart.snap.md

@@ -37,122 +37,122 @@ flowchart LR
   subgraph path75 [Path]
     75["Path<br>[493, 529, 6]"]
     76["Segment<br>[535, 572, 6]"]
-    77["Segment<br>[578, 666, 6]"]
+    77["Segment<br>[578, 633, 6]"]
-    78["Segment<br>[672, 721, 6]"]
+    78["Segment<br>[639, 688, 6]"]
-    79["Segment<br>[727, 783, 6]"]
+    79["Segment<br>[694, 750, 6]"]
-    80["Segment<br>[789, 796, 6]"]
+    80["Segment<br>[756, 763, 6]"]
     81[Solid2d]
   end
   subgraph path97 [Path]
-    97["Path<br>[898, 1073, 6]"]
+    97["Path<br>[865, 1040, 6]"]
-    98["Segment<br>[898, 1073, 6]"]
+    98["Segment<br>[865, 1040, 6]"]
     99[Solid2d]
   end
   subgraph path105 [Path]
-    105["Path<br>[1282, 1429, 6]"]
+    105["Path<br>[1249, 1396, 6]"]
-    106["Segment<br>[1282, 1429, 6]"]
+    106["Segment<br>[1249, 1396, 6]"]
     107[Solid2d]
   end
   subgraph path116 [Path]
-    116["Path<br>[1751, 1925, 6]"]
+    116["Path<br>[1718, 1892, 6]"]
-    117["Segment<br>[1751, 1925, 6]"]
+    117["Segment<br>[1718, 1892, 6]"]
     118[Solid2d]
   end
   subgraph path125 [Path]
-    125["Path<br>[2150, 2190, 6]"]
+    125["Path<br>[2117, 2157, 6]"]
-    126["Segment<br>[2150, 2190, 6]"]
+    126["Segment<br>[2117, 2157, 6]"]
     127[Solid2d]
   end
   subgraph path137 [Path]
     137["Path<br>[251, 394, 7]"]
-    138["Segment<br>[400, 516, 7]"]
+    138["Segment<br>[400, 483, 7]"]
-    139["Segment<br>[522, 574, 7]"]
+    139["Segment<br>[489, 541, 7]"]
-    140["Segment<br>[580, 696, 7]"]
+    140["Segment<br>[547, 630, 7]"]
-    141["Segment<br>[702, 758, 7]"]
+    141["Segment<br>[636, 692, 7]"]
-    142["Segment<br>[764, 771, 7]"]
+    142["Segment<br>[698, 705, 7]"]
     143[Solid2d]
   end
   subgraph path159 [Path]
-    159["Path<br>[892, 956, 7]"]
+    159["Path<br>[826, 890, 7]"]
-    160["Segment<br>[892, 956, 7]"]
+    160["Segment<br>[826, 890, 7]"]
     161[Solid2d]
   end
   subgraph path167 [Path]
-    167["Path<br>[1130, 1338, 7]"]
+    167["Path<br>[1064, 1272, 7]"]
-    168["Segment<br>[1130, 1338, 7]"]
+    168["Segment<br>[1064, 1272, 7]"]
     169[Solid2d]
   end
   subgraph path175 [Path]
-    175["Path<br>[1546, 1590, 7]"]
+    175["Path<br>[1480, 1524, 7]"]
-    176["Segment<br>[1546, 1590, 7]"]
+    176["Segment<br>[1480, 1524, 7]"]
     177[Solid2d]
   end
   subgraph path190 [Path]
-    190["Path<br>[1833, 2025, 7]"]
+    190["Path<br>[1767, 1959, 7]"]
-    191["Segment<br>[1833, 2025, 7]"]
+    191["Segment<br>[1767, 1959, 7]"]
     192[Solid2d]
   end
   subgraph path201 [Path]
-    201["Path<br>[2383, 2558, 7]"]
+    201["Path<br>[2317, 2492, 7]"]
-    202["Segment<br>[2383, 2558, 7]"]
+    202["Segment<br>[2317, 2492, 7]"]
     203[Solid2d]
   end
   subgraph path210 [Path]
     210["Path<br>[271, 504, 8]"]
-    211["Segment<br>[510, 629, 8]"]
+    211["Segment<br>[510, 596, 8]"]
-    212["Segment<br>[635, 689, 8]"]
+    212["Segment<br>[602, 656, 8]"]
-    213["Segment<br>[695, 814, 8]"]
+    213["Segment<br>[662, 748, 8]"]
-    214["Segment<br>[820, 890, 8]"]
+    214["Segment<br>[754, 824, 8]"]
-    215["Segment<br>[896, 903, 8]"]
+    215["Segment<br>[830, 837, 8]"]
     216[Solid2d]
   end
   subgraph path232 [Path]
-    232["Path<br>[1022, 1231, 8]"]
+    232["Path<br>[956, 1165, 8]"]
-    233["Segment<br>[1022, 1231, 8]"]
+    233["Segment<br>[956, 1165, 8]"]
     234[Solid2d]
   end
   subgraph path240 [Path]
-    240["Path<br>[1441, 1630, 8]"]
+    240["Path<br>[1375, 1564, 8]"]
-    241["Segment<br>[1441, 1630, 8]"]
+    241["Segment<br>[1375, 1564, 8]"]
     242[Solid2d]
   end
   subgraph path255 [Path]
-    255["Path<br>[2056, 2342, 8]"]
+    255["Path<br>[1990, 2276, 8]"]
-    256["Segment<br>[2056, 2342, 8]"]
+    256["Segment<br>[1990, 2276, 8]"]
     257[Solid2d]
   end
   subgraph path264 [Path]
-    264["Path<br>[2446, 2730, 8]"]
+    264["Path<br>[2380, 2664, 8]"]
-    265["Segment<br>[2446, 2730, 8]"]
+    265["Segment<br>[2380, 2664, 8]"]
     266[Solid2d]
   end
   subgraph path273 [Path]
-    273["Path<br>[2889, 2927, 8]"]
+    273["Path<br>[2823, 2861, 8]"]
-    274["Segment<br>[2889, 2927, 8]"]
+    274["Segment<br>[2823, 2861, 8]"]
     275[Solid2d]
   end
   subgraph path282 [Path]
-    282["Path<br>[3062, 3287, 8]"]
+    282["Path<br>[2996, 3221, 8]"]
-    283["Segment<br>[3293, 3361, 8]"]
+    283["Segment<br>[3227, 3295, 8]"]
-    284["Segment<br>[3367, 3510, 8]"]
+    284["Segment<br>[3301, 3411, 8]"]
-    285["Segment<br>[3516, 3584, 8]"]
+    285["Segment<br>[3417, 3485, 8]"]
-    286["Segment<br>[3590, 3666, 8]"]
+    286["Segment<br>[3491, 3567, 8]"]
-    287["Segment<br>[3672, 3748, 8]"]
+    287["Segment<br>[3573, 3649, 8]"]
-    288["Segment<br>[3754, 3828, 8]"]
+    288["Segment<br>[3655, 3729, 8]"]
-    289["Segment<br>[3834, 3890, 8]"]
+    289["Segment<br>[3735, 3791, 8]"]
-    290["Segment<br>[3896, 3903, 8]"]
+    290["Segment<br>[3797, 3804, 8]"]
     291[Solid2d]
   end
   subgraph path316 [Path]
-    316["Path<br>[4037, 4262, 8]"]
+    316["Path<br>[3938, 4163, 8]"]
-    317["Segment<br>[4268, 4338, 8]"]
+    317["Segment<br>[4169, 4239, 8]"]
-    318["Segment<br>[4344, 4492, 8]"]
+    318["Segment<br>[4245, 4360, 8]"]
-    319["Segment<br>[4498, 4568, 8]"]
+    319["Segment<br>[4366, 4436, 8]"]
-    320["Segment<br>[4574, 4652, 8]"]
+    320["Segment<br>[4442, 4520, 8]"]
-    321["Segment<br>[4658, 4736, 8]"]
+    321["Segment<br>[4526, 4604, 8]"]
-    322["Segment<br>[4742, 4818, 8]"]
+    322["Segment<br>[4610, 4686, 8]"]
-    323["Segment<br>[4824, 4880, 8]"]
+    323["Segment<br>[4692, 4748, 8]"]
-    324["Segment<br>[4886, 4893, 8]"]
+    324["Segment<br>[4754, 4761, 8]"]
     325[Solid2d]
   end
   1["Plane<br>[201, 218, 5]"]
@@ -207,7 +207,7 @@ flowchart LR
   72["SweepEdge Opposite"]
   73["SweepEdge Adjacent"]
   74["Plane<br>[464, 487, 6]"]
-  82["Sweep Extrusion<br>[811, 841, 6]"]
+  82["Sweep Extrusion<br>[778, 808, 6]"]
   83[Wall]
   84[Wall]
   85[Wall]
@@ -222,35 +222,35 @@ flowchart LR
   94["SweepEdge Adjacent"]
   95["SweepEdge Opposite"]
   96["SweepEdge Adjacent"]
-  100["Sweep Extrusion<br>[1087, 1119, 6]"]
+  100["Sweep Extrusion<br>[1054, 1086, 6]"]
   101[Wall]
   102["Cap End"]
   103["SweepEdge Opposite"]
   104["SweepEdge Adjacent"]
-  108["Sweep Extrusion<br>[1662, 1694, 6]"]
+  108["Sweep Extrusion<br>[1629, 1661, 6]"]
   109[Wall]
   110["Cap End"]
   111["SweepEdge Opposite"]
   112["SweepEdge Adjacent"]
-  113["Sweep Extrusion<br>[1662, 1694, 6]"]
+  113["Sweep Extrusion<br>[1629, 1661, 6]"]
-  114["Sweep Extrusion<br>[1662, 1694, 6]"]
+  114["Sweep Extrusion<br>[1629, 1661, 6]"]
-  115["Sweep Extrusion<br>[1662, 1694, 6]"]
+  115["Sweep Extrusion<br>[1629, 1661, 6]"]
-  119["Sweep Extrusion<br>[1939, 1972, 6]"]
+  119["Sweep Extrusion<br>[1906, 1939, 6]"]
   120[Wall]
   121["Cap End"]
   122["SweepEdge Opposite"]
   123["SweepEdge Adjacent"]
-  124["Plane<br>[2121, 2144, 6]"]
+  124["Plane<br>[2088, 2111, 6]"]
-  128["Sweep Extrusion<br>[2192, 2223, 6]"]
+  128["Sweep Extrusion<br>[2159, 2190, 6]"]
   129[Wall]
   130["Cap Start"]
   131["Cap End"]
   132["SweepEdge Opposite"]
   133["SweepEdge Adjacent"]
   134["EdgeCut Fillet<br>[321, 383, 6]"]
-  135["EdgeCut Fillet<br>[1978, 2040, 6]"]
+  135["EdgeCut Fillet<br>[1945, 2007, 6]"]
   136["Plane<br>[222, 245, 7]"]
-  144["Sweep Extrusion<br>[785, 833, 7]"]
+  144["Sweep Extrusion<br>[719, 767, 7]"]
   145[Wall]
   146[Wall]
   147[Wall]
@@ -265,43 +265,43 @@ flowchart LR
   156["SweepEdge Adjacent"]
   157["SweepEdge Opposite"]
   158["SweepEdge Adjacent"]
-  162["Sweep Extrusion<br>[971, 1004, 7]"]
+  162["Sweep Extrusion<br>[905, 938, 7]"]
   163[Wall]
   164["Cap End"]
   165["SweepEdge Opposite"]
   166["SweepEdge Adjacent"]
-  170["Sweep Extrusion<br>[1353, 1383, 7]"]
+  170["Sweep Extrusion<br>[1287, 1317, 7]"]
   171[Wall]
   172["Cap End"]
   173["SweepEdge Opposite"]
   174["SweepEdge Adjacent"]
-  178["Sweep Extrusion<br>[1743, 1776, 7]"]
+  178["Sweep Extrusion<br>[1677, 1710, 7]"]
   179[Wall]
   180["Cap End"]
   181["SweepEdge Opposite"]
   182["SweepEdge Adjacent"]
-  183["Sweep Extrusion<br>[1743, 1776, 7]"]
+  183["Sweep Extrusion<br>[1677, 1710, 7]"]
-  184["Sweep Extrusion<br>[1743, 1776, 7]"]
+  184["Sweep Extrusion<br>[1677, 1710, 7]"]
-  185["Sweep Extrusion<br>[1743, 1776, 7]"]
+  185["Sweep Extrusion<br>[1677, 1710, 7]"]
-  186["Sweep Extrusion<br>[1743, 1776, 7]"]
+  186["Sweep Extrusion<br>[1677, 1710, 7]"]
-  187["Sweep Extrusion<br>[1743, 1776, 7]"]
+  187["Sweep Extrusion<br>[1677, 1710, 7]"]
-  188["Sweep Extrusion<br>[1743, 1776, 7]"]
+  188["Sweep Extrusion<br>[1677, 1710, 7]"]
-  189["Sweep Extrusion<br>[1743, 1776, 7]"]
+  189["Sweep Extrusion<br>[1677, 1710, 7]"]
-  193["Sweep Extrusion<br>[2293, 2326, 7]"]
+  193["Sweep Extrusion<br>[2227, 2260, 7]"]
   194[Wall]
   195["Cap End"]
   196["SweepEdge Opposite"]
   197["SweepEdge Adjacent"]
-  198["Sweep Extrusion<br>[2293, 2326, 7]"]
+  198["Sweep Extrusion<br>[2227, 2260, 7]"]
-  199["Sweep Extrusion<br>[2293, 2326, 7]"]
+  199["Sweep Extrusion<br>[2227, 2260, 7]"]
-  200["Sweep Extrusion<br>[2293, 2326, 7]"]
+  200["Sweep Extrusion<br>[2227, 2260, 7]"]
-  204["Sweep Extrusion<br>[2560, 2590, 7]"]
+  204["Sweep Extrusion<br>[2494, 2524, 7]"]
   205[Wall]
   206["Cap End"]
   207["SweepEdge Opposite"]
   208["SweepEdge Adjacent"]
   209["Plane<br>[242, 265, 8]"]
-  217["Sweep Extrusion<br>[917, 965, 8]"]
+  217["Sweep Extrusion<br>[851, 899, 8]"]
   218[Wall]
   219[Wall]
   220[Wall]
@@ -316,42 +316,42 @@ flowchart LR
   229["SweepEdge Adjacent"]
   230["SweepEdge Opposite"]
   231["SweepEdge Adjacent"]
-  235["Sweep Extrusion<br>[1246, 1279, 8]"]
+  235["Sweep Extrusion<br>[1180, 1213, 8]"]
   236[Wall]
   237["Cap End"]
   238["SweepEdge Opposite"]
   239["SweepEdge Adjacent"]
-  243["Sweep Extrusion<br>[1895, 1928, 8]"]
+  243["Sweep Extrusion<br>[1829, 1862, 8]"]
   244[Wall]
   245["Cap End"]
   246["SweepEdge Opposite"]
   247["SweepEdge Adjacent"]
-  248["Sweep Extrusion<br>[1895, 1928, 8]"]
+  248["Sweep Extrusion<br>[1829, 1862, 8]"]
-  249["Sweep Extrusion<br>[1895, 1928, 8]"]
+  249["Sweep Extrusion<br>[1829, 1862, 8]"]
-  250["Sweep Extrusion<br>[1895, 1928, 8]"]
+  250["Sweep Extrusion<br>[1829, 1862, 8]"]
-  251["Sweep Extrusion<br>[1895, 1928, 8]"]
+  251["Sweep Extrusion<br>[1829, 1862, 8]"]
-  252["Sweep Extrusion<br>[1895, 1928, 8]"]
+  252["Sweep Extrusion<br>[1829, 1862, 8]"]
-  253["Sweep Extrusion<br>[1895, 1928, 8]"]
+  253["Sweep Extrusion<br>[1829, 1862, 8]"]
-  254["Sweep Extrusion<br>[1895, 1928, 8]"]
+  254["Sweep Extrusion<br>[1829, 1862, 8]"]
-  258["Sweep Extrusion<br>[2356, 2389, 8]"]
+  258["Sweep Extrusion<br>[2290, 2323, 8]"]
   259[Wall]
   260["Cap Start"]
   261["Cap End"]
   262["SweepEdge Opposite"]
   263["SweepEdge Adjacent"]
-  267["Sweep Extrusion<br>[2745, 2778, 8]"]
+  267["Sweep Extrusion<br>[2679, 2712, 8]"]
   268[Wall]
   269["Cap Start"]
   270["Cap End"]
   271["SweepEdge Opposite"]
   272["SweepEdge Adjacent"]
-  276["Sweep Extrusion<br>[2942, 2976, 8]"]
+  276["Sweep Extrusion<br>[2876, 2910, 8]"]
   277[Wall]
   278["Cap Start"]
   279["Cap End"]
   280["SweepEdge Opposite"]
   281["SweepEdge Adjacent"]
-  292["Sweep Extrusion<br>[3918, 3951, 8]"]
+  292["Sweep Extrusion<br>[3819, 3852, 8]"]
   293[Wall]
   294[Wall]
   295[Wall]
@@ -375,7 +375,7 @@ flowchart LR
   313["SweepEdge Adjacent"]
   314["SweepEdge Opposite"]
   315["SweepEdge Adjacent"]
-  326["Sweep Extrusion<br>[4895, 4928, 8]"]
+  326["Sweep Extrusion<br>[4763, 4796, 8]"]
   327[Wall]
   328[Wall]
   329[Wall]
@@ -403,21 +403,21 @@ flowchart LR
   351["StartSketchOnFace<br>[1368, 1405, 5]"]
   352["StartSketchOnFace<br>[1542, 1579, 5]"]
   353["StartSketchOnFace<br>[1933, 1970, 5]"]
-  354["StartSketchOnFace<br>[855, 892, 6]"]
+  354["StartSketchOnFace<br>[822, 859, 6]"]
-  355["StartSketchOnFace<br>[1239, 1276, 6]"]
+  355["StartSketchOnFace<br>[1206, 1243, 6]"]
-  356["StartSketchOnFace<br>[1708, 1745, 6]"]
+  356["StartSketchOnFace<br>[1675, 1712, 6]"]
-  357["StartSketchOnFace<br>[847, 886, 7]"]
+  357["StartSketchOnFace<br>[781, 820, 7]"]
-  358["StartSketchOnFace<br>[1085, 1124, 7]"]
+  358["StartSketchOnFace<br>[1019, 1058, 7]"]
-  359["StartSketchOnFace<br>[1503, 1540, 7]"]
+  359["StartSketchOnFace<br>[1437, 1474, 7]"]
-  360["StartSketchOnFace<br>[1790, 1827, 7]"]
+  360["StartSketchOnFace<br>[1724, 1761, 7]"]
-  361["StartSketchOnFace<br>[2340, 2377, 7]"]
+  361["StartSketchOnFace<br>[2274, 2311, 7]"]
-  362["StartSketchOnFace<br>[979, 1016, 8]"]
+  362["StartSketchOnFace<br>[913, 950, 8]"]
-  363["StartSketchOnFace<br>[1398, 1435, 8]"]
+  363["StartSketchOnFace<br>[1332, 1369, 8]"]
-  364["StartSketchOnFace<br>[2011, 2050, 8]"]
+  364["StartSketchOnFace<br>[1945, 1984, 8]"]
-  365["StartSketchOnFace<br>[2403, 2440, 8]"]
+  365["StartSketchOnFace<br>[2337, 2374, 8]"]
-  366["StartSketchOnFace<br>[2844, 2883, 8]"]
+  366["StartSketchOnFace<br>[2778, 2817, 8]"]
-  367["StartSketchOnFace<br>[3017, 3056, 8]"]
+  367["StartSketchOnFace<br>[2951, 2990, 8]"]
-  368["StartSketchOnFace<br>[3992, 4031, 8]"]
+  368["StartSketchOnFace<br>[3893, 3932, 8]"]
   1 --- 2
   2 --- 3
   2 --- 4

rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/artifact_graph_flowchart.snap.md

@@ -3,57 +3,57 @@ flowchart LR
   subgraph path2 [Path]
     2["Path<br>[538, 581, 0]"]
     3["Segment<br>[587, 640, 0]"]
-    4["Segment<br>[646, 748, 0]"]
+    4["Segment<br>[646, 757, 0]"]
-    5["Segment<br>[754, 807, 0]"]
+    5["Segment<br>[763, 816, 0]"]
-    6["Segment<br>[813, 860, 0]"]
+    6["Segment<br>[822, 869, 0]"]
-    7["Segment<br>[866, 961, 0]"]
+    7["Segment<br>[875, 970, 0]"]
-    8["Segment<br>[967, 1038, 0]"]
+    8["Segment<br>[976, 1047, 0]"]
-    9["Segment<br>[1044, 1095, 0]"]
+    9["Segment<br>[1053, 1104, 0]"]
-    10["Segment<br>[1101, 1154, 0]"]
+    10["Segment<br>[1110, 1163, 0]"]
-    11["Segment<br>[1160, 1229, 0]"]
+    11["Segment<br>[1169, 1238, 0]"]
-    12["Segment<br>[1235, 1271, 0]"]
+    12["Segment<br>[1244, 1280, 0]"]
-    13["Segment<br>[1277, 1307, 0]"]
+    13["Segment<br>[1286, 1316, 0]"]
-    14["Segment<br>[1313, 1343, 0]"]
+    14["Segment<br>[1322, 1352, 0]"]
-    15["Segment<br>[1349, 1379, 0]"]
+    15["Segment<br>[1358, 1388, 0]"]
-    16["Segment<br>[1385, 1415, 0]"]
+    16["Segment<br>[1394, 1424, 0]"]
-    17["Segment<br>[1421, 1450, 0]"]
+    17["Segment<br>[1430, 1459, 0]"]
-    18["Segment<br>[1456, 1486, 0]"]
+    18["Segment<br>[1465, 1495, 0]"]
-    19["Segment<br>[1492, 1521, 0]"]
+    19["Segment<br>[1501, 1530, 0]"]
-    20["Segment<br>[1527, 1556, 0]"]
+    20["Segment<br>[1536, 1565, 0]"]
-    21["Segment<br>[1562, 1658, 0]"]
+    21["Segment<br>[1571, 1634, 0]"]
-    22["Segment<br>[1664, 1720, 0]"]
+    22["Segment<br>[1640, 1696, 0]"]
-    23["Segment<br>[1726, 1733, 0]"]
+    23["Segment<br>[1702, 1709, 0]"]
     24[Solid2d]
   end
   subgraph path85 [Path]
-    85["Path<br>[1893, 1937, 0]"]
+    85["Path<br>[1869, 1913, 0]"]
-    86["Segment<br>[1943, 2023, 0]"]
+    86["Segment<br>[1919, 1999, 0]"]
-    87["Segment<br>[2029, 2139, 0]"]
+    87["Segment<br>[2005, 2115, 0]"]
-    88["Segment<br>[2145, 2262, 0]"]
+    88["Segment<br>[2121, 2238, 0]"]
-    89["Segment<br>[2268, 2324, 0]"]
+    89["Segment<br>[2244, 2300, 0]"]
-    90["Segment<br>[2330, 2337, 0]"]
+    90["Segment<br>[2306, 2313, 0]"]
     91[Solid2d]
   end
   subgraph path107 [Path]
-    107["Path<br>[2498, 2543, 0]"]
+    107["Path<br>[2474, 2519, 0]"]
-    108["Segment<br>[2549, 2627, 0]"]
+    108["Segment<br>[2525, 2603, 0]"]
-    109["Segment<br>[2633, 2743, 0]"]
+    109["Segment<br>[2609, 2719, 0]"]
-    110["Segment<br>[2749, 2866, 0]"]
+    110["Segment<br>[2725, 2842, 0]"]
-    111["Segment<br>[2872, 2928, 0]"]
+    111["Segment<br>[2848, 2904, 0]"]
-    112["Segment<br>[2934, 2941, 0]"]
+    112["Segment<br>[2910, 2917, 0]"]
     113[Solid2d]
   end
   subgraph path129 [Path]
-    129["Path<br>[3100, 3145, 0]"]
+    129["Path<br>[3076, 3121, 0]"]
-    130["Segment<br>[3151, 3236, 0]"]
+    130["Segment<br>[3127, 3212, 0]"]
-    131["Segment<br>[3242, 3352, 0]"]
+    131["Segment<br>[3218, 3328, 0]"]
-    132["Segment<br>[3358, 3475, 0]"]
+    132["Segment<br>[3334, 3451, 0]"]
-    133["Segment<br>[3481, 3537, 0]"]
+    133["Segment<br>[3457, 3513, 0]"]
-    134["Segment<br>[3543, 3550, 0]"]
+    134["Segment<br>[3519, 3526, 0]"]
     135[Solid2d]
   end
   1["Plane<br>[515, 532, 0]"]
-  25["Sweep Extrusion<br>[1776, 1806, 0]"]
+  25["Sweep Extrusion<br>[1752, 1782, 0]"]
   26[Wall]
   27[Wall]
   28[Wall]
@@ -113,7 +113,7 @@ flowchart LR
   82["SweepEdge Adjacent"]
   83["SweepEdge Opposite"]
   84["SweepEdge Adjacent"]
-  92["Sweep Extrusion<br>[2381, 2412, 0]"]
+  92["Sweep Extrusion<br>[2357, 2388, 0]"]
   93[Wall]
   94[Wall]
   95[Wall]
@@ -128,7 +128,7 @@ flowchart LR
   104["SweepEdge Adjacent"]
   105["SweepEdge Opposite"]
   106["SweepEdge Adjacent"]
-  114["Sweep Extrusion<br>[2984, 3015, 0]"]
+  114["Sweep Extrusion<br>[2960, 2991, 0]"]
   115[Wall]
   116[Wall]
   117[Wall]
@@ -143,7 +143,7 @@ flowchart LR
   126["SweepEdge Adjacent"]
   127["SweepEdge Opposite"]
   128["SweepEdge Adjacent"]
-  136["Sweep Extrusion<br>[3594, 3624, 0]"]
+  136["Sweep Extrusion<br>[3570, 3600, 0]"]
   137[Wall]
   138[Wall]
   139[Wall]
@@ -158,9 +158,9 @@ flowchart LR
   148["SweepEdge Adjacent"]
   149["SweepEdge Opposite"]
   150["SweepEdge Adjacent"]
-  151["StartSketchOnFace<br>[1848, 1887, 0]"]
+  151["StartSketchOnFace<br>[1824, 1863, 0]"]
-  152["StartSketchOnFace<br>[2453, 2492, 0]"]
+  152["StartSketchOnFace<br>[2429, 2468, 0]"]
-  153["StartSketchOnFace<br>[3057, 3094, 0]"]
+  153["StartSketchOnFace<br>[3033, 3070, 0]"]
   1 --- 2
   2 --- 3
   2 --- 4

rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/ast.snap

@@ -756,47 +756,15 @@ description: Result of parsing router-template-cross-bar.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": "angleEnd",
-                          "start": 0,
-                          "type": "Identifier"
-                        },
-                        "start": 0,
-                        "type": "ObjectProperty",
-                        "value": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "raw": "0",
-                          "start": 0,
-                          "type": "Literal",
-                          "type": "Literal",
-                          "value": {
-                            "value": 0.0,
-                            "suffix": "None"
-                          }
-                        }
-                      },
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "90",
@@ -810,18 +778,37 @@ description: Result of parsing router-template-cross-bar.kcl
                     }
                   },
                   {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
-                        "key": {
+                      "name": "angleEnd",
+                      "start": 0,
+                      "type": "Identifier"
+                    },
+                    "arg": {
+                      "commentStart": 0,
+                      "end": 0,
+                      "raw": "0",
+                      "start": 0,
+                      "type": "Literal",
+                      "type": "Literal",
+                      "value": {
+                        "value": 0.0,
+                        "suffix": "None"
+                      }
+                    }
+                  },
+                  {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "left": {
@@ -857,20 +844,17 @@ description: Result of parsing router-template-cross-bar.kcl
                       "type": "BinaryExpression",
                       "type": "BinaryExpression"
                     }
-                      }
-                    ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
                   },
                   {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
+                      "name": "tag",
                       "start": 0,
-                    "type": "PipeSubstitution",
+                      "type": "Identifier"
-                    "type": "PipeSubstitution"
                     },
-                  {
+                    "arg": {
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
@@ -878,6 +862,7 @@ description: Result of parsing router-template-cross-bar.kcl
                       "type": "TagDeclarator",
                       "value": "seg09"
                     }
+                  }
                 ],
                 "callee": {
                   "abs_path": false,
@@ -897,8 +882,9 @@ description: Result of parsing router-template-cross-bar.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
@@ -2351,47 +2337,15 @@ description: Result of parsing router-template-cross-bar.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": "angleEnd",
-                          "start": 0,
-                          "type": "Identifier"
-                        },
-                        "start": 0,
-                        "type": "ObjectProperty",
-                        "value": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "raw": "90",
-                          "start": 0,
-                          "type": "Literal",
-                          "type": "Literal",
-                          "value": {
-                            "value": 90.0,
-                            "suffix": "None"
-                          }
-                        }
-                      },
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "180",
@@ -2405,18 +2359,37 @@ description: Result of parsing router-template-cross-bar.kcl
                     }
                   },
                   {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
-                        "key": {
+                      "name": "angleEnd",
+                      "start": 0,
+                      "type": "Identifier"
+                    },
+                    "arg": {
+                      "commentStart": 0,
+                      "end": 0,
+                      "raw": "90",
+                      "start": 0,
+                      "type": "Literal",
+                      "type": "Literal",
+                      "value": {
+                        "value": 90.0,
+                        "suffix": "None"
+                      }
+                    }
+                  },
+                  {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "left": {
@@ -2454,18 +2427,6 @@ description: Result of parsing router-template-cross-bar.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -2484,8 +2445,9 @@ description: Result of parsing router-template-cross-bar.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [

rust/kcl-lib/tests/kcl_samples/router-template-slate/artifact_graph_flowchart.snap.md

@@ -3,40 +3,40 @@ flowchart LR
   subgraph path2 [Path]
     2["Path<br>[537, 580, 0]"]
     3["Segment<br>[586, 625, 0]"]
-    4["Segment<br>[631, 729, 0]"]
+    4["Segment<br>[631, 696, 0]"]
-    5["Segment<br>[735, 811, 0]"]
+    5["Segment<br>[702, 778, 0]"]
-    6["Segment<br>[817, 886, 0]"]
+    6["Segment<br>[784, 853, 0]"]
-    7["Segment<br>[892, 932, 0]"]
+    7["Segment<br>[859, 899, 0]"]
-    8["Segment<br>[938, 974, 0]"]
+    8["Segment<br>[905, 941, 0]"]
-    9["Segment<br>[1014, 1044, 0]"]
+    9["Segment<br>[981, 1011, 0]"]
-    10["Segment<br>[1050, 1079, 0]"]
+    10["Segment<br>[1017, 1046, 0]"]
-    11["Segment<br>[1085, 1114, 0]"]
+    11["Segment<br>[1052, 1081, 0]"]
-    12["Segment<br>[1120, 1149, 0]"]
+    12["Segment<br>[1087, 1116, 0]"]
-    13["Segment<br>[1155, 1255, 0]"]
+    13["Segment<br>[1122, 1189, 0]"]
-    14["Segment<br>[1261, 1317, 0]"]
+    14["Segment<br>[1195, 1251, 0]"]
-    15["Segment<br>[1323, 1330, 0]"]
+    15["Segment<br>[1257, 1264, 0]"]
     16[Solid2d]
   end
   subgraph path52 [Path]
-    52["Path<br>[1490, 1590, 0]"]
+    52["Path<br>[1424, 1524, 0]"]
-    53["Segment<br>[1596, 1643, 0]"]
+    53["Segment<br>[1530, 1577, 0]"]
-    54["Segment<br>[1649, 1761, 0]"]
+    54["Segment<br>[1583, 1695, 0]"]
-    55["Segment<br>[1767, 1884, 0]"]
+    55["Segment<br>[1701, 1818, 0]"]
-    56["Segment<br>[1890, 1946, 0]"]
+    56["Segment<br>[1824, 1880, 0]"]
-    57["Segment<br>[1952, 1959, 0]"]
+    57["Segment<br>[1886, 1893, 0]"]
     58[Solid2d]
   end
   subgraph path74 [Path]
-    74["Path<br>[2121, 2220, 0]"]
+    74["Path<br>[2055, 2154, 0]"]
-    75["Segment<br>[2226, 2272, 0]"]
+    75["Segment<br>[2160, 2206, 0]"]
-    76["Segment<br>[2278, 2361, 0]"]
+    76["Segment<br>[2212, 2295, 0]"]
-    77["Segment<br>[2367, 2455, 0]"]
+    77["Segment<br>[2301, 2389, 0]"]
-    78["Segment<br>[2461, 2517, 0]"]
+    78["Segment<br>[2395, 2451, 0]"]
-    79["Segment<br>[2523, 2530, 0]"]
+    79["Segment<br>[2457, 2464, 0]"]
     80[Solid2d]
   end
   1["Plane<br>[514, 531, 0]"]
-  17["Sweep Extrusion<br>[1373, 1403, 0]"]
+  17["Sweep Extrusion<br>[1307, 1337, 0]"]
   18[Wall]
   19[Wall]
   20[Wall]
@@ -71,7 +71,7 @@ flowchart LR
   49["SweepEdge Opposite"]
   50["SweepEdge Adjacent"]
   51["SweepEdge Opposite"]
-  59["Sweep Extrusion<br>[2003, 2035, 0]"]
+  59["Sweep Extrusion<br>[1937, 1969, 0]"]
   60[Wall]
   61[Wall]
   62[Wall]
@@ -86,7 +86,7 @@ flowchart LR
   71["SweepEdge Adjacent"]
   72["SweepEdge Opposite"]
   73["SweepEdge Adjacent"]
-  81["Sweep Extrusion<br>[2573, 2605, 0]"]
+  81["Sweep Extrusion<br>[2507, 2539, 0]"]
   82[Wall]
   83[Wall]
   84[Wall]
@@ -101,8 +101,8 @@ flowchart LR
   93["SweepEdge Adjacent"]
   94["SweepEdge Opposite"]
   95["SweepEdge Adjacent"]
-  96["StartSketchOnFace<br>[1445, 1484, 0]"]
+  96["StartSketchOnFace<br>[1379, 1418, 0]"]
-  97["StartSketchOnFace<br>[2076, 2115, 0]"]
+  97["StartSketchOnFace<br>[2010, 2049, 0]"]
   1 --- 2
   2 --- 3
   2 --- 4

rust/kcl-lib/tests/kcl_samples/router-template-slate/ast.snap

@@ -769,47 +769,15 @@ description: Result of parsing router-template-slate.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": "angleEnd",
-                          "start": 0,
-                          "type": "Identifier"
-                        },
-                        "start": 0,
-                        "type": "ObjectProperty",
-                        "value": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "raw": "0",
-                          "start": 0,
-                          "type": "Literal",
-                          "type": "Literal",
-                          "value": {
-                            "value": 0.0,
-                            "suffix": "None"
-                          }
-                        }
-                      },
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "90",
@@ -823,18 +791,37 @@ description: Result of parsing router-template-slate.kcl
                     }
                   },
                   {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
-                        "key": {
+                      "name": "angleEnd",
+                      "start": 0,
+                      "type": "Identifier"
+                    },
+                    "arg": {
+                      "commentStart": 0,
+                      "end": 0,
+                      "raw": "0",
+                      "start": 0,
+                      "type": "Literal",
+                      "type": "Literal",
+                      "value": {
+                        "value": 0.0,
+                        "suffix": "None"
+                      }
+                    }
+                  },
+                  {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "left": {
@@ -876,18 +863,6 @@ description: Result of parsing router-template-slate.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -906,8 +881,9 @@ description: Result of parsing router-template-slate.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
@@ -1596,47 +1572,15 @@ description: Result of parsing router-template-slate.kcl
               {
                 "arguments": [
                   {
-                    "commentStart": 0,
+                    "type": "LabeledArg",
-                    "end": 0,
+                    "label": {
-                    "properties": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": "angleEnd",
-                          "start": 0,
-                          "type": "Identifier"
-                        },
-                        "start": 0,
-                        "type": "ObjectProperty",
-                        "value": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "raw": "90",
-                          "start": 0,
-                          "type": "Literal",
-                          "type": "Literal",
-                          "value": {
-                            "value": 90.0,
-                            "suffix": "None"
-                          }
-                        }
-                      },
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "key": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "angleStart",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "raw": "180",
@@ -1650,18 +1594,37 @@ description: Result of parsing router-template-slate.kcl
                     }
                   },
                   {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
-                        "key": {
+                      "name": "angleEnd",
+                      "start": 0,
+                      "type": "Identifier"
+                    },
+                    "arg": {
+                      "commentStart": 0,
+                      "end": 0,
+                      "raw": "90",
+                      "start": 0,
+                      "type": "Literal",
+                      "type": "Literal",
+                      "value": {
+                        "value": 90.0,
+                        "suffix": "None"
+                      }
+                    }
+                  },
+                  {
+                    "type": "LabeledArg",
+                    "label": {
                       "commentStart": 0,
                       "end": 0,
                       "name": "radius",
                       "start": 0,
                       "type": "Identifier"
                     },
-                        "start": 0,
+                    "arg": {
-                        "type": "ObjectProperty",
-                        "value": {
                       "commentStart": 0,
                       "end": 0,
                       "left": {
@@ -1703,18 +1666,6 @@ description: Result of parsing router-template-slate.kcl
                     }
                   }
                 ],
-                    "start": 0,
-                    "type": "ObjectExpression",
-                    "type": "ObjectExpression"
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1733,8 +1684,9 @@ description: Result of parsing router-template-slate.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [

rust/kcl-lib/tests/kcl_samples/router-template-slate/program_memory.snap

@@ -48,9 +48,9 @@ description: Variables in memory after executing router-template-slate.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 804,
+            "commentStart": 771,
-            "end": 810,
+            "end": 777,
-            "start": 804,
+            "start": 771,
             "type": "TagDeclarator",
             "value": "seg05"
           },
@@ -61,9 +61,9 @@ description: Variables in memory after executing router-template-slate.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 879,
+            "commentStart": 846,
-            "end": 885,
+            "end": 852,
-            "start": 879,
+            "start": 846,
             "type": "TagDeclarator",
             "value": "seg04"
           },
@@ -74,9 +74,9 @@ description: Variables in memory after executing router-template-slate.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 925,
+            "commentStart": 892,
-            "end": 931,
+            "end": 898,
-            "start": 925,
+            "start": 892,
             "type": "TagDeclarator",
             "value": "seg03"
           },
@@ -189,9 +189,9 @@ description: Variables in memory after executing router-template-slate.kcl
               20.0
             ],
             "tag": {
-              "commentStart": 804,
+              "commentStart": 771,
-              "end": 810,
+              "end": 777,
-              "start": 804,
+              "start": 771,
               "type": "TagDeclarator",
               "value": "seg05"
             },
@@ -214,9 +214,9 @@ description: Variables in memory after executing router-template-slate.kcl
               -12.4937
             ],
             "tag": {
-              "commentStart": 879,
+              "commentStart": 846,
-              "end": 885,
+              "end": 852,
-              "start": 879,
+              "start": 846,
               "type": "TagDeclarator",
               "value": "seg04"
             },
@@ -239,9 +239,9 @@ description: Variables in memory after executing router-template-slate.kcl
               -12.4937
             ],
             "tag": {
-              "commentStart": 925,
+              "commentStart": 892,
-              "end": 931,
+              "end": 898,
-              "start": 925,
+              "start": 892,
               "type": "TagDeclarator",
               "value": "seg03"
             },
@@ -264,9 +264,9 @@ description: Variables in memory after executing router-template-slate.kcl
               -122.4938
             ],
             "tag": {
-              "commentStart": 967,
+              "commentStart": 934,
-              "end": 973,
+              "end": 940,
-              "start": 967,
+              "start": 934,
               "type": "TagDeclarator",
               "value": "seg02"
             },
@@ -526,9 +526,9 @@ description: Variables in memory after executing router-template-slate.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 1621,
+            "commentStart": 1555,
-            "end": 1642,
+            "end": 1576,
-            "start": 1621,
+            "start": 1555,
             "type": "TagDeclarator",
             "value": "rectangleSegmentA001"
           },
@@ -539,9 +539,9 @@ description: Variables in memory after executing router-template-slate.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 1739,
+            "commentStart": 1673,
-            "end": 1760,
+            "end": 1694,
-            "start": 1739,
+            "start": 1673,
             "type": "TagDeclarator",
             "value": "rectangleSegmentB001"
           },
@@ -552,9 +552,9 @@ description: Variables in memory after executing router-template-slate.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 1862,
+            "commentStart": 1796,
-            "end": 1883,
+            "end": 1817,
-            "start": 1862,
+            "start": 1796,
             "type": "TagDeclarator",
             "value": "rectangleSegmentC001"
           },
@@ -582,9 +582,9 @@ description: Variables in memory after executing router-template-slate.kcl
               -12.4937
             ],
             "tag": {
-              "commentStart": 1621,
+              "commentStart": 1555,
-              "end": 1642,
+              "end": 1576,
-              "start": 1621,
+              "start": 1555,
               "type": "TagDeclarator",
               "value": "rectangleSegmentA001"
             },
@@ -607,9 +607,9 @@ description: Variables in memory after executing router-template-slate.kcl
               -12.4937
             ],
             "tag": {
-              "commentStart": 1739,
+              "commentStart": 1673,
-              "end": 1760,
+              "end": 1694,
-              "start": 1739,
+              "start": 1673,
               "type": "TagDeclarator",
               "value": "rectangleSegmentB001"
             },
@@ -632,9 +632,9 @@ description: Variables in memory after executing router-template-slate.kcl
               -92.4938
             ],
             "tag": {
-              "commentStart": 1862,
+              "commentStart": 1796,
-              "end": 1883,
+              "end": 1817,
-              "start": 1862,
+              "start": 1796,
               "type": "TagDeclarator",
               "value": "rectangleSegmentC001"
             },
@@ -745,9 +745,9 @@ description: Variables in memory after executing router-template-slate.kcl
                 "id": "[uuid]",
                 "sourceRange": [],
                 "tag": {
-                  "commentStart": 804,
+                  "commentStart": 771,
-                  "end": 810,
+                  "end": 777,
-                  "start": 804,
+                  "start": 771,
                   "type": "TagDeclarator",
                   "value": "seg05"
                 },
@@ -758,9 +758,9 @@ description: Variables in memory after executing router-template-slate.kcl
                 "id": "[uuid]",
                 "sourceRange": [],
                 "tag": {
-                  "commentStart": 879,
+                  "commentStart": 846,
-                  "end": 885,
+                  "end": 852,
-                  "start": 879,
+                  "start": 846,
                   "type": "TagDeclarator",
                   "value": "seg04"
                 },
@@ -771,9 +771,9 @@ description: Variables in memory after executing router-template-slate.kcl
                 "id": "[uuid]",
                 "sourceRange": [],
                 "tag": {
-                  "commentStart": 925,
+                  "commentStart": 892,
-                  "end": 931,
+                  "end": 898,
-                  "start": 925,
+                  "start": 892,
                   "type": "TagDeclarator",
                   "value": "seg03"
                 },
@@ -886,9 +886,9 @@ description: Variables in memory after executing router-template-slate.kcl
                     20.0
                   ],
                   "tag": {
-                    "commentStart": 804,
+                    "commentStart": 771,
-                    "end": 810,
+                    "end": 777,
-                    "start": 804,
+                    "start": 771,
                     "type": "TagDeclarator",
                     "value": "seg05"
                   },
@@ -911,9 +911,9 @@ description: Variables in memory after executing router-template-slate.kcl
                     -12.4937
                   ],
                   "tag": {
-                    "commentStart": 879,
+                    "commentStart": 846,
-                    "end": 885,
+                    "end": 852,
-                    "start": 879,
+                    "start": 846,
                     "type": "TagDeclarator",
                     "value": "seg04"
                   },
@@ -936,9 +936,9 @@ description: Variables in memory after executing router-template-slate.kcl
                     -12.4937
                   ],
                   "tag": {
-                    "commentStart": 925,
+                    "commentStart": 892,
-                    "end": 931,
+                    "end": 898,
-                    "start": 925,
+                    "start": 892,
                     "type": "TagDeclarator",
                     "value": "seg03"
                   },
@@ -961,9 +961,9 @@ description: Variables in memory after executing router-template-slate.kcl
                     -122.4938
                   ],
                   "tag": {
-                    "commentStart": 967,
+                    "commentStart": 934,
-                    "end": 973,
+                    "end": 940,
-                    "start": 967,
+                    "start": 934,
                     "type": "TagDeclarator",
                     "value": "seg02"
                   },
@@ -1272,9 +1272,9 @@ description: Variables in memory after executing router-template-slate.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 2250,
+            "commentStart": 2184,
-            "end": 2271,
+            "end": 2205,
-            "start": 2250,
+            "start": 2184,
             "type": "TagDeclarator",
             "value": "rectangleSegmentA002"
           },
@@ -1316,9 +1316,9 @@ description: Variables in memory after executing router-template-slate.kcl
               -12.4937
             ],
             "tag": {
-              "commentStart": 2250,
+              "commentStart": 2184,
-              "end": 2271,
+              "end": 2205,
-              "start": 2250,
+              "start": 2184,
               "type": "TagDeclarator",
               "value": "rectangleSegmentA002"
             },
@@ -1467,9 +1467,9 @@ description: Variables in memory after executing router-template-slate.kcl
                 "id": "[uuid]",
                 "sourceRange": [],
                 "tag": {
-                  "commentStart": 804,
+                  "commentStart": 771,
-                  "end": 810,
+                  "end": 777,
-                  "start": 804,
+                  "start": 771,
                   "type": "TagDeclarator",
                   "value": "seg05"
                 },
@@ -1480,9 +1480,9 @@ description: Variables in memory after executing router-template-slate.kcl
                 "id": "[uuid]",
                 "sourceRange": [],
                 "tag": {
-                  "commentStart": 879,
+                  "commentStart": 846,
-                  "end": 885,
+                  "end": 852,
-                  "start": 879,
+                  "start": 846,
                   "type": "TagDeclarator",
                   "value": "seg04"
                 },
@@ -1493,9 +1493,9 @@ description: Variables in memory after executing router-template-slate.kcl
                 "id": "[uuid]",
                 "sourceRange": [],
                 "tag": {
-                  "commentStart": 925,
+                  "commentStart": 892,
-                  "end": 931,
+                  "end": 898,
-                  "start": 925,
+                  "start": 892,
                   "type": "TagDeclarator",
                   "value": "seg03"
                 },
@@ -1608,9 +1608,9 @@ description: Variables in memory after executing router-template-slate.kcl
                     20.0
                   ],
                   "tag": {
-                    "commentStart": 804,
+                    "commentStart": 771,
-                    "end": 810,
+                    "end": 777,
-                    "start": 804,
+                    "start": 771,
                     "type": "TagDeclarator",
                     "value": "seg05"
                   },
@@ -1633,9 +1633,9 @@ description: Variables in memory after executing router-template-slate.kcl
                     -12.4937
                   ],
                   "tag": {
-                    "commentStart": 879,
+                    "commentStart": 846,
-                    "end": 885,
+                    "end": 852,
-                    "start": 879,
+                    "start": 846,
                     "type": "TagDeclarator",
                     "value": "seg04"
                   },
@@ -1658,9 +1658,9 @@ description: Variables in memory after executing router-template-slate.kcl
                     -12.4937
                   ],
                   "tag": {
-                    "commentStart": 925,
+                    "commentStart": 892,
-                    "end": 931,
+                    "end": 898,
-                    "start": 925,
+                    "start": 892,
                     "type": "TagDeclarator",
                     "value": "seg03"
                   },
@@ -1683,9 +1683,9 @@ description: Variables in memory after executing router-template-slate.kcl
                     -122.4938
                   ],
                   "tag": {
-                    "commentStart": 967,
+                    "commentStart": 934,
-                    "end": 973,
+                    "end": 940,
-                    "start": 967,
+                    "start": 934,
                     "type": "TagDeclarator",
                     "value": "seg02"
                   },
@@ -2150,9 +2150,9 @@ description: Variables in memory after executing router-template-slate.kcl
             20.0
           ],
           "tag": {
-            "commentStart": 804,
+            "commentStart": 771,
-            "end": 810,
+            "end": 777,
-            "start": 804,
+            "start": 771,
             "type": "TagDeclarator",
             "value": "seg05"
           },
@@ -2175,9 +2175,9 @@ description: Variables in memory after executing router-template-slate.kcl
             -12.4937
           ],
           "tag": {
-            "commentStart": 879,
+            "commentStart": 846,
-            "end": 885,
+            "end": 852,
-            "start": 879,
+            "start": 846,
             "type": "TagDeclarator",
             "value": "seg04"
           },
@@ -2200,9 +2200,9 @@ description: Variables in memory after executing router-template-slate.kcl
             -12.4937
           ],
           "tag": {
-            "commentStart": 925,
+            "commentStart": 892,
-            "end": 931,
+            "end": 898,
-            "start": 925,
+            "start": 892,
             "type": "TagDeclarator",
             "value": "seg03"
           },
@@ -2225,9 +2225,9 @@ description: Variables in memory after executing router-template-slate.kcl
             -122.4938
           ],
           "tag": {
-            "commentStart": 967,
+            "commentStart": 934,
-            "end": 973,
+            "end": 940,
-            "start": 967,
+            "start": 934,
             "type": "TagDeclarator",
             "value": "seg02"
           },
@@ -2484,9 +2484,9 @@ description: Variables in memory after executing router-template-slate.kcl
             -12.4937
           ],
           "tag": {
-            "commentStart": 1621,
+            "commentStart": 1555,
-            "end": 1642,
+            "end": 1576,
-            "start": 1621,
+            "start": 1555,
             "type": "TagDeclarator",
             "value": "rectangleSegmentA001"
           },
@@ -2509,9 +2509,9 @@ description: Variables in memory after executing router-template-slate.kcl
             -12.4937
           ],
           "tag": {
-            "commentStart": 1739,
+            "commentStart": 1673,
-            "end": 1760,
+            "end": 1694,
-            "start": 1739,
+            "start": 1673,
             "type": "TagDeclarator",
             "value": "rectangleSegmentB001"
           },
@@ -2534,9 +2534,9 @@ description: Variables in memory after executing router-template-slate.kcl
             -92.4938
           ],
           "tag": {
-            "commentStart": 1862,
+            "commentStart": 1796,
-            "end": 1883,
+            "end": 1817,
-            "start": 1862,
+            "start": 1796,
             "type": "TagDeclarator",
             "value": "rectangleSegmentC001"
           },
@@ -2647,9 +2647,9 @@ description: Variables in memory after executing router-template-slate.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 804,
+                "commentStart": 771,
-                "end": 810,
+                "end": 777,
-                "start": 804,
+                "start": 771,
                 "type": "TagDeclarator",
                 "value": "seg05"
               },
@@ -2660,9 +2660,9 @@ description: Variables in memory after executing router-template-slate.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 879,
+                "commentStart": 846,
-                "end": 885,
+                "end": 852,
-                "start": 879,
+                "start": 846,
                 "type": "TagDeclarator",
                 "value": "seg04"
               },
@@ -2673,9 +2673,9 @@ description: Variables in memory after executing router-template-slate.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 925,
+                "commentStart": 892,
-                "end": 931,
+                "end": 898,
-                "start": 925,
+                "start": 892,
                 "type": "TagDeclarator",
                 "value": "seg03"
               },
@@ -2788,9 +2788,9 @@ description: Variables in memory after executing router-template-slate.kcl
                   20.0
                 ],
                 "tag": {
-                  "commentStart": 804,
+                  "commentStart": 771,
-                  "end": 810,
+                  "end": 777,
-                  "start": 804,
+                  "start": 771,
                   "type": "TagDeclarator",
                   "value": "seg05"
                 },
@@ -2813,9 +2813,9 @@ description: Variables in memory after executing router-template-slate.kcl
                   -12.4937
                 ],
                 "tag": {
-                  "commentStart": 879,
+                  "commentStart": 846,
-                  "end": 885,
+                  "end": 852,
-                  "start": 879,
+                  "start": 846,
                   "type": "TagDeclarator",
                   "value": "seg04"
                 },
@@ -2838,9 +2838,9 @@ description: Variables in memory after executing router-template-slate.kcl
                   -12.4937
                 ],
                 "tag": {
-                  "commentStart": 925,
+                  "commentStart": 892,
-                  "end": 931,
+                  "end": 898,
-                  "start": 925,
+                  "start": 892,
                   "type": "TagDeclarator",
                   "value": "seg03"
                 },
@@ -2863,9 +2863,9 @@ description: Variables in memory after executing router-template-slate.kcl
                   -122.4938
                 ],
                 "tag": {
-                  "commentStart": 967,
+                  "commentStart": 934,
-                  "end": 973,
+                  "end": 940,
-                  "start": 967,
+                  "start": 934,
                   "type": "TagDeclarator",
                   "value": "seg02"
                 },
@@ -3171,9 +3171,9 @@ description: Variables in memory after executing router-template-slate.kcl
             -12.4937
           ],
           "tag": {
-            "commentStart": 2250,
+            "commentStart": 2184,
-            "end": 2271,
+            "end": 2205,
-            "start": 2250,
+            "start": 2184,
             "type": "TagDeclarator",
             "value": "rectangleSegmentA002"
           },
@@ -3322,9 +3322,9 @@ description: Variables in memory after executing router-template-slate.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 804,
+                "commentStart": 771,
-                "end": 810,
+                "end": 777,
-                "start": 804,
+                "start": 771,
                 "type": "TagDeclarator",
                 "value": "seg05"
               },
@@ -3335,9 +3335,9 @@ description: Variables in memory after executing router-template-slate.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 879,
+                "commentStart": 846,
-                "end": 885,
+                "end": 852,
-                "start": 879,
+                "start": 846,
                 "type": "TagDeclarator",
                 "value": "seg04"
               },
@@ -3348,9 +3348,9 @@ description: Variables in memory after executing router-template-slate.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 925,
+                "commentStart": 892,
-                "end": 931,
+                "end": 898,
-                "start": 925,
+                "start": 892,
                 "type": "TagDeclarator",
                 "value": "seg03"
               },
@@ -3463,9 +3463,9 @@ description: Variables in memory after executing router-template-slate.kcl
                   20.0
                 ],
                 "tag": {
-                  "commentStart": 804,
+                  "commentStart": 771,
-                  "end": 810,
+                  "end": 777,
-                  "start": 804,
+                  "start": 771,
                   "type": "TagDeclarator",
                   "value": "seg05"
                 },
@@ -3488,9 +3488,9 @@ description: Variables in memory after executing router-template-slate.kcl
                   -12.4937
                 ],
                 "tag": {
-                  "commentStart": 879,
+                  "commentStart": 846,
-                  "end": 885,
+                  "end": 852,
-                  "start": 879,
+                  "start": 846,
                   "type": "TagDeclarator",
                   "value": "seg04"
                 },
@@ -3513,9 +3513,9 @@ description: Variables in memory after executing router-template-slate.kcl
                   -12.4937
                 ],
                 "tag": {
-                  "commentStart": 925,
+                  "commentStart": 892,
-                  "end": 931,
+                  "end": 898,
-                  "start": 925,
+                  "start": 892,
                   "type": "TagDeclarator",
                   "value": "seg03"
                 },
@@ -3538,9 +3538,9 @@ description: Variables in memory after executing router-template-slate.kcl
                   -122.4938
                 ],
                 "tag": {
-                  "commentStart": 967,
+                  "commentStart": 934,
-                  "end": 973,
+                  "end": 940,
-                  "start": 967,
+                  "start": 934,
                   "type": "TagDeclarator",
                   "value": "seg02"
                 },

rust/kcl-lib/tests/kcl_samples/walkie-talkie/artifact_graph_flowchart.snap.md

@@ -100,34 +100,34 @@ flowchart LR
   end
   subgraph path175 [Path]
     175["Path<br>[1092, 1190, 12]"]
-    176["Segment<br>[1198, 1317, 12]"]
+    176["Segment<br>[1198, 1276, 12]"]
-    177["Segment<br>[1325, 1372, 12]"]
+    177["Segment<br>[1284, 1331, 12]"]
-    178["Segment<br>[1380, 1501, 12]"]
+    178["Segment<br>[1339, 1419, 12]"]
-    179["Segment<br>[1509, 1516, 12]"]
+    179["Segment<br>[1427, 1434, 12]"]
     180[Solid2d]
   end
   subgraph path182 [Path]
-    182["Path<br>[1613, 1710, 12]"]
+    182["Path<br>[1531, 1628, 12]"]
-    183["Segment<br>[1718, 1837, 12]"]
+    183["Segment<br>[1636, 1714, 12]"]
-    184["Segment<br>[1845, 1893, 12]"]
+    184["Segment<br>[1722, 1770, 12]"]
-    185["Segment<br>[1901, 2022, 12]"]
+    185["Segment<br>[1778, 1858, 12]"]
-    186["Segment<br>[2030, 2037, 12]"]
+    186["Segment<br>[1866, 1873, 12]"]
     187[Solid2d]
   end
   subgraph path189 [Path]
     189["Path<br>[1092, 1190, 12]"]
-    190["Segment<br>[1198, 1317, 12]"]
+    190["Segment<br>[1198, 1276, 12]"]
-    191["Segment<br>[1325, 1372, 12]"]
+    191["Segment<br>[1284, 1331, 12]"]
-    192["Segment<br>[1380, 1501, 12]"]
+    192["Segment<br>[1339, 1419, 12]"]
-    193["Segment<br>[1509, 1516, 12]"]
+    193["Segment<br>[1427, 1434, 12]"]
     194[Solid2d]
   end
   subgraph path196 [Path]
-    196["Path<br>[1613, 1710, 12]"]
+    196["Path<br>[1531, 1628, 12]"]
-    197["Segment<br>[1718, 1837, 12]"]
+    197["Segment<br>[1636, 1714, 12]"]
-    198["Segment<br>[1845, 1893, 12]"]
+    198["Segment<br>[1722, 1770, 12]"]
-    199["Segment<br>[1901, 2022, 12]"]
+    199["Segment<br>[1778, 1858, 12]"]
-    200["Segment<br>[2030, 2037, 12]"]
+    200["Segment<br>[1866, 1873, 12]"]
     201[Solid2d]
   end
   subgraph path230 [Path]
@@ -142,9 +142,9 @@ flowchart LR
     256["Path<br>[309, 339, 10]"]
     257["Segment<br>[345, 377, 10]"]
     258["Segment<br>[383, 416, 10]"]
-    259["Segment<br>[422, 503, 10]"]
+    259["Segment<br>[422, 470, 10]"]
-    260["Segment<br>[509, 536, 10]"]
+    260["Segment<br>[476, 503, 10]"]
-    261["Segment<br>[542, 549, 10]"]
+    261["Segment<br>[509, 516, 10]"]
     262[Solid2d]
   end
   subgraph path274 [Path]
@@ -326,7 +326,7 @@ flowchart LR
   253["EdgeCut Fillet<br>[649, 855, 9]"]
   254["EdgeCut Fillet<br>[649, 855, 9]"]
   255["Plane<br>[286, 303, 10]"]
-  263["Sweep Revolve<br>[555, 572, 10]"]
+  263["Sweep Revolve<br>[522, 539, 10]"]
   264[Wall]
   265[Wall]
   266[Wall]

rust/kcl-lib/tests/kcl_samples/walkie-talkie/ops.snap

@@ -1571,7 +1571,7 @@ description: Operations executed walkie-talkie.kcl
       "name": "oLogo",
       "functionSourceRange": [
         1035,
-        1538,
+        1456,
         12
       ],
       "unlabeledArg": null,
@@ -1629,8 +1629,8 @@ description: Operations executed walkie-talkie.kcl
       "type": "FunctionCall",
       "name": "oLogo2",
       "functionSourceRange": [
-        1556,
+        1474,
-        2059,
+        1895,
         12
       ],
       "unlabeledArg": null,
@@ -1689,7 +1689,7 @@ description: Operations executed walkie-talkie.kcl
       "name": "oLogo",
       "functionSourceRange": [
         1035,
-        1538,
+        1456,
         12
       ],
       "unlabeledArg": null,
@@ -1747,8 +1747,8 @@ description: Operations executed walkie-talkie.kcl
       "type": "FunctionCall",
       "name": "oLogo2",
       "functionSourceRange": [
-        1556,
+        1474,
-        2059,
+        1895,
         12
       ],
       "unlabeledArg": null,