Revolve changed to kw args (#5873)

* initial port

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* more fixes

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* fix e2e

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* more fixes

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* update js side

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* fixes

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* fix;

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* cleanup

Signed-off-by: Jess Frazelle <github@jessfraz.com>

* updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

---------

Signed-off-by: Jess Frazelle <github@jessfraz.com>

docs/kcl/appearance.md

@@ -54,7 +54,7 @@ example = extrude(exampleSketch, length = 5)
 // Add color to a revolved solid.
 sketch001 = startSketchOn('XY')
   |> circle(center = [15, 0], radius = 5)
-  |> revolve({ angle = 360, axis = 'y' }, %)
+  |> revolve(angle = 360, axis = 'y')
   |> appearance(color = '#ff0000', metalness = 90, roughness = 90)
 ```
 

docs/kcl/startSketchOn.md

@@ -112,7 +112,7 @@ exampleSketch = startSketchOn(XY)
   |> line(end = [-2, 0])
   |> close()
 
-example = revolve({ axis = 'y', angle = 180 }, exampleSketch)
+example = revolve(exampleSketch, axis = 'y', angle = 180)
 
 exampleSketch002 = startSketchOn(example, 'end')
   |> startProfileAt([4.5, -5], %)

e2e/playwright/editor-tests.spec.ts

@@ -726,10 +726,10 @@ test.describe('Editor tests', { tag: ['@skipWin'] }, () => {
     |> line(end = [2, 0])
     |> line(end = [0, -10])
     |> close()
-    |> revolve({
+    |> revolve(
-    axis: revolveAxis,
+    axis = revolveAxis,
-    angle: 90
+    angle = 90
-    }, %)
+    )
     `
       )
     })

e2e/playwright/feature-tree-pane.spec.ts

@@ -21,7 +21,7 @@ sketch001 = startSketchOn('XZ')
   |> angledLine([-45, length001], %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-revolve001 = revolve({ axis = "X" }, sketch001)
+revolve001 = revolve(sketch001, axis = "X")
 triangle()
   |> extrude(length = 30)
 plane001 = offsetPlane('XY', offset = 10)
@@ -126,7 +126,7 @@ test.describe('Feature Tree pane', () => {
       await testViewSource({
         operationName: 'Revolve',
         operationIndex: 0,
-        expectedActiveLine: 'revolve001 = revolve({ axis = "X" }, sketch001)',
+        expectedActiveLine: 'revolve001 = revolve(sketch001, axis = "X")',
       })
       await testViewSource({
         operationName: 'Triangle',

e2e/playwright/point-click.spec.ts

@@ -2810,7 +2810,7 @@ segAng(rectangleSegmentA002),
       await cmdBar.progressCmdBar()
       await cmdBar.progressCmdBar()
 
-      const newCodeToFind = `revolve001 = revolve({ angle = 360, axis = 'X' }, sketch002)`
+      const newCodeToFind = `revolve001 = revolve(sketch002, angle = 360, axis = 'X')`
       expect(editor.expectEditor.toContain(newCodeToFind)).toBeTruthy()
     })
     test('revolve surface around edge from an extruded solid2d', async ({
@@ -2860,7 +2860,7 @@ radius = 8.69
       await page.getByText(lineCodeToSelection).click()
       await cmdBar.progressCmdBar()
 
-      const newCodeToFind = `revolve001 = revolve({angle = 360, axis = getOppositeEdge(rectangleSegmentA001)}, sketch002) `
+      const newCodeToFind = `revolve001 = revolve(sketch002, angle = 360, axis = getOppositeEdge(rectangleSegmentA001)) `
       expect(editor.expectEditor.toContain(newCodeToFind)).toBeTruthy()
     })
     test('revolve sketch circle around line segment from startProfileAt sketch', async ({
@@ -2911,7 +2911,7 @@ radius = 8.69
       await page.getByText(lineCodeToSelection).click()
       await cmdBar.progressCmdBar()
 
-      const newCodeToFind = `revolve001 = revolve({ angle = 360, axis = seg01 }, sketch003)`
+      const newCodeToFind = `revolve001 = revolve(sketch003, angle = 360, axis = seg01)`
       expect(editor.expectEditor.toContain(newCodeToFind)).toBeTruthy()
     })
   })

e2e/playwright/sketch-tests.spec.ts

@@ -666,7 +666,7 @@ sketch001 = startProfileAt([12.34, -12.34], sketch002)
   |> line(end = [12.73, -0.09])
   |> tangentialArcTo([24.95, -5.38], %)
   |> close()
-  |> revolve({ axis = "X",}, %)`
+  |> revolve(axis = "X")`
       )
     })
 
@@ -753,7 +753,7 @@ sketch001 = startProfileAt([12.34, -12.34], sketch002)
   |> tangentialArcTo([24.95, -5.38], %)
   |> line(end = [1.97, 2.06])
   |> close()
-  |> revolve({ axis = "X" }, %)`)
+  |> revolve(axis = "X")`)
   })
   test('Can add multiple sketches', async ({ page, homePage }) => {
     const u = await getUtils(page)
@@ -1200,7 +1200,7 @@ profile001 = startProfileAt([${roundOff(scale * 69.6)}, ${roundOff(
           |> xLine(endAbsolute = 0 + .001)
           |> yLine(endAbsolute = 0)
           |> close()
-          |> revolve({ axis = "Y" }, %)
+          |> revolve(axis = "Y")
 
         return lugSketch
       }
@@ -2570,10 +2570,11 @@ profile006 = startProfileAt([9.65, 3.82], sketch002)
   |> line(end = [2.13, -5.57])
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-revolve001 = revolve({
+revolve001 = revolve(
+  profile004,
   angle = 45,
   axis = getNextAdjacentEdge(seg01)
-}, profile004)
+)
 extrude002 = extrude(profile006, length = 4)
 sketch003 = startSketchOn('-XZ')
 profile007 = startProfileAt([4.8, 7.55], sketch003)
@@ -2608,7 +2609,7 @@ profile011 = startProfileAt([5.07, -6.39], sketch003)
   |> close()
 extrude003 = extrude(profile011, length = 2.5)
 // TODO this breaks the test,
-// revolve002 = revolve({ angle = 45, axis = seg02 }, profile008)
+// revolve002 = revolve(profile008, angle = 45, axis = seg02)
 `
         )
       })

e2e/playwright/storageStates.ts

@@ -142,10 +142,10 @@ sketch001 = startSketchOn(box, revolveAxis)
   |> line(end = [2, 0])
   |> line(end = [0, -10])
   |> close()
-  |> revolve({
+  |> revolve(
-  axis: revolveAxis,
+  axis = revolveAxis,
-  angle: 90
+  angle = 90
-  }, %)
+  )
 
 sketch001 = startSketchOn('XZ')
   |> startProfileAt([0.0, 0.0], %)

e2e/playwright/testing-selections.spec.ts

@@ -323,7 +323,7 @@ part009 = startSketchOn('XY')
   |> line(end = [0, pipeLength])
   |> angledLineToX({ angle = 60, to = pipeLargeDia }, %)
   |> close()
-rev = revolve({ axis = 'y' }, part009)
+rev = revolve(part009, axis = 'y')
 sketch006 = startSketchOn('XY')
 profile001 = circle(
   sketch006,
@@ -379,7 +379,7 @@ profile003 = startProfileAt([40.16, -120.48], sketch006)
     await page.waitForTimeout(200)
 
     await expect(u.codeLocator).not.toContainText(
-      `rev = revolve({ axis: 'y' }, part009)`
+      `rev = revolve(part009, axis: 'y')`
     )
 
     // FIXME (commented section below), this test would select a wall that had a sketch on it, and delete the underlying extrude

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

@@ -41,7 +41,7 @@ ballsSketch = startSketchOn("XY")
   |> close()
 
 // Revolve the ball to make a sphere and pattern around the inside wall
-balls = revolve({ axis = "X" }, ballsSketch)
+balls = revolve(ballsSketch, axis = "X")
   |> patternCircular3d(
        arcDegrees = 360,
        axis = [0, 0, 1],
@@ -66,7 +66,7 @@ chainSketch = startSketchOn("XY")
   |> close()
 
 // Revolve the chain sketch
-chainHead = revolve({ axis = "X" }, chainSketch)
+chainHead = revolve(chainSketch, axis = "X")
   |> patternCircular3d(
        arcDegrees = 360,
        axis = [0, 0, 1],
@@ -86,7 +86,7 @@ linkSketch = startSketchOn("XZ")
      )
 
 // Revolve the link sketch
-linkRevolve = revolve({ axis = 'Y', angle = 360 / nBalls }, linkSketch)
+linkRevolve = revolve(linkSketch, axis = 'Y', angle = 360 / nBalls)
   |> patternCircular3d(
        arcDegrees = 360,
        axis = [0, 0, 1],

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

@@ -82,5 +82,5 @@ brakeCaliperSketch = startSketchOn('XY')
   |> close()
 
 // Revolve the brake caliper sketch
-revolve({ axis = "Y", angle = -70 }, brakeCaliperSketch)
+revolve(brakeCaliperSketch, axis = "Y", angle = -70)
   |> appearance(color = "#c82d2d", metalness = 90, roughness = 90)

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

@@ -40,5 +40,5 @@ tireSketch = startSketchOn("XY")
   |> close()
 
 // Revolve the sketch to create the tire
-revolve({ axis = "Y" }, tireSketch)
+revolve(tireSketch, axis = "Y")
   |> appearance(color = "#0f0f0f", roughness = 80)

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

@@ -74,7 +74,7 @@ wheelCenterInner = startSketchOn('XY')
   |> yLine(endAbsolute = 0)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-  |> revolve({ axis = 'y' }, %)
+  |> revolve(axis = 'y')
   |> appearance(color = "#ffffff", metalness = 0, roughness = 0)
 
 wheelCenterOuter = startSketchOn('XY')
@@ -88,7 +88,7 @@ wheelCenterOuter = startSketchOn('XY')
   |> yLine(endAbsolute = -wheelWidth / 20)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-  |> revolve({ axis = 'y' }, %)
+  |> revolve(axis = 'y')
   |> appearance(color = "#ffffff", metalness = 0, roughness = 0)
 
 // Write a function that defines the spoke geometry, patterns and extrudes it
@@ -193,5 +193,5 @@ startSketchOn('XY')
   |> xLine(length = wheelWidth * 0.03)
   |> yLine(length = wheelWidth * 0.05)
   |> close()
-  |> revolve({ axis = 'y' }, %)
+  |> revolve(axis = 'y')
   |> appearance(color = "#ffffff", metalness = 0, roughness = 0)

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

@@ -34,7 +34,7 @@ fn lug(plane, length, diameter) {
     |> xLine(endAbsolute = lugThreadDiameter)
     |> yLine(endAbsolute = 0)
     |> close()
-    |> revolve({ axis = "Y" }, %)
+    |> revolve(axis = "Y")
     |> appearance(color = "#dbcd70", roughness = 90, metalness = 90)
   return lugSketch
 }

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

@@ -23,7 +23,7 @@ sketch001 = startSketchOn('XZ')
      ], %, $rectangleSegmentC001)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-  |> revolve({ angle = 360, axis = 'Y' }, %)
+  |> revolve(angle = 360, axis = 'Y')
 
 // Create an angled plane to sketch the supports
 plane001 = {
@@ -135,7 +135,7 @@ sketch005 = startSketchOn('XZ')
   |> xLine(endAbsolute = 0.15)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-  |> revolve({ axis = 'y' }, %)
+  |> revolve(axis = 'y')
 
 // Plunger and stem
 sketch006 = startSketchOn('XZ')
@@ -148,7 +148,7 @@ sketch006 = startSketchOn('XZ')
   |> tangentialArc({ radius = 0.6, offset = -90 }, %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-  |> revolve({ axis = 'y' }, %)
+  |> revolve(axis = 'y')
 
 // Spiral plate
 sketch007 = startSketchOn(offsetPlane('XY', offset = 1.12))
@@ -210,7 +210,7 @@ sketch011 = startSketchOn('XZ')
      }, %)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-  |> revolve({ axis = 'y' }, %)
+  |> revolve(axis = 'y')
 
 // Draw and extrude handle
 sketch012 = startSketchOn(offsetPlane('XZ', offset = handleThickness / 2))

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

@@ -55,7 +55,7 @@ axis000 = {
 }
 
 // create a single corner of the bin
-singleCorner = revolve({ angle = -90, axis = axis000 }, face(offsetPlane("YZ", offset = cornerRadius)))
+singleCorner = revolve(face(offsetPlane("YZ", offset = cornerRadius)), angle = -90, axis = axis000)
 
 // create the corners of the bin
 corners = patternCircular3d(

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

@@ -52,7 +52,7 @@ axis000 = {
 }
 
 // create a single corner of the bin
-singleCorner = revolve({ angle = -90, axis = axis000 }, face(offsetPlane("YZ", offset = cornerRadius)))
+singleCorner = revolve(face(offsetPlane("YZ", offset = cornerRadius)), angle = -90, axis = axis000)
 
 // create the corners of the bin
 corners = patternCircular3d(

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

@@ -75,7 +75,7 @@ axis000 = {
 }
 
 // create a single corner of the bin
-singleCorner = revolve({ angle = -90, axis = axis000 }, face(offsetPlane("YZ", offset = cornerRadius + binTol)))
+singleCorner = revolve(face(offsetPlane("YZ", offset = cornerRadius + binTol)), angle = -90, axis = axis000)
 
 // create the corners of the bin
 corners = patternCircular3d(
@@ -291,10 +291,10 @@ axis001 = {
 }
 
 // create a single corner of the bin
-lipSingleLengthCorner = revolve({ angle = -90, axis = axis001 }, lipFace(plane000))
+lipSingleLengthCorner = revolve(lipFace(plane000), angle = -90, axis = axis001)
 
 // create a single corner of the bin
-lipSingleWidthCorner = revolve({ angle = 90, axis = axis001 }, lipFace(plane002))
+lipSingleWidthCorner = revolve(lipFace(plane002), angle = 90, axis = axis001)
 
 // create the corners of the bin
 lipCorners000 = patternCircular3d(

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

@@ -68,7 +68,7 @@ axis000 = {
 }
 
 // create a single corner of the bin
-singleCorner = revolve({ angle = -90, axis = axis000 }, face(offsetPlane("YZ", offset = cornerRadius + binTol)))
+singleCorner = revolve(face(offsetPlane("YZ", offset = cornerRadius + binTol)), angle = -90, axis = axis000)
 
 // create the corners of the bin
 corners = patternCircular3d(

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

@@ -190,7 +190,7 @@ pipe = startSketchOn('XY')
   |> line(end = [0, -1])
   |> angledLine({ angle = 240, length = .5 }, %)
   |> close()
-  |> revolve({ axis = 'y' }, %)
+  |> revolve(axis = 'y')
   |> appearance(color = "#7b79d7")
 
 // Sketch and extrude the wall

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

@@ -32,4 +32,4 @@ pipeProfile = outerProfile
   |> hole(innerProfile, %)
 
 // revolve the pipe profile at the desired angle
-pipe = revolve({ axis = "Y", angle = bendAngle }, pipeProfile)
+pipe = revolve(pipeProfile, axis = "Y", angle = bendAngle)

public/kcl-samples/pipe/main.kcl

@@ -33,4 +33,4 @@ pipeSketch = startSketchOn('XY')
   |> close()
 
 // Revolve the sketch to create the pipe
-pipe = revolve({ axis = 'y' }, pipeSketch)
+pipe = revolve(pipeSketch, axis = 'y')

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

@@ -30,7 +30,8 @@ sketch001 = startSketchOn("-YZ")
   |> yLine(endAbsolute = segEndY(seg01))
   |> angledLineToY({ angle = 180 - 60, to = 0 }, %)
   |> close()
-part001 = revolve({
+part001 = revolve(
+  sketch001,
   angle = 90,
   axis = {
     custom = {
@@ -38,7 +39,7 @@ part001 = revolve({
       origin = [0.0, height + .0001]
     }
   }
-}, sketch001)
+)
 
 sketch002 = startSketchOn('-YZ')
   |> startProfileAt([wallsWidth / 2, 0], %)

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

@@ -39,7 +39,7 @@ DATA;
 #23 = VERTEX_POINT('NONE', #22);
 #24 = CARTESIAN_POINT('NONE', (0.009555193704377126, 0.0381, 0.01030836525700516));
 #25 = VERTEX_POINT('NONE', #24);
-#26 = CARTESIAN_POINT('NONE', (0.011810999999999978, 0, -0.007619999999999995));
+#26 = CARTESIAN_POINT('NONE', (0.011810999999999981, 0, -0.0076199999999999974));
 #27 = VERTEX_POINT('NONE', #26);
 #28 = CARTESIAN_POINT('NONE', (0.0037719, 0, -0));
 #29 = VERTEX_POINT('NONE', #28);
@@ -95,7 +95,7 @@ DATA;
 #63 = AXIS2_PLACEMENT_3D('NONE', #62, #61, #60);
 #64 = CIRCLE('NONE', #63, 0.00762);
 #65 = CARTESIAN_POINT('NONE', (-0.008420618915550801, 0.0381, -0.011114374012594288));
-#66 = CARTESIAN_POINT('NONE', (-0.016775317593923766, 0.01905, -0.003827032886274202));
+#66 = CARTESIAN_POINT('NONE', (-0.016775317593923773, 0.01905, -0.003827032886274202));
 #67 = CARTESIAN_POINT('NONE', (-0.012407746826993343, -0, 0.006362700000000004));
 #68 = (
   BOUNDED_CURVE()
@@ -106,18 +106,18 @@ DATA;
   RATIONAL_B_SPLINE_CURVE((1, 1, 1))
   REPRESENTATION_ITEM('NONE')
 );
-#69 = DIRECTION('NONE', (-0.8660254037844387, 0, -0.49999999999999967));
+#69 = DIRECTION('NONE', (-0.8660254037844388, 0, -0.4999999999999997));
 #70 = DIRECTION('NONE', (0, 1, 0));
-#71 = CARTESIAN_POINT('NONE', (-0.005808633250155917, -0, 0.010172700000000003));
+#71 = CARTESIAN_POINT('NONE', (-0.0058086332501559165, -0, 0.010172700000000003));
 #72 = AXIS2_PLACEMENT_3D('NONE', #71, #70, #69);
-#73 = CIRCLE('NONE', #72, 0.007620000000000003);
+#73 = CIRCLE('NONE', #72, 0.007620000000000002);
 #74 = DIRECTION('NONE', (-0.3420201433256678, 0, 0.9396926207859089));
 #75 = DIRECTION('NONE', (0, 1.0000000000000002, -0));
 #76 = CARTESIAN_POINT('NONE', (-0.004068275783674349, 0.0381, -0.023072338489143286));
 #77 = AXIS2_PLACEMENT_3D('NONE', #76, #75, #74);
 #78 = CIRCLE('NONE', #77, 0.012725399999999994);
 #79 = CARTESIAN_POINT('NONE', (0.004111453664630743, 0.0381, -0.013324116532677054));
-#80 = CARTESIAN_POINT('NONE', (-0.006681894987404381, 0.01905, -0.01585590553916532));
+#80 = CARTESIAN_POINT('NONE', (-0.006681894987404388, 0.01905, -0.01585590553916532));
 #81 = CARTESIAN_POINT('NONE', (-0.012407746826993356, -0, -0.006362699999999989));
 #82 = (
   BOUNDED_CURVE()
@@ -128,18 +128,18 @@ DATA;
   RATIONAL_B_SPLINE_CURVE((1, 1, 1))
   REPRESENTATION_ITEM('NONE')
 );
-#83 = DIRECTION('NONE', (0.8660254037844382, 0, -0.5000000000000007));
+#83 = DIRECTION('NONE', (0.8660254037844384, 0, -0.5000000000000007));
-#84 = DIRECTION('NONE', (0, -0.9999999999999998, 0));
+#84 = DIRECTION('NONE', (0, -1.0000000000000002, 0));
-#85 = CARTESIAN_POINT('NONE', (-0.023428266500311844, -0, 0.00000000000000001687538997430238));
+#85 = CARTESIAN_POINT('NONE', (-0.02342826650031185, -0, 0.00000000000000001865174681370263));
 #86 = AXIS2_PLACEMENT_3D('NONE', #85, #84, #83);
-#87 = CIRCLE('NONE', #86, 0.012725399999999994);
+#87 = CIRCLE('NONE', #86, 0.012725400000000001);
 #88 = DIRECTION('NONE', (-0.6427876096865395, 0, -0.766044443118978));
 #89 = DIRECTION('NONE', (0, -1.0000000000000002, -0));
 #90 = CARTESIAN_POINT('NONE', (0.009009495250442175, 0.0381, -0.0074868578761104415));
 #91 = AXIS2_PLACEMENT_3D('NONE', #90, #89, #88);
 #92 = CIRCLE('NONE', #91, 0.007620000000000001);
 #93 = CARTESIAN_POINT('NONE', (0.013907536836253597, 0.0381, -0.0016495992195438261));
-#94 = CARTESIAN_POINT('NONE', (0.011837890161758862, 0.01905, -0.0125903677404439));
+#94 = CARTESIAN_POINT('NONE', (0.011837890161758855, 0.01905, -0.0125903677404439));
 #95 = CARTESIAN_POINT('NONE', (0.0007904803266814893, -0, -0.013982699999999994));
 #96 = (
   BOUNDED_CURVE()
@@ -150,19 +150,19 @@ DATA;
   RATIONAL_B_SPLINE_CURVE((1, 1, 1))
   REPRESENTATION_ITEM('NONE')
 );
-#97 = DIRECTION('NONE', (0.8660254037844388, -0, -0.49999999999999956));
+#97 = DIRECTION('NONE', (0.866025403784439, -0, -0.4999999999999996));
-#98 = DIRECTION('NONE', (0, 0.9999999999999999, 0));
+#98 = DIRECTION('NONE', (0, 1, 0));
-#99 = CARTESIAN_POINT('NONE', (-0.005808633250155936, 0, -0.010172699999999996));
+#99 = CARTESIAN_POINT('NONE', (-0.0058086332501559364, 0, -0.010172699999999996));
 #100 = AXIS2_PLACEMENT_3D('NONE', #99, #98, #97);
-#101 = CIRCLE('NONE', #100, 0.007620000000000001);
+#101 = CIRCLE('NONE', #100, 0.00762);
 #102 = DIRECTION('NONE', (-0.6427876096865413, 0, -0.7660444431189763));
 #103 = DIRECTION('NONE', (0, 0.9999999999999999, 0));
 #104 = CARTESIAN_POINT('NONE', (0.022087266284558753, 0.0381, 0.008098622736922445));
 #105 = AXIS2_PLACEMENT_3D('NONE', #104, #103, #102);
 #106 = CIRCLE('NONE', #105, 0.012725400000000064);
 #107 = CARTESIAN_POINT('NONE', (0.009555193704377126, 0.0381, 0.01030836525700516));
-#108 = CARTESIAN_POINT('NONE', (0.017208488154790785, 0.01905, 0.00216522897437961));
+#108 = CARTESIAN_POINT('NONE', (0.01720848815479078, 0.01905, 0.0021652289743796134));
-#109 = CARTESIAN_POINT('NONE', (0.011810999999999978, -0, -0.007619999999999995));
+#109 = CARTESIAN_POINT('NONE', (0.011810999999999981, -0, -0.0076199999999999974));
 #110 = (
   BOUNDED_CURVE()
   B_SPLINE_CURVE(2, (#107, #108, #109), .UNSPECIFIED., .F., .F.)
@@ -172,11 +172,11 @@ DATA;
   RATIONAL_B_SPLINE_CURVE((1, 1, 1))
   REPRESENTATION_ITEM('NONE')
 );
-#111 = DIRECTION('NONE', (-0.000000000000002373054384915535, 0, 1));
+#111 = DIRECTION('NONE', (-0.0000000000000018146886472883515, 0, 1));
 #112 = DIRECTION('NONE', (-0, -1, 0));
-#113 = CARTESIAN_POINT('NONE', (0.011811000000000009, -0, -0.02034540000000004));
+#113 = CARTESIAN_POINT('NONE', (0.011811000000000004, -0, -0.020345400000000034));
 #114 = AXIS2_PLACEMENT_3D('NONE', #113, #112, #111);
-#115 = CIRCLE('NONE', #114, 0.012725400000000046);
+#115 = CIRCLE('NONE', #114, 0.012725400000000036);
 #116 = DIRECTION('NONE', (0, 1, -0));
 #117 = VECTOR('NONE', #116, 1);
 #118 = CARTESIAN_POINT('NONE', (0.0037719, -0, 0));
@@ -256,14 +256,14 @@ DATA;
 );
 #177 = CARTESIAN_POINT('NONE', (0.0007904803266815029, -0, 0.013982700000000004));
 #178 = CARTESIAN_POINT('NONE', (-0.0030195196733185, -0, 0.02058181357683743));
-#179 = CARTESIAN_POINT('NONE', (-0.009618633250155922, -0, 0.01677181357683742));
+#179 = CARTESIAN_POINT('NONE', (-0.009618633250155923, -0, 0.01677181357683742));
 #180 = CARTESIAN_POINT('NONE', (-0.01621774682699334, -0, 0.012961813576837417));
 #181 = CARTESIAN_POINT('NONE', (-0.012407746826993343, -0, 0.006362700000000004));
 #182 = CARTESIAN_POINT('NONE', (-0.010343463710053215, 0.01905, 0.013844340424891662));
 #183 = CARTESIAN_POINT('NONE', (-0.01917915036563614, 0.01905, 0.017060267366826944));
-#184 = CARTESIAN_POINT('NONE', (-0.02239507730757142, 0.01905, 0.008224580711244014));
+#184 = CARTESIAN_POINT('NONE', (-0.022395077307571426, 0.01905, 0.008224580711244014));
 #185 = CARTESIAN_POINT('NONE', (-0.025611004249506707, 0.01905, -0.000611105944338923));
-#186 = CARTESIAN_POINT('NONE', (-0.016775317593923766, 0.01905, -0.003827032886274202));
+#186 = CARTESIAN_POINT('NONE', (-0.016775317593923773, 0.01905, -0.003827032886274202));
 #187 = CARTESIAN_POINT('NONE', (-0.01363300589983399, 0.0381, 0.0032065415281829547));
 #188 = CARTESIAN_POINT('NONE', (-0.020793463670222608, 0.0381, 0.0006003480360413621));
 #189 = CARTESIAN_POINT('NONE', (-0.018187270178081014, 0.0381, -0.00656010973434726));
@@ -278,12 +278,12 @@ DATA;
   REPRESENTATION_ITEM('NONE')
   SURFACE()
 );
-#193 = CARTESIAN_POINT('NONE', (-0.012407746826993344, -0, 0.006362700000000004));
+#193 = CARTESIAN_POINT('NONE', (-0.012407746826993343, -0, 0.006362700000000004));
-#194 = CARTESIAN_POINT('NONE', (-0.00873424026922052, -0, -0.000000000000000004726054498244314));
+#194 = CARTESIAN_POINT('NONE', (-0.008734240269220523, -0, -0.000000000000000004726054498244314));
 #195 = CARTESIAN_POINT('NONE', (-0.012407746826993356, -0, -0.006362699999999989));
-#196 = CARTESIAN_POINT('NONE', (-0.016775317593923766, 0.01905, -0.003827032886274204));
+#196 = CARTESIAN_POINT('NONE', (-0.016775317593923773, 0.01905, -0.003827032886274204));
-#197 = CARTESIAN_POINT('NONE', (-0.008256169858566881, 0.019050000000000004, -0.006927749083260438));
+#197 = CARTESIAN_POINT('NONE', (-0.008256169858566887, 0.019050000000000004, -0.006927749083260438));
-#198 = CARTESIAN_POINT('NONE', (-0.006681894987404381, 0.01905, -0.01585590553916532));
+#198 = CARTESIAN_POINT('NONE', (-0.006681894987404388, 0.01905, -0.01585590553916532));
 #199 = CARTESIAN_POINT('NONE', (-0.008420618915550801, 0.0381, -0.011114374012594288));
 #200 = CARTESIAN_POINT('NONE', (-0.0015166849060552505, 0.0381, -0.008601547533799802));
 #201 = CARTESIAN_POINT('NONE', (0.004111453664630743, 0.0381, -0.013324116532677054));
@@ -298,14 +298,14 @@ DATA;
 );
 #203 = CARTESIAN_POINT('NONE', (-0.012407746826993355, -0, -0.006362699999999989));
 #204 = CARTESIAN_POINT('NONE', (-0.016217746826993354, -0, -0.012961813576837412));
-#205 = CARTESIAN_POINT('NONE', (-0.009618633250155937, -0, -0.01677181357683742));
+#205 = CARTESIAN_POINT('NONE', (-0.009618633250155936, -0, -0.01677181357683742));
-#206 = CARTESIAN_POINT('NONE', (-0.003019519673318509, -0, -0.020581813576837412));
+#206 = CARTESIAN_POINT('NONE', (-0.0030195196733185095, -0, -0.020581813576837412));
 #207 = CARTESIAN_POINT('NONE', (0.0007904803266814893, -0, -0.013982699999999994));
-#208 = CARTESIAN_POINT('NONE', (-0.006681894987404382, 0.01905, -0.01585590553916532));
+#208 = CARTESIAN_POINT('NONE', (-0.006681894987404389, 0.01905, -0.01585590553916532));
-#209 = CARTESIAN_POINT('NONE', (-0.0050491260880436714, 0.019049999999999997, -0.02511579811374694));
+#209 = CARTESIAN_POINT('NONE', (-0.005049126088043679, 0.019049999999999997, -0.02511579811374694));
-#210 = CARTESIAN_POINT('NONE', (0.0042107664865379535, 0.01905, -0.02348302921438623));
+#210 = CARTESIAN_POINT('NONE', (0.0042107664865379466, 0.01905, -0.02348302921438623));
-#211 = CARTESIAN_POINT('NONE', (0.01347065906111957, 0.019049999999999997, -0.02185026031502552));
+#211 = CARTESIAN_POINT('NONE', (0.013470659061119567, 0.019049999999999997, -0.02185026031502552));
-#212 = CARTESIAN_POINT('NONE', (0.011837890161758862, 0.01905, -0.0125903677404439));
+#212 = CARTESIAN_POINT('NONE', (0.011837890161758855, 0.01905, -0.0125903677404439));
 #213 = CARTESIAN_POINT('NONE', (0.004111453664630743, 0.0381, -0.013324116532677054));
 #214 = CARTESIAN_POINT('NONE', (0.009948712321197359, 0.0381, -0.018222158118488478));
 #215 = CARTESIAN_POINT('NONE', (0.014846753907008787, 0.0381, -0.012384899461921867));
@@ -320,12 +320,12 @@ DATA;
   REPRESENTATION_ITEM('NONE')
   SURFACE()
 );
-#219 = CARTESIAN_POINT('NONE', (0.0007904803266814876, -0, -0.013982699999999994));
+#219 = CARTESIAN_POINT('NONE', (0.0007904803266814854, -0, -0.013982699999999997));
-#220 = CARTESIAN_POINT('NONE', (0.0044639868844543245, -0, -0.007620000000000015));
+#220 = CARTESIAN_POINT('NONE', (0.004463986884454323, -0, -0.007620000000000017));
-#221 = CARTESIAN_POINT('NONE', (0.011810999999999978, -0, -0.007619999999999995));
+#221 = CARTESIAN_POINT('NONE', (0.011810999999999981, -0, -0.0076199999999999974));
-#222 = CARTESIAN_POINT('NONE', (0.011837890161758862, 0.01905, -0.0125903677404439));
+#222 = CARTESIAN_POINT('NONE', (0.011837890161758858, 0.01905, -0.012590367740443899));
-#223 = CARTESIAN_POINT('NONE', (0.010263615290596393, 0.019049999999999994, -0.0036622112845390324));
+#223 = CARTESIAN_POINT('NONE', (0.01026361529059639, 0.019049999999999994, -0.0036622112845390306));
-#224 = CARTESIAN_POINT('NONE', (0.017208488154790785, 0.01905, 0.00216522897437961));
+#224 = CARTESIAN_POINT('NONE', (0.01720848815479078, 0.01905, 0.0021652289743796134));
 #225 = CARTESIAN_POINT('NONE', (0.013907536836253597, 0.0381, -0.0016495992195438261));
 #226 = CARTESIAN_POINT('NONE', (0.00827939826556762, 0.038099999999999995, 0.0030729697793334247));
 #227 = CARTESIAN_POINT('NONE', (0.009555193704377126, 0.0381, 0.01030836525700516));

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

@@ -161,20 +161,20 @@ DATA;
 #145 = VERTEX_POINT('NONE', #144);
 #146 = CARTESIAN_POINT('NONE', (-0.0186055, 0.3859187599240827, -0.2649386954314825));
 #147 = VERTEX_POINT('NONE', #146);
-#148 = DIRECTION('NONE', (-0.08428666399522529, 0, 0.9964415478454097));
+#148 = DIRECTION('NONE', (-0.0842866639952229, 0, 0.99644154784541));
 #149 = DIRECTION('NONE', (0, 1, -0));
-#150 = CARTESIAN_POINT('NONE', (0.10987218406621378, 0, 0.024039844328695128));
+#150 = CARTESIAN_POINT('NONE', (0.10987218406621377, 0, 0.02403984432869508));
 #151 = AXIS2_PLACEMENT_3D('NONE', #150, #149, #148);
-#152 = CIRCLE('NONE', #151, 0.007737689870496104);
+#152 = CIRCLE('NONE', #151, 0.007737689870496156);
 #153 = DIRECTION('NONE', (0, 1, 0));
 #154 = VECTOR('NONE', #153, 1);
 #155 = CARTESIAN_POINT('NONE', (0.11484587524256575, 0, 0.029967258656566655));
 #156 = LINE('NONE', #155, #154);
-#157 = DIRECTION('NONE', (-0.08428666399522529, 0, 0.9964415478454097));
+#157 = DIRECTION('NONE', (-0.0842866639952229, 0, 0.99644154784541));
 #158 = DIRECTION('NONE', (0, 1, -0));
-#159 = CARTESIAN_POINT('NONE', (0.10987218406621378, 0.003175, 0.024039844328695128));
+#159 = CARTESIAN_POINT('NONE', (0.10987218406621377, 0.003175, 0.02403984432869508));
 #160 = AXIS2_PLACEMENT_3D('NONE', #159, #158, #157);
-#161 = CIRCLE('NONE', #160, 0.007737689870496104);
+#161 = CIRCLE('NONE', #160, 0.007737689870496156);
 #162 = DIRECTION('NONE', (0, 1, 0));
 #163 = VECTOR('NONE', #162, 1);
 #164 = CARTESIAN_POINT('NONE', (0.10922000000000001, 0, 0.031750000000000014));
@@ -1183,11 +1183,11 @@ DATA;
 #1103 = EDGE_CURVE('NONE', #145, #147, #987, .T.);
 #1104 = EDGE_CURVE('NONE', #145, #145, #992, .T.);
 #1105 = EDGE_CURVE('NONE', #147, #147, #997, .T.);
-#1106 = CARTESIAN_POINT('NONE', (0.10987218406621378, 0.0015874999999999997, 0.024039844328695128));
+#1106 = CARTESIAN_POINT('NONE', (0.10987218406621377, 0.0015874999999999997, 0.02403984432869508));
 #1107 = DIRECTION('NONE', (0, 1, -0));
-#1108 = DIRECTION('NONE', (-0.08428666399522529, 0, 0.9964415478454097));
+#1108 = DIRECTION('NONE', (-0.0842866639952229, 0, 0.99644154784541));
 #1109 = AXIS2_PLACEMENT_3D('NONE', #1106, #1107, #1108);
-#1110 = CYLINDRICAL_SURFACE('NONE', #1109, 0.007737689870496104);
+#1110 = CYLINDRICAL_SURFACE('NONE', #1109, 0.007737689870496156);
 #1111 = CARTESIAN_POINT('NONE', (0.12954000000000004, 0.0015874999999999997, 0.04747903462626646));
 #1112 = DIRECTION('NONE', (0, -1.0000000000000002, -0));
 #1113 = DIRECTION('NONE', (-0.6427876096865407, 0, -0.766044443118977));

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

@@ -131,9 +131,9 @@ DATA;
 #115 = VERTEX_POINT('NONE', #114);
 #116 = CARTESIAN_POINT('NONE', (-0.0248334258488368, 0, -0.02299722453489577));
 #117 = VERTEX_POINT('NONE', #116);
-#118 = CARTESIAN_POINT('NONE', (-0.025166574151163194, 0, -0.013002775465104229));
+#118 = CARTESIAN_POINT('NONE', (-0.025166574151163194, 0, -0.013002775465104227));
 #119 = VERTEX_POINT('NONE', #118);
-#120 = CARTESIAN_POINT('NONE', (-0.025166574151163194, 0.0035, -0.013002775465104229));
+#120 = CARTESIAN_POINT('NONE', (-0.025166574151163194, 0.0035, -0.013002775465104227));
 #121 = VERTEX_POINT('NONE', #120);
 #122 = CARTESIAN_POINT('NONE', (-0.0248334258488368, 0.0035, -0.02299722453489577));
 #123 = VERTEX_POINT('NONE', #122);
@@ -778,20 +778,20 @@ DATA;
 #762 = VECTOR('NONE', #761, 1);
 #763 = CARTESIAN_POINT('NONE', (-0.055, 0.0035, -0.005000000000000004));
 #764 = LINE('NONE', #763, #762);
-#765 = DIRECTION('NONE', (0.033314830232639266, 0, -0.9994449069791544));
+#765 = DIRECTION('NONE', (0.033314830232639946, 0, -0.9994449069791542));
-#766 = DIRECTION('NONE', (0, -1.0000000000000002, 0));
+#766 = DIRECTION('NONE', (0, -0.9999999999999999, 0));
-#767 = CARTESIAN_POINT('NONE', (-0.024999999999999998, -0, -0.017999999999999995));
+#767 = CARTESIAN_POINT('NONE', (-0.025, -0, -0.01799999999999999));
 #768 = AXIS2_PLACEMENT_3D('NONE', #767, #766, #765);
-#769 = CIRCLE('NONE', #768, 0.005000000000000003);
+#769 = CIRCLE('NONE', #768, 0.005000000000000007);
 #770 = DIRECTION('NONE', (0, 1, 0));
 #771 = VECTOR('NONE', #770, 1);
-#772 = CARTESIAN_POINT('NONE', (-0.025166574151163194, 0, -0.013002775465104229));
+#772 = CARTESIAN_POINT('NONE', (-0.025166574151163194, 0, -0.013002775465104227));
 #773 = LINE('NONE', #772, #771);
-#774 = DIRECTION('NONE', (0.033314830232639266, 0, -0.9994449069791544));
+#774 = DIRECTION('NONE', (0.033314830232639946, 0, -0.9994449069791542));
-#775 = DIRECTION('NONE', (0, -1.0000000000000002, 0));
+#775 = DIRECTION('NONE', (0, -0.9999999999999999, 0));
-#776 = CARTESIAN_POINT('NONE', (-0.024999999999999998, 0.0035, -0.017999999999999995));
+#776 = CARTESIAN_POINT('NONE', (-0.025, 0.0035, -0.01799999999999999));
 #777 = AXIS2_PLACEMENT_3D('NONE', #776, #775, #774);
-#778 = CIRCLE('NONE', #777, 0.005000000000000003);
+#778 = CIRCLE('NONE', #777, 0.005000000000000007);
 #779 = DIRECTION('NONE', (0, 1, 0));
 #780 = VECTOR('NONE', #779, 1);
 #781 = CARTESIAN_POINT('NONE', (-0.0248334258488368, 0, -0.02299722453489577));
@@ -1209,11 +1209,11 @@ DATA;
 #1193 = DIRECTION('NONE', (0, 0, 1));
 #1194 = AXIS2_PLACEMENT_3D('NONE', #1192, #1193, $);
 #1195 = PLANE('NONE', #1194);
-#1196 = CARTESIAN_POINT('NONE', (-0.024999999999999998, 0.00175, -0.017999999999999995));
+#1196 = CARTESIAN_POINT('NONE', (-0.025, 0.00175, -0.01799999999999999));
-#1197 = DIRECTION('NONE', (0, -1.0000000000000002, 0));
+#1197 = DIRECTION('NONE', (0, -0.9999999999999999, 0));
-#1198 = DIRECTION('NONE', (0.033314830232639266, 0, -0.9994449069791544));
+#1198 = DIRECTION('NONE', (0.033314830232639946, 0, -0.9994449069791542));
 #1199 = AXIS2_PLACEMENT_3D('NONE', #1196, #1197, #1198);
-#1200 = CYLINDRICAL_SURFACE('NONE', #1199, 0.005000000000000003);
+#1200 = CYLINDRICAL_SURFACE('NONE', #1199, 0.005000000000000007);
 #1201 = CARTESIAN_POINT('NONE', (-0.04016657415116319, 0.00175, -0.013502775465104222));
 #1202 = DIRECTION('NONE', (0.033314830232638176, -0, -0.9994449069791543));
 #1203 = AXIS2_PLACEMENT_3D('NONE', #1201, #1202, $);

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

@@ -19,27 +19,27 @@ DATA;
 );
 #4 = CARTESIAN_POINT('NONE', (0.05841999999999999, 0.16256, -0.008255));
 #5 = VERTEX_POINT('NONE', #4);
-#6 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.1493519999999996, -0.008255));
+#6 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.14935199999999962, -0.008255));
 #7 = VERTEX_POINT('NONE', #6);
-#8 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.1493519999999996, 0.008255));
+#8 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.14935199999999962, 0.008255));
 #9 = VERTEX_POINT('NONE', #8);
 #10 = CARTESIAN_POINT('NONE', (0.05841999999999999, 0.16256, 0.008255));
 #11 = VERTEX_POINT('NONE', #10);
-#12 = CARTESIAN_POINT('NONE', (0.06908799999999998, 0.1493519999999996, -0.008255));
+#12 = CARTESIAN_POINT('NONE', (0.06908799999999998, 0.14935199999999962, -0.008255));
 #13 = VERTEX_POINT('NONE', #12);
-#14 = CARTESIAN_POINT('NONE', (0.06908799999999998, 0.1493519999999996, 0.008255));
+#14 = CARTESIAN_POINT('NONE', (0.06908799999999998, 0.14935199999999962, 0.008255));
 #15 = VERTEX_POINT('NONE', #14);
-#16 = CARTESIAN_POINT('NONE', (0.09042399999999998, 0.1308099999999996, -0.008255));
+#16 = CARTESIAN_POINT('NONE', (0.09042399999999998, 0.13080999999999965, -0.008255));
 #17 = VERTEX_POINT('NONE', #16);
-#18 = CARTESIAN_POINT('NONE', (0.09042399999999998, 0.1308099999999996, 0.008255));
+#18 = CARTESIAN_POINT('NONE', (0.09042399999999998, 0.13080999999999965, 0.008255));
 #19 = VERTEX_POINT('NONE', #18);
-#20 = CARTESIAN_POINT('NONE', (0.09220199999999999, 0.04064000000000004, -0.008255));
+#20 = CARTESIAN_POINT('NONE', (0.09220199999999999, 0.040640000000000044, -0.008255));
 #21 = VERTEX_POINT('NONE', #20);
-#22 = CARTESIAN_POINT('NONE', (0.09220199999999999, 0.04064000000000004, 0.008255));
+#22 = CARTESIAN_POINT('NONE', (0.09220199999999999, 0.040640000000000044, 0.008255));
 #23 = VERTEX_POINT('NONE', #22);
-#24 = CARTESIAN_POINT('NONE', (0.076962, 0.025908000000000028, -0.008255));
+#24 = CARTESIAN_POINT('NONE', (0.076962, 0.02590800000000003, -0.008255));
 #25 = VERTEX_POINT('NONE', #24);
-#26 = CARTESIAN_POINT('NONE', (0.076962, 0.025908000000000028, 0.008255));
+#26 = CARTESIAN_POINT('NONE', (0.076962, 0.02590800000000003, 0.008255));
 #27 = VERTEX_POINT('NONE', #26);
 #28 = CARTESIAN_POINT('NONE', (0.051816, 0.026416000000000033, -0.008255));
 #29 = VERTEX_POINT('NONE', #28);
@@ -473,15 +473,15 @@ DATA;
 #457 = VERTEX_POINT('NONE', #456);
 #458 = CARTESIAN_POINT('NONE', (0.056007, 0.14478, 0.000000000000000013717758655969163));
 #459 = VERTEX_POINT('NONE', #458);
-#460 = DIRECTION('NONE', (0.038433122101202255, -0.9992611746313144, 0));
+#460 = DIRECTION('NONE', (0.03843312210120234, -0.9992611746313144, 0));
 #461 = VECTOR('NONE', #460, 1);
 #462 = CARTESIAN_POINT('NONE', (0.05841999999999999, 0.16256, -0.008255));
 #463 = LINE('NONE', #462, #461);
 #464 = DIRECTION('NONE', (0, 0, 1));
 #465 = VECTOR('NONE', #464, 1);
-#466 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.1493519999999996, -0.008255));
+#466 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.14935199999999962, -0.008255));
 #467 = LINE('NONE', #466, #465);
-#468 = DIRECTION('NONE', (0.038433122101202255, -0.9992611746313144, 0));
+#468 = DIRECTION('NONE', (0.03843312210120234, -0.9992611746313144, 0));
 #469 = VECTOR('NONE', #468, 1);
 #470 = CARTESIAN_POINT('NONE', (0.05841999999999999, 0.16256, 0.008255));
 #471 = LINE('NONE', #470, #469);
@@ -491,58 +491,58 @@ DATA;
 #475 = LINE('NONE', #474, #473);
 #476 = DIRECTION('NONE', (1, 0, 0));
 #477 = VECTOR('NONE', #476, 1);
-#478 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.1493519999999996, -0.008255));
+#478 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.14935199999999962, -0.008255));
 #479 = LINE('NONE', #478, #477);
 #480 = DIRECTION('NONE', (0, 0, 1));
 #481 = VECTOR('NONE', #480, 1);
-#482 = CARTESIAN_POINT('NONE', (0.06908799999999998, 0.1493519999999996, -0.008255));
+#482 = CARTESIAN_POINT('NONE', (0.06908799999999998, 0.14935199999999962, -0.008255));
 #483 = LINE('NONE', #482, #481);
 #484 = DIRECTION('NONE', (1, 0, 0));
 #485 = VECTOR('NONE', #484, 1);
-#486 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.1493519999999996, 0.008255));
+#486 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.14935199999999962, 0.008255));
 #487 = LINE('NONE', #486, #485);
-#488 = DIRECTION('NONE', (-0.0866626263544473, 0.9962377172107816, -0));
+#488 = DIRECTION('NONE', (-0.08666262635444875, 0.9962377172107816, -0));
-#489 = DIRECTION('NONE', (0, -0, -0.9999999999999998));
+#489 = DIRECTION('NONE', (0, -0, -1));
-#490 = CARTESIAN_POINT('NONE', (0.07079178336201049, 0.12976601099190213, -0.008255));
+#490 = CARTESIAN_POINT('NONE', (0.07079178336201052, 0.12976601099190216, -0.008255));
 #491 = AXIS2_PLACEMENT_3D('NONE', #490, #489, #488);
 #492 = CIRCLE('NONE', #491, 0.01965995531963333);
 #493 = DIRECTION('NONE', (0, 0, 1));
 #494 = VECTOR('NONE', #493, 1);
-#495 = CARTESIAN_POINT('NONE', (0.09042399999999998, 0.1308099999999996, -0.008255));
+#495 = CARTESIAN_POINT('NONE', (0.09042399999999998, 0.13080999999999965, -0.008255));
 #496 = LINE('NONE', #495, #494);
-#497 = DIRECTION('NONE', (-0.0866626263544473, 0.9962377172107816, -0));
+#497 = DIRECTION('NONE', (-0.08666262635444875, 0.9962377172107816, -0));
-#498 = DIRECTION('NONE', (0, -0, -0.9999999999999998));
+#498 = DIRECTION('NONE', (0, -0, -1));
-#499 = CARTESIAN_POINT('NONE', (0.07079178336201049, 0.12976601099190213, 0.008255));
+#499 = CARTESIAN_POINT('NONE', (0.07079178336201052, 0.12976601099190216, 0.008255));
 #500 = AXIS2_PLACEMENT_3D('NONE', #499, #498, #497);
 #501 = CIRCLE('NONE', #500, 0.01965995531963333);
-#502 = DIRECTION('NONE', (0.9985890770760726, 0.05310230827711328, -0));
+#502 = DIRECTION('NONE', (0.9985890770760725, 0.05310230827711449, -0));
 #503 = DIRECTION('NONE', (-0, 0, -1));
-#504 = CARTESIAN_POINT('NONE', (-1.2575688405092589, 0.059127329905450624, -0.008255));
+#504 = CARTESIAN_POINT('NONE', (-1.2575688405092098, 0.059127329905451644, -0.008255));
 #505 = AXIS2_PLACEMENT_3D('NONE', #504, #503, #502);
-#506 = CIRCLE('NONE', #505, 1.3498974417547818);
+#506 = CIRCLE('NONE', #505, 1.3498974417547327);
 #507 = DIRECTION('NONE', (0, 0, 1));
 #508 = VECTOR('NONE', #507, 1);
-#509 = CARTESIAN_POINT('NONE', (0.09220199999999999, 0.04064000000000004, -0.008255));
+#509 = CARTESIAN_POINT('NONE', (0.09220199999999999, 0.040640000000000044, -0.008255));
 #510 = LINE('NONE', #509, #508);
-#511 = DIRECTION('NONE', (0.9985890770760726, 0.05310230827711328, -0));
+#511 = DIRECTION('NONE', (0.9985890770760725, 0.05310230827711449, -0));
 #512 = DIRECTION('NONE', (-0, 0, -1));
-#513 = CARTESIAN_POINT('NONE', (-1.2575688405092589, 0.059127329905450624, 0.008255));
+#513 = CARTESIAN_POINT('NONE', (-1.2575688405092098, 0.059127329905451644, 0.008255));
 #514 = AXIS2_PLACEMENT_3D('NONE', #513, #512, #511);
-#515 = CIRCLE('NONE', #514, 1.3498974417547818);
+#515 = CIRCLE('NONE', #514, 1.3498974417547327);
-#516 = DIRECTION('NONE', (0.9999062141747909, -0.013695358872168632, -0));
+#516 = DIRECTION('NONE', (0.9999062141747909, -0.013695358872166266, -0));
 #517 = DIRECTION('NONE', (0, 0, -1.0000000000000002));
-#518 = CARTESIAN_POINT('NONE', (0.07726374957352439, 0.04084460388945755, -0.008255));
+#518 = CARTESIAN_POINT('NONE', (0.07726374957352439, 0.04084460388945753, -0.008255));
 #519 = AXIS2_PLACEMENT_3D('NONE', #518, #517, #516);
-#520 = CIRCLE('NONE', #519, 0.014939651554024935);
+#520 = CIRCLE('NONE', #519, 0.014939651554024921);
 #521 = DIRECTION('NONE', (0, 0, 1));
 #522 = VECTOR('NONE', #521, 1);
-#523 = CARTESIAN_POINT('NONE', (0.076962, 0.025908000000000028, -0.008255));
+#523 = CARTESIAN_POINT('NONE', (0.076962, 0.02590800000000003, -0.008255));
 #524 = LINE('NONE', #523, #522);
-#525 = DIRECTION('NONE', (0.9999062141747909, -0.013695358872168632, -0));
+#525 = DIRECTION('NONE', (0.9999062141747909, -0.013695358872166266, -0));
 #526 = DIRECTION('NONE', (0, 0, -1.0000000000000002));
-#527 = CARTESIAN_POINT('NONE', (0.07726374957352439, 0.04084460388945755, 0.008255));
+#527 = CARTESIAN_POINT('NONE', (0.07726374957352439, 0.04084460388945753, 0.008255));
 #528 = AXIS2_PLACEMENT_3D('NONE', #527, #526, #525);
-#529 = CIRCLE('NONE', #528, 0.014939651554024935);
+#529 = CIRCLE('NONE', #528, 0.014939651554024921);
 #530 = DIRECTION('NONE', (-0.9997960016298644, 0.0201978990228256, 0));
 #531 = VECTOR('NONE', #530, 1);
 #532 = CARTESIAN_POINT('NONE', (0.076962, 0.02590800000000003, -0.008255));
@@ -2369,29 +2369,29 @@ DATA;
 #2353 = EDGE_CURVE('NONE', #457, #457, #1992, .T.);
 #2354 = EDGE_CURVE('NONE', #457, #459, #1996, .T.);
 #2355 = EDGE_CURVE('NONE', #459, #459, #2001, .T.);
-#2356 = CARTESIAN_POINT('NONE', (0.05867399999999999, 0.1559559999999998, -0));
+#2356 = CARTESIAN_POINT('NONE', (0.05867399999999998, 0.15595599999999982, -0));
 #2357 = DIRECTION('NONE', (-0.9992611746313143, -0.038433122101202415, 0));
 #2358 = AXIS2_PLACEMENT_3D('NONE', #2356, #2357, $);
 #2359 = PLANE('NONE', #2358);
-#2360 = CARTESIAN_POINT('NONE', (0.06400799999999998, 0.1493519999999996, -0));
+#2360 = CARTESIAN_POINT('NONE', (0.06400799999999998, 0.14935199999999962, -0));
 #2361 = DIRECTION('NONE', (0, -1, 0));
 #2362 = AXIS2_PLACEMENT_3D('NONE', #2360, #2361, $);
 #2363 = PLANE('NONE', #2362);
-#2364 = CARTESIAN_POINT('NONE', (0.07079178336201049, 0.12976601099190213, -0));
+#2364 = CARTESIAN_POINT('NONE', (0.07079178336201052, 0.12976601099190216, -0));
-#2365 = DIRECTION('NONE', (0, -0, -0.9999999999999998));
+#2365 = DIRECTION('NONE', (0, -0, -1));
-#2366 = DIRECTION('NONE', (-0.0866626263544473, 0.9962377172107816, -0));
+#2366 = DIRECTION('NONE', (-0.08666262635444875, 0.9962377172107816, -0));
 #2367 = AXIS2_PLACEMENT_3D('NONE', #2364, #2365, #2366);
 #2368 = CYLINDRICAL_SURFACE('NONE', #2367, 0.01965995531963333);
-#2369 = CARTESIAN_POINT('NONE', (-1.2575688405092589, 0.059127329905450624, -0));
+#2369 = CARTESIAN_POINT('NONE', (-1.2575688405092098, 0.059127329905451644, -0));
 #2370 = DIRECTION('NONE', (-0, 0, -1));
-#2371 = DIRECTION('NONE', (0.9985890770760726, 0.05310230827711328, -0));
+#2371 = DIRECTION('NONE', (0.9985890770760725, 0.05310230827711449, -0));
 #2372 = AXIS2_PLACEMENT_3D('NONE', #2369, #2370, #2371);
-#2373 = CYLINDRICAL_SURFACE('NONE', #2372, 1.3498974417547818);
+#2373 = CYLINDRICAL_SURFACE('NONE', #2372, 1.3498974417547327);
-#2374 = CARTESIAN_POINT('NONE', (0.07726374957352439, 0.04084460388945755, -0));
+#2374 = CARTESIAN_POINT('NONE', (0.07726374957352439, 0.04084460388945753, -0));
 #2375 = DIRECTION('NONE', (0, 0, -1.0000000000000002));
-#2376 = DIRECTION('NONE', (0.9999062141747909, -0.013695358872168632, -0));
+#2376 = DIRECTION('NONE', (0.9999062141747909, -0.013695358872166266, -0));
 #2377 = AXIS2_PLACEMENT_3D('NONE', #2374, #2375, #2376);
-#2378 = CYLINDRICAL_SURFACE('NONE', #2377, 0.014939651554024935);
+#2378 = CYLINDRICAL_SURFACE('NONE', #2377, 0.014939651554024921);
 #2379 = CARTESIAN_POINT('NONE', (0.064389, 0.026162000000000036, -0));
 #2380 = DIRECTION('NONE', (0.020197899022825535, 0.9997960016298644, -0));
 #2381 = AXIS2_PLACEMENT_3D('NONE', #2379, #2380, $);

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

@@ -17,213 +17,213 @@ DATA;
   GLOBAL_UNIT_ASSIGNED_CONTEXT((#1))
   REPRESENTATION_CONTEXT('', '3D')
 );
-#4 = CARTESIAN_POINT('NONE', (-0.000000000000000006221205739668554, -0.0508, -0));
+#4 = CARTESIAN_POINT('NONE', (0, 0.0508, -0));
 #5 = VERTEX_POINT('NONE', #4);
-#6 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0));
+#6 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0));
 #7 = VERTEX_POINT('NONE', #6);
-#8 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0.6096));
+#8 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0.6096));
 #9 = VERTEX_POINT('NONE', #8);
-#10 = CARTESIAN_POINT('NONE', (-0.000000000000000006221205739668554, -0.0508, -0.6096));
+#10 = CARTESIAN_POINT('NONE', (0, 0.0508, -0.6096));
 #11 = VERTEX_POINT('NONE', #10);
-#12 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0));
+#12 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0));
 #13 = VERTEX_POINT('NONE', #12);
-#14 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0.6096));
+#14 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0.6096));
 #15 = VERTEX_POINT('NONE', #14);
-#16 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0));
+#16 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0));
 #17 = VERTEX_POINT('NONE', #16);
-#18 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0.6096));
+#18 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0.6096));
 #19 = VERTEX_POINT('NONE', #18);
-#20 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0));
+#20 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0));
 #21 = VERTEX_POINT('NONE', #20);
-#22 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0.6096));
+#22 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0.6096));
 #23 = VERTEX_POINT('NONE', #22);
-#24 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0));
+#24 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0));
 #25 = VERTEX_POINT('NONE', #24);
-#26 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0.6096));
+#26 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0.6096));
 #27 = VERTEX_POINT('NONE', #26);
-#28 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0));
+#28 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0));
 #29 = VERTEX_POINT('NONE', #28);
-#30 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0.6096));
+#30 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0.6096));
 #31 = VERTEX_POINT('NONE', #30);
-#32 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0));
+#32 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0));
 #33 = VERTEX_POINT('NONE', #32);
-#34 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0.6096));
+#34 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0.6096));
 #35 = VERTEX_POINT('NONE', #34);
-#36 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0));
+#36 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0));
 #37 = VERTEX_POINT('NONE', #36);
-#38 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0.6096));
+#38 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0.6096));
 #39 = VERTEX_POINT('NONE', #38);
-#40 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0));
+#40 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0));
 #41 = VERTEX_POINT('NONE', #40);
-#42 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0.6096));
+#42 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0.6096));
 #43 = VERTEX_POINT('NONE', #42);
-#44 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0));
+#44 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0));
 #45 = VERTEX_POINT('NONE', #44);
-#46 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0.6096));
+#46 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0.6096));
 #47 = VERTEX_POINT('NONE', #46);
-#48 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0));
+#48 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0));
 #49 = VERTEX_POINT('NONE', #48);
-#50 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0.6096));
+#50 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0.6096));
 #51 = VERTEX_POINT('NONE', #50);
-#52 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0));
+#52 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0));
 #53 = VERTEX_POINT('NONE', #52);
-#54 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0.6096));
+#54 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0.6096));
 #55 = VERTEX_POINT('NONE', #54);
-#56 = DIRECTION('NONE', (-1, 0.00000000000000020517070925003855, 0));
+#56 = DIRECTION('NONE', (1, 0, 0));
 #57 = VECTOR('NONE', #56, 1);
-#58 = CARTESIAN_POINT('NONE', (-0.000000000000000006221205739668554, -0.0508, -0));
+#58 = CARTESIAN_POINT('NONE', (0, 0.0508, -0));
 #59 = LINE('NONE', #58, #57);
 #60 = DIRECTION('NONE', (0, 0, -1));
 #61 = VECTOR('NONE', #60, 1);
-#62 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0));
+#62 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0));
 #63 = LINE('NONE', #62, #61);
-#64 = DIRECTION('NONE', (-1, 0.00000000000000020517070925003855, 0));
+#64 = DIRECTION('NONE', (1, 0, 0));
 #65 = VECTOR('NONE', #64, 1);
-#66 = CARTESIAN_POINT('NONE', (-0.000000000000000006221205739668554, -0.0508, -0.6096));
+#66 = CARTESIAN_POINT('NONE', (0, 0.0508, -0.6096));
 #67 = LINE('NONE', #66, #65);
 #68 = DIRECTION('NONE', (0, 0, -1));
 #69 = VECTOR('NONE', #68, 1);
-#70 = CARTESIAN_POINT('NONE', (-0.000000000000000006221205739668554, -0.0508, -0));
+#70 = CARTESIAN_POINT('NONE', (0, 0.0508, -0));
 #71 = LINE('NONE', #70, #69);
-#72 = DIRECTION('NONE', (0, 1, 0));
+#72 = DIRECTION('NONE', (0, -1, 0));
 #73 = VECTOR('NONE', #72, 1);
-#74 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0));
+#74 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0));
 #75 = LINE('NONE', #74, #73);
 #76 = DIRECTION('NONE', (0, 0, -1));
 #77 = VECTOR('NONE', #76, 1);
-#78 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0));
+#78 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0));
 #79 = LINE('NONE', #78, #77);
-#80 = DIRECTION('NONE', (0, 1, 0));
+#80 = DIRECTION('NONE', (0, -1, 0));
 #81 = VECTOR('NONE', #80, 1);
-#82 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0.6096));
+#82 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0.6096));
 #83 = LINE('NONE', #82, #81);
-#84 = DIRECTION('NONE', (1, -0.0000000000000004610713913357407, 0));
+#84 = DIRECTION('NONE', (-1, 0.00000000000000023053569566787033, 0));
 #85 = VECTOR('NONE', #84, 1);
-#86 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0));
+#86 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0));
 #87 = LINE('NONE', #86, #85);
 #88 = DIRECTION('NONE', (0, 0, -1));
 #89 = VECTOR('NONE', #88, 1);
-#90 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0));
+#90 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0));
 #91 = LINE('NONE', #90, #89);
-#92 = DIRECTION('NONE', (1, -0.0000000000000004610713913357407, 0));
+#92 = DIRECTION('NONE', (-1, 0.00000000000000023053569566787033, 0));
 #93 = VECTOR('NONE', #92, 1);
-#94 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0.6096));
+#94 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0.6096));
 #95 = LINE('NONE', #94, #93);
-#96 = DIRECTION('NONE', (0.00000000000000006501542164183402, 1, 0));
+#96 = DIRECTION('NONE', (0.00000000000000006501542164183402, -1, 0));
 #97 = VECTOR('NONE', #96, 1);
-#98 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0));
+#98 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0));
 #99 = LINE('NONE', #98, #97);
 #100 = DIRECTION('NONE', (0, 0, -1));
 #101 = VECTOR('NONE', #100, 1);
-#102 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0));
+#102 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0));
 #103 = LINE('NONE', #102, #101);
-#104 = DIRECTION('NONE', (0.00000000000000006501542164183402, 1, 0));
+#104 = DIRECTION('NONE', (0.00000000000000006501542164183402, -1, 0));
 #105 = VECTOR('NONE', #104, 1);
-#106 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0.6096));
+#106 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0.6096));
 #107 = LINE('NONE', #106, #105);
-#108 = DIRECTION('NONE', (-1, -0.00000000000000023053569566787033, 0));
+#108 = DIRECTION('NONE', (1, 0.0000000000000004610713913357407, 0));
 #109 = VECTOR('NONE', #108, 1);
-#110 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0));
+#110 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0));
 #111 = LINE('NONE', #110, #109);
 #112 = DIRECTION('NONE', (0, 0, -1));
 #113 = VECTOR('NONE', #112, 1);
-#114 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0));
+#114 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0));
 #115 = LINE('NONE', #114, #113);
-#116 = DIRECTION('NONE', (-1, -0.00000000000000023053569566787033, 0));
+#116 = DIRECTION('NONE', (1, 0.0000000000000004610713913357407, 0));
 #117 = VECTOR('NONE', #116, 1);
-#118 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0.6096));
+#118 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0.6096));
 #119 = LINE('NONE', #118, #117);
-#120 = DIRECTION('NONE', (0, 1, 0));
+#120 = DIRECTION('NONE', (0, -1, 0));
 #121 = VECTOR('NONE', #120, 1);
-#122 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0));
+#122 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0));
 #123 = LINE('NONE', #122, #121);
 #124 = DIRECTION('NONE', (0, 0, -1));
 #125 = VECTOR('NONE', #124, 1);
-#126 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0));
+#126 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0));
 #127 = LINE('NONE', #126, #125);
-#128 = DIRECTION('NONE', (0, 1, 0));
+#128 = DIRECTION('NONE', (0, -1, 0));
 #129 = VECTOR('NONE', #128, 1);
-#130 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0.6096));
+#130 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0.6096));
 #131 = LINE('NONE', #130, #129);
-#132 = DIRECTION('NONE', (1, 0, 0));
+#132 = DIRECTION('NONE', (-1, 0, 0));
 #133 = VECTOR('NONE', #132, 1);
-#134 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0));
+#134 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0));
 #135 = LINE('NONE', #134, #133);
 #136 = DIRECTION('NONE', (0, 0, -1));
 #137 = VECTOR('NONE', #136, 1);
-#138 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0));
+#138 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0));
 #139 = LINE('NONE', #138, #137);
-#140 = DIRECTION('NONE', (1, 0, 0));
+#140 = DIRECTION('NONE', (-1, 0, 0));
 #141 = VECTOR('NONE', #140, 1);
-#142 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0.6096));
+#142 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0.6096));
 #143 = LINE('NONE', #142, #141);
-#144 = DIRECTION('NONE', (0, -1, 0));
+#144 = DIRECTION('NONE', (0, 1, 0));
 #145 = VECTOR('NONE', #144, 1);
-#146 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0));
+#146 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0));
 #147 = LINE('NONE', #146, #145);
 #148 = DIRECTION('NONE', (0, 0, -1));
 #149 = VECTOR('NONE', #148, 1);
-#150 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0));
+#150 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0));
 #151 = LINE('NONE', #150, #149);
-#152 = DIRECTION('NONE', (0, -1, 0));
+#152 = DIRECTION('NONE', (0, 1, 0));
 #153 = VECTOR('NONE', #152, 1);
-#154 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0.6096));
+#154 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0.6096));
 #155 = LINE('NONE', #154, #153);
-#156 = DIRECTION('NONE', (-1, 0.00000000000000023053569566787033, 0));
+#156 = DIRECTION('NONE', (1, -0.0000000000000004610713913357407, 0));
 #157 = VECTOR('NONE', #156, 1);
-#158 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0));
+#158 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0));
 #159 = LINE('NONE', #158, #157);
 #160 = DIRECTION('NONE', (0, 0, -1));
 #161 = VECTOR('NONE', #160, 1);
-#162 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0));
+#162 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0));
 #163 = LINE('NONE', #162, #161);
-#164 = DIRECTION('NONE', (-1, 0.00000000000000023053569566787033, 0));
+#164 = DIRECTION('NONE', (1, -0.0000000000000004610713913357407, 0));
 #165 = VECTOR('NONE', #164, 1);
-#166 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0.6096));
+#166 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0.6096));
 #167 = LINE('NONE', #166, #165);
-#168 = DIRECTION('NONE', (0.00000000000000006501542164183402, -1, 0));
+#168 = DIRECTION('NONE', (0.00000000000000006501542164183402, 1, 0));
 #169 = VECTOR('NONE', #168, 1);
-#170 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0));
+#170 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0));
 #171 = LINE('NONE', #170, #169);
 #172 = DIRECTION('NONE', (0, 0, -1));
 #173 = VECTOR('NONE', #172, 1);
-#174 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0));
+#174 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0));
 #175 = LINE('NONE', #174, #173);
-#176 = DIRECTION('NONE', (0.00000000000000006501542164183402, -1, 0));
+#176 = DIRECTION('NONE', (0.00000000000000006501542164183402, 1, 0));
 #177 = VECTOR('NONE', #176, 1);
-#178 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0.6096));
+#178 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0.6096));
 #179 = LINE('NONE', #178, #177);
-#180 = DIRECTION('NONE', (1, 0.0000000000000004610713913357407, 0));
+#180 = DIRECTION('NONE', (-1, -0.00000000000000023053569566787033, 0));
 #181 = VECTOR('NONE', #180, 1);
-#182 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0));
+#182 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0));
 #183 = LINE('NONE', #182, #181);
 #184 = DIRECTION('NONE', (0, 0, -1));
 #185 = VECTOR('NONE', #184, 1);
-#186 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0));
+#186 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0));
 #187 = LINE('NONE', #186, #185);
-#188 = DIRECTION('NONE', (1, 0.0000000000000004610713913357407, 0));
+#188 = DIRECTION('NONE', (-1, -0.00000000000000023053569566787033, 0));
 #189 = VECTOR('NONE', #188, 1);
-#190 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0.6096));
+#190 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0.6096));
 #191 = LINE('NONE', #190, #189);
-#192 = DIRECTION('NONE', (0, -1, 0));
+#192 = DIRECTION('NONE', (0, 1, 0));
 #193 = VECTOR('NONE', #192, 1);
-#194 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0));
+#194 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0));
 #195 = LINE('NONE', #194, #193);
 #196 = DIRECTION('NONE', (0, 0, -1));
 #197 = VECTOR('NONE', #196, 1);
-#198 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0));
+#198 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0));
 #199 = LINE('NONE', #198, #197);
-#200 = DIRECTION('NONE', (0, -1, 0));
+#200 = DIRECTION('NONE', (0, 1, 0));
 #201 = VECTOR('NONE', #200, 1);
-#202 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0.6096));
+#202 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0.6096));
 #203 = LINE('NONE', #202, #201);
-#204 = DIRECTION('NONE', (-1, -0.00000000000000020517070925003855, 0));
+#204 = DIRECTION('NONE', (1, 0, 0));
 #205 = VECTOR('NONE', #204, 1);
-#206 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0));
+#206 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0));
 #207 = LINE('NONE', #206, #205);
-#208 = DIRECTION('NONE', (-1, -0.00000000000000020517070925003855, 0));
+#208 = DIRECTION('NONE', (1, 0, 0));
 #209 = VECTOR('NONE', #208, 1);
-#210 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0.6096));
+#210 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0.6096));
 #211 = LINE('NONE', #210, #209);
 #212 = EDGE_CURVE('NONE', #5, #7, #59, .T.);
 #213 = EDGE_CURVE('NONE', #7, #9, #63, .T.);
@@ -264,56 +264,56 @@ DATA;
 #248 = EDGE_CURVE('NONE', #51, #55, #203, .T.);
 #249 = EDGE_CURVE('NONE', #53, #5, #207, .T.);
 #250 = EDGE_CURVE('NONE', #55, #11, #211, .T.);
-#251 = CARTESIAN_POINT('NONE', (-0.01691004999999998, -0.0508, -0.30480000000000007));
+#251 = CARTESIAN_POINT('NONE', (0.01691005, 0.0508, -0.3048));
-#252 = DIRECTION('NONE', (0, -1, -0));
+#252 = DIRECTION('NONE', (0, 1, 0));
 #253 = AXIS2_PLACEMENT_3D('NONE', #251, #252, $);
 #254 = PLANE('NONE', #253);
-#255 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04707889999999995, -0.30479999999999996));
+#255 = CARTESIAN_POINT('NONE', (0.0338201, 0.0470789, -0.3048));
-#256 = DIRECTION('NONE', (-1, 0, -0));
+#256 = DIRECTION('NONE', (1, 0, 0));
 #257 = AXIS2_PLACEMENT_3D('NONE', #255, #256, $);
 #258 = PLANE('NONE', #257);
-#259 = CARTESIAN_POINT('NONE', (-0.018770600000000033, -0.043357799999999995, -0.30480000000000007));
+#259 = CARTESIAN_POINT('NONE', (0.018770600000000002, 0.043357799999999995, -0.3048));
-#260 = DIRECTION('NONE', (0, 1, 0));
+#260 = DIRECTION('NONE', (0, -1, -0));
 #261 = AXIS2_PLACEMENT_3D('NONE', #259, #260, $);
 #262 = PLANE('NONE', #261);
-#263 = CARTESIAN_POINT('NONE', (-0.0037211000000000024, 0, -0.3048));
+#263 = CARTESIAN_POINT('NONE', (0.0037211000000000024, 0, -0.3048));
-#264 = DIRECTION('NONE', (-1, 0, -0));
+#264 = DIRECTION('NONE', (1, 0, 0));
 #265 = AXIS2_PLACEMENT_3D('NONE', #263, #264, $);
 #266 = PLANE('NONE', #265);
-#267 = CARTESIAN_POINT('NONE', (-0.01877060000000003, 0.0433578, -0.30480000000000007));
+#267 = CARTESIAN_POINT('NONE', (0.018770600000000002, -0.043357799999999995, -0.3048));
-#268 = DIRECTION('NONE', (0, -1, -0));
+#268 = DIRECTION('NONE', (0, 1, 0));
 #269 = AXIS2_PLACEMENT_3D('NONE', #267, #268, $);
 #270 = PLANE('NONE', #269);
-#271 = CARTESIAN_POINT('NONE', (-0.0338201, 0.04707889999999997, -0.30479999999999996));
+#271 = CARTESIAN_POINT('NONE', (0.0338201, -0.047078899999999986, -0.30479999999999996));
-#272 = DIRECTION('NONE', (-1, 0, -0));
+#272 = DIRECTION('NONE', (1, 0, 0));
 #273 = AXIS2_PLACEMENT_3D('NONE', #271, #272, $);
 #274 = PLANE('NONE', #273);
-#275 = CARTESIAN_POINT('NONE', (0, 0.0508, -0.3048));
+#275 = CARTESIAN_POINT('NONE', (0, -0.05079999999999999, -0.3048));
-#276 = DIRECTION('NONE', (0, 1, 0));
+#276 = DIRECTION('NONE', (0, -1, -0));
 #277 = AXIS2_PLACEMENT_3D('NONE', #275, #276, $);
 #278 = PLANE('NONE', #277);
-#279 = CARTESIAN_POINT('NONE', (0.03382009999999999, 0.04707889999999999, -0.30479999999999996));
+#279 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04707889999999995, -0.30479999999999996));
-#280 = DIRECTION('NONE', (1, 0, 0));
+#280 = DIRECTION('NONE', (-1, 0, -0));
 #281 = AXIS2_PLACEMENT_3D('NONE', #279, #280, $);
 #282 = PLANE('NONE', #281);
-#283 = CARTESIAN_POINT('NONE', (0.018770600000000002, 0.043357799999999995, -0.3048));
+#283 = CARTESIAN_POINT('NONE', (-0.018770600000000033, -0.043357799999999995, -0.30480000000000007));
-#284 = DIRECTION('NONE', (0, -1, -0));
+#284 = DIRECTION('NONE', (0, 1, 0));
 #285 = AXIS2_PLACEMENT_3D('NONE', #283, #284, $);
 #286 = PLANE('NONE', #285);
-#287 = CARTESIAN_POINT('NONE', (0.0037211000000000024, 0, -0.3048));
+#287 = CARTESIAN_POINT('NONE', (-0.0037211000000000024, 0, -0.3048));
-#288 = DIRECTION('NONE', (1, 0, 0));
+#288 = DIRECTION('NONE', (-1, 0, -0));
 #289 = AXIS2_PLACEMENT_3D('NONE', #287, #288, $);
 #290 = PLANE('NONE', #289);
-#291 = CARTESIAN_POINT('NONE', (0.018770600000000002, -0.043357799999999995, -0.3048));
+#291 = CARTESIAN_POINT('NONE', (-0.01877060000000003, 0.0433578, -0.30480000000000007));
-#292 = DIRECTION('NONE', (0, 1, 0));
+#292 = DIRECTION('NONE', (0, -1, -0));
 #293 = AXIS2_PLACEMENT_3D('NONE', #291, #292, $);
 #294 = PLANE('NONE', #293);
-#295 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04707889999999999, -0.3048));
+#295 = CARTESIAN_POINT('NONE', (-0.0338201, 0.04707889999999997, -0.30479999999999996));
-#296 = DIRECTION('NONE', (1, 0, 0));
+#296 = DIRECTION('NONE', (-1, 0, -0));
 #297 = AXIS2_PLACEMENT_3D('NONE', #295, #296, $);
 #298 = PLANE('NONE', #297);
-#299 = CARTESIAN_POINT('NONE', (0.016910050000000003, -0.0508, -0.3048));
+#299 = CARTESIAN_POINT('NONE', (-0.016910049999999968, 0.050800000000000005, -0.30480000000000007));
-#300 = DIRECTION('NONE', (0, -1, -0));
+#300 = DIRECTION('NONE', (0, 1, 0));
 #301 = AXIS2_PLACEMENT_3D('NONE', #299, #300, $);
 #302 = PLANE('NONE', #301);
 #303 = CARTESIAN_POINT('NONE', (0, 0, -0));

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

@@ -34,5 +34,5 @@ startSketchOn(knobPlane)
      }, %)
   |> xLine(endAbsolute = 0.0001)
   |> close()
-  |> revolve({ axis = "Y" }, %)
+  |> revolve(axis = "Y")
   |> appearance(color = '#D0FF01', metalness = 90, roughness = 50)

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

@@ -876,7 +876,7 @@ async fn kcl_test_simple_revolve() {
      |> line(end = [0, -5.5])
      |> line(end = [-2, 0])
      |> close()
-     |> revolve({axis: 'y'}, %)
+     |> revolve(axis = 'y')
 
 "#;
 
@@ -896,7 +896,7 @@ async fn kcl_test_simple_revolve_uppercase() {
      |> line(end = [0, -5.5])
      |> line(end = [-2, 0])
      |> close()
-     |> revolve({axis: 'Y'}, %)
+     |> revolve(axis = 'Y')
 
 "#;
 
@@ -916,7 +916,7 @@ async fn kcl_test_simple_revolve_negative() {
      |> line(end = [0, -5.5])
      |> line(end = [-2, 0])
      |> close()
-     |> revolve({axis: '-Y', angle: 180}, %)
+     |> revolve(axis = '-Y', angle = 180)
 
 "#;
 
@@ -936,7 +936,7 @@ async fn kcl_test_revolve_bad_angle_low() {
      |> line(end = [0, -5.5])
      |> line(end = [-2, 0])
      |> close()
-     |> revolve({axis: 'y', angle: -455}, %)
+     |> revolve(axis = 'y', angle = -455)
 
 "#;
 
@@ -962,7 +962,7 @@ async fn kcl_test_revolve_bad_angle_high() {
      |> line(end = [0, -5.5])
      |> line(end = [-2, 0])
      |> close()
-     |> revolve({axis: 'y', angle: 455}, %)
+     |> revolve(axis = 'y', angle = 455)
 
 "#;
 
@@ -988,7 +988,7 @@ async fn kcl_test_simple_revolve_custom_angle() {
      |> line(end = [0, -5.5])
      |> line(end = [-2, 0])
      |> close()
-     |> revolve({axis: 'y', angle: 180}, %)
+     |> revolve(axis = 'y', angle = 180)
 
 "#;
 
@@ -1008,7 +1008,7 @@ async fn kcl_test_simple_revolve_custom_axis() {
      |> line(end = [0, -5.5])
      |> line(end = [-2, 0])
      |> close()
-     |> revolve({axis: {custom: {axis: [0, -1], origin: [0,0]}}, angle: 180}, %)
+     |> revolve(axis = {custom: {axis: [0, -1], origin: [0,0]}}, angle = 180)
 
 "#;
 
@@ -1032,7 +1032,7 @@ sketch001 = startSketchOn(box, "end")
   |> line(end = [2, 0])
   |> line(end = [0, 10])
   |> close()
-  |> revolve({ axis: getOppositeEdge(revolveAxis), angle: 90 }, %)
+  |> revolve(axis = getOppositeEdge(revolveAxis), angle = 90)
 
 "#;
 
@@ -1056,7 +1056,7 @@ sketch001 = startSketchOn(box, revolveAxis)
   |> line(end = [2, 0])
   |> line(end = [0, 10])
   |> close()
-  |> revolve({ axis: revolveAxis, angle: 90 }, %)
+  |> revolve(axis = revolveAxis, angle = 90)
 
 "#;
 
@@ -1082,10 +1082,10 @@ async fn kcl_test_revolve_on_face_circle_edge() {
 
 sketch001 = startSketchOn(box, "END")
   |> circle(center = [10,10], radius= 4)
-  |> revolve({
+  |> revolve(
-    angle: 90, 
+    angle = 90, 
-    axis: getOppositeEdge(revolveAxis) 
+    axis = getOppositeEdge(revolveAxis) 
-    }, %)
+    )
 "#;
 
     let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
@@ -1104,10 +1104,10 @@ async fn kcl_test_revolve_on_face_circle() {
 
 sketch001 = startSketchOn(box, "END")
   |> circle(center = [10,10], radius= 4 )
-  |> revolve({
+  |> revolve(
-    angle: -90, 
+    angle = -90, 
-    axis: 'y' 
+    axis = 'y' 
-    }, %)
+    )
 "#;
 
     let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
@@ -1130,10 +1130,10 @@ sketch001 = startSketchOn(box, "end")
   |> line(end = [2, 0])
   |> line(end = [0, 10])
   |> close()
-  |> revolve({
+  |> revolve(
-      axis: 'y',
+      axis = 'y',
-      angle: -90,
+      angle = -90,
-  }, %)
+  )
 "#;
 
     let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
@@ -1144,10 +1144,10 @@ sketch001 = startSketchOn(box, "end")
 async fn kcl_test_basic_revolve_circle() {
     let code = r#"sketch001 = startSketchOn('XY')
   |> circle(center = [15, 0], radius= 5)
-  |> revolve({
+  |> revolve(
-    angle: 360, 
+    angle = 360, 
-    axis: 'y' 
+    axis = 'y' 
-    }, %)
+    )
 "#;
 
     let result = execute_and_snapshot(code, UnitLength::Mm, None).await.unwrap();
@@ -1166,7 +1166,7 @@ async fn kcl_test_simple_revolve_sketch_on_edge() {
      |> line(end = [0, -5.5])
      |> line(end = [-2, 0])
      |> close()
-     |> revolve({axis: 'y', angle: 180}, %)
+     |> revolve(axis = 'y', angle = 180)
 
 part002 = startSketchOn(part001, 'end')
     |> startProfileAt([4.5, -5], %)

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

@@ -1000,12 +1000,7 @@ mod tests {
     fn get_autocomplete_snippet_revolve() {
         let revolve_fn: Box<dyn StdLibFn> = Box::new(crate::std::revolve::Revolve);
         let snippet = revolve_fn.to_autocomplete_snippet().unwrap();
-        assert_eq!(
+        assert_eq!(snippet, r#"revolve(${0:%}, axis = ${1:"X"})${}"#);
-            snippet,
-            r#"revolve({
-	axis = ${0:"X"},
-}, ${1:%})${}"#
-        );
     }
 
     #[test]

rust/kcl-lib/src/simulation_tests.rs

@@ -167,7 +167,7 @@ async fn execute_test(test: &Test, render_to_png: bool, export_step: bool) {
             if render_to_png {
                 twenty_twenty::assert_image(test.output_dir.join(RENDERED_MODEL_NAME), &png, 0.99);
             }
-            if export_step {
+            if export_step && std::env::var("EXPECTORATE").is_ok() {
                 let step = step.unwrap();
                 // We do not use expectorate here because the output is non-deterministic
                 // due to SSI and GPU.

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

@@ -98,7 +98,7 @@ pub async fn appearance(exec_state: &mut ExecState, args: Args) -> Result<KclVal
 /// // Add color to a revolved solid.
 /// sketch001 = startSketchOn('XY')
 ///     |> circle( center = [15, 0], radius = 5 )
-///     |> revolve({ angle = 360, axis = 'y' }, %)
+///     |> revolve( angle = 360, axis = 'y')
 ///     |> appearance(
 ///         color = '#ff0000',
 ///         metalness = 90,

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

@@ -1239,16 +1239,6 @@ impl<'a> FromKclValue<'a> for super::sketch::ArcToData {
     }
 }
 
-impl<'a> FromKclValue<'a> for super::revolve::RevolveData {
-    fn from_kcl_val(arg: &'a KclValue) -> Option<Self> {
-        let obj = arg.as_object()?;
-        let angle = obj.get("angle").and_then(|x| x.as_f64());
-        let tolerance = obj.get("tolerance").and_then(|x| x.as_f64());
-        let_field_of!(obj, axis);
-        Some(Self { angle, axis, tolerance })
-    }
-}
-
 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/revolve.rs

@@ -4,35 +4,28 @@ use anyhow::Result;
 use kcl_derive_docs::stdlib;
 use kcmc::{each_cmd as mcmd, length_unit::LengthUnit, shared::Angle, ModelingCmd};
 use kittycad_modeling_cmds::{self as kcmc};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
 
 use crate::{
     errors::{KclError, KclErrorDetails},
-    execution::{ExecState, KclValue, Sketch, Solid},
+    execution::{
+        kcl_value::{ArrayLen, RuntimeType},
+        ExecState, KclValue, PrimitiveType, Sketch, Solid,
+    },
     std::{axis_or_reference::Axis2dOrEdgeReference, extrude::do_post_extrude, fillet::default_tolerance, Args},
 };
 
-/// Data for revolution surfaces.
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
-#[ts(export)]
-pub struct RevolveData {
-    /// Angle to revolve (in degrees). Default is 360.
-    #[serde(default)]
-    #[schemars(range(min = -360.0, max = 360.0))]
-    pub angle: Option<f64>,
-    /// Axis of revolution.
-    pub axis: Axis2dOrEdgeReference,
-    /// Tolerance for the revolve operation.
-    #[serde(default)]
-    pub tolerance: Option<f64>,
-}
-
 /// Revolve a sketch or set of sketches around an axis.
 pub async fn revolve(exec_state: &mut ExecState, args: Args) -> Result<KclValue, KclError> {
-    let (data, sketches): (RevolveData, _) = args.get_data_and_sketches(exec_state)?;
+    let sketches = args.get_unlabeled_kw_arg_typed(
+        "sketches",
+        &RuntimeType::Array(PrimitiveType::Sketch, ArrayLen::NonEmpty),
+        exec_state,
+    )?;
+    let axis: Axis2dOrEdgeReference = args.get_kw_arg("axis")?;
+    let angle = args.get_kw_arg_opt("angle")?;
+    let tolerance = args.get_kw_arg_opt("tolerance")?;
 
-    let value = inner_revolve(data, sketches, exec_state, args).await?;
+    let value = inner_revolve(sketches, axis, angle, tolerance, exec_state, args).await?;
     Ok(value.into())
 }
 
@@ -60,17 +53,17 @@ pub async fn revolve(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
 ///     |> line(end = [0, -5.5])
 ///     |> line(end = [-2, 0])
 ///     |> close()
-///     |> revolve({axis = 'y'}, %) // default angle is 360
+///     |> revolve(axis = 'y') // default angle is 360
 /// ```
 ///
 /// ```no_run
 /// // A donut shape.
 /// sketch001 = startSketchOn('XY')
 ///     |> circle( center = [15, 0], radius = 5 )
-///     |> revolve({
+///     |> revolve(
 ///         angle = 360,
 ///         axis = 'y'
-///     }, %)
+///     )
 /// ```
 ///
 /// ```no_run
@@ -84,7 +77,7 @@ pub async fn revolve(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
 ///     |> line(end = [0, -5.5])
 ///     |> line(end = [-2, 0])
 ///     |> close()
-///     |> revolve({axis = 'y', angle = 180}, %)
+///     |> revolve(axis = 'y', angle = 180)
 /// ```
 ///
 /// ```no_run
@@ -98,7 +91,8 @@ pub async fn revolve(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
 ///     |> line(end = [0, -5.5])
 ///     |> line(end = [-2, 0])
 ///     |> close()
-///     |> revolve({axis = 'y', angle = 180}, %)
+///     |> revolve(axis = 'y', angle = 180)
+///
 /// part002 = startSketchOn(part001, 'end')
 ///     |> startProfileAt([4.5, -5], %)
 ///     |> line(end = [0, 5])
@@ -119,10 +113,10 @@ pub async fn revolve(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
 ///
 /// sketch001 = startSketchOn(box, "END")
 ///     |> circle( center = [10,10], radius = 4 )
-///     |> revolve({
+///     |> revolve(
 ///         angle = -90,
 ///         axis = 'y'
-///     }, %)
+///     )
 /// ```
 ///
 /// ```no_run
@@ -136,10 +130,10 @@ pub async fn revolve(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
 ///
 /// sketch001 = startSketchOn(box, "END")
 ///     |> circle( center = [10,10], radius = 4 )
-///     |> revolve({
+///     |> revolve(
 ///         angle = 90,
 ///         axis = getOppositeEdge(revolveAxis)
-///     }, %)
+///     )
 /// ```
 ///
 /// ```no_run
@@ -153,11 +147,11 @@ pub async fn revolve(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
 ///
 /// sketch001 = startSketchOn(box, "END")
 ///     |> circle( center = [10,10], radius = 4 )
-///     |> revolve({
+///     |> revolve(
 ///         angle = 90,
 ///         axis = getOppositeEdge(revolveAxis),
-///         tolerance: 0.0001
+///         tolerance = 0.0001
-///     }, %)
+///     )
 /// ```
 ///
 /// ```no_run
@@ -168,14 +162,15 @@ pub async fn revolve(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
 ///   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
 ///   |> close()
 ///
-/// part001 = revolve({
+/// part001 = revolve(
+///    sketch001,
 ///   axis = {
 ///     custom: {
 ///       axis = [0.0, 1.0],
 ///       origin: [0.0, 0.0]
 ///     }
 ///   }
-/// }, sketch001)
+/// )
 /// ```
 ///
 /// ```no_run
@@ -196,9 +191,10 @@ pub async fn revolve(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
 ///     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
 ///     |> close()
 ///
-/// revolve({
+/// revolve(
+///     [profile001, profile002],
 ///     axis = "X",
-/// }, [profile001, profile002])
+/// )
 /// ```
 ///
 /// ```no_run
@@ -213,7 +209,7 @@ pub async fn revolve(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
 ///
 /// sketch001 = startSketchOn('XY')
 ///     |> circle(center = [-10, 10], radius = 4)
-///     |> revolve({ angle: 90, axis: revolveAxis }, %)
+///     |> revolve(angle = 90, axis = revolveAxis)
 /// ```
 ///
 /// ```no_run
@@ -226,19 +222,29 @@ pub async fn revolve(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
 ///
 /// sketch001 = startSketchOn('XY')
 ///     |> circle(center = [-10, 10], radius = 4)
-///     |> revolve({ angle: 90, axis: revolveAxis }, %)
+///     |> revolve(angle = 90, axis = revolveAxis)
 /// ```
 #[stdlib {
     name = "revolve",
     feature_tree_operation = true,
+    keywords = true,
+    unlabeled_first = true,
+    args = {
+        sketches = { docs = "The sketch or set of sketches that should be revolved" },
+        axis = { docs = "Axis of revolution." },
+        angle = { docs = "Angle to revolve (in degrees). Default is 360." },
+        tolerance = { docs = "Tolerance for the revolve operation." },
+    }
 }]
 async fn inner_revolve(
-    data: RevolveData,
     sketches: Vec<Sketch>,
+    axis: Axis2dOrEdgeReference,
+    angle: Option<f64>,
+    tolerance: Option<f64>,
     exec_state: &mut ExecState,
     args: Args,
 ) -> Result<Vec<Solid>, KclError> {
-    if let Some(angle) = data.angle {
+    if let Some(angle) = angle {
         // Return an error if the angle is zero.
         // We don't use validate() here because we want to return a specific error message that is
         // nice and we use the other data in the docs, so we still need use the derive above for the json schema.
@@ -250,13 +256,13 @@ async fn inner_revolve(
         }
     }
 
-    let angle = Angle::from_degrees(data.angle.unwrap_or(360.0));
+    let angle = Angle::from_degrees(angle.unwrap_or(360.0));
 
     let mut solids = Vec::new();
     for sketch in &sketches {
         let id = exec_state.next_uuid();
 
-        match &data.axis {
+        match &axis {
             Axis2dOrEdgeReference::Axis(axis) => {
                 let (axis, origin) = axis.axis_and_origin()?;
                 args.batch_modeling_cmd(
@@ -266,7 +272,7 @@ async fn inner_revolve(
                         target: sketch.id.into(),
                         axis,
                         origin,
-                        tolerance: LengthUnit(data.tolerance.unwrap_or(default_tolerance(&args.ctx.settings.units))),
+                        tolerance: LengthUnit(tolerance.unwrap_or(default_tolerance(&args.ctx.settings.units))),
                         axis_is_2d: true,
                     }),
                 )
@@ -280,7 +286,7 @@ async fn inner_revolve(
                         angle,
                         target: sketch.id.into(),
                         edge_id,
-                        tolerance: LengthUnit(data.tolerance.unwrap_or(default_tolerance(&args.ctx.settings.units))),
+                        tolerance: LengthUnit(tolerance.unwrap_or(default_tolerance(&args.ctx.settings.units))),
                     }),
                 )
                 .await?;

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

@@ -991,7 +991,7 @@ pub async fn start_sketch_on(exec_state: &mut ExecState, args: Args) -> Result<K
 ///   |> line(end = [-2, 0])
 ///   |> close()
 ///
-/// example = revolve({ axis: 'y', angle: 180 }, exampleSketch)
+/// example = revolve(exampleSketch, axis = 'y', angle = 180)
 ///
 /// exampleSketch002 = startSketchOn(example, 'end')
 ///   |> startProfileAt([4.5, -5], %)

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

@@ -1,5 +1,5 @@
 ---
-source: kcl/src/simulation_tests.rs
+source: kcl-lib/src/simulation_tests.rs
 description: Result of parsing array_index_oob.kcl
 ---
 {

rust/kcl-lib/tests/array_index_oob/execution_error.snap

@@ -1,5 +1,5 @@
 ---
-source: kcl/src/simulation_tests.rs
+source: kcl-lib/src/simulation_tests.rs
 description: Error from executing array_index_oob.kcl
 ---
 KCL UndefinedValue error

rust/kcl-lib/tests/crazy_multi_profile/artifact_commands.snap

@@ -977,8 +977,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1313,
+      1319,
-      1339,
+      1345,
       0
     ],
     "command": {
@@ -992,7 +992,7 @@ description: Artifact commands crazy_multi_profile.kcl
     "cmdId": "[uuid]",
     "range": [
       1280,
-      1354,
+      1346,
       0
     ],
     "command": {
@@ -1010,7 +1010,7 @@ description: Artifact commands crazy_multi_profile.kcl
     "cmdId": "[uuid]",
     "range": [
       1280,
-      1354,
+      1346,
       0
     ],
     "command": {
@@ -1022,7 +1022,7 @@ description: Artifact commands crazy_multi_profile.kcl
     "cmdId": "[uuid]",
     "range": [
       1280,
-      1354,
+      1346,
       0
     ],
     "command": {
@@ -1035,7 +1035,7 @@ description: Artifact commands crazy_multi_profile.kcl
     "cmdId": "[uuid]",
     "range": [
       1280,
-      1354,
+      1346,
       0
     ],
     "command": {
@@ -1049,7 +1049,7 @@ description: Artifact commands crazy_multi_profile.kcl
     "cmdId": "[uuid]",
     "range": [
       1280,
-      1354,
+      1346,
       0
     ],
     "command": {
@@ -1063,7 +1063,7 @@ description: Artifact commands crazy_multi_profile.kcl
     "cmdId": "[uuid]",
     "range": [
       1280,
-      1354,
+      1346,
       0
     ],
     "command": {
@@ -1077,7 +1077,7 @@ description: Artifact commands crazy_multi_profile.kcl
     "cmdId": "[uuid]",
     "range": [
       1280,
-      1354,
+      1346,
       0
     ],
     "command": {
@@ -1091,7 +1091,7 @@ description: Artifact commands crazy_multi_profile.kcl
     "cmdId": "[uuid]",
     "range": [
       1280,
-      1354,
+      1346,
       0
     ],
     "command": {
@@ -1105,7 +1105,7 @@ description: Artifact commands crazy_multi_profile.kcl
     "cmdId": "[uuid]",
     "range": [
       1280,
-      1354,
+      1346,
       0
     ],
     "command": {
@@ -1118,8 +1118,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1368,
+      1360,
-      1399,
+      1391,
       0
     ],
     "command": {
@@ -1134,8 +1134,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1368,
+      1360,
-      1399,
+      1391,
       0
     ],
     "command": {
@@ -1148,8 +1148,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1368,
+      1360,
-      1399,
+      1391,
       0
     ],
     "command": {
@@ -1159,8 +1159,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1368,
+      1360,
-      1399,
+      1391,
       0
     ],
     "command": {
@@ -1171,8 +1171,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1368,
+      1360,
-      1399,
+      1391,
       0
     ],
     "command": {
@@ -1184,8 +1184,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1368,
+      1360,
-      1399,
+      1391,
       0
     ],
     "command": {
@@ -1198,8 +1198,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1368,
+      1360,
-      1399,
+      1391,
       0
     ],
     "command": {
@@ -1212,8 +1212,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1368,
+      1360,
-      1399,
+      1391,
       0
     ],
     "command": {
@@ -1226,8 +1226,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1368,
+      1360,
-      1399,
+      1391,
       0
     ],
     "command": {
@@ -1240,8 +1240,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1368,
+      1360,
-      1399,
+      1391,
       0
     ],
     "command": {
@@ -1254,8 +1254,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1368,
+      1360,
-      1399,
+      1391,
       0
     ],
     "command": {
@@ -1268,8 +1268,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1412,
+      1404,
-      1432,
+      1424,
       0
     ],
     "command": {
@@ -1297,8 +1297,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1446,
+      1438,
-      1484,
+      1476,
       0
     ],
     "command": {
@@ -1317,8 +1317,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1446,
+      1438,
-      1484,
+      1476,
       0
     ],
     "command": {
@@ -1328,8 +1328,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1446,
+      1438,
-      1484,
+      1476,
       0
     ],
     "command": {
@@ -1345,8 +1345,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1446,
+      1438,
-      1484,
+      1476,
       0
     ],
     "command": {
@@ -1356,8 +1356,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1490,
+      1482,
-      1514,
+      1506,
       0
     ],
     "command": {
@@ -1377,8 +1377,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1520,
+      1512,
-      1545,
+      1537,
       0
     ],
     "command": {
@@ -1398,8 +1398,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1559,
+      1551,
-      1598,
+      1590,
       0
     ],
     "command": {
@@ -1418,8 +1418,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1559,
+      1551,
-      1598,
+      1590,
       0
     ],
     "command": {
@@ -1429,8 +1429,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1559,
+      1551,
-      1598,
+      1590,
       0
     ],
     "command": {
@@ -1446,8 +1446,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1559,
+      1551,
-      1598,
+      1590,
       0
     ],
     "command": {
@@ -1457,8 +1457,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1604,
+      1596,
-      1628,
+      1620,
       0
     ],
     "command": {
@@ -1478,8 +1478,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1634,
+      1626,
-      1659,
+      1651,
       0
     ],
     "command": {
@@ -1499,8 +1499,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1665,
+      1657,
-      1721,
+      1713,
       0
     ],
     "command": {
@@ -1520,8 +1520,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1727,
+      1719,
-      1734,
+      1726,
       0
     ],
     "command": {
@@ -1532,8 +1532,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1748,
+      1740,
-      1787,
+      1779,
       0
     ],
     "command": {
@@ -1552,8 +1552,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1748,
+      1740,
-      1787,
+      1779,
       0
     ],
     "command": {
@@ -1563,8 +1563,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1748,
+      1740,
-      1787,
+      1779,
       0
     ],
     "command": {
@@ -1580,8 +1580,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1748,
+      1740,
-      1787,
+      1779,
       0
     ],
     "command": {
@@ -1591,8 +1591,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1793,
+      1785,
-      1816,
+      1808,
       0
     ],
     "command": {
@@ -1612,8 +1612,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1822,
+      1814,
-      1847,
+      1839,
       0
     ],
     "command": {
@@ -1633,8 +1633,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1853,
+      1845,
-      1909,
+      1901,
       0
     ],
     "command": {
@@ -1654,8 +1654,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1915,
+      1907,
-      1922,
+      1914,
       0
     ],
     "command": {
@@ -1666,8 +1666,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1936,
+      1928,
-      1992,
+      1984,
       0
     ],
     "command": {
@@ -1686,8 +1686,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1936,
+      1928,
-      1992,
+      1984,
       0
     ],
     "command": {
@@ -1697,8 +1697,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1936,
+      1928,
-      1992,
+      1984,
       0
     ],
     "command": {
@@ -1714,8 +1714,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1936,
+      1928,
-      1992,
+      1984,
       0
     ],
     "command": {
@@ -1725,8 +1725,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1936,
+      1928,
-      1992,
+      1984,
       0
     ],
     "command": {
@@ -1754,8 +1754,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1936,
+      1928,
-      1992,
+      1984,
       0
     ],
     "command": {
@@ -1766,8 +1766,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2006,
+      1998,
-      2046,
+      2038,
       0
     ],
     "command": {
@@ -1786,8 +1786,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2006,
+      1998,
-      2046,
+      2038,
       0
     ],
     "command": {
@@ -1797,8 +1797,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2006,
+      1998,
-      2046,
+      2038,
       0
     ],
     "command": {
@@ -1814,8 +1814,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2006,
+      1998,
-      2046,
+      2038,
       0
     ],
     "command": {
@@ -1825,8 +1825,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2052,
+      2044,
-      2099,
+      2091,
       0
     ],
     "command": {
@@ -1846,8 +1846,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2105,
+      2097,
-      2182,
+      2174,
       0
     ],
     "command": {
@@ -1867,8 +1867,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2188,
+      2180,
-      2285,
+      2277,
       0
     ],
     "command": {
@@ -1888,8 +1888,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2291,
+      2283,
-      2347,
+      2339,
       0
     ],
     "command": {
@@ -1909,8 +1909,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2353,
+      2345,
-      2360,
+      2352,
       0
     ],
     "command": {
@@ -1921,8 +1921,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2374,
+      2366,
-      2407,
+      2399,
       0
     ],
     "command": {
@@ -1941,8 +1941,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2374,
+      2366,
-      2407,
+      2399,
       0
     ],
     "command": {
@@ -1955,8 +1955,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2374,
+      2366,
-      2407,
+      2399,
       0
     ],
     "command": {
@@ -1966,8 +1966,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2374,
+      2366,
-      2407,
+      2399,
       0
     ],
     "command": {
@@ -1978,8 +1978,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2374,
+      2366,
-      2407,
+      2399,
       0
     ],
     "command": {
@@ -1991,8 +1991,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2374,
+      2366,
-      2407,
+      2399,
       0
     ],
     "command": {
@@ -2005,8 +2005,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2374,
+      2366,
-      2407,
+      2399,
       0
     ],
     "command": {
@@ -2019,8 +2019,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2374,
+      2366,
-      2407,
+      2399,
       0
     ],
     "command": {
@@ -2033,8 +2033,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2374,
+      2366,
-      2407,
+      2399,
       0
     ],
     "command": {
@@ -2047,8 +2047,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2374,
+      2366,
-      2407,
+      2399,
       0
     ],
     "command": {
@@ -2061,8 +2061,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2374,
+      2366,
-      2407,
+      2399,
       0
     ],
     "command": {
@@ -2075,8 +2075,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2374,
+      2366,
-      2407,
+      2399,
       0
     ],
     "command": {
@@ -2089,8 +2089,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2374,
+      2366,
-      2407,
+      2399,
       0
     ],
     "command": {
@@ -2103,8 +2103,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2421,
+      2413,
-      2470,
+      2458,
       0
     ],
     "command": {
@@ -2121,8 +2121,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2421,
+      2413,
-      2470,
+      2458,
       0
     ],
     "command": {
@@ -2133,8 +2133,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2421,
+      2413,
-      2470,
+      2458,
       0
     ],
     "command": {
@@ -2146,8 +2146,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2421,
+      2413,
-      2470,
+      2458,
       0
     ],
     "command": {
@@ -2160,8 +2160,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2421,
+      2413,
-      2470,
+      2458,
       0
     ],
     "command": {
@@ -2174,8 +2174,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2421,
+      2413,
-      2470,
+      2458,
       0
     ],
     "command": {
@@ -2188,8 +2188,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2421,
+      2413,
-      2470,
+      2458,
       0
     ],
     "command": {
@@ -2202,8 +2202,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2421,
+      2413,
-      2470,
+      2458,
       0
     ],
     "command": {
@@ -2216,8 +2216,8 @@ description: Artifact commands crazy_multi_profile.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2421,
+      2413,
-      2470,
+      2458,
       0
     ],
     "command": {

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

@@ -44,38 +44,38 @@ flowchart LR
     44[Solid2d]
   end
   subgraph path59 [Path]
-    59["Path<br>[1446, 1484, 0]"]
+    59["Path<br>[1438, 1476, 0]"]
-    60["Segment<br>[1490, 1514, 0]"]
+    60["Segment<br>[1482, 1506, 0]"]
-    61["Segment<br>[1520, 1545, 0]"]
+    61["Segment<br>[1512, 1537, 0]"]
   end
   subgraph path62 [Path]
-    62["Path<br>[1559, 1598, 0]"]
+    62["Path<br>[1551, 1590, 0]"]
-    63["Segment<br>[1604, 1628, 0]"]
+    63["Segment<br>[1596, 1620, 0]"]
-    64["Segment<br>[1634, 1659, 0]"]
+    64["Segment<br>[1626, 1651, 0]"]
-    65["Segment<br>[1665, 1721, 0]"]
+    65["Segment<br>[1657, 1713, 0]"]
-    66["Segment<br>[1727, 1734, 0]"]
+    66["Segment<br>[1719, 1726, 0]"]
     67[Solid2d]
   end
   subgraph path68 [Path]
-    68["Path<br>[1748, 1787, 0]"]
+    68["Path<br>[1740, 1779, 0]"]
-    69["Segment<br>[1793, 1816, 0]"]
+    69["Segment<br>[1785, 1808, 0]"]
-    70["Segment<br>[1822, 1847, 0]"]
+    70["Segment<br>[1814, 1839, 0]"]
-    71["Segment<br>[1853, 1909, 0]"]
+    71["Segment<br>[1845, 1901, 0]"]
-    72["Segment<br>[1915, 1922, 0]"]
+    72["Segment<br>[1907, 1914, 0]"]
     73[Solid2d]
   end
   subgraph path74 [Path]
-    74["Path<br>[1936, 1992, 0]"]
+    74["Path<br>[1928, 1984, 0]"]
-    75["Segment<br>[1936, 1992, 0]"]
+    75["Segment<br>[1928, 1984, 0]"]
     76[Solid2d]
   end
   subgraph path77 [Path]
-    77["Path<br>[2006, 2046, 0]"]
+    77["Path<br>[1998, 2038, 0]"]
-    78["Segment<br>[2052, 2099, 0]"]
+    78["Segment<br>[2044, 2091, 0]"]
-    79["Segment<br>[2105, 2182, 0]"]
+    79["Segment<br>[2097, 2174, 0]"]
-    80["Segment<br>[2188, 2285, 0]"]
+    80["Segment<br>[2180, 2277, 0]"]
-    81["Segment<br>[2291, 2347, 0]"]
+    81["Segment<br>[2283, 2339, 0]"]
-    82["Segment<br>[2353, 2360, 0]"]
+    82["Segment<br>[2345, 2352, 0]"]
     83[Solid2d]
   end
   1["Plane<br>[12, 31, 0]"]
@@ -91,8 +91,8 @@ flowchart LR
   17["SweepEdge Adjacent"]
   18["SweepEdge Opposite"]
   19["SweepEdge Adjacent"]
-  45["Sweep RevolveAboutEdge<br>[1280, 1354, 0]"]
+  45["Sweep RevolveAboutEdge<br>[1280, 1346, 0]"]
-  46["Sweep Extrusion<br>[1368, 1399, 0]"]
+  46["Sweep Extrusion<br>[1360, 1391, 0]"]
   47[Wall]
   48[Wall]
   49[Wall]
@@ -104,8 +104,8 @@ flowchart LR
   55["SweepEdge Adjacent"]
   56["SweepEdge Opposite"]
   57["SweepEdge Adjacent"]
-  58["Plane<br>[1412, 1432, 0]"]
+  58["Plane<br>[1404, 1424, 0]"]
-  84["Sweep Extrusion<br>[2374, 2407, 0]"]
+  84["Sweep Extrusion<br>[2366, 2399, 0]"]
   85[Wall]
   86[Wall]
   87[Wall]
@@ -120,7 +120,7 @@ flowchart LR
   96["SweepEdge Adjacent"]
   97["SweepEdge Opposite"]
   98["SweepEdge Adjacent"]
-  99["Sweep RevolveAboutEdge<br>[2421, 2470, 0]"]
+  99["Sweep RevolveAboutEdge<br>[2413, 2458, 0]"]
   100[Wall]
   101[Wall]
   102[Wall]

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

@@ -32,10 +32,7 @@ profile006 = startProfileAt([9.65, 3.82], sketch002)
   |> line(end = [2.13, -5.57])
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
-revolve001 = revolve({
+revolve001 = revolve(profile004, angle = 45, axis = getNextAdjacentEdge(seg01))
-  angle = 45,
-  axis = getNextAdjacentEdge(seg01)
-}, profile004)
 extrude002 = extrude(profile006, length = 4)
 sketch003 = startSketchOn('-XZ')
 profile007 = startProfileAt([4.8, 7.55], sketch003)
@@ -65,4 +62,4 @@ profile011 = startProfileAt([5.07, -6.39], sketch003)
   |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
   |> close()
 extrude003 = extrude(profile011, length = 2.5)
-revolve002 = revolve({ angle = 45, axis = seg02 }, profile008)
+revolve002 = revolve(profile008, angle = 45, axis = seg02)

rust/kcl-lib/tests/crazy_multi_profile/ops.snap

@@ -109,45 +109,34 @@ description: Operations executed crazy_multi_profile.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "angle": {
         "value": {
-          "type": "Object",
+          "type": "Number",
-          "value": {
+          "value": 45.0,
-            "angle": {
+          "ty": {
-              "type": "Number",
+            "type": "Default",
-              "value": 45.0,
+            "len": {
-              "ty": {
+              "type": "Mm"
-                "type": "Default",
-                "len": {
-                  "type": "Mm"
-                },
-                "angle": {
-                  "type": "Degrees"
-                }
-              }
             },
-            "axis": {
+            "angle": {
-              "type": "Uuid",
+              "type": "Degrees"
-              "value": "[uuid]"
             }
           }
         },
         "sourceRange": [
-          1288,
+          1308,
-          1341,
+          1310,
           0
         ]
       },
-      "sketches": {
+      "axis": {
         "value": {
-          "type": "Sketch",
+          "type": "Uuid",
-          "value": {
+          "value": "[uuid]"
-            "artifactId": "[uuid]"
-          }
         },
         "sourceRange": [
-          1343,
+          1319,
-          1353,
+          1345,
           0
         ]
       }
@@ -155,11 +144,23 @@ description: Operations executed crazy_multi_profile.kcl
     "name": "revolve",
     "sourceRange": [
       1280,
-      1354,
+      1346,
       0
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        1288,
+        1298,
+        0
+      ]
+    }
   },
   {
     "labeledArgs": {
@@ -178,16 +179,16 @@ description: Operations executed crazy_multi_profile.kcl
           }
         },
         "sourceRange": [
-          1397,
+          1389,
-          1398,
+          1390,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      1368,
+      1360,
-      1399,
+      1391,
       0
     ],
     "type": "StdLibCall",
@@ -199,8 +200,8 @@ description: Operations executed crazy_multi_profile.kcl
         }
       },
       "sourceRange": [
-        1376,
+        1368,
-        1386,
+        1378,
         0
       ]
     }
@@ -213,16 +214,16 @@ description: Operations executed crazy_multi_profile.kcl
           "value": "-XZ"
         },
         "sourceRange": [
-          1426,
+          1418,
-          1431,
+          1423,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      1412,
+      1404,
-      1432,
+      1424,
       0
     ],
     "type": "StdLibCall",
@@ -245,16 +246,16 @@ description: Operations executed crazy_multi_profile.kcl
           }
         },
         "sourceRange": [
-          2403,
+          2395,
-          2406,
+          2398,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      2374,
+      2366,
-      2407,
+      2399,
       0
     ],
     "type": "StdLibCall",
@@ -266,65 +267,66 @@ description: Operations executed crazy_multi_profile.kcl
         }
       },
       "sourceRange": [
-        2382,
+        2374,
-        2392,
+        2384,
         0
       ]
     }
   },
   {
     "labeledArgs": {
-      "data": {
+      "angle": {
         "value": {
-          "type": "Object",
+          "type": "Number",
-          "value": {
+          "value": 45.0,
-            "angle": {
+          "ty": {
-              "type": "Number",
+            "type": "Default",
-              "value": 45.0,
+            "len": {
-              "ty": {
+              "type": "Mm"
-                "type": "Default",
-                "len": {
-                  "type": "Mm"
-                },
-                "angle": {
-                  "type": "Degrees"
-                }
-              }
             },
-            "axis": {
+            "angle": {
-              "type": "TagIdentifier",
+              "type": "Degrees"
-              "value": "seg02",
-              "artifact_id": "[uuid]"
             }
           }
         },
         "sourceRange": [
-          2429,
+          2441,
-          2457,
+          2443,
           0
         ]
       },
-      "sketches": {
+      "axis": {
         "value": {
-          "type": "Sketch",
+          "type": "TagIdentifier",
-          "value": {
+          "value": "seg02",
-            "artifactId": "[uuid]"
+          "artifact_id": "[uuid]"
-          }
         },
         "sourceRange": [
-          2459,
+          2452,
-          2469,
+          2457,
           0
         ]
       }
     },
     "name": "revolve",
     "sourceRange": [
-      2421,
+      2413,
-      2470,
+      2458,
       0
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        2421,
+        2431,
+        0
+      ]
+    }
   }
 ]

rust/kcl-lib/tests/crazy_multi_profile/program_memory.snap

@@ -675,13 +675,13 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            2052,
+            2044,
-            2099,
+            2091,
             0
           ],
           "tag": {
-            "end": 2098,
+            "end": 2090,
-            "start": 2077,
+            "start": 2069,
             "type": "TagDeclarator",
             "value": "rectangleSegmentA002"
           },
@@ -691,8 +691,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            2105,
+            2097,
-            2182,
+            2174,
             0
           ],
           "tag": null,
@@ -702,8 +702,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            2188,
+            2180,
-            2285,
+            2277,
             0
           ],
           "tag": null,
@@ -713,8 +713,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            2291,
+            2283,
-            2347,
+            2339,
             0
           ],
           "tag": null,
@@ -729,8 +729,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                2052,
+                2044,
-                2099,
+                2091,
                 0
               ]
             },
@@ -739,8 +739,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               -6.39
             ],
             "tag": {
-              "end": 2098,
+              "end": 2090,
-              "start": 2077,
+              "start": 2069,
               "type": "TagDeclarator",
               "value": "rectangleSegmentA002"
             },
@@ -757,8 +757,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                2105,
+                2097,
-                2182,
+                2174,
                 0
               ]
             },
@@ -780,8 +780,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                2188,
+                2180,
-                2285,
+                2277,
                 0
               ]
             },
@@ -803,8 +803,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                2291,
+                2283,
-                2347,
+                2339,
                 0
               ]
             },
@@ -826,8 +826,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                2353,
+                2345,
-                2360,
+                2352,
                 0
               ]
             },
@@ -891,8 +891,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              2006,
+              1998,
-              2046,
+              2038,
               0
             ]
           }
@@ -2939,8 +2939,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              1490,
+              1482,
-              1514,
+              1506,
               0
             ]
           },
@@ -2962,8 +2962,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              1520,
+              1512,
-              1545,
+              1537,
               0
             ]
           },
@@ -3027,8 +3027,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
         "__geoMeta": {
           "id": "[uuid]",
           "sourceRange": [
-            1446,
+            1438,
-            1484,
+            1476,
             0
           ]
         }
@@ -3050,8 +3050,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              1604,
+              1596,
-              1628,
+              1620,
               0
             ]
           },
@@ -3073,8 +3073,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              1634,
+              1626,
-              1659,
+              1651,
               0
             ]
           },
@@ -3096,8 +3096,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              1665,
+              1657,
-              1721,
+              1713,
               0
             ]
           },
@@ -3119,8 +3119,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              1727,
+              1719,
-              1734,
+              1726,
               0
             ]
           },
@@ -3184,8 +3184,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
         "__geoMeta": {
           "id": "[uuid]",
           "sourceRange": [
-            1559,
+            1551,
-            1598,
+            1590,
             0
           ]
         }
@@ -3207,8 +3207,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              1793,
+              1785,
-              1816,
+              1808,
               0
             ]
           },
@@ -3230,8 +3230,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              1822,
+              1814,
-              1847,
+              1839,
               0
             ]
           },
@@ -3253,8 +3253,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              1853,
+              1845,
-              1909,
+              1901,
               0
             ]
           },
@@ -3276,8 +3276,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              1915,
+              1907,
-              1922,
+              1914,
               0
             ]
           },
@@ -3341,8 +3341,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
         "__geoMeta": {
           "id": "[uuid]",
           "sourceRange": [
-            1748,
+            1740,
-            1787,
+            1779,
             0
           ]
         }
@@ -3364,8 +3364,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              1936,
+              1928,
-              1992,
+              1984,
               0
             ]
           },
@@ -3435,8 +3435,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
         "__geoMeta": {
           "id": "[uuid]",
           "sourceRange": [
-            1936,
+            1928,
-            1992,
+            1984,
             0
           ]
         }
@@ -3458,8 +3458,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              2052,
+              2044,
-              2099,
+              2091,
               0
             ]
           },
@@ -3468,8 +3468,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             -6.39
           ],
           "tag": {
-            "end": 2098,
+            "end": 2090,
-            "start": 2077,
+            "start": 2069,
             "type": "TagDeclarator",
             "value": "rectangleSegmentA002"
           },
@@ -3486,8 +3486,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              2105,
+              2097,
-              2182,
+              2174,
               0
             ]
           },
@@ -3509,8 +3509,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              2188,
+              2180,
-              2285,
+              2277,
               0
             ]
           },
@@ -3532,8 +3532,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              2291,
+              2283,
-              2347,
+              2339,
               0
             ]
           },
@@ -3555,8 +3555,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              2353,
+              2345,
-              2360,
+              2352,
               0
             ]
           },
@@ -3620,8 +3620,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
         "__geoMeta": {
           "id": "[uuid]",
           "sourceRange": [
-            2006,
+            1998,
-            2046,
+            2038,
             0
           ]
         }
@@ -4054,8 +4054,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            1604,
+            1596,
-            1628,
+            1620,
             0
           ],
           "tag": null,
@@ -4065,8 +4065,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            1634,
+            1626,
-            1659,
+            1651,
             0
           ],
           "tag": null,
@@ -4076,8 +4076,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            1665,
+            1657,
-            1721,
+            1713,
             0
           ],
           "tag": null,
@@ -4092,8 +4092,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                1604,
+                1596,
-                1628,
+                1620,
                 0
               ]
             },
@@ -4115,8 +4115,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                1634,
+                1626,
-                1659,
+                1651,
                 0
               ]
             },
@@ -4138,8 +4138,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                1665,
+                1657,
-                1721,
+                1713,
                 0
               ]
             },
@@ -4161,8 +4161,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                1727,
+                1719,
-                1734,
+                1726,
                 0
               ]
             },
@@ -4226,8 +4226,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              1559,
+              1551,
-              1598,
+              1590,
               0
             ]
           }

rust/kcl-lib/tests/import_function_not_sketch/my_functions.kcl

@@ -11,7 +11,7 @@ export part001 = startSketchOn('XY')
   |> line(end = [0, -5.5])
   |> line(end = [-2, 0])
   |> close()
-  |> revolve({ axis = 'y' }, %) // default angle is 360
+  |> revolve(axis = 'y') // default angle is 360
 
 export fn two() {
   return 5

rust/kcl-lib/tests/import_function_not_sketch/ops.snap

@@ -28,32 +28,14 @@ description: Operations executed import_function_not_sketch.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "axis": {
         "value": {
-          "type": "Object",
+          "type": "String",
-          "value": {
+          "value": "y"
-            "axis": {
-              "type": "String",
-              "value": "y"
-            }
-          }
         },
         "sourceRange": [
-          313,
+          320,
-          327,
+          323,
-          3
-        ]
-      },
-      "sketches": {
-        "value": {
-          "type": "Sketch",
-          "value": {
-            "artifactId": "[uuid]"
-          }
-        },
-        "sourceRange": [
-          329,
-          330,
           3
         ]
       }
@@ -61,10 +43,22 @@ description: Operations executed import_function_not_sketch.kcl
     "name": "revolve",
     "sourceRange": [
       305,
-      331,
+      324,
       3
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        305,
+        324,
+        3
+      ]
+    }
   }
 ]

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

@@ -597,7 +597,7 @@ description: Artifact commands ball-bearing.kcl
     "cmdId": "[uuid]",
     "range": [
       1332,
-      1368,
+      1364,
       0
     ],
     "command": {
@@ -625,7 +625,7 @@ description: Artifact commands ball-bearing.kcl
     "cmdId": "[uuid]",
     "range": [
       1332,
-      1368,
+      1364,
       0
     ],
     "command": {
@@ -637,7 +637,7 @@ description: Artifact commands ball-bearing.kcl
     "cmdId": "[uuid]",
     "range": [
       1332,
-      1368,
+      1364,
       0
     ],
     "command": {
@@ -650,7 +650,7 @@ description: Artifact commands ball-bearing.kcl
     "cmdId": "[uuid]",
     "range": [
       1332,
-      1368,
+      1364,
       0
     ],
     "command": {
@@ -664,7 +664,7 @@ description: Artifact commands ball-bearing.kcl
     "cmdId": "[uuid]",
     "range": [
       1332,
-      1368,
+      1364,
       0
     ],
     "command": {
@@ -678,7 +678,7 @@ description: Artifact commands ball-bearing.kcl
     "cmdId": "[uuid]",
     "range": [
       1332,
-      1368,
+      1364,
       0
     ],
     "command": {
@@ -692,7 +692,7 @@ description: Artifact commands ball-bearing.kcl
     "cmdId": "[uuid]",
     "range": [
       1332,
-      1368,
+      1364,
       0
     ],
     "command": {
@@ -705,8 +705,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1374,
+      1370,
-      1534,
+      1530,
       0
     ],
     "command": {
@@ -730,8 +730,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1602,
+      1598,
-      1621,
+      1617,
       0
     ],
     "command": {
@@ -759,8 +759,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1627,
+      1623,
-      1760,
+      1756,
       0
     ],
     "command": {
@@ -779,8 +779,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1627,
+      1623,
-      1760,
+      1756,
       0
     ],
     "command": {
@@ -790,8 +790,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1627,
+      1623,
-      1760,
+      1756,
       0
     ],
     "command": {
@@ -807,8 +807,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1627,
+      1623,
-      1760,
+      1756,
       0
     ],
     "command": {
@@ -818,8 +818,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1766,
+      1762,
-      1859,
+      1855,
       0
     ],
     "command": {
@@ -847,8 +847,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1865,
+      1861,
-      1896,
+      1892,
       0
     ],
     "command": {
@@ -868,8 +868,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1902,
+      1898,
-      1930,
+      1926,
       0
     ],
     "command": {
@@ -889,8 +889,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1936,
+      1932,
-      1943,
+      1939,
       0
     ],
     "command": {
@@ -901,8 +901,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1985,
+      1981,
-      2021,
+      2013,
       0
     ],
     "command": {
@@ -929,8 +929,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1985,
+      1981,
-      2021,
+      2013,
       0
     ],
     "command": {
@@ -941,8 +941,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1985,
+      1981,
-      2021,
+      2013,
       0
     ],
     "command": {
@@ -954,8 +954,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1985,
+      1981,
-      2021,
+      2013,
       0
     ],
     "command": {
@@ -968,8 +968,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1985,
+      1981,
-      2021,
+      2013,
       0
     ],
     "command": {
@@ -982,8 +982,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1985,
+      1981,
-      2021,
+      2013,
       0
     ],
     "command": {
@@ -996,8 +996,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1985,
+      1981,
-      2021,
+      2013,
       0
     ],
     "command": {
@@ -1010,8 +1010,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1985,
+      1981,
-      2021,
+      2013,
       0
     ],
     "command": {
@@ -1024,8 +1024,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1985,
+      1981,
-      2021,
+      2013,
       0
     ],
     "command": {
@@ -1038,8 +1038,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1985,
+      1981,
-      2021,
+      2013,
       0
     ],
     "command": {
@@ -1052,8 +1052,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1985,
+      1981,
-      2021,
+      2013,
       0
     ],
     "command": {
@@ -1066,8 +1066,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2027,
+      2019,
-      2187,
+      2179,
       0
     ],
     "command": {
@@ -1091,8 +1091,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2259,
+      2251,
-      2278,
+      2270,
       0
     ],
     "command": {
@@ -1120,8 +1120,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2284,
+      2276,
-      2425,
+      2417,
       0
     ],
     "command": {
@@ -1140,8 +1140,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2284,
+      2276,
-      2425,
+      2417,
       0
     ],
     "command": {
@@ -1151,8 +1151,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2284,
+      2276,
-      2425,
+      2417,
       0
     ],
     "command": {
@@ -1168,8 +1168,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2284,
+      2276,
-      2425,
+      2417,
       0
     ],
     "command": {
@@ -1179,8 +1179,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2284,
+      2276,
-      2425,
+      2417,
       0
     ],
     "command": {
@@ -1208,8 +1208,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2284,
+      2276,
-      2425,
+      2417,
       0
     ],
     "command": {
@@ -1220,8 +1220,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2468,
+      2460,
-      2525,
+      2513,
       0
     ],
     "command": {
@@ -1248,8 +1248,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2468,
+      2460,
-      2525,
+      2513,
       0
     ],
     "command": {
@@ -1260,8 +1260,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2468,
+      2460,
-      2525,
+      2513,
       0
     ],
     "command": {
@@ -1273,8 +1273,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2468,
+      2460,
-      2525,
+      2513,
       0
     ],
     "command": {
@@ -1287,8 +1287,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2468,
+      2460,
-      2525,
+      2513,
       0
     ],
     "command": {
@@ -1301,8 +1301,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2531,
+      2519,
-      2691,
+      2679,
       0
     ],
     "command": {
@@ -1326,8 +1326,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2770,
+      2758,
-      2819,
+      2807,
       0
     ],
     "command": {
@@ -1355,8 +1355,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2770,
+      2758,
-      2819,
+      2807,
       0
     ],
     "command": {
@@ -1373,8 +1373,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2826,
+      2814,
-      2900,
+      2888,
       0
     ],
     "command": {
@@ -1393,8 +1393,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2826,
+      2814,
-      2900,
+      2888,
       0
     ],
     "command": {
@@ -1404,8 +1404,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2826,
+      2814,
-      2900,
+      2888,
       0
     ],
     "command": {
@@ -1421,8 +1421,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2826,
+      2814,
-      2900,
+      2888,
       0
     ],
     "command": {
@@ -1432,8 +1432,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2826,
+      2814,
-      2900,
+      2888,
       0
     ],
     "command": {
@@ -1461,8 +1461,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2826,
+      2814,
-      2900,
+      2888,
       0
     ],
     "command": {
@@ -1473,8 +1473,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2911,
+      2899,
-      3006,
+      2994,
       0
     ],
     "command": {
@@ -1493,8 +1493,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2911,
+      2899,
-      3006,
+      2994,
       0
     ],
     "command": {
@@ -1504,8 +1504,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2911,
+      2899,
-      3006,
+      2994,
       0
     ],
     "command": {
@@ -1521,8 +1521,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2911,
+      2899,
-      3006,
+      2994,
       0
     ],
     "command": {
@@ -1532,8 +1532,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2911,
+      2899,
-      3006,
+      2994,
       0
     ],
     "command": {
@@ -1561,8 +1561,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2911,
+      2899,
-      3006,
+      2994,
       0
     ],
     "command": {
@@ -1573,8 +1573,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2906,
+      2894,
-      3010,
+      2998,
       0
     ],
     "command": {
@@ -1586,8 +1586,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2906,
+      2894,
-      3010,
+      2998,
       0
     ],
     "command": {
@@ -1599,8 +1599,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      3026,
+      3014,
-      3079,
+      3067,
       0
     ],
     "command": {
@@ -1619,8 +1619,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      3026,
+      3014,
-      3079,
+      3067,
       0
     ],
     "command": {
@@ -1633,8 +1633,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      3026,
+      3014,
-      3079,
+      3067,
       0
     ],
     "command": {
@@ -1644,8 +1644,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      3026,
+      3014,
-      3079,
+      3067,
       0
     ],
     "command": {
@@ -1656,8 +1656,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      3026,
+      3014,
-      3079,
+      3067,
       0
     ],
     "command": {
@@ -1669,8 +1669,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      3026,
+      3014,
-      3079,
+      3067,
       0
     ],
     "command": {
@@ -1683,8 +1683,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      3026,
+      3014,
-      3079,
+      3067,
       0
     ],
     "command": {
@@ -1697,8 +1697,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      3026,
+      3014,
-      3079,
+      3067,
       0
     ],
     "command": {
@@ -1711,8 +1711,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      3026,
+      3014,
-      3079,
+      3067,
       0
     ],
     "command": {
@@ -1751,8 +1751,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2826,
+      2814,
-      2900,
+      2888,
       0
     ],
     "command": {
@@ -1764,8 +1764,8 @@ description: Artifact commands ball-bearing.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2911,
+      2899,
-      3006,
+      2994,
       0
     ],
     "command": {

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

@@ -17,26 +17,26 @@ flowchart LR
     18[Solid2d]
   end
   subgraph path24 [Path]
-    24["Path<br>[1627, 1760, 0]"]
+    24["Path<br>[1623, 1756, 0]"]
-    25["Segment<br>[1766, 1859, 0]"]
+    25["Segment<br>[1762, 1855, 0]"]
-    26["Segment<br>[1865, 1896, 0]"]
+    26["Segment<br>[1861, 1892, 0]"]
-    27["Segment<br>[1902, 1930, 0]"]
+    27["Segment<br>[1898, 1926, 0]"]
-    28["Segment<br>[1936, 1943, 0]"]
+    28["Segment<br>[1932, 1939, 0]"]
     29[Solid2d]
   end
   subgraph path40 [Path]
-    40["Path<br>[2284, 2425, 0]"]
+    40["Path<br>[2276, 2417, 0]"]
-    41["Segment<br>[2284, 2425, 0]"]
+    41["Segment<br>[2276, 2417, 0]"]
     42[Solid2d]
   end
   subgraph path50 [Path]
-    50["Path<br>[2826, 2900, 0]"]
+    50["Path<br>[2814, 2888, 0]"]
-    51["Segment<br>[2826, 2900, 0]"]
+    51["Segment<br>[2814, 2888, 0]"]
     52[Solid2d]
   end
   subgraph path53 [Path]
-    53["Path<br>[2911, 3006, 0]"]
+    53["Path<br>[2899, 2994, 0]"]
-    54["Segment<br>[2911, 3006, 0]"]
+    54["Segment<br>[2899, 2994, 0]"]
     55[Solid2d]
   end
   1["Plane<br>[677, 726, 0]"]
@@ -47,12 +47,12 @@ flowchart LR
   12["SweepEdge Opposite"]
   13["SweepEdge Adjacent"]
   14["Plane<br>[1058, 1077, 0]"]
-  19["Sweep Revolve<br>[1332, 1368, 0]"]
+  19["Sweep Revolve<br>[1332, 1364, 0]"]
   20[Wall]
   21[Wall]
   22["SweepEdge Adjacent"]
-  23["Plane<br>[1602, 1621, 0]"]
+  23["Plane<br>[1598, 1617, 0]"]
-  30["Sweep Revolve<br>[1985, 2021, 0]"]
+  30["Sweep Revolve<br>[1981, 2013, 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>[2259, 2278, 0]"]
+  39["Plane<br>[2251, 2270, 0]"]
-  43["Sweep Revolve<br>[2468, 2525, 0]"]
+  43["Sweep Revolve<br>[2460, 2513, 0]"]
   44[Wall]
   45["Cap Start"]
   46["Cap End"]
   47["SweepEdge Opposite"]
   48["SweepEdge Adjacent"]
-  49["Plane<br>[2770, 2819, 0]"]
+  49["Plane<br>[2758, 2807, 0]"]
-  56["Sweep Extrusion<br>[3026, 3079, 0]"]
+  56["Sweep Extrusion<br>[3014, 3067, 0]"]
   57[Wall]
   58["Cap Start"]
   59["Cap End"]
   60["SweepEdge Opposite"]
   61["SweepEdge Adjacent"]
   62["StartSketchOnPlane<br>[663, 727, 0]"]
-  63["StartSketchOnPlane<br>[2756, 2820, 0]"]
+  63["StartSketchOnPlane<br>[2744, 2808, 0]"]
   1 --- 2
   1 --- 5
   2 --- 3

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

@@ -169,32 +169,14 @@ description: Operations executed ball-bearing.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "axis": {
         "value": {
-          "type": "Object",
+          "type": "String",
-          "value": {
+          "value": "X"
-            "axis": {
-              "type": "String",
-              "value": "X"
-            }
-          }
         },
         "sourceRange": [
-          1340,
+          1360,
-          1354,
+          1363,
-          0
-        ]
-      },
-      "sketches": {
-        "value": {
-          "type": "Sketch",
-          "value": {
-            "artifactId": "[uuid]"
-          }
-        },
-        "sourceRange": [
-          1356,
-          1367,
           0
         ]
       }
@@ -202,11 +184,23 @@ description: Operations executed ball-bearing.kcl
     "name": "revolve",
     "sourceRange": [
       1332,
-      1368,
+      1364,
       0
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        1340,
+        1351,
+        0
+      ]
+    }
   },
   {
     "labeledArgs": {
@@ -225,8 +219,8 @@ description: Operations executed ball-bearing.kcl
           }
         },
         "sourceRange": [
-          1413,
+          1409,
-          1416,
+          1412,
           0
         ]
       },
@@ -276,8 +270,8 @@ description: Operations executed ball-bearing.kcl
           ]
         },
         "sourceRange": [
-          1432,
+          1428,
-          1441,
+          1437,
           0
         ]
       },
@@ -327,8 +321,8 @@ description: Operations executed ball-bearing.kcl
           ]
         },
         "sourceRange": [
-          1459,
+          1455,
-          1468,
+          1464,
           0
         ]
       },
@@ -347,8 +341,8 @@ description: Operations executed ball-bearing.kcl
           }
         },
         "sourceRange": [
-          1489,
+          1485,
-          1495,
+          1491,
           0
         ]
       },
@@ -358,16 +352,16 @@ description: Operations executed ball-bearing.kcl
           "value": true
         },
         "sourceRange": [
+          1519,
           1523,
-          1527,
           0
         ]
       }
     },
     "name": "patternCircular3d",
     "sourceRange": [
-      1374,
+      1370,
-      1534,
+      1530,
       0
     ],
     "type": "StdLibCall",
@@ -379,8 +373,8 @@ description: Operations executed ball-bearing.kcl
         }
       },
       "sourceRange": [
-        1374,
+        1370,
-        1534,
+        1530,
         0
       ]
     }
@@ -393,16 +387,16 @@ description: Operations executed ball-bearing.kcl
           "value": "XY"
         },
         "sourceRange": [
+          1612,
           1616,
-          1620,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      1602,
+      1598,
-      1621,
+      1617,
       0
     ],
     "type": "StdLibCall",
@@ -419,8 +413,8 @@ description: Operations executed ball-bearing.kcl
     "unlabeledArg": null,
     "labeledArgs": {},
     "sourceRange": [
-      1731,
+      1727,
-      1749,
+      1745,
       0
     ]
   },
@@ -429,44 +423,38 @@ description: Operations executed ball-bearing.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "axis": {
         "value": {
-          "type": "Object",
+          "type": "String",
-          "value": {
+          "value": "X"
-            "axis": {
-              "type": "String",
-              "value": "X"
-            }
-          }
-        },
-        "sourceRange": [
-          1993,
-          2007,
-          0
-        ]
-      },
-      "sketches": {
-        "value": {
-          "type": "Sketch",
-          "value": {
-            "artifactId": "[uuid]"
-          }
         },
         "sourceRange": [
           2009,
-          2020,
+          2012,
           0
         ]
       }
     },
     "name": "revolve",
     "sourceRange": [
-      1985,
+      1981,
-      2021,
+      2013,
       0
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        1989,
+        2000,
+        0
+      ]
+    }
   },
   {
     "labeledArgs": {
@@ -485,8 +473,8 @@ description: Operations executed ball-bearing.kcl
           }
         },
         "sourceRange": [
-          2066,
+          2058,
-          2069,
+          2061,
           0
         ]
       },
@@ -536,8 +524,8 @@ description: Operations executed ball-bearing.kcl
           ]
         },
         "sourceRange": [
-          2085,
+          2077,
-          2094,
+          2086,
           0
         ]
       },
@@ -587,8 +575,8 @@ description: Operations executed ball-bearing.kcl
           ]
         },
         "sourceRange": [
-          2112,
+          2104,
-          2121,
+          2113,
           0
         ]
       },
@@ -607,8 +595,8 @@ description: Operations executed ball-bearing.kcl
           }
         },
         "sourceRange": [
-          2142,
+          2134,
-          2148,
+          2140,
           0
         ]
       },
@@ -618,16 +606,16 @@ description: Operations executed ball-bearing.kcl
           "value": true
         },
         "sourceRange": [
-          2176,
+          2168,
-          2180,
+          2172,
           0
         ]
       }
     },
     "name": "patternCircular3d",
     "sourceRange": [
-      2027,
+      2019,
-      2187,
+      2179,
       0
     ],
     "type": "StdLibCall",
@@ -639,8 +627,8 @@ description: Operations executed ball-bearing.kcl
         }
       },
       "sourceRange": [
-        2027,
+        2019,
-        2187,
+        2179,
         0
       ]
     }
@@ -653,16 +641,16 @@ description: Operations executed ball-bearing.kcl
           "value": "XZ"
         },
         "sourceRange": [
-          2273,
+          2265,
-          2277,
+          2269,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      2259,
+      2251,
-      2278,
+      2270,
       0
     ],
     "type": "StdLibCall",
@@ -670,51 +658,52 @@ description: Operations executed ball-bearing.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "angle": {
         "value": {
-          "type": "Object",
+          "type": "Number",
-          "value": {
+          "value": 36.0,
-            "angle": {
+          "ty": {
-              "type": "Number",
+            "type": "Unknown"
-              "value": 36.0,
-              "ty": {
-                "type": "Unknown"
-              }
-            },
-            "axis": {
-              "type": "String",
-              "value": "Y"
-            }
           }
         },
         "sourceRange": [
-          2476,
+          2500,
           2512,
           0
         ]
       },
-      "sketches": {
+      "axis": {
         "value": {
-          "type": "Sketch",
+          "type": "String",
-          "value": {
+          "value": "Y"
-            "artifactId": "[uuid]"
-          }
         },
         "sourceRange": [
-          2514,
+          2487,
-          2524,
+          2490,
           0
         ]
       }
     },
     "name": "revolve",
     "sourceRange": [
-      2468,
+      2460,
-      2525,
+      2513,
       0
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        2468,
+        2478,
+        0
+      ]
+    }
   },
   {
     "labeledArgs": {
@@ -733,8 +722,8 @@ description: Operations executed ball-bearing.kcl
           }
         },
         "sourceRange": [
-          2570,
+          2558,
-          2573,
+          2561,
           0
         ]
       },
@@ -784,8 +773,8 @@ description: Operations executed ball-bearing.kcl
           ]
         },
         "sourceRange": [
-          2589,
+          2577,
-          2598,
+          2586,
           0
         ]
       },
@@ -835,8 +824,8 @@ description: Operations executed ball-bearing.kcl
           ]
         },
         "sourceRange": [
-          2616,
+          2604,
-          2625,
+          2613,
           0
         ]
       },
@@ -855,8 +844,8 @@ description: Operations executed ball-bearing.kcl
           }
         },
         "sourceRange": [
-          2646,
+          2634,
-          2652,
+          2640,
           0
         ]
       },
@@ -866,16 +855,16 @@ description: Operations executed ball-bearing.kcl
           "value": true
         },
         "sourceRange": [
-          2680,
+          2668,
-          2684,
+          2672,
           0
         ]
       }
     },
     "name": "patternCircular3d",
     "sourceRange": [
-      2531,
+      2519,
-      2691,
+      2679,
       0
     ],
     "type": "StdLibCall",
@@ -887,8 +876,8 @@ description: Operations executed ball-bearing.kcl
         }
       },
       "sourceRange": [
-        2531,
+        2519,
-        2691,
+        2679,
         0
       ]
     }
@@ -904,16 +893,16 @@ description: Operations executed ball-bearing.kcl
           }
         },
         "sourceRange": [
-          2797,
+          2785,
-          2818,
+          2806,
           0
         ]
       }
     },
     "name": "offsetPlane",
     "sourceRange": [
-      2770,
+      2758,
-      2819,
+      2807,
       0
     ],
     "type": "StdLibCall",
@@ -923,8 +912,8 @@ description: Operations executed ball-bearing.kcl
         "value": "XY"
       },
       "sourceRange": [
-        2782,
+        2770,
-        2786,
+        2774,
         0
       ]
     }
@@ -937,16 +926,16 @@ description: Operations executed ball-bearing.kcl
           "artifact_id": "[uuid]"
         },
         "sourceRange": [
-          2770,
+          2758,
-          2819,
+          2807,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      2756,
+      2744,
-      2820,
+      2808,
       0
     ],
     "type": "StdLibCall",
@@ -962,8 +951,8 @@ description: Operations executed ball-bearing.kcl
           }
         },
         "sourceRange": [
-          2911,
+          2899,
-          3006,
+          2994,
           0
         ]
       },
@@ -975,16 +964,16 @@ description: Operations executed ball-bearing.kcl
           }
         },
         "sourceRange": [
-          3008,
+          2996,
-          3009,
+          2997,
           0
         ]
       }
     },
     "name": "hole",
     "sourceRange": [
-      2906,
+      2894,
-      3010,
+      2998,
       0
     ],
     "type": "StdLibCall",
@@ -1007,16 +996,16 @@ description: Operations executed ball-bearing.kcl
           }
         },
         "sourceRange": [
-          3062,
+          3050,
-          3078,
+          3066,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      3026,
+      3014,
-      3079,
+      3067,
       0
     ],
     "type": "StdLibCall",
@@ -1028,8 +1017,8 @@ description: Operations executed ball-bearing.kcl
         }
       },
       "sourceRange": [
-        3034,
+        3022,
-        3051,
+        3039,
         0
       ]
     }

rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/artifact_graph_flowchart.snap.md

@@ -93,58 +93,58 @@ flowchart LR
     185[Solid2d]
   end
   subgraph path195 [Path]
-    195["Path<br>[2246, 2292, 3]"]
+    195["Path<br>[2239, 2285, 3]"]
-    196["Segment<br>[2298, 2350, 3]"]
+    196["Segment<br>[2291, 2343, 3]"]
-    197["Segment<br>[2356, 2463, 3]"]
+    197["Segment<br>[2349, 2456, 3]"]
-    198["Segment<br>[2469, 2506, 3]"]
+    198["Segment<br>[2462, 2499, 3]"]
-    199["Segment<br>[2512, 2568, 3]"]
+    199["Segment<br>[2505, 2561, 3]"]
-    200["Segment<br>[2574, 2581, 3]"]
+    200["Segment<br>[2567, 2574, 3]"]
     201[Solid2d]
   end
   subgraph path212 [Path]
-    212["Path<br>[3099, 3146, 3]"]
+    212["Path<br>[3085, 3132, 3]"]
-    213["Segment<br>[3154, 3494, 3]"]
+    213["Segment<br>[3140, 3480, 3]"]
-    214["Segment<br>[3502, 3534, 3]"]
+    214["Segment<br>[3488, 3520, 3]"]
-    215["Segment<br>[3542, 3886, 3]"]
+    215["Segment<br>[3528, 3872, 3]"]
-    216["Segment<br>[3894, 3950, 3]"]
+    216["Segment<br>[3880, 3936, 3]"]
-    217["Segment<br>[3958, 3965, 3]"]
+    217["Segment<br>[3944, 3951, 3]"]
     218[Solid2d]
   end
   subgraph path235 [Path]
-    235["Path<br>[3099, 3146, 3]"]
+    235["Path<br>[3085, 3132, 3]"]
-    236["Segment<br>[3154, 3494, 3]"]
+    236["Segment<br>[3140, 3480, 3]"]
-    237["Segment<br>[3502, 3534, 3]"]
+    237["Segment<br>[3488, 3520, 3]"]
-    238["Segment<br>[3542, 3886, 3]"]
+    238["Segment<br>[3528, 3872, 3]"]
-    239["Segment<br>[3894, 3950, 3]"]
+    239["Segment<br>[3880, 3936, 3]"]
-    240["Segment<br>[3958, 3965, 3]"]
+    240["Segment<br>[3944, 3951, 3]"]
     241[Solid2d]
   end
   subgraph path258 [Path]
-    258["Path<br>[4494, 4589, 3]"]
+    258["Path<br>[4480, 4575, 3]"]
-    259["Segment<br>[4595, 4628, 3]"]
+    259["Segment<br>[4581, 4614, 3]"]
-    260["Segment<br>[4634, 4685, 3]"]
+    260["Segment<br>[4620, 4671, 3]"]
-    261["Segment<br>[4691, 4724, 3]"]
+    261["Segment<br>[4677, 4710, 3]"]
-    262["Segment<br>[4730, 4780, 3]"]
+    262["Segment<br>[4716, 4766, 3]"]
-    263["Segment<br>[4786, 4827, 3]"]
+    263["Segment<br>[4772, 4813, 3]"]
-    264["Segment<br>[4833, 4882, 3]"]
+    264["Segment<br>[4819, 4868, 3]"]
-    265["Segment<br>[4888, 4921, 3]"]
+    265["Segment<br>[4874, 4907, 3]"]
-    266["Segment<br>[4927, 4961, 3]"]
+    266["Segment<br>[4913, 4947, 3]"]
-    267["Segment<br>[4967, 5001, 3]"]
+    267["Segment<br>[4953, 4987, 3]"]
-    268["Segment<br>[5007, 5059, 3]"]
+    268["Segment<br>[4993, 5045, 3]"]
-    269["Segment<br>[5065, 5099, 3]"]
+    269["Segment<br>[5051, 5085, 3]"]
-    270["Segment<br>[5105, 5181, 3]"]
+    270["Segment<br>[5091, 5167, 3]"]
-    271["Segment<br>[5187, 5220, 3]"]
+    271["Segment<br>[5173, 5206, 3]"]
-    272["Segment<br>[5226, 5302, 3]"]
+    272["Segment<br>[5212, 5288, 3]"]
-    273["Segment<br>[5308, 5342, 3]"]
+    273["Segment<br>[5294, 5328, 3]"]
-    274["Segment<br>[5348, 5422, 3]"]
+    274["Segment<br>[5334, 5408, 3]"]
-    275["Segment<br>[5428, 5462, 3]"]
+    275["Segment<br>[5414, 5448, 3]"]
-    276["Segment<br>[5468, 5519, 3]"]
+    276["Segment<br>[5454, 5505, 3]"]
-    277["Segment<br>[5525, 5587, 3]"]
+    277["Segment<br>[5511, 5573, 3]"]
-    278["Segment<br>[5593, 5644, 3]"]
+    278["Segment<br>[5579, 5630, 3]"]
-    279["Segment<br>[5650, 5684, 3]"]
+    279["Segment<br>[5636, 5670, 3]"]
-    280["Segment<br>[5690, 5723, 3]"]
+    280["Segment<br>[5676, 5709, 3]"]
-    281["Segment<br>[5729, 5762, 3]"]
+    281["Segment<br>[5715, 5748, 3]"]
-    282["Segment<br>[5768, 5775, 3]"]
+    282["Segment<br>[5754, 5761, 3]"]
     283[Solid2d]
   end
   subgraph path334 [Path]
@@ -324,7 +324,7 @@ flowchart LR
   176["Sweep Extrusion<br>[1572, 1606, 3]"]
   177["Sweep Extrusion<br>[1572, 1606, 3]"]
   178["Plane<br>[1760, 1779, 3]"]
-  186["Sweep Revolve<br>[2109, 2135, 3]"]
+  186["Sweep Revolve<br>[2109, 2128, 3]"]
   187[Wall]
   188[Wall]
   189[Wall]
@@ -332,8 +332,8 @@ flowchart LR
   191["SweepEdge Adjacent"]
   192["SweepEdge Adjacent"]
   193["SweepEdge Adjacent"]
-  194["Plane<br>[2221, 2240, 3]"]
+  194["Plane<br>[2214, 2233, 3]"]
-  202["Sweep Revolve<br>[2587, 2613, 3]"]
+  202["Sweep Revolve<br>[2580, 2599, 3]"]
   203[Wall]
   204[Wall]
   205[Wall]
@@ -342,8 +342,8 @@ flowchart LR
   208["SweepEdge Adjacent"]
   209["SweepEdge Adjacent"]
   210["SweepEdge Adjacent"]
-  211["Plane<br>[3068, 3091, 3]"]
+  211["Plane<br>[3054, 3077, 3]"]
-  219["Sweep Extrusion<br>[4013, 4059, 3]"]
+  219["Sweep Extrusion<br>[3999, 4045, 3]"]
   220[Wall]
   221[Wall]
   222[Wall]
@@ -358,8 +358,8 @@ flowchart LR
   231["SweepEdge Adjacent"]
   232["SweepEdge Opposite"]
   233["SweepEdge Adjacent"]
-  234["Plane<br>[3068, 3091, 3]"]
+  234["Plane<br>[3054, 3077, 3]"]
-  242["Sweep Extrusion<br>[4013, 4059, 3]"]
+  242["Sweep Extrusion<br>[3999, 4045, 3]"]
   243[Wall]
   244[Wall]
   245[Wall]
@@ -374,8 +374,8 @@ flowchart LR
   254["SweepEdge Adjacent"]
   255["SweepEdge Opposite"]
   256["SweepEdge Adjacent"]
-  257["Plane<br>[4469, 4488, 3]"]
+  257["Plane<br>[4455, 4474, 3]"]
-  284["Sweep Revolve<br>[5781, 5807, 3]"]
+  284["Sweep Revolve<br>[5767, 5786, 3]"]
   285[Wall]
   286[Wall]
   287[Wall]
@@ -425,7 +425,7 @@ flowchart LR
   331["SweepEdge Adjacent"]
   332["SweepEdge Adjacent"]
   333["Plane<br>[708, 734, 6]"]
-  345["Sweep Revolve<br>[1184, 1210, 6]"]
+  345["Sweep Revolve<br>[1184, 1203, 6]"]
   346[Wall]
   347[Wall]
   348[Wall]
@@ -445,7 +445,7 @@ flowchart LR
   362["SweepEdge Adjacent"]
   363["SweepEdge Adjacent"]
   364["Plane<br>[486, 505, 5]"]
-  384["Sweep Revolve<br>[2247, 2303, 5]"]
+  384["Sweep Revolve<br>[2247, 2299, 5]"]
   385[Wall]
   386[Wall]
   387[Wall]
@@ -500,7 +500,7 @@ flowchart LR
   436["SweepEdge Opposite"]
   437["SweepEdge Adjacent"]
   438["Plane<br>[462, 481, 7]"]
-  455["Sweep Revolve<br>[1462, 1497, 7]"]
+  455["Sweep Revolve<br>[1462, 1493, 7]"]
   456[Wall]
   457[Wall]
   458[Wall]

rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/ast.snap

@@ -25,7 +25,7 @@ description: Result of parsing car-wheel-assembly.kcl
         "type": "ImportStatement"
       },
       {
-        "end": 199,
+        "end": 198,
         "path": {
           "type": "Kcl",
           "filename": "car-rotor.kcl"
@@ -33,18 +33,18 @@ description: Result of parsing car-wheel-assembly.kcl
         "selector": {
           "type": "None",
           "alias": {
-            "end": 199,
+            "end": 198,
             "name": "carRotor",
-            "start": 191,
+            "start": 190,
             "type": "Identifier"
           }
         },
-        "start": 165,
+        "start": 164,
         "type": "ImportStatement",
         "type": "ImportStatement"
       },
       {
-        "end": 242,
+        "end": 241,
         "path": {
           "type": "Kcl",
           "filename": "brake-caliper.kcl"
@@ -52,18 +52,18 @@ description: Result of parsing car-wheel-assembly.kcl
         "selector": {
           "type": "None",
           "alias": {
-            "end": 242,
+            "end": 241,
             "name": "brakeCaliper",
-            "start": 230,
+            "start": 229,
             "type": "Identifier"
           }
         },
-        "start": 200,
+        "start": 199,
         "type": "ImportStatement",
         "type": "ImportStatement"
       },
       {
-        "end": 273,
+        "end": 272,
         "path": {
           "type": "Kcl",
           "filename": "lug-nut.kcl"
@@ -71,18 +71,18 @@ description: Result of parsing car-wheel-assembly.kcl
         "selector": {
           "type": "None",
           "alias": {
-            "end": 273,
+            "end": 272,
             "name": "lugNut",
-            "start": 267,
+            "start": 266,
             "type": "Identifier"
           }
         },
-        "start": 243,
+        "start": 242,
         "type": "ImportStatement",
         "type": "ImportStatement"
       },
       {
-        "end": 306,
+        "end": 305,
         "path": {
           "type": "Kcl",
           "filename": "car-tire.kcl"
@@ -90,18 +90,18 @@ description: Result of parsing car-wheel-assembly.kcl
         "selector": {
           "type": "None",
           "alias": {
-            "end": 306,
+            "end": 305,
             "name": "carTire",
-            "start": 299,
+            "start": 298,
             "type": "Identifier"
           }
         },
-        "start": 274,
+        "start": 273,
         "type": "ImportStatement",
         "type": "ImportStatement"
       },
       {
-        "end": 341,
+        "end": 340,
         "path": {
           "type": "Kcl",
           "filename": "globals.kcl"
@@ -111,30 +111,30 @@ description: Result of parsing car-wheel-assembly.kcl
           "items": [
             {
               "alias": null,
-              "end": 322,
+              "end": 321,
               "name": {
-                "end": 322,
+                "end": 321,
                 "name": "lugCount",
-                "start": 314,
+                "start": 313,
                 "type": "Identifier"
               },
-              "start": 314,
+              "start": 313,
               "type": "ImportItem"
             }
           ]
         },
-        "start": 307,
+        "start": 306,
         "type": "ImportStatement",
         "type": "ImportStatement"
       },
       {
-        "end": 391,
+        "end": 390,
         "expression": {
           "body": [
             {
-              "end": 351,
+              "end": 350,
               "name": "carRotor",
-              "start": 343,
+              "start": 342,
               "type": "Identifier",
               "type": "Identifier"
             },
@@ -143,17 +143,17 @@ description: Result of parsing car-wheel-assembly.kcl
                 {
                   "type": "LabeledArg",
                   "label": {
-                    "end": 376,
+                    "end": 375,
                     "name": "translate",
-                    "start": 367,
+                    "start": 366,
                     "type": "Identifier"
                   },
                   "arg": {
                     "elements": [
                       {
-                        "end": 381,
+                        "end": 380,
                         "raw": "0",
-                        "start": 380,
+                        "start": 379,
                         "type": "Literal",
                         "type": "Literal",
                         "value": {
@@ -162,9 +162,9 @@ description: Result of parsing car-wheel-assembly.kcl
                         }
                       },
                       {
-                        "end": 386,
+                        "end": 385,
                         "raw": "0.5",
-                        "start": 383,
+                        "start": 382,
                         "type": "Literal",
                         "type": "Literal",
                         "value": {
@@ -173,9 +173,9 @@ description: Result of parsing car-wheel-assembly.kcl
                         }
                       },
                       {
-                        "end": 389,
+                        "end": 388,
                         "raw": "0",
-                        "start": 388,
+                        "start": 387,
                         "type": "Literal",
                         "type": "Literal",
                         "value": {
@@ -184,56 +184,56 @@ description: Result of parsing car-wheel-assembly.kcl
                         }
                       }
                     ],
-                    "end": 390,
+                    "end": 389,
-                    "start": 379,
+                    "start": 378,
                     "type": "ArrayExpression",
                     "type": "ArrayExpression"
                   }
                 }
               ],
               "callee": {
-                "end": 366,
+                "end": 365,
                 "name": "translate",
-                "start": 357,
+                "start": 356,
                 "type": "Identifier"
               },
-              "end": 391,
+              "end": 390,
-              "start": 357,
+              "start": 356,
               "type": "CallExpressionKw",
               "type": "CallExpressionKw",
               "unlabeled": null
             }
           ],
-          "end": 391,
+          "end": 390,
-          "start": 343,
+          "start": 342,
           "type": "PipeExpression",
           "type": "PipeExpression"
         },
-        "start": 343,
+        "start": 342,
         "type": "ExpressionStatement",
         "type": "ExpressionStatement"
       },
       {
-        "end": 400,
+        "end": 399,
         "expression": {
-          "end": 400,
+          "end": 399,
           "name": "carWheel",
-          "start": 392,
+          "start": 391,
           "type": "Identifier",
           "type": "Identifier"
         },
-        "start": 392,
+        "start": 391,
         "type": "ExpressionStatement",
         "type": "ExpressionStatement"
       },
       {
-        "end": 564,
+        "end": 563,
         "expression": {
           "body": [
             {
-              "end": 407,
+              "end": 406,
               "name": "lugNut",
-              "start": 401,
+              "start": 400,
               "type": "Identifier",
               "type": "Identifier"
             },
@@ -242,15 +242,15 @@ description: Result of parsing car-wheel-assembly.kcl
                 {
                   "type": "LabeledArg",
                   "label": {
-                    "end": 447,
+                    "end": 446,
                     "name": "arcDegrees",
-                    "start": 437,
+                    "start": 436,
                     "type": "Identifier"
                   },
                   "arg": {
-                    "end": 453,
+                    "end": 452,
                     "raw": "360",
-                    "start": 450,
+                    "start": 449,
                     "type": "Literal",
                     "type": "Literal",
                     "value": {
@@ -262,17 +262,17 @@ description: Result of parsing car-wheel-assembly.kcl
                 {
                   "type": "LabeledArg",
                   "label": {
-                    "end": 464,
+                    "end": 463,
                     "name": "axis",
-                    "start": 460,
+                    "start": 459,
                     "type": "Identifier"
                   },
                   "arg": {
                     "elements": [
                       {
-                        "end": 469,
+                        "end": 468,
                         "raw": "0",
-                        "start": 468,
+                        "start": 467,
                         "type": "Literal",
                         "type": "Literal",
                         "value": {
@@ -281,9 +281,9 @@ description: Result of parsing car-wheel-assembly.kcl
                         }
                       },
                       {
-                        "end": 472,
+                        "end": 471,
                         "raw": "1",
-                        "start": 471,
+                        "start": 470,
                         "type": "Literal",
                         "type": "Literal",
                         "value": {
@@ -292,9 +292,9 @@ description: Result of parsing car-wheel-assembly.kcl
                         }
                       },
                       {
-                        "end": 475,
+                        "end": 474,
                         "raw": "0",
-                        "start": 474,
+                        "start": 473,
                         "type": "Literal",
                         "type": "Literal",
                         "value": {
@@ -303,8 +303,8 @@ description: Result of parsing car-wheel-assembly.kcl
                         }
                       }
                     ],
-                    "end": 476,
+                    "end": 475,
-                    "start": 467,
+                    "start": 466,
                     "type": "ArrayExpression",
                     "type": "ArrayExpression"
                   }
@@ -312,17 +312,17 @@ description: Result of parsing car-wheel-assembly.kcl
                 {
                   "type": "LabeledArg",
                   "label": {
-                    "end": 489,
+                    "end": 488,
                     "name": "center",
-                    "start": 483,
+                    "start": 482,
                     "type": "Identifier"
                   },
                   "arg": {
                     "elements": [
                       {
-                        "end": 494,
+                        "end": 493,
                         "raw": "0",
-                        "start": 493,
+                        "start": 492,
                         "type": "Literal",
                         "type": "Literal",
                         "value": {
@@ -331,9 +331,9 @@ description: Result of parsing car-wheel-assembly.kcl
                         }
                       },
                       {
-                        "end": 497,
+                        "end": 496,
                         "raw": "0",
-                        "start": 496,
+                        "start": 495,
                         "type": "Literal",
                         "type": "Literal",
                         "value": {
@@ -342,9 +342,9 @@ description: Result of parsing car-wheel-assembly.kcl
                         }
                       },
                       {
-                        "end": 500,
+                        "end": 499,
                         "raw": "0",
-                        "start": 499,
+                        "start": 498,
                         "type": "Literal",
                         "type": "Literal",
                         "value": {
@@ -353,8 +353,8 @@ description: Result of parsing car-wheel-assembly.kcl
                         }
                       }
                     ],
-                    "end": 501,
+                    "end": 500,
-                    "start": 492,
+                    "start": 491,
                     "type": "ArrayExpression",
                     "type": "ArrayExpression"
                   }
@@ -362,15 +362,15 @@ description: Result of parsing car-wheel-assembly.kcl
                 {
                   "type": "LabeledArg",
                   "label": {
-                    "end": 517,
+                    "end": 516,
                     "name": "instances",
-                    "start": 508,
+                    "start": 507,
                     "type": "Identifier"
                   },
                   "arg": {
-                    "end": 528,
+                    "end": 527,
                     "name": "lugCount",
-                    "start": 520,
+                    "start": 519,
                     "type": "Identifier",
                     "type": "Identifier"
                   }
@@ -378,15 +378,15 @@ description: Result of parsing car-wheel-assembly.kcl
                 {
                   "type": "LabeledArg",
                   "label": {
-                    "end": 551,
+                    "end": 550,
                     "name": "rotateDuplicates",
-                    "start": 535,
+                    "start": 534,
                     "type": "Identifier"
                   },
                   "arg": {
-                    "end": 559,
+                    "end": 558,
                     "raw": "false",
-                    "start": 554,
+                    "start": 553,
                     "type": "Literal",
                     "type": "Literal",
                     "value": false
@@ -394,35 +394,35 @@ description: Result of parsing car-wheel-assembly.kcl
                 }
               ],
               "callee": {
-                "end": 430,
+                "end": 429,
                 "name": "patternCircular3d",
-                "start": 413,
+                "start": 412,
                 "type": "Identifier"
               },
-              "end": 564,
+              "end": 563,
-              "start": 413,
+              "start": 412,
               "type": "CallExpressionKw",
               "type": "CallExpressionKw",
               "unlabeled": null
             }
           ],
-          "end": 564,
+          "end": 563,
-          "start": 401,
+          "start": 400,
           "type": "PipeExpression",
           "type": "PipeExpression"
         },
-        "start": 401,
+        "start": 400,
         "type": "ExpressionStatement",
         "type": "ExpressionStatement"
       },
       {
-        "end": 617,
+        "end": 616,
         "expression": {
           "body": [
             {
-              "end": 577,
+              "end": 576,
               "name": "brakeCaliper",
-              "start": 565,
+              "start": 564,
               "type": "Identifier",
               "type": "Identifier"
             },
@@ -431,17 +431,17 @@ description: Result of parsing car-wheel-assembly.kcl
                 {
                   "type": "LabeledArg",
                   "label": {
-                    "end": 602,
+                    "end": 601,
                     "name": "translate",
-                    "start": 593,
+                    "start": 592,
                     "type": "Identifier"
                   },
                   "arg": {
                     "elements": [
                       {
-                        "end": 607,
+                        "end": 606,
                         "raw": "0",
-                        "start": 606,
+                        "start": 605,
                         "type": "Literal",
                         "type": "Literal",
                         "value": {
@@ -450,9 +450,9 @@ description: Result of parsing car-wheel-assembly.kcl
                         }
                       },
                       {
-                        "end": 612,
+                        "end": 611,
                         "raw": "0.5",
-                        "start": 609,
+                        "start": 608,
                         "type": "Literal",
                         "type": "Literal",
                         "value": {
@@ -461,9 +461,9 @@ description: Result of parsing car-wheel-assembly.kcl
                         }
                       },
                       {
-                        "end": 615,
+                        "end": 614,
                         "raw": "0",
-                        "start": 614,
+                        "start": 613,
                         "type": "Literal",
                         "type": "Literal",
                         "value": {
@@ -472,50 +472,50 @@ description: Result of parsing car-wheel-assembly.kcl
                         }
                       }
                     ],
-                    "end": 616,
+                    "end": 615,
-                    "start": 605,
+                    "start": 604,
                     "type": "ArrayExpression",
                     "type": "ArrayExpression"
                   }
                 }
               ],
               "callee": {
-                "end": 592,
+                "end": 591,
                 "name": "translate",
-                "start": 583,
+                "start": 582,
                 "type": "Identifier"
               },
-              "end": 617,
+              "end": 616,
-              "start": 583,
+              "start": 582,
               "type": "CallExpressionKw",
               "type": "CallExpressionKw",
               "unlabeled": null
             }
           ],
-          "end": 617,
+          "end": 616,
-          "start": 565,
+          "start": 564,
           "type": "PipeExpression",
           "type": "PipeExpression"
         },
-        "start": 565,
+        "start": 564,
         "type": "ExpressionStatement",
         "type": "ExpressionStatement"
       },
       {
-        "end": 625,
+        "end": 624,
         "expression": {
-          "end": 625,
+          "end": 624,
           "name": "carTire",
-          "start": 618,
+          "start": 617,
           "type": "Identifier",
           "type": "Identifier"
         },
-        "start": 618,
+        "start": 617,
         "type": "ExpressionStatement",
         "type": "ExpressionStatement"
       }
     ],
-    "end": 626,
+    "end": 625,
     "innerAttrs": [
       {
         "end": 127,
@@ -553,8 +553,8 @@ description: Result of parsing car-wheel-assembly.kcl
       "nonCodeNodes": {
         "5": [
           {
-            "end": 343,
+            "end": 342,
-            "start": 341,
+            "start": 340,
             "type": "NonCodeNode",
             "value": {
               "type": "newLine"

rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/ops.snap

@@ -1339,32 +1339,14 @@ description: Operations executed car-wheel-assembly.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "axis": {
         "value": {
-          "type": "Object",
+          "type": "String",
-          "value": {
+          "value": "y"
-            "axis": {
-              "type": "String",
-              "value": "y"
-            }
-          }
         },
         "sourceRange": [
-          2117,
+          2124,
-          2131,
+          2127,
-          3
-        ]
-      },
-      "sketches": {
-        "value": {
-          "type": "Sketch",
-          "value": {
-            "artifactId": "[uuid]"
-          }
-        },
-        "sourceRange": [
-          2133,
-          2134,
           3
         ]
       }
@@ -1372,11 +1354,23 @@ description: Operations executed car-wheel-assembly.kcl
     "name": "revolve",
     "sourceRange": [
       2109,
-      2135,
+      2128,
       3
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        2109,
+        2128,
+        3
+      ]
+    }
   },
   {
     "labeledArgs": {
@@ -1386,16 +1380,16 @@ description: Operations executed car-wheel-assembly.kcl
           "value": "XY"
         },
         "sourceRange": [
-          2235,
+          2228,
-          2239,
+          2232,
           3
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      2221,
+      2214,
-      2240,
+      2233,
       3
     ],
     "type": "StdLibCall",
@@ -1403,58 +1397,52 @@ description: Operations executed car-wheel-assembly.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "axis": {
         "value": {
-          "type": "Object",
+          "type": "String",
-          "value": {
+          "value": "y"
-            "axis": {
-              "type": "String",
-              "value": "y"
-            }
-          }
         },
         "sourceRange": [
           2595,
-          2609,
+          2598,
-          3
-        ]
-      },
-      "sketches": {
-        "value": {
-          "type": "Sketch",
-          "value": {
-            "artifactId": "[uuid]"
-          }
-        },
-        "sourceRange": [
-          2611,
-          2612,
           3
         ]
       }
     },
     "name": "revolve",
     "sourceRange": [
-      2587,
+      2580,
-      2613,
+      2599,
       3
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        2580,
+        2599,
+        3
+      ]
+    }
   },
   {
     "type": "UserDefinedFunctionCall",
     "name": "spoke",
     "functionSourceRange": [
-      2766,
+      2752,
-      4338,
+      4324,
       3
     ],
     "unlabeledArg": null,
     "labeledArgs": {},
     "sourceRange": [
-      4340,
+      4326,
-      4383,
+      4369,
       3
     ]
   },
@@ -1642,16 +1630,16 @@ description: Operations executed car-wheel-assembly.kcl
           }
         },
         "sourceRange": [
-          3082,
+          3068,
-          3090,
+          3076,
           3
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      3068,
+      3054,
-      3091,
+      3077,
       3
     ],
     "type": "StdLibCall",
@@ -1674,16 +1662,16 @@ description: Operations executed car-wheel-assembly.kcl
           }
         },
         "sourceRange": [
+          4030,
           4044,
-          4058,
           3
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      4013,
+      3999,
-      4059,
+      4045,
       3
     ],
     "type": "StdLibCall",
@@ -1695,8 +1683,8 @@ description: Operations executed car-wheel-assembly.kcl
         }
       },
       "sourceRange": [
-        4021,
+        4007,
-        4033,
+        4019,
         3
       ]
     }
@@ -1718,8 +1706,8 @@ description: Operations executed car-wheel-assembly.kcl
           }
         },
         "sourceRange": [
-          4201,
+          4187,
-          4204,
+          4190,
           3
         ]
       },
@@ -1769,8 +1757,8 @@ description: Operations executed car-wheel-assembly.kcl
           ]
         },
         "sourceRange": [
-          4102,
+          4088,
-          4111,
+          4097,
           3
         ]
       },
@@ -1820,8 +1808,8 @@ description: Operations executed car-wheel-assembly.kcl
           ]
         },
         "sourceRange": [
-          4131,
+          4117,
-          4144,
+          4130,
           3
         ]
       },
@@ -1840,8 +1828,8 @@ description: Operations executed car-wheel-assembly.kcl
           }
         },
         "sourceRange": [
-          4167,
+          4153,
-          4177,
+          4163,
           3
         ]
       },
@@ -1851,16 +1839,16 @@ description: Operations executed car-wheel-assembly.kcl
           "value": true
         },
         "sourceRange": [
-          4234,
+          4220,
-          4238,
+          4224,
           3
         ]
       }
     },
     "name": "patternCircular3d",
     "sourceRange": [
-      4067,
+      4053,
-      4247,
+      4233,
       3
     ],
     "type": "StdLibCall",
@@ -1872,8 +1860,8 @@ description: Operations executed car-wheel-assembly.kcl
         }
       },
       "sourceRange": [
-        4067,
+        4053,
-        4247,
+        4233,
         3
       ]
     }
@@ -1885,15 +1873,15 @@ description: Operations executed car-wheel-assembly.kcl
     "type": "UserDefinedFunctionCall",
     "name": "spoke",
     "functionSourceRange": [
-      2766,
+      2752,
-      4338,
+      4324,
       3
     ],
     "unlabeledArg": null,
     "labeledArgs": {},
     "sourceRange": [
-      4384,
+      4370,
-      4430,
+      4416,
       3
     ]
   },
@@ -2081,16 +2069,16 @@ description: Operations executed car-wheel-assembly.kcl
           }
         },
         "sourceRange": [
-          3082,
+          3068,
-          3090,
+          3076,
           3
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      3068,
+      3054,
-      3091,
+      3077,
       3
     ],
     "type": "StdLibCall",
@@ -2113,16 +2101,16 @@ description: Operations executed car-wheel-assembly.kcl
           }
         },
         "sourceRange": [
+          4030,
           4044,
-          4058,
           3
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      4013,
+      3999,
-      4059,
+      4045,
       3
     ],
     "type": "StdLibCall",
@@ -2134,8 +2122,8 @@ description: Operations executed car-wheel-assembly.kcl
         }
       },
       "sourceRange": [
-        4021,
+        4007,
-        4033,
+        4019,
         3
       ]
     }
@@ -2157,8 +2145,8 @@ description: Operations executed car-wheel-assembly.kcl
           }
         },
         "sourceRange": [
-          4201,
+          4187,
-          4204,
+          4190,
           3
         ]
       },
@@ -2208,8 +2196,8 @@ description: Operations executed car-wheel-assembly.kcl
           ]
         },
         "sourceRange": [
-          4102,
+          4088,
-          4111,
+          4097,
           3
         ]
       },
@@ -2259,8 +2247,8 @@ description: Operations executed car-wheel-assembly.kcl
           ]
         },
         "sourceRange": [
-          4131,
+          4117,
-          4144,
+          4130,
           3
         ]
       },
@@ -2279,8 +2267,8 @@ description: Operations executed car-wheel-assembly.kcl
           }
         },
         "sourceRange": [
-          4167,
+          4153,
-          4177,
+          4163,
           3
         ]
       },
@@ -2290,16 +2278,16 @@ description: Operations executed car-wheel-assembly.kcl
           "value": true
         },
         "sourceRange": [
-          4234,
+          4220,
-          4238,
+          4224,
           3
         ]
       }
     },
     "name": "patternCircular3d",
     "sourceRange": [
-      4067,
+      4053,
-      4247,
+      4233,
       3
     ],
     "type": "StdLibCall",
@@ -2311,8 +2299,8 @@ description: Operations executed car-wheel-assembly.kcl
         }
       },
       "sourceRange": [
-        4067,
+        4053,
-        4247,
+        4233,
         3
       ]
     }
@@ -2328,16 +2316,16 @@ description: Operations executed car-wheel-assembly.kcl
           "value": "XY"
         },
         "sourceRange": [
-          4483,
+          4469,
-          4487,
+          4473,
           3
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      4469,
+      4455,
-      4488,
+      4474,
       3
     ],
     "type": "StdLibCall",
@@ -2345,58 +2333,52 @@ description: Operations executed car-wheel-assembly.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "axis": {
         "value": {
-          "type": "Object",
+          "type": "String",
-          "value": {
+          "value": "y"
-            "axis": {
-              "type": "String",
-              "value": "y"
-            }
-          }
         },
         "sourceRange": [
-          5789,
+          5782,
-          5803,
+          5785,
-          3
-        ]
-      },
-      "sketches": {
-        "value": {
-          "type": "Sketch",
-          "value": {
-            "artifactId": "[uuid]"
-          }
-        },
-        "sourceRange": [
-          5805,
-          5806,
           3
         ]
       }
     },
     "name": "revolve",
     "sourceRange": [
-      5781,
+      5767,
-      5807,
+      5786,
       3
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        5767,
+        5786,
+        3
+      ]
+    }
   },
   {
     "type": "UserDefinedFunctionCall",
     "name": "lug",
     "functionSourceRange": [
       666,
-      1300,
+      1293,
       6
     ],
     "unlabeledArg": null,
     "labeledArgs": {},
     "sourceRange": [
-      1302,
+      1295,
-      1342,
+      1335,
       6
     ]
   },
@@ -2595,32 +2577,14 @@ description: Operations executed car-wheel-assembly.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "axis": {
         "value": {
-          "type": "Object",
+          "type": "String",
-          "value": {
+          "value": "Y"
-            "axis": {
-              "type": "String",
-              "value": "Y"
-            }
-          }
         },
         "sourceRange": [
-          1192,
+          1199,
-          1206,
+          1202,
-          6
-        ]
-      },
-      "sketches": {
-        "value": {
-          "type": "Sketch",
-          "value": {
-            "artifactId": "[uuid]"
-          }
-        },
-        "sourceRange": [
-          1208,
-          1209,
           6
         ]
       }
@@ -2628,11 +2592,23 @@ description: Operations executed car-wheel-assembly.kcl
     "name": "revolve",
     "sourceRange": [
       1184,
-      1210,
+      1203,
       6
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        1184,
+        1203,
+        6
+      ]
+    }
   },
   {
     "type": "UserDefinedFunctionReturn"
@@ -2654,8 +2630,8 @@ description: Operations executed car-wheel-assembly.kcl
           }
         },
         "sourceRange": [
-          450,
+          449,
-          453,
+          452,
           0
         ]
       },
@@ -2705,8 +2681,8 @@ description: Operations executed car-wheel-assembly.kcl
           ]
         },
         "sourceRange": [
-          467,
+          466,
-          476,
+          475,
           0
         ]
       },
@@ -2756,8 +2732,8 @@ description: Operations executed car-wheel-assembly.kcl
           ]
         },
         "sourceRange": [
-          492,
+          491,
-          501,
+          500,
           0
         ]
       },
@@ -2776,8 +2752,8 @@ description: Operations executed car-wheel-assembly.kcl
           }
         },
         "sourceRange": [
-          520,
+          519,
-          528,
+          527,
           0
         ]
       },
@@ -2787,16 +2763,16 @@ description: Operations executed car-wheel-assembly.kcl
           "value": false
         },
         "sourceRange": [
-          554,
+          553,
-          559,
+          558,
           0
         ]
       }
     },
     "name": "patternCircular3d",
     "sourceRange": [
-      413,
+      412,
-      564,
+      563,
       0
     ],
     "type": "StdLibCall",
@@ -2808,8 +2784,8 @@ description: Operations executed car-wheel-assembly.kcl
         }
       },
       "sourceRange": [
-        413,
+        412,
-        564,
+        563,
         0
       ]
     }
@@ -2839,45 +2815,34 @@ description: Operations executed car-wheel-assembly.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "angle": {
         "value": {
-          "type": "Object",
+          "type": "Number",
-          "value": {
+          "value": -70.0,
-            "angle": {
+          "ty": {
-              "type": "Number",
+            "type": "Default",
-              "value": -70.0,
+            "len": {
-              "ty": {
+              "type": "Inches"
-                "type": "Default",
-                "len": {
-                  "type": "Inches"
-                },
-                "angle": {
-                  "type": "Degrees"
-                }
-              }
             },
-            "axis": {
+            "angle": {
-              "type": "String",
+              "type": "Degrees"
-              "value": "Y"
             }
           }
         },
         "sourceRange": [
-          2255,
+          2295,
-          2282,
+          2298,
           5
         ]
       },
-      "sketches": {
+      "axis": {
         "value": {
-          "type": "Sketch",
+          "type": "String",
-          "value": {
+          "value": "Y"
-            "artifactId": "[uuid]"
-          }
         },
         "sourceRange": [
-          2284,
+          2282,
-          2302,
+          2285,
           5
         ]
       }
@@ -2885,11 +2850,23 @@ description: Operations executed car-wheel-assembly.kcl
     "name": "revolve",
     "sourceRange": [
       2247,
-      2303,
+      2299,
       5
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        2255,
+        2273,
+        5
+      ]
+    }
   },
   {
     "labeledArgs": {
@@ -2916,32 +2893,14 @@ description: Operations executed car-wheel-assembly.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "axis": {
         "value": {
-          "type": "Object",
+          "type": "String",
-          "value": {
+          "value": "Y"
-            "axis": {
-              "type": "String",
-              "value": "Y"
-            }
-          }
         },
         "sourceRange": [
-          1470,
+          1489,
-          1484,
+          1492,
-          7
-        ]
-      },
-      "sketches": {
-        "value": {
-          "type": "Sketch",
-          "value": {
-            "artifactId": "[uuid]"
-          }
-        },
-        "sourceRange": [
-          1486,
-          1496,
           7
         ]
       }
@@ -2949,10 +2908,22 @@ description: Operations executed car-wheel-assembly.kcl
     "name": "revolve",
     "sourceRange": [
       1462,
-      1497,
+      1493,
       7
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        1470,
+        1480,
+        7
+      ]
+    }
   }
 ]

rust/kcl-lib/tests/kcl_samples/cycloidal-gear/exported_step.step

@@ -39,7 +39,7 @@ DATA;
 #23 = VERTEX_POINT('NONE', #22);
 #24 = CARTESIAN_POINT('NONE', (0.009555193704377126, 0.0381, 0.01030836525700516));
 #25 = VERTEX_POINT('NONE', #24);
-#26 = CARTESIAN_POINT('NONE', (0.011810999999999978, 0, -0.007619999999999995));
+#26 = CARTESIAN_POINT('NONE', (0.011810999999999981, 0, -0.0076199999999999974));
 #27 = VERTEX_POINT('NONE', #26);
 #28 = CARTESIAN_POINT('NONE', (0.0037719, 0, -0));
 #29 = VERTEX_POINT('NONE', #28);
@@ -95,7 +95,7 @@ DATA;
 #63 = AXIS2_PLACEMENT_3D('NONE', #62, #61, #60);
 #64 = CIRCLE('NONE', #63, 0.00762);
 #65 = CARTESIAN_POINT('NONE', (-0.008420618915550801, 0.0381, -0.011114374012594288));
-#66 = CARTESIAN_POINT('NONE', (-0.016775317593923766, 0.01905, -0.003827032886274202));
+#66 = CARTESIAN_POINT('NONE', (-0.016775317593923773, 0.01905, -0.003827032886274202));
 #67 = CARTESIAN_POINT('NONE', (-0.012407746826993343, -0, 0.006362700000000004));
 #68 = (
   BOUNDED_CURVE()
@@ -106,18 +106,18 @@ DATA;
   RATIONAL_B_SPLINE_CURVE((1, 1, 1))
   REPRESENTATION_ITEM('NONE')
 );
-#69 = DIRECTION('NONE', (-0.8660254037844387, 0, -0.49999999999999967));
+#69 = DIRECTION('NONE', (-0.8660254037844388, 0, -0.4999999999999997));
 #70 = DIRECTION('NONE', (0, 1, 0));
-#71 = CARTESIAN_POINT('NONE', (-0.005808633250155917, -0, 0.010172700000000003));
+#71 = CARTESIAN_POINT('NONE', (-0.0058086332501559165, -0, 0.010172700000000003));
 #72 = AXIS2_PLACEMENT_3D('NONE', #71, #70, #69);
-#73 = CIRCLE('NONE', #72, 0.007620000000000003);
+#73 = CIRCLE('NONE', #72, 0.007620000000000002);
 #74 = DIRECTION('NONE', (-0.3420201433256678, 0, 0.9396926207859089));
 #75 = DIRECTION('NONE', (0, 1.0000000000000002, -0));
 #76 = CARTESIAN_POINT('NONE', (-0.004068275783674349, 0.0381, -0.023072338489143286));
 #77 = AXIS2_PLACEMENT_3D('NONE', #76, #75, #74);
 #78 = CIRCLE('NONE', #77, 0.012725399999999994);
 #79 = CARTESIAN_POINT('NONE', (0.004111453664630743, 0.0381, -0.013324116532677054));
-#80 = CARTESIAN_POINT('NONE', (-0.006681894987404381, 0.01905, -0.01585590553916532));
+#80 = CARTESIAN_POINT('NONE', (-0.006681894987404388, 0.01905, -0.01585590553916532));
 #81 = CARTESIAN_POINT('NONE', (-0.012407746826993356, -0, -0.006362699999999989));
 #82 = (
   BOUNDED_CURVE()
@@ -128,18 +128,18 @@ DATA;
   RATIONAL_B_SPLINE_CURVE((1, 1, 1))
   REPRESENTATION_ITEM('NONE')
 );
-#83 = DIRECTION('NONE', (0.8660254037844382, 0, -0.5000000000000007));
+#83 = DIRECTION('NONE', (0.8660254037844384, 0, -0.5000000000000007));
-#84 = DIRECTION('NONE', (0, -0.9999999999999998, 0));
+#84 = DIRECTION('NONE', (0, -1.0000000000000002, 0));
-#85 = CARTESIAN_POINT('NONE', (-0.023428266500311844, -0, 0.00000000000000001687538997430238));
+#85 = CARTESIAN_POINT('NONE', (-0.02342826650031185, -0, 0.00000000000000001865174681370263));
 #86 = AXIS2_PLACEMENT_3D('NONE', #85, #84, #83);
-#87 = CIRCLE('NONE', #86, 0.012725399999999994);
+#87 = CIRCLE('NONE', #86, 0.012725400000000001);
 #88 = DIRECTION('NONE', (-0.6427876096865395, 0, -0.766044443118978));
 #89 = DIRECTION('NONE', (0, -1.0000000000000002, -0));
 #90 = CARTESIAN_POINT('NONE', (0.009009495250442175, 0.0381, -0.0074868578761104415));
 #91 = AXIS2_PLACEMENT_3D('NONE', #90, #89, #88);
 #92 = CIRCLE('NONE', #91, 0.007620000000000001);
 #93 = CARTESIAN_POINT('NONE', (0.013907536836253597, 0.0381, -0.0016495992195438261));
-#94 = CARTESIAN_POINT('NONE', (0.011837890161758862, 0.01905, -0.0125903677404439));
+#94 = CARTESIAN_POINT('NONE', (0.011837890161758855, 0.01905, -0.0125903677404439));
 #95 = CARTESIAN_POINT('NONE', (0.0007904803266814893, -0, -0.013982699999999994));
 #96 = (
   BOUNDED_CURVE()
@@ -150,19 +150,19 @@ DATA;
   RATIONAL_B_SPLINE_CURVE((1, 1, 1))
   REPRESENTATION_ITEM('NONE')
 );
-#97 = DIRECTION('NONE', (0.8660254037844388, -0, -0.49999999999999956));
+#97 = DIRECTION('NONE', (0.866025403784439, -0, -0.4999999999999996));
-#98 = DIRECTION('NONE', (0, 0.9999999999999999, 0));
+#98 = DIRECTION('NONE', (0, 1, 0));
-#99 = CARTESIAN_POINT('NONE', (-0.005808633250155936, 0, -0.010172699999999996));
+#99 = CARTESIAN_POINT('NONE', (-0.0058086332501559364, 0, -0.010172699999999996));
 #100 = AXIS2_PLACEMENT_3D('NONE', #99, #98, #97);
-#101 = CIRCLE('NONE', #100, 0.007620000000000001);
+#101 = CIRCLE('NONE', #100, 0.00762);
 #102 = DIRECTION('NONE', (-0.6427876096865413, 0, -0.7660444431189763));
 #103 = DIRECTION('NONE', (0, 0.9999999999999999, 0));
 #104 = CARTESIAN_POINT('NONE', (0.022087266284558753, 0.0381, 0.008098622736922445));
 #105 = AXIS2_PLACEMENT_3D('NONE', #104, #103, #102);
 #106 = CIRCLE('NONE', #105, 0.012725400000000064);
 #107 = CARTESIAN_POINT('NONE', (0.009555193704377126, 0.0381, 0.01030836525700516));
-#108 = CARTESIAN_POINT('NONE', (0.017208488154790785, 0.01905, 0.00216522897437961));
+#108 = CARTESIAN_POINT('NONE', (0.01720848815479078, 0.01905, 0.0021652289743796134));
-#109 = CARTESIAN_POINT('NONE', (0.011810999999999978, -0, -0.007619999999999995));
+#109 = CARTESIAN_POINT('NONE', (0.011810999999999981, -0, -0.0076199999999999974));
 #110 = (
   BOUNDED_CURVE()
   B_SPLINE_CURVE(2, (#107, #108, #109), .UNSPECIFIED., .F., .F.)
@@ -172,11 +172,11 @@ DATA;
   RATIONAL_B_SPLINE_CURVE((1, 1, 1))
   REPRESENTATION_ITEM('NONE')
 );
-#111 = DIRECTION('NONE', (-0.000000000000002373054384915535, 0, 1));
+#111 = DIRECTION('NONE', (-0.0000000000000018146886472883515, 0, 1));
 #112 = DIRECTION('NONE', (-0, -1, 0));
-#113 = CARTESIAN_POINT('NONE', (0.011811000000000009, -0, -0.02034540000000004));
+#113 = CARTESIAN_POINT('NONE', (0.011811000000000004, -0, -0.020345400000000034));
 #114 = AXIS2_PLACEMENT_3D('NONE', #113, #112, #111);
-#115 = CIRCLE('NONE', #114, 0.012725400000000046);
+#115 = CIRCLE('NONE', #114, 0.012725400000000036);
 #116 = DIRECTION('NONE', (0, 1, -0));
 #117 = VECTOR('NONE', #116, 1);
 #118 = CARTESIAN_POINT('NONE', (0.0037719, -0, 0));
@@ -256,14 +256,14 @@ DATA;
 );
 #177 = CARTESIAN_POINT('NONE', (0.0007904803266815029, -0, 0.013982700000000004));
 #178 = CARTESIAN_POINT('NONE', (-0.0030195196733185, -0, 0.02058181357683743));
-#179 = CARTESIAN_POINT('NONE', (-0.009618633250155922, -0, 0.01677181357683742));
+#179 = CARTESIAN_POINT('NONE', (-0.009618633250155923, -0, 0.01677181357683742));
 #180 = CARTESIAN_POINT('NONE', (-0.01621774682699334, -0, 0.012961813576837417));
 #181 = CARTESIAN_POINT('NONE', (-0.012407746826993343, -0, 0.006362700000000004));
 #182 = CARTESIAN_POINT('NONE', (-0.010343463710053215, 0.01905, 0.013844340424891662));
 #183 = CARTESIAN_POINT('NONE', (-0.01917915036563614, 0.01905, 0.017060267366826944));
-#184 = CARTESIAN_POINT('NONE', (-0.02239507730757142, 0.01905, 0.008224580711244014));
+#184 = CARTESIAN_POINT('NONE', (-0.022395077307571426, 0.01905, 0.008224580711244014));
 #185 = CARTESIAN_POINT('NONE', (-0.025611004249506707, 0.01905, -0.000611105944338923));
-#186 = CARTESIAN_POINT('NONE', (-0.016775317593923766, 0.01905, -0.003827032886274202));
+#186 = CARTESIAN_POINT('NONE', (-0.016775317593923773, 0.01905, -0.003827032886274202));
 #187 = CARTESIAN_POINT('NONE', (-0.01363300589983399, 0.0381, 0.0032065415281829547));
 #188 = CARTESIAN_POINT('NONE', (-0.020793463670222608, 0.0381, 0.0006003480360413621));
 #189 = CARTESIAN_POINT('NONE', (-0.018187270178081014, 0.0381, -0.00656010973434726));
@@ -278,12 +278,12 @@ DATA;
   REPRESENTATION_ITEM('NONE')
   SURFACE()
 );
-#193 = CARTESIAN_POINT('NONE', (-0.012407746826993344, -0, 0.006362700000000004));
+#193 = CARTESIAN_POINT('NONE', (-0.012407746826993343, -0, 0.006362700000000004));
-#194 = CARTESIAN_POINT('NONE', (-0.00873424026922052, -0, -0.000000000000000004726054498244314));
+#194 = CARTESIAN_POINT('NONE', (-0.008734240269220523, -0, -0.000000000000000004726054498244314));
 #195 = CARTESIAN_POINT('NONE', (-0.012407746826993356, -0, -0.006362699999999989));
-#196 = CARTESIAN_POINT('NONE', (-0.016775317593923766, 0.01905, -0.003827032886274204));
+#196 = CARTESIAN_POINT('NONE', (-0.016775317593923773, 0.01905, -0.003827032886274204));
-#197 = CARTESIAN_POINT('NONE', (-0.008256169858566881, 0.019050000000000004, -0.006927749083260438));
+#197 = CARTESIAN_POINT('NONE', (-0.008256169858566887, 0.019050000000000004, -0.006927749083260438));
-#198 = CARTESIAN_POINT('NONE', (-0.006681894987404381, 0.01905, -0.01585590553916532));
+#198 = CARTESIAN_POINT('NONE', (-0.006681894987404388, 0.01905, -0.01585590553916532));
 #199 = CARTESIAN_POINT('NONE', (-0.008420618915550801, 0.0381, -0.011114374012594288));
 #200 = CARTESIAN_POINT('NONE', (-0.0015166849060552505, 0.0381, -0.008601547533799802));
 #201 = CARTESIAN_POINT('NONE', (0.004111453664630743, 0.0381, -0.013324116532677054));
@@ -298,14 +298,14 @@ DATA;
 );
 #203 = CARTESIAN_POINT('NONE', (-0.012407746826993355, -0, -0.006362699999999989));
 #204 = CARTESIAN_POINT('NONE', (-0.016217746826993354, -0, -0.012961813576837412));
-#205 = CARTESIAN_POINT('NONE', (-0.009618633250155937, -0, -0.01677181357683742));
+#205 = CARTESIAN_POINT('NONE', (-0.009618633250155936, -0, -0.01677181357683742));
-#206 = CARTESIAN_POINT('NONE', (-0.003019519673318509, -0, -0.020581813576837412));
+#206 = CARTESIAN_POINT('NONE', (-0.0030195196733185095, -0, -0.020581813576837412));
 #207 = CARTESIAN_POINT('NONE', (0.0007904803266814893, -0, -0.013982699999999994));
-#208 = CARTESIAN_POINT('NONE', (-0.006681894987404382, 0.01905, -0.01585590553916532));
+#208 = CARTESIAN_POINT('NONE', (-0.006681894987404389, 0.01905, -0.01585590553916532));
-#209 = CARTESIAN_POINT('NONE', (-0.0050491260880436714, 0.019049999999999997, -0.02511579811374694));
+#209 = CARTESIAN_POINT('NONE', (-0.005049126088043679, 0.019049999999999997, -0.02511579811374694));
-#210 = CARTESIAN_POINT('NONE', (0.0042107664865379535, 0.01905, -0.02348302921438623));
+#210 = CARTESIAN_POINT('NONE', (0.0042107664865379466, 0.01905, -0.02348302921438623));
-#211 = CARTESIAN_POINT('NONE', (0.01347065906111957, 0.019049999999999997, -0.02185026031502552));
+#211 = CARTESIAN_POINT('NONE', (0.013470659061119567, 0.019049999999999997, -0.02185026031502552));
-#212 = CARTESIAN_POINT('NONE', (0.011837890161758862, 0.01905, -0.0125903677404439));
+#212 = CARTESIAN_POINT('NONE', (0.011837890161758855, 0.01905, -0.0125903677404439));
 #213 = CARTESIAN_POINT('NONE', (0.004111453664630743, 0.0381, -0.013324116532677054));
 #214 = CARTESIAN_POINT('NONE', (0.009948712321197359, 0.0381, -0.018222158118488478));
 #215 = CARTESIAN_POINT('NONE', (0.014846753907008787, 0.0381, -0.012384899461921867));
@@ -320,12 +320,12 @@ DATA;
   REPRESENTATION_ITEM('NONE')
   SURFACE()
 );
-#219 = CARTESIAN_POINT('NONE', (0.0007904803266814876, -0, -0.013982699999999994));
+#219 = CARTESIAN_POINT('NONE', (0.0007904803266814854, -0, -0.013982699999999997));
-#220 = CARTESIAN_POINT('NONE', (0.0044639868844543245, -0, -0.007620000000000015));
+#220 = CARTESIAN_POINT('NONE', (0.004463986884454323, -0, -0.007620000000000017));
-#221 = CARTESIAN_POINT('NONE', (0.011810999999999978, -0, -0.007619999999999995));
+#221 = CARTESIAN_POINT('NONE', (0.011810999999999981, -0, -0.0076199999999999974));
-#222 = CARTESIAN_POINT('NONE', (0.011837890161758862, 0.01905, -0.0125903677404439));
+#222 = CARTESIAN_POINT('NONE', (0.011837890161758858, 0.01905, -0.012590367740443899));
-#223 = CARTESIAN_POINT('NONE', (0.010263615290596393, 0.019049999999999994, -0.0036622112845390324));
+#223 = CARTESIAN_POINT('NONE', (0.01026361529059639, 0.019049999999999994, -0.0036622112845390306));
-#224 = CARTESIAN_POINT('NONE', (0.017208488154790785, 0.01905, 0.00216522897437961));
+#224 = CARTESIAN_POINT('NONE', (0.01720848815479078, 0.01905, 0.0021652289743796134));
 #225 = CARTESIAN_POINT('NONE', (0.013907536836253597, 0.0381, -0.0016495992195438261));
 #226 = CARTESIAN_POINT('NONE', (0.00827939826556762, 0.038099999999999995, 0.0030729697793334247));
 #227 = CARTESIAN_POINT('NONE', (0.009555193704377126, 0.0381, 0.01030836525700516));

rust/kcl-lib/tests/kcl_samples/exhaust-manifold/exported_step.step

@@ -161,20 +161,20 @@ DATA;
 #145 = VERTEX_POINT('NONE', #144);
 #146 = CARTESIAN_POINT('NONE', (-0.0186055, 0.3859187599240827, -0.2649386954314825));
 #147 = VERTEX_POINT('NONE', #146);
-#148 = DIRECTION('NONE', (-0.08428666399522529, 0, 0.9964415478454097));
+#148 = DIRECTION('NONE', (-0.0842866639952229, 0, 0.99644154784541));
 #149 = DIRECTION('NONE', (0, 1, -0));
-#150 = CARTESIAN_POINT('NONE', (0.10987218406621378, 0, 0.024039844328695128));
+#150 = CARTESIAN_POINT('NONE', (0.10987218406621377, 0, 0.02403984432869508));
 #151 = AXIS2_PLACEMENT_3D('NONE', #150, #149, #148);
-#152 = CIRCLE('NONE', #151, 0.007737689870496104);
+#152 = CIRCLE('NONE', #151, 0.007737689870496156);
 #153 = DIRECTION('NONE', (0, 1, 0));
 #154 = VECTOR('NONE', #153, 1);
 #155 = CARTESIAN_POINT('NONE', (0.11484587524256575, 0, 0.029967258656566655));
 #156 = LINE('NONE', #155, #154);
-#157 = DIRECTION('NONE', (-0.08428666399522529, 0, 0.9964415478454097));
+#157 = DIRECTION('NONE', (-0.0842866639952229, 0, 0.99644154784541));
 #158 = DIRECTION('NONE', (0, 1, -0));
-#159 = CARTESIAN_POINT('NONE', (0.10987218406621378, 0.003175, 0.024039844328695128));
+#159 = CARTESIAN_POINT('NONE', (0.10987218406621377, 0.003175, 0.02403984432869508));
 #160 = AXIS2_PLACEMENT_3D('NONE', #159, #158, #157);
-#161 = CIRCLE('NONE', #160, 0.007737689870496104);
+#161 = CIRCLE('NONE', #160, 0.007737689870496156);
 #162 = DIRECTION('NONE', (0, 1, 0));
 #163 = VECTOR('NONE', #162, 1);
 #164 = CARTESIAN_POINT('NONE', (0.10922000000000001, 0, 0.031750000000000014));
@@ -1183,11 +1183,11 @@ DATA;
 #1103 = EDGE_CURVE('NONE', #145, #147, #987, .T.);
 #1104 = EDGE_CURVE('NONE', #145, #145, #992, .T.);
 #1105 = EDGE_CURVE('NONE', #147, #147, #997, .T.);
-#1106 = CARTESIAN_POINT('NONE', (0.10987218406621378, 0.0015874999999999997, 0.024039844328695128));
+#1106 = CARTESIAN_POINT('NONE', (0.10987218406621377, 0.0015874999999999997, 0.02403984432869508));
 #1107 = DIRECTION('NONE', (0, 1, -0));
-#1108 = DIRECTION('NONE', (-0.08428666399522529, 0, 0.9964415478454097));
+#1108 = DIRECTION('NONE', (-0.0842866639952229, 0, 0.99644154784541));
 #1109 = AXIS2_PLACEMENT_3D('NONE', #1106, #1107, #1108);
-#1110 = CYLINDRICAL_SURFACE('NONE', #1109, 0.007737689870496104);
+#1110 = CYLINDRICAL_SURFACE('NONE', #1109, 0.007737689870496156);
 #1111 = CARTESIAN_POINT('NONE', (0.12954000000000004, 0.0015874999999999997, 0.04747903462626646));
 #1112 = DIRECTION('NONE', (0, -1.0000000000000002, -0));
 #1113 = DIRECTION('NONE', (-0.6427876096865407, 0, -0.766044443118977));

rust/kcl-lib/tests/kcl_samples/food-service-spatula/exported_step.step

@@ -131,9 +131,9 @@ DATA;
 #115 = VERTEX_POINT('NONE', #114);
 #116 = CARTESIAN_POINT('NONE', (-0.0248334258488368, 0, -0.02299722453489577));
 #117 = VERTEX_POINT('NONE', #116);
-#118 = CARTESIAN_POINT('NONE', (-0.025166574151163194, 0, -0.013002775465104229));
+#118 = CARTESIAN_POINT('NONE', (-0.025166574151163194, 0, -0.013002775465104227));
 #119 = VERTEX_POINT('NONE', #118);
-#120 = CARTESIAN_POINT('NONE', (-0.025166574151163194, 0.0035, -0.013002775465104229));
+#120 = CARTESIAN_POINT('NONE', (-0.025166574151163194, 0.0035, -0.013002775465104227));
 #121 = VERTEX_POINT('NONE', #120);
 #122 = CARTESIAN_POINT('NONE', (-0.0248334258488368, 0.0035, -0.02299722453489577));
 #123 = VERTEX_POINT('NONE', #122);
@@ -493,7 +493,7 @@ DATA;
 #477 = CARTESIAN_POINT('NONE', (0.17795201496890334, 0.08584714229719675, -0.0020772165411061887));
 #478 = CARTESIAN_POINT('NONE', (0.1778867385149994, 0.08582338363052132, -0.001955831074479715));
 #479 = CARTESIAN_POINT('NONE', (0.17785399900826404, 0.08581146743438747, -0.0018949500053573982));
-#480 = CARTESIAN_POINT('NONE', (0.177795228689155, 0.08579007680516954, -0.0017710544700858233));
+#480 = CARTESIAN_POINT('NONE', (0.177795228689155, 0.08579007680516954, -0.0017710544700858236));
 #481 = CARTESIAN_POINT('NONE', (0.17776575234442069, 0.08577934830189664, -0.0017089144721400538));
 #482 = CARTESIAN_POINT('NONE', (0.17771356944994834, 0.08576035529719464, -0.0015830812806709412));
 #483 = CARTESIAN_POINT('NONE', (0.17768739703826125, 0.0857508293262177, -0.0015199694482529182));
@@ -501,22 +501,22 @@ DATA;
 #485 = CARTESIAN_POINT('NONE', (0.17761897023322498, 0.08572592402644587, -0.001328967798546515));
 #486 = CARTESIAN_POINT('NONE', (0.1775799821690043, 0.08571173354325107, -0.0012009514248958885));
 #487 = CARTESIAN_POINT('NONE', (0.17756042764490243, 0.08570461628438747, -0.001136744614067409));
-#488 = CARTESIAN_POINT('NONE', (0.17752794179056877, 0.08569279241010172, -0.001008452303748607));
+#488 = CARTESIAN_POINT('NONE', (0.17752794179056877, 0.08569279241010172, -0.0010084523037486074));
 #489 = CARTESIAN_POINT('NONE', (0.17751164845992426, 0.08568686212760836, -0.0009441070964560733));
 #490 = CARTESIAN_POINT('NONE', (0.17748553743296888, 0.08567735849882824, -0.0008160519293165438));
 #491 = CARTESIAN_POINT('NONE', (0.1774724414068868, 0.0856725919390682, -0.0007518256615535176));
 #492 = CARTESIAN_POINT('NONE', (0.17745253555268684, 0.08566534680661167, -0.0006244912002219513));
 #493 = CARTESIAN_POINT('NONE', (0.1774425517406279, 0.0856617129991869, -0.0005606264035751191));
-#494 = CARTESIAN_POINT('NONE', (0.1774286442148312, 0.08565665107792858, -0.0004344626339110227));
+#494 = CARTESIAN_POINT('NONE', (0.1774286442148312, 0.08565665107792858, -0.00043446263391102273));
 #495 = CARTESIAN_POINT('NONE', (0.17742166887368957, 0.08565411226346764, -0.00037118499948639576));
-#496 = CARTESIAN_POINT('NONE', (0.1774135209818589, 0.08565114667580877, -0.0002466052443253171));
+#496 = CARTESIAN_POINT('NONE', (0.1774135209818589, 0.08565114667580877, -0.00024660524432531703));
 #497 = CARTESIAN_POINT('NONE', (0.17740943439406934, 0.08564965928071719, -0.0001841220748323609));
-#498 = CARTESIAN_POINT('NONE', (0.1774067810255368, 0.08564869353434526, -0.00006150086036782758));
+#498 = CARTESIAN_POINT('NONE', (0.1774067810255368, 0.08564869353434526, -0.00006150086036782763));
 #499 = CARTESIAN_POINT('NONE', (0.17740545022443252, 0.085648209162754, 0.0000000000000000034978213206350045));
 #500 = CARTESIAN_POINT('NONE', (0.177408103592965, 0.08564917490912594, 0.00012262121446453774));
 #501 = CARTESIAN_POINT('NONE', (0.17740912580390183, 0.08564954696317403, 0.00016986107013356122));
 #502 = CARTESIAN_POINT('NONE', (0.17740943439406934, 0.08564965928071719, 0.00018412207483236787));
-#503 = CARTESIAN_POINT('NONE', (0.17741758228590004, 0.08565262486837608, 0.00030870182999344597));
+#503 = CARTESIAN_POINT('NONE', (0.17741758228590004, 0.08565262486837608, 0.000308701829993446));
 #504 = CARTESIAN_POINT('NONE', (0.17742166887368963, 0.08565411226346765, 0.0003711849994864027));
 #505 = CARTESIAN_POINT('NONE', (0.17743557639948632, 0.08565917418472598, 0.0004973487691505));
 #506 = CARTESIAN_POINT('NONE', (0.1774425517406279, 0.0856617129991869, 0.0005606264035751264));
@@ -526,7 +526,7 @@ DATA;
 #510 = CARTESIAN_POINT('NONE', (0.17751164845992423, 0.08568686212760836, 0.0009441070964560802));
 #511 = CARTESIAN_POINT('NONE', (0.17754413431425792, 0.0856986860018941, 0.001072399406774878));
 #512 = CARTESIAN_POINT('NONE', (0.17756042764490243, 0.08570461628438747, 0.001136744614067416));
-#513 = CARTESIAN_POINT('NONE', (0.1775994157091231, 0.08571880676758226, 0.00126476098771804));
+#513 = CARTESIAN_POINT('NONE', (0.1775994157091231, 0.08571880676758226, 0.0012647609877180397));
 #514 = CARTESIAN_POINT('NONE', (0.17761897023322495, 0.08572592402644587, 0.001328967798546522));
 #515 = CARTESIAN_POINT('NONE', (0.1776645409663547, 0.08574251040321469, 0.0014561706571556946));
 #516 = CARTESIAN_POINT('NONE', (0.17768739703826128, 0.08575082932621772, 0.0015199694482529254));
@@ -541,7 +541,7 @@ DATA;
 #525 = CARTESIAN_POINT('NONE', (0.1781128423383614, 0.08590567862438238, 0.0023333333333333322));
 #526 = CARTESIAN_POINT('NONE', (0.17813740492873031, 0.085914618668799, 0.0023695300981384096));
 #527 = CARTESIAN_POINT('NONE', (0.1781764324402324, 0.08592882350961822, 0.002427043154927221));
-#528 = CARTESIAN_POINT('NONE', (0.17826016236587194, 0.08595929868519923, 0.0025375400111489355));
+#528 = CARTESIAN_POINT('NONE', (0.17826016236587194, 0.08595929868519923, 0.002537540011148935));
 #529 = CARTESIAN_POINT('NONE', (0.1783021572399878, 0.08597458355679569, 0.0025929598808285105));
 #530 = CARTESIAN_POINT('NONE', (0.17839149551745315, 0.08600710000382542, 0.002698774175843207));
 #531 = CARTESIAN_POINT('NONE', (0.17843630326912885, 0.08602340867828413, 0.002751845499684166));
@@ -571,14 +571,14 @@ DATA;
 #555 = CARTESIAN_POINT('NONE', (0.18045773597500814, 0.08675914940857034, 0.0039287094795402685));
 #556 = CARTESIAN_POINT('NONE', (0.18057739124020727, 0.08680270032765071, 0.003949892845083641));
 #557 = CARTESIAN_POINT('NONE', (0.18063740452411917, 0.08682454335868699, 0.003960517394939006));
-#558 = CARTESIAN_POINT('NONE', (0.18067644581277573, 0.08683875321397622, 0.003965391194281957));
+#558 = CARTESIAN_POINT('NONE', (0.18067644581277573, 0.08683875321397622, 0.003965391194281956));
 #559 = CARTESIAN_POINT('NONE', (0.18075595969889122, 0.08686769387792627, 0.003975317473337812));
 #560 = CARTESIAN_POINT('NONE', (0.18081542123074262, 0.086889336087801, 0.003982740475621818));
 #561 = CARTESIAN_POINT('NONE', (0.18093248791863173, 0.08693194484256649, 0.003991411280166247));
 #562 = CARTESIAN_POINT('NONE', (0.18099120289757753, 0.08695331532962879, 0.003995760135638706));
 #563 = CARTESIAN_POINT('NONE', (0.18110642915904954, 0.0869952542245111, 0.003998583791181479));
 #564 = CARTESIAN_POINT('NONE', (0.1811642210692703, 0.08701628874230968, 0.0040000000000000036));
-#565 = B_SPLINE_CURVE_WITH_KNOTS('NONE', 2, (#434, #435, #436, #437, #438, #439, #440, #441, #442, #443, #444, #445, #446, #447, #448, #449, #450, #451, #452, #453, #454, #455, #456, #457, #458, #459, #460, #461, #462, #463, #464, #465, #466, #467, #468, #469, #470, #471, #472, #473, #474, #475, #476, #477, #478, #479, #480, #481, #482, #483, #484, #485, #486, #487, #488, #489, #490, #491, #492, #493, #494, #495, #496, #497, #498, #499, #500, #501, #502, #503, #504, #505, #506, #507, #508, #509, #510, #511, #512, #513, #514, #515, #516, #517, #518, #519, #520, #521, #522, #523, #524, #525, #526, #527, #528, #529, #530, #531, #532, #533, #534, #535, #536, #537, #538, #539, #540, #541, #542, #543, #544, #545, #546, #547, #548, #549, #550, #551, #552, #553, #554, #555, #556, #557, #558, #559, #560, #561, #562, #563, #564), .UNSPECIFIED., .F., .F., (3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3), (-1, -0.9922480620155039, -0.9844961240310077, -0.9767441860465116, -0.9689922480620154, -0.9612403100775194, -0.9534883720930233, -0.9457364341085271, -0.937984496124031, -0.9302325581395349, -0.9224806201550387, -0.9147286821705426, -0.9069767441860466, -0.8992248062015504, -0.8914728682170543, -0.8837209302325582, -0.875968992248062, -0.8682170542635659, -0.8604651162790697, -0.8527131782945736, -0.8449612403100775, -0.8372093023255813, -0.8294573643410853, -0.8217054263565892, -0.813953488372093, -0.8062015503875969, -0.7984496124031008, -0.7906976744186047, -0.7829457364341086, -0.7751937984496124, -0.7674418604651163, -0.7596899224806202, -0.751937984496124, -0.7441860465116279, -0.7364341085271318, -0.7286821705426356, -0.7209302325581395, -0.7131782945736433, -0.7054263565891473, -0.6976744186046512, -0.689922480620155, -0.6821705426356589, -0.6744186046511628, -0.6666666666666667, -0.6589147286821706, -0.6511627906976745, -0.6434108527131783, -0.6356589147286822, -0.627906976744186, -0.6201550387596899, -0.6124031007751938, -0.6046511627906976, -0.5968992248062015, -0.5891472868217054, -0.5813953488372093, -0.5736434108527132, -0.5658914728682171, -0.5581395348837209, -0.5503875968992248, -0.5426356589147288, -0.5348837209302326, -0.5271317829457365, -0.5193798449612403, -0.5116279069767442, -0.5038759689922481, -0.49612403100775193, -0.4883720930232558, -0.48062015503875966, -0.4728682170542636, -0.46511627906976744, -0.4573643410852713, -0.4496124031007752, -0.4418604651162791, -0.43410852713178294, -0.4263565891472868, -0.41860465116279066, -0.4108527131782946, -0.40310077519379844, -0.3953488372093023, -0.3875968992248062, -0.3798449612403101, -0.37209302325581395, -0.3643410852713178, -0.3565891472868217, -0.3488372093023256, -0.34108527131782945, -0.3333333333333333, -0.32558139534883723, -0.3178294573643411, -0.31007751937984496, -0.3023255813953488, -0.2945736434108527, -0.2868217054263566, -0.27906976744186046, -0.2713178294573643, -0.26356589147286824, -0.2558139534883721, -0.24806201550387597, -0.24031007751937983, -0.23255813953488372, -0.2248062015503876, -0.21705426356589147, -0.20930232558139533, -0.20155038759689922, -0.1937984496124031, -0.18604651162790697, -0.17829457364341084, -0.17054263565891473, -0.16279069767441862, -0.15503875968992248, -0.14728682170542634, -0.13953488372093023, -0.13178294573643412, -0.12403100775193798, -0.11627906976744186, -0.10852713178294573, -0.10077519379844961, -0.09302325581395349, -0.08527131782945736, -0.07751937984496124, -0.06976744186046512, -0.06201550387596899, -0.05426356589147287, -0.046511627906976744, -0.03875968992248062, -0.031007751937984496, -0.023255813953488372, -0.015503875968992248, -0.007751937984496124, -0), .UNSPECIFIED.);
+#565 = B_SPLINE_CURVE_WITH_KNOTS('NONE', 2, (#434, #435, #436, #437, #438, #439, #440, #441, #442, #443, #444, #445, #446, #447, #448, #449, #450, #451, #452, #453, #454, #455, #456, #457, #458, #459, #460, #461, #462, #463, #464, #465, #466, #467, #468, #469, #470, #471, #472, #473, #474, #475, #476, #477, #478, #479, #480, #481, #482, #483, #484, #485, #486, #487, #488, #489, #490, #491, #492, #493, #494, #495, #496, #497, #498, #499, #500, #501, #502, #503, #504, #505, #506, #507, #508, #509, #510, #511, #512, #513, #514, #515, #516, #517, #518, #519, #520, #521, #522, #523, #524, #525, #526, #527, #528, #529, #530, #531, #532, #533, #534, #535, #536, #537, #538, #539, #540, #541, #542, #543, #544, #545, #546, #547, #548, #549, #550, #551, #552, #553, #554, #555, #556, #557, #558, #559, #560, #561, #562, #563, #564), .UNSPECIFIED., .F., .F., (3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3), (0, 0.007751937984496124, 0.015503875968992248, 0.023255813953488372, 0.031007751937984496, 0.03875968992248062, 0.046511627906976744, 0.05426356589147287, 0.06201550387596899, 0.06976744186046512, 0.07751937984496124, 0.08527131782945736, 0.09302325581395349, 0.10077519379844961, 0.10852713178294573, 0.11627906976744186, 0.12403100775193798, 0.13178294573643412, 0.13953488372093023, 0.14728682170542634, 0.15503875968992248, 0.16279069767441862, 0.17054263565891473, 0.17829457364341084, 0.18604651162790697, 0.1937984496124031, 0.20155038759689922, 0.20930232558139533, 0.21705426356589147, 0.2248062015503876, 0.23255813953488372, 0.24031007751937983, 0.24806201550387597, 0.2558139534883721, 0.26356589147286824, 0.2713178294573643, 0.27906976744186046, 0.2868217054263566, 0.2945736434108527, 0.3023255813953488, 0.31007751937984496, 0.3178294573643411, 0.32558139534883723, 0.3333333333333333, 0.34108527131782945, 0.3488372093023256, 0.3565891472868217, 0.3643410852713178, 0.37209302325581395, 0.3798449612403101, 0.3875968992248062, 0.3953488372093023, 0.40310077519379844, 0.4108527131782946, 0.41860465116279066, 0.4263565891472868, 0.43410852713178294, 0.4418604651162791, 0.4496124031007752, 0.4573643410852713, 0.46511627906976744, 0.4728682170542636, 0.48062015503875966, 0.4883720930232558, 0.49612403100775193, 0.5038759689922481, 0.5116279069767442, 0.5193798449612403, 0.5271317829457365, 0.5348837209302326, 0.5426356589147288, 0.5503875968992248, 0.5581395348837209, 0.5658914728682171, 0.5736434108527132, 0.5813953488372093, 0.5891472868217054, 0.5968992248062015, 0.6046511627906976, 0.6124031007751938, 0.6201550387596899, 0.627906976744186, 0.6356589147286822, 0.6434108527131783, 0.6511627906976745, 0.6589147286821706, 0.6666666666666667, 0.6744186046511628, 0.6821705426356589, 0.689922480620155, 0.6976744186046512, 0.7054263565891473, 0.7131782945736433, 0.7209302325581395, 0.7286821705426356, 0.7364341085271318, 0.7441860465116279, 0.751937984496124, 0.7596899224806202, 0.7674418604651163, 0.7751937984496124, 0.7829457364341086, 0.7906976744186047, 0.7984496124031008, 0.8062015503875969, 0.813953488372093, 0.8217054263565892, 0.8294573643410853, 0.8372093023255813, 0.8449612403100775, 0.8527131782945736, 0.8604651162790697, 0.8682170542635659, 0.875968992248062, 0.8837209302325582, 0.8914728682170543, 0.8992248062015504, 0.9069767441860466, 0.9147286821705426, 0.9224806201550387, 0.9302325581395349, 0.937984496124031, 0.9457364341085271, 0.9534883720930233, 0.9612403100775194, 0.9689922480620154, 0.9767441860465116, 0.9844961240310077, 0.9922480620155039, 1), .UNSPECIFIED.);
 #566 = DIRECTION('NONE', (-0.000000000000014210854715201953, -0.0000000000000035527136788004883, -1));
 #567 = DIRECTION('NONE', (-0.342019894888923, 0.9396927112094519, 0.0000000000000015219358869921909));
 #568 = CARTESIAN_POINT('NONE', (0.17774402212038112, 0.0964132158544042, 0.00000000000000002009718347115226));
@@ -778,20 +778,20 @@ DATA;
 #762 = VECTOR('NONE', #761, 1);
 #763 = CARTESIAN_POINT('NONE', (-0.055, 0.0035, -0.005000000000000004));
 #764 = LINE('NONE', #763, #762);
-#765 = DIRECTION('NONE', (0.033314830232639266, 0, -0.9994449069791544));
+#765 = DIRECTION('NONE', (0.033314830232639946, 0, -0.9994449069791542));
-#766 = DIRECTION('NONE', (0, -1.0000000000000002, 0));
+#766 = DIRECTION('NONE', (0, -0.9999999999999999, 0));
-#767 = CARTESIAN_POINT('NONE', (-0.024999999999999998, -0, -0.017999999999999995));
+#767 = CARTESIAN_POINT('NONE', (-0.025, -0, -0.01799999999999999));
 #768 = AXIS2_PLACEMENT_3D('NONE', #767, #766, #765);
-#769 = CIRCLE('NONE', #768, 0.005000000000000003);
+#769 = CIRCLE('NONE', #768, 0.005000000000000007);
 #770 = DIRECTION('NONE', (0, 1, 0));
 #771 = VECTOR('NONE', #770, 1);
-#772 = CARTESIAN_POINT('NONE', (-0.025166574151163194, 0, -0.013002775465104229));
+#772 = CARTESIAN_POINT('NONE', (-0.025166574151163194, 0, -0.013002775465104227));
 #773 = LINE('NONE', #772, #771);
-#774 = DIRECTION('NONE', (0.033314830232639266, 0, -0.9994449069791544));
+#774 = DIRECTION('NONE', (0.033314830232639946, 0, -0.9994449069791542));
-#775 = DIRECTION('NONE', (0, -1.0000000000000002, 0));
+#775 = DIRECTION('NONE', (0, -0.9999999999999999, 0));
-#776 = CARTESIAN_POINT('NONE', (-0.024999999999999998, 0.0035, -0.017999999999999995));
+#776 = CARTESIAN_POINT('NONE', (-0.025, 0.0035, -0.01799999999999999));
 #777 = AXIS2_PLACEMENT_3D('NONE', #776, #775, #774);
-#778 = CIRCLE('NONE', #777, 0.005000000000000003);
+#778 = CIRCLE('NONE', #777, 0.005000000000000007);
 #779 = DIRECTION('NONE', (0, 1, 0));
 #780 = VECTOR('NONE', #779, 1);
 #781 = CARTESIAN_POINT('NONE', (-0.0248334258488368, 0, -0.02299722453489577));
@@ -1209,11 +1209,11 @@ DATA;
 #1193 = DIRECTION('NONE', (0, 0, 1));
 #1194 = AXIS2_PLACEMENT_3D('NONE', #1192, #1193, $);
 #1195 = PLANE('NONE', #1194);
-#1196 = CARTESIAN_POINT('NONE', (-0.024999999999999998, 0.00175, -0.017999999999999995));
+#1196 = CARTESIAN_POINT('NONE', (-0.025, 0.00175, -0.01799999999999999));
-#1197 = DIRECTION('NONE', (0, -1.0000000000000002, 0));
+#1197 = DIRECTION('NONE', (0, -0.9999999999999999, 0));
-#1198 = DIRECTION('NONE', (0.033314830232639266, 0, -0.9994449069791544));
+#1198 = DIRECTION('NONE', (0.033314830232639946, 0, -0.9994449069791542));
 #1199 = AXIS2_PLACEMENT_3D('NONE', #1196, #1197, #1198);
-#1200 = CYLINDRICAL_SURFACE('NONE', #1199, 0.005000000000000003);
+#1200 = CYLINDRICAL_SURFACE('NONE', #1199, 0.005000000000000007);
 #1201 = CARTESIAN_POINT('NONE', (-0.04016657415116319, 0.00175, -0.013502775465104222));
 #1202 = DIRECTION('NONE', (0.033314830232638176, -0, -0.9994449069791543));
 #1203 = AXIS2_PLACEMENT_3D('NONE', #1201, #1202, $);

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

@@ -10,118 +10,118 @@ flowchart LR
     8[Solid2d]
   end
   subgraph path18 [Path]
-    18["Path<br>[993, 1037, 0]"]
+    18["Path<br>[986, 1030, 0]"]
-    19["Segment<br>[1043, 1062, 0]"]
+    19["Segment<br>[1036, 1055, 0]"]
-    20["Segment<br>[1068, 1102, 0]"]
+    20["Segment<br>[1061, 1095, 0]"]
-    21["Segment<br>[1108, 1192, 0]"]
+    21["Segment<br>[1101, 1185, 0]"]
-    22["Segment<br>[1198, 1250, 0]"]
+    22["Segment<br>[1191, 1243, 0]"]
-    23["Segment<br>[1256, 1340, 0]"]
+    23["Segment<br>[1249, 1333, 0]"]
-    24["Segment<br>[1346, 1398, 0]"]
+    24["Segment<br>[1339, 1391, 0]"]
-    25["Segment<br>[1404, 1486, 0]"]
+    25["Segment<br>[1397, 1479, 0]"]
-    26["Segment<br>[1492, 1532, 0]"]
+    26["Segment<br>[1485, 1525, 0]"]
-    27["Segment<br>[1538, 1557, 0]"]
+    27["Segment<br>[1531, 1550, 0]"]
-    28["Segment<br>[1563, 1616, 0]"]
+    28["Segment<br>[1556, 1609, 0]"]
-    29["Segment<br>[1622, 1704, 0]"]
+    29["Segment<br>[1615, 1697, 0]"]
-    30["Segment<br>[1710, 1800, 0]"]
+    30["Segment<br>[1703, 1793, 0]"]
-    31["Segment<br>[1806, 1890, 0]"]
+    31["Segment<br>[1799, 1883, 0]"]
-    32["Segment<br>[1896, 1986, 0]"]
+    32["Segment<br>[1889, 1979, 0]"]
-    33["Segment<br>[1992, 2076, 0]"]
+    33["Segment<br>[1985, 2069, 0]"]
-    34["Segment<br>[2082, 2138, 0]"]
+    34["Segment<br>[2075, 2131, 0]"]
-    35["Segment<br>[2144, 2151, 0]"]
+    35["Segment<br>[2137, 2144, 0]"]
     36[Solid2d]
   end
   subgraph path89 [Path]
-    89["Path<br>[2419, 2499, 0]"]
+    89["Path<br>[2412, 2492, 0]"]
-    90["Segment<br>[2419, 2499, 0]"]
+    90["Segment<br>[2412, 2492, 0]"]
     91[Solid2d]
   end
   subgraph path98 [Path]
-    98["Path<br>[2600, 2630, 0]"]
+    98["Path<br>[2593, 2623, 0]"]
-    99["Segment<br>[2636, 2655, 0]"]
+    99["Segment<br>[2629, 2648, 0]"]
-    100["Segment<br>[2661, 2744, 0]"]
+    100["Segment<br>[2654, 2737, 0]"]
-    101["Segment<br>[2750, 2806, 0]"]
+    101["Segment<br>[2743, 2799, 0]"]
-    102["Segment<br>[2812, 2819, 0]"]
+    102["Segment<br>[2805, 2812, 0]"]
     103[Solid2d]
   end
   subgraph path117 [Path]
-    117["Path<br>[3058, 3089, 0]"]
+    117["Path<br>[3051, 3082, 0]"]
-    118["Segment<br>[3095, 3140, 0]"]
+    118["Segment<br>[3088, 3133, 0]"]
-    119["Segment<br>[3146, 3236, 0]"]
+    119["Segment<br>[3139, 3229, 0]"]
-    120["Segment<br>[3242, 3288, 0]"]
+    120["Segment<br>[3235, 3281, 0]"]
-    121["Segment<br>[3294, 3347, 0]"]
+    121["Segment<br>[3287, 3340, 0]"]
-    122["Segment<br>[3353, 3378, 0]"]
+    122["Segment<br>[3346, 3371, 0]"]
-    123["Segment<br>[3384, 3440, 0]"]
+    123["Segment<br>[3377, 3433, 0]"]
-    124["Segment<br>[3446, 3453, 0]"]
+    124["Segment<br>[3439, 3446, 0]"]
     125[Solid2d]
   end
   subgraph path140 [Path]
-    140["Path<br>[3544, 3571, 0]"]
+    140["Path<br>[3530, 3557, 0]"]
-    141["Segment<br>[3577, 3597, 0]"]
+    141["Segment<br>[3563, 3583, 0]"]
-    142["Segment<br>[3603, 3646, 0]"]
+    142["Segment<br>[3589, 3632, 0]"]
-    143["Segment<br>[3652, 3670, 0]"]
+    143["Segment<br>[3638, 3656, 0]"]
-    144["Segment<br>[3676, 3696, 0]"]
+    144["Segment<br>[3662, 3682, 0]"]
-    145["Segment<br>[3702, 3722, 0]"]
+    145["Segment<br>[3688, 3708, 0]"]
-    146["Segment<br>[3728, 3776, 0]"]
+    146["Segment<br>[3714, 3762, 0]"]
-    147["Segment<br>[3782, 3838, 0]"]
+    147["Segment<br>[3768, 3824, 0]"]
-    148["Segment<br>[3844, 3851, 0]"]
+    148["Segment<br>[3830, 3837, 0]"]
     149[Solid2d]
   end
   subgraph path166 [Path]
-    166["Path<br>[3966, 4046, 0]"]
+    166["Path<br>[3945, 4025, 0]"]
-    167["Segment<br>[3966, 4046, 0]"]
+    167["Segment<br>[3945, 4025, 0]"]
     168[Solid2d]
   end
   subgraph path169 [Path]
-    169["Path<br>[4057, 4094, 0]"]
+    169["Path<br>[4036, 4073, 0]"]
-    170["Segment<br>[4057, 4094, 0]"]
+    170["Segment<br>[4036, 4073, 0]"]
     171[Solid2d]
   end
   subgraph path178 [Path]
-    178["Path<br>[4236, 4274, 0]"]
+    178["Path<br>[4215, 4253, 0]"]
-    179["Segment<br>[4236, 4274, 0]"]
+    179["Segment<br>[4215, 4253, 0]"]
     180[Solid2d]
   end
   subgraph path192 [Path]
-    192["Path<br>[4546, 4584, 0]"]
+    192["Path<br>[4525, 4563, 0]"]
-    193["Segment<br>[4546, 4584, 0]"]
+    193["Segment<br>[4525, 4563, 0]"]
     194[Solid2d]
   end
   subgraph path203 [Path]
-    203["Path<br>[4837, 4910, 0]"]
+    203["Path<br>[4816, 4889, 0]"]
-    204["Segment<br>[4837, 4910, 0]"]
+    204["Segment<br>[4816, 4889, 0]"]
     205[Solid2d]
   end
   subgraph path213 [Path]
-    213["Path<br>[5159, 5203, 0]"]
+    213["Path<br>[5138, 5182, 0]"]
-    214["Segment<br>[5209, 5249, 0]"]
+    214["Segment<br>[5188, 5228, 0]"]
-    215["Segment<br>[5255, 5274, 0]"]
+    215["Segment<br>[5234, 5253, 0]"]
-    216["Segment<br>[5280, 5299, 0]"]
+    216["Segment<br>[5259, 5278, 0]"]
-    217["Segment<br>[5305, 5324, 0]"]
+    217["Segment<br>[5284, 5303, 0]"]
-    218["Segment<br>[5330, 5355, 0]"]
+    218["Segment<br>[5309, 5334, 0]"]
-    219["Segment<br>[5361, 5501, 0]"]
+    219["Segment<br>[5340, 5480, 0]"]
-    220["Segment<br>[5507, 5563, 0]"]
+    220["Segment<br>[5486, 5542, 0]"]
-    221["Segment<br>[5569, 5576, 0]"]
+    221["Segment<br>[5548, 5555, 0]"]
     222[Solid2d]
   end
   subgraph path239 [Path]
-    239["Path<br>[5717, 5746, 0]"]
+    239["Path<br>[5689, 5718, 0]"]
-    240["Segment<br>[5752, 5773, 0]"]
+    240["Segment<br>[5724, 5745, 0]"]
-    241["Segment<br>[5779, 5810, 0]"]
+    241["Segment<br>[5751, 5782, 0]"]
-    242["Segment<br>[5816, 5847, 0]"]
+    242["Segment<br>[5788, 5819, 0]"]
-    243["Segment<br>[5853, 5885, 0]"]
+    243["Segment<br>[5825, 5857, 0]"]
-    244["Segment<br>[5891, 5913, 0]"]
+    244["Segment<br>[5863, 5885, 0]"]
-    245["Segment<br>[5919, 5940, 0]"]
+    245["Segment<br>[5891, 5912, 0]"]
-    246["Segment<br>[5946, 5971, 0]"]
+    246["Segment<br>[5918, 5943, 0]"]
-    247["Segment<br>[5977, 6008, 0]"]
+    247["Segment<br>[5949, 5980, 0]"]
-    248["Segment<br>[6014, 6046, 0]"]
+    248["Segment<br>[5986, 6018, 0]"]
-    249["Segment<br>[6052, 6084, 0]"]
+    249["Segment<br>[6024, 6056, 0]"]
-    250["Segment<br>[6090, 6111, 0]"]
+    250["Segment<br>[6062, 6083, 0]"]
-    251["Segment<br>[6117, 6173, 0]"]
+    251["Segment<br>[6089, 6145, 0]"]
-    252["Segment<br>[6179, 6186, 0]"]
+    252["Segment<br>[6151, 6158, 0]"]
     253[Solid2d]
   end
   1["Plane<br>[241, 260, 0]"]
-  9["Sweep Revolve<br>[676, 715, 0]"]
+  9["Sweep Revolve<br>[676, 708, 0]"]
   10[Wall]
   11[Wall]
   12[Wall]
@@ -129,8 +129,8 @@ flowchart LR
   14["SweepEdge Adjacent"]
   15["SweepEdge Adjacent"]
   16["SweepEdge Adjacent"]
-  17["Plane<br>[964, 987, 0]"]
+  17["Plane<br>[957, 980, 0]"]
-  37["Sweep Extrusion<br>[2157, 2179, 0]"]
+  37["Sweep Extrusion<br>[2150, 2172, 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>[2383, 2412, 0]"]
+  88["Plane<br>[2376, 2405, 0]"]
-  92["Sweep Extrusion<br>[2514, 2548, 0]"]
+  92["Sweep Extrusion<br>[2507, 2541, 0]"]
   93[Wall]
   94["Cap Start"]
   95["Cap End"]
   96["SweepEdge Opposite"]
   97["SweepEdge Adjacent"]
-  104["Sweep Extrusion<br>[2967, 3002, 0]"]
+  104["Sweep Extrusion<br>[2960, 2995, 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>[2967, 3002, 0]"]
+  114["Sweep Extrusion<br>[2960, 2995, 0]"]
-  115["Sweep Extrusion<br>[2967, 3002, 0]"]
+  115["Sweep Extrusion<br>[2960, 2995, 0]"]
-  116["Plane<br>[3033, 3052, 0]"]
+  116["Plane<br>[3026, 3045, 0]"]
-  126["Sweep Revolve<br>[3459, 3485, 0]"]
+  126["Sweep Revolve<br>[3452, 3471, 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>[3519, 3538, 0]"]
+  139["Plane<br>[3505, 3524, 0]"]
-  150["Sweep Revolve<br>[3857, 3883, 0]"]
+  150["Sweep Revolve<br>[3843, 3862, 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>[3927, 3959, 0]"]
+  165["Plane<br>[3906, 3938, 0]"]
-  172["Sweep Extrusion<br>[4113, 4147, 0]"]
+  172["Sweep Extrusion<br>[4092, 4126, 0]"]
   173[Wall]
   174["Cap Start"]
   175["Cap End"]
   176["SweepEdge Opposite"]
   177["SweepEdge Adjacent"]
-  181["Sweep Extrusion<br>[4422, 4457, 0]"]
+  181["Sweep Extrusion<br>[4401, 4436, 0]"]
   182[Wall]
   183["SweepEdge Opposite"]
   184["SweepEdge Adjacent"]
-  185["Sweep Extrusion<br>[4422, 4457, 0]"]
+  185["Sweep Extrusion<br>[4401, 4436, 0]"]
-  186["Sweep Extrusion<br>[4422, 4457, 0]"]
+  186["Sweep Extrusion<br>[4401, 4436, 0]"]
-  187["Sweep Extrusion<br>[4422, 4457, 0]"]
+  187["Sweep Extrusion<br>[4401, 4436, 0]"]
-  188["Sweep Extrusion<br>[4422, 4457, 0]"]
+  188["Sweep Extrusion<br>[4401, 4436, 0]"]
-  189["Sweep Extrusion<br>[4422, 4457, 0]"]
+  189["Sweep Extrusion<br>[4401, 4436, 0]"]
-  190["Sweep Extrusion<br>[4422, 4457, 0]"]
+  190["Sweep Extrusion<br>[4401, 4436, 0]"]
-  191["Sweep Extrusion<br>[4422, 4457, 0]"]
+  191["Sweep Extrusion<br>[4401, 4436, 0]"]
-  195["Sweep Extrusion<br>[4732, 4767, 0]"]
+  195["Sweep Extrusion<br>[4711, 4746, 0]"]
   196[Wall]
   197["SweepEdge Opposite"]
   198["SweepEdge Adjacent"]
-  199["Sweep Extrusion<br>[4732, 4767, 0]"]
+  199["Sweep Extrusion<br>[4711, 4746, 0]"]
-  200["Sweep Extrusion<br>[4732, 4767, 0]"]
+  200["Sweep Extrusion<br>[4711, 4746, 0]"]
-  201["Sweep Extrusion<br>[4732, 4767, 0]"]
+  201["Sweep Extrusion<br>[4711, 4746, 0]"]
-  202["Plane<br>[4812, 4831, 0]"]
+  202["Plane<br>[4791, 4810, 0]"]
-  206["Sweep Extrusion<br>[5006, 5047, 0]"]
+  206["Sweep Extrusion<br>[4985, 5026, 0]"]
   207[Wall]
   208["Cap Start"]
   209["Cap End"]
   210["SweepEdge Opposite"]
   211["SweepEdge Adjacent"]
-  212["Plane<br>[5134, 5153, 0]"]
+  212["Plane<br>[5113, 5132, 0]"]
-  223["Sweep Revolve<br>[5582, 5608, 0]"]
+  223["Sweep Revolve<br>[5561, 5580, 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>[5663, 5710, 0]"]
+  238["Plane<br>[5635, 5682, 0]"]
-  254["Sweep Extrusion<br>[6200, 6245, 0]"]
+  254["Sweep Extrusion<br>[6172, 6217, 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>[2369, 2413, 0]"]
+  293["StartSketchOnPlane<br>[2362, 2406, 0]"]
-  294["StartSketchOnFace<br>[2562, 2594, 0]"]
+  294["StartSketchOnFace<br>[2555, 2587, 0]"]
-  295["StartSketchOnPlane<br>[3913, 3960, 0]"]
+  295["StartSketchOnPlane<br>[3892, 3939, 0]"]
-  296["StartSketchOnFace<br>[4198, 4230, 0]"]
+  296["StartSketchOnFace<br>[4177, 4209, 0]"]
-  297["StartSketchOnFace<br>[4508, 4540, 0]"]
+  297["StartSketchOnFace<br>[4487, 4519, 0]"]
-  298["StartSketchOnPlane<br>[5649, 5711, 0]"]
+  298["StartSketchOnPlane<br>[5621, 5683, 0]"]
   1 --- 2
   2 --- 3
   2 --- 4

rust/kcl-lib/tests/kcl_samples/french-press/exported_step.step

@@ -19,27 +19,27 @@ DATA;
 );
 #4 = CARTESIAN_POINT('NONE', (0.05841999999999999, 0.16256, -0.008255));
 #5 = VERTEX_POINT('NONE', #4);
-#6 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.1493519999999996, -0.008255));
+#6 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.14935199999999962, -0.008255));
 #7 = VERTEX_POINT('NONE', #6);
-#8 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.1493519999999996, 0.008255));
+#8 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.14935199999999962, 0.008255));
 #9 = VERTEX_POINT('NONE', #8);
 #10 = CARTESIAN_POINT('NONE', (0.05841999999999999, 0.16256, 0.008255));
 #11 = VERTEX_POINT('NONE', #10);
-#12 = CARTESIAN_POINT('NONE', (0.06908799999999998, 0.1493519999999996, -0.008255));
+#12 = CARTESIAN_POINT('NONE', (0.06908799999999998, 0.14935199999999962, -0.008255));
 #13 = VERTEX_POINT('NONE', #12);
-#14 = CARTESIAN_POINT('NONE', (0.06908799999999998, 0.1493519999999996, 0.008255));
+#14 = CARTESIAN_POINT('NONE', (0.06908799999999998, 0.14935199999999962, 0.008255));
 #15 = VERTEX_POINT('NONE', #14);
-#16 = CARTESIAN_POINT('NONE', (0.09042399999999998, 0.1308099999999996, -0.008255));
+#16 = CARTESIAN_POINT('NONE', (0.09042399999999998, 0.13080999999999965, -0.008255));
 #17 = VERTEX_POINT('NONE', #16);
-#18 = CARTESIAN_POINT('NONE', (0.09042399999999998, 0.1308099999999996, 0.008255));
+#18 = CARTESIAN_POINT('NONE', (0.09042399999999998, 0.13080999999999965, 0.008255));
 #19 = VERTEX_POINT('NONE', #18);
-#20 = CARTESIAN_POINT('NONE', (0.09220199999999999, 0.04064000000000004, -0.008255));
+#20 = CARTESIAN_POINT('NONE', (0.09220199999999999, 0.040640000000000044, -0.008255));
 #21 = VERTEX_POINT('NONE', #20);
-#22 = CARTESIAN_POINT('NONE', (0.09220199999999999, 0.04064000000000004, 0.008255));
+#22 = CARTESIAN_POINT('NONE', (0.09220199999999999, 0.040640000000000044, 0.008255));
 #23 = VERTEX_POINT('NONE', #22);
-#24 = CARTESIAN_POINT('NONE', (0.076962, 0.025908000000000028, -0.008255));
+#24 = CARTESIAN_POINT('NONE', (0.076962, 0.02590800000000003, -0.008255));
 #25 = VERTEX_POINT('NONE', #24);
-#26 = CARTESIAN_POINT('NONE', (0.076962, 0.025908000000000028, 0.008255));
+#26 = CARTESIAN_POINT('NONE', (0.076962, 0.02590800000000003, 0.008255));
 #27 = VERTEX_POINT('NONE', #26);
 #28 = CARTESIAN_POINT('NONE', (0.051816, 0.026416000000000033, -0.008255));
 #29 = VERTEX_POINT('NONE', #28);
@@ -473,15 +473,15 @@ DATA;
 #457 = VERTEX_POINT('NONE', #456);
 #458 = CARTESIAN_POINT('NONE', (0.056007, 0.14478, 0.000000000000000013717758655969163));
 #459 = VERTEX_POINT('NONE', #458);
-#460 = DIRECTION('NONE', (0.038433122101202255, -0.9992611746313144, 0));
+#460 = DIRECTION('NONE', (0.03843312210120234, -0.9992611746313144, 0));
 #461 = VECTOR('NONE', #460, 1);
 #462 = CARTESIAN_POINT('NONE', (0.05841999999999999, 0.16256, -0.008255));
 #463 = LINE('NONE', #462, #461);
 #464 = DIRECTION('NONE', (0, 0, 1));
 #465 = VECTOR('NONE', #464, 1);
-#466 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.1493519999999996, -0.008255));
+#466 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.14935199999999962, -0.008255));
 #467 = LINE('NONE', #466, #465);
-#468 = DIRECTION('NONE', (0.038433122101202255, -0.9992611746313144, 0));
+#468 = DIRECTION('NONE', (0.03843312210120234, -0.9992611746313144, 0));
 #469 = VECTOR('NONE', #468, 1);
 #470 = CARTESIAN_POINT('NONE', (0.05841999999999999, 0.16256, 0.008255));
 #471 = LINE('NONE', #470, #469);
@@ -491,58 +491,58 @@ DATA;
 #475 = LINE('NONE', #474, #473);
 #476 = DIRECTION('NONE', (1, 0, 0));
 #477 = VECTOR('NONE', #476, 1);
-#478 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.1493519999999996, -0.008255));
+#478 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.14935199999999962, -0.008255));
 #479 = LINE('NONE', #478, #477);
 #480 = DIRECTION('NONE', (0, 0, 1));
 #481 = VECTOR('NONE', #480, 1);
-#482 = CARTESIAN_POINT('NONE', (0.06908799999999998, 0.1493519999999996, -0.008255));
+#482 = CARTESIAN_POINT('NONE', (0.06908799999999998, 0.14935199999999962, -0.008255));
 #483 = LINE('NONE', #482, #481);
 #484 = DIRECTION('NONE', (1, 0, 0));
 #485 = VECTOR('NONE', #484, 1);
-#486 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.1493519999999996, 0.008255));
+#486 = CARTESIAN_POINT('NONE', (0.05892799999999998, 0.14935199999999962, 0.008255));
 #487 = LINE('NONE', #486, #485);
-#488 = DIRECTION('NONE', (-0.0866626263544473, 0.9962377172107816, -0));
+#488 = DIRECTION('NONE', (-0.08666262635444875, 0.9962377172107816, -0));
-#489 = DIRECTION('NONE', (0, -0, -0.9999999999999998));
+#489 = DIRECTION('NONE', (0, -0, -1));
-#490 = CARTESIAN_POINT('NONE', (0.07079178336201049, 0.12976601099190213, -0.008255));
+#490 = CARTESIAN_POINT('NONE', (0.07079178336201052, 0.12976601099190216, -0.008255));
 #491 = AXIS2_PLACEMENT_3D('NONE', #490, #489, #488);
 #492 = CIRCLE('NONE', #491, 0.01965995531963333);
 #493 = DIRECTION('NONE', (0, 0, 1));
 #494 = VECTOR('NONE', #493, 1);
-#495 = CARTESIAN_POINT('NONE', (0.09042399999999998, 0.1308099999999996, -0.008255));
+#495 = CARTESIAN_POINT('NONE', (0.09042399999999998, 0.13080999999999965, -0.008255));
 #496 = LINE('NONE', #495, #494);
-#497 = DIRECTION('NONE', (-0.0866626263544473, 0.9962377172107816, -0));
+#497 = DIRECTION('NONE', (-0.08666262635444875, 0.9962377172107816, -0));
-#498 = DIRECTION('NONE', (0, -0, -0.9999999999999998));
+#498 = DIRECTION('NONE', (0, -0, -1));
-#499 = CARTESIAN_POINT('NONE', (0.07079178336201049, 0.12976601099190213, 0.008255));
+#499 = CARTESIAN_POINT('NONE', (0.07079178336201052, 0.12976601099190216, 0.008255));
 #500 = AXIS2_PLACEMENT_3D('NONE', #499, #498, #497);
 #501 = CIRCLE('NONE', #500, 0.01965995531963333);
-#502 = DIRECTION('NONE', (0.9985890770760726, 0.05310230827711328, -0));
+#502 = DIRECTION('NONE', (0.9985890770760725, 0.05310230827711449, -0));
 #503 = DIRECTION('NONE', (-0, 0, -1));
-#504 = CARTESIAN_POINT('NONE', (-1.2575688405092589, 0.059127329905450624, -0.008255));
+#504 = CARTESIAN_POINT('NONE', (-1.2575688405092098, 0.059127329905451644, -0.008255));
 #505 = AXIS2_PLACEMENT_3D('NONE', #504, #503, #502);
-#506 = CIRCLE('NONE', #505, 1.3498974417547818);
+#506 = CIRCLE('NONE', #505, 1.3498974417547327);
 #507 = DIRECTION('NONE', (0, 0, 1));
 #508 = VECTOR('NONE', #507, 1);
-#509 = CARTESIAN_POINT('NONE', (0.09220199999999999, 0.04064000000000004, -0.008255));
+#509 = CARTESIAN_POINT('NONE', (0.09220199999999999, 0.040640000000000044, -0.008255));
 #510 = LINE('NONE', #509, #508);
-#511 = DIRECTION('NONE', (0.9985890770760726, 0.05310230827711328, -0));
+#511 = DIRECTION('NONE', (0.9985890770760725, 0.05310230827711449, -0));
 #512 = DIRECTION('NONE', (-0, 0, -1));
-#513 = CARTESIAN_POINT('NONE', (-1.2575688405092589, 0.059127329905450624, 0.008255));
+#513 = CARTESIAN_POINT('NONE', (-1.2575688405092098, 0.059127329905451644, 0.008255));
 #514 = AXIS2_PLACEMENT_3D('NONE', #513, #512, #511);
-#515 = CIRCLE('NONE', #514, 1.3498974417547818);
+#515 = CIRCLE('NONE', #514, 1.3498974417547327);
-#516 = DIRECTION('NONE', (0.9999062141747909, -0.013695358872168632, -0));
+#516 = DIRECTION('NONE', (0.9999062141747909, -0.013695358872166266, -0));
 #517 = DIRECTION('NONE', (0, 0, -1.0000000000000002));
-#518 = CARTESIAN_POINT('NONE', (0.07726374957352439, 0.04084460388945755, -0.008255));
+#518 = CARTESIAN_POINT('NONE', (0.07726374957352439, 0.04084460388945753, -0.008255));
 #519 = AXIS2_PLACEMENT_3D('NONE', #518, #517, #516);
-#520 = CIRCLE('NONE', #519, 0.014939651554024935);
+#520 = CIRCLE('NONE', #519, 0.014939651554024921);
 #521 = DIRECTION('NONE', (0, 0, 1));
 #522 = VECTOR('NONE', #521, 1);
-#523 = CARTESIAN_POINT('NONE', (0.076962, 0.025908000000000028, -0.008255));
+#523 = CARTESIAN_POINT('NONE', (0.076962, 0.02590800000000003, -0.008255));
 #524 = LINE('NONE', #523, #522);
-#525 = DIRECTION('NONE', (0.9999062141747909, -0.013695358872168632, -0));
+#525 = DIRECTION('NONE', (0.9999062141747909, -0.013695358872166266, -0));
 #526 = DIRECTION('NONE', (0, 0, -1.0000000000000002));
-#527 = CARTESIAN_POINT('NONE', (0.07726374957352439, 0.04084460388945755, 0.008255));
+#527 = CARTESIAN_POINT('NONE', (0.07726374957352439, 0.04084460388945753, 0.008255));
 #528 = AXIS2_PLACEMENT_3D('NONE', #527, #526, #525);
-#529 = CIRCLE('NONE', #528, 0.014939651554024935);
+#529 = CIRCLE('NONE', #528, 0.014939651554024921);
 #530 = DIRECTION('NONE', (-0.9997960016298644, 0.0201978990228256, 0));
 #531 = VECTOR('NONE', #530, 1);
 #532 = CARTESIAN_POINT('NONE', (0.076962, 0.02590800000000003, -0.008255));
@@ -2369,29 +2369,29 @@ DATA;
 #2353 = EDGE_CURVE('NONE', #457, #457, #1992, .T.);
 #2354 = EDGE_CURVE('NONE', #457, #459, #1996, .T.);
 #2355 = EDGE_CURVE('NONE', #459, #459, #2001, .T.);
-#2356 = CARTESIAN_POINT('NONE', (0.05867399999999999, 0.1559559999999998, -0));
+#2356 = CARTESIAN_POINT('NONE', (0.05867399999999998, 0.15595599999999982, -0));
 #2357 = DIRECTION('NONE', (-0.9992611746313143, -0.038433122101202415, 0));
 #2358 = AXIS2_PLACEMENT_3D('NONE', #2356, #2357, $);
 #2359 = PLANE('NONE', #2358);
-#2360 = CARTESIAN_POINT('NONE', (0.06400799999999998, 0.1493519999999996, -0));
+#2360 = CARTESIAN_POINT('NONE', (0.06400799999999998, 0.14935199999999962, -0));
 #2361 = DIRECTION('NONE', (0, -1, 0));
 #2362 = AXIS2_PLACEMENT_3D('NONE', #2360, #2361, $);
 #2363 = PLANE('NONE', #2362);
-#2364 = CARTESIAN_POINT('NONE', (0.07079178336201049, 0.12976601099190213, -0));
+#2364 = CARTESIAN_POINT('NONE', (0.07079178336201052, 0.12976601099190216, -0));
-#2365 = DIRECTION('NONE', (0, -0, -0.9999999999999998));
+#2365 = DIRECTION('NONE', (0, -0, -1));
-#2366 = DIRECTION('NONE', (-0.0866626263544473, 0.9962377172107816, -0));
+#2366 = DIRECTION('NONE', (-0.08666262635444875, 0.9962377172107816, -0));
 #2367 = AXIS2_PLACEMENT_3D('NONE', #2364, #2365, #2366);
 #2368 = CYLINDRICAL_SURFACE('NONE', #2367, 0.01965995531963333);
-#2369 = CARTESIAN_POINT('NONE', (-1.2575688405092589, 0.059127329905450624, -0));
+#2369 = CARTESIAN_POINT('NONE', (-1.2575688405092098, 0.059127329905451644, -0));
 #2370 = DIRECTION('NONE', (-0, 0, -1));
-#2371 = DIRECTION('NONE', (0.9985890770760726, 0.05310230827711328, -0));
+#2371 = DIRECTION('NONE', (0.9985890770760725, 0.05310230827711449, -0));
 #2372 = AXIS2_PLACEMENT_3D('NONE', #2369, #2370, #2371);
-#2373 = CYLINDRICAL_SURFACE('NONE', #2372, 1.3498974417547818);
+#2373 = CYLINDRICAL_SURFACE('NONE', #2372, 1.3498974417547327);
-#2374 = CARTESIAN_POINT('NONE', (0.07726374957352439, 0.04084460388945755, -0));
+#2374 = CARTESIAN_POINT('NONE', (0.07726374957352439, 0.04084460388945753, -0));
 #2375 = DIRECTION('NONE', (0, 0, -1.0000000000000002));
-#2376 = DIRECTION('NONE', (0.9999062141747909, -0.013695358872168632, -0));
+#2376 = DIRECTION('NONE', (0.9999062141747909, -0.013695358872166266, -0));
 #2377 = AXIS2_PLACEMENT_3D('NONE', #2374, #2375, #2376);
-#2378 = CYLINDRICAL_SURFACE('NONE', #2377, 0.014939651554024935);
+#2378 = CYLINDRICAL_SURFACE('NONE', #2377, 0.014939651554024921);
 #2379 = CARTESIAN_POINT('NONE', (0.064389, 0.026162000000000036, -0));
 #2380 = DIRECTION('NONE', (0.020197899022825535, 0.9997960016298644, -0));
 #2381 = AXIS2_PLACEMENT_3D('NONE', #2379, #2380, $);

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

@@ -28,45 +28,34 @@ description: Operations executed french-press.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "angle": {
         "value": {
-          "type": "Object",
+          "type": "Number",
-          "value": {
+          "value": 360.0,
-            "angle": {
+          "ty": {
-              "type": "Number",
+            "type": "Default",
-              "value": 360.0,
+            "len": {
-              "ty": {
+              "type": "Inches"
-                "type": "Default",
-                "len": {
-                  "type": "Inches"
-                },
-                "angle": {
-                  "type": "Degrees"
-                }
-              }
             },
-            "axis": {
+            "angle": {
-              "type": "String",
+              "type": "Degrees"
-              "value": "Y"
             }
           }
         },
         "sourceRange": [
-          684,
+          692,
-          711,
+          695,
           0
         ]
       },
-      "sketches": {
+      "axis": {
         "value": {
-          "type": "Sketch",
+          "type": "String",
-          "value": {
+          "value": "Y"
-            "artifactId": "[uuid]"
-          }
         },
         "sourceRange": [
-          713,
+          704,
-          714,
+          707,
           0
         ]
       }
@@ -74,11 +63,23 @@ description: Operations executed french-press.kcl
     "name": "revolve",
     "sourceRange": [
       676,
-      715,
+      708,
       0
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        676,
+        708,
+        0
+      ]
+    }
   },
   {
     "labeledArgs": {
@@ -270,16 +271,16 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          978,
+          971,
-          986,
+          979,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      964,
+      957,
-      987,
+      980,
       0
     ],
     "type": "StdLibCall",
@@ -302,16 +303,16 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          2174,
+          2167,
-          2178,
+          2171,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      2157,
+      2150,
-      2179,
+      2172,
       0
     ],
     "type": "StdLibCall",
@@ -323,8 +324,8 @@ description: Operations executed french-press.kcl
         }
       },
       "sourceRange": [
-        2157,
+        2150,
-        2179,
+        2172,
         0
       ]
     }
@@ -346,8 +347,8 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          2298,
+          2291,
-          2301,
+          2294,
           0
         ]
       },
@@ -397,8 +398,8 @@ description: Operations executed french-press.kcl
           ]
         },
         "sourceRange": [
-          2218,
+          2211,
-          2227,
+          2220,
           0
         ]
       },
@@ -448,8 +449,8 @@ description: Operations executed french-press.kcl
           ]
         },
         "sourceRange": [
-          2245,
+          2238,
-          2254,
+          2247,
           0
         ]
       },
@@ -468,8 +469,8 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          2275,
+          2268,
-          2276,
+          2269,
           0
         ]
       },
@@ -479,16 +480,16 @@ description: Operations executed french-press.kcl
           "value": true
         },
         "sourceRange": [
-          2329,
+          2322,
-          2333,
+          2326,
           0
         ]
       }
     },
     "name": "patternCircular3d",
     "sourceRange": [
-      2185,
+      2178,
-      2340,
+      2333,
       0
     ],
     "type": "StdLibCall",
@@ -500,8 +501,8 @@ description: Operations executed french-press.kcl
         }
       },
       "sourceRange": [
-        2185,
+        2178,
-        2340,
+        2333,
         0
       ]
     }
@@ -523,16 +524,16 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          2410,
+          2403,
-          2411,
+          2404,
           0
         ]
       }
     },
     "name": "offsetPlane",
     "sourceRange": [
-      2383,
+      2376,
-      2412,
+      2405,
       0
     ],
     "type": "StdLibCall",
@@ -542,8 +543,8 @@ description: Operations executed french-press.kcl
         "value": "XY"
       },
       "sourceRange": [
-        2395,
+        2388,
-        2399,
+        2392,
         0
       ]
     }
@@ -556,16 +557,16 @@ description: Operations executed french-press.kcl
           "artifact_id": "[uuid]"
         },
         "sourceRange": [
-          2383,
+          2376,
-          2412,
+          2405,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      2369,
+      2362,
-      2413,
+      2406,
       0
     ],
     "type": "StdLibCall",
@@ -588,16 +589,16 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          2542,
+          2535,
-          2547,
+          2540,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      2514,
+      2507,
-      2548,
+      2541,
       0
     ],
     "type": "StdLibCall",
@@ -609,8 +610,8 @@ description: Operations executed french-press.kcl
         }
       },
       "sourceRange": [
-        2522,
+        2515,
-        2531,
+        2524,
         0
       ]
     }
@@ -625,8 +626,8 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          2576,
+          2569,
-          2586,
+          2579,
           0
         ]
       },
@@ -636,16 +637,16 @@ description: Operations executed french-press.kcl
           "value": "END"
         },
         "sourceRange": [
-          2588,
+          2581,
-          2593,
+          2586,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      2562,
+      2555,
-      2594,
+      2587,
       0
     ],
     "type": "StdLibCall",
@@ -668,16 +669,16 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          2995,
+          2988,
-          3001,
+          2994,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      2967,
+      2960,
-      3002,
+      2995,
       0
     ],
     "type": "StdLibCall",
@@ -706,8 +707,8 @@ description: Operations executed french-press.kcl
         ]
       },
       "sourceRange": [
-        2975,
+        2968,
-        2984,
+        2977,
         0
       ]
     }
@@ -720,16 +721,16 @@ description: Operations executed french-press.kcl
           "value": "XZ"
         },
         "sourceRange": [
-          3047,
+          3040,
-          3051,
+          3044,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      3033,
+      3026,
-      3052,
+      3045,
       0
     ],
     "type": "StdLibCall",
@@ -737,44 +738,38 @@ description: Operations executed french-press.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "axis": {
         "value": {
-          "type": "Object",
+          "type": "String",
-          "value": {
+          "value": "y"
-            "axis": {
-              "type": "String",
-              "value": "y"
-            }
-          }
         },
         "sourceRange": [
           3467,
-          3481,
+          3470,
-          0
-        ]
-      },
-      "sketches": {
-        "value": {
-          "type": "Sketch",
-          "value": {
-            "artifactId": "[uuid]"
-          }
-        },
-        "sourceRange": [
-          3483,
-          3484,
           0
         ]
       }
     },
     "name": "revolve",
     "sourceRange": [
-      3459,
+      3452,
-      3485,
+      3471,
       0
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        3452,
+        3471,
+        0
+      ]
+    }
   },
   {
     "labeledArgs": {
@@ -784,16 +779,16 @@ description: Operations executed french-press.kcl
           "value": "XZ"
         },
         "sourceRange": [
-          3533,
+          3519,
-          3537,
+          3523,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      3519,
+      3505,
-      3538,
+      3524,
       0
     ],
     "type": "StdLibCall",
@@ -801,44 +796,38 @@ description: Operations executed french-press.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "axis": {
         "value": {
-          "type": "Object",
+          "type": "String",
-          "value": {
+          "value": "y"
-            "axis": {
-              "type": "String",
-              "value": "y"
-            }
-          }
         },
         "sourceRange": [
-          3865,
+          3858,
-          3879,
+          3861,
-          0
-        ]
-      },
-      "sketches": {
-        "value": {
-          "type": "Sketch",
-          "value": {
-            "artifactId": "[uuid]"
-          }
-        },
-        "sourceRange": [
-          3881,
-          3882,
           0
         ]
       }
     },
     "name": "revolve",
     "sourceRange": [
-      3857,
+      3843,
-      3883,
+      3862,
       0
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        3843,
+        3862,
+        0
+      ]
+    }
   },
   {
     "labeledArgs": {
@@ -857,16 +846,16 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          3954,
+          3933,
-          3958,
+          3937,
           0
         ]
       }
     },
     "name": "offsetPlane",
     "sourceRange": [
-      3927,
+      3906,
-      3959,
+      3938,
       0
     ],
     "type": "StdLibCall",
@@ -876,8 +865,8 @@ description: Operations executed french-press.kcl
         "value": "XY"
       },
       "sourceRange": [
-        3939,
+        3918,
-        3943,
+        3922,
         0
       ]
     }
@@ -890,16 +879,16 @@ description: Operations executed french-press.kcl
           "artifact_id": "[uuid]"
         },
         "sourceRange": [
-          3927,
+          3906,
-          3959,
+          3938,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      3913,
+      3892,
-      3960,
+      3939,
       0
     ],
     "type": "StdLibCall",
@@ -915,8 +904,8 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          4057,
+          4036,
-          4094,
+          4073,
           0
         ]
       },
@@ -928,16 +917,16 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          4096,
+          4075,
-          4097,
+          4076,
           0
         ]
       }
     },
     "name": "hole",
     "sourceRange": [
-      4052,
+      4031,
-      4098,
+      4077,
       0
     ],
     "type": "StdLibCall",
@@ -960,16 +949,16 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          4141,
+          4120,
-          4146,
+          4125,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      4113,
+      4092,
-      4147,
+      4126,
       0
     ],
     "type": "StdLibCall",
@@ -981,8 +970,8 @@ description: Operations executed french-press.kcl
         }
       },
       "sourceRange": [
-        4121,
+        4100,
-        4130,
+        4109,
         0
       ]
     }
@@ -997,8 +986,8 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          4212,
+          4191,
-          4222,
+          4201,
           0
         ]
       },
@@ -1008,16 +997,16 @@ description: Operations executed french-press.kcl
           "value": "END"
         },
         "sourceRange": [
-          4224,
+          4203,
-          4229,
+          4208,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      4198,
+      4177,
-      4230,
+      4209,
       0
     ],
     "type": "StdLibCall",
@@ -1040,16 +1029,16 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          4450,
+          4429,
-          4456,
+          4435,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      4422,
+      4401,
-      4457,
+      4436,
       0
     ],
     "type": "StdLibCall",
@@ -1108,8 +1097,8 @@ description: Operations executed french-press.kcl
         ]
       },
       "sourceRange": [
-        4430,
+        4409,
-        4439,
+        4418,
         0
       ]
     }
@@ -1124,8 +1113,8 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          4522,
+          4501,
-          4532,
+          4511,
           0
         ]
       },
@@ -1135,16 +1124,16 @@ description: Operations executed french-press.kcl
           "value": "END"
         },
         "sourceRange": [
-          4534,
+          4513,
-          4539,
+          4518,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      4508,
+      4487,
-      4540,
+      4519,
       0
     ],
     "type": "StdLibCall",
@@ -1167,16 +1156,16 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          4760,
+          4739,
-          4766,
+          4745,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      4732,
+      4711,
-      4767,
+      4746,
       0
     ],
     "type": "StdLibCall",
@@ -1211,8 +1200,8 @@ description: Operations executed french-press.kcl
         ]
       },
       "sourceRange": [
-        4740,
+        4719,
-        4749,
+        4728,
         0
       ]
     }
@@ -1225,16 +1214,16 @@ description: Operations executed french-press.kcl
           "value": "XY"
         },
         "sourceRange": [
-          4826,
+          4805,
-          4830,
+          4809,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      4812,
+      4791,
-      4831,
+      4810,
       0
     ],
     "type": "StdLibCall",
@@ -1257,16 +1246,16 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          5034,
+          5013,
-          5046,
+          5025,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      5006,
+      4985,
-      5047,
+      5026,
       0
     ],
     "type": "StdLibCall",
@@ -1278,8 +1267,8 @@ description: Operations executed french-press.kcl
         }
       },
       "sourceRange": [
-        5014,
+        4993,
-        5023,
+        5002,
         0
       ]
     }
@@ -1297,8 +1286,8 @@ description: Operations executed french-press.kcl
           ]
         },
         "sourceRange": [
-          5067,
+          5046,
-          5074,
+          5053,
           0
         ]
       },
@@ -1317,16 +1306,16 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          5088,
+          5067,
-          5091,
+          5070,
           0
         ]
       }
     },
     "name": "shell",
     "sourceRange": [
-      5053,
+      5032,
-      5092,
+      5071,
       0
     ],
     "type": "StdLibCall",
@@ -1338,8 +1327,8 @@ description: Operations executed french-press.kcl
         }
       },
       "sourceRange": [
-        5053,
+        5032,
-        5092,
+        5071,
         0
       ]
     }
@@ -1352,16 +1341,16 @@ description: Operations executed french-press.kcl
           "value": "XZ"
         },
         "sourceRange": [
-          5148,
+          5127,
-          5152,
+          5131,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      5134,
+      5113,
-      5153,
+      5132,
       0
     ],
     "type": "StdLibCall",
@@ -1369,44 +1358,38 @@ description: Operations executed french-press.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "axis": {
         "value": {
-          "type": "Object",
+          "type": "String",
-          "value": {
+          "value": "y"
-            "axis": {
-              "type": "String",
-              "value": "y"
-            }
-          }
         },
         "sourceRange": [
-          5590,
+          5576,
-          5604,
+          5579,
-          0
-        ]
-      },
-      "sketches": {
-        "value": {
-          "type": "Sketch",
-          "value": {
-            "artifactId": "[uuid]"
-          }
-        },
-        "sourceRange": [
-          5606,
-          5607,
           0
         ]
       }
     },
     "name": "revolve",
     "sourceRange": [
-      5582,
+      5561,
-      5608,
+      5580,
       0
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        5561,
+        5580,
+        0
+      ]
+    }
   },
   {
     "labeledArgs": {
@@ -1419,16 +1402,16 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          5690,
+          5662,
-          5709,
+          5681,
           0
         ]
       }
     },
     "name": "offsetPlane",
     "sourceRange": [
-      5663,
+      5635,
-      5710,
+      5682,
       0
     ],
     "type": "StdLibCall",
@@ -1438,8 +1421,8 @@ description: Operations executed french-press.kcl
         "value": "XZ"
       },
       "sourceRange": [
-        5675,
+        5647,
-        5679,
+        5651,
         0
       ]
     }
@@ -1452,16 +1435,16 @@ description: Operations executed french-press.kcl
           "artifact_id": "[uuid]"
         },
         "sourceRange": [
-          5663,
+          5635,
-          5710,
+          5682,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      5649,
+      5621,
-      5711,
+      5683,
       0
     ],
     "type": "StdLibCall",
@@ -1484,16 +1467,16 @@ description: Operations executed french-press.kcl
           }
         },
         "sourceRange": [
-          6228,
+          6200,
-          6244,
+          6216,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      6200,
+      6172,
-      6245,
+      6217,
       0
     ],
     "type": "StdLibCall",
@@ -1505,8 +1488,8 @@ description: Operations executed french-press.kcl
         }
       },
       "sourceRange": [
-        6208,
+        6180,
-        6217,
+        6189,
         0
       ]
     }

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>[4856, 4957, 0]"]
+    54["Path<br>[4852, 4953, 0]"]
-    55["Segment<br>[4856, 4957, 0]"]
+    55["Segment<br>[4852, 4953, 0]"]
     56[Solid2d]
   end
   subgraph path58 [Path]
-    58["Path<br>[4485, 4510, 0]"]
+    58["Path<br>[4481, 4506, 0]"]
-    59["Segment<br>[4518, 4559, 0]"]
+    59["Segment<br>[4514, 4555, 0]"]
-    60["Segment<br>[4567, 4608, 0]"]
+    60["Segment<br>[4563, 4604, 0]"]
-    61["Segment<br>[4616, 4669, 0]"]
+    61["Segment<br>[4612, 4665, 0]"]
-    62["Segment<br>[4677, 4698, 0]"]
+    62["Segment<br>[4673, 4694, 0]"]
     63[Solid2d]
   end
   subgraph path65 [Path]
-    65["Path<br>[2830, 2917, 0]"]
+    65["Path<br>[2826, 2913, 0]"]
-    66["Segment<br>[2925, 3004, 0]"]
+    66["Segment<br>[2921, 3000, 0]"]
-    67["Segment<br>[3012, 3118, 0]"]
+    67["Segment<br>[3008, 3114, 0]"]
-    68["Segment<br>[3126, 3208, 0]"]
+    68["Segment<br>[3122, 3204, 0]"]
-    69["Segment<br>[3216, 3262, 0]"]
+    69["Segment<br>[3212, 3258, 0]"]
-    70["Segment<br>[3270, 3349, 0]"]
+    70["Segment<br>[3266, 3345, 0]"]
-    71["Segment<br>[3357, 3465, 0]"]
+    71["Segment<br>[3353, 3461, 0]"]
-    72["Segment<br>[3473, 3552, 0]"]
+    72["Segment<br>[3469, 3548, 0]"]
-    73["Segment<br>[3560, 3606, 0]"]
+    73["Segment<br>[3556, 3602, 0]"]
-    74["Segment<br>[3614, 3696, 0]"]
+    74["Segment<br>[3610, 3692, 0]"]
-    75["Segment<br>[3704, 3813, 0]"]
+    75["Segment<br>[3700, 3809, 0]"]
-    76["Segment<br>[3821, 3900, 0]"]
+    76["Segment<br>[3817, 3896, 0]"]
-    77["Segment<br>[3908, 3973, 0]"]
+    77["Segment<br>[3904, 3969, 0]"]
-    78["Segment<br>[3981, 4063, 0]"]
+    78["Segment<br>[3977, 4059, 0]"]
-    79["Segment<br>[4071, 4180, 0]"]
+    79["Segment<br>[4067, 4176, 0]"]
-    80["Segment<br>[4188, 4270, 0]"]
+    80["Segment<br>[4184, 4266, 0]"]
-    81["Segment<br>[4278, 4327, 0]"]
+    81["Segment<br>[4274, 4323, 0]"]
-    82["Segment<br>[4335, 4342, 0]"]
+    82["Segment<br>[4331, 4338, 0]"]
     83[Solid2d]
   end
   subgraph path100 [Path]
-    100["Path<br>[4485, 4510, 0]"]
+    100["Path<br>[4481, 4506, 0]"]
-    101["Segment<br>[4518, 4559, 0]"]
+    101["Segment<br>[4514, 4555, 0]"]
-    102["Segment<br>[4567, 4608, 0]"]
+    102["Segment<br>[4563, 4604, 0]"]
-    103["Segment<br>[4616, 4669, 0]"]
+    103["Segment<br>[4612, 4665, 0]"]
-    104["Segment<br>[4677, 4698, 0]"]
+    104["Segment<br>[4673, 4694, 0]"]
     105[Solid2d]
   end
   subgraph path106 [Path]
-    106["Path<br>[2830, 2917, 0]"]
+    106["Path<br>[2826, 2913, 0]"]
-    107["Segment<br>[2925, 3004, 0]"]
+    107["Segment<br>[2921, 3000, 0]"]
-    108["Segment<br>[3012, 3118, 0]"]
+    108["Segment<br>[3008, 3114, 0]"]
-    109["Segment<br>[3126, 3208, 0]"]
+    109["Segment<br>[3122, 3204, 0]"]
-    110["Segment<br>[3216, 3262, 0]"]
+    110["Segment<br>[3212, 3258, 0]"]
-    111["Segment<br>[3270, 3349, 0]"]
+    111["Segment<br>[3266, 3345, 0]"]
-    112["Segment<br>[3357, 3465, 0]"]
+    112["Segment<br>[3353, 3461, 0]"]
-    113["Segment<br>[3473, 3552, 0]"]
+    113["Segment<br>[3469, 3548, 0]"]
-    114["Segment<br>[3560, 3606, 0]"]
+    114["Segment<br>[3556, 3602, 0]"]
-    115["Segment<br>[3614, 3696, 0]"]
+    115["Segment<br>[3610, 3692, 0]"]
-    116["Segment<br>[3704, 3813, 0]"]
+    116["Segment<br>[3700, 3809, 0]"]
-    117["Segment<br>[3821, 3900, 0]"]
+    117["Segment<br>[3817, 3896, 0]"]
-    118["Segment<br>[3908, 3973, 0]"]
+    118["Segment<br>[3904, 3969, 0]"]
-    119["Segment<br>[3981, 4063, 0]"]
+    119["Segment<br>[3977, 4059, 0]"]
-    120["Segment<br>[4071, 4180, 0]"]
+    120["Segment<br>[4067, 4176, 0]"]
-    121["Segment<br>[4188, 4270, 0]"]
+    121["Segment<br>[4184, 4266, 0]"]
-    122["Segment<br>[4278, 4327, 0]"]
+    122["Segment<br>[4274, 4323, 0]"]
-    123["Segment<br>[4335, 4342, 0]"]
+    123["Segment<br>[4331, 4338, 0]"]
     124[Solid2d]
   end
   1["Plane<br>[1246, 1286, 0]"]
@@ -100,8 +100,8 @@ flowchart LR
   24["SweepEdge Adjacent"]
   25["SweepEdge Opposite"]
   26["SweepEdge Adjacent"]
-  27["Plane<br>[1792, 1832, 0]"]
+  27["Plane<br>[1759, 1799, 0]"]
-  35["Sweep Revolve<br>[1746, 1834, 0]"]
+  35["Sweep Revolve<br>[1746, 1830, 0]"]
   36[Wall]
   37[Wall]
   38[Wall]
@@ -119,10 +119,10 @@ flowchart LR
   50["SweepEdge Adjacent"]
   51["SweepEdge Opposite"]
   52["SweepEdge Adjacent"]
-  53["Plane<br>[4831, 4850, 0]"]
+  53["Plane<br>[4827, 4846, 0]"]
-  57["Plane<br>[4457, 4477, 0]"]
+  57["Plane<br>[4453, 4473, 0]"]
-  64["Plane<br>[2802, 2822, 0]"]
+  64["Plane<br>[2798, 2818, 0]"]
-  84["Sweep Extrusion<br>[5301, 5343, 0]"]
+  84["Sweep Extrusion<br>[5297, 5339, 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>[5836, 5873, 0]"]
+  99["Plane<br>[5832, 5869, 0]"]
-  125["Sweep Extrusion<br>[5956, 6007, 0]"]
+  125["Sweep Extrusion<br>[5952, 6003, 0]"]
   126[Wall]
   127[Wall]
   128[Wall]
@@ -153,18 +153,18 @@ flowchart LR
   137["SweepEdge Adjacent"]
   138["SweepEdge Opposite"]
   139["SweepEdge Adjacent"]
-  140["EdgeCut Fillet<br>[5406, 5744, 0]"]
+  140["EdgeCut Fillet<br>[5402, 5740, 0]"]
-  141["EdgeCut Fillet<br>[5406, 5744, 0]"]
+  141["EdgeCut Fillet<br>[5402, 5740, 0]"]
-  142["EdgeCut Fillet<br>[5406, 5744, 0]"]
+  142["EdgeCut Fillet<br>[5402, 5740, 0]"]
-  143["EdgeCut Fillet<br>[5406, 5744, 0]"]
+  143["EdgeCut Fillet<br>[5402, 5740, 0]"]
-  144["EdgeCut Fillet<br>[6071, 6414, 0]"]
+  144["EdgeCut Fillet<br>[6067, 6410, 0]"]
-  145["EdgeCut Fillet<br>[6071, 6414, 0]"]
+  145["EdgeCut Fillet<br>[6067, 6410, 0]"]
-  146["EdgeCut Fillet<br>[6071, 6414, 0]"]
+  146["EdgeCut Fillet<br>[6067, 6410, 0]"]
-  147["EdgeCut Fillet<br>[6071, 6414, 0]"]
+  147["EdgeCut Fillet<br>[6067, 6410, 0]"]
   148["StartSketchOnPlane<br>[893, 913, 0]"]
   149["StartSketchOnPlane<br>[893, 913, 0]"]
-  150["StartSketchOnPlane<br>[4457, 4477, 0]"]
+  150["StartSketchOnPlane<br>[4453, 4473, 0]"]
-  151["StartSketchOnPlane<br>[2802, 2822, 0]"]
+  151["StartSketchOnPlane<br>[2798, 2818, 0]"]
   1 --- 2
   2 --- 3
   2 --- 4

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

@@ -13143,13 +13143,13 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            4518,
+            4514,
-            4559,
+            4555,
             0
           ],
           "tag": {
-            "end": 4558,
+            "end": 4554,
-            "start": 4550,
+            "start": 4546,
             "type": "TagDeclarator",
             "value": "line001"
           },
@@ -13159,13 +13159,13 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            4567,
+            4563,
-            4608,
+            4604,
             0
           ],
           "tag": {
-            "end": 4607,
+            "end": 4603,
-            "start": 4599,
+            "start": 4595,
             "type": "TagDeclarator",
             "value": "line002"
           },
@@ -13175,13 +13175,13 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            4616,
+            4612,
-            4669,
+            4665,
             0
           ],
           "tag": {
-            "end": 4668,
+            "end": 4664,
-            "start": 4660,
+            "start": 4656,
             "type": "TagDeclarator",
             "value": "line003"
           },
@@ -13191,13 +13191,13 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            4677,
+            4673,
-            4698,
+            4694,
             0
           ],
           "tag": {
-            "end": 4697,
+            "end": 4693,
-            "start": 4689,
+            "start": 4685,
             "type": "TagDeclarator",
             "value": "line004"
           },
@@ -13212,8 +13212,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4518,
+                4514,
-                4559,
+                4555,
                 0
               ]
             },
@@ -13222,8 +13222,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               0.0
             ],
             "tag": {
-              "end": 4558,
+              "end": 4554,
-              "start": 4550,
+              "start": 4546,
               "type": "TagDeclarator",
               "value": "line001"
             },
@@ -13240,8 +13240,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4567,
+                4563,
-                4608,
+                4604,
                 0
               ]
             },
@@ -13250,8 +13250,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               0.0
             ],
             "tag": {
-              "end": 4607,
+              "end": 4603,
-              "start": 4599,
+              "start": 4595,
               "type": "TagDeclarator",
               "value": "line002"
             },
@@ -13268,8 +13268,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4616,
+                4612,
-                4669,
+                4665,
                 0
               ]
             },
@@ -13278,8 +13278,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               42.0
             ],
             "tag": {
-              "end": 4668,
+              "end": 4664,
-              "start": 4660,
+              "start": 4656,
               "type": "TagDeclarator",
               "value": "line003"
             },
@@ -13296,8 +13296,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4677,
+                4673,
-                4698,
+                4694,
                 0
               ]
             },
@@ -13306,8 +13306,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               42.0
             ],
             "tag": {
-              "end": 4697,
+              "end": 4693,
-              "start": 4689,
+              "start": 4685,
               "type": "TagDeclarator",
               "value": "line004"
             },
@@ -13366,8 +13366,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              4485,
+              4481,
-              4510,
+              4506,
               0
             ]
           }
@@ -13415,13 +13415,13 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            4518,
+            4514,
-            4559,
+            4555,
             0
           ],
           "tag": {
-            "end": 4558,
+            "end": 4554,
-            "start": 4550,
+            "start": 4546,
             "type": "TagDeclarator",
             "value": "line001"
           },
@@ -13431,13 +13431,13 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            4567,
+            4563,
-            4608,
+            4604,
             0
           ],
           "tag": {
-            "end": 4607,
+            "end": 4603,
-            "start": 4599,
+            "start": 4595,
             "type": "TagDeclarator",
             "value": "line002"
           },
@@ -13447,13 +13447,13 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            4616,
+            4612,
-            4669,
+            4665,
             0
           ],
           "tag": {
-            "end": 4668,
+            "end": 4664,
-            "start": 4660,
+            "start": 4656,
             "type": "TagDeclarator",
             "value": "line003"
           },
@@ -13463,13 +13463,13 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            4677,
+            4673,
-            4698,
+            4694,
             0
           ],
           "tag": {
-            "end": 4697,
+            "end": 4693,
-            "start": 4689,
+            "start": 4685,
             "type": "TagDeclarator",
             "value": "line004"
           },
@@ -13484,8 +13484,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4518,
+                4514,
-                4559,
+                4555,
                 0
               ]
             },
@@ -13494,8 +13494,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               0.0
             ],
             "tag": {
-              "end": 4558,
+              "end": 4554,
-              "start": 4550,
+              "start": 4546,
               "type": "TagDeclarator",
               "value": "line001"
             },
@@ -13512,8 +13512,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4567,
+                4563,
-                4608,
+                4604,
                 0
               ]
             },
@@ -13522,8 +13522,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               0.0
             ],
             "tag": {
-              "end": 4607,
+              "end": 4603,
-              "start": 4599,
+              "start": 4595,
               "type": "TagDeclarator",
               "value": "line002"
             },
@@ -13540,8 +13540,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4616,
+                4612,
-                4669,
+                4665,
                 0
               ]
             },
@@ -13550,8 +13550,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               42.0
             ],
             "tag": {
-              "end": 4668,
+              "end": 4664,
-              "start": 4660,
+              "start": 4656,
               "type": "TagDeclarator",
               "value": "line003"
             },
@@ -13568,8 +13568,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4677,
+                4673,
-                4698,
+                4694,
                 0
               ]
             },
@@ -13578,8 +13578,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               42.0
             ],
             "tag": {
-              "end": 4697,
+              "end": 4693,
-              "start": 4689,
+              "start": 4685,
               "type": "TagDeclarator",
               "value": "line004"
             },
@@ -13638,8 +13638,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              4485,
+              4481,
-              4510,
+              4506,
               0
             ]
           }
@@ -13717,13 +13717,13 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            4518,
+            4514,
-            4559,
+            4555,
             0
           ],
           "tag": {
-            "end": 4558,
+            "end": 4554,
-            "start": 4550,
+            "start": 4546,
             "type": "TagDeclarator",
             "value": "line001"
           },
@@ -13733,13 +13733,13 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            4567,
+            4563,
-            4608,
+            4604,
             0
           ],
           "tag": {
-            "end": 4607,
+            "end": 4603,
-            "start": 4599,
+            "start": 4595,
             "type": "TagDeclarator",
             "value": "line002"
           },
@@ -13749,13 +13749,13 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            4616,
+            4612,
-            4669,
+            4665,
             0
           ],
           "tag": {
-            "end": 4668,
+            "end": 4664,
-            "start": 4660,
+            "start": 4656,
             "type": "TagDeclarator",
             "value": "line003"
           },
@@ -13765,13 +13765,13 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            4677,
+            4673,
-            4698,
+            4694,
             0
           ],
           "tag": {
-            "end": 4697,
+            "end": 4693,
-            "start": 4689,
+            "start": 4685,
             "type": "TagDeclarator",
             "value": "line004"
           },
@@ -13786,8 +13786,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4518,
+                4514,
-                4559,
+                4555,
                 0
               ]
             },
@@ -13796,8 +13796,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               0.0
             ],
             "tag": {
-              "end": 4558,
+              "end": 4554,
-              "start": 4550,
+              "start": 4546,
               "type": "TagDeclarator",
               "value": "line001"
             },
@@ -13814,8 +13814,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4567,
+                4563,
-                4608,
+                4604,
                 0
               ]
             },
@@ -13824,8 +13824,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               0.0
             ],
             "tag": {
-              "end": 4607,
+              "end": 4603,
-              "start": 4599,
+              "start": 4595,
               "type": "TagDeclarator",
               "value": "line002"
             },
@@ -13842,8 +13842,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4616,
+                4612,
-                4669,
+                4665,
                 0
               ]
             },
@@ -13852,8 +13852,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               42.0
             ],
             "tag": {
-              "end": 4668,
+              "end": 4664,
-              "start": 4660,
+              "start": 4656,
               "type": "TagDeclarator",
               "value": "line003"
             },
@@ -13870,8 +13870,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4677,
+                4673,
-                4698,
+                4694,
                 0
               ]
             },
@@ -13880,8 +13880,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               42.0
             ],
             "tag": {
-              "end": 4697,
+              "end": 4693,
-              "start": 4689,
+              "start": 4685,
               "type": "TagDeclarator",
               "value": "line004"
             },
@@ -13940,8 +13940,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              4485,
+              4481,
-              4510,
+              4506,
               0
             ]
           }
@@ -13989,13 +13989,13 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            4518,
+            4514,
-            4559,
+            4555,
             0
           ],
           "tag": {
-            "end": 4558,
+            "end": 4554,
-            "start": 4550,
+            "start": 4546,
             "type": "TagDeclarator",
             "value": "line001"
           },
@@ -14005,13 +14005,13 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            4567,
+            4563,
-            4608,
+            4604,
             0
           ],
           "tag": {
-            "end": 4607,
+            "end": 4603,
-            "start": 4599,
+            "start": 4595,
             "type": "TagDeclarator",
             "value": "line002"
           },
@@ -14021,13 +14021,13 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            4616,
+            4612,
-            4669,
+            4665,
             0
           ],
           "tag": {
-            "end": 4668,
+            "end": 4664,
-            "start": 4660,
+            "start": 4656,
             "type": "TagDeclarator",
             "value": "line003"
           },
@@ -14037,13 +14037,13 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            4677,
+            4673,
-            4698,
+            4694,
             0
           ],
           "tag": {
-            "end": 4697,
+            "end": 4693,
-            "start": 4689,
+            "start": 4685,
             "type": "TagDeclarator",
             "value": "line004"
           },
@@ -14058,8 +14058,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4518,
+                4514,
-                4559,
+                4555,
                 0
               ]
             },
@@ -14068,8 +14068,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               0.0
             ],
             "tag": {
-              "end": 4558,
+              "end": 4554,
-              "start": 4550,
+              "start": 4546,
               "type": "TagDeclarator",
               "value": "line001"
             },
@@ -14086,8 +14086,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4567,
+                4563,
-                4608,
+                4604,
                 0
               ]
             },
@@ -14096,8 +14096,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               0.0
             ],
             "tag": {
-              "end": 4607,
+              "end": 4603,
-              "start": 4599,
+              "start": 4595,
               "type": "TagDeclarator",
               "value": "line002"
             },
@@ -14114,8 +14114,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4616,
+                4612,
-                4669,
+                4665,
                 0
               ]
             },
@@ -14124,8 +14124,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               42.0
             ],
             "tag": {
-              "end": 4668,
+              "end": 4664,
-              "start": 4660,
+              "start": 4656,
               "type": "TagDeclarator",
               "value": "line003"
             },
@@ -14142,8 +14142,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4677,
+                4673,
-                4698,
+                4694,
                 0
               ]
             },
@@ -14152,8 +14152,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               42.0
             ],
             "tag": {
-              "end": 4697,
+              "end": 4693,
-              "start": 4689,
+              "start": 4685,
               "type": "TagDeclarator",
               "value": "line004"
             },
@@ -14212,8 +14212,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              4485,
+              4481,
-              4510,
+              4506,
               0
             ]
           }
@@ -14290,8 +14290,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              4518,
+              4514,
-              4559,
+              4555,
               0
             ]
           },
@@ -14300,8 +14300,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             0.0
           ],
           "tag": {
-            "end": 4558,
+            "end": 4554,
-            "start": 4550,
+            "start": 4546,
             "type": "TagDeclarator",
             "value": "line001"
           },
@@ -14318,8 +14318,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              4567,
+              4563,
-              4608,
+              4604,
               0
             ]
           },
@@ -14328,8 +14328,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             0.0
           ],
           "tag": {
-            "end": 4607,
+            "end": 4603,
-            "start": 4599,
+            "start": 4595,
             "type": "TagDeclarator",
             "value": "line002"
           },
@@ -14346,8 +14346,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              4616,
+              4612,
-              4669,
+              4665,
               0
             ]
           },
@@ -14356,8 +14356,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             42.0
           ],
           "tag": {
-            "end": 4668,
+            "end": 4664,
-            "start": 4660,
+            "start": 4656,
             "type": "TagDeclarator",
             "value": "line003"
           },
@@ -14374,8 +14374,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              4677,
+              4673,
-              4698,
+              4694,
               0
             ]
           },
@@ -14384,8 +14384,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             42.0
           ],
           "tag": {
-            "end": 4697,
+            "end": 4693,
-            "start": 4689,
+            "start": 4685,
             "type": "TagDeclarator",
             "value": "line004"
           },
@@ -14444,8 +14444,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
         "__geoMeta": {
           "id": "[uuid]",
           "sourceRange": [
-            4485,
+            4481,
-            4510,
+            4506,
             0
           ]
         }
@@ -14485,8 +14485,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              4518,
+              4514,
-              4559,
+              4555,
               0
             ]
           },
@@ -14495,8 +14495,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             0.0
           ],
           "tag": {
-            "end": 4558,
+            "end": 4554,
-            "start": 4550,
+            "start": 4546,
             "type": "TagDeclarator",
             "value": "line001"
           },
@@ -14513,8 +14513,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              4567,
+              4563,
-              4608,
+              4604,
               0
             ]
           },
@@ -14523,8 +14523,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             0.0
           ],
           "tag": {
-            "end": 4607,
+            "end": 4603,
-            "start": 4599,
+            "start": 4595,
             "type": "TagDeclarator",
             "value": "line002"
           },
@@ -14541,8 +14541,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              4616,
+              4612,
-              4669,
+              4665,
               0
             ]
           },
@@ -14551,8 +14551,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             42.0
           ],
           "tag": {
-            "end": 4668,
+            "end": 4664,
-            "start": 4660,
+            "start": 4656,
             "type": "TagDeclarator",
             "value": "line003"
           },
@@ -14569,8 +14569,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              4677,
+              4673,
-              4698,
+              4694,
               0
             ]
           },
@@ -14579,8 +14579,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             42.0
           ],
           "tag": {
-            "end": 4697,
+            "end": 4693,
-            "start": 4689,
+            "start": 4685,
             "type": "TagDeclarator",
             "value": "line004"
           },
@@ -14639,8 +14639,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
         "__geoMeta": {
           "id": "[uuid]",
           "sourceRange": [
-            4485,
+            4481,
-            4510,
+            4506,
             0
           ]
         }
@@ -14683,8 +14683,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               "__geoMeta": {
                 "id": "[uuid]",
                 "sourceRange": [
-                  4856,
+                  4852,
-                  4957,
+                  4953,
                   0
                 ]
               },
@@ -14754,8 +14754,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4856,
+                4852,
-                4957,
+                4953,
                 0
               ]
             }
@@ -14777,8 +14777,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               "__geoMeta": {
                 "id": "[uuid]",
                 "sourceRange": [
-                  4856,
+                  4852,
-                  4957,
+                  4953,
                   0
                 ]
               },
@@ -14848,8 +14848,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4856,
+                4852,
-                4957,
+                4953,
                 0
               ]
             }
@@ -14871,8 +14871,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               "__geoMeta": {
                 "id": "[uuid]",
                 "sourceRange": [
-                  4856,
+                  4852,
-                  4957,
+                  4953,
                   0
                 ]
               },
@@ -14942,8 +14942,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4856,
+                4852,
-                4957,
+                4953,
                 0
               ]
             }
@@ -14965,8 +14965,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
               "__geoMeta": {
                 "id": "[uuid]",
                 "sourceRange": [
-                  4856,
+                  4852,
-                  4957,
+                  4953,
                   0
                 ]
               },
@@ -15036,8 +15036,8 @@ description: Variables in memory after executing gridfinity-baseplate-magnets.kc
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                4856,
+                4852,
-                4957,
+                4953,
                 0
               ]
             }

rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate/artifact_commands.snap

@@ -505,8 +505,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1667,
+      1634,
-      1707,
+      1674,
       0
     ],
     "command": {
@@ -534,8 +534,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1667,
+      1634,
-      1707,
+      1674,
       0
     ],
     "command": {
@@ -708,7 +708,7 @@ description: Artifact commands gridfinity-baseplate.kcl
     "cmdId": "[uuid]",
     "range": [
       1621,
-      1709,
+      1705,
       0
     ],
     "command": {
@@ -736,7 +736,7 @@ description: Artifact commands gridfinity-baseplate.kcl
     "cmdId": "[uuid]",
     "range": [
       1621,
-      1709,
+      1705,
       0
     ],
     "command": {
@@ -748,7 +748,7 @@ description: Artifact commands gridfinity-baseplate.kcl
     "cmdId": "[uuid]",
     "range": [
       1621,
-      1709,
+      1705,
       0
     ],
     "command": {
@@ -761,7 +761,7 @@ description: Artifact commands gridfinity-baseplate.kcl
     "cmdId": "[uuid]",
     "range": [
       1621,
-      1709,
+      1705,
       0
     ],
     "command": {
@@ -775,7 +775,7 @@ description: Artifact commands gridfinity-baseplate.kcl
     "cmdId": "[uuid]",
     "range": [
       1621,
-      1709,
+      1705,
       0
     ],
     "command": {
@@ -789,7 +789,7 @@ description: Artifact commands gridfinity-baseplate.kcl
     "cmdId": "[uuid]",
     "range": [
       1621,
-      1709,
+      1705,
       0
     ],
     "command": {
@@ -803,7 +803,7 @@ description: Artifact commands gridfinity-baseplate.kcl
     "cmdId": "[uuid]",
     "range": [
       1621,
-      1709,
+      1705,
       0
     ],
     "command": {
@@ -817,7 +817,7 @@ description: Artifact commands gridfinity-baseplate.kcl
     "cmdId": "[uuid]",
     "range": [
       1621,
-      1709,
+      1705,
       0
     ],
     "command": {
@@ -831,7 +831,7 @@ description: Artifact commands gridfinity-baseplate.kcl
     "cmdId": "[uuid]",
     "range": [
       1621,
-      1709,
+      1705,
       0
     ],
     "command": {
@@ -845,7 +845,7 @@ description: Artifact commands gridfinity-baseplate.kcl
     "cmdId": "[uuid]",
     "range": [
       1621,
-      1709,
+      1705,
       0
     ],
     "command": {
@@ -859,7 +859,7 @@ description: Artifact commands gridfinity-baseplate.kcl
     "cmdId": "[uuid]",
     "range": [
       1621,
-      1709,
+      1705,
       0
     ],
     "command": {
@@ -873,7 +873,7 @@ description: Artifact commands gridfinity-baseplate.kcl
     "cmdId": "[uuid]",
     "range": [
       1621,
-      1709,
+      1705,
       0
     ],
     "command": {
@@ -887,7 +887,7 @@ description: Artifact commands gridfinity-baseplate.kcl
     "cmdId": "[uuid]",
     "range": [
       1621,
-      1709,
+      1705,
       0
     ],
     "command": {
@@ -900,8 +900,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1754,
+      1750,
-      1919,
+      1915,
       0
     ],
     "command": {
@@ -925,8 +925,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1982,
+      1978,
-      2112,
+      2108,
       0
     ],
     "command": {
@@ -969,8 +969,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1982,
+      1978,
-      2112,
+      2108,
       0
     ],
     "command": {
@@ -1013,8 +1013,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1982,
+      1978,
-      2112,
+      2108,
       0
     ],
     "command": {
@@ -1057,8 +1057,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      1982,
+      1978,
-      2112,
+      2108,
       0
     ],
     "command": {
@@ -1101,8 +1101,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2118,
+      2114,
-      2235,
+      2231,
       0
     ],
     "command": {
@@ -1174,8 +1174,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2118,
+      2114,
-      2235,
+      2231,
       0
     ],
     "command": {
@@ -1247,8 +1247,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2118,
+      2114,
-      2235,
+      2231,
       0
     ],
     "command": {
@@ -1320,8 +1320,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2118,
+      2114,
-      2235,
+      2231,
       0
     ],
     "command": {
@@ -1393,8 +1393,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2118,
+      2114,
-      2235,
+      2231,
       0
     ],
     "command": {
@@ -1466,8 +1466,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2118,
+      2114,
-      2235,
+      2231,
       0
     ],
     "command": {
@@ -1539,8 +1539,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2118,
+      2114,
-      2235,
+      2231,
       0
     ],
     "command": {
@@ -1612,8 +1612,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2118,
+      2114,
-      2235,
+      2231,
       0
     ],
     "command": {
@@ -1685,8 +1685,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2321,
+      2317,
-      2453,
+      2449,
       0
     ],
     "command": {
@@ -1729,8 +1729,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2321,
+      2317,
-      2453,
+      2449,
       0
     ],
     "command": {
@@ -1773,8 +1773,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2321,
+      2317,
-      2453,
+      2449,
       0
     ],
     "command": {
@@ -1817,8 +1817,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2321,
+      2317,
-      2453,
+      2449,
       0
     ],
     "command": {
@@ -1861,8 +1861,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2459,
+      2455,
-      2576,
+      2572,
       0
     ],
     "command": {
@@ -1934,8 +1934,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2459,
+      2455,
-      2576,
+      2572,
       0
     ],
     "command": {
@@ -2007,8 +2007,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2459,
+      2455,
-      2576,
+      2572,
       0
     ],
     "command": {
@@ -2080,8 +2080,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2459,
+      2455,
-      2576,
+      2572,
       0
     ],
     "command": {
@@ -2153,8 +2153,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2459,
+      2455,
-      2576,
+      2572,
       0
     ],
     "command": {
@@ -2226,8 +2226,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2459,
+      2455,
-      2576,
+      2572,
       0
     ],
     "command": {
@@ -2299,8 +2299,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2459,
+      2455,
-      2576,
+      2572,
       0
     ],
     "command": {
@@ -2372,8 +2372,8 @@ description: Artifact commands gridfinity-baseplate.kcl
   {
     "cmdId": "[uuid]",
     "range": [
-      2459,
+      2455,
-      2576,
+      2572,
       0
     ],
     "command": {

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

@@ -37,8 +37,8 @@ flowchart LR
   24["SweepEdge Adjacent"]
   25["SweepEdge Opposite"]
   26["SweepEdge Adjacent"]
-  27["Plane<br>[1667, 1707, 0]"]
+  27["Plane<br>[1634, 1674, 0]"]
-  35["Sweep Revolve<br>[1621, 1709, 0]"]
+  35["Sweep Revolve<br>[1621, 1705, 0]"]
   36[Wall]
   37[Wall]
   38[Wall]

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

@@ -307,16 +307,16 @@ description: Operations executed gridfinity-baseplate.kcl
           }
         },
         "sourceRange": [
-          1694,
+          1661,
-          1706,
+          1673,
           0
         ]
       }
     },
     "name": "offsetPlane",
     "sourceRange": [
-      1667,
+      1634,
-      1707,
+      1674,
       0
     ],
     "type": "StdLibCall",
@@ -326,8 +326,8 @@ description: Operations executed gridfinity-baseplate.kcl
         "value": "YZ"
       },
       "sourceRange": [
-        1679,
+        1646,
-        1683,
+        1650,
         0
       ]
     }
@@ -343,8 +343,8 @@ description: Operations executed gridfinity-baseplate.kcl
     "unlabeledArg": null,
     "labeledArgs": {},
     "sourceRange": [
-      1662,
+      1629,
-      1708,
+      1675,
       0
     ]
   },
@@ -376,113 +376,102 @@ description: Operations executed gridfinity-baseplate.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "angle": {
+        "value": {
+          "type": "Number",
+          "value": -90.0,
+          "ty": {
+            "type": "Default",
+            "len": {
+              "type": "Mm"
+            },
+            "angle": {
+              "type": "Degrees"
+            }
+          }
+        },
+        "sourceRange": [
+          1685,
+          1688,
+          0
+        ]
+      },
+      "axis": {
         "value": {
           "type": "Object",
           "value": {
-            "angle": {
+            "custom": {
-              "type": "Number",
-              "value": -90.0,
-              "ty": {
-                "type": "Default",
-                "len": {
-                  "type": "Mm"
-                },
-                "angle": {
-                  "type": "Degrees"
-                }
-              }
-            },
-            "axis": {
               "type": "Object",
               "value": {
-                "custom": {
+                "axis": {
-                  "type": "Object",
+                  "type": "Array",
-                  "value": {
+                  "value": [
-                    "axis": {
+                    {
-                      "type": "Array",
+                      "type": "Number",
-                      "value": [
+                      "value": 0.0,
-                        {
+                      "ty": {
-                          "type": "Number",
+                        "type": "Default",
-                          "value": 0.0,
+                        "len": {
-                          "ty": {
+                          "type": "Mm"
-                            "type": "Default",
-                            "len": {
-                              "type": "Mm"
-                            },
-                            "angle": {
-                              "type": "Degrees"
-                            }
-                          }
                         },
-                        {
+                        "angle": {
-                          "type": "Number",
+                          "type": "Degrees"
-                          "value": 1.0,
-                          "ty": {
-                            "type": "Default",
-                            "len": {
-                              "type": "Mm"
-                            },
-                            "angle": {
-                              "type": "Degrees"
-                            }
-                          }
                         }
-                      ]
+                      }
                     },
-                    "origin": {
+                    {
-                      "type": "Array",
+                      "type": "Number",
-                      "value": [
+                      "value": 1.0,
-                        {
+                      "ty": {
-                          "type": "Number",
+                        "type": "Default",
-                          "value": 4.0,
+                        "len": {
-                          "ty": {
+                          "type": "Mm"
-                            "type": "Default",
-                            "len": {
-                              "type": "Mm"
-                            },
-                            "angle": {
-                              "type": "Degrees"
-                            }
-                          }
                         },
-                        {
+                        "angle": {
-                          "type": "Number",
+                          "type": "Degrees"
-                          "value": 4.0,
-                          "ty": {
-                            "type": "Default",
-                            "len": {
-                              "type": "Mm"
-                            },
-                            "angle": {
-                              "type": "Degrees"
-                            }
-                          }
                         }
-                      ]
+                      }
                     }
-                  }
+                  ]
+                },
+                "origin": {
+                  "type": "Array",
+                  "value": [
+                    {
+                      "type": "Number",
+                      "value": 4.0,
+                      "ty": {
+                        "type": "Default",
+                        "len": {
+                          "type": "Mm"
+                        },
+                        "angle": {
+                          "type": "Degrees"
+                        }
+                      }
+                    },
+                    {
+                      "type": "Number",
+                      "value": 4.0,
+                      "ty": {
+                        "type": "Default",
+                        "len": {
+                          "type": "Mm"
+                        },
+                        "angle": {
+                          "type": "Degrees"
+                        }
+                      }
+                    }
+                  ]
                 }
               }
             }
           }
         },
         "sourceRange": [
-          1629,
+          1697,
-          1660,
+          1704,
-          0
-        ]
-      },
-      "sketches": {
-        "value": {
-          "type": "Sketch",
-          "value": {
-            "artifactId": "[uuid]"
-          }
-        },
-        "sourceRange": [
-          1662,
-          1708,
           0
         ]
       }
@@ -490,11 +479,23 @@ description: Operations executed gridfinity-baseplate.kcl
     "name": "revolve",
     "sourceRange": [
       1621,
-      1709,
+      1705,
       0
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        1629,
+        1675,
+        0
+      ]
+    }
   },
   {
     "labeledArgs": {
@@ -513,8 +514,8 @@ description: Operations executed gridfinity-baseplate.kcl
           }
         },
         "sourceRange": [
-          1804,
+          1800,
-          1807,
+          1803,
           0
         ]
       },
@@ -564,8 +565,8 @@ description: Operations executed gridfinity-baseplate.kcl
           ]
         },
         "sourceRange": [
-          1818,
+          1814,
-          1827,
+          1823,
           0
         ]
       },
@@ -603,8 +604,8 @@ description: Operations executed gridfinity-baseplate.kcl
           ]
         },
         "sourceRange": [
-          1840,
+          1836,
-          1873,
+          1869,
           0
         ]
       },
@@ -623,8 +624,8 @@ description: Operations executed gridfinity-baseplate.kcl
           }
         },
         "sourceRange": [
-          1889,
+          1885,
-          1890,
+          1886,
           0
         ]
       },
@@ -634,16 +635,16 @@ description: Operations executed gridfinity-baseplate.kcl
           "value": true
         },
         "sourceRange": [
+          1909,
           1913,
-          1917,
           0
         ]
       }
     },
     "name": "patternCircular3d",
     "sourceRange": [
-      1754,
+      1750,
-      1919,
+      1915,
       0
     ],
     "type": "StdLibCall",
@@ -655,8 +656,8 @@ description: Operations executed gridfinity-baseplate.kcl
         }
       },
       "sourceRange": [
-        1775,
+        1771,
-        1787,
+        1783,
         0
       ]
     }
@@ -709,8 +710,8 @@ description: Operations executed gridfinity-baseplate.kcl
           ]
         },
         "sourceRange": [
-          2027,
+          2023,
-          2042,
+          2038,
           0
         ]
       },
@@ -729,8 +730,8 @@ description: Operations executed gridfinity-baseplate.kcl
           }
         },
         "sourceRange": [
-          2096,
+          2092,
-          2105,
+          2101,
           0
         ]
       },
@@ -749,16 +750,16 @@ description: Operations executed gridfinity-baseplate.kcl
           }
         },
         "sourceRange": [
-          2063,
+          2059,
-          2076,
+          2072,
           0
         ]
       }
     },
     "name": "patternLinear3d",
     "sourceRange": [
-      1982,
+      1978,
-      2112,
+      2108,
       0
     ],
     "type": "StdLibCall",
@@ -793,8 +794,8 @@ description: Operations executed gridfinity-baseplate.kcl
         ]
       },
       "sourceRange": [
-        2006,
+        2002,
-        2011,
+        2007,
         0
       ]
     }
@@ -847,8 +848,8 @@ description: Operations executed gridfinity-baseplate.kcl
           ]
         },
         "sourceRange": [
-          2149,
+          2145,
-          2164,
+          2160,
           0
         ]
       },
@@ -867,8 +868,8 @@ description: Operations executed gridfinity-baseplate.kcl
           }
         },
         "sourceRange": [
-          2219,
+          2215,
-          2228,
+          2224,
           0
         ]
       },
@@ -887,16 +888,16 @@ description: Operations executed gridfinity-baseplate.kcl
           }
         },
         "sourceRange": [
-          2185,
+          2181,
-          2199,
+          2195,
           0
         ]
       }
     },
     "name": "patternLinear3d",
     "sourceRange": [
-      2118,
+      2114,
-      2235,
+      2231,
       0
     ],
     "type": "StdLibCall",
@@ -955,8 +956,8 @@ description: Operations executed gridfinity-baseplate.kcl
         ]
       },
       "sourceRange": [
-        2118,
+        2114,
-        2235,
+        2231,
         0
       ]
     }
@@ -1009,8 +1010,8 @@ description: Operations executed gridfinity-baseplate.kcl
           ]
         },
         "sourceRange": [
-          2368,
+          2364,
-          2383,
+          2379,
           0
         ]
       },
@@ -1029,8 +1030,8 @@ description: Operations executed gridfinity-baseplate.kcl
           }
         },
         "sourceRange": [
-          2437,
+          2433,
-          2446,
+          2442,
           0
         ]
       },
@@ -1049,16 +1050,16 @@ description: Operations executed gridfinity-baseplate.kcl
           }
         },
         "sourceRange": [
-          2404,
+          2400,
-          2417,
+          2413,
           0
         ]
       }
     },
     "name": "patternLinear3d",
     "sourceRange": [
-      2321,
+      2317,
-      2453,
+      2449,
       0
     ],
     "type": "StdLibCall",
@@ -1093,8 +1094,8 @@ description: Operations executed gridfinity-baseplate.kcl
         ]
       },
       "sourceRange": [
-        2345,
+        2341,
-        2352,
+        2348,
         0
       ]
     }
@@ -1147,8 +1148,8 @@ description: Operations executed gridfinity-baseplate.kcl
           ]
         },
         "sourceRange": [
-          2490,
+          2486,
-          2505,
+          2501,
           0
         ]
       },
@@ -1167,8 +1168,8 @@ description: Operations executed gridfinity-baseplate.kcl
           }
         },
         "sourceRange": [
-          2560,
+          2556,
-          2569,
+          2565,
           0
         ]
       },
@@ -1187,16 +1188,16 @@ description: Operations executed gridfinity-baseplate.kcl
           }
         },
         "sourceRange": [
-          2526,
+          2522,
-          2540,
+          2536,
           0
         ]
       }
     },
     "name": "patternLinear3d",
     "sourceRange": [
-      2459,
+      2455,
-      2576,
+      2572,
       0
     ],
     "type": "StdLibCall",
@@ -1255,8 +1256,8 @@ description: Operations executed gridfinity-baseplate.kcl
         ]
       },
       "sourceRange": [
-        2459,
+        2455,
-        2576,
+        2572,
         0
       ]
     }

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

@@ -21,72 +21,72 @@ flowchart LR
     36[Solid2d]
   end
   subgraph path56 [Path]
-    56["Path<br>[2555, 2643, 0]"]
+    56["Path<br>[2551, 2639, 0]"]
-    57["Segment<br>[2649, 2713, 0]"]
+    57["Segment<br>[2645, 2709, 0]"]
-    58["Segment<br>[2719, 2783, 0]"]
+    58["Segment<br>[2715, 2779, 0]"]
-    59["Segment<br>[2789, 2842, 0]"]
+    59["Segment<br>[2785, 2838, 0]"]
-    60["Segment<br>[2848, 2869, 0]"]
+    60["Segment<br>[2844, 2865, 0]"]
     61[Solid2d]
   end
   subgraph path81 [Path]
-    81["Path<br>[3194, 3359, 0]"]
+    81["Path<br>[3190, 3355, 0]"]
-    82["Segment<br>[3194, 3359, 0]"]
+    82["Segment<br>[3190, 3355, 0]"]
     83[Solid2d]
   end
   subgraph path93 [Path]
-    93["Path<br>[4728, 4753, 0]"]
+    93["Path<br>[4724, 4749, 0]"]
-    94["Segment<br>[4759, 4831, 0]"]
+    94["Segment<br>[4755, 4827, 0]"]
-    95["Segment<br>[4837, 4910, 0]"]
+    95["Segment<br>[4833, 4906, 0]"]
-    96["Segment<br>[4916, 4969, 0]"]
+    96["Segment<br>[4912, 4965, 0]"]
-    97["Segment<br>[4975, 4996, 0]"]
+    97["Segment<br>[4971, 4992, 0]"]
     98[Solid2d]
   end
   subgraph path119 [Path]
-    119["Path<br>[5464, 5489, 0]"]
+    119["Path<br>[5460, 5485, 0]"]
-    120["Segment<br>[5549, 5592, 0]"]
+    120["Segment<br>[5545, 5588, 0]"]
-    121["Segment<br>[5600, 5709, 0]"]
+    121["Segment<br>[5596, 5705, 0]"]
-    122["Segment<br>[5784, 5833, 0]"]
+    122["Segment<br>[5780, 5829, 0]"]
-    123["Segment<br>[5841, 5866, 0]"]
+    123["Segment<br>[5837, 5862, 0]"]
-    124["Segment<br>[5874, 5932, 0]"]
+    124["Segment<br>[5870, 5928, 0]"]
-    125["Segment<br>[5940, 5965, 0]"]
+    125["Segment<br>[5936, 5961, 0]"]
-    126["Segment<br>[5973, 6032, 0]"]
+    126["Segment<br>[5969, 6028, 0]"]
-    127["Segment<br>[6040, 6047, 0]"]
+    127["Segment<br>[6036, 6043, 0]"]
     128[Solid2d]
   end
   subgraph path157 [Path]
-    157["Path<br>[5464, 5489, 0]"]
+    157["Path<br>[5460, 5485, 0]"]
-    158["Segment<br>[5549, 5592, 0]"]
+    158["Segment<br>[5545, 5588, 0]"]
-    159["Segment<br>[5600, 5709, 0]"]
+    159["Segment<br>[5596, 5705, 0]"]
-    160["Segment<br>[5784, 5833, 0]"]
+    160["Segment<br>[5780, 5829, 0]"]
-    161["Segment<br>[5841, 5866, 0]"]
+    161["Segment<br>[5837, 5862, 0]"]
-    162["Segment<br>[5874, 5932, 0]"]
+    162["Segment<br>[5870, 5928, 0]"]
-    163["Segment<br>[5940, 5965, 0]"]
+    163["Segment<br>[5936, 5961, 0]"]
-    164["Segment<br>[5973, 6032, 0]"]
+    164["Segment<br>[5969, 6028, 0]"]
-    165["Segment<br>[6040, 6047, 0]"]
+    165["Segment<br>[6036, 6043, 0]"]
     166[Solid2d]
   end
   subgraph path195 [Path]
-    195["Path<br>[5464, 5489, 0]"]
+    195["Path<br>[5460, 5485, 0]"]
-    196["Segment<br>[5549, 5592, 0]"]
+    196["Segment<br>[5545, 5588, 0]"]
-    197["Segment<br>[5600, 5709, 0]"]
+    197["Segment<br>[5596, 5705, 0]"]
-    198["Segment<br>[5784, 5833, 0]"]
+    198["Segment<br>[5780, 5829, 0]"]
-    199["Segment<br>[5841, 5866, 0]"]
+    199["Segment<br>[5837, 5862, 0]"]
-    200["Segment<br>[5874, 5932, 0]"]
+    200["Segment<br>[5870, 5928, 0]"]
-    201["Segment<br>[5940, 5965, 0]"]
+    201["Segment<br>[5936, 5961, 0]"]
-    202["Segment<br>[5973, 6032, 0]"]
+    202["Segment<br>[5969, 6028, 0]"]
-    203["Segment<br>[6040, 6047, 0]"]
+    203["Segment<br>[6036, 6043, 0]"]
     204[Solid2d]
   end
   subgraph path233 [Path]
-    233["Path<br>[5464, 5489, 0]"]
+    233["Path<br>[5460, 5485, 0]"]
-    234["Segment<br>[5549, 5592, 0]"]
+    234["Segment<br>[5545, 5588, 0]"]
-    235["Segment<br>[5600, 5709, 0]"]
+    235["Segment<br>[5596, 5705, 0]"]
-    236["Segment<br>[5784, 5833, 0]"]
+    236["Segment<br>[5780, 5829, 0]"]
-    237["Segment<br>[5841, 5866, 0]"]
+    237["Segment<br>[5837, 5862, 0]"]
-    238["Segment<br>[5874, 5932, 0]"]
+    238["Segment<br>[5870, 5928, 0]"]
-    239["Segment<br>[5940, 5965, 0]"]
+    239["Segment<br>[5936, 5961, 0]"]
-    240["Segment<br>[5973, 6032, 0]"]
+    240["Segment<br>[5969, 6028, 0]"]
-    241["Segment<br>[6040, 6047, 0]"]
+    241["Segment<br>[6036, 6043, 0]"]
     242[Solid2d]
   end
   1["Plane<br>[1570, 1619, 0]"]
@@ -108,8 +108,8 @@ flowchart LR
   25["SweepEdge Adjacent"]
   26["SweepEdge Opposite"]
   27["SweepEdge Adjacent"]
-  28["Plane<br>[2205, 2254, 0]"]
+  28["Plane<br>[2172, 2221, 0]"]
-  37["Sweep Revolve<br>[2159, 2256, 0]"]
+  37["Sweep Revolve<br>[2159, 2252, 0]"]
   38[Wall]
   39[Wall]
   40[Wall]
@@ -127,8 +127,8 @@ flowchart LR
   52["SweepEdge Adjacent"]
   53["SweepEdge Opposite"]
   54["SweepEdge Adjacent"]
-  55["Plane<br>[2530, 2549, 0]"]
+  55["Plane<br>[2526, 2545, 0]"]
-  62["Sweep Extrusion<br>[2875, 2899, 0]"]
+  62["Sweep Extrusion<br>[2871, 2895, 0]"]
   63[Wall]
   64[Wall]
   65[Wall]
@@ -143,20 +143,20 @@ flowchart LR
   74["SweepEdge Adjacent"]
   75["SweepEdge Opposite"]
   76["SweepEdge Adjacent"]
-  77["EdgeCut Fillet<br>[2905, 3134, 0]"]
+  77["EdgeCut Fillet<br>[2901, 3130, 0]"]
-  78["EdgeCut Fillet<br>[2905, 3134, 0]"]
+  78["EdgeCut Fillet<br>[2901, 3130, 0]"]
-  79["EdgeCut Fillet<br>[2905, 3134, 0]"]
+  79["EdgeCut Fillet<br>[2901, 3130, 0]"]
-  80["EdgeCut Fillet<br>[2905, 3134, 0]"]
+  80["EdgeCut Fillet<br>[2901, 3130, 0]"]
-  84["Sweep Extrusion<br>[3580, 3607, 0]"]
+  84["Sweep Extrusion<br>[3576, 3603, 0]"]
   85[Wall]
   86["Cap Start"]
   87["SweepEdge Opposite"]
   88["SweepEdge Adjacent"]
-  89["Sweep Extrusion<br>[3580, 3607, 0]"]
+  89["Sweep Extrusion<br>[3576, 3603, 0]"]
-  90["Sweep Extrusion<br>[3580, 3607, 0]"]
+  90["Sweep Extrusion<br>[3576, 3603, 0]"]
-  91["Sweep Extrusion<br>[3580, 3607, 0]"]
+  91["Sweep Extrusion<br>[3576, 3603, 0]"]
-  92["Plane<br>[4687, 4721, 0]"]
+  92["Plane<br>[4683, 4717, 0]"]
-  99["Sweep Extrusion<br>[5002, 5046, 0]"]
+  99["Sweep Extrusion<br>[4998, 5042, 0]"]
   100[Wall]
   101[Wall]
   102[Wall]
@@ -171,12 +171,12 @@ flowchart LR
   111["SweepEdge Adjacent"]
   112["SweepEdge Opposite"]
   113["SweepEdge Adjacent"]
-  114["EdgeCut Fillet<br>[5052, 5284, 0]"]
+  114["EdgeCut Fillet<br>[5048, 5280, 0]"]
-  115["EdgeCut Fillet<br>[5052, 5284, 0]"]
+  115["EdgeCut Fillet<br>[5048, 5280, 0]"]
-  116["EdgeCut Fillet<br>[5052, 5284, 0]"]
+  116["EdgeCut Fillet<br>[5048, 5280, 0]"]
-  117["EdgeCut Fillet<br>[5052, 5284, 0]"]
+  117["EdgeCut Fillet<br>[5048, 5280, 0]"]
-  118["Plane<br>[5436, 5456, 0]"]
+  118["Plane<br>[5432, 5452, 0]"]
-  129["Sweep Extrusion<br>[6818, 6930, 0]"]
+  129["Sweep Extrusion<br>[6814, 6926, 0]"]
   130[Wall]
   131[Wall]
   132[Wall]
@@ -203,8 +203,8 @@ flowchart LR
   153["SweepEdge Adjacent"]
   154["SweepEdge Opposite"]
   155["SweepEdge Adjacent"]
-  156["Plane<br>[5436, 5456, 0]"]
+  156["Plane<br>[5432, 5452, 0]"]
-  167["Sweep Extrusion<br>[6996, 7110, 0]"]
+  167["Sweep Extrusion<br>[6992, 7106, 0]"]
   168[Wall]
   169[Wall]
   170[Wall]
@@ -231,8 +231,8 @@ flowchart LR
   191["SweepEdge Adjacent"]
   192["SweepEdge Opposite"]
   193["SweepEdge Adjacent"]
-  194["Plane<br>[5436, 5456, 0]"]
+  194["Plane<br>[5432, 5452, 0]"]
-  205["Sweep Revolve<br>[7950, 8009, 0]"]
+  205["Sweep Revolve<br>[7946, 8001, 0]"]
   206[Wall]
   207[Wall]
   208[Wall]
@@ -259,8 +259,8 @@ flowchart LR
   229["SweepEdge Adjacent"]
   230["SweepEdge Opposite"]
   231["SweepEdge Adjacent"]
-  232["Plane<br>[5436, 5456, 0]"]
+  232["Plane<br>[5432, 5452, 0]"]
-  243["Sweep Revolve<br>[8071, 8129, 0]"]
+  243["Sweep Revolve<br>[8063, 8117, 0]"]
   244[Wall]
   245[Wall]
   246[Wall]
@@ -289,8 +289,8 @@ flowchart LR
   269["SweepEdge Adjacent"]
   270["StartSketchOnPlane<br>[1158, 1178, 0]"]
   271["StartSketchOnPlane<br>[1158, 1178, 0]"]
-  272["StartSketchOnFace<br>[3151, 3188, 0]"]
+  272["StartSketchOnFace<br>[3147, 3184, 0]"]
-  273["StartSketchOnPlane<br>[4673, 4722, 0]"]
+  273["StartSketchOnPlane<br>[4669, 4718, 0]"]
   1 --- 2
   2 --- 3
   2 --- 4

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

@@ -21,24 +21,24 @@ flowchart LR
     36[Solid2d]
   end
   subgraph path56 [Path]
-    56["Path<br>[2298, 2386, 0]"]
+    56["Path<br>[2294, 2382, 0]"]
-    57["Segment<br>[2392, 2456, 0]"]
+    57["Segment<br>[2388, 2452, 0]"]
-    58["Segment<br>[2462, 2526, 0]"]
+    58["Segment<br>[2458, 2522, 0]"]
-    59["Segment<br>[2532, 2585, 0]"]
+    59["Segment<br>[2528, 2581, 0]"]
-    60["Segment<br>[2591, 2612, 0]"]
+    60["Segment<br>[2587, 2608, 0]"]
     61[Solid2d]
   end
   subgraph path81 [Path]
-    81["Path<br>[2937, 3102, 0]"]
+    81["Path<br>[2933, 3098, 0]"]
-    82["Segment<br>[2937, 3102, 0]"]
+    82["Segment<br>[2933, 3098, 0]"]
     83[Solid2d]
   end
   subgraph path93 [Path]
-    93["Path<br>[4497, 4522, 0]"]
+    93["Path<br>[4493, 4518, 0]"]
-    94["Segment<br>[4528, 4600, 0]"]
+    94["Segment<br>[4524, 4596, 0]"]
-    95["Segment<br>[4606, 4679, 0]"]
+    95["Segment<br>[4602, 4675, 0]"]
-    96["Segment<br>[4685, 4738, 0]"]
+    96["Segment<br>[4681, 4734, 0]"]
-    97["Segment<br>[4744, 4765, 0]"]
+    97["Segment<br>[4740, 4761, 0]"]
     98[Solid2d]
   end
   1["Plane<br>[1311, 1360, 0]"]
@@ -60,8 +60,8 @@ flowchart LR
   25["SweepEdge Adjacent"]
   26["SweepEdge Opposite"]
   27["SweepEdge Adjacent"]
-  28["Plane<br>[1948, 1997, 0]"]
+  28["Plane<br>[1915, 1964, 0]"]
-  37["Sweep Revolve<br>[1902, 1999, 0]"]
+  37["Sweep Revolve<br>[1902, 1995, 0]"]
   38[Wall]
   39[Wall]
   40[Wall]
@@ -79,8 +79,8 @@ flowchart LR
   52["SweepEdge Adjacent"]
   53["SweepEdge Opposite"]
   54["SweepEdge Adjacent"]
-  55["Plane<br>[2273, 2292, 0]"]
+  55["Plane<br>[2269, 2288, 0]"]
-  62["Sweep Extrusion<br>[2618, 2642, 0]"]
+  62["Sweep Extrusion<br>[2614, 2638, 0]"]
   63[Wall]
   64[Wall]
   65[Wall]
@@ -95,20 +95,20 @@ flowchart LR
   74["SweepEdge Adjacent"]
   75["SweepEdge Opposite"]
   76["SweepEdge Adjacent"]
-  77["EdgeCut Fillet<br>[2648, 2877, 0]"]
+  77["EdgeCut Fillet<br>[2644, 2873, 0]"]
-  78["EdgeCut Fillet<br>[2648, 2877, 0]"]
+  78["EdgeCut Fillet<br>[2644, 2873, 0]"]
-  79["EdgeCut Fillet<br>[2648, 2877, 0]"]
+  79["EdgeCut Fillet<br>[2644, 2873, 0]"]
-  80["EdgeCut Fillet<br>[2648, 2877, 0]"]
+  80["EdgeCut Fillet<br>[2644, 2873, 0]"]
-  84["Sweep Extrusion<br>[3323, 3350, 0]"]
+  84["Sweep Extrusion<br>[3319, 3346, 0]"]
   85[Wall]
   86["Cap Start"]
   87["SweepEdge Opposite"]
   88["SweepEdge Adjacent"]
-  89["Sweep Extrusion<br>[3323, 3350, 0]"]
+  89["Sweep Extrusion<br>[3319, 3346, 0]"]
-  90["Sweep Extrusion<br>[3323, 3350, 0]"]
+  90["Sweep Extrusion<br>[3319, 3346, 0]"]
-  91["Sweep Extrusion<br>[3323, 3350, 0]"]
+  91["Sweep Extrusion<br>[3319, 3346, 0]"]
-  92["Plane<br>[4456, 4490, 0]"]
+  92["Plane<br>[4452, 4486, 0]"]
-  99["Sweep Extrusion<br>[4771, 4815, 0]"]
+  99["Sweep Extrusion<br>[4767, 4811, 0]"]
   100[Wall]
   101[Wall]
   102[Wall]
@@ -123,14 +123,14 @@ flowchart LR
   111["SweepEdge Adjacent"]
   112["SweepEdge Opposite"]
   113["SweepEdge Adjacent"]
-  114["EdgeCut Fillet<br>[4821, 5053, 0]"]
+  114["EdgeCut Fillet<br>[4817, 5049, 0]"]
-  115["EdgeCut Fillet<br>[4821, 5053, 0]"]
+  115["EdgeCut Fillet<br>[4817, 5049, 0]"]
-  116["EdgeCut Fillet<br>[4821, 5053, 0]"]
+  116["EdgeCut Fillet<br>[4817, 5049, 0]"]
-  117["EdgeCut Fillet<br>[4821, 5053, 0]"]
+  117["EdgeCut Fillet<br>[4817, 5049, 0]"]
   118["StartSketchOnPlane<br>[899, 919, 0]"]
   119["StartSketchOnPlane<br>[899, 919, 0]"]
-  120["StartSketchOnFace<br>[2894, 2931, 0]"]
+  120["StartSketchOnFace<br>[2890, 2927, 0]"]
-  121["StartSketchOnPlane<br>[4442, 4491, 0]"]
+  121["StartSketchOnPlane<br>[4438, 4487, 0]"]
   1 --- 2
   2 --- 3
   2 --- 4

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

@@ -307,16 +307,16 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          1975,
+          1942,
-          1996,
+          1963,
           0
         ]
       }
     },
     "name": "offsetPlane",
     "sourceRange": [
-      1948,
+      1915,
-      1997,
+      1964,
       0
     ],
     "type": "StdLibCall",
@@ -326,8 +326,8 @@ description: Operations executed gridfinity-bins.kcl
         "value": "YZ"
       },
       "sourceRange": [
-        1960,
+        1927,
-        1964,
+        1931,
         0
       ]
     }
@@ -343,8 +343,8 @@ description: Operations executed gridfinity-bins.kcl
     "unlabeledArg": null,
     "labeledArgs": {},
     "sourceRange": [
-      1943,
+      1910,
-      1998,
+      1965,
       0
     ]
   },
@@ -376,113 +376,102 @@ description: Operations executed gridfinity-bins.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "angle": {
+        "value": {
+          "type": "Number",
+          "value": -90.0,
+          "ty": {
+            "type": "Default",
+            "len": {
+              "type": "Mm"
+            },
+            "angle": {
+              "type": "Degrees"
+            }
+          }
+        },
+        "sourceRange": [
+          1975,
+          1978,
+          0
+        ]
+      },
+      "axis": {
         "value": {
           "type": "Object",
           "value": {
-            "angle": {
+            "custom": {
-              "type": "Number",
-              "value": -90.0,
-              "ty": {
-                "type": "Default",
-                "len": {
-                  "type": "Mm"
-                },
-                "angle": {
-                  "type": "Degrees"
-                }
-              }
-            },
-            "axis": {
               "type": "Object",
               "value": {
-                "custom": {
+                "axis": {
-                  "type": "Object",
+                  "type": "Array",
-                  "value": {
+                  "value": [
-                    "axis": {
+                    {
-                      "type": "Array",
+                      "type": "Number",
-                      "value": [
+                      "value": 0.0,
-                        {
+                      "ty": {
-                          "type": "Number",
+                        "type": "Default",
-                          "value": 0.0,
+                        "len": {
-                          "ty": {
+                          "type": "Mm"
-                            "type": "Default",
-                            "len": {
-                              "type": "Mm"
-                            },
-                            "angle": {
-                              "type": "Degrees"
-                            }
-                          }
                         },
-                        {
+                        "angle": {
-                          "type": "Number",
+                          "type": "Degrees"
-                          "value": 1.0,
-                          "ty": {
-                            "type": "Default",
-                            "len": {
-                              "type": "Mm"
-                            },
-                            "angle": {
-                              "type": "Degrees"
-                            }
-                          }
                         }
-                      ]
+                      }
                     },
-                    "origin": {
+                    {
-                      "type": "Array",
+                      "type": "Number",
-                      "value": [
+                      "value": 1.0,
-                        {
+                      "ty": {
-                          "type": "Number",
+                        "type": "Default",
-                          "value": 4.0,
+                        "len": {
-                          "ty": {
+                          "type": "Mm"
-                            "type": "Default",
-                            "len": {
-                              "type": "Mm"
-                            },
-                            "angle": {
-                              "type": "Degrees"
-                            }
-                          }
                         },
-                        {
+                        "angle": {
-                          "type": "Number",
+                          "type": "Degrees"
-                          "value": 4.0,
-                          "ty": {
-                            "type": "Default",
-                            "len": {
-                              "type": "Mm"
-                            },
-                            "angle": {
-                              "type": "Degrees"
-                            }
-                          }
                         }
-                      ]
+                      }
                     }
-                  }
+                  ]
+                },
+                "origin": {
+                  "type": "Array",
+                  "value": [
+                    {
+                      "type": "Number",
+                      "value": 4.0,
+                      "ty": {
+                        "type": "Default",
+                        "len": {
+                          "type": "Mm"
+                        },
+                        "angle": {
+                          "type": "Degrees"
+                        }
+                      }
+                    },
+                    {
+                      "type": "Number",
+                      "value": 4.0,
+                      "ty": {
+                        "type": "Default",
+                        "len": {
+                          "type": "Mm"
+                        },
+                        "angle": {
+                          "type": "Degrees"
+                        }
+                      }
+                    }
+                  ]
                 }
               }
             }
           }
         },
         "sourceRange": [
-          1910,
+          1987,
-          1941,
+          1994,
-          0
-        ]
-      },
-      "sketches": {
-        "value": {
-          "type": "Sketch",
-          "value": {
-            "artifactId": "[uuid]"
-          }
-        },
-        "sourceRange": [
-          1943,
-          1998,
           0
         ]
       }
@@ -490,11 +479,23 @@ description: Operations executed gridfinity-bins.kcl
     "name": "revolve",
     "sourceRange": [
       1902,
-      1999,
+      1995,
       0
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        1910,
+        1965,
+        0
+      ]
+    }
   },
   {
     "labeledArgs": {
@@ -513,8 +514,8 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          2094,
+          2090,
-          2097,
+          2093,
           0
         ]
       },
@@ -564,8 +565,8 @@ description: Operations executed gridfinity-bins.kcl
           ]
         },
         "sourceRange": [
-          2108,
+          2104,
-          2117,
+          2113,
           0
         ]
       },
@@ -603,8 +604,8 @@ description: Operations executed gridfinity-bins.kcl
           ]
         },
         "sourceRange": [
-          2130,
+          2126,
-          2209,
+          2205,
           0
         ]
       },
@@ -623,8 +624,8 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          2225,
+          2221,
-          2226,
+          2222,
           0
         ]
       },
@@ -634,16 +635,16 @@ description: Operations executed gridfinity-bins.kcl
           "value": true
         },
         "sourceRange": [
+          2245,
           2249,
-          2253,
           0
         ]
       }
     },
     "name": "patternCircular3d",
     "sourceRange": [
-      2044,
+      2040,
-      2255,
+      2251,
       0
     ],
     "type": "StdLibCall",
@@ -655,8 +656,8 @@ description: Operations executed gridfinity-bins.kcl
         }
       },
       "sourceRange": [
-        2065,
+        2061,
-        2077,
+        2073,
         0
       ]
     }
@@ -669,16 +670,16 @@ description: Operations executed gridfinity-bins.kcl
           "value": "XY"
         },
         "sourceRange": [
+          2283,
           2287,
-          2291,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      2273,
+      2269,
-      2292,
+      2288,
       0
     ],
     "type": "StdLibCall",
@@ -701,16 +702,16 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          2635,
+          2631,
-          2641,
+          2637,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      2618,
+      2614,
-      2642,
+      2638,
       0
     ],
     "type": "StdLibCall",
@@ -722,8 +723,8 @@ description: Operations executed gridfinity-bins.kcl
         }
       },
       "sourceRange": [
-        2618,
+        2614,
-        2642,
+        2638,
         0
       ]
     }
@@ -745,8 +746,8 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          2672,
+          2668,
-          2681,
+          2677,
           0
         ]
       },
@@ -773,16 +774,16 @@ description: Operations executed gridfinity-bins.kcl
           ]
         },
         "sourceRange": [
-          2697,
+          2693,
-          2870,
+          2866,
           0
         ]
       }
     },
     "name": "fillet",
     "sourceRange": [
-      2648,
+      2644,
-      2877,
+      2873,
       0
     ],
     "type": "StdLibCall",
@@ -794,8 +795,8 @@ description: Operations executed gridfinity-bins.kcl
         }
       },
       "sourceRange": [
-        2648,
+        2644,
-        2877,
+        2873,
         0
       ]
     }
@@ -810,8 +811,8 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          2908,
+          2904,
-          2921,
+          2917,
           0
         ]
       },
@@ -821,16 +822,16 @@ description: Operations executed gridfinity-bins.kcl
           "value": "start"
         },
         "sourceRange": [
-          2923,
+          2919,
-          2930,
+          2926,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      2894,
+      2890,
-      2931,
+      2927,
       0
     ],
     "type": "StdLibCall",
@@ -853,16 +854,16 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          3340,
+          3336,
-          3349,
+          3345,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      3323,
+      3319,
-      3350,
+      3346,
       0
     ],
     "type": "StdLibCall",
@@ -897,8 +898,8 @@ description: Operations executed gridfinity-bins.kcl
         ]
       },
       "sourceRange": [
-        3323,
+        3319,
-        3350,
+        3346,
         0
       ]
     }
@@ -951,8 +952,8 @@ description: Operations executed gridfinity-bins.kcl
           ]
         },
         "sourceRange": [
-          3452,
+          3448,
-          3467,
+          3463,
           0
         ]
       },
@@ -965,8 +966,8 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          3521,
+          3517,
-          3543,
+          3539,
           0
         ]
       },
@@ -985,16 +986,16 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          3488,
+          3484,
-          3501,
+          3497,
           0
         ]
       }
     },
     "name": "patternLinear3d",
     "sourceRange": [
-      3407,
+      3403,
-      3550,
+      3546,
       0
     ],
     "type": "StdLibCall",
@@ -1029,8 +1030,8 @@ description: Operations executed gridfinity-bins.kcl
         ]
       },
       "sourceRange": [
-        3431,
+        3427,
-        3436,
+        3432,
         0
       ]
     }
@@ -1083,8 +1084,8 @@ description: Operations executed gridfinity-bins.kcl
           ]
         },
         "sourceRange": [
-          3587,
+          3583,
-          3602,
+          3598,
           0
         ]
       },
@@ -1097,8 +1098,8 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          3657,
+          3653,
-          3679,
+          3675,
           0
         ]
       },
@@ -1117,16 +1118,16 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          3623,
+          3619,
-          3637,
+          3633,
           0
         ]
       }
     },
     "name": "patternLinear3d",
     "sourceRange": [
-      3556,
+      3552,
-      3686,
+      3682,
       0
     ],
     "type": "StdLibCall",
@@ -1185,8 +1186,8 @@ description: Operations executed gridfinity-bins.kcl
         ]
       },
       "sourceRange": [
-        3556,
+        3552,
-        3686,
+        3682,
         0
       ]
     }
@@ -1239,8 +1240,8 @@ description: Operations executed gridfinity-bins.kcl
           ]
         },
         "sourceRange": [
-          3813,
+          3809,
-          3828,
+          3824,
           0
         ]
       },
@@ -1253,8 +1254,8 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          3882,
+          3878,
-          3904,
+          3900,
           0
         ]
       },
@@ -1273,16 +1274,16 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          3849,
+          3845,
-          3862,
+          3858,
           0
         ]
       }
     },
     "name": "patternLinear3d",
     "sourceRange": [
-      3766,
+      3762,
-      3911,
+      3907,
       0
     ],
     "type": "StdLibCall",
@@ -1317,8 +1318,8 @@ description: Operations executed gridfinity-bins.kcl
         ]
       },
       "sourceRange": [
-        3790,
+        3786,
-        3797,
+        3793,
         0
       ]
     }
@@ -1371,8 +1372,8 @@ description: Operations executed gridfinity-bins.kcl
           ]
         },
         "sourceRange": [
-          3948,
+          3944,
-          3963,
+          3959,
           0
         ]
       },
@@ -1385,8 +1386,8 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          4018,
+          4014,
-          4040,
+          4036,
           0
         ]
       },
@@ -1405,16 +1406,16 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          3984,
+          3980,
-          3998,
+          3994,
           0
         ]
       }
     },
     "name": "patternLinear3d",
     "sourceRange": [
-      3917,
+      3913,
-      4047,
+      4043,
       0
     ],
     "type": "StdLibCall",
@@ -1473,8 +1474,8 @@ description: Operations executed gridfinity-bins.kcl
         ]
       },
       "sourceRange": [
-        3917,
+        3913,
-        4047,
+        4043,
         0
       ]
     }
@@ -1527,8 +1528,8 @@ description: Operations executed gridfinity-bins.kcl
           ]
         },
         "sourceRange": [
-          4168,
+          4164,
-          4183,
+          4179,
           0
         ]
       },
@@ -1541,8 +1542,8 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          4237,
+          4233,
-          4259,
+          4255,
           0
         ]
       },
@@ -1561,16 +1562,16 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          4204,
+          4200,
-          4217,
+          4213,
           0
         ]
       }
     },
     "name": "patternLinear3d",
     "sourceRange": [
-      4115,
+      4111,
-      4266,
+      4262,
       0
     ],
     "type": "StdLibCall",
@@ -1582,8 +1583,8 @@ description: Operations executed gridfinity-bins.kcl
         }
       },
       "sourceRange": [
-        4139,
+        4135,
-        4152,
+        4148,
         0
       ]
     }
@@ -1636,8 +1637,8 @@ description: Operations executed gridfinity-bins.kcl
           ]
         },
         "sourceRange": [
-          4303,
+          4299,
-          4318,
+          4314,
           0
         ]
       },
@@ -1650,8 +1651,8 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          4373,
+          4369,
-          4395,
+          4391,
           0
         ]
       },
@@ -1670,16 +1671,16 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          4339,
+          4335,
-          4353,
+          4349,
           0
         ]
       }
     },
     "name": "patternLinear3d",
     "sourceRange": [
-      4272,
+      4268,
-      4402,
+      4398,
       0
     ],
     "type": "StdLibCall",
@@ -1702,8 +1703,8 @@ description: Operations executed gridfinity-bins.kcl
         ]
       },
       "sourceRange": [
-        4272,
+        4268,
-        4402,
+        4398,
         0
       ]
     }
@@ -1725,16 +1726,16 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          4483,
+          4479,
-          4489,
+          4485,
           0
         ]
       }
     },
     "name": "offsetPlane",
     "sourceRange": [
-      4456,
+      4452,
-      4490,
+      4486,
       0
     ],
     "type": "StdLibCall",
@@ -1744,8 +1745,8 @@ description: Operations executed gridfinity-bins.kcl
         "value": "XY"
       },
       "sourceRange": [
+        4464,
         4468,
-        4472,
         0
       ]
     }
@@ -1758,16 +1759,16 @@ description: Operations executed gridfinity-bins.kcl
           "artifact_id": "[uuid]"
         },
         "sourceRange": [
-          4456,
+          4452,
-          4490,
+          4486,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      4442,
+      4438,
-      4491,
+      4487,
       0
     ],
     "type": "StdLibCall",
@@ -1784,16 +1785,16 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          4788,
+          4784,
-          4814,
+          4810,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      4771,
+      4767,
-      4815,
+      4811,
       0
     ],
     "type": "StdLibCall",
@@ -1805,8 +1806,8 @@ description: Operations executed gridfinity-bins.kcl
         }
       },
       "sourceRange": [
-        4771,
+        4767,
-        4815,
+        4811,
         0
       ]
     }
@@ -1828,8 +1829,8 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          4845,
+          4841,
-          4857,
+          4853,
           0
         ]
       },
@@ -1856,16 +1857,16 @@ description: Operations executed gridfinity-bins.kcl
           ]
         },
         "sourceRange": [
-          4873,
+          4869,
-          5046,
+          5042,
           0
         ]
       }
     },
     "name": "fillet",
     "sourceRange": [
-      4821,
+      4817,
-      5053,
+      5049,
       0
     ],
     "type": "StdLibCall",
@@ -1877,8 +1878,8 @@ description: Operations executed gridfinity-bins.kcl
         }
       },
       "sourceRange": [
-        4821,
+        4817,
-        5053,
+        5049,
         0
       ]
     }
@@ -1896,8 +1897,8 @@ description: Operations executed gridfinity-bins.kcl
           ]
         },
         "sourceRange": [
-          5073,
+          5069,
-          5080,
+          5076,
           0
         ]
       },
@@ -1916,16 +1917,16 @@ description: Operations executed gridfinity-bins.kcl
           }
         },
         "sourceRange": [
-          5094,
+          5090,
-          5100,
+          5096,
           0
         ]
       }
     },
     "name": "shell",
     "sourceRange": [
-      5059,
+      5055,
-      5101,
+      5097,
       0
     ],
     "type": "StdLibCall",
@@ -1937,8 +1938,8 @@ description: Operations executed gridfinity-bins.kcl
         }
       },
       "sourceRange": [
-        5059,
+        5055,
-        5101,
+        5097,
         0
       ]
     }

rust/kcl-lib/tests/kcl_samples/i-beam/exported_step.step

@@ -17,213 +17,213 @@ DATA;
   GLOBAL_UNIT_ASSIGNED_CONTEXT((#1))
   REPRESENTATION_CONTEXT('', '3D')
 );
-#4 = CARTESIAN_POINT('NONE', (-0.000000000000000006221205739668554, -0.0508, -0));
+#4 = CARTESIAN_POINT('NONE', (0, 0.0508, -0));
 #5 = VERTEX_POINT('NONE', #4);
-#6 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0));
+#6 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0));
 #7 = VERTEX_POINT('NONE', #6);
-#8 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0.6096));
+#8 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0.6096));
 #9 = VERTEX_POINT('NONE', #8);
-#10 = CARTESIAN_POINT('NONE', (-0.000000000000000006221205739668554, -0.0508, -0.6096));
+#10 = CARTESIAN_POINT('NONE', (0, 0.0508, -0.6096));
 #11 = VERTEX_POINT('NONE', #10);
-#12 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0));
+#12 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0));
 #13 = VERTEX_POINT('NONE', #12);
-#14 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0.6096));
+#14 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0.6096));
 #15 = VERTEX_POINT('NONE', #14);
-#16 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0));
+#16 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0));
 #17 = VERTEX_POINT('NONE', #16);
-#18 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0.6096));
+#18 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0.6096));
 #19 = VERTEX_POINT('NONE', #18);
-#20 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0));
+#20 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0));
 #21 = VERTEX_POINT('NONE', #20);
-#22 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0.6096));
+#22 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0.6096));
 #23 = VERTEX_POINT('NONE', #22);
-#24 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0));
+#24 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0));
 #25 = VERTEX_POINT('NONE', #24);
-#26 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0.6096));
+#26 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0.6096));
 #27 = VERTEX_POINT('NONE', #26);
-#28 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0));
+#28 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0));
 #29 = VERTEX_POINT('NONE', #28);
-#30 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0.6096));
+#30 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0.6096));
 #31 = VERTEX_POINT('NONE', #30);
-#32 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0));
+#32 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0));
 #33 = VERTEX_POINT('NONE', #32);
-#34 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0.6096));
+#34 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0.6096));
 #35 = VERTEX_POINT('NONE', #34);
-#36 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0));
+#36 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0));
 #37 = VERTEX_POINT('NONE', #36);
-#38 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0.6096));
+#38 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0.6096));
 #39 = VERTEX_POINT('NONE', #38);
-#40 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0));
+#40 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0));
 #41 = VERTEX_POINT('NONE', #40);
-#42 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0.6096));
+#42 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0.6096));
 #43 = VERTEX_POINT('NONE', #42);
-#44 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0));
+#44 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0));
 #45 = VERTEX_POINT('NONE', #44);
-#46 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0.6096));
+#46 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0.6096));
 #47 = VERTEX_POINT('NONE', #46);
-#48 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0));
+#48 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0));
 #49 = VERTEX_POINT('NONE', #48);
-#50 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0.6096));
+#50 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0.6096));
 #51 = VERTEX_POINT('NONE', #50);
-#52 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0));
+#52 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0));
 #53 = VERTEX_POINT('NONE', #52);
-#54 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0.6096));
+#54 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0.6096));
 #55 = VERTEX_POINT('NONE', #54);
-#56 = DIRECTION('NONE', (-1, 0.00000000000000020517070925003855, 0));
+#56 = DIRECTION('NONE', (1, 0, 0));
 #57 = VECTOR('NONE', #56, 1);
-#58 = CARTESIAN_POINT('NONE', (-0.000000000000000006221205739668554, -0.0508, -0));
+#58 = CARTESIAN_POINT('NONE', (0, 0.0508, -0));
 #59 = LINE('NONE', #58, #57);
 #60 = DIRECTION('NONE', (0, 0, -1));
 #61 = VECTOR('NONE', #60, 1);
-#62 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0));
+#62 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0));
 #63 = LINE('NONE', #62, #61);
-#64 = DIRECTION('NONE', (-1, 0.00000000000000020517070925003855, 0));
+#64 = DIRECTION('NONE', (1, 0, 0));
 #65 = VECTOR('NONE', #64, 1);
-#66 = CARTESIAN_POINT('NONE', (-0.000000000000000006221205739668554, -0.0508, -0.6096));
+#66 = CARTESIAN_POINT('NONE', (0, 0.0508, -0.6096));
 #67 = LINE('NONE', #66, #65);
 #68 = DIRECTION('NONE', (0, 0, -1));
 #69 = VECTOR('NONE', #68, 1);
-#70 = CARTESIAN_POINT('NONE', (-0.000000000000000006221205739668554, -0.0508, -0));
+#70 = CARTESIAN_POINT('NONE', (0, 0.0508, -0));
 #71 = LINE('NONE', #70, #69);
-#72 = DIRECTION('NONE', (0, 1, 0));
+#72 = DIRECTION('NONE', (0, -1, 0));
 #73 = VECTOR('NONE', #72, 1);
-#74 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0));
+#74 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0));
 #75 = LINE('NONE', #74, #73);
 #76 = DIRECTION('NONE', (0, 0, -1));
 #77 = VECTOR('NONE', #76, 1);
-#78 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0));
+#78 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0));
 #79 = LINE('NONE', #78, #77);
-#80 = DIRECTION('NONE', (0, 1, 0));
+#80 = DIRECTION('NONE', (0, -1, 0));
 #81 = VECTOR('NONE', #80, 1);
-#82 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0.6096));
+#82 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0.6096));
 #83 = LINE('NONE', #82, #81);
-#84 = DIRECTION('NONE', (1, -0.0000000000000004610713913357407, 0));
+#84 = DIRECTION('NONE', (-1, 0.00000000000000023053569566787033, 0));
 #85 = VECTOR('NONE', #84, 1);
-#86 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0));
+#86 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0));
 #87 = LINE('NONE', #86, #85);
 #88 = DIRECTION('NONE', (0, 0, -1));
 #89 = VECTOR('NONE', #88, 1);
-#90 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0));
+#90 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0));
 #91 = LINE('NONE', #90, #89);
-#92 = DIRECTION('NONE', (1, -0.0000000000000004610713913357407, 0));
+#92 = DIRECTION('NONE', (-1, 0.00000000000000023053569566787033, 0));
 #93 = VECTOR('NONE', #92, 1);
-#94 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0.6096));
+#94 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0.6096));
 #95 = LINE('NONE', #94, #93);
-#96 = DIRECTION('NONE', (0.00000000000000006501542164183402, 1, 0));
+#96 = DIRECTION('NONE', (0.00000000000000006501542164183402, -1, 0));
 #97 = VECTOR('NONE', #96, 1);
-#98 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0));
+#98 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0));
 #99 = LINE('NONE', #98, #97);
 #100 = DIRECTION('NONE', (0, 0, -1));
 #101 = VECTOR('NONE', #100, 1);
-#102 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0));
+#102 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0));
 #103 = LINE('NONE', #102, #101);
-#104 = DIRECTION('NONE', (0.00000000000000006501542164183402, 1, 0));
+#104 = DIRECTION('NONE', (0.00000000000000006501542164183402, -1, 0));
 #105 = VECTOR('NONE', #104, 1);
-#106 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0.6096));
+#106 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0.6096));
 #107 = LINE('NONE', #106, #105);
-#108 = DIRECTION('NONE', (-1, -0.00000000000000023053569566787033, 0));
+#108 = DIRECTION('NONE', (1, 0.0000000000000004610713913357407, 0));
 #109 = VECTOR('NONE', #108, 1);
-#110 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0));
+#110 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0));
 #111 = LINE('NONE', #110, #109);
 #112 = DIRECTION('NONE', (0, 0, -1));
 #113 = VECTOR('NONE', #112, 1);
-#114 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0));
+#114 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0));
 #115 = LINE('NONE', #114, #113);
-#116 = DIRECTION('NONE', (-1, -0.00000000000000023053569566787033, 0));
+#116 = DIRECTION('NONE', (1, 0.0000000000000004610713913357407, 0));
 #117 = VECTOR('NONE', #116, 1);
-#118 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0.6096));
+#118 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0.6096));
 #119 = LINE('NONE', #118, #117);
-#120 = DIRECTION('NONE', (0, 1, 0));
+#120 = DIRECTION('NONE', (0, -1, 0));
 #121 = VECTOR('NONE', #120, 1);
-#122 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0));
+#122 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0));
 #123 = LINE('NONE', #122, #121);
 #124 = DIRECTION('NONE', (0, 0, -1));
 #125 = VECTOR('NONE', #124, 1);
-#126 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0));
+#126 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0));
 #127 = LINE('NONE', #126, #125);
-#128 = DIRECTION('NONE', (0, 1, 0));
+#128 = DIRECTION('NONE', (0, -1, 0));
 #129 = VECTOR('NONE', #128, 1);
-#130 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0.6096));
+#130 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0.6096));
 #131 = LINE('NONE', #130, #129);
-#132 = DIRECTION('NONE', (1, 0, 0));
+#132 = DIRECTION('NONE', (-1, 0, 0));
 #133 = VECTOR('NONE', #132, 1);
-#134 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0));
+#134 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0));
 #135 = LINE('NONE', #134, #133);
 #136 = DIRECTION('NONE', (0, 0, -1));
 #137 = VECTOR('NONE', #136, 1);
-#138 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0));
+#138 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0));
 #139 = LINE('NONE', #138, #137);
-#140 = DIRECTION('NONE', (1, 0, 0));
+#140 = DIRECTION('NONE', (-1, 0, 0));
 #141 = VECTOR('NONE', #140, 1);
-#142 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0.6096));
+#142 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0.6096));
 #143 = LINE('NONE', #142, #141);
-#144 = DIRECTION('NONE', (0, -1, 0));
+#144 = DIRECTION('NONE', (0, 1, 0));
 #145 = VECTOR('NONE', #144, 1);
-#146 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0));
+#146 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0));
 #147 = LINE('NONE', #146, #145);
 #148 = DIRECTION('NONE', (0, 0, -1));
 #149 = VECTOR('NONE', #148, 1);
-#150 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0));
+#150 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0));
 #151 = LINE('NONE', #150, #149);
-#152 = DIRECTION('NONE', (0, -1, 0));
+#152 = DIRECTION('NONE', (0, 1, 0));
 #153 = VECTOR('NONE', #152, 1);
-#154 = CARTESIAN_POINT('NONE', (0.0338201, 0.0508, -0.6096));
+#154 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.05079999999999999, -0.6096));
 #155 = LINE('NONE', #154, #153);
-#156 = DIRECTION('NONE', (-1, 0.00000000000000023053569566787033, 0));
+#156 = DIRECTION('NONE', (1, -0.0000000000000004610713913357407, 0));
 #157 = VECTOR('NONE', #156, 1);
-#158 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0));
+#158 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0));
 #159 = LINE('NONE', #158, #157);
 #160 = DIRECTION('NONE', (0, 0, -1));
 #161 = VECTOR('NONE', #160, 1);
-#162 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0));
+#162 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0));
 #163 = LINE('NONE', #162, #161);
-#164 = DIRECTION('NONE', (-1, 0.00000000000000023053569566787033, 0));
+#164 = DIRECTION('NONE', (1, -0.0000000000000004610713913357407, 0));
 #165 = VECTOR('NONE', #164, 1);
-#166 = CARTESIAN_POINT('NONE', (0.0338201, 0.043357799999999995, -0.6096));
+#166 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04335779999999999, -0.6096));
 #167 = LINE('NONE', #166, #165);
-#168 = DIRECTION('NONE', (0.00000000000000006501542164183402, -1, 0));
+#168 = DIRECTION('NONE', (0.00000000000000006501542164183402, 1, 0));
 #169 = VECTOR('NONE', #168, 1);
-#170 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0));
+#170 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0));
 #171 = LINE('NONE', #170, #169);
 #172 = DIRECTION('NONE', (0, 0, -1));
 #173 = VECTOR('NONE', #172, 1);
-#174 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0));
+#174 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0));
 #175 = LINE('NONE', #174, #173);
-#176 = DIRECTION('NONE', (0.00000000000000006501542164183402, -1, 0));
+#176 = DIRECTION('NONE', (0.00000000000000006501542164183402, 1, 0));
 #177 = VECTOR('NONE', #176, 1);
-#178 = CARTESIAN_POINT('NONE', (0.0037210999999999998, 0.0433578, -0.6096));
+#178 = CARTESIAN_POINT('NONE', (-0.0037211000000000054, -0.0433578, -0.6096));
 #179 = LINE('NONE', #178, #177);
-#180 = DIRECTION('NONE', (1, 0.0000000000000004610713913357407, 0));
+#180 = DIRECTION('NONE', (-1, -0.00000000000000023053569566787033, 0));
 #181 = VECTOR('NONE', #180, 1);
-#182 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0));
+#182 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0));
 #183 = LINE('NONE', #182, #181);
 #184 = DIRECTION('NONE', (0, 0, -1));
 #185 = VECTOR('NONE', #184, 1);
-#186 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0));
+#186 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0));
 #187 = LINE('NONE', #186, #185);
-#188 = DIRECTION('NONE', (1, 0.0000000000000004610713913357407, 0));
+#188 = DIRECTION('NONE', (-1, -0.00000000000000023053569566787033, 0));
 #189 = VECTOR('NONE', #188, 1);
-#190 = CARTESIAN_POINT('NONE', (0.0037211000000000054, -0.0433578, -0.6096));
+#190 = CARTESIAN_POINT('NONE', (-0.0037210999999999998, 0.0433578, -0.6096));
 #191 = LINE('NONE', #190, #189);
-#192 = DIRECTION('NONE', (0, -1, 0));
+#192 = DIRECTION('NONE', (0, 1, 0));
 #193 = VECTOR('NONE', #192, 1);
-#194 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0));
+#194 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0));
 #195 = LINE('NONE', #194, #193);
 #196 = DIRECTION('NONE', (0, 0, -1));
 #197 = VECTOR('NONE', #196, 1);
-#198 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0));
+#198 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0));
 #199 = LINE('NONE', #198, #197);
-#200 = DIRECTION('NONE', (0, -1, 0));
+#200 = DIRECTION('NONE', (0, 1, 0));
 #201 = VECTOR('NONE', #200, 1);
-#202 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04335779999999999, -0.6096));
+#202 = CARTESIAN_POINT('NONE', (-0.0338201, 0.043357799999999995, -0.6096));
 #203 = LINE('NONE', #202, #201);
-#204 = DIRECTION('NONE', (-1, -0.00000000000000020517070925003855, 0));
+#204 = DIRECTION('NONE', (1, 0, 0));
 #205 = VECTOR('NONE', #204, 1);
-#206 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0));
+#206 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0));
 #207 = LINE('NONE', #206, #205);
-#208 = DIRECTION('NONE', (-1, -0.00000000000000020517070925003855, 0));
+#208 = DIRECTION('NONE', (1, 0, 0));
 #209 = VECTOR('NONE', #208, 1);
-#210 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.05079999999999999, -0.6096));
+#210 = CARTESIAN_POINT('NONE', (-0.0338201, 0.0508, -0.6096));
 #211 = LINE('NONE', #210, #209);
 #212 = EDGE_CURVE('NONE', #5, #7, #59, .T.);
 #213 = EDGE_CURVE('NONE', #7, #9, #63, .T.);
@@ -264,56 +264,56 @@ DATA;
 #248 = EDGE_CURVE('NONE', #51, #55, #203, .T.);
 #249 = EDGE_CURVE('NONE', #53, #5, #207, .T.);
 #250 = EDGE_CURVE('NONE', #55, #11, #211, .T.);
-#251 = CARTESIAN_POINT('NONE', (-0.01691004999999998, -0.0508, -0.30480000000000007));
+#251 = CARTESIAN_POINT('NONE', (0.01691005, 0.0508, -0.3048));
-#252 = DIRECTION('NONE', (0, -1, -0));
+#252 = DIRECTION('NONE', (0, 1, 0));
 #253 = AXIS2_PLACEMENT_3D('NONE', #251, #252, $);
 #254 = PLANE('NONE', #253);
-#255 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04707889999999995, -0.30479999999999996));
+#255 = CARTESIAN_POINT('NONE', (0.0338201, 0.0470789, -0.3048));
-#256 = DIRECTION('NONE', (-1, 0, -0));
+#256 = DIRECTION('NONE', (1, 0, 0));
 #257 = AXIS2_PLACEMENT_3D('NONE', #255, #256, $);
 #258 = PLANE('NONE', #257);
-#259 = CARTESIAN_POINT('NONE', (-0.018770600000000033, -0.043357799999999995, -0.30480000000000007));
+#259 = CARTESIAN_POINT('NONE', (0.018770600000000002, 0.043357799999999995, -0.3048));
-#260 = DIRECTION('NONE', (0, 1, 0));
+#260 = DIRECTION('NONE', (0, -1, -0));
 #261 = AXIS2_PLACEMENT_3D('NONE', #259, #260, $);
 #262 = PLANE('NONE', #261);
-#263 = CARTESIAN_POINT('NONE', (-0.0037211000000000024, 0, -0.3048));
+#263 = CARTESIAN_POINT('NONE', (0.0037211000000000024, 0, -0.3048));
-#264 = DIRECTION('NONE', (-1, 0, -0));
+#264 = DIRECTION('NONE', (1, 0, 0));
 #265 = AXIS2_PLACEMENT_3D('NONE', #263, #264, $);
 #266 = PLANE('NONE', #265);
-#267 = CARTESIAN_POINT('NONE', (-0.01877060000000003, 0.0433578, -0.30480000000000007));
+#267 = CARTESIAN_POINT('NONE', (0.018770600000000002, -0.043357799999999995, -0.3048));
-#268 = DIRECTION('NONE', (0, -1, -0));
+#268 = DIRECTION('NONE', (0, 1, 0));
 #269 = AXIS2_PLACEMENT_3D('NONE', #267, #268, $);
 #270 = PLANE('NONE', #269);
-#271 = CARTESIAN_POINT('NONE', (-0.0338201, 0.04707889999999997, -0.30479999999999996));
+#271 = CARTESIAN_POINT('NONE', (0.0338201, -0.047078899999999986, -0.30479999999999996));
-#272 = DIRECTION('NONE', (-1, 0, -0));
+#272 = DIRECTION('NONE', (1, 0, 0));
 #273 = AXIS2_PLACEMENT_3D('NONE', #271, #272, $);
 #274 = PLANE('NONE', #273);
-#275 = CARTESIAN_POINT('NONE', (0, 0.0508, -0.3048));
+#275 = CARTESIAN_POINT('NONE', (0, -0.05079999999999999, -0.3048));
-#276 = DIRECTION('NONE', (0, 1, 0));
+#276 = DIRECTION('NONE', (0, -1, -0));
 #277 = AXIS2_PLACEMENT_3D('NONE', #275, #276, $);
 #278 = PLANE('NONE', #277);
-#279 = CARTESIAN_POINT('NONE', (0.03382009999999999, 0.04707889999999999, -0.30479999999999996));
+#279 = CARTESIAN_POINT('NONE', (-0.033820100000000006, -0.04707889999999995, -0.30479999999999996));
-#280 = DIRECTION('NONE', (1, 0, 0));
+#280 = DIRECTION('NONE', (-1, 0, -0));
 #281 = AXIS2_PLACEMENT_3D('NONE', #279, #280, $);
 #282 = PLANE('NONE', #281);
-#283 = CARTESIAN_POINT('NONE', (0.018770600000000002, 0.043357799999999995, -0.3048));
+#283 = CARTESIAN_POINT('NONE', (-0.018770600000000033, -0.043357799999999995, -0.30480000000000007));
-#284 = DIRECTION('NONE', (0, -1, -0));
+#284 = DIRECTION('NONE', (0, 1, 0));
 #285 = AXIS2_PLACEMENT_3D('NONE', #283, #284, $);
 #286 = PLANE('NONE', #285);
-#287 = CARTESIAN_POINT('NONE', (0.0037211000000000024, 0, -0.3048));
+#287 = CARTESIAN_POINT('NONE', (-0.0037211000000000024, 0, -0.3048));
-#288 = DIRECTION('NONE', (1, 0, 0));
+#288 = DIRECTION('NONE', (-1, 0, -0));
 #289 = AXIS2_PLACEMENT_3D('NONE', #287, #288, $);
 #290 = PLANE('NONE', #289);
-#291 = CARTESIAN_POINT('NONE', (0.018770600000000002, -0.043357799999999995, -0.3048));
+#291 = CARTESIAN_POINT('NONE', (-0.01877060000000003, 0.0433578, -0.30480000000000007));
-#292 = DIRECTION('NONE', (0, 1, 0));
+#292 = DIRECTION('NONE', (0, -1, -0));
 #293 = AXIS2_PLACEMENT_3D('NONE', #291, #292, $);
 #294 = PLANE('NONE', #293);
-#295 = CARTESIAN_POINT('NONE', (0.033820100000000006, -0.04707889999999999, -0.3048));
+#295 = CARTESIAN_POINT('NONE', (-0.0338201, 0.04707889999999997, -0.30479999999999996));
-#296 = DIRECTION('NONE', (1, 0, 0));
+#296 = DIRECTION('NONE', (-1, 0, -0));
 #297 = AXIS2_PLACEMENT_3D('NONE', #295, #296, $);
 #298 = PLANE('NONE', #297);
-#299 = CARTESIAN_POINT('NONE', (0.016910050000000003, -0.0508, -0.3048));
+#299 = CARTESIAN_POINT('NONE', (-0.016910049999999968, 0.050800000000000005, -0.30480000000000007));
-#300 = DIRECTION('NONE', (0, -1, -0));
+#300 = DIRECTION('NONE', (0, 1, 0));
 #301 = AXIS2_PLACEMENT_3D('NONE', #299, #300, $);
 #302 = PLANE('NONE', #301);
 #303 = CARTESIAN_POINT('NONE', (0, 0, -0));

rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/artifact_graph_flowchart.snap.md

@@ -23,26 +23,26 @@ flowchart LR
     20[Solid2d]
   end
   subgraph path48 [Path]
-    48["Path<br>[5264, 5291, 0]"]
+    48["Path<br>[5257, 5284, 0]"]
-    49["Segment<br>[5297, 5315, 0]"]
+    49["Segment<br>[5290, 5308, 0]"]
-    50["Segment<br>[5321, 5339, 0]"]
+    50["Segment<br>[5314, 5332, 0]"]
-    51["Segment<br>[5345, 5364, 0]"]
+    51["Segment<br>[5338, 5357, 0]"]
-    52["Segment<br>[5370, 5377, 0]"]
+    52["Segment<br>[5363, 5370, 0]"]
     53[Solid2d]
   end
   subgraph path54 [Path]
-    54["Path<br>[5422, 5494, 0]"]
+    54["Path<br>[5415, 5487, 0]"]
-    55["Segment<br>[5422, 5494, 0]"]
+    55["Segment<br>[5415, 5487, 0]"]
     56[Solid2d]
   end
   subgraph path73 [Path]
-    73["Path<br>[5643, 5711, 0]"]
+    73["Path<br>[5636, 5704, 0]"]
-    74["Segment<br>[5643, 5711, 0]"]
+    74["Segment<br>[5636, 5704, 0]"]
     75[Solid2d]
   end
   subgraph path76 [Path]
-    76["Path<br>[5756, 5828, 0]"]
+    76["Path<br>[5749, 5821, 0]"]
-    77["Segment<br>[5756, 5828, 0]"]
+    77["Segment<br>[5749, 5821, 0]"]
     78[Solid2d]
   end
   subgraph path86 [Path]
@@ -72,8 +72,8 @@ flowchart LR
     116[Solid2d]
   end
   subgraph path141 [Path]
-    141["Path<br>[6648, 6715, 0]"]
+    141["Path<br>[6641, 6708, 0]"]
-    142["Segment<br>[6648, 6715, 0]"]
+    142["Segment<br>[6641, 6708, 0]"]
     143[Solid2d]
   end
   subgraph path151 [Path]
@@ -103,7 +103,7 @@ flowchart LR
   end
   1["Plane<br>[4332, 4351, 0]"]
   5["Plane<br>[4627, 4646, 0]"]
-  21["Sweep Revolve<br>[5138, 5164, 0]"]
+  21["Sweep Revolve<br>[5138, 5157, 0]"]
   22[Wall]
   23[Wall]
   24[Wall]
@@ -129,8 +129,8 @@ flowchart LR
   44["SweepEdge Adjacent"]
   45["SweepEdge Adjacent"]
   46["SweepEdge Adjacent"]
-  47["Plane<br>[5239, 5258, 0]"]
+  47["Plane<br>[5232, 5251, 0]"]
-  57["Sweep Extrusion<br>[5504, 5535, 0]"]
+  57["Sweep Extrusion<br>[5497, 5528, 0]"]
   58[Wall]
   59[Wall]
   60[Wall]
@@ -145,8 +145,8 @@ flowchart LR
   69["SweepEdge Adjacent"]
   70["SweepEdge Opposite"]
   71["SweepEdge Adjacent"]
-  72["Plane<br>[5618, 5637, 0]"]
+  72["Plane<br>[5611, 5630, 0]"]
-  79["Sweep Extrusion<br>[5838, 5872, 0]"]
+  79["Sweep Extrusion<br>[5831, 5865, 0]"]
   80[Wall]
   81["Cap Start"]
   82["Cap End"]
@@ -189,8 +189,8 @@ flowchart LR
   137["SweepEdge Adjacent"]
   138["SweepEdge Opposite"]
   139["SweepEdge Adjacent"]
-  140["Plane<br>[6617, 6642, 0]"]
+  140["Plane<br>[6610, 6635, 0]"]
-  144["Sweep Extrusion<br>[6728, 6775, 0]"]
+  144["Sweep Extrusion<br>[6721, 6768, 0]"]
   145[Wall]
   146["Cap Start"]
   147["Cap End"]

rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/ops.snap

@@ -51,32 +51,14 @@ description: Operations executed pipe-flange-assembly.kcl
   },
   {
     "labeledArgs": {
-      "data": {
+      "axis": {
         "value": {
-          "type": "Object",
+          "type": "String",
-          "value": {
+          "value": "y"
-            "axis": {
-              "type": "String",
-              "value": "y"
-            }
-          }
         },
         "sourceRange": [
-          5146,
+          5153,
-          5160,
+          5156,
-          0
-        ]
-      },
-      "sketches": {
-        "value": {
-          "type": "Sketch",
-          "value": {
-            "artifactId": "[uuid]"
-          }
-        },
-        "sourceRange": [
-          5162,
-          5163,
           0
         ]
       }
@@ -84,11 +66,23 @@ description: Operations executed pipe-flange-assembly.kcl
     "name": "revolve",
     "sourceRange": [
       5138,
-      5164,
+      5157,
       0
     ],
     "type": "StdLibCall",
-    "unlabeledArg": null
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": [
+        5138,
+        5157,
+        0
+      ]
+    }
   },
   {
     "labeledArgs": {
@@ -98,16 +92,16 @@ description: Operations executed pipe-flange-assembly.kcl
           "value": "XZ"
         },
         "sourceRange": [
-          5253,
+          5246,
-          5257,
+          5250,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      5239,
+      5232,
-      5258,
+      5251,
       0
     ],
     "type": "StdLibCall",
@@ -164,8 +158,8 @@ description: Operations executed pipe-flange-assembly.kcl
           ]
         },
         "sourceRange": [
-          5388,
+          5381,
-          5407,
+          5400,
           0
         ]
       },
@@ -177,16 +171,16 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          5409,
+          5402,
-          5410,
+          5403,
           0
         ]
       }
     },
     "name": "hole",
     "sourceRange": [
-      5383,
+      5376,
-      5411,
+      5404,
       0
     ],
     "type": "StdLibCall",
@@ -202,8 +196,8 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          5422,
+          5415,
-          5494,
+          5487,
           0
         ]
       },
@@ -215,16 +209,16 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          5496,
+          5489,
-          5497,
+          5490,
           0
         ]
       }
     },
     "name": "hole",
     "sourceRange": [
-      5417,
+      5410,
-      5498,
+      5491,
       0
     ],
     "type": "StdLibCall",
@@ -247,16 +241,16 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          5521,
+          5514,
-          5534,
+          5527,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      5504,
+      5497,
-      5535,
+      5528,
       0
     ],
     "type": "StdLibCall",
@@ -268,8 +262,8 @@ description: Operations executed pipe-flange-assembly.kcl
         }
       },
       "sourceRange": [
-        5504,
+        5497,
-        5535,
+        5528,
         0
       ]
     }
@@ -282,16 +276,16 @@ description: Operations executed pipe-flange-assembly.kcl
           "value": "XZ"
         },
         "sourceRange": [
-          5632,
+          5625,
-          5636,
+          5629,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      5618,
+      5611,
-      5637,
+      5630,
       0
     ],
     "type": "StdLibCall",
@@ -348,8 +342,8 @@ description: Operations executed pipe-flange-assembly.kcl
           ]
         },
         "sourceRange": [
-          5722,
+          5715,
-          5741,
+          5734,
           0
         ]
       },
@@ -361,16 +355,16 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          5743,
+          5736,
-          5744,
+          5737,
           0
         ]
       }
     },
     "name": "hole",
     "sourceRange": [
-      5717,
+      5710,
-      5745,
+      5738,
       0
     ],
     "type": "StdLibCall",
@@ -386,8 +380,8 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          5756,
+          5749,
-          5828,
+          5821,
           0
         ]
       },
@@ -399,16 +393,16 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          5830,
+          5823,
-          5831,
+          5824,
           0
         ]
       }
     },
     "name": "hole",
     "sourceRange": [
-      5751,
+      5744,
-      5832,
+      5825,
       0
     ],
     "type": "StdLibCall",
@@ -431,16 +425,16 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          5855,
+          5848,
-          5871,
+          5864,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      5838,
+      5831,
-      5872,
+      5865,
       0
     ],
     "type": "StdLibCall",
@@ -452,8 +446,8 @@ description: Operations executed pipe-flange-assembly.kcl
         }
       },
       "sourceRange": [
-        5838,
+        5831,
-        5872,
+        5865,
         0
       ]
     }
@@ -469,8 +463,8 @@ description: Operations executed pipe-flange-assembly.kcl
     "unlabeledArg": null,
     "labeledArgs": {},
     "sourceRange": [
-      5960,
+      5953,
-      6043,
+      6036,
       0
     ]
   },
@@ -781,8 +775,8 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          6162,
+          6155,
-          6165,
+          6158,
           0
         ]
       },
@@ -832,8 +826,8 @@ description: Operations executed pipe-flange-assembly.kcl
           ]
         },
         "sourceRange": [
-          6082,
+          6075,
-          6091,
+          6084,
           0
         ]
       },
@@ -883,8 +877,8 @@ description: Operations executed pipe-flange-assembly.kcl
           ]
         },
         "sourceRange": [
-          6109,
+          6102,
-          6118,
+          6111,
           0
         ]
       },
@@ -903,8 +897,8 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          6139,
+          6132,
-          6140,
+          6133,
           0
         ]
       },
@@ -914,16 +908,16 @@ description: Operations executed pipe-flange-assembly.kcl
           "value": true
         },
         "sourceRange": [
-          6193,
+          6186,
-          6197,
+          6190,
           0
         ]
       }
     },
     "name": "patternCircular3d",
     "sourceRange": [
-      6049,
+      6042,
-      6204,
+      6197,
       0
     ],
     "type": "StdLibCall",
@@ -935,8 +929,8 @@ description: Operations executed pipe-flange-assembly.kcl
         }
       },
       "sourceRange": [
-        6049,
+        6042,
-        6204,
+        6197,
         0
       ]
     }
@@ -952,8 +946,8 @@ description: Operations executed pipe-flange-assembly.kcl
     "unlabeledArg": null,
     "labeledArgs": {},
     "sourceRange": [
-      6295,
+      6288,
-      6401,
+      6394,
       0
     ]
   },
@@ -1319,8 +1313,8 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          6520,
+          6513,
-          6523,
+          6516,
           0
         ]
       },
@@ -1370,8 +1364,8 @@ description: Operations executed pipe-flange-assembly.kcl
           ]
         },
         "sourceRange": [
-          6440,
+          6433,
-          6449,
+          6442,
           0
         ]
       },
@@ -1421,8 +1415,8 @@ description: Operations executed pipe-flange-assembly.kcl
           ]
         },
         "sourceRange": [
-          6467,
+          6460,
-          6476,
+          6469,
           0
         ]
       },
@@ -1441,8 +1435,8 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          6497,
+          6490,
-          6498,
+          6491,
           0
         ]
       },
@@ -1452,16 +1446,16 @@ description: Operations executed pipe-flange-assembly.kcl
           "value": true
         },
         "sourceRange": [
-          6551,
+          6544,
-          6555,
+          6548,
           0
         ]
       }
     },
     "name": "patternCircular3d",
     "sourceRange": [
-      6407,
+      6400,
-      6562,
+      6555,
       0
     ],
     "type": "StdLibCall",
@@ -1473,8 +1467,8 @@ description: Operations executed pipe-flange-assembly.kcl
         }
       },
       "sourceRange": [
-        6407,
+        6400,
-        6562,
+        6555,
         0
       ]
     }
@@ -1669,16 +1663,16 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          6631,
+          6624,
-          6641,
+          6634,
           0
         ]
       }
     },
     "name": "startSketchOn",
     "sourceRange": [
-      6617,
+      6610,
-      6642,
+      6635,
       0
     ],
     "type": "StdLibCall",
@@ -1701,16 +1695,16 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          6762,
+          6755,
-          6774,
+          6767,
           0
         ]
       }
     },
     "name": "extrude",
     "sourceRange": [
-      6728,
+      6721,
-      6775,
+      6768,
       0
     ],
     "type": "StdLibCall",
@@ -1722,8 +1716,8 @@ description: Operations executed pipe-flange-assembly.kcl
         }
       },
       "sourceRange": [
-        6736,
+        6729,
-        6751,
+        6744,
         0
       ]
     }
@@ -1745,8 +1739,8 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          6894,
+          6887,
-          6897,
+          6890,
           0
         ]
       },
@@ -1796,8 +1790,8 @@ description: Operations executed pipe-flange-assembly.kcl
           ]
         },
         "sourceRange": [
-          6814,
+          6807,
-          6823,
+          6816,
           0
         ]
       },
@@ -1847,8 +1841,8 @@ description: Operations executed pipe-flange-assembly.kcl
           ]
         },
         "sourceRange": [
-          6841,
+          6834,
-          6850,
+          6843,
           0
         ]
       },
@@ -1867,8 +1861,8 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          6871,
+          6864,
-          6872,
+          6865,
           0
         ]
       },
@@ -1878,16 +1872,16 @@ description: Operations executed pipe-flange-assembly.kcl
           "value": true
         },
         "sourceRange": [
-          6925,
+          6918,
-          6929,
+          6922,
           0
         ]
       }
     },
     "name": "patternCircular3d",
     "sourceRange": [
-      6781,
+      6774,
-      6936,
+      6929,
       0
     ],
     "type": "StdLibCall",
@@ -1899,8 +1893,8 @@ description: Operations executed pipe-flange-assembly.kcl
         }
       },
       "sourceRange": [
-        6781,
+        6774,
-        6936,
+        6929,
         0
       ]
     }
@@ -1916,8 +1910,8 @@ description: Operations executed pipe-flange-assembly.kcl
     "unlabeledArg": null,
     "labeledArgs": {},
     "sourceRange": [
-      7330,
+      7323,
-      7420,
+      7413,
       0
     ]
   },
@@ -2228,8 +2222,8 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          7539,
+          7532,
-          7542,
+          7535,
           0
         ]
       },
@@ -2279,8 +2273,8 @@ description: Operations executed pipe-flange-assembly.kcl
           ]
         },
         "sourceRange": [
-          7459,
+          7452,
-          7468,
+          7461,
           0
         ]
       },
@@ -2330,8 +2324,8 @@ description: Operations executed pipe-flange-assembly.kcl
           ]
         },
         "sourceRange": [
-          7486,
+          7479,
-          7495,
+          7488,
           0
         ]
       },
@@ -2350,8 +2344,8 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          7516,
+          7509,
-          7517,
+          7510,
           0
         ]
       },
@@ -2361,16 +2355,16 @@ description: Operations executed pipe-flange-assembly.kcl
           "value": true
         },
         "sourceRange": [
-          7570,
+          7563,
-          7574,
+          7567,
           0
         ]
       }
     },
     "name": "patternCircular3d",
     "sourceRange": [
-      7426,
+      7419,
-      7581,
+      7574,
       0
     ],
     "type": "StdLibCall",
@@ -2382,8 +2376,8 @@ description: Operations executed pipe-flange-assembly.kcl
         }
       },
       "sourceRange": [
-        7426,
+        7419,
-        7581,
+        7574,
         0
       ]
     }
@@ -2399,8 +2393,8 @@ description: Operations executed pipe-flange-assembly.kcl
     "unlabeledArg": null,
     "labeledArgs": {},
     "sourceRange": [
-      7670,
+      7663,
-      7772,
+      7765,
       0
     ]
   },
@@ -2711,8 +2705,8 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          7891,
+          7884,
-          7894,
+          7887,
           0
         ]
       },
@@ -2762,8 +2756,8 @@ description: Operations executed pipe-flange-assembly.kcl
           ]
         },
         "sourceRange": [
-          7811,
+          7804,
-          7820,
+          7813,
           0
         ]
       },
@@ -2813,8 +2807,8 @@ description: Operations executed pipe-flange-assembly.kcl
           ]
         },
         "sourceRange": [
-          7838,
+          7831,
-          7847,
+          7840,
           0
         ]
       },
@@ -2833,8 +2827,8 @@ description: Operations executed pipe-flange-assembly.kcl
           }
         },
         "sourceRange": [
-          7868,
+          7861,
-          7869,
+          7862,
           0
         ]
       },
@@ -2844,16 +2838,16 @@ description: Operations executed pipe-flange-assembly.kcl
           "value": true
         },
         "sourceRange": [
-          7922,
+          7915,
-          7926,
+          7919,
           0
         ]
       }
     },
     "name": "patternCircular3d",
     "sourceRange": [
-      7778,
+      7771,
-      7933,
+      7926,
       0
     ],
     "type": "StdLibCall",
@@ -2865,8 +2859,8 @@ description: Operations executed pipe-flange-assembly.kcl
         }
       },
       "sourceRange": [
-        7778,
+        7771,
-        7933,
+        7926,
         0
       ]
     }

rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/program_memory.snap

@@ -223,8 +223,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            5643,
+            5636,
-            5711,
+            5704,
             0
           ],
           "tag": null,
@@ -239,8 +239,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                5643,
+                5636,
-                5711,
+                5704,
                 0
               ]
             },
@@ -310,8 +310,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              5643,
+              5636,
-              5711,
+              5704,
               0
             ]
           }
@@ -1641,8 +1641,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
               "faceId": "[uuid]",
               "id": "[uuid]",
               "sourceRange": [
-                6648,
+                6641,
-                6715,
+                6708,
                 0
               ],
               "tag": null,
@@ -1657,8 +1657,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
                 "__geoMeta": {
                   "id": "[uuid]",
                   "sourceRange": [
-                    6648,
+                    6641,
-                    6715,
+                    6708,
                     0
                   ]
                 },
@@ -1728,8 +1728,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
               "__geoMeta": {
                 "id": "[uuid]",
                 "sourceRange": [
-                  6648,
+                  6641,
-                  6715,
+                  6708,
                   0
                 ]
               }
@@ -1759,8 +1759,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
               "faceId": "[uuid]",
               "id": "[uuid]",
               "sourceRange": [
-                6648,
+                6641,
-                6715,
+                6708,
                 0
               ],
               "tag": null,
@@ -1775,8 +1775,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
                 "__geoMeta": {
                   "id": "[uuid]",
                   "sourceRange": [
-                    6648,
+                    6641,
-                    6715,
+                    6708,
                     0
                   ]
                 },
@@ -1846,8 +1846,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
               "__geoMeta": {
                 "id": "[uuid]",
                 "sourceRange": [
-                  6648,
+                  6641,
-                  6715,
+                  6708,
                   0
                 ]
               }
@@ -1877,8 +1877,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
               "faceId": "[uuid]",
               "id": "[uuid]",
               "sourceRange": [
-                6648,
+                6641,
-                6715,
+                6708,
                 0
               ],
               "tag": null,
@@ -1893,8 +1893,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
                 "__geoMeta": {
                   "id": "[uuid]",
                   "sourceRange": [
-                    6648,
+                    6641,
-                    6715,
+                    6708,
                     0
                   ]
                 },
@@ -1964,8 +1964,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
               "__geoMeta": {
                 "id": "[uuid]",
                 "sourceRange": [
-                  6648,
+                  6641,
-                  6715,
+                  6708,
                   0
                 ]
               }
@@ -1995,8 +1995,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
               "faceId": "[uuid]",
               "id": "[uuid]",
               "sourceRange": [
-                6648,
+                6641,
-                6715,
+                6708,
                 0
               ],
               "tag": null,
@@ -2011,8 +2011,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
                 "__geoMeta": {
                   "id": "[uuid]",
                   "sourceRange": [
-                    6648,
+                    6641,
-                    6715,
+                    6708,
                     0
                   ]
                 },
@@ -2082,8 +2082,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
               "__geoMeta": {
                 "id": "[uuid]",
                 "sourceRange": [
-                  6648,
+                  6641,
-                  6715,
+                  6708,
                   0
                 ]
               }
@@ -2113,8 +2113,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
               "faceId": "[uuid]",
               "id": "[uuid]",
               "sourceRange": [
-                6648,
+                6641,
-                6715,
+                6708,
                 0
               ],
               "tag": null,
@@ -2129,8 +2129,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
                 "__geoMeta": {
                   "id": "[uuid]",
                   "sourceRange": [
-                    6648,
+                    6641,
-                    6715,
+                    6708,
                     0
                   ]
                 },
@@ -2200,8 +2200,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
               "__geoMeta": {
                 "id": "[uuid]",
                 "sourceRange": [
-                  6648,
+                  6641,
-                  6715,
+                  6708,
                   0
                 ]
               }
@@ -2231,8 +2231,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
               "faceId": "[uuid]",
               "id": "[uuid]",
               "sourceRange": [
-                6648,
+                6641,
-                6715,
+                6708,
                 0
               ],
               "tag": null,
@@ -2247,8 +2247,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
                 "__geoMeta": {
                   "id": "[uuid]",
                   "sourceRange": [
-                    6648,
+                    6641,
-                    6715,
+                    6708,
                     0
                   ]
                 },
@@ -2318,8 +2318,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
               "__geoMeta": {
                 "id": "[uuid]",
                 "sourceRange": [
-                  6648,
+                  6641,
-                  6715,
+                  6708,
                   0
                 ]
               }
@@ -2349,8 +2349,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
               "faceId": "[uuid]",
               "id": "[uuid]",
               "sourceRange": [
-                6648,
+                6641,
-                6715,
+                6708,
                 0
               ],
               "tag": null,
@@ -2365,8 +2365,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
                 "__geoMeta": {
                   "id": "[uuid]",
                   "sourceRange": [
-                    6648,
+                    6641,
-                    6715,
+                    6708,
                     0
                   ]
                 },
@@ -2436,8 +2436,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
               "__geoMeta": {
                 "id": "[uuid]",
                 "sourceRange": [
-                  6648,
+                  6641,
-                  6715,
+                  6708,
                   0
                 ]
               }
@@ -2468,8 +2468,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              6648,
+              6641,
-              6715,
+              6708,
               0
             ]
           },
@@ -2539,8 +2539,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
         "__geoMeta": {
           "id": "[uuid]",
           "sourceRange": [
-            6648,
+            6641,
-            6715,
+            6708,
             0
           ]
         }
@@ -2832,8 +2832,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            5297,
+            5290,
-            5315,
+            5308,
             0
           ],
           "tag": null,
@@ -2843,8 +2843,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            5321,
+            5314,
-            5339,
+            5332,
             0
           ],
           "tag": null,
@@ -2854,8 +2854,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
-            5345,
+            5338,
-            5364,
+            5357,
             0
           ],
           "tag": null,
@@ -2865,8 +2865,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
           "faceId": "[uuid]",
           "id": "[uuid]",
           "sourceRange": [
+            5363,
             5370,
-            5377,
             0
           ],
           "tag": null,
@@ -2881,8 +2881,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                5297,
+                5290,
-                5315,
+                5308,
                 0
               ]
             },
@@ -2904,8 +2904,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                5321,
+                5314,
-                5339,
+                5332,
                 0
               ]
             },
@@ -2927,8 +2927,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
-                5345,
+                5338,
-                5364,
+                5357,
                 0
               ]
             },
@@ -2950,8 +2950,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
             "__geoMeta": {
               "id": "[uuid]",
               "sourceRange": [
+                5363,
                 5370,
-                5377,
                 0
               ]
             },
@@ -3015,8 +3015,8 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
           "__geoMeta": {
             "id": "[uuid]",
             "sourceRange": [
-              5264,
+              5257,
-              5291,
+              5284,
               0
             ]
           }

rust/kcl-lib/tests/kcl_samples/pipe-with-bend/artifact_commands.snap

@@ -324,7 +324,7 @@ description: Artifact commands pipe-with-bend.kcl
     "cmdId": "[uuid]",
     "range": [
       794,
-      849,
+      845,
       0
     ],
     "command": {
@@ -352,7 +352,7 @@ description: Artifact commands pipe-with-bend.kcl
     "cmdId": "[uuid]",
     "range": [
       794,
-      849,
+      845,
       0
     ],
     "command": {
@@ -364,7 +364,7 @@ description: Artifact commands pipe-with-bend.kcl
     "cmdId": "[uuid]",
     "range": [
       794,
-      849,
+      845,
       0
     ],
     "command": {
@@ -377,7 +377,7 @@ description: Artifact commands pipe-with-bend.kcl
     "cmdId": "[uuid]",
     "range": [
       794,
-      849,
+      845,
       0
     ],
     "command": {
@@ -391,7 +391,7 @@ description: Artifact commands pipe-with-bend.kcl
     "cmdId": "[uuid]",
     "range": [
       794,
-      849,
+      845,
       0
     ],
     "command": {

rust/kcl-lib/tests/kcl_samples/pipe-with-bend/artifact_graph_flowchart.snap.md

@@ -11,7 +11,7 @@ flowchart LR
     7[Solid2d]
   end
   1["Plane<br>[350, 369, 0]"]
-  8["Sweep Revolve<br>[794, 849, 0]"]
+  8["Sweep Revolve<br>[794, 845, 0]"]
   9[Wall]
   10["Cap Start"]
   11["Cap End"]

rust/kcl-lib/tests/kcl_samples/pipe-with-bend/ast.snap

@@ -456,7 +456,7 @@ description: Result of parsing pipe-with-bend.kcl
       },
       {
         "declaration": {
-          "end": 849,
+          "end": 845,
           "id": {
             "end": 791,
             "name": "pipe",
@@ -466,56 +466,37 @@ description: Result of parsing pipe-with-bend.kcl
           "init": {
             "arguments": [
               {
-                "end": 835,
+                "type": "LabeledArg",
-                "properties": [
+                "label": {
-                  {
+                  "end": 819,
-                    "end": 814,
+                  "name": "axis",
-                    "key": {
+                  "start": 815,
-                      "end": 808,
+                  "type": "Identifier"
-                      "name": "axis",
+                },
-                      "start": 804,
+                "arg": {
-                      "type": "Identifier"
+                  "end": 825,
-                    },
+                  "raw": "\"Y\"",
-                    "start": 804,
+                  "start": 822,
-                    "type": "ObjectProperty",
+                  "type": "Literal",
-                    "value": {
+                  "type": "Literal",
-                      "end": 814,
+                  "value": "Y"
-                      "raw": "\"Y\"",
+                }
-                      "start": 811,
-                      "type": "Literal",
-                      "type": "Literal",
-                      "value": "Y"
-                    }
-                  },
-                  {
-                    "end": 833,
-                    "key": {
-                      "end": 821,
-                      "name": "angle",
-                      "start": 816,
-                      "type": "Identifier"
-                    },
-                    "start": 816,
-                    "type": "ObjectProperty",
-                    "value": {
-                      "end": 833,
-                      "name": "bendAngle",
-                      "start": 824,
-                      "type": "Identifier",
-                      "type": "Identifier"
-                    }
-                  }
-                ],
-                "start": 802,
-                "type": "ObjectExpression",
-                "type": "ObjectExpression"
               },
               {
-                "end": 848,
+                "type": "LabeledArg",
-                "name": "pipeProfile",
+                "label": {
-                "start": 837,
+                  "end": 832,
-                "type": "Identifier",
+                  "name": "angle",
-                "type": "Identifier"
+                  "start": 827,
+                  "type": "Identifier"
+                },
+                "arg": {
+                  "end": 844,
+                  "name": "bendAngle",
+                  "start": 835,
+                  "type": "Identifier",
+                  "type": "Identifier"
+                }
               }
             ],
             "callee": {
@@ -524,22 +505,29 @@ description: Result of parsing pipe-with-bend.kcl
               "start": 794,
               "type": "Identifier"
             },
-            "end": 849,
+            "end": 845,
             "start": 794,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "end": 813,
+              "name": "pipeProfile",
+              "start": 802,
+              "type": "Identifier",
+              "type": "Identifier"
+            }
           },
           "start": 787,
           "type": "VariableDeclarator"
         },
-        "end": 849,
+        "end": 845,
         "kind": "const",
         "start": 787,
         "type": "VariableDeclaration",
         "type": "VariableDeclaration"
       }
     ],
-    "end": 850,
+    "end": 846,
     "innerAttrs": [
       {
         "end": 209,