ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KCL: Migrate hole to kwargs (#6382)

Browse Source 
Previously:

`|> hole(circle(radius = 2, center = p), %)`

Now:

`|> subtract2d(tool = circle(radius = 2, center = p))`
This commit is contained in:
Adam Chalmers
2025-04-26 15:31:51 -05:00
committed by GitHub
parent 5a18f551aa
commit 6e115c19d5
116 changed files with 12912 additions and 12847 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/kcl/appearance.md
View File

@ -198,7 +198,7 @@ pipeHole = startSketchOn(XY)
sweepSketch = startSketchOn(XY) sweepSketch = startSketchOn(XY)
|> circle(center = [0, 0], radius = 2) |> circle(center = [0, 0], radius = 2)
|> hole(pipeHole, %) |> subtract2d(tool = pipeHole)
|> sweep(path = sweepPath) |> sweep(path = sweepPath)
|> appearance(color = "#ff0000", metalness = 50, roughness = 50) |> appearance(color = "#ff0000", metalness = 50, roughness = 50)
``` ```

67
docs/kcl/hole.md
View File

File diff suppressed because one or more lines are too long

2
docs/kcl/index.md
View File

@ -55,7 +55,6 @@ layout: manual
* [`getOppositeEdge`](kcl/getOppositeEdge) * [`getOppositeEdge`](kcl/getOppositeEdge)
* [`getPreviousAdjacentEdge`](kcl/getPreviousAdjacentEdge) * [`getPreviousAdjacentEdge`](kcl/getPreviousAdjacentEdge)
* [`helix`](kcl/std-helix) * [`helix`](kcl/std-helix)
* [`hole`](kcl/hole)
* [`hollow`](kcl/hollow) * [`hollow`](kcl/hollow)
* [`intersect`](kcl/intersect) * [`intersect`](kcl/intersect)
* [`involuteCircular`](kcl/involuteCircular) * [`involuteCircular`](kcl/involuteCircular)
@ -106,6 +105,7 @@ layout: manual
* [`startProfile`](kcl/startProfile) * [`startProfile`](kcl/startProfile)
* [`startSketchOn`](kcl/startSketchOn) * [`startSketchOn`](kcl/startSketchOn)
* [`subtract`](kcl/subtract) * [`subtract`](kcl/subtract)
* [`subtract2d`](kcl/subtract2d)
* [`sweep`](kcl/sweep) * [`sweep`](kcl/sweep)
* [`tangentToEnd`](kcl/tangentToEnd) * [`tangentToEnd`](kcl/tangentToEnd)
* [`tangentialArc`](kcl/tangentialArc) * [`tangentialArc`](kcl/tangentialArc)

6
docs/kcl/rotate.md
View File

@ -76,7 +76,7 @@ pipeHole = startSketchOn(XY)
sweepSketch = startSketchOn(XY) sweepSketch = startSketchOn(XY)
|> circle(center = [0, 0], radius = 2) |> circle(center = [0, 0], radius = 2)
|> hole(pipeHole, %) |> subtract2d(tool = pipeHole)
|> sweep(path = sweepPath) |> sweep(path = sweepPath)
|> rotate(roll = 10, pitch = 10, yaw = 90) |> rotate(roll = 10, pitch = 10, yaw = 90)
``` ```
@ -101,7 +101,7 @@ pipeHole = startSketchOn(XY)
sweepSketch = startSketchOn(XY) sweepSketch = startSketchOn(XY)
|> circle(center = [0, 0], radius = 2) |> circle(center = [0, 0], radius = 2)
|> hole(pipeHole, %) |> subtract2d(tool = pipeHole)
|> sweep(path = sweepPath) |> sweep(path = sweepPath)
|> rotate(roll = 10) |> rotate(roll = 10)
``` ```
@ -126,7 +126,7 @@ pipeHole = startSketchOn(XY)
sweepSketch = startSketchOn(XY) sweepSketch = startSketchOn(XY)
|> circle(center = [0, 0], radius = 2) |> circle(center = [0, 0], radius = 2)
|> hole(pipeHole, %) |> subtract2d(tool = pipeHole)
|> sweep(path = sweepPath) |> sweep(path = sweepPath)
|> rotate(axis = [0, 0, 1.0], angle = 90) |> rotate(axis = [0, 0, 1.0], angle = 90)
``` ```

2
docs/kcl/scale.md
View File

@ -60,7 +60,7 @@ pipeHole = startSketchOn(XY)
sweepSketch = startSketchOn(XY) sweepSketch = startSketchOn(XY)
|> circle(center = [0, 0], radius = 2) |> circle(center = [0, 0], radius = 2)
|> hole(pipeHole, %) |> subtract2d(tool = pipeHole)
|> sweep(path = sweepPath) |> sweep(path = sweepPath)
|> scale(z = 2.5) |> scale(z = 2.5)
``` ```

2
docs/kcl/std-sketch-circle.md
View File

@ -51,7 +51,7 @@ exampleSketch = startSketchOn(XZ)
|> line(end = [0, 30]) |> line(end = [0, 30])
|> line(end = [-30, 0]) |> line(end = [-30, 0])
|> close() |> close()
|> hole(circle(center = [0, 15], radius = 5), %) |> subtract2d(tool = circle(center = [0, 15], radius = 5))
example = extrude(exampleSketch, length = 5) example = extrude(exampleSketch, length = 5)
``` ```

9914
docs/kcl/std.json
View File

File diff suppressed because it is too large Load Diff

67
docs/kcl/subtract2d.md Normal file
View File

File diff suppressed because one or more lines are too long

2
docs/kcl/sweep.md
View File

@ -58,7 +58,7 @@ pipeHole = startSketchOn(XY)
sweepSketch = startSketchOn(XY) sweepSketch = startSketchOn(XY)
|> circle(center = [0, 0], radius = 2) |> circle(center = [0, 0], radius = 2)
|> hole(pipeHole, %) |> subtract2d(tool = pipeHole)
|> sweep(path = sweepPath) |> sweep(path = sweepPath)
``` ```

2
docs/kcl/translate.md
View File

@ -56,7 +56,7 @@ pipeHole = startSketchOn(XY)
sweepSketch = startSketchOn(XY) sweepSketch = startSketchOn(XY)
|> circle(center = [0, 0], radius = 2) |> circle(center = [0, 0], radius = 2)
|> hole(pipeHole, %) |> subtract2d(tool = pipeHole)
|> sweep(path = sweepPath) |> sweep(path = sweepPath)
|> translate(x = 1.0, y = 1.0, z = 2.5) |> translate(x = 1.0, y = 1.0, z = 2.5)
``` ```

2
e2e/playwright/editor-tests.spec.ts
View File

@ -702,7 +702,7 @@ sketch_001 = startSketchOn(XY)
await page.keyboard.press('Enter') await page.keyboard.press('Enter')
await page.keyboard.type(`extrusion = startSketchOn(XY) await page.keyboard.type(`extrusion = startSketchOn(XY)
|> circle(center: [0, 0], radius: dia/2) |> circle(center: [0, 0], radius: dia/2)
|> hole(squareHole(length, width, height), %) |> subtract2d(tool = squareHole(length, width, height))
|> extrude(length = height)`) |> extrude(length = height)`)
// error in gutter // error in gutter

2
e2e/playwright/sketch-tests.spec.ts
View File

@ -52,7 +52,7 @@ test.describe('Sketch tests', () => {
|> yLine(length = height) |> yLine(length = height)
|> xLine(length = -width * .5) |> xLine(length = -width * .5)
|> close() |> close()
|> hole(screwHole, %) |> subtract2d(tool = screwHole)
|> extrude(length = thickness) |> extrude(length = thickness)
part002 = startSketchOn(-XZ) part002 = startSketchOn(-XZ)

4
public/kcl-samples/80-20-rail/main.kcl
View File

@ -85,13 +85,13 @@ fn rail8020(originStart, railHeight, railLength) {
|> close() |> close()
// Sketch center hole of profile // Sketch center hole of profile
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
.5 * railHeight + originStart[0], .5 * railHeight + originStart[0],
.5 * railHeight + originStart[1] .5 * railHeight + originStart[1]
], ],
radius = .205 * railHeight / 2, radius = .205 * railHeight / 2,
), %) ))
|> extrude(length = railLength) |> extrude(length = railLength)
|> fillet( |> fillet(
radius = 0.06, radius = 0.06,

36
public/kcl-samples/axial-fan/fan-housing.kcl
View File

@ -16,35 +16,35 @@ bottomFaceSketch = startSketchOn(XY)
|> angledLine(angle = segAng(rectangleSegmentA001), length = -segLen(rectangleSegmentA001), tag = $rectangleSegmentC001) |> angledLine(angle = segAng(rectangleSegmentA001), length = -segLen(rectangleSegmentA001), tag = $rectangleSegmentC001)
|> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $rectangleSegmentD001) |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $rectangleSegmentD001)
|> close() |> close()
|> hole(circle(center = [0, 0], radius = 4), %) |> subtract2d(tool = circle(center = [0, 0], radius = 4))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
mountingHoleSpacing / 2, mountingHoleSpacing / 2,
mountingHoleSpacing / 2 mountingHoleSpacing / 2
], ],
radius = mountingHoleSize / 2, radius = mountingHoleSize / 2,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
-mountingHoleSpacing / 2, -mountingHoleSpacing / 2,
mountingHoleSpacing / 2 mountingHoleSpacing / 2
], ],
radius = mountingHoleSize / 2, radius = mountingHoleSize / 2,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
mountingHoleSpacing / 2, mountingHoleSpacing / 2,
-mountingHoleSpacing / 2 -mountingHoleSpacing / 2
], ],
radius = mountingHoleSize / 2, radius = mountingHoleSize / 2,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
-mountingHoleSpacing / 2, -mountingHoleSpacing / 2,
-mountingHoleSpacing / 2 -mountingHoleSpacing / 2
], ],
radius = mountingHoleSize / 2, radius = mountingHoleSize / 2,
), %) ))
|> extrude(length = 4) |> extrude(length = 4)
// Add large openings to the bottom face to allow airflow through the fan // Add large openings to the bottom face to allow airflow through the fan
@ -98,35 +98,35 @@ topHoles = startProfile(topFaceSketch, at = [-fanSize / 2, -fanSize / 2])
|> angledLine(angle = segAng(rectangleSegmentA002), length = -segLen(rectangleSegmentA002), tag = $rectangleSegmentC002) |> angledLine(angle = segAng(rectangleSegmentA002), length = -segLen(rectangleSegmentA002), tag = $rectangleSegmentC002)
|> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $rectangleSegmentD002) |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $rectangleSegmentD002)
|> close() |> close()
|> hole(circle(center = [0, 0], radius = fanSize * 23 / 50), %) |> subtract2d(tool = circle(center = [0, 0], radius = fanSize * 23 / 50))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
mountingHoleSpacing / 2, mountingHoleSpacing / 2,
mountingHoleSpacing / 2 mountingHoleSpacing / 2
], ],
radius = mountingHoleSize / 2, radius = mountingHoleSize / 2,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
-mountingHoleSpacing / 2, -mountingHoleSpacing / 2,
mountingHoleSpacing / 2 mountingHoleSpacing / 2
], ],
radius = mountingHoleSize / 2, radius = mountingHoleSize / 2,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
mountingHoleSpacing / 2, mountingHoleSpacing / 2,
-mountingHoleSpacing / 2 -mountingHoleSpacing / 2
], ],
radius = mountingHoleSize / 2, radius = mountingHoleSize / 2,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
-mountingHoleSpacing / 2, -mountingHoleSpacing / 2,
-mountingHoleSpacing / 2 -mountingHoleSpacing / 2
], ],
radius = mountingHoleSize / 2, radius = mountingHoleSize / 2,
), %) ))
|> extrude(length = 4) |> extrude(length = 4)
// Create a housing for the electric motor to sit // Create a housing for the electric motor to sit

4
public/kcl-samples/ball-bearing/main.kcl
View File

@ -19,7 +19,7 @@ linkDiameter = sphereDia / 4
// Sketch the inside bearing piece // Sketch the inside bearing piece
insideWallSketch = startSketchOn(offsetPlane(XY, offset = -overallThickness / 2)) insideWallSketch = startSketchOn(offsetPlane(XY, offset = -overallThickness / 2))
|> circle(center = [0, 0], radius = shaftDia / 2 + wallThickness) |> circle(center = [0, 0], radius = shaftDia / 2 + wallThickness)
|> hole(circle(center = [0, 0], radius = shaftDia / 2), %) |> subtract2d(tool = circle(center = [0, 0], radius = shaftDia / 2))
// Extrude the inside bearing piece // Extrude the inside bearing piece
insideWall = extrude(insideWallSketch, length = overallThickness) insideWall = extrude(insideWallSketch, length = overallThickness)
@ -84,6 +84,6 @@ linkRevolve = revolve(linkSketch, axis = Y, angle = 360 / nBalls)
// Create the sketch for the outside walls // Create the sketch for the outside walls
outsideWallSketch = startSketchOn(offsetPlane(XY, offset = -overallThickness / 2)) outsideWallSketch = startSketchOn(offsetPlane(XY, offset = -overallThickness / 2))
|> circle(center = [0, 0], radius = outsideDiameter / 2) |> circle(center = [0, 0], radius = outsideDiameter / 2)
|> hole(circle(center = [0, 0], radius = shaftDia / 2 + wallThickness + sphereDia), %) |> subtract2d(tool = circle(center = [0, 0], radius = shaftDia / 2 + wallThickness + sphereDia))
outsideWall = extrude(outsideWallSketch, length = overallThickness) outsideWall = extrude(outsideWallSketch, length = overallThickness)

4
public/kcl-samples/car-wheel-assembly/car-wheel.kcl
View File

@ -10,13 +10,13 @@ import lugCount, lugSpacing, offset, backSpacing, wheelWidth, wheelDiameter, spo
// Create the wheel center // Create the wheel center
lugBase = startSketchOn(XZ) lugBase = startSketchOn(XZ)
|> circle(center = [0, 0], radius = (lugSpacing + 1.5) / 2) |> circle(center = [0, 0], radius = (lugSpacing + 1.5) / 2)
|> hole(circle(center = [0, 0], radius = (lugSpacing - 1.5) / 2), %) |> subtract2d(tool = circle(center = [0, 0], radius = (lugSpacing - 1.5) / 2))
|> extrude(length = wheelWidth / 20) |> extrude(length = wheelWidth / 20)
// Extend the wheel center and bore holes to accomidate the lug heads // Extend the wheel center and bore holes to accomidate the lug heads
lugExtrusion = startSketchOn(lugBase, face = END) lugExtrusion = startSketchOn(lugBase, face = END)
|> circle(center = [0, 0], radius = (lugSpacing + 1.5) / 2) |> circle(center = [0, 0], radius = (lugSpacing + 1.5) / 2)
|> hole(circle(center = [0, 0], radius = (lugSpacing - 1.5) / 2), %) |> subtract2d(tool = circle(center = [0, 0], radius = (lugSpacing - 1.5) / 2))
|> extrude(length = wheelWidth / 10) |> extrude(length = wheelWidth / 10)
// Create the circular pattern for the lugs // Create the circular pattern for the lugs

2
public/kcl-samples/cycloidal-gear/main.kcl
View File

@ -21,7 +21,7 @@ fn cycloidalGear(gearPitch, gearHeight, holeDiameter, helixAngle) {
|> tangentialArc(radius = gearPitch, angle = -180) |> tangentialArc(radius = gearPitch, angle = -180)
|> tangentialArc(endAbsolute = [profileStartX(%), profileStartY(%)]) |> tangentialArc(endAbsolute = [profileStartX(%), profileStartY(%)])
|> close(%) |> close(%)
|> hole(circle(center = [0, 0], radius = holeDiameter / 2), %) |> subtract2d(tool = circle(center = [0, 0], radius = holeDiameter / 2))
return gearProfile return gearProfile
} }

34
public/kcl-samples/enclosure/main.kcl
View File

@ -46,7 +46,7 @@ fn function001(originStart) {
// Create a pillar with a fasterner hole at the center // Create a pillar with a fasterner hole at the center
sketch002 = startSketchOn(plane001) sketch002 = startSketchOn(plane001)
|> circle(center = [originStart[0], originStart[1]], radius = holeDia + wallThickness) |> circle(center = [originStart[0], originStart[1]], radius = holeDia + wallThickness)
|> hole(circle(center = [originStart[0], originStart[1]], radius = holeDia), %) |> subtract2d(tool = circle(center = [originStart[0], originStart[1]], radius = holeDia))
extrude002 = extrude(sketch002, length = height - wallThickness) extrude002 = extrude(sketch002, length = height - wallThickness)
return extrude002 return extrude002
@ -78,34 +78,34 @@ sketch003 = startSketchOn(XY)
|> angledLine(angle = segAng(rectangleSegmentA001), length = -segLen(rectangleSegmentA001), tag = $rectangleSegmentC002) |> angledLine(angle = segAng(rectangleSegmentA001), length = -segLen(rectangleSegmentA001), tag = $rectangleSegmentC002)
|> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $rectangleSegmentD002) |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $rectangleSegmentD002)
|> close() |> close()
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
width * 1.2 + wallThickness * 3 + holeDia, width * 1.2 + wallThickness * 3 + holeDia,
wallThickness * 3 + holeDia wallThickness * 3 + holeDia
], ],
radius = holeDia, radius = holeDia,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
width * 1.2 + wallThickness * 3 + holeDia, width * 1.2 + wallThickness * 3 + holeDia,
length - (wallThickness * 3 + holeDia) length - (wallThickness * 3 + holeDia)
], ],
radius = holeDia, radius = holeDia,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
width * 2.2 - (wallThickness * 3 + holeDia), width * 2.2 - (wallThickness * 3 + holeDia),
wallThickness * 3 + holeDia wallThickness * 3 + holeDia
], ],
radius = holeDia, radius = holeDia,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
width * 2.2 - (wallThickness * 3 + holeDia), width * 2.2 - (wallThickness * 3 + holeDia),
length - (wallThickness * 3 + holeDia) length - (wallThickness * 3 + holeDia)
], ],
radius = holeDia, radius = holeDia,
), %) ))
extrude003 = extrude(sketch003, length = wallThickness) extrude003 = extrude(sketch003, length = wallThickness)
|> fillet( |> fillet(
radius = wallThickness * 4, radius = wallThickness * 4,
@ -128,34 +128,34 @@ sketch004 = startSketchOn(extrude003, face = END)
|> angledLine(angle = segAng(rectangleSegmentA003), length = -segLen(rectangleSegmentA003), tag = $rectangleSegmentC003) |> angledLine(angle = segAng(rectangleSegmentA003), length = -segLen(rectangleSegmentA003), tag = $rectangleSegmentC003)
|> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $rectangleSegmentD003) |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $rectangleSegmentD003)
|> close() |> close()
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
width * 1.2 + wallThickness * 3 + holeDia, width * 1.2 + wallThickness * 3 + holeDia,
wallThickness * 3 + holeDia wallThickness * 3 + holeDia
], ],
radius = holeDia + wallThickness, radius = holeDia + wallThickness,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
width * 1.2 + wallThickness * 3 + holeDia, width * 1.2 + wallThickness * 3 + holeDia,
length - (wallThickness * 3 + holeDia) length - (wallThickness * 3 + holeDia)
], ],
radius = holeDia + wallThickness, radius = holeDia + wallThickness,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
width * 2.2 - (wallThickness * 3 + holeDia), width * 2.2 - (wallThickness * 3 + holeDia),
wallThickness * 3 + holeDia wallThickness * 3 + holeDia
], ],
radius = holeDia + wallThickness, radius = holeDia + wallThickness,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
width * 2.2 - (wallThickness * 3 + holeDia), width * 2.2 - (wallThickness * 3 + holeDia),
length - (wallThickness * 3 + holeDia) length - (wallThickness * 3 + holeDia)
], ],
radius = holeDia + wallThickness, radius = holeDia + wallThickness,
), %) ))
extrude004 = extrude(sketch004, length = wallThickness) extrude004 = extrude(sketch004, length = wallThickness)
|> fillet( |> fillet(
radius = wallThickness * 3, radius = wallThickness * 3,

26
public/kcl-samples/exhaust-manifold/main.kcl
View File

@ -39,7 +39,7 @@ fn primaryTube(n, angle001, length001, length002, length003) {
// Create the cross section of each tube and sweep them // Create the cross section of each tube and sweep them
sweepProfile = startSketchOn(XY) sweepProfile = startSketchOn(XY)
|> circle(center = [pos001, 0], radius = primaryTubeDiameter / 2) |> circle(center = [pos001, 0], radius = primaryTubeDiameter / 2)
|> hole(circle(center = [pos001, 0], radius = primaryTubeDiameter / 2 - wallThickness), %) |> subtract2d(tool = circle(center = [pos001, 0], radius = primaryTubeDiameter / 2 - wallThickness))
|> sweep(path = sweepPath) |> sweep(path = sweepPath)
return { } return { }
@ -73,40 +73,40 @@ flangeSketch = startSketchOn(XY)
|> close() |> close()
// Create openings in the flange to accommodate each tube // Create openings in the flange to accommodate each tube
|> hole(circle(center = [0, 0], radius = primaryTubeDiameter / 2 - wallThickness), %) |> subtract2d(tool = circle(center = [0, 0], radius = primaryTubeDiameter / 2 - wallThickness))
|> hole(circle(center = [2, 0], radius = primaryTubeDiameter / 2 - wallThickness), %) |> subtract2d(tool = circle(center = [2, 0], radius = primaryTubeDiameter / 2 - wallThickness))
|> hole(circle(center = [4, 0], radius = primaryTubeDiameter / 2 - wallThickness), %) |> subtract2d(tool = circle(center = [4, 0], radius = primaryTubeDiameter / 2 - wallThickness))
|> hole(circle(center = [6, 0], radius = primaryTubeDiameter / 2 - wallThickness), %) |> subtract2d(tool = circle(center = [6, 0], radius = primaryTubeDiameter / 2 - wallThickness))
// Add mounting holes to the flange // Add mounting holes to the flange
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
-primaryTubeDiameter * .6, -primaryTubeDiameter * .6,
-primaryTubeDiameter * .6 -primaryTubeDiameter * .6
], ],
radius = 0.25 / 2, radius = 0.25 / 2,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
primaryTubeDiameter * .6, primaryTubeDiameter * .6,
primaryTubeDiameter * .6 primaryTubeDiameter * .6
], ],
radius = 0.25 / 2, radius = 0.25 / 2,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
3 * 2 - (primaryTubeDiameter * .6), 3 * 2 - (primaryTubeDiameter * .6),
primaryTubeDiameter * .6 primaryTubeDiameter * .6
], ],
radius = 0.25 / 2, radius = 0.25 / 2,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
3 * 2 + primaryTubeDiameter * .6, 3 * 2 + primaryTubeDiameter * .6,
-primaryTubeDiameter * .6 -primaryTubeDiameter * .6
], ],
radius = 0.25 / 2, radius = 0.25 / 2,
), %) ))
// Extrude the flange and fillet the edges // Extrude the flange and fillet the edges
|> extrude(length = plateHeight) |> extrude(length = plateHeight)

2
public/kcl-samples/flange/main.kcl
View File

@ -33,7 +33,7 @@ circles = startSketchOn(XY)
// Create the base of the flange and add the mounting holes // Create the base of the flange and add the mounting holes
flangeBase = startSketchOn(XY) flangeBase = startSketchOn(XY)
|> circle(center = [0, 0], radius = baseDia / 2) |> circle(center = [0, 0], radius = baseDia / 2)
|> hole(circles, %) |> subtract2d(tool = circles)
|> extrude(length = baseThickness) |> extrude(length = baseThickness)
// Create the extrusion on the top of the flange base // Create the extrusion on the top of the flange base

8
public/kcl-samples/focusrite-scarlett-mounting-bracket/main.kcl
View File

@ -78,13 +78,13 @@ tabsR = startSketchOn(tabPlane)
|> line(end = [0, -tabLength / 3 * 2], tag = $edge12) |> line(end = [0, -tabLength / 3 * 2], tag = $edge12)
|> line(end = [-tabWidth, -tabLength / 3], tag = $edge13) |> line(end = [-tabWidth, -tabLength / 3], tag = $edge13)
|> close(tag = $edge14) |> close(tag = $edge14)
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
width / 2 + thk + tabWidth / 2, width / 2 + thk + tabWidth / 2,
length / 2 + thk - (tabLength / (3 / 2)) length / 2 + thk - (tabLength / (3 / 2))
], ],
radius = holeDiam / 2, radius = holeDiam / 2,
), %) ))
|> extrude(length = -tabThk) |> extrude(length = -tabThk)
|> fillet( |> fillet(
radius = holeDiam / 2, radius = holeDiam / 2,
@ -102,13 +102,13 @@ tabsL = startSketchOn(tabPlane)
|> line(end = [0, -tabLength / 3 * 2], tag = $edge22) |> line(end = [0, -tabLength / 3 * 2], tag = $edge22)
|> line(end = [tabWidth, -tabLength / 3], tag = $edge23) |> line(end = [tabWidth, -tabLength / 3], tag = $edge23)
|> close(tag = $edge24) |> close(tag = $edge24)
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
-width / 2 - thk - (tabWidth / 2), -width / 2 - thk - (tabWidth / 2),
length / 2 + thk - (tabLength / (3 / 2)) length / 2 + thk - (tabLength / (3 / 2))
], ],
radius = holeDiam / 2, radius = holeDiam / 2,
), %) ))
|> extrude(length = -tabThk) |> extrude(length = -tabThk)
|> fillet( |> fillet(
radius = holeDiam / 2, radius = holeDiam / 2,

6
public/kcl-samples/food-service-spatula/main.kcl
View File

@ -65,9 +65,9 @@ slotProfile002 = slot(flipperSketch, [-25, -18], [-55, -19], flipperSlotWidth)
// Create a profile with slots for the spatula // Create a profile with slots for the spatula
spatulaProfile = flipperProfile spatulaProfile = flipperProfile
|> hole(slotProfile000, %) |> subtract2d(tool = slotProfile000)
|> hole(slotProfile001, %) |> subtract2d(tool = slotProfile001)
|> hole(slotProfile002, %) |> subtract2d(tool = slotProfile002)
// Extrude the profile to create the spatula flipper // Extrude the profile to create the spatula flipper
flipper = extrude(spatulaProfile, length = flipperThickness) flipper = extrude(spatulaProfile, length = flipperThickness)

2
public/kcl-samples/french-press/main.kcl
View File

@ -105,7 +105,7 @@ sketch006 = startSketchOn(XZ)
// Spiral plate // Spiral plate
sketch007 = startSketchOn(offsetPlane(XY, offset = 1.12)) sketch007 = startSketchOn(offsetPlane(XY, offset = 1.12))
|> circle(center = [0, 0], radius = carafeDiameter / 2 - 0.24) |> circle(center = [0, 0], radius = carafeDiameter / 2 - 0.24)
|> hole(circle(center = [0, 0], radius = .15), %) |> subtract2d(tool = circle(center = [0, 0], radius = .15))
extrude003 = extrude(sketch007, length = 0.050) extrude003 = extrude(sketch007, length = 0.050)

4
public/kcl-samples/gridfinity-baseplate-magnets/main.kcl
View File

@ -118,7 +118,7 @@ fn magnetBase(plane) {
|> yLine(length = binLength, tag = $line002) |> yLine(length = binLength, tag = $line002)
|> xLine(endAbsolute = profileStartX(%), tag = $line003) |> xLine(endAbsolute = profileStartX(%), tag = $line003)
|> close(tag = $line004) |> close(tag = $line004)
|> hole(magnetCenterCutout(plane), %) |> subtract2d(tool = magnetCenterCutout(plane))
return magnetBaseSketch return magnetBaseSketch
} }
@ -134,7 +134,7 @@ magnetsSketch = startSketchOn(XY)
// Create a profile with holes for the magnets // Create a profile with holes for the magnets
magnetProfile = magnetBase(XY) magnetProfile = magnetBase(XY)
|> hole(magnetsSketch, %) |> subtract2d(tool = magnetsSketch)
// Create an extrusion of the magnet cutout with holes // Create an extrusion of the magnet cutout with holes
magnetHolesExtrude = extrude(magnetProfile, length = -magDepth) magnetHolesExtrude = extrude(magnetProfile, length = -magDepth)

2
public/kcl-samples/hex-nut/main.kcl
View File

@ -19,7 +19,7 @@ fn hexNut(start, thk, innerDia) {
|> angledLine(angle = 60, length = innerDia) |> angledLine(angle = 60, length = innerDia)
|> angledLine(angle = 0, length = innerDia * .90) |> angledLine(angle = 0, length = innerDia * .90)
|> close() |> close()
|> hole(circle(center = [start[0], start[1]], radius = innerDia / 2), %) |> subtract2d(tool = circle(center = [start[0], start[1]], radius = innerDia / 2))
|> extrude(length = thk) |> extrude(length = thk)
return hexNutSketch return hexNutSketch
} }

18
public/kcl-samples/mounting-plate/main.kcl
View File

@ -29,35 +29,35 @@ holeIndex = .75
// Create the mounting plate extrusion, holes, and fillets // Create the mounting plate extrusion, holes, and fillets
rs = rectShape([0, 0], plateWidth, plateLength) rs = rectShape([0, 0], plateWidth, plateLength)
part = rs part = rs
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
-plateWidth / 2 + holeIndex, -plateWidth / 2 + holeIndex,
plateLength / 2 - holeIndex plateLength / 2 - holeIndex
], ],
radius = holeRadius, radius = holeRadius,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
plateWidth / 2 - holeIndex, plateWidth / 2 - holeIndex,
plateLength / 2 - holeIndex plateLength / 2 - holeIndex
], ],
radius = holeRadius, radius = holeRadius,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
-plateWidth / 2 + holeIndex, -plateWidth / 2 + holeIndex,
-plateLength / 2 + holeIndex -plateLength / 2 + holeIndex
], ],
radius = holeRadius, radius = holeRadius,
), %) ))
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
plateWidth / 2 - holeIndex, plateWidth / 2 - holeIndex,
-plateLength / 2 + holeIndex -plateLength / 2 + holeIndex
], ],
radius = holeRadius, radius = holeRadius,
), %) ))
|> hole(circle(center = [0, 0], radius = centerHoleDiameter), %) |> subtract2d(tool = circle(center = [0, 0], radius = centerHoleDiameter))
|> extrude(length = plateThickness) |> extrude(length = plateThickness)
|> fillet( |> fillet(
radius = filletRadius, radius = filletRadius,

2
public/kcl-samples/pipe-flange-assembly/68095k348-flange.kcl
View File

@ -23,7 +23,7 @@ export fn flange() {
// Create the flange base // Create the flange base
flangeBase = startSketchOn(XY) flangeBase = startSketchOn(XY)
|> circle(%, center = [0, 0], radius = flangeDiameter / 2) |> circle(%, center = [0, 0], radius = flangeDiameter / 2)
|> hole(mountingHoles, %) |> subtract2d(tool = mountingHoles)
|> extrude(%, length = flangeBaseThickness) |> extrude(%, length = flangeBaseThickness)
// Create both the raised portions on the front and back of the flange base // Create both the raised portions on the front and back of the flange base

2
public/kcl-samples/pipe-with-bend/main.kcl
View File

@ -21,7 +21,7 @@ innerProfile = circle(sketch000, center = [bendRadius, 0], radius = innerDiamete
// Create the profile of the pipe // Create the profile of the pipe
pipeProfile = outerProfile pipeProfile = outerProfile
|> hole(innerProfile, %) |> subtract2d(tool = innerProfile)
// Revolve the pipe profile at the desired angle // Revolve the pipe profile at the desired angle
pipe = revolve(pipeProfile, axis = Y, angle = bendAngle) pipe = revolve(pipeProfile, axis = Y, angle = bendAngle)

14
public/kcl-samples/walkie-talkie/case.kcl
View File

@ -58,14 +58,14 @@ case = startSketchOn(XZ)
]) ])
|> angledLine(angle = -225, endAbsoluteX = -width / 2 + offset + caseTolerance) |> angledLine(angle = -225, endAbsoluteX = -width / 2 + offset + caseTolerance)
|> close() |> close()
|> hole(screenSketch, %) |> subtract2d(tool = screenSketch)
|> hole(squareHolePatternSketch, %) |> subtract2d(tool = squareHolePatternSketch)
// Create the Zoo logo // Create the Zoo logo
|> hole(zLogo(startSketchOn(XZ), [-.30, -1.825], .20), %) |> subtract2d(tool = zLogo(startSketchOn(XZ), [-.30, -1.825], .20))
|> hole(oLogo(startSketchOn(XZ), [-.075, -1.825], .20), %) |> subtract2d(tool = oLogo(startSketchOn(XZ), [-.075, -1.825], .20))
|> hole(oLogo2(startSketchOn(XZ), [-.075, -1.825], .20), %) |> subtract2d(tool = oLogo2(startSketchOn(XZ), [-.075, -1.825], .20))
|> hole(oLogo(startSketchOn(XZ), [.175, -1.825], .20), %) |> subtract2d(tool = oLogo(startSketchOn(XZ), [.175, -1.825], .20))
|> hole(oLogo2(startSketchOn(XZ), [.175, -1.825], .20), %) |> subtract2d(tool = oLogo2(startSketchOn(XZ), [.175, -1.825], .20))
extrude(case, length = -0.0625) extrude(case, length = -0.0625)
|> appearance(color = '#D0FF01', metalness = 0, roughness = 50) |> appearance(color = '#D0FF01', metalness = 0, roughness = 50)

2
public/kcl-samples/washer/main.kcl
View File

@ -14,6 +14,6 @@ thicknessMin = 0.024
// Define the sketch of the washer // Define the sketch of the washer
washerSketch = startSketchOn(XY) washerSketch = startSketchOn(XY)
|> circle(center = [0, 0], radius = outerDiameter / 2) |> circle(center = [0, 0], radius = outerDiameter / 2)
|> hole(circle(center = [0, 0], radius = innerDiameter / 2), %) |> subtract2d(tool = circle(center = [0, 0], radius = innerDiameter / 2))
washer = extrude(washerSketch, length = thicknessNom) washer = extrude(washerSketch, length = thicknessNom)

2
rust/kcl-lib/e2e/executor/inputs/fillet-and-shell.kcl
View File

@ -60,7 +60,7 @@ fn m25Screw = (x, y, height) => {
screw = startSketchOn(XY) screw = startSketchOn(XY)
|> startProfile(at = [0, 0]) |> startProfile(at = [0, 0])
|> circle(center= [x, y], radius=2.5) |> circle(center= [x, y], radius=2.5)
|> hole(circle(center= [x, y], radius = 1.25), %) |> subtract2d(tool = circle(center= [x, y], radius = 1.25))
|> extrude(length = height) |> extrude(length = height)
return screw return screw
} }

8
rust/kcl-lib/e2e/executor/inputs/focusrite_scarlett_mounting_braket.kcl
View File

@ -76,13 +76,13 @@ const tabsR = startSketchOn(tabPlane)
|> line(end = [0, -tabLength / 3 * 2], tag = $edge12) |> line(end = [0, -tabLength / 3 * 2], tag = $edge12)
|> line(end = [-tabWidth, -tabLength / 3], tag = $edge13) |> line(end = [-tabWidth, -tabLength / 3], tag = $edge13)
|> close(tag = $edge14) |> close(tag = $edge14)
|> hole(circle( |> subtract2d(tool = circle(
center = [ center = [
width / 2 + thk + tabWidth / 2, width / 2 + thk + tabWidth / 2,
length / 2 + thk - (tabLength / (3 / 2)) length / 2 + thk - (tabLength / (3 / 2))
], ],
radius = holeDiam / 2 radius = holeDiam / 2
), %) ))
|> extrude(length = -tabThk) |> extrude(length = -tabThk)
|> fillet( |> fillet(
radius = holeDiam / 2, radius = holeDiam / 2,
@ -104,13 +104,13 @@ const tabsL = startSketchOn(tabPlane)
|> line(end = [0, -tabLength / 3 * 2], tag = $edge22) |> line(end = [0, -tabLength / 3 * 2], tag = $edge22)
|> line(end = [tabWidth, -tabLength / 3], tag = $edge23) |> line(end = [tabWidth, -tabLength / 3], tag = $edge23)
|> close(tag = $edge24) |> close(tag = $edge24)
|> hole(circle( |> subtract2d(tool = circle(
center= [ center= [
-width / 2 - thk - (tabWidth / 2), -width / 2 - thk - (tabWidth / 2),
length / 2 + thk - (tabLength / (3 / 2)) length / 2 + thk - (tabLength / (3 / 2))
], ],
radius= holeDiam / 2 radius= holeDiam / 2
), %) ))
|> extrude(length = -tabThk) |> extrude(length = -tabThk)
|> fillet( |> fillet(
radius = holeDiam / 2, radius = holeDiam / 2,

8
rust/kcl-lib/e2e/executor/inputs/global-tags.kcl
View File

@ -76,13 +76,13 @@ const tabsR = startSketchOn(tabPlane)
|> line(end = [0, -tabLength / 3 * 2], tag = $edge12) |> line(end = [0, -tabLength / 3 * 2], tag = $edge12)
|> line(end = [-tabWidth, -tabLength / 3], tag = $edge13) |> line(end = [-tabWidth, -tabLength / 3], tag = $edge13)
|> close(tag = $edge14) |> close(tag = $edge14)
|> hole(circle( |> subtract2d(tool = circle(
center= [ center= [
width / 2 + thk + tabWidth / 2, width / 2 + thk + tabWidth / 2,
length / 2 + thk - (tabLength / (3 / 2)) length / 2 + thk - (tabLength / (3 / 2))
], ],
radius= holeDiam / 2 radius= holeDiam / 2
), %) ))
|> extrude(length = -tabThk) |> extrude(length = -tabThk)
|> fillet( |> fillet(
radius = holeDiam / 2, radius = holeDiam / 2,
@ -104,13 +104,13 @@ const tabsL = startSketchOn(tabPlane)
|> line(end = [0, -tabLength / 3 * 2], tag = $edge22) |> line(end = [0, -tabLength / 3 * 2], tag = $edge22)
|> line(end = [tabWidth, -tabLength / 3], tag = $edge23) |> line(end = [tabWidth, -tabLength / 3], tag = $edge23)
|> close(tag = $edge24) |> close(tag = $edge24)
|> hole(circle( |> subtract2d(tool = circle(
center= [ center= [
-width / 2 - thk - (tabWidth / 2), -width / 2 - thk - (tabWidth / 2),
length / 2 + thk - (tabLength / (3 / 2)) length / 2 + thk - (tabLength / (3 / 2))
], ],
radius= holeDiam / 2 radius= holeDiam / 2
), %) ))
|> extrude(length = -tabThk) |> extrude(length = -tabThk)
|> fillet( |> fillet(
radius = holeDiam / 2, radius = holeDiam / 2,

2
rust/kcl-lib/e2e/executor/inputs/i_shape.kcl
View File

@ -48,6 +48,6 @@ let inner = startSketchOn(XY)
|> close() |> close()
let final = brace_base let final = brace_base
|> hole(inner, %) |> subtract2d(tool = inner)
|> extrude(length = 3.0) |> extrude(length = 3.0)

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

@ -28,19 +28,19 @@ fn caster = (originStart) => {
|> xLine(length = -3.543) |> xLine(length = -3.543)
|> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
|> close() |> close()
|> hole(circle(center = [ |> subtract2d(tool = circle(center = [
(3.543 - 2.756) / 2, (3.543 - 2.756) / 2,
(3.543 - 2.756) / 2 (3.543 - 2.756) / 2
], radius = 8.8 / 2 / 25.4), %) ], radius = 8.8 / 2 / 25.4), %)
|> hole(circle(center = [ |> subtract2d(tool = circle(center = [
(3.543 - 2.756) / 2 + 2.756, (3.543 - 2.756) / 2 + 2.756,
(3.543 - 2.756) / 2 (3.543 - 2.756) / 2
], radius = 8.8 / 2 / 25.4 ), %) ], radius = 8.8 / 2 / 25.4 ), %)
|> hole(circle(center = [ |> subtract2d(tool = circle(center = [
(3.543 - 2.756) / 2, (3.543 - 2.756) / 2,
(3.543 - 2.756) / 2 + 2.756 (3.543 - 2.756) / 2 + 2.756
], radius = 8.8 / 2 / 25.4 ), %) ], radius = 8.8 / 2 / 25.4 ), %)
|> hole(circle(center = [ |> subtract2d(tool = circle(center = [
(3.543 - 2.756) / 2 + 2.756, (3.543 - 2.756) / 2 + 2.756,
(3.543 - 2.756) / 2 + 2.756 (3.543 - 2.756) / 2 + 2.756
], radius = 8.8 / 2 / 25.4 ), %) ], radius = 8.8 / 2 / 25.4 ), %)

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

@ -26,19 +26,19 @@ fn caster = (originStart) => {
|> xLine(length = -3.543) |> xLine(length = -3.543)
|> line(endAbsolute = [profileStartX(%), profileStartY(%)]) |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
|> close() |> close()
|> hole(circle(center = [ |> subtract2d(tool = circle(center = [
(3.543 - 2.756) / 2, (3.543 - 2.756) / 2,
(3.543 - 2.756) / 2 (3.543 - 2.756) / 2
], radius= 8.8 / 2 / 25.4), %) ], radius= 8.8 / 2 / 25.4), %)
|> hole(circle(center = [ |> subtract2d(tool = circle(center = [
(3.543 - 2.756) / 2 + 2.756, (3.543 - 2.756) / 2 + 2.756,
(3.543 - 2.756) / 2 (3.543 - 2.756) / 2
], radius= 8.8 / 2 / 25.4), %) ], radius= 8.8 / 2 / 25.4), %)
|> hole(circle(center = [ |> subtract2d(tool = circle(center = [
(3.543 - 2.756) / 2, (3.543 - 2.756) / 2,
(3.543 - 2.756) / 2 + 2.756 (3.543 - 2.756) / 2 + 2.756
], radius= 8.8 / 2 / 25.4), %) ], radius= 8.8 / 2 / 25.4), %)
|> hole(circle(center = [ |> subtract2d(tool = circle(center = [
(3.543 - 2.756) / 2 + 2.756, (3.543 - 2.756) / 2 + 2.756,
(3.543 - 2.756) / 2 + 2.756 (3.543 - 2.756) / 2 + 2.756
], radius= 8.8 / 2 / 25.4), %) ], radius= 8.8 / 2 / 25.4), %)

43
rust/kcl-lib/e2e/executor/main.rs
View File

@ -49,11 +49,9 @@ async fn kcl_test_execute_engine_error_return() {
"#; "#;
let result = execute_and_snapshot(code, None).await; let result = execute_and_snapshot(code, None).await;
assert!(result.is_err()); let expected_msg = "engine: Modeling command failed: [ApiError { error_code: BadRequest, message: \"The path is not closed. Solid2D construction requires a closed path!\" }]";
assert_eq!( let err = result.unwrap_err().as_kcl_error().unwrap().get_message();
result.err().unwrap().to_string(), assert_eq!(err, expected_msg);
r#"engine: KclErrorDetails { source_ranges: [SourceRange([226, 245, 0])], message: "Modeling command failed: [ApiError { error_code: BadRequest, message: \"The path is not closed. Solid2D construction requires a closed path!\" }]" }"#,
);
} }
#[tokio::test(flavor = "multi_thread")] #[tokio::test(flavor = "multi_thread")]
@ -275,8 +273,8 @@ async fn kcl_test_holes() {
|> line(end = [10, 0]) |> line(end = [10, 0])
|> line(end = [0, -10]) |> line(end = [0, -10])
|> close() |> close()
|> hole(circle(center = [2, 2], radius= .5), %) |> subtract2d(tool = circle(center = [2, 2], radius= .5))
|> hole(circle(center = [2, 8], radius= .5), %) |> subtract2d(tool = circle(center = [2, 8], radius= .5))
|> extrude(length = 2) |> extrude(length = 2)
"#; "#;
@ -328,10 +326,10 @@ holeRadius = 1
holeIndex = 6 holeIndex = 6
part = roundedRectangle([0, 0], 20, 20, 4) part = roundedRectangle([0, 0], 20, 20, 4)
|> hole(circle(center = [-holeIndex, holeIndex], radius= holeRadius), %) |> subtract2d(tool = circle(center = [-holeIndex, holeIndex], radius= holeRadius))
|> hole(circle(center = [holeIndex, holeIndex], radius= holeRadius), %) |> subtract2d(tool = circle(center = [holeIndex, holeIndex], radius= holeRadius))
|> hole(circle(center = [-holeIndex, -holeIndex], radius= holeRadius), %) |> subtract2d(tool = circle(center = [-holeIndex, -holeIndex], radius= holeRadius))
|> hole(circle(center = [holeIndex, -holeIndex], radius= holeRadius), %) |> subtract2d(tool = circle(center = [holeIndex, -holeIndex], radius= holeRadius))
|> extrude(length = 2) |> extrude(length = 2)
"#; "#;
@ -425,7 +423,7 @@ rectangle = startSketchOn(XY)
|> line(end = [50, 0]) |> line(end = [50, 0])
|> line(end = [0, -50]) |> line(end = [0, -50])
|> close() |> close()
|> hole(circles, %) |> subtract2d(tool = circles)
|> extrude(length = 10) |> extrude(length = 10)
"#; "#;
@ -780,8 +778,8 @@ async fn kcl_test_stdlib_kcl_error_right_code_path() {
|> line(end = [10, 0]) |> line(end = [10, 0])
|> line(end = [0, -10]) |> line(end = [0, -10])
|> close() |> close()
|> hole(circle(), %) |> subtract2d(tool = circle())
|> hole(circle(center = [2, 8], radius= .5), %) |> subtract2d(tool = circle(center = [2, 8], radius= .5))
|> extrude(length = 2) |> extrude(length = 2)
"#; "#;
@ -842,10 +840,10 @@ holeIndex = 6
// Create the mounting plate extrusion, holes, and fillets // Create the mounting plate extrusion, holes, and fillets
part = rectShape([0, 0], 20, 20) part = rectShape([0, 0], 20, 20)
|> hole(circle('XY', center = [-holeIndex, holeIndex], radius = holeRadius)) |> subtract2d(tool = circle('XY', center = [-holeIndex, holeIndex], radius = holeRadius))
|> hole(circle('XY', center = [holeIndex, holeIndex], radius = holeRadius)) |> subtract2d(tool = circle('XY', center = [holeIndex, holeIndex], radius = holeRadius))
|> hole(circle('XY', center = [-holeIndex, -holeIndex], radius = holeRadius)) |> subtract2d(tool = circle('XY', center = [-holeIndex, -holeIndex], radius = holeRadius))
|> hole(circle('XY', center = [holeIndex, -holeIndex], radius = holeRadius)) |> subtract2d(tool = circle('XY', center = [holeIndex, -holeIndex], radius = holeRadius))
|> extrude(length = 2) |> extrude(length = 2)
|> fillet( |> fillet(
radius = 4, radius = 4,
@ -1378,16 +1376,15 @@ fn squareHole = (l, w) => {
extrusion = startSketchOn(XY) extrusion = startSketchOn(XY)
|> circle(center = [0, 0], radius= dia/2 ) |> circle(center = [0, 0], radius= dia/2 )
|> hole(squareHole(length, width, height), %) |> subtract2d(tool = squareHole(length, width, height))
|> extrude(length = height) |> extrude(length = height)
"#; "#;
let result = execute_and_snapshot(code, None).await; let result = execute_and_snapshot(code, None).await;
assert!(result.is_err()); assert!(result.is_err());
assert_eq!( let expected_msg = "semantic: Expected 2 arguments, got 3";
result.err().unwrap().to_string(), let err = result.unwrap_err().as_kcl_error().unwrap().get_message();
r#"semantic: KclErrorDetails { source_ranges: [SourceRange([68, 358, 0]), SourceRange([445, 478, 0])], message: "Expected 2 arguments, got 3" }"# assert_eq!(err, expected_msg);
);
} }
#[tokio::test(flavor = "multi_thread")] #[tokio::test(flavor = "multi_thread")]

10
rust/kcl-lib/src/docs/mod.rs
View File

@ -512,8 +512,8 @@ pub trait StdLibFn: std::fmt::Debug + Send + Sync {
return Ok("subtract([${0:extrude001}], tools = [${1:extrude002}])".to_string()); return Ok("subtract([${0:extrude001}], tools = [${1:extrude002}])".to_string());
} else if self.name() == "intersect" { } else if self.name() == "intersect" {
return Ok("intersect([${0:extrude001}, ${1:extrude002}])".to_string()); return Ok("intersect([${0:extrude001}, ${1:extrude002}])".to_string());
} else if self.name() == "hole" { } else if self.name() == "subtract2D" {
return Ok("hole(${0:holeSketch}, ${1:%})".to_string()); return Ok("subtract2d(${0:%}, tool = ${1:%})".to_string());
} }
let in_keyword_fn = self.keyword_arguments(); let in_keyword_fn = self.keyword_arguments();
let mut args = Vec::new(); let mut args = Vec::new();
@ -1015,9 +1015,9 @@ mod tests {
#[test] #[test]
fn get_autocomplete_snippet_hole() { fn get_autocomplete_snippet_hole() {
let hole_fn: Box<dyn StdLibFn> = Box::new(crate::std::sketch::Hole); let f: Box<dyn StdLibFn> = Box::new(crate::std::sketch::Subtract2D);
let snippet = hole_fn.to_autocomplete_snippet().unwrap(); let snippet = f.to_autocomplete_snippet().unwrap();
assert_eq!(snippet, r#"hole(${0:holeSketch}, ${1:%})"#); assert_eq!(snippet, r#"subtract2d(${0:%}, tool = ${1:%})"#);
} }
#[test] #[test]

2
rust/kcl-lib/src/std/appearance.rs
View File

@ -262,7 +262,7 @@ pub async fn appearance(exec_state: &mut ExecState, args: Args) -> Result<KclVal
/// center = [0, 0], /// center = [0, 0],
/// radius = 2, /// radius = 2,
/// ) /// )
/// |> hole(pipeHole, %) /// |> subtract2d(tool = pipeHole)
/// |> sweep(path = sweepPath) /// |> sweep(path = sweepPath)
/// |> appearance( /// |> appearance(
/// color = "#ff0000", /// color = "#ff0000",

44
rust/kcl-lib/src/std/args.rs
View File

@ -615,50 +615,6 @@ impl Args {
Ok(numbers) Ok(numbers)
} }
pub(crate) fn get_sketches(&self, exec_state: &mut ExecState) -> Result<(Vec<Sketch>, Sketch), KclError> {
let Some(arg0) = self.args.first() else {
return Err(KclError::Semantic(KclErrorDetails {
message: "Expected a sketch argument".to_owned(),
source_ranges: vec![self.source_range],
}));
};
let sarg = arg0.value.coerce(&RuntimeType::sketches(), exec_state).map_err(|_| {
KclError::Type(KclErrorDetails {
message: format!(
"Expected an array of sketches, found {}",
arg0.value.human_friendly_type()
),
source_ranges: vec![self.source_range],
})
})?;
let sketches = match sarg {
KclValue::HomArray { value, .. } => value.iter().map(|v| v.as_sketch().unwrap().clone()).collect(),
_ => unreachable!(),
};
let Some(arg1) = self.args.get(1) else {
return Err(KclError::Semantic(KclErrorDetails {
message: "Expected a second sketch argument".to_owned(),
source_ranges: vec![self.source_range],
}));
};
let sarg = arg1
.value
.coerce(&RuntimeType::Primitive(PrimitiveType::Sketch), exec_state)
.map_err(|_| {
KclError::Type(KclErrorDetails {
message: format!("Expected a sketch, found {}", arg1.value.human_friendly_type()),
source_ranges: vec![self.source_range],
})
})?;
let sketch = match sarg {
KclValue::Sketch { value } => *value,
_ => unreachable!(),
};
Ok((sketches, sketch))
}
pub(crate) async fn get_adjacent_face_to_tag( pub(crate) async fn get_adjacent_face_to_tag(
&self, &self,
exec_state: &mut ExecState, exec_state: &mut ExecState,

2
rust/kcl-lib/src/std/mod.rs
View File

@ -89,7 +89,7 @@ lazy_static! {
Box::new(crate::std::sketch::Arc), Box::new(crate::std::sketch::Arc),
Box::new(crate::std::sketch::TangentialArc), Box::new(crate::std::sketch::TangentialArc),
Box::new(crate::std::sketch::BezierCurve), Box::new(crate::std::sketch::BezierCurve),
Box::new(crate::std::sketch::Hole), Box::new(crate::std::sketch::Subtract2D),
Box::new(crate::std::clone::Clone), Box::new(crate::std::clone::Clone),
Box::new(crate::std::patterns::PatternLinear2D), Box::new(crate::std::patterns::PatternLinear2D),
Box::new(crate::std::patterns::PatternLinear3D), Box::new(crate::std::patterns::PatternLinear3D),

37
rust/kcl-lib/src/std/sketch.rs
View File

@ -13,6 +13,7 @@ use schemars::JsonSchema;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use super::utils::{point_to_len_unit, point_to_mm, untype_point, untyped_point_to_mm}; use super::utils::{point_to_len_unit, point_to_mm, untype_point, untyped_point_to_mm};
use crate::execution::types::ArrayLen;
use crate::{ use crate::{
errors::{KclError, KclErrorDetails}, errors::{KclError, KclErrorDetails},
execution::{ execution::{
@ -2253,10 +2254,20 @@ async fn inner_bezier_curve(
} }
/// Use a sketch to cut a hole in another sketch. /// Use a sketch to cut a hole in another sketch.
pub async fn hole(exec_state: &mut ExecState, args: Args) -> Result<KclValue, KclError> { pub async fn subtract_2d(exec_state: &mut ExecState, args: Args) -> Result<KclValue, KclError> {
let (hole_sketch, sketch): (Vec<Sketch>, Sketch) = args.get_sketches(exec_state)?; let sketch =
args.get_unlabeled_kw_arg_typed("sketch", &RuntimeType::Primitive(PrimitiveType::Sketch), exec_state)?;
let new_sketch = inner_hole(hole_sketch, sketch, exec_state, args).await?; let tool: Vec<Sketch> = args.get_kw_arg_typed(
"tool",
&RuntimeType::Array(
Box::new(RuntimeType::Primitive(PrimitiveType::Sketch)),
ArrayLen::NonEmpty,
),
exec_state,
)?;
let new_sketch = inner_subtract_2d(sketch, tool, exec_state, args).await?;
Ok(KclValue::Sketch { Ok(KclValue::Sketch {
value: Box::new(new_sketch), value: Box::new(new_sketch),
}) })
@ -2271,8 +2282,8 @@ pub async fn hole(exec_state: &mut ExecState, args: Args) -> Result<KclValue, Kc
/// |> line(end = [5, 0]) /// |> line(end = [5, 0])
/// |> line(end = [0, -5]) /// |> line(end = [0, -5])
/// |> close() /// |> close()
/// |> hole(circle( center = [1, 1], radius = .25 ), %) /// |> subtract2d(tool =circle( center = [1, 1], radius = .25 ))
/// |> hole(circle( center = [1, 4], radius = .25 ), %) /// |> subtract2d(tool =circle( center = [1, 4], radius = .25 ))
/// ///
/// example = extrude(exampleSketch, length = 1) /// example = extrude(exampleSketch, length = 1)
/// ``` /// ```
@ -2290,20 +2301,26 @@ pub async fn hole(exec_state: &mut ExecState, args: Args) -> Result<KclValue, Kc
/// ///
/// exampleSketch = startSketchOn(-XZ) /// exampleSketch = startSketchOn(-XZ)
/// |> circle( center = [0, 0], radius = 3 ) /// |> circle( center = [0, 0], radius = 3 )
/// |> hole(squareHoleSketch(), %) /// |> subtract2d(tool = squareHoleSketch())
/// example = extrude(exampleSketch, length = 1) /// example = extrude(exampleSketch, length = 1)
/// ``` /// ```
#[stdlib { #[stdlib {
name = "hole", name = "subtract2d",
feature_tree_operation = true, feature_tree_operation = true,
keywords = true,
unlabeled_first = true,
args = {
sketch = { docs = "Which sketch should this path be added to?" },
tool = { docs = "The shape(s) which should be cut out of the sketch." },
}
}] }]
async fn inner_hole( async fn inner_subtract_2d(
hole_sketch: Vec<Sketch>,
sketch: Sketch, sketch: Sketch,
tool: Vec<Sketch>,
exec_state: &mut ExecState, exec_state: &mut ExecState,
args: Args, args: Args,
) -> Result<Sketch, KclError> { ) -> Result<Sketch, KclError> {
for hole_sketch in hole_sketch { for hole_sketch in tool {
args.batch_modeling_cmd( args.batch_modeling_cmd(
exec_state.next_uuid(), exec_state.next_uuid(),
ModelingCmd::from(mcmd::Solid2dAddHole { ModelingCmd::from(mcmd::Solid2dAddHole {

2
rust/kcl-lib/src/std/sweep.rs
View File

@ -82,7 +82,7 @@ pub async fn sweep(exec_state: &mut ExecState, args: Args) -> Result<KclValue, K
/// center = [0, 0], /// center = [0, 0],
/// radius = 2, /// radius = 2,
/// ) /// )
/// |> hole(pipeHole, %) /// |> subtract2d(tool = pipeHole)
/// |> sweep(path = sweepPath) /// |> sweep(path = sweepPath)
/// ``` /// ```
/// ///

12
rust/kcl-lib/src/std/transform.rs
View File

@ -95,7 +95,7 @@ pub async fn scale(exec_state: &mut ExecState, args: Args) -> Result<KclValue, K
/// center = [0, 0], /// center = [0, 0],
/// radius = 2, /// radius = 2,
/// ) /// )
/// |> hole(pipeHole, %) /// |> subtract2d(tool = pipeHole)
/// |> sweep(path = sweepPath) /// |> sweep(path = sweepPath)
/// |> scale( /// |> scale(
/// z = 2.5, /// z = 2.5,
@ -261,7 +261,7 @@ pub async fn translate(exec_state: &mut ExecState, args: Args) -> Result<KclValu
/// center = [0, 0], /// center = [0, 0],
/// radius = 2, /// radius = 2,
/// ) /// )
/// |> hole(pipeHole, %) /// |> subtract2d(tool = pipeHole)
/// |> sweep(path = sweepPath) /// |> sweep(path = sweepPath)
/// |> translate( /// |> translate(
/// x = 1.0, /// x = 1.0,
@ -600,7 +600,7 @@ pub async fn rotate(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
/// center = [0, 0], /// center = [0, 0],
/// radius = 2, /// radius = 2,
/// ) /// )
/// |> hole(pipeHole, %) /// |> subtract2d(tool = pipeHole)
/// |> sweep(path = sweepPath) /// |> sweep(path = sweepPath)
/// |> rotate( /// |> rotate(
/// roll = 10, /// roll = 10,
@ -633,7 +633,7 @@ pub async fn rotate(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
/// center = [0, 0], /// center = [0, 0],
/// radius = 2, /// radius = 2,
/// ) /// )
/// |> hole(pipeHole, %) /// |> subtract2d(tool = pipeHole)
/// |> sweep(path = sweepPath) /// |> sweep(path = sweepPath)
/// |> rotate( /// |> rotate(
/// roll = 10, /// roll = 10,
@ -664,7 +664,7 @@ pub async fn rotate(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
/// center = [0, 0], /// center = [0, 0],
/// radius = 2, /// radius = 2,
/// ) /// )
/// |> hole(pipeHole, %) /// |> subtract2d(tool = pipeHole)
/// |> sweep(path = sweepPath) /// |> sweep(path = sweepPath)
/// |> rotate( /// |> rotate(
/// axis = [0, 0, 1.0], /// axis = [0, 0, 1.0],
@ -850,7 +850,7 @@ sweepSketch = startSketchOn('XY')
center = [0, 0], center = [0, 0],
radius = 2, radius = 2,
) )
|> hole(pipeHole, %) |> subtract2d(tool = pipeHole)
|> sweep( |> sweep(
path = sweepPath, path = sweepPath,
)"#; )"#;

2
rust/kcl-lib/std/sketch.kcl
View File

@ -18,7 +18,7 @@
/// |> line(end = [0, 30]) /// |> line(end = [0, 30])
/// |> line(end = [-30, 0]) /// |> line(end = [-30, 0])
/// |> close() /// |> close()
/// |> hole(circle(center = [0, 15], radius = 5), %) /// |> subtract2d(tool = circle(center = [0, 15], radius = 5))
/// ///
/// example = extrude(exampleSketch, length = 5) /// example = extrude(exampleSketch, length = 5)
/// ``` /// ```

24
rust/kcl-lib/tests/fillet-and-shell/artifact_graph_flowchart.snap.md
View File

@ -25,8 +25,8 @@ flowchart LR
30[Solid2d] 30[Solid2d]
end end
subgraph path31 [Path] subgraph path31 [Path]
31["Path<br>[1426, 1464, 0]"] 31["Path<br>[1439, 1477, 0]"]
32["Segment<br>[1426, 1464, 0]"] 32["Segment<br>[1439, 1477, 0]"]
33[Solid2d] 33[Solid2d]
end end
subgraph path39 [Path] subgraph path39 [Path]
@ -38,8 +38,8 @@ flowchart LR
42[Solid2d] 42[Solid2d]
end end
subgraph path43 [Path] subgraph path43 [Path]
43["Path<br>[1426, 1464, 0]"] 43["Path<br>[1439, 1477, 0]"]
44["Segment<br>[1426, 1464, 0]"] 44["Segment<br>[1439, 1477, 0]"]
45[Solid2d] 45[Solid2d]
end end
subgraph path51 [Path] subgraph path51 [Path]
@ -51,8 +51,8 @@ flowchart LR
54[Solid2d] 54[Solid2d]
end end
subgraph path55 [Path] subgraph path55 [Path]
55["Path<br>[1426, 1464, 0]"] 55["Path<br>[1439, 1477, 0]"]
56["Segment<br>[1426, 1464, 0]"] 56["Segment<br>[1439, 1477, 0]"]
57[Solid2d] 57[Solid2d]
end end
subgraph path63 [Path] subgraph path63 [Path]
@ -64,8 +64,8 @@ flowchart LR
66[Solid2d] 66[Solid2d]
end end
subgraph path67 [Path] subgraph path67 [Path]
67["Path<br>[1426, 1464, 0]"] 67["Path<br>[1439, 1477, 0]"]
68["Segment<br>[1426, 1464, 0]"] 68["Segment<br>[1439, 1477, 0]"]
69[Solid2d] 69[Solid2d]
end end
1["Plane<br>[373, 390, 0]"] 1["Plane<br>[373, 390, 0]"]
@ -82,22 +82,22 @@ flowchart LR
24["SweepEdge Opposite"] 24["SweepEdge Opposite"]
25["SweepEdge Adjacent"] 25["SweepEdge Adjacent"]
26["Plane<br>[1316, 1335, 0]"] 26["Plane<br>[1316, 1335, 0]"]
34["Sweep Extrusion<br>[1476, 1500, 0]"] 34["Sweep Extrusion<br>[1486, 1510, 0]"]
35[Wall] 35[Wall]
36["Cap Start"] 36["Cap Start"]
37["Cap End"] 37["Cap End"]
38["Plane<br>[1316, 1335, 0]"] 38["Plane<br>[1316, 1335, 0]"]
46["Sweep Extrusion<br>[1476, 1500, 0]"] 46["Sweep Extrusion<br>[1486, 1510, 0]"]
47[Wall] 47[Wall]
48["Cap Start"] 48["Cap Start"]
49["Cap End"] 49["Cap End"]
50["Plane<br>[1316, 1335, 0]"] 50["Plane<br>[1316, 1335, 0]"]
58["Sweep Extrusion<br>[1476, 1500, 0]"] 58["Sweep Extrusion<br>[1486, 1510, 0]"]
59[Wall] 59[Wall]
60["Cap Start"] 60["Cap Start"]
61["Cap End"] 61["Cap End"]
62["Plane<br>[1316, 1335, 0]"] 62["Plane<br>[1316, 1335, 0]"]
70["Sweep Extrusion<br>[1476, 1500, 0]"] 70["Sweep Extrusion<br>[1486, 1510, 0]"]
71[Wall] 71[Wall]
72["Cap Start"] 72["Cap Start"]
73["Cap End"] 73["Cap End"]

24
rust/kcl-lib/tests/fillet-and-shell/ast.snap
View File

@ -2266,6 +2266,15 @@ description: Result of parsing fillet-and-shell.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -2362,13 +2371,7 @@ description: Result of parsing fillet-and-shell.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -2378,7 +2381,7 @@ description: Result of parsing fillet-and-shell.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -2389,8 +2392,9 @@ description: Result of parsing fillet-and-shell.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [

2
rust/kcl-lib/tests/fillet-and-shell/input.kcl
View File

@ -59,7 +59,7 @@ fn m25Screw(x, y, height) {
screw = startSketchOn("XY") screw = startSketchOn("XY")
|> startProfile(at = [0, 0]) |> startProfile(at = [0, 0])
|> circle(center = [x, y], radius = 2.5) |> circle(center = [x, y], radius = 2.5)
|> hole(circle(center = [x, y], radius = 1.25), %) |> subtract2d(tool = circle(center = [x, y], radius = 1.25))
|> extrude(length = height) |> extrude(length = height)
return screw return screw
} }

100
rust/kcl-lib/tests/fillet-and-shell/ops.snap
View File

@ -128,7 +128,7 @@ description: Operations executed fillet-and-shell.kcl
"name": "m25Screw", "name": "m25Screw",
"functionSourceRange": [ "functionSourceRange": [
1289, 1289,
1517, 1527,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -153,16 +153,7 @@ description: Operations executed fillet-and-shell.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -172,10 +163,18 @@ description: Operations executed fillet-and-shell.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -219,7 +218,7 @@ description: Operations executed fillet-and-shell.kcl
"name": "m25Screw", "name": "m25Screw",
"functionSourceRange": [ "functionSourceRange": [
1289, 1289,
1517, 1527,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -244,16 +243,7 @@ description: Operations executed fillet-and-shell.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -263,10 +253,18 @@ description: Operations executed fillet-and-shell.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -310,7 +308,7 @@ description: Operations executed fillet-and-shell.kcl
"name": "m25Screw", "name": "m25Screw",
"functionSourceRange": [ "functionSourceRange": [
1289, 1289,
1517, 1527,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -335,16 +333,7 @@ description: Operations executed fillet-and-shell.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -354,10 +343,18 @@ description: Operations executed fillet-and-shell.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -401,7 +398,7 @@ description: Operations executed fillet-and-shell.kcl
"name": "m25Screw", "name": "m25Screw",
"functionSourceRange": [ "functionSourceRange": [
1289, 1289,
1517, 1527,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -426,16 +423,7 @@ description: Operations executed fillet-and-shell.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -445,10 +433,18 @@ description: Operations executed fillet-and-shell.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {

2
rust/kcl-lib/tests/fillet-and-shell/unparsed.snap
View File

@ -66,7 +66,7 @@ fn m25Screw(x, y, height) {
screw = startSketchOn(XY) screw = startSketchOn(XY)
|> startProfile(at = [0, 0]) |> startProfile(at = [0, 0])
|> circle(center = [x, y], radius = 2.5) |> circle(center = [x, y], radius = 2.5)
|> hole(circle(center = [x, y], radius = 1.25), %) |> subtract2d(tool = circle(center = [x, y], radius = 1.25))
|> extrude(length = height) |> extrude(length = height)
return screw return screw
} }

2
rust/kcl-lib/tests/flush_batch_on_end/artifact_graph_flowchart.snap.md
View File

@ -11,7 +11,7 @@ flowchart LR
7[Solid2d] 7[Solid2d]
end end
1["Plane<br>[199, 218, 0]"] 1["Plane<br>[199, 218, 0]"]
8["Sweep Extrusion<br>[696, 733, 0]"] 8["Sweep Extrusion<br>[706, 743, 0]"]
9[Wall] 9[Wall]
10["Cap Start"] 10["Cap Start"]
11["Cap End"] 11["Cap End"]

24
rust/kcl-lib/tests/flush_batch_on_end/ast.snap
View File

@ -608,6 +608,15 @@ description: Result of parsing flush_batch_on_end.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -622,13 +631,7 @@ description: Result of parsing flush_batch_on_end.kcl
"start": 0, "start": 0,
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -638,7 +641,7 @@ description: Result of parsing flush_batch_on_end.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -649,8 +652,9 @@ description: Result of parsing flush_batch_on_end.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,

2
rust/kcl-lib/tests/flush_batch_on_end/input.kcl
View File

@ -28,7 +28,7 @@ innerProfile = circle(
// create a profile with holes sketch000Profile000Holes // create a profile with holes sketch000Profile000Holes
pipeProfile = outerProfile pipeProfile = outerProfile
|> hole(innerProfile, %) |> subtract2d(tool = innerProfile)
// extrude the pipe profile to create the pipe // extrude the pipe profile to create the pipe
pipe = extrude(pipeProfile, length = length) pipe = extrude(pipeProfile, length = length)

23
rust/kcl-lib/tests/flush_batch_on_end/ops.snap
View File

@ -20,16 +20,7 @@ description: Operations executed flush_batch_on_end.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -39,10 +30,18 @@ description: Operations executed flush_batch_on_end.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {

2
rust/kcl-lib/tests/flush_batch_on_end/unparsed.snap
View File

@ -32,7 +32,7 @@ innerProfile = circle(
// create a profile with holes sketch000Profile000Holes // create a profile with holes sketch000Profile000Holes
pipeProfile = outerProfile pipeProfile = outerProfile
|> hole(innerProfile, %) |> subtract2d(tool = innerProfile)
// extrude the pipe profile to create the pipe // extrude the pipe profile to create the pipe
pipe = extrude(pipeProfile, length = length) pipe = extrude(pipeProfile, length = length)

2
rust/kcl-lib/tests/i_shape/artifact_graph_flowchart.snap.md
View File

@ -44,7 +44,7 @@ flowchart LR
end end
1["Plane<br>[399, 416, 0]"] 1["Plane<br>[399, 416, 0]"]
29["Plane<br>[1908, 1925, 0]"] 29["Plane<br>[1908, 1925, 0]"]
41["Sweep Extrusion<br>[2398, 2419, 0]"] 41["Sweep Extrusion<br>[2408, 2429, 0]"]
42[Wall] 42[Wall]
43[Wall] 43[Wall]
44[Wall] 44[Wall]

24
rust/kcl-lib/tests/i_shape/ast.snap
View File

@ -3662,6 +3662,15 @@ description: Result of parsing i_shape.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -3676,13 +3685,7 @@ description: Result of parsing i_shape.kcl
"start": 0, "start": 0,
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -3692,7 +3695,7 @@ description: Result of parsing i_shape.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -3703,8 +3706,9 @@ description: Result of parsing i_shape.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [

2
rust/kcl-lib/tests/i_shape/input.kcl
View File

@ -48,5 +48,5 @@ inner = startSketchOn(XY)
|> close(%) |> close(%)
final = brace_base final = brace_base
|> hole(inner, %) |> subtract2d(tool = inner)
|> extrude(length = 3.0) |> extrude(length = 3.0)

23
rust/kcl-lib/tests/i_shape/ops.snap
View File

@ -35,16 +35,7 @@ description: Operations executed i_shape.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -54,10 +45,18 @@ description: Operations executed i_shape.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {

2
rust/kcl-lib/tests/i_shape/unparsed.snap
View File

@ -52,5 +52,5 @@ inner = startSketchOn(XY)
|> close(%) |> close(%)
final = brace_base final = brace_base
|> hole(inner, %) |> subtract2d(tool = inner)
|> extrude(length = 3.0) |> extrude(length = 3.0)

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

@ -70,12 +70,12 @@ flowchart LR
68[Solid2d] 68[Solid2d]
end end
subgraph path69 [Path] subgraph path69 [Path]
69["Path<br>[4868, 5046, 0]"] 69["Path<br>[4881, 5059, 0]"]
70["Segment<br>[4868, 5046, 0]"] 70["Segment<br>[4881, 5059, 0]"]
71[Solid2d] 71[Solid2d]
end end
1["Plane<br>[323, 341, 0]"] 1["Plane<br>[323, 341, 0]"]
72["Sweep Extrusion<br>[5058, 5086, 0]"] 72["Sweep Extrusion<br>[5068, 5096, 0]"]
73[Wall] 73[Wall]
74[Wall] 74[Wall]
75[Wall] 75[Wall]
@ -206,38 +206,38 @@ flowchart LR
200["SweepEdge Opposite"] 200["SweepEdge Opposite"]
201["SweepEdge Opposite"] 201["SweepEdge Opposite"]
202["SweepEdge Adjacent"] 202["SweepEdge Adjacent"]
203["EdgeCut Fillet<br>[5094, 5799, 0]"] 203["EdgeCut Fillet<br>[5104, 5809, 0]"]
204["EdgeCut Fillet<br>[5094, 5799, 0]"] 204["EdgeCut Fillet<br>[5104, 5809, 0]"]
205["EdgeCut Fillet<br>[5094, 5799, 0]"] 205["EdgeCut Fillet<br>[5104, 5809, 0]"]
206["EdgeCut Fillet<br>[5094, 5799, 0]"] 206["EdgeCut Fillet<br>[5104, 5809, 0]"]
207["EdgeCut Fillet<br>[5094, 5799, 0]"] 207["EdgeCut Fillet<br>[5104, 5809, 0]"]
208["EdgeCut Fillet<br>[5094, 5799, 0]"] 208["EdgeCut Fillet<br>[5104, 5809, 0]"]
209["EdgeCut Fillet<br>[5094, 5799, 0]"] 209["EdgeCut Fillet<br>[5104, 5809, 0]"]
210["EdgeCut Fillet<br>[5094, 5799, 0]"] 210["EdgeCut Fillet<br>[5104, 5809, 0]"]
211["EdgeCut Fillet<br>[5094, 5799, 0]"] 211["EdgeCut Fillet<br>[5104, 5809, 0]"]
212["EdgeCut Fillet<br>[5094, 5799, 0]"] 212["EdgeCut Fillet<br>[5104, 5809, 0]"]
213["EdgeCut Fillet<br>[5094, 5799, 0]"] 213["EdgeCut Fillet<br>[5104, 5809, 0]"]
214["EdgeCut Fillet<br>[5094, 5799, 0]"] 214["EdgeCut Fillet<br>[5104, 5809, 0]"]
215["EdgeCut Fillet<br>[5094, 5799, 0]"] 215["EdgeCut Fillet<br>[5104, 5809, 0]"]
216["EdgeCut Fillet<br>[5094, 5799, 0]"] 216["EdgeCut Fillet<br>[5104, 5809, 0]"]
217["EdgeCut Fillet<br>[5094, 5799, 0]"] 217["EdgeCut Fillet<br>[5104, 5809, 0]"]
218["EdgeCut Fillet<br>[5094, 5799, 0]"] 218["EdgeCut Fillet<br>[5104, 5809, 0]"]
219["EdgeCut Fillet<br>[5807, 6511, 0]"] 219["EdgeCut Fillet<br>[5817, 6521, 0]"]
220["EdgeCut Fillet<br>[5807, 6511, 0]"] 220["EdgeCut Fillet<br>[5817, 6521, 0]"]
221["EdgeCut Fillet<br>[5807, 6511, 0]"] 221["EdgeCut Fillet<br>[5817, 6521, 0]"]
222["EdgeCut Fillet<br>[5807, 6511, 0]"] 222["EdgeCut Fillet<br>[5817, 6521, 0]"]
223["EdgeCut Fillet<br>[5807, 6511, 0]"] 223["EdgeCut Fillet<br>[5817, 6521, 0]"]
224["EdgeCut Fillet<br>[5807, 6511, 0]"] 224["EdgeCut Fillet<br>[5817, 6521, 0]"]
225["EdgeCut Fillet<br>[5807, 6511, 0]"] 225["EdgeCut Fillet<br>[5817, 6521, 0]"]
226["EdgeCut Fillet<br>[5807, 6511, 0]"] 226["EdgeCut Fillet<br>[5817, 6521, 0]"]
227["EdgeCut Fillet<br>[5807, 6511, 0]"] 227["EdgeCut Fillet<br>[5817, 6521, 0]"]
228["EdgeCut Fillet<br>[5807, 6511, 0]"] 228["EdgeCut Fillet<br>[5817, 6521, 0]"]
229["EdgeCut Fillet<br>[5807, 6511, 0]"] 229["EdgeCut Fillet<br>[5817, 6521, 0]"]
230["EdgeCut Fillet<br>[5807, 6511, 0]"] 230["EdgeCut Fillet<br>[5817, 6521, 0]"]
231["EdgeCut Fillet<br>[5807, 6511, 0]"] 231["EdgeCut Fillet<br>[5817, 6521, 0]"]
232["EdgeCut Fillet<br>[5807, 6511, 0]"] 232["EdgeCut Fillet<br>[5817, 6521, 0]"]
233["EdgeCut Fillet<br>[5807, 6511, 0]"] 233["EdgeCut Fillet<br>[5817, 6521, 0]"]
234["EdgeCut Fillet<br>[5807, 6511, 0]"] 234["EdgeCut Fillet<br>[5817, 6521, 0]"]
1 --- 2 1 --- 2
1 --- 69 1 --- 69
2 --- 3 2 --- 3

24
rust/kcl-lib/tests/kcl_samples/80-20-rail/ast.snap
View File

@ -7500,6 +7500,15 @@ description: Result of parsing 80-20-rail.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -7752,13 +7761,7 @@ description: Result of parsing 80-20-rail.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -7768,7 +7771,7 @@ description: Result of parsing 80-20-rail.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -7779,8 +7782,9 @@ description: Result of parsing 80-20-rail.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [

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

@ -10,7 +10,7 @@ description: Operations executed 80-20-rail.kcl
"name": "rail8020", "name": "rail8020",
"functionSourceRange": [ "functionSourceRange": [
239, 239,
6532, 6542,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -35,16 +35,7 @@ description: Operations executed 80-20-rail.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -54,10 +45,18 @@ description: Operations executed 80-20-rail.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {

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

@ -10,101 +10,101 @@ flowchart LR
8[Solid2d] 8[Solid2d]
end end
subgraph path9 [Path] subgraph path9 [Path]
9["Path<br>[788, 823, 6]"] 9["Path<br>[801, 836, 6]"]
10["Segment<br>[788, 823, 6]"] 10["Segment<br>[801, 836, 6]"]
11[Solid2d] 11[Solid2d]
end end
subgraph path12 [Path] subgraph path12 [Path]
12["Path<br>[838, 985, 6]"] 12["Path<br>[861, 1008, 6]"]
13["Segment<br>[838, 985, 6]"] 13["Segment<br>[861, 1008, 6]"]
14[Solid2d] 14[Solid2d]
end end
subgraph path15 [Path] subgraph path15 [Path]
15["Path<br>[1000, 1148, 6]"] 15["Path<br>[1033, 1181, 6]"]
16["Segment<br>[1000, 1148, 6]"] 16["Segment<br>[1033, 1181, 6]"]
17[Solid2d] 17[Solid2d]
end end
subgraph path18 [Path] subgraph path18 [Path]
18["Path<br>[1163, 1311, 6]"] 18["Path<br>[1206, 1354, 6]"]
19["Segment<br>[1163, 1311, 6]"] 19["Segment<br>[1206, 1354, 6]"]
20[Solid2d] 20[Solid2d]
end end
subgraph path21 [Path] subgraph path21 [Path]
21["Path<br>[1326, 1475, 6]"] 21["Path<br>[1379, 1528, 6]"]
22["Segment<br>[1326, 1475, 6]"] 22["Segment<br>[1379, 1528, 6]"]
23[Solid2d] 23[Solid2d]
end end
subgraph path34 [Path] subgraph path34 [Path]
34["Path<br>[1646, 1702, 6]"] 34["Path<br>[1696, 1752, 6]"]
35["Segment<br>[1708, 1773, 6]"] 35["Segment<br>[1758, 1823, 6]"]
36["Segment<br>[1779, 1831, 6]"] 36["Segment<br>[1829, 1881, 6]"]
37["Segment<br>[1837, 1888, 6]"] 37["Segment<br>[1887, 1938, 6]"]
38["Segment<br>[1894, 1946, 6]"] 38["Segment<br>[1944, 1996, 6]"]
39["Segment<br>[1952, 2018, 6]"] 39["Segment<br>[2002, 2068, 6]"]
40["Segment<br>[2024, 2076, 6]"] 40["Segment<br>[2074, 2126, 6]"]
41["Segment<br>[2082, 2114, 6]"] 41["Segment<br>[2132, 2164, 6]"]
42["Segment<br>[2120, 2185, 6]"] 42["Segment<br>[2170, 2235, 6]"]
43["Segment<br>[2191, 2198, 6]"] 43["Segment<br>[2241, 2248, 6]"]
44[Solid2d] 44[Solid2d]
end end
subgraph path64 [Path] subgraph path64 [Path]
64["Path<br>[2547, 2660, 6]"] 64["Path<br>[2597, 2710, 6]"]
65["Segment<br>[2666, 2721, 6]"] 65["Segment<br>[2716, 2771, 6]"]
66["Segment<br>[2727, 2762, 6]"] 66["Segment<br>[2777, 2812, 6]"]
67["Segment<br>[2768, 2823, 6]"] 67["Segment<br>[2818, 2873, 6]"]
68["Segment<br>[2829, 2865, 6]"] 68["Segment<br>[2879, 2915, 6]"]
69["Segment<br>[2871, 2926, 6]"] 69["Segment<br>[2921, 2976, 6]"]
70["Segment<br>[2932, 2968, 6]"] 70["Segment<br>[2982, 3018, 6]"]
71["Segment<br>[2974, 3029, 6]"] 71["Segment<br>[3024, 3079, 6]"]
72["Segment<br>[3035, 3091, 6]"] 72["Segment<br>[3085, 3141, 6]"]
end end
subgraph path90 [Path] subgraph path90 [Path]
90["Path<br>[3240, 3291, 6]"] 90["Path<br>[3290, 3341, 6]"]
91["Segment<br>[3240, 3291, 6]"] 91["Segment<br>[3290, 3341, 6]"]
92[Solid2d] 92[Solid2d]
end end
subgraph path95 [Path] subgraph path95 [Path]
95["Path<br>[3470, 3532, 6]"] 95["Path<br>[3520, 3582, 6]"]
96["Segment<br>[3538, 3606, 6]"] 96["Segment<br>[3588, 3656, 6]"]
97["Segment<br>[3612, 3712, 6]"] 97["Segment<br>[3662, 3762, 6]"]
98["Segment<br>[3718, 3835, 6]"] 98["Segment<br>[3768, 3885, 6]"]
99["Segment<br>[3841, 3926, 6]"] 99["Segment<br>[3891, 3976, 6]"]
100["Segment<br>[3932, 3939, 6]"] 100["Segment<br>[3982, 3989, 6]"]
101[Solid2d] 101[Solid2d]
end end
subgraph path102 [Path] subgraph path102 [Path]
102["Path<br>[3950, 4001, 6]"] 102["Path<br>[4013, 4064, 6]"]
103["Segment<br>[3950, 4001, 6]"] 103["Segment<br>[4013, 4064, 6]"]
104[Solid2d] 104[Solid2d]
end end
subgraph path105 [Path] subgraph path105 [Path]
105["Path<br>[4016, 4163, 6]"] 105["Path<br>[4089, 4236, 6]"]
106["Segment<br>[4016, 4163, 6]"] 106["Segment<br>[4089, 4236, 6]"]
107[Solid2d] 107[Solid2d]
end end
subgraph path108 [Path] subgraph path108 [Path]
108["Path<br>[4178, 4326, 6]"] 108["Path<br>[4261, 4409, 6]"]
109["Segment<br>[4178, 4326, 6]"] 109["Segment<br>[4261, 4409, 6]"]
110[Solid2d] 110[Solid2d]
end end
subgraph path111 [Path] subgraph path111 [Path]
111["Path<br>[4341, 4489, 6]"] 111["Path<br>[4434, 4582, 6]"]
112["Segment<br>[4341, 4489, 6]"] 112["Segment<br>[4434, 4582, 6]"]
113[Solid2d] 113[Solid2d]
end end
subgraph path114 [Path] subgraph path114 [Path]
114["Path<br>[4504, 4653, 6]"] 114["Path<br>[4607, 4756, 6]"]
115["Segment<br>[4504, 4653, 6]"] 115["Segment<br>[4607, 4756, 6]"]
116[Solid2d] 116[Solid2d]
end end
subgraph path127 [Path] subgraph path127 [Path]
127["Path<br>[4798, 4836, 6]"] 127["Path<br>[4898, 4936, 6]"]
128["Segment<br>[4798, 4836, 6]"] 128["Segment<br>[4898, 4936, 6]"]
129[Solid2d] 129[Solid2d]
end end
subgraph path133 [Path] subgraph path133 [Path]
133["Path<br>[4909, 4945, 6]"] 133["Path<br>[5009, 5045, 6]"]
134["Segment<br>[4909, 4945, 6]"] 134["Segment<br>[5009, 5045, 6]"]
135[Solid2d] 135[Solid2d]
end end
subgraph path148 [Path] subgraph path148 [Path]
@ -159,7 +159,7 @@ flowchart LR
218[Solid2d] 218[Solid2d]
end end
1["Plane<br>[300, 317, 6]"] 1["Plane<br>[300, 317, 6]"]
24["Sweep Extrusion<br>[1485, 1504, 6]"] 24["Sweep Extrusion<br>[1535, 1554, 6]"]
25[Wall] 25[Wall]
26[Wall] 26[Wall]
27[Wall] 27[Wall]
@ -169,7 +169,7 @@ flowchart LR
31["SweepEdge Opposite"] 31["SweepEdge Opposite"]
32["SweepEdge Opposite"] 32["SweepEdge Opposite"]
33["SweepEdge Opposite"] 33["SweepEdge Opposite"]
45["Sweep Extrusion<br>[2338, 2358, 6]"] 45["Sweep Extrusion<br>[2388, 2408, 6]"]
46[Wall] 46[Wall]
47[Wall] 47[Wall]
48[Wall] 48[Wall]
@ -185,10 +185,10 @@ flowchart LR
58["SweepEdge Opposite"] 58["SweepEdge Opposite"]
59["SweepEdge Opposite"] 59["SweepEdge Opposite"]
60["SweepEdge Opposite"] 60["SweepEdge Opposite"]
61["Sweep Extrusion<br>[2338, 2358, 6]"] 61["Sweep Extrusion<br>[2388, 2408, 6]"]
62["Sweep Extrusion<br>[2338, 2358, 6]"] 62["Sweep Extrusion<br>[2388, 2408, 6]"]
63["Sweep Extrusion<br>[2338, 2358, 6]"] 63["Sweep Extrusion<br>[2388, 2408, 6]"]
73["Sweep Extrusion<br>[3097, 3132, 6]"] 73["Sweep Extrusion<br>[3147, 3182, 6]"]
74[Wall] 74[Wall]
75[Wall] 75[Wall]
76[Wall] 76[Wall]
@ -205,9 +205,9 @@ flowchart LR
87["SweepEdge Opposite"] 87["SweepEdge Opposite"]
88["SweepEdge Opposite"] 88["SweepEdge Opposite"]
89["SweepEdge Opposite"] 89["SweepEdge Opposite"]
93["Sweep Extrusion<br>[3297, 3335, 6]"] 93["Sweep Extrusion<br>[3347, 3385, 6]"]
94[Wall] 94[Wall]
117["Sweep Extrusion<br>[4663, 4682, 6]"] 117["Sweep Extrusion<br>[4763, 4782, 6]"]
118[Wall] 118[Wall]
119[Wall] 119[Wall]
120[Wall] 120[Wall]
@ -217,20 +217,20 @@ flowchart LR
124["SweepEdge Opposite"] 124["SweepEdge Opposite"]
125["SweepEdge Opposite"] 125["SweepEdge Opposite"]
126["SweepEdge Opposite"] 126["SweepEdge Opposite"]
130["Sweep Extrusion<br>[4842, 4862, 6]"] 130["Sweep Extrusion<br>[4942, 4962, 6]"]
131[Wall] 131[Wall]
132["Cap End"] 132["Cap End"]
136["Sweep Extrusion<br>[4951, 4972, 6]"] 136["Sweep Extrusion<br>[5051, 5072, 6]"]
137[Wall] 137[Wall]
138["SweepEdge Adjacent"] 138["SweepEdge Adjacent"]
139["EdgeCut Fillet<br>[5013, 5524, 6]"] 139["EdgeCut Fillet<br>[5113, 5624, 6]"]
140["EdgeCut Fillet<br>[5013, 5524, 6]"] 140["EdgeCut Fillet<br>[5113, 5624, 6]"]
141["EdgeCut Fillet<br>[5013, 5524, 6]"] 141["EdgeCut Fillet<br>[5113, 5624, 6]"]
142["EdgeCut Fillet<br>[5013, 5524, 6]"] 142["EdgeCut Fillet<br>[5113, 5624, 6]"]
143["EdgeCut Fillet<br>[5013, 5524, 6]"] 143["EdgeCut Fillet<br>[5113, 5624, 6]"]
144["EdgeCut Fillet<br>[5013, 5524, 6]"] 144["EdgeCut Fillet<br>[5113, 5624, 6]"]
145["EdgeCut Fillet<br>[5013, 5524, 6]"] 145["EdgeCut Fillet<br>[5113, 5624, 6]"]
146["EdgeCut Fillet<br>[5013, 5524, 6]"] 146["EdgeCut Fillet<br>[5113, 5624, 6]"]
147["Plane<br>[204, 231, 7]"] 147["Plane<br>[204, 231, 7]"]
151["Sweep Extrusion<br>[333, 353, 7]"] 151["Sweep Extrusion<br>[333, 353, 7]"]
152[Wall] 152[Wall]
@ -271,12 +271,12 @@ flowchart LR
223[Wall] 223[Wall]
224["Cap End"] 224["Cap End"]
225["Cap End"] 225["Cap End"]
226["StartSketchOnFace<br>[1597, 1640, 6]"] 226["StartSketchOnFace<br>[1647, 1690, 6]"]
227["StartSketchOnFace<br>[2498, 2541, 6]"] 227["StartSketchOnFace<br>[2548, 2591, 6]"]
228["StartSketchOnFace<br>[3197, 3234, 6]"] 228["StartSketchOnFace<br>[3247, 3284, 6]"]
229["StartSketchOnFace<br>[3421, 3458, 6]"] 229["StartSketchOnFace<br>[3471, 3508, 6]"]
230["StartSketchOnFace<br>[4749, 4792, 6]"] 230["StartSketchOnFace<br>[4849, 4892, 6]"]
231["StartSketchOnFace<br>[4864, 4903, 6]"] 231["StartSketchOnFace<br>[4964, 5003, 6]"]
232["StartSketchOnPlane<br>[244, 271, 7]"] 232["StartSketchOnPlane<br>[244, 271, 7]"]
233["StartSketchOnPlane<br>[453, 496, 7]"] 233["StartSketchOnPlane<br>[453, 496, 7]"]
234["StartSketchOnPlane<br>[1039, 1092, 8]"] 234["StartSketchOnPlane<br>[1039, 1092, 8]"]

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

@ -29,16 +29,7 @@ description: Operations executed axial-fan.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -48,23 +39,22 @@ description: Operations executed axial-fan.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -74,23 +64,22 @@ description: Operations executed axial-fan.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -100,23 +89,22 @@ description: Operations executed axial-fan.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -126,23 +114,22 @@ description: Operations executed axial-fan.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -152,10 +139,18 @@ description: Operations executed axial-fan.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -402,16 +397,7 @@ description: Operations executed axial-fan.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -421,23 +407,22 @@ description: Operations executed axial-fan.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -447,23 +432,22 @@ description: Operations executed axial-fan.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -473,23 +457,22 @@ description: Operations executed axial-fan.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -499,23 +482,22 @@ description: Operations executed axial-fan.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -525,10 +507,18 @@ description: Operations executed axial-fan.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {

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

@ -6,66 +6,66 @@ flowchart LR
4[Solid2d] 4[Solid2d]
end end
subgraph path5 [Path] subgraph path5 [Path]
5["Path<br>[737, 783, 0]"] 5["Path<br>[750, 796, 0]"]
6["Segment<br>[737, 783, 0]"] 6["Segment<br>[750, 796, 0]"]
7[Solid2d] 7[Solid2d]
end end
subgraph path13 [Path] subgraph path13 [Path]
13["Path<br>[970, 1026, 0]"] 13["Path<br>[980, 1036, 0]"]
14["Segment<br>[1032, 1091, 0]"] 14["Segment<br>[1042, 1101, 0]"]
15["Segment<br>[1097, 1104, 0]"] 15["Segment<br>[1107, 1114, 0]"]
16[Solid2d] 16[Solid2d]
end end
subgraph path21 [Path] subgraph path21 [Path]
21["Path<br>[1474, 1607, 0]"] 21["Path<br>[1484, 1617, 0]"]
22["Segment<br>[1613, 1673, 0]"] 22["Segment<br>[1623, 1683, 0]"]
23["Segment<br>[1679, 1710, 0]"] 23["Segment<br>[1689, 1720, 0]"]
24["Segment<br>[1716, 1744, 0]"] 24["Segment<br>[1726, 1754, 0]"]
25["Segment<br>[1750, 1757, 0]"] 25["Segment<br>[1760, 1767, 0]"]
26[Solid2d] 26[Solid2d]
end end
subgraph path33 [Path] subgraph path33 [Path]
33["Path<br>[2091, 2233, 0]"] 33["Path<br>[2101, 2243, 0]"]
34["Segment<br>[2091, 2233, 0]"] 34["Segment<br>[2101, 2243, 0]"]
35[Solid2d] 35[Solid2d]
end end
subgraph path41 [Path] subgraph path41 [Path]
41["Path<br>[2627, 2680, 0]"] 41["Path<br>[2637, 2690, 0]"]
42["Segment<br>[2627, 2680, 0]"] 42["Segment<br>[2637, 2690, 0]"]
43[Solid2d] 43[Solid2d]
end end
subgraph path44 [Path] subgraph path44 [Path]
44["Path<br>[2691, 2765, 0]"] 44["Path<br>[2714, 2788, 0]"]
45["Segment<br>[2691, 2765, 0]"] 45["Segment<br>[2714, 2788, 0]"]
46[Solid2d] 46[Solid2d]
end end
1["Plane<br>[610, 657, 0]"] 1["Plane<br>[610, 657, 0]"]
8["Sweep Extrusion<br>[838, 890, 0]"] 8["Sweep Extrusion<br>[848, 900, 0]"]
9[Wall] 9[Wall]
10["Cap Start"] 10["Cap Start"]
11["Cap End"] 11["Cap End"]
12["Plane<br>[947, 964, 0]"] 12["Plane<br>[957, 974, 0]"]
17["Sweep Revolve<br>[1186, 1216, 0]"] 17["Sweep Revolve<br>[1196, 1226, 0]"]
18[Wall] 18[Wall]
19[Wall] 19[Wall]
20["Plane<br>[1451, 1468, 0]"] 20["Plane<br>[1461, 1478, 0]"]
27["Sweep Revolve<br>[1799, 1829, 0]"] 27["Sweep Revolve<br>[1809, 1839, 0]"]
28[Wall] 28[Wall]
29[Wall] 29[Wall]
30[Wall] 30[Wall]
31[Wall] 31[Wall]
32["Plane<br>[2068, 2085, 0]"] 32["Plane<br>[2078, 2095, 0]"]
36["Sweep Revolve<br>[2276, 2327, 0]"] 36["Sweep Revolve<br>[2286, 2337, 0]"]
37[Wall] 37[Wall]
38["Cap Start"] 38["Cap Start"]
39["Cap End"] 39["Cap End"]
40["Plane<br>[2573, 2620, 0]"] 40["Plane<br>[2583, 2630, 0]"]
47["Sweep Extrusion<br>[2785, 2838, 0]"] 47["Sweep Extrusion<br>[2805, 2858, 0]"]
48[Wall] 48[Wall]
49["Cap Start"] 49["Cap Start"]
50["Cap End"] 50["Cap End"]
51["StartSketchOnPlane<br>[596, 658, 0]"] 51["StartSketchOnPlane<br>[596, 658, 0]"]
52["StartSketchOnPlane<br>[2559, 2621, 0]"] 52["StartSketchOnPlane<br>[2569, 2631, 0]"]
1 --- 2 1 --- 2
1 --- 5 1 --- 5
2 --- 3 2 --- 3

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

@ -683,6 +683,15 @@ description: Result of parsing ball-bearing.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -795,13 +804,7 @@ description: Result of parsing ball-bearing.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -811,7 +814,7 @@ description: Result of parsing ball-bearing.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -822,8 +825,9 @@ description: Result of parsing ball-bearing.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -3485,6 +3489,15 @@ description: Result of parsing ball-bearing.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -3645,13 +3658,7 @@ description: Result of parsing ball-bearing.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -3661,7 +3668,7 @@ description: Result of parsing ball-bearing.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -3672,8 +3679,9 @@ description: Result of parsing ball-bearing.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,

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

@ -50,16 +50,7 @@ description: Operations executed ball-bearing.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -69,10 +60,18 @@ description: Operations executed ball-bearing.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -970,16 +969,7 @@ description: Operations executed ball-bearing.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -989,10 +979,18 @@ description: Operations executed ball-bearing.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {

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

@ -59,92 +59,92 @@ flowchart LR
110[Solid2d] 110[Solid2d]
end end
subgraph path111 [Path] subgraph path111 [Path]
111["Path<br>[421, 477, 6]"] 111["Path<br>[434, 490, 6]"]
112["Segment<br>[421, 477, 6]"] 112["Segment<br>[434, 490, 6]"]
113[Solid2d] 113[Solid2d]
end end
subgraph path118 [Path] subgraph path118 [Path]
118["Path<br>[647, 703, 6]"] 118["Path<br>[657, 713, 6]"]
119["Segment<br>[647, 703, 6]"] 119["Segment<br>[657, 713, 6]"]
120[Solid2d] 120[Solid2d]
end end
subgraph path121 [Path] subgraph path121 [Path]
121["Path<br>[714, 770, 6]"] 121["Path<br>[737, 793, 6]"]
122["Segment<br>[714, 770, 6]"] 122["Segment<br>[737, 793, 6]"]
123[Solid2d] 123[Solid2d]
end end
subgraph path128 [Path] subgraph path128 [Path]
128["Path<br>[919, 973, 6]"] 128["Path<br>[939, 993, 6]"]
129["Segment<br>[919, 973, 6]"] 129["Segment<br>[939, 993, 6]"]
130[Solid2d] 130[Solid2d]
end end
subgraph path137 [Path] subgraph path137 [Path]
137["Path<br>[1256, 1317, 6]"] 137["Path<br>[1276, 1337, 6]"]
138["Segment<br>[1256, 1317, 6]"] 138["Segment<br>[1276, 1337, 6]"]
139[Solid2d] 139[Solid2d]
end end
subgraph path147 [Path] subgraph path147 [Path]
147["Path<br>[1675, 1721, 6]"] 147["Path<br>[1695, 1741, 6]"]
148["Segment<br>[1727, 1779, 6]"] 148["Segment<br>[1747, 1799, 6]"]
149["Segment<br>[1785, 1858, 6]"] 149["Segment<br>[1805, 1878, 6]"]
150["Segment<br>[1864, 1886, 6]"] 150["Segment<br>[1884, 1906, 6]"]
151["Segment<br>[1892, 1948, 6]"] 151["Segment<br>[1912, 1968, 6]"]
152["Segment<br>[1954, 1961, 6]"] 152["Segment<br>[1974, 1981, 6]"]
153[Solid2d] 153[Solid2d]
end end
subgraph path160 [Path] subgraph path160 [Path]
160["Path<br>[2093, 2139, 6]"] 160["Path<br>[2113, 2159, 6]"]
161["Segment<br>[2145, 2197, 6]"] 161["Segment<br>[2165, 2217, 6]"]
162["Segment<br>[2203, 2278, 6]"] 162["Segment<br>[2223, 2298, 6]"]
163["Segment<br>[2284, 2321, 6]"] 163["Segment<br>[2304, 2341, 6]"]
164["Segment<br>[2327, 2383, 6]"] 164["Segment<br>[2347, 2403, 6]"]
165["Segment<br>[2389, 2396, 6]"] 165["Segment<br>[2409, 2416, 6]"]
166[Solid2d] 166[Solid2d]
end end
subgraph path173 [Path] subgraph path173 [Path]
173["Path<br>[2877, 2924, 6]"] 173["Path<br>[2897, 2944, 6]"]
174["Segment<br>[2932, 3269, 6]"] 174["Segment<br>[2952, 3289, 6]"]
175["Segment<br>[3277, 3309, 6]"] 175["Segment<br>[3297, 3329, 6]"]
176["Segment<br>[3317, 3658, 6]"] 176["Segment<br>[3337, 3678, 6]"]
177["Segment<br>[3666, 3722, 6]"] 177["Segment<br>[3686, 3742, 6]"]
178["Segment<br>[3730, 3737, 6]"] 178["Segment<br>[3750, 3757, 6]"]
179[Solid2d] 179[Solid2d]
end end
subgraph path191 [Path] subgraph path191 [Path]
191["Path<br>[2877, 2924, 6]"] 191["Path<br>[2897, 2944, 6]"]
192["Segment<br>[2932, 3269, 6]"] 192["Segment<br>[2952, 3289, 6]"]
193["Segment<br>[3277, 3309, 6]"] 193["Segment<br>[3297, 3329, 6]"]
194["Segment<br>[3317, 3658, 6]"] 194["Segment<br>[3337, 3678, 6]"]
195["Segment<br>[3666, 3722, 6]"] 195["Segment<br>[3686, 3742, 6]"]
196["Segment<br>[3730, 3737, 6]"] 196["Segment<br>[3750, 3757, 6]"]
197[Solid2d] 197[Solid2d]
end end
subgraph path209 [Path] subgraph path209 [Path]
209["Path<br>[4265, 4360, 6]"] 209["Path<br>[4285, 4380, 6]"]
210["Segment<br>[4366, 4399, 6]"] 210["Segment<br>[4386, 4419, 6]"]
211["Segment<br>[4405, 4456, 6]"] 211["Segment<br>[4425, 4476, 6]"]
212["Segment<br>[4462, 4495, 6]"] 212["Segment<br>[4482, 4515, 6]"]
213["Segment<br>[4501, 4551, 6]"] 213["Segment<br>[4521, 4571, 6]"]
214["Segment<br>[4557, 4598, 6]"] 214["Segment<br>[4577, 4618, 6]"]
215["Segment<br>[4604, 4653, 6]"] 215["Segment<br>[4624, 4673, 6]"]
216["Segment<br>[4659, 4692, 6]"] 216["Segment<br>[4679, 4712, 6]"]
217["Segment<br>[4698, 4732, 6]"] 217["Segment<br>[4718, 4752, 6]"]
218["Segment<br>[4738, 4772, 6]"] 218["Segment<br>[4758, 4792, 6]"]
219["Segment<br>[4778, 4830, 6]"] 219["Segment<br>[4798, 4850, 6]"]
220["Segment<br>[4836, 4870, 6]"] 220["Segment<br>[4856, 4890, 6]"]
221["Segment<br>[4876, 4952, 6]"] 221["Segment<br>[4896, 4972, 6]"]
222["Segment<br>[4958, 4991, 6]"] 222["Segment<br>[4978, 5011, 6]"]
223["Segment<br>[4997, 5073, 6]"] 223["Segment<br>[5017, 5093, 6]"]
224["Segment<br>[5079, 5113, 6]"] 224["Segment<br>[5099, 5133, 6]"]
225["Segment<br>[5119, 5193, 6]"] 225["Segment<br>[5139, 5213, 6]"]
226["Segment<br>[5199, 5233, 6]"] 226["Segment<br>[5219, 5253, 6]"]
227["Segment<br>[5239, 5290, 6]"] 227["Segment<br>[5259, 5310, 6]"]
228["Segment<br>[5296, 5358, 6]"] 228["Segment<br>[5316, 5378, 6]"]
229["Segment<br>[5364, 5415, 6]"] 229["Segment<br>[5384, 5435, 6]"]
230["Segment<br>[5421, 5455, 6]"] 230["Segment<br>[5441, 5475, 6]"]
231["Segment<br>[5461, 5494, 6]"] 231["Segment<br>[5481, 5514, 6]"]
232["Segment<br>[5500, 5533, 6]"] 232["Segment<br>[5520, 5553, 6]"]
233["Segment<br>[5539, 5546, 6]"] 233["Segment<br>[5559, 5566, 6]"]
234[Solid2d] 234[Solid2d]
end end
subgraph path261 [Path] subgraph path261 [Path]
@ -271,40 +271,40 @@ flowchart LR
105["Sweep Extrusion<br>[3253, 3327, 7]"] 105["Sweep Extrusion<br>[3253, 3327, 7]"]
106["Sweep Extrusion<br>[3253, 3327, 7]"] 106["Sweep Extrusion<br>[3253, 3327, 7]"]
107["Plane<br>[331, 348, 6]"] 107["Plane<br>[331, 348, 6]"]
114["Sweep Extrusion<br>[487, 520, 6]"] 114["Sweep Extrusion<br>[497, 530, 6]"]
115[Wall] 115[Wall]
116["Cap Start"] 116["Cap Start"]
117["Cap End"] 117["Cap End"]
124["Sweep Extrusion<br>[780, 813, 6]"] 124["Sweep Extrusion<br>[800, 833, 6]"]
125[Wall] 125[Wall]
126["Cap Start"] 126["Cap Start"]
127["Cap End"] 127["Cap End"]
131["Sweep Extrusion<br>[1120, 1154, 6]"] 131["Sweep Extrusion<br>[1140, 1174, 6]"]
132[Wall] 132[Wall]
133["Sweep Extrusion<br>[1120, 1154, 6]"] 133["Sweep Extrusion<br>[1140, 1174, 6]"]
134["Sweep Extrusion<br>[1120, 1154, 6]"] 134["Sweep Extrusion<br>[1140, 1174, 6]"]
135["Sweep Extrusion<br>[1120, 1154, 6]"] 135["Sweep Extrusion<br>[1140, 1174, 6]"]
136["Sweep Extrusion<br>[1120, 1154, 6]"] 136["Sweep Extrusion<br>[1140, 1174, 6]"]
140["Sweep Extrusion<br>[1464, 1498, 6]"] 140["Sweep Extrusion<br>[1484, 1518, 6]"]
141[Wall] 141[Wall]
142["Sweep Extrusion<br>[1464, 1498, 6]"] 142["Sweep Extrusion<br>[1484, 1518, 6]"]
143["Sweep Extrusion<br>[1464, 1498, 6]"] 143["Sweep Extrusion<br>[1484, 1518, 6]"]
144["Sweep Extrusion<br>[1464, 1498, 6]"] 144["Sweep Extrusion<br>[1484, 1518, 6]"]
145["Sweep Extrusion<br>[1464, 1498, 6]"] 145["Sweep Extrusion<br>[1484, 1518, 6]"]
146["Plane<br>[1652, 1669, 6]"] 146["Plane<br>[1672, 1689, 6]"]
154["Sweep Revolve<br>[1967, 1984, 6]"] 154["Sweep Revolve<br>[1987, 2004, 6]"]
155[Wall] 155[Wall]
156[Wall] 156[Wall]
157[Wall] 157[Wall]
158[Wall] 158[Wall]
159["Plane<br>[2070, 2087, 6]"] 159["Plane<br>[2090, 2107, 6]"]
167["Sweep Revolve<br>[2402, 2419, 6]"] 167["Sweep Revolve<br>[2422, 2439, 6]"]
168[Wall] 168[Wall]
169[Wall] 169[Wall]
170[Wall] 170[Wall]
171[Wall] 171[Wall]
172["Plane<br>[2846, 2869, 6]"] 172["Plane<br>[2866, 2889, 6]"]
180["Sweep Extrusion<br>[3785, 3831, 6]"] 180["Sweep Extrusion<br>[3805, 3851, 6]"]
181[Wall] 181[Wall]
182[Wall] 182[Wall]
183[Wall] 183[Wall]
@ -314,8 +314,8 @@ flowchart LR
187["SweepEdge Opposite"] 187["SweepEdge Opposite"]
188["SweepEdge Opposite"] 188["SweepEdge Opposite"]
189["SweepEdge Opposite"] 189["SweepEdge Opposite"]
190["Plane<br>[2846, 2869, 6]"] 190["Plane<br>[2866, 2889, 6]"]
198["Sweep Extrusion<br>[3785, 3831, 6]"] 198["Sweep Extrusion<br>[3805, 3851, 6]"]
199[Wall] 199[Wall]
200[Wall] 200[Wall]
201[Wall] 201[Wall]
@ -325,8 +325,8 @@ flowchart LR
205["SweepEdge Opposite"] 205["SweepEdge Opposite"]
206["SweepEdge Opposite"] 206["SweepEdge Opposite"]
207["SweepEdge Opposite"] 207["SweepEdge Opposite"]
208["Plane<br>[4242, 4259, 6]"] 208["Plane<br>[4262, 4279, 6]"]
235["Sweep Revolve<br>[5552, 5569, 6]"] 235["Sweep Revolve<br>[5572, 5589, 6]"]
236[Wall] 236[Wall]
237[Wall] 237[Wall]
238[Wall] 238[Wall]
@ -423,9 +423,9 @@ flowchart LR
375["StartSketchOnFace<br>[2038, 2072, 7]"] 375["StartSketchOnFace<br>[2038, 2072, 7]"]
376["StartSketchOnFace<br>[2372, 2406, 7]"] 376["StartSketchOnFace<br>[2372, 2406, 7]"]
377["StartSketchOnFace<br>[2860, 2898, 7]"] 377["StartSketchOnFace<br>[2860, 2898, 7]"]
378["StartSketchOnFace<br>[607, 641, 6]"] 378["StartSketchOnFace<br>[617, 651, 6]"]
379["StartSketchOnFace<br>[874, 913, 6]"] 379["StartSketchOnFace<br>[894, 933, 6]"]
380["StartSketchOnFace<br>[1216, 1250, 6]"] 380["StartSketchOnFace<br>[1236, 1270, 6]"]
1 --- 2 1 --- 2
2 --- 3 2 --- 3
2 ---- 5 2 ---- 5

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

@ -739,16 +739,7 @@ description: Operations executed car-wheel-assembly.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -758,10 +749,18 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -820,16 +819,7 @@ description: Operations executed car-wheel-assembly.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -839,10 +829,18 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1252,8 +1250,8 @@ description: Operations executed car-wheel-assembly.kcl
"type": "FunctionCall", "type": "FunctionCall",
"name": "spoke", "name": "spoke",
"functionSourceRange": [ "functionSourceRange": [
2572, 2592,
4111, 4131,
6 6
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -1643,8 +1641,8 @@ description: Operations executed car-wheel-assembly.kcl
"type": "FunctionCall", "type": "FunctionCall",
"name": "spoke", "name": "spoke",
"functionSourceRange": [ "functionSourceRange": [
2572, 2592,
4111, 4131,
6 6
], ],
"unlabeledArg": null, "unlabeledArg": null,

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

@ -12,8 +12,8 @@ flowchart LR
10[Solid2d] 10[Solid2d]
end end
subgraph path11 [Path] subgraph path11 [Path]
11["Path<br>[1305, 1355, 0]"] 11["Path<br>[1318, 1368, 0]"]
12["Segment<br>[1305, 1355, 0]"] 12["Segment<br>[1318, 1368, 0]"]
13[Solid2d] 13[Solid2d]
end end
subgraph path15 [Path] subgraph path15 [Path]
@ -28,8 +28,8 @@ flowchart LR
23[Solid2d] 23[Solid2d]
end end
subgraph path24 [Path] subgraph path24 [Path]
24["Path<br>[1305, 1355, 0]"] 24["Path<br>[1318, 1368, 0]"]
25["Segment<br>[1305, 1355, 0]"] 25["Segment<br>[1318, 1368, 0]"]
26[Solid2d] 26[Solid2d]
end end
subgraph path28 [Path] subgraph path28 [Path]
@ -39,8 +39,8 @@ flowchart LR
36[Solid2d] 36[Solid2d]
end end
subgraph path37 [Path] subgraph path37 [Path]
37["Path<br>[1305, 1355, 0]"] 37["Path<br>[1318, 1368, 0]"]
38["Segment<br>[1305, 1355, 0]"] 38["Segment<br>[1318, 1368, 0]"]
39[Solid2d] 39[Solid2d]
end end
1["Plane<br>[587, 620, 0]"] 1["Plane<br>[587, 620, 0]"]
@ -51,7 +51,7 @@ flowchart LR
32["SweepEdge Opposite"] 32["SweepEdge Opposite"]
33["SweepEdge Opposite"] 33["SweepEdge Opposite"]
34["SweepEdge Opposite"] 34["SweepEdge Opposite"]
40["Sweep Loft<br>[1485, 1574, 0]"] 40["Sweep Loft<br>[1495, 1584, 0]"]
41[Wall] 41[Wall]
42[Wall] 42[Wall]
43[Wall] 43[Wall]

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

@ -1331,6 +1331,15 @@ description: Result of parsing cycloidal-gear.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -1443,13 +1452,7 @@ description: Result of parsing cycloidal-gear.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -1459,7 +1462,7 @@ description: Result of parsing cycloidal-gear.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -1470,8 +1473,9 @@ description: Result of parsing cycloidal-gear.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,

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

@ -10,7 +10,7 @@ description: Operations executed cycloidal-gear.kcl
"name": "cycloidalGear", "name": "cycloidalGear",
"functionSourceRange": [ "functionSourceRange": [
265, 265,
1595, 1605,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -25,7 +25,7 @@ description: Operations executed cycloidal-gear.kcl
"name": "gearSketch", "name": "gearSketch",
"functionSourceRange": [ "functionSourceRange": [
491, 491,
1386, 1396,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -224,16 +224,7 @@ description: Operations executed cycloidal-gear.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -243,10 +234,18 @@ description: Operations executed cycloidal-gear.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"type": "GroupEnd" "type": "GroupEnd"
@ -258,7 +257,7 @@ description: Operations executed cycloidal-gear.kcl
"name": "gearSketch", "name": "gearSketch",
"functionSourceRange": [ "functionSourceRange": [
491, 491,
1386, 1396,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -457,16 +456,7 @@ description: Operations executed cycloidal-gear.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -476,10 +466,18 @@ description: Operations executed cycloidal-gear.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"type": "GroupEnd" "type": "GroupEnd"
@ -491,7 +489,7 @@ description: Operations executed cycloidal-gear.kcl
"name": "gearSketch", "name": "gearSketch",
"functionSourceRange": [ "functionSourceRange": [
491, 491,
1386, 1396,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -690,16 +688,7 @@ description: Operations executed cycloidal-gear.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -709,10 +698,18 @@ description: Operations executed cycloidal-gear.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"type": "GroupEnd" "type": "GroupEnd"

104
rust/kcl-lib/tests/kcl_samples/enclosure/artifact_graph_flowchart.snap.md
View File

@ -15,8 +15,8 @@ flowchart LR
27[Solid2d] 27[Solid2d]
end end
subgraph path28 [Path] subgraph path28 [Path]
28["Path<br>[1693, 1760, 0]"] 28["Path<br>[1706, 1773, 0]"]
29["Segment<br>[1693, 1760, 0]"] 29["Segment<br>[1706, 1773, 0]"]
30[Solid2d] 30[Solid2d]
end end
subgraph path36 [Path] subgraph path36 [Path]
@ -25,8 +25,8 @@ flowchart LR
38[Solid2d] 38[Solid2d]
end end
subgraph path39 [Path] subgraph path39 [Path]
39["Path<br>[1693, 1760, 0]"] 39["Path<br>[1706, 1773, 0]"]
40["Segment<br>[1693, 1760, 0]"] 40["Segment<br>[1706, 1773, 0]"]
41[Solid2d] 41[Solid2d]
end end
subgraph path47 [Path] subgraph path47 [Path]
@ -35,8 +35,8 @@ flowchart LR
49[Solid2d] 49[Solid2d]
end end
subgraph path50 [Path] subgraph path50 [Path]
50["Path<br>[1693, 1760, 0]"] 50["Path<br>[1706, 1773, 0]"]
51["Segment<br>[1693, 1760, 0]"] 51["Segment<br>[1706, 1773, 0]"]
52[Solid2d] 52[Solid2d]
end end
subgraph path58 [Path] subgraph path58 [Path]
@ -45,66 +45,66 @@ flowchart LR
60[Solid2d] 60[Solid2d]
end end
subgraph path61 [Path] subgraph path61 [Path]
61["Path<br>[1693, 1760, 0]"] 61["Path<br>[1706, 1773, 0]"]
62["Segment<br>[1693, 1760, 0]"] 62["Segment<br>[1706, 1773, 0]"]
63[Solid2d] 63[Solid2d]
end end
subgraph path69 [Path] subgraph path69 [Path]
69["Path<br>[2331, 2366, 0]"] 69["Path<br>[2341, 2376, 0]"]
70["Segment<br>[2372, 2438, 0]"] 70["Segment<br>[2382, 2448, 0]"]
71["Segment<br>[2444, 2543, 0]"] 71["Segment<br>[2454, 2553, 0]"]
72["Segment<br>[2549, 2666, 0]"] 72["Segment<br>[2559, 2676, 0]"]
73["Segment<br>[2672, 2757, 0]"] 73["Segment<br>[2682, 2767, 0]"]
74["Segment<br>[2763, 2770, 0]"] 74["Segment<br>[2773, 2780, 0]"]
75[Solid2d] 75[Solid2d]
end end
subgraph path76 [Path] subgraph path76 [Path]
76["Path<br>[2781, 2937, 0]"] 76["Path<br>[2804, 2960, 0]"]
77["Segment<br>[2781, 2937, 0]"] 77["Segment<br>[2804, 2960, 0]"]
78[Solid2d] 78[Solid2d]
end end
subgraph path79 [Path] subgraph path79 [Path]
79["Path<br>[2952, 3119, 0]"] 79["Path<br>[2985, 3152, 0]"]
80["Segment<br>[2952, 3119, 0]"] 80["Segment<br>[2985, 3152, 0]"]
81[Solid2d] 81[Solid2d]
end end
subgraph path82 [Path] subgraph path82 [Path]
82["Path<br>[3134, 3292, 0]"] 82["Path<br>[3177, 3335, 0]"]
83["Segment<br>[3134, 3292, 0]"] 83["Segment<br>[3177, 3335, 0]"]
84[Solid2d] 84[Solid2d]
end end
subgraph path85 [Path] subgraph path85 [Path]
85["Path<br>[3307, 3476, 0]"] 85["Path<br>[3360, 3529, 0]"]
86["Segment<br>[3307, 3476, 0]"] 86["Segment<br>[3360, 3529, 0]"]
87[Solid2d] 87[Solid2d]
end end
subgraph path103 [Path] subgraph path103 [Path]
103["Path<br>[3922, 4006, 0]"] 103["Path<br>[3972, 4056, 0]"]
104["Segment<br>[4012, 4100, 0]"] 104["Segment<br>[4062, 4150, 0]"]
105["Segment<br>[4106, 4227, 0]"] 105["Segment<br>[4156, 4277, 0]"]
106["Segment<br>[4233, 4350, 0]"] 106["Segment<br>[4283, 4400, 0]"]
107["Segment<br>[4356, 4441, 0]"] 107["Segment<br>[4406, 4491, 0]"]
108["Segment<br>[4447, 4454, 0]"] 108["Segment<br>[4497, 4504, 0]"]
109[Solid2d] 109[Solid2d]
end end
subgraph path110 [Path] subgraph path110 [Path]
110["Path<br>[4465, 4637, 0]"] 110["Path<br>[4528, 4700, 0]"]
111["Segment<br>[4465, 4637, 0]"] 111["Segment<br>[4528, 4700, 0]"]
112[Solid2d] 112[Solid2d]
end end
subgraph path113 [Path] subgraph path113 [Path]
113["Path<br>[4652, 4835, 0]"] 113["Path<br>[4725, 4908, 0]"]
114["Segment<br>[4652, 4835, 0]"] 114["Segment<br>[4725, 4908, 0]"]
115[Solid2d] 115[Solid2d]
end end
subgraph path116 [Path] subgraph path116 [Path]
116["Path<br>[4850, 5024, 0]"] 116["Path<br>[4933, 5107, 0]"]
117["Segment<br>[4850, 5024, 0]"] 117["Segment<br>[4933, 5107, 0]"]
118[Solid2d] 118[Solid2d]
end end
subgraph path119 [Path] subgraph path119 [Path]
119["Path<br>[5039, 5224, 0]"] 119["Path<br>[5132, 5317, 0]"]
120["Segment<br>[5039, 5224, 0]"] 120["Segment<br>[5132, 5317, 0]"]
121[Solid2d] 121[Solid2d]
end end
1["Plane<br>[264, 281, 0]"] 1["Plane<br>[264, 281, 0]"]
@ -124,27 +124,27 @@ flowchart LR
22["EdgeCut Fillet<br>[771, 1053, 0]"] 22["EdgeCut Fillet<br>[771, 1053, 0]"]
23["EdgeCut Fillet<br>[771, 1053, 0]"] 23["EdgeCut Fillet<br>[771, 1053, 0]"]
24["Plane<br>[1566, 1589, 0]"] 24["Plane<br>[1566, 1589, 0]"]
31["Sweep Extrusion<br>[1780, 1831, 0]"] 31["Sweep Extrusion<br>[1790, 1841, 0]"]
32[Wall] 32[Wall]
33["Cap Start"] 33["Cap Start"]
34["Cap End"] 34["Cap End"]
35["Plane<br>[1566, 1589, 0]"] 35["Plane<br>[1566, 1589, 0]"]
42["Sweep Extrusion<br>[1780, 1831, 0]"] 42["Sweep Extrusion<br>[1790, 1841, 0]"]
43[Wall] 43[Wall]
44["Cap Start"] 44["Cap Start"]
45["Cap End"] 45["Cap End"]
46["Plane<br>[1566, 1589, 0]"] 46["Plane<br>[1566, 1589, 0]"]
53["Sweep Extrusion<br>[1780, 1831, 0]"] 53["Sweep Extrusion<br>[1790, 1841, 0]"]
54[Wall] 54[Wall]
55["Cap Start"] 55["Cap Start"]
56["Cap End"] 56["Cap End"]
57["Plane<br>[1566, 1589, 0]"] 57["Plane<br>[1566, 1589, 0]"]
64["Sweep Extrusion<br>[1780, 1831, 0]"] 64["Sweep Extrusion<br>[1790, 1841, 0]"]
65[Wall] 65[Wall]
66["Cap Start"] 66["Cap Start"]
67["Cap End"] 67["Cap End"]
68["Plane<br>[2308, 2325, 0]"] 68["Plane<br>[2318, 2335, 0]"]
88["Sweep Extrusion<br>[3494, 3536, 0]"] 88["Sweep Extrusion<br>[3544, 3586, 0]"]
89[Wall] 89[Wall]
90[Wall] 90[Wall]
91[Wall] 91[Wall]
@ -155,11 +155,11 @@ flowchart LR
96["SweepEdge Opposite"] 96["SweepEdge Opposite"]
97["SweepEdge Opposite"] 97["SweepEdge Opposite"]
98["SweepEdge Adjacent"] 98["SweepEdge Adjacent"]
99["EdgeCut Fillet<br>[3542, 3824, 0]"] 99["EdgeCut Fillet<br>[3592, 3874, 0]"]
100["EdgeCut Fillet<br>[3542, 3824, 0]"] 100["EdgeCut Fillet<br>[3592, 3874, 0]"]
101["EdgeCut Fillet<br>[3542, 3824, 0]"] 101["EdgeCut Fillet<br>[3592, 3874, 0]"]
102["EdgeCut Fillet<br>[3542, 3824, 0]"] 102["EdgeCut Fillet<br>[3592, 3874, 0]"]
122["Sweep Extrusion<br>[5242, 5284, 0]"] 122["Sweep Extrusion<br>[5332, 5374, 0]"]
123[Wall] 123[Wall]
124[Wall] 124[Wall]
125[Wall] 125[Wall]
@ -170,11 +170,11 @@ flowchart LR
130["SweepEdge Opposite"] 130["SweepEdge Opposite"]
131["SweepEdge Opposite"] 131["SweepEdge Opposite"]
132["SweepEdge Adjacent"] 132["SweepEdge Adjacent"]
133["EdgeCut Fillet<br>[5290, 5572, 0]"] 133["EdgeCut Fillet<br>[5380, 5662, 0]"]
134["EdgeCut Fillet<br>[5290, 5572, 0]"] 134["EdgeCut Fillet<br>[5380, 5662, 0]"]
135["EdgeCut Fillet<br>[5290, 5572, 0]"] 135["EdgeCut Fillet<br>[5380, 5662, 0]"]
136["EdgeCut Fillet<br>[5290, 5572, 0]"] 136["EdgeCut Fillet<br>[5380, 5662, 0]"]
137["StartSketchOnFace<br>[3879, 3916, 0]"] 137["StartSketchOnFace<br>[3929, 3966, 0]"]
1 --- 2 1 --- 2
2 --- 3 2 --- 3
2 --- 4 2 --- 4

216
rust/kcl-lib/tests/kcl_samples/enclosure/ast.snap
View File

@ -1798,6 +1798,15 @@ description: Result of parsing enclosure.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -1922,13 +1931,7 @@ description: Result of parsing enclosure.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -1938,7 +1941,7 @@ description: Result of parsing enclosure.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -1949,8 +1952,9 @@ description: Result of parsing enclosure.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -3573,6 +3577,15 @@ description: Result of parsing enclosure.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -3805,13 +3818,7 @@ description: Result of parsing enclosure.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -3821,7 +3828,7 @@ description: Result of parsing enclosure.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -3832,12 +3839,22 @@ description: Result of parsing enclosure.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -4094,13 +4111,7 @@ description: Result of parsing enclosure.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -4110,7 +4121,7 @@ description: Result of parsing enclosure.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -4121,12 +4132,22 @@ description: Result of parsing enclosure.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -4359,13 +4380,7 @@ description: Result of parsing enclosure.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -4375,7 +4390,7 @@ description: Result of parsing enclosure.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -4386,12 +4401,22 @@ description: Result of parsing enclosure.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -4648,13 +4673,7 @@ description: Result of parsing enclosure.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -4664,7 +4683,7 @@ description: Result of parsing enclosure.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -4675,8 +4694,9 @@ description: Result of parsing enclosure.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -5882,6 +5902,15 @@ description: Result of parsing enclosure.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -6138,13 +6167,7 @@ description: Result of parsing enclosure.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -6154,7 +6177,7 @@ description: Result of parsing enclosure.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -6165,12 +6188,22 @@ description: Result of parsing enclosure.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -6451,13 +6484,7 @@ description: Result of parsing enclosure.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -6467,7 +6494,7 @@ description: Result of parsing enclosure.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -6478,12 +6505,22 @@ description: Result of parsing enclosure.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -6740,13 +6777,7 @@ description: Result of parsing enclosure.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -6756,7 +6787,7 @@ description: Result of parsing enclosure.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -6767,12 +6798,22 @@ description: Result of parsing enclosure.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -7053,13 +7094,7 @@ description: Result of parsing enclosure.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -7069,7 +7104,7 @@ description: Result of parsing enclosure.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -7080,8 +7115,9 @@ description: Result of parsing enclosure.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,

284
rust/kcl-lib/tests/kcl_samples/enclosure/ops.snap
View File

@ -157,7 +157,7 @@ description: Operations executed enclosure.kcl
"name": "function001", "name": "function001",
"functionSourceRange": [ "functionSourceRange": [
1285, 1285,
1854, 1864,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -359,16 +359,7 @@ description: Operations executed enclosure.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -378,10 +369,18 @@ description: Operations executed enclosure.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -425,7 +424,7 @@ description: Operations executed enclosure.kcl
"name": "function001", "name": "function001",
"functionSourceRange": [ "functionSourceRange": [
1285, 1285,
1854, 1864,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -627,16 +626,7 @@ description: Operations executed enclosure.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -646,10 +636,18 @@ description: Operations executed enclosure.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -693,7 +691,7 @@ description: Operations executed enclosure.kcl
"name": "function001", "name": "function001",
"functionSourceRange": [ "functionSourceRange": [
1285, 1285,
1854, 1864,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -895,16 +893,7 @@ description: Operations executed enclosure.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -914,10 +903,18 @@ description: Operations executed enclosure.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -961,7 +958,7 @@ description: Operations executed enclosure.kcl
"name": "function001", "name": "function001",
"functionSourceRange": [ "functionSourceRange": [
1285, 1285,
1854, 1864,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -1163,16 +1160,7 @@ description: Operations executed enclosure.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1182,10 +1170,18 @@ description: Operations executed enclosure.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1239,16 +1235,7 @@ description: Operations executed enclosure.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1258,23 +1245,22 @@ description: Operations executed enclosure.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1284,23 +1270,22 @@ description: Operations executed enclosure.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1310,23 +1295,22 @@ description: Operations executed enclosure.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1336,10 +1320,18 @@ description: Operations executed enclosure.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1454,16 +1446,7 @@ description: Operations executed enclosure.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1473,23 +1456,22 @@ description: Operations executed enclosure.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1499,23 +1481,22 @@ description: Operations executed enclosure.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1525,23 +1506,22 @@ description: Operations executed enclosure.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1551,10 +1531,18 @@ description: Operations executed enclosure.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {

240
rust/kcl-lib/tests/kcl_samples/enclosure/program_memory.snap
View File

@ -354,9 +354,9 @@ description: Variables in memory after executing enclosure.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2416, "commentStart": 2426,
"end": 2437, "end": 2447,
"start": 2416, "start": 2426,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentA002" "value": "rectangleSegmentA002"
}, },
@ -367,9 +367,9 @@ description: Variables in memory after executing enclosure.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2521, "commentStart": 2531,
"end": 2542, "end": 2552,
"start": 2521, "start": 2531,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentB002" "value": "rectangleSegmentB002"
}, },
@ -380,9 +380,9 @@ description: Variables in memory after executing enclosure.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2644, "commentStart": 2654,
"end": 2665, "end": 2675,
"start": 2644, "start": 2654,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentC002" "value": "rectangleSegmentC002"
}, },
@ -393,9 +393,9 @@ description: Variables in memory after executing enclosure.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2735, "commentStart": 2745,
"end": 2756, "end": 2766,
"start": 2735, "start": 2745,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentD002" "value": "rectangleSegmentD002"
}, },
@ -416,9 +416,9 @@ description: Variables in memory after executing enclosure.kcl
0.0 0.0
], ],
"tag": { "tag": {
"commentStart": 2416, "commentStart": 2426,
"end": 2437, "end": 2447,
"start": 2416, "start": 2426,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentA002" "value": "rectangleSegmentA002"
}, },
@ -441,9 +441,9 @@ description: Variables in memory after executing enclosure.kcl
0.0 0.0
], ],
"tag": { "tag": {
"commentStart": 2521, "commentStart": 2531,
"end": 2542, "end": 2552,
"start": 2521, "start": 2531,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentB002" "value": "rectangleSegmentB002"
}, },
@ -466,9 +466,9 @@ description: Variables in memory after executing enclosure.kcl
175.0 175.0
], ],
"tag": { "tag": {
"commentStart": 2644, "commentStart": 2654,
"end": 2665, "end": 2675,
"start": 2644, "start": 2654,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentC002" "value": "rectangleSegmentC002"
}, },
@ -491,9 +491,9 @@ description: Variables in memory after executing enclosure.kcl
175.0 175.0
], ],
"tag": { "tag": {
"commentStart": 2735, "commentStart": 2745,
"end": 2756, "end": 2766,
"start": 2735, "start": 2745,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentD002" "value": "rectangleSegmentD002"
}, },
@ -693,9 +693,9 @@ description: Variables in memory after executing enclosure.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 4078, "commentStart": 4128,
"end": 4099, "end": 4149,
"start": 4078, "start": 4128,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentA003" "value": "rectangleSegmentA003"
}, },
@ -706,9 +706,9 @@ description: Variables in memory after executing enclosure.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 4205, "commentStart": 4255,
"end": 4226, "end": 4276,
"start": 4205, "start": 4255,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentB003" "value": "rectangleSegmentB003"
}, },
@ -719,9 +719,9 @@ description: Variables in memory after executing enclosure.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 4328, "commentStart": 4378,
"end": 4349, "end": 4399,
"start": 4328, "start": 4378,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentC003" "value": "rectangleSegmentC003"
}, },
@ -732,9 +732,9 @@ description: Variables in memory after executing enclosure.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 4419, "commentStart": 4469,
"end": 4440, "end": 4490,
"start": 4419, "start": 4469,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentD003" "value": "rectangleSegmentD003"
}, },
@ -755,9 +755,9 @@ description: Variables in memory after executing enclosure.kcl
3.0 3.0
], ],
"tag": { "tag": {
"commentStart": 4078, "commentStart": 4128,
"end": 4099, "end": 4149,
"start": 4078, "start": 4128,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentA003" "value": "rectangleSegmentA003"
}, },
@ -780,9 +780,9 @@ description: Variables in memory after executing enclosure.kcl
3.0 3.0
], ],
"tag": { "tag": {
"commentStart": 4205, "commentStart": 4255,
"end": 4226, "end": 4276,
"start": 4205, "start": 4255,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentB003" "value": "rectangleSegmentB003"
}, },
@ -805,9 +805,9 @@ description: Variables in memory after executing enclosure.kcl
172.0 172.0
], ],
"tag": { "tag": {
"commentStart": 4328, "commentStart": 4378,
"end": 4349, "end": 4399,
"start": 4328, "start": 4378,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentC003" "value": "rectangleSegmentC003"
}, },
@ -830,9 +830,9 @@ description: Variables in memory after executing enclosure.kcl
172.0 172.0
], ],
"tag": { "tag": {
"commentStart": 4419, "commentStart": 4469,
"end": 4440, "end": 4490,
"start": 4419, "start": 4469,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentD003" "value": "rectangleSegmentD003"
}, },
@ -896,9 +896,9 @@ description: Variables in memory after executing enclosure.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2416, "commentStart": 2426,
"end": 2437, "end": 2447,
"start": 2416, "start": 2426,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentA002" "value": "rectangleSegmentA002"
}, },
@ -909,9 +909,9 @@ description: Variables in memory after executing enclosure.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2521, "commentStart": 2531,
"end": 2542, "end": 2552,
"start": 2521, "start": 2531,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentB002" "value": "rectangleSegmentB002"
}, },
@ -922,9 +922,9 @@ description: Variables in memory after executing enclosure.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2644, "commentStart": 2654,
"end": 2665, "end": 2675,
"start": 2644, "start": 2654,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentC002" "value": "rectangleSegmentC002"
}, },
@ -935,9 +935,9 @@ description: Variables in memory after executing enclosure.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2735, "commentStart": 2745,
"end": 2756, "end": 2766,
"start": 2735, "start": 2745,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentD002" "value": "rectangleSegmentD002"
}, },
@ -958,9 +958,9 @@ description: Variables in memory after executing enclosure.kcl
0.0 0.0
], ],
"tag": { "tag": {
"commentStart": 2416, "commentStart": 2426,
"end": 2437, "end": 2447,
"start": 2416, "start": 2426,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentA002" "value": "rectangleSegmentA002"
}, },
@ -983,9 +983,9 @@ description: Variables in memory after executing enclosure.kcl
0.0 0.0
], ],
"tag": { "tag": {
"commentStart": 2521, "commentStart": 2531,
"end": 2542, "end": 2552,
"start": 2521, "start": 2531,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentB002" "value": "rectangleSegmentB002"
}, },
@ -1008,9 +1008,9 @@ description: Variables in memory after executing enclosure.kcl
175.0 175.0
], ],
"tag": { "tag": {
"commentStart": 2644, "commentStart": 2654,
"end": 2665, "end": 2675,
"start": 2644, "start": 2654,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentC002" "value": "rectangleSegmentC002"
}, },
@ -1033,9 +1033,9 @@ description: Variables in memory after executing enclosure.kcl
175.0 175.0
], ],
"tag": { "tag": {
"commentStart": 2735, "commentStart": 2745,
"end": 2756, "end": 2766,
"start": 2735, "start": 2745,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentD002" "value": "rectangleSegmentD002"
}, },
@ -1668,9 +1668,9 @@ description: Variables in memory after executing enclosure.kcl
0.0 0.0
], ],
"tag": { "tag": {
"commentStart": 2416, "commentStart": 2426,
"end": 2437, "end": 2447,
"start": 2416, "start": 2426,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentA002" "value": "rectangleSegmentA002"
}, },
@ -1693,9 +1693,9 @@ description: Variables in memory after executing enclosure.kcl
0.0 0.0
], ],
"tag": { "tag": {
"commentStart": 2521, "commentStart": 2531,
"end": 2542, "end": 2552,
"start": 2521, "start": 2531,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentB002" "value": "rectangleSegmentB002"
}, },
@ -1718,9 +1718,9 @@ description: Variables in memory after executing enclosure.kcl
175.0 175.0
], ],
"tag": { "tag": {
"commentStart": 2644, "commentStart": 2654,
"end": 2665, "end": 2675,
"start": 2644, "start": 2654,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentC002" "value": "rectangleSegmentC002"
}, },
@ -1743,9 +1743,9 @@ description: Variables in memory after executing enclosure.kcl
175.0 175.0
], ],
"tag": { "tag": {
"commentStart": 2735, "commentStart": 2745,
"end": 2756, "end": 2766,
"start": 2735, "start": 2745,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentD002" "value": "rectangleSegmentD002"
}, },
@ -1867,9 +1867,9 @@ description: Variables in memory after executing enclosure.kcl
3.0 3.0
], ],
"tag": { "tag": {
"commentStart": 4078, "commentStart": 4128,
"end": 4099, "end": 4149,
"start": 4078, "start": 4128,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentA003" "value": "rectangleSegmentA003"
}, },
@ -1892,9 +1892,9 @@ description: Variables in memory after executing enclosure.kcl
3.0 3.0
], ],
"tag": { "tag": {
"commentStart": 4205, "commentStart": 4255,
"end": 4226, "end": 4276,
"start": 4205, "start": 4255,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentB003" "value": "rectangleSegmentB003"
}, },
@ -1917,9 +1917,9 @@ description: Variables in memory after executing enclosure.kcl
172.0 172.0
], ],
"tag": { "tag": {
"commentStart": 4328, "commentStart": 4378,
"end": 4349, "end": 4399,
"start": 4328, "start": 4378,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentC003" "value": "rectangleSegmentC003"
}, },
@ -1942,9 +1942,9 @@ description: Variables in memory after executing enclosure.kcl
172.0 172.0
], ],
"tag": { "tag": {
"commentStart": 4419, "commentStart": 4469,
"end": 4440, "end": 4490,
"start": 4419, "start": 4469,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentD003" "value": "rectangleSegmentD003"
}, },
@ -2008,9 +2008,9 @@ description: Variables in memory after executing enclosure.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2416, "commentStart": 2426,
"end": 2437, "end": 2447,
"start": 2416, "start": 2426,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentA002" "value": "rectangleSegmentA002"
}, },
@ -2021,9 +2021,9 @@ description: Variables in memory after executing enclosure.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2521, "commentStart": 2531,
"end": 2542, "end": 2552,
"start": 2521, "start": 2531,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentB002" "value": "rectangleSegmentB002"
}, },
@ -2034,9 +2034,9 @@ description: Variables in memory after executing enclosure.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2644, "commentStart": 2654,
"end": 2665, "end": 2675,
"start": 2644, "start": 2654,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentC002" "value": "rectangleSegmentC002"
}, },
@ -2047,9 +2047,9 @@ description: Variables in memory after executing enclosure.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2735, "commentStart": 2745,
"end": 2756, "end": 2766,
"start": 2735, "start": 2745,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentD002" "value": "rectangleSegmentD002"
}, },
@ -2070,9 +2070,9 @@ description: Variables in memory after executing enclosure.kcl
0.0 0.0
], ],
"tag": { "tag": {
"commentStart": 2416, "commentStart": 2426,
"end": 2437, "end": 2447,
"start": 2416, "start": 2426,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentA002" "value": "rectangleSegmentA002"
}, },
@ -2095,9 +2095,9 @@ description: Variables in memory after executing enclosure.kcl
0.0 0.0
], ],
"tag": { "tag": {
"commentStart": 2521, "commentStart": 2531,
"end": 2542, "end": 2552,
"start": 2521, "start": 2531,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentB002" "value": "rectangleSegmentB002"
}, },
@ -2120,9 +2120,9 @@ description: Variables in memory after executing enclosure.kcl
175.0 175.0
], ],
"tag": { "tag": {
"commentStart": 2644, "commentStart": 2654,
"end": 2665, "end": 2675,
"start": 2644, "start": 2654,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentC002" "value": "rectangleSegmentC002"
}, },
@ -2145,9 +2145,9 @@ description: Variables in memory after executing enclosure.kcl
175.0 175.0
], ],
"tag": { "tag": {
"commentStart": 2735, "commentStart": 2745,
"end": 2756, "end": 2766,
"start": 2735, "start": 2745,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "rectangleSegmentD002" "value": "rectangleSegmentD002"
}, },

104
rust/kcl-lib/tests/kcl_samples/exhaust-manifold/artifact_graph_flowchart.snap.md
View File

@ -14,8 +14,8 @@ flowchart LR
11[Solid2d] 11[Solid2d]
end end
subgraph path12 [Path] subgraph path12 [Path]
12["Path<br>[1298, 1376, 0]"] 12["Path<br>[1311, 1389, 0]"]
13["Segment<br>[1298, 1376, 0]"] 13["Segment<br>[1311, 1389, 0]"]
14[Solid2d] 14[Solid2d]
end end
subgraph path20 [Path] subgraph path20 [Path]
@ -32,8 +32,8 @@ flowchart LR
29[Solid2d] 29[Solid2d]
end end
subgraph path30 [Path] subgraph path30 [Path]
30["Path<br>[1298, 1376, 0]"] 30["Path<br>[1311, 1389, 0]"]
31["Segment<br>[1298, 1376, 0]"] 31["Segment<br>[1311, 1389, 0]"]
32[Solid2d] 32[Solid2d]
end end
subgraph path38 [Path] subgraph path38 [Path]
@ -50,8 +50,8 @@ flowchart LR
47[Solid2d] 47[Solid2d]
end end
subgraph path48 [Path] subgraph path48 [Path]
48["Path<br>[1298, 1376, 0]"] 48["Path<br>[1311, 1389, 0]"]
49["Segment<br>[1298, 1376, 0]"] 49["Segment<br>[1311, 1389, 0]"]
50[Solid2d] 50[Solid2d]
end end
subgraph path56 [Path] subgraph path56 [Path]
@ -68,97 +68,97 @@ flowchart LR
65[Solid2d] 65[Solid2d]
end end
subgraph path66 [Path] subgraph path66 [Path]
66["Path<br>[1298, 1376, 0]"] 66["Path<br>[1311, 1389, 0]"]
67["Segment<br>[1298, 1376, 0]"] 67["Segment<br>[1311, 1389, 0]"]
68[Solid2d] 68[Solid2d]
end end
subgraph path74 [Path] subgraph path74 [Path]
74["Path<br>[1703, 1738, 0]"] 74["Path<br>[1713, 1748, 0]"]
75["Segment<br>[1744, 1778, 0]"] 75["Segment<br>[1754, 1788, 0]"]
76["Segment<br>[1784, 1823, 0]"] 76["Segment<br>[1794, 1833, 0]"]
77["Segment<br>[1829, 1867, 0]"] 77["Segment<br>[1839, 1877, 0]"]
78["Segment<br>[1873, 1912, 0]"] 78["Segment<br>[1883, 1922, 0]"]
79["Segment<br>[1918, 1952, 0]"] 79["Segment<br>[1928, 1962, 0]"]
80["Segment<br>[1958, 2001, 0]"] 80["Segment<br>[1968, 2011, 0]"]
81["Segment<br>[2007, 2040, 0]"] 81["Segment<br>[2017, 2050, 0]"]
82["Segment<br>[2046, 2085, 0]"] 82["Segment<br>[2056, 2095, 0]"]
83["Segment<br>[2091, 2130, 0]"] 83["Segment<br>[2101, 2140, 0]"]
84["Segment<br>[2136, 2175, 0]"] 84["Segment<br>[2146, 2185, 0]"]
85["Segment<br>[2181, 2224, 0]"] 85["Segment<br>[2191, 2234, 0]"]
86["Segment<br>[2230, 2281, 0]"] 86["Segment<br>[2240, 2291, 0]"]
87["Segment<br>[2287, 2331, 0]"] 87["Segment<br>[2297, 2341, 0]"]
88["Segment<br>[2337, 2376, 0]"] 88["Segment<br>[2347, 2386, 0]"]
89["Segment<br>[2382, 2420, 0]"] 89["Segment<br>[2392, 2430, 0]"]
90["Segment<br>[2426, 2491, 0]"] 90["Segment<br>[2436, 2501, 0]"]
91["Segment<br>[2497, 2504, 0]"] 91["Segment<br>[2507, 2514, 0]"]
92[Solid2d] 92[Solid2d]
end end
subgraph path93 [Path] subgraph path93 [Path]
93["Path<br>[2576, 2649, 0]"] 93["Path<br>[2599, 2672, 0]"]
94["Segment<br>[2576, 2649, 0]"] 94["Segment<br>[2599, 2672, 0]"]
95[Solid2d] 95[Solid2d]
end end
subgraph path96 [Path] subgraph path96 [Path]
96["Path<br>[2664, 2737, 0]"] 96["Path<br>[2697, 2770, 0]"]
97["Segment<br>[2664, 2737, 0]"] 97["Segment<br>[2697, 2770, 0]"]
98[Solid2d] 98[Solid2d]
end end
subgraph path99 [Path] subgraph path99 [Path]
99["Path<br>[2752, 2825, 0]"] 99["Path<br>[2795, 2868, 0]"]
100["Segment<br>[2752, 2825, 0]"] 100["Segment<br>[2795, 2868, 0]"]
101[Solid2d] 101[Solid2d]
end end
subgraph path102 [Path] subgraph path102 [Path]
102["Path<br>[2840, 2913, 0]"] 102["Path<br>[2893, 2966, 0]"]
103["Segment<br>[2840, 2913, 0]"] 103["Segment<br>[2893, 2966, 0]"]
104[Solid2d] 104[Solid2d]
end end
subgraph path105 [Path] subgraph path105 [Path]
105["Path<br>[2967, 3106, 0]"] 105["Path<br>[3030, 3169, 0]"]
106["Segment<br>[2967, 3106, 0]"] 106["Segment<br>[3030, 3169, 0]"]
107[Solid2d] 107[Solid2d]
end end
subgraph path108 [Path] subgraph path108 [Path]
108["Path<br>[3121, 3258, 0]"] 108["Path<br>[3194, 3331, 0]"]
109["Segment<br>[3121, 3258, 0]"] 109["Segment<br>[3194, 3331, 0]"]
110[Solid2d] 110[Solid2d]
end end
subgraph path111 [Path] subgraph path111 [Path]
111["Path<br>[3273, 3420, 0]"] 111["Path<br>[3356, 3503, 0]"]
112["Segment<br>[3273, 3420, 0]"] 112["Segment<br>[3356, 3503, 0]"]
113[Solid2d] 113[Solid2d]
end end
subgraph path114 [Path] subgraph path114 [Path]
114["Path<br>[3435, 3581, 0]"] 114["Path<br>[3528, 3674, 0]"]
115["Segment<br>[3435, 3581, 0]"] 115["Segment<br>[3528, 3674, 0]"]
116[Solid2d] 116[Solid2d]
end end
1["Plane<br>[748, 773, 0]"] 1["Plane<br>[748, 773, 0]"]
8["Plane<br>[1198, 1215, 0]"] 8["Plane<br>[1198, 1215, 0]"]
15["Sweep Sweep<br>[1388, 1411, 0]"] 15["Sweep Sweep<br>[1398, 1421, 0]"]
16[Wall] 16[Wall]
17["Cap Start"] 17["Cap Start"]
18["Cap End"] 18["Cap End"]
19["Plane<br>[748, 773, 0]"] 19["Plane<br>[748, 773, 0]"]
26["Plane<br>[1198, 1215, 0]"] 26["Plane<br>[1198, 1215, 0]"]
33["Sweep Sweep<br>[1388, 1411, 0]"] 33["Sweep Sweep<br>[1398, 1421, 0]"]
34[Wall] 34[Wall]
35["Cap Start"] 35["Cap Start"]
36["Cap End"] 36["Cap End"]
37["Plane<br>[748, 773, 0]"] 37["Plane<br>[748, 773, 0]"]
44["Plane<br>[1198, 1215, 0]"] 44["Plane<br>[1198, 1215, 0]"]
51["Sweep Sweep<br>[1388, 1411, 0]"] 51["Sweep Sweep<br>[1398, 1421, 0]"]
52[Wall] 52[Wall]
53["Cap Start"] 53["Cap Start"]
54["Cap End"] 54["Cap End"]
55["Plane<br>[748, 773, 0]"] 55["Plane<br>[748, 773, 0]"]
62["Plane<br>[1198, 1215, 0]"] 62["Plane<br>[1198, 1215, 0]"]
69["Sweep Sweep<br>[1388, 1411, 0]"] 69["Sweep Sweep<br>[1398, 1421, 0]"]
70[Wall] 70[Wall]
71["Cap Start"] 71["Cap Start"]
72["Cap End"] 72["Cap End"]
73["Plane<br>[1680, 1697, 0]"] 73["Plane<br>[1690, 1707, 0]"]
117["Sweep Extrusion<br>[3637, 3666, 0]"] 117["Sweep Extrusion<br>[3727, 3756, 0]"]
118[Wall] 118[Wall]
119[Wall] 119[Wall]
120[Wall] 120[Wall]
@ -193,10 +193,10 @@ flowchart LR
149["SweepEdge Opposite"] 149["SweepEdge Opposite"]
150["SweepEdge Opposite"] 150["SweepEdge Opposite"]
151["SweepEdge Adjacent"] 151["SweepEdge Adjacent"]
152["EdgeCut Fillet<br>[3672, 3806, 0]"] 152["EdgeCut Fillet<br>[3762, 3896, 0]"]
153["EdgeCut Fillet<br>[3672, 3806, 0]"] 153["EdgeCut Fillet<br>[3762, 3896, 0]"]
154["EdgeCut Fillet<br>[3812, 3946, 0]"] 154["EdgeCut Fillet<br>[3902, 4036, 0]"]
155["EdgeCut Fillet<br>[3812, 3946, 0]"] 155["EdgeCut Fillet<br>[3902, 4036, 0]"]
1 --- 2 1 --- 2
2 --- 3 2 --- 3
2 --- 4 2 --- 4

216
rust/kcl-lib/tests/kcl_samples/exhaust-manifold/ast.snap
View File

@ -1410,6 +1410,15 @@ description: Result of parsing exhaust-manifold.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -1550,13 +1559,7 @@ description: Result of parsing exhaust-manifold.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -1566,7 +1569,7 @@ description: Result of parsing exhaust-manifold.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -1577,8 +1580,9 @@ description: Result of parsing exhaust-manifold.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
@ -3580,6 +3584,15 @@ description: Result of parsing exhaust-manifold.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -3716,13 +3729,7 @@ description: Result of parsing exhaust-manifold.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -3732,7 +3739,7 @@ description: Result of parsing exhaust-manifold.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -3743,12 +3750,22 @@ description: Result of parsing exhaust-manifold.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -3885,13 +3902,7 @@ description: Result of parsing exhaust-manifold.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -3901,7 +3912,7 @@ description: Result of parsing exhaust-manifold.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -3912,12 +3923,22 @@ description: Result of parsing exhaust-manifold.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -4054,13 +4075,7 @@ description: Result of parsing exhaust-manifold.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -4070,7 +4085,7 @@ description: Result of parsing exhaust-manifold.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -4081,12 +4096,22 @@ description: Result of parsing exhaust-manifold.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -4223,13 +4248,7 @@ description: Result of parsing exhaust-manifold.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -4239,7 +4258,7 @@ description: Result of parsing exhaust-manifold.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -4250,12 +4269,22 @@ description: Result of parsing exhaust-manifold.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -4428,13 +4457,7 @@ description: Result of parsing exhaust-manifold.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -4444,7 +4467,7 @@ description: Result of parsing exhaust-manifold.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -4455,12 +4478,22 @@ description: Result of parsing exhaust-manifold.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -4617,13 +4650,7 @@ description: Result of parsing exhaust-manifold.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -4633,7 +4660,7 @@ description: Result of parsing exhaust-manifold.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -4644,12 +4671,22 @@ description: Result of parsing exhaust-manifold.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -4846,13 +4883,7 @@ description: Result of parsing exhaust-manifold.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -4862,7 +4893,7 @@ description: Result of parsing exhaust-manifold.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -4873,12 +4904,22 @@ description: Result of parsing exhaust-manifold.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -5083,13 +5124,7 @@ description: Result of parsing exhaust-manifold.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -5099,7 +5134,7 @@ description: Result of parsing exhaust-manifold.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -5110,8 +5145,9 @@ description: Result of parsing exhaust-manifold.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [

284
rust/kcl-lib/tests/kcl_samples/exhaust-manifold/ops.snap
View File

@ -10,7 +10,7 @@ description: Operations executed exhaust-manifold.kcl
"name": "primaryTube", "name": "primaryTube",
"functionSourceRange": [ "functionSourceRange": [
330, 330,
1428, 1438,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -289,16 +289,7 @@ description: Operations executed exhaust-manifold.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -308,10 +299,18 @@ description: Operations executed exhaust-manifold.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -348,7 +347,7 @@ description: Operations executed exhaust-manifold.kcl
"name": "primaryTube", "name": "primaryTube",
"functionSourceRange": [ "functionSourceRange": [
330, 330,
1428, 1438,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -627,16 +626,7 @@ description: Operations executed exhaust-manifold.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -646,10 +636,18 @@ description: Operations executed exhaust-manifold.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -686,7 +684,7 @@ description: Operations executed exhaust-manifold.kcl
"name": "primaryTube", "name": "primaryTube",
"functionSourceRange": [ "functionSourceRange": [
330, 330,
1428, 1438,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -965,16 +963,7 @@ description: Operations executed exhaust-manifold.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -984,10 +973,18 @@ description: Operations executed exhaust-manifold.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1024,7 +1021,7 @@ description: Operations executed exhaust-manifold.kcl
"name": "primaryTube", "name": "primaryTube",
"functionSourceRange": [ "functionSourceRange": [
330, 330,
1428, 1438,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -1303,16 +1300,7 @@ description: Operations executed exhaust-manifold.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1322,10 +1310,18 @@ description: Operations executed exhaust-manifold.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1372,16 +1368,7 @@ description: Operations executed exhaust-manifold.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1391,23 +1378,22 @@ description: Operations executed exhaust-manifold.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1417,23 +1403,22 @@ description: Operations executed exhaust-manifold.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1443,23 +1428,22 @@ description: Operations executed exhaust-manifold.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1469,23 +1453,22 @@ description: Operations executed exhaust-manifold.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1495,23 +1478,22 @@ description: Operations executed exhaust-manifold.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1521,23 +1503,22 @@ description: Operations executed exhaust-manifold.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1547,23 +1528,22 @@ description: Operations executed exhaust-manifold.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1573,10 +1553,18 @@ description: Operations executed exhaust-manifold.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {

84
rust/kcl-lib/tests/kcl_samples/exhaust-manifold/program_memory.snap
View File

@ -28,9 +28,9 @@ description: Variables in memory after executing exhaust-manifold.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 1771, "commentStart": 1781,
"end": 1777, "end": 1787,
"start": 1771, "start": 1781,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "seg01" "value": "seg01"
}, },
@ -62,9 +62,9 @@ description: Variables in memory after executing exhaust-manifold.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 1945, "commentStart": 1955,
"end": 1951, "end": 1961,
"start": 1945, "start": 1955,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "seg03" "value": "seg03"
}, },
@ -75,9 +75,9 @@ description: Variables in memory after executing exhaust-manifold.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 1994, "commentStart": 2004,
"end": 2000, "end": 2010,
"start": 1994, "start": 2004,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "seg04" "value": "seg04"
}, },
@ -88,9 +88,9 @@ description: Variables in memory after executing exhaust-manifold.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2033, "commentStart": 2043,
"end": 2039, "end": 2049,
"start": 2033, "start": 2043,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "seg05" "value": "seg05"
}, },
@ -122,9 +122,9 @@ description: Variables in memory after executing exhaust-manifold.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2217, "commentStart": 2227,
"end": 2223, "end": 2233,
"start": 2217, "start": 2227,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "seg07" "value": "seg07"
}, },
@ -135,9 +135,9 @@ description: Variables in memory after executing exhaust-manifold.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2274, "commentStart": 2284,
"end": 2280, "end": 2290,
"start": 2274, "start": 2284,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "seg08" "value": "seg08"
}, },
@ -148,9 +148,9 @@ description: Variables in memory after executing exhaust-manifold.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2324, "commentStart": 2334,
"end": 2330, "end": 2340,
"start": 2324, "start": 2334,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "seg09" "value": "seg09"
}, },
@ -192,9 +192,9 @@ description: Variables in memory after executing exhaust-manifold.kcl
-1.25 -1.25
], ],
"tag": { "tag": {
"commentStart": 1771, "commentStart": 1781,
"end": 1777, "end": 1787,
"start": 1771, "start": 1781,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "seg01" "value": "seg01"
}, },
@ -289,9 +289,9 @@ description: Variables in memory after executing exhaust-manifold.kcl
-1.25 -1.25
], ],
"tag": { "tag": {
"commentStart": 1945, "commentStart": 1955,
"end": 1951, "end": 1961,
"start": 1945, "start": 1955,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "seg03" "value": "seg03"
}, },
@ -314,9 +314,9 @@ description: Variables in memory after executing exhaust-manifold.kcl
-1.25 -1.25
], ],
"tag": { "tag": {
"commentStart": 1994, "commentStart": 2004,
"end": 2000, "end": 2010,
"start": 1994, "start": 2004,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "seg04" "value": "seg04"
}, },
@ -339,9 +339,9 @@ description: Variables in memory after executing exhaust-manifold.kcl
1.35 1.35
], ],
"tag": { "tag": {
"commentStart": 2033, "commentStart": 2043,
"end": 2039, "end": 2049,
"start": 2033, "start": 2043,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "seg05" "value": "seg05"
}, },
@ -436,9 +436,9 @@ description: Variables in memory after executing exhaust-manifold.kcl
1.35 1.35
], ],
"tag": { "tag": {
"commentStart": 2217, "commentStart": 2227,
"end": 2223, "end": 2233,
"start": 2217, "start": 2227,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "seg07" "value": "seg07"
}, },
@ -461,9 +461,9 @@ description: Variables in memory after executing exhaust-manifold.kcl
1.35 1.35
], ],
"tag": { "tag": {
"commentStart": 2274, "commentStart": 2284,
"end": 2280, "end": 2290,
"start": 2274, "start": 2284,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "seg08" "value": "seg08"
}, },
@ -486,9 +486,9 @@ description: Variables in memory after executing exhaust-manifold.kcl
-1.25 -1.25
], ],
"tag": { "tag": {
"commentStart": 2324, "commentStart": 2334,
"end": 2330, "end": 2340,
"start": 2324, "start": 2334,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "seg09" "value": "seg09"
}, },

26
rust/kcl-lib/tests/kcl_samples/flange/artifact_graph_flowchart.snap.md
View File

@ -11,37 +11,37 @@ flowchart LR
8[Solid2d] 8[Solid2d]
end end
subgraph path13 [Path] subgraph path13 [Path]
13["Path<br>[1403, 1457, 0]"] 13["Path<br>[1413, 1467, 0]"]
14["Segment<br>[1403, 1457, 0]"] 14["Segment<br>[1413, 1467, 0]"]
15[Solid2d] 15[Solid2d]
end end
subgraph path19 [Path] subgraph path19 [Path]
19["Path<br>[1620, 1677, 0]"] 19["Path<br>[1630, 1687, 0]"]
20["Segment<br>[1620, 1677, 0]"] 20["Segment<br>[1630, 1687, 0]"]
21[Solid2d] 21[Solid2d]
end end
subgraph path25 [Path] subgraph path25 [Path]
25["Path<br>[1812, 1857, 0]"] 25["Path<br>[1822, 1867, 0]"]
26["Segment<br>[1812, 1857, 0]"] 26["Segment<br>[1822, 1867, 0]"]
27[Solid2d] 27[Solid2d]
end end
1["Plane<br>[840, 857, 0]"] 1["Plane<br>[840, 857, 0]"]
5["Plane<br>[1162, 1179, 0]"] 5["Plane<br>[1162, 1179, 0]"]
9["Sweep Extrusion<br>[1258, 1289, 0]"] 9["Sweep Extrusion<br>[1268, 1299, 0]"]
10[Wall] 10[Wall]
11["Cap Start"] 11["Cap Start"]
12["Cap End"] 12["Cap End"]
16["Sweep Extrusion<br>[1463, 1498, 0]"] 16["Sweep Extrusion<br>[1473, 1508, 0]"]
17[Wall] 17[Wall]
18["Cap End"] 18["Cap End"]
22["Sweep Extrusion<br>[1683, 1716, 0]"] 22["Sweep Extrusion<br>[1693, 1726, 0]"]
23[Wall] 23[Wall]
24["Cap End"] 24["Cap End"]
28["Sweep Extrusion<br>[1863, 1938, 0]"] 28["Sweep Extrusion<br>[1873, 1948, 0]"]
29[Wall] 29[Wall]
30["StartSketchOnFace<br>[1360, 1397, 0]"] 30["StartSketchOnFace<br>[1370, 1407, 0]"]
31["StartSketchOnFace<br>[1575, 1614, 0]"] 31["StartSketchOnFace<br>[1585, 1624, 0]"]
32["StartSketchOnFace<br>[1767, 1806, 0]"] 32["StartSketchOnFace<br>[1777, 1816, 0]"]
1 --- 2 1 --- 2
2 --- 3 2 --- 3
2 --- 4 2 --- 4

24
rust/kcl-lib/tests/kcl_samples/flange/ast.snap
View File

@ -1053,6 +1053,15 @@ description: Result of parsing flange.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -1067,13 +1076,7 @@ description: Result of parsing flange.kcl
"start": 0, "start": 0,
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -1083,7 +1086,7 @@ description: Result of parsing flange.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -1094,8 +1097,9 @@ description: Result of parsing flange.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [

13
rust/kcl-lib/tests/kcl_samples/flange/ops.snap
View File

@ -35,7 +35,7 @@ description: Operations executed flange.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": { "value": {
"type": "Array", "type": "Array",
"value": [ "value": [
@ -66,8 +66,12 @@ description: Operations executed flange.kcl
] ]
}, },
"sourceRange": [] "sourceRange": []
}
}, },
"sketch": { "name": "subtract2d",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -77,11 +81,6 @@ description: Operations executed flange.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {

58
rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/artifact_graph_flowchart.snap.md
View File

@ -21,36 +21,36 @@ flowchart LR
36[Solid2d] 36[Solid2d]
end end
subgraph path37 [Path] subgraph path37 [Path]
37["Path<br>[2649, 2812, 0]"] 37["Path<br>[2662, 2825, 0]"]
38["Segment<br>[2649, 2812, 0]"] 38["Segment<br>[2662, 2825, 0]"]
39[Solid2d] 39[Solid2d]
end end
subgraph path54 [Path] subgraph path54 [Path]
54["Path<br>[3197, 3252, 0]"] 54["Path<br>[3207, 3262, 0]"]
55["Segment<br>[3258, 3312, 0]"] 55["Segment<br>[3268, 3322, 0]"]
56["Segment<br>[3318, 3368, 0]"] 56["Segment<br>[3328, 3378, 0]"]
57["Segment<br>[3374, 3427, 0]"] 57["Segment<br>[3384, 3437, 0]"]
58["Segment<br>[3433, 3453, 0]"] 58["Segment<br>[3443, 3463, 0]"]
59[Solid2d] 59[Solid2d]
end end
subgraph path60 [Path] subgraph path60 [Path]
60["Path<br>[3464, 3630, 0]"] 60["Path<br>[3487, 3653, 0]"]
61["Segment<br>[3464, 3630, 0]"] 61["Segment<br>[3487, 3653, 0]"]
62[Solid2d] 62[Solid2d]
end end
subgraph path77 [Path] subgraph path77 [Path]
77["Path<br>[4213, 4254, 0]"] 77["Path<br>[4233, 4274, 0]"]
78["Segment<br>[4260, 4280, 0]"] 78["Segment<br>[4280, 4300, 0]"]
79["Segment<br>[4286, 4309, 0]"] 79["Segment<br>[4306, 4329, 0]"]
80["Segment<br>[4315, 4322, 0]"] 80["Segment<br>[4335, 4342, 0]"]
81[Solid2d] 81[Solid2d]
end end
subgraph path91 [Path] subgraph path91 [Path]
91["Path<br>[4437, 4477, 0]"] 91["Path<br>[4457, 4497, 0]"]
92["Segment<br>[4483, 4503, 0]"] 92["Segment<br>[4503, 4523, 0]"]
93["Segment<br>[4509, 4530, 0]"] 93["Segment<br>[4529, 4550, 0]"]
94["Segment<br>[4536, 4557, 0]"] 94["Segment<br>[4556, 4577, 0]"]
95["Segment<br>[4563, 4570, 0]"] 95["Segment<br>[4583, 4590, 0]"]
96[Solid2d] 96[Solid2d]
end end
1["Plane<br>[1199, 1226, 0]"] 1["Plane<br>[1199, 1226, 0]"]
@ -73,7 +73,7 @@ flowchart LR
28["SweepEdge Opposite"] 28["SweepEdge Opposite"]
29["SweepEdge Opposite"] 29["SweepEdge Opposite"]
30["Plane<br>[2354, 2377, 0]"] 30["Plane<br>[2354, 2377, 0]"]
40["Sweep Extrusion<br>[2822, 2847, 0]"] 40["Sweep Extrusion<br>[2832, 2857, 0]"]
41[Wall] 41[Wall]
42[Wall] 42[Wall]
43[Wall] 43[Wall]
@ -84,10 +84,10 @@ flowchart LR
48["SweepEdge Opposite"] 48["SweepEdge Opposite"]
49["SweepEdge Opposite"] 49["SweepEdge Opposite"]
50["SweepEdge Adjacent"] 50["SweepEdge Adjacent"]
51["EdgeCut Fillet<br>[2853, 2998, 0]"] 51["EdgeCut Fillet<br>[2863, 3008, 0]"]
52["EdgeCut Fillet<br>[2853, 2998, 0]"] 52["EdgeCut Fillet<br>[2863, 3008, 0]"]
53["Plane<br>[3168, 3191, 0]"] 53["Plane<br>[3178, 3201, 0]"]
63["Sweep Extrusion<br>[3640, 3665, 0]"] 63["Sweep Extrusion<br>[3660, 3685, 0]"]
64[Wall] 64[Wall]
65[Wall] 65[Wall]
66[Wall] 66[Wall]
@ -98,10 +98,10 @@ flowchart LR
71["SweepEdge Opposite"] 71["SweepEdge Opposite"]
72["SweepEdge Opposite"] 72["SweepEdge Opposite"]
73["SweepEdge Adjacent"] 73["SweepEdge Adjacent"]
74["EdgeCut Fillet<br>[3671, 3816, 0]"] 74["EdgeCut Fillet<br>[3691, 3836, 0]"]
75["EdgeCut Fillet<br>[3671, 3816, 0]"] 75["EdgeCut Fillet<br>[3691, 3836, 0]"]
76["Plane<br>[4184, 4207, 0]"] 76["Plane<br>[4204, 4227, 0]"]
82["Sweep Extrusion<br>[4328, 4356, 0]"] 82["Sweep Extrusion<br>[4348, 4376, 0]"]
83[Wall] 83[Wall]
84[Wall] 84[Wall]
85[Wall] 85[Wall]
@ -109,8 +109,8 @@ flowchart LR
87["Cap End"] 87["Cap End"]
88["SweepEdge Opposite"] 88["SweepEdge Opposite"]
89["SweepEdge Opposite"] 89["SweepEdge Opposite"]
90["Plane<br>[4408, 4431, 0]"] 90["Plane<br>[4428, 4451, 0]"]
97["Sweep Extrusion<br>[4576, 4604, 0]"] 97["Sweep Extrusion<br>[4596, 4624, 0]"]
98[Wall] 98[Wall]
99[Wall] 99[Wall]
100[Wall] 100[Wall]

48
rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/ast.snap
View File

@ -4815,6 +4815,15 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -5131,13 +5140,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -5147,7 +5150,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -5158,8 +5161,9 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
@ -6335,6 +6339,15 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -6659,13 +6672,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -6675,7 +6682,7 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -6686,8 +6693,9 @@ description: Result of parsing focusrite-scarlett-mounting-bracket.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [

46
rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/ops.snap
View File

@ -495,16 +495,7 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -514,10 +505,18 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -888,16 +887,7 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -907,10 +897,18 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {

96
rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/program_memory.snap
View File

@ -1856,9 +1856,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 3304, "commentStart": 3314,
"end": 3311, "end": 3321,
"start": 3304, "start": 3314,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "edge21" "value": "edge21"
}, },
@ -1869,9 +1869,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 3360, "commentStart": 3370,
"end": 3367, "end": 3377,
"start": 3360, "start": 3370,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "edge22" "value": "edge22"
}, },
@ -1882,9 +1882,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 3419, "commentStart": 3429,
"end": 3426, "end": 3436,
"start": 3419, "start": 3429,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "edge23" "value": "edge23"
}, },
@ -1895,9 +1895,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 3445, "commentStart": 3455,
"end": 3452, "end": 3462,
"start": 3445, "start": 3455,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "edge24" "value": "edge24"
}, },
@ -1918,9 +1918,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
44.0 44.0
], ],
"tag": { "tag": {
"commentStart": 3304, "commentStart": 3314,
"end": 3311, "end": 3321,
"start": 3304, "start": 3314,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "edge21" "value": "edge21"
}, },
@ -1943,9 +1943,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
35.6667 35.6667
], ],
"tag": { "tag": {
"commentStart": 3360, "commentStart": 3370,
"end": 3367, "end": 3377,
"start": 3360, "start": 3370,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "edge22" "value": "edge22"
}, },
@ -1968,9 +1968,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
19.0 19.0
], ],
"tag": { "tag": {
"commentStart": 3419, "commentStart": 3429,
"end": 3426, "end": 3436,
"start": 3419, "start": 3429,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "edge23" "value": "edge23"
}, },
@ -1993,9 +1993,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
10.6667 10.6667
], ],
"tag": { "tag": {
"commentStart": 3445, "commentStart": 3455,
"end": 3452, "end": 3462,
"start": 3445, "start": 3455,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "edge24" "value": "edge24"
}, },
@ -2140,9 +2140,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 3304, "commentStart": 3314,
"end": 3311, "end": 3321,
"start": 3304, "start": 3314,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "edge21" "value": "edge21"
}, },
@ -2153,9 +2153,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 3360, "commentStart": 3370,
"end": 3367, "end": 3377,
"start": 3360, "start": 3370,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "edge22" "value": "edge22"
}, },
@ -2166,9 +2166,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 3419, "commentStart": 3429,
"end": 3426, "end": 3436,
"start": 3419, "start": 3429,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "edge23" "value": "edge23"
}, },
@ -2179,9 +2179,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 3445, "commentStart": 3455,
"end": 3452, "end": 3462,
"start": 3445, "start": 3455,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "edge24" "value": "edge24"
}, },
@ -2202,9 +2202,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
44.0 44.0
], ],
"tag": { "tag": {
"commentStart": 3304, "commentStart": 3314,
"end": 3311, "end": 3321,
"start": 3304, "start": 3314,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "edge21" "value": "edge21"
}, },
@ -2227,9 +2227,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
35.6667 35.6667
], ],
"tag": { "tag": {
"commentStart": 3360, "commentStart": 3370,
"end": 3367, "end": 3377,
"start": 3360, "start": 3370,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "edge22" "value": "edge22"
}, },
@ -2252,9 +2252,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
19.0 19.0
], ],
"tag": { "tag": {
"commentStart": 3419, "commentStart": 3429,
"end": 3426, "end": 3436,
"start": 3419, "start": 3429,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "edge23" "value": "edge23"
}, },
@ -2277,9 +2277,9 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
10.6667 10.6667
], ],
"tag": { "tag": {
"commentStart": 3445, "commentStart": 3455,
"end": 3452, "end": 3462,
"start": 3445, "start": 3455,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "edge24" "value": "edge24"
}, },

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

@ -37,27 +37,27 @@ flowchart LR
29[Solid2d] 29[Solid2d]
end end
subgraph path44 [Path] subgraph path44 [Path]
44["Path<br>[2714, 2770, 0]"] 44["Path<br>[2744, 2800, 0]"]
45["Segment<br>[2776, 2835, 0]"] 45["Segment<br>[2806, 2865, 0]"]
46["Segment<br>[2841, 2876, 0]"] 46["Segment<br>[2871, 2906, 0]"]
47["Segment<br>[2882, 2915, 0]"] 47["Segment<br>[2912, 2945, 0]"]
48["Segment<br>[2921, 2980, 0]"] 48["Segment<br>[2951, 3010, 0]"]
49["Segment<br>[2986, 3022, 0]"] 49["Segment<br>[3016, 3052, 0]"]
50["Segment<br>[3028, 3052, 0]"] 50["Segment<br>[3058, 3082, 0]"]
51["Segment<br>[3058, 3065, 0]"] 51["Segment<br>[3088, 3095, 0]"]
52[Solid2d] 52[Solid2d]
end end
subgraph path71 [Path] subgraph path71 [Path]
71["Path<br>[3660, 3710, 0]"] 71["Path<br>[3690, 3740, 0]"]
72["Segment<br>[3716, 3766, 0]"] 72["Segment<br>[3746, 3796, 0]"]
73["Segment<br>[3772, 3838, 0]"] 73["Segment<br>[3802, 3868, 0]"]
74["Segment<br>[3844, 3895, 0]"] 74["Segment<br>[3874, 3925, 0]"]
75["Segment<br>[3901, 3966, 0]"] 75["Segment<br>[3931, 3996, 0]"]
76["Segment<br>[3972, 4025, 0]"] 76["Segment<br>[4002, 4055, 0]"]
77["Segment<br>[4031, 4098, 0]"] 77["Segment<br>[4061, 4128, 0]"]
78["Segment<br>[4104, 4178, 0]"] 78["Segment<br>[4134, 4208, 0]"]
79["Segment<br>[4184, 4252, 0]"] 79["Segment<br>[4214, 4282, 0]"]
80["Segment<br>[4258, 4265, 0]"] 80["Segment<br>[4288, 4295, 0]"]
81[Solid2d] 81[Solid2d]
end end
subgraph path100 [Path] subgraph path100 [Path]
@ -70,7 +70,7 @@ flowchart LR
106[Solid2d] 106[Solid2d]
end end
1["Plane<br>[1377, 1394, 0]"] 1["Plane<br>[1377, 1394, 0]"]
30["Sweep Extrusion<br>[2286, 2336, 0]"] 30["Sweep Extrusion<br>[2316, 2366, 0]"]
31[Wall] 31[Wall]
32[Wall] 32[Wall]
33[Wall] 33[Wall]
@ -83,8 +83,8 @@ flowchart LR
40["SweepEdge Opposite"] 40["SweepEdge Opposite"]
41["SweepEdge Opposite"] 41["SweepEdge Opposite"]
42["SweepEdge Adjacent"] 42["SweepEdge Adjacent"]
43["Plane<br>[2611, 2653, 0]"] 43["Plane<br>[2641, 2683, 0]"]
53["Sweep Extrusion<br>[3099, 3143, 0]"] 53["Sweep Extrusion<br>[3129, 3173, 0]"]
54[Wall] 54[Wall]
55[Wall] 55[Wall]
56[Wall] 56[Wall]
@ -101,8 +101,8 @@ flowchart LR
67["SweepEdge Opposite"] 67["SweepEdge Opposite"]
68["SweepEdge Opposite"] 68["SweepEdge Opposite"]
69["SweepEdge Adjacent"] 69["SweepEdge Adjacent"]
70["Plane<br>[3586, 3612, 0]"] 70["Plane<br>[3616, 3642, 0]"]
82["Sweep Extrusion<br>[4321, 4363, 0]"] 82["Sweep Extrusion<br>[4351, 4393, 0]"]
83[Wall] 83[Wall]
84[Wall] 84[Wall]
85[Wall] 85[Wall]
@ -120,7 +120,7 @@ flowchart LR
97["SweepEdge Opposite"] 97["SweepEdge Opposite"]
98["SweepEdge Opposite"] 98["SweepEdge Opposite"]
99["SweepEdge Opposite"] 99["SweepEdge Opposite"]
107["Sweep Extrusion<br>[4598, 4648, 0]"] 107["Sweep Extrusion<br>[4628, 4678, 0]"]
108[Wall] 108[Wall]
109[Wall] 109[Wall]
110[Wall] 110[Wall]
@ -128,12 +128,12 @@ flowchart LR
112["SweepEdge Opposite"] 112["SweepEdge Opposite"]
113["SweepEdge Opposite"] 113["SweepEdge Opposite"]
114["SweepEdge Opposite"] 114["SweepEdge Opposite"]
115["EdgeCut Fillet<br>[2373, 2514, 0]"] 115["EdgeCut Fillet<br>[2403, 2544, 0]"]
116["EdgeCut Fillet<br>[2373, 2514, 0]"] 116["EdgeCut Fillet<br>[2403, 2544, 0]"]
117["EdgeCut Fillet<br>[3186, 3317, 0]"] 117["EdgeCut Fillet<br>[3216, 3347, 0]"]
118["EdgeCut Fillet<br>[3186, 3317, 0]"] 118["EdgeCut Fillet<br>[3216, 3347, 0]"]
119["StartSketchOnPlane<br>[2597, 2654, 0]"] 119["StartSketchOnPlane<br>[2627, 2684, 0]"]
120["StartSketchOnFace<br>[4422, 4461, 0]"] 120["StartSketchOnFace<br>[4452, 4491, 0]"]
1 --- 2 1 --- 2
1 --- 9 1 --- 9
1 --- 16 1 --- 16

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

@ -3396,6 +3396,15 @@ description: Result of parsing food-service-spatula.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -3410,13 +3419,7 @@ description: Result of parsing food-service-spatula.kcl
"start": 0, "start": 0,
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -3426,7 +3429,7 @@ description: Result of parsing food-service-spatula.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -3437,12 +3440,22 @@ description: Result of parsing food-service-spatula.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -3457,13 +3470,7 @@ description: Result of parsing food-service-spatula.kcl
"start": 0, "start": 0,
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -3473,7 +3480,7 @@ description: Result of parsing food-service-spatula.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -3484,12 +3491,22 @@ description: Result of parsing food-service-spatula.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -3504,13 +3521,7 @@ description: Result of parsing food-service-spatula.kcl
"start": 0, "start": 0,
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -3520,7 +3531,7 @@ description: Result of parsing food-service-spatula.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -3531,8 +3542,9 @@ description: Result of parsing food-service-spatula.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,

69
rust/kcl-lib/tests/kcl_samples/food-service-spatula/ops.snap
View File

@ -344,16 +344,7 @@ description: Operations executed food-service-spatula.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -363,23 +354,22 @@ description: Operations executed food-service-spatula.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -389,23 +379,22 @@ description: Operations executed food-service-spatula.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -415,10 +404,18 @@ description: Operations executed food-service-spatula.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {

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

@ -551,9 +551,9 @@ description: Variables in memory after executing food-service-spatula.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 4165, "commentStart": 4195,
"end": 4177, "end": 4207,
"start": 4165, "start": 4195,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "gripEdgeTop" "value": "gripEdgeTop"
}, },
@ -713,9 +713,9 @@ description: Variables in memory after executing food-service-spatula.kcl
7.0 7.0
], ],
"tag": { "tag": {
"commentStart": 4165, "commentStart": 4195,
"end": 4177, "end": 4207,
"start": 4165, "start": 4195,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "gripEdgeTop" "value": "gripEdgeTop"
}, },
@ -1058,9 +1058,9 @@ description: Variables in memory after executing food-service-spatula.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 4165, "commentStart": 4195,
"end": 4177, "end": 4207,
"start": 4165, "start": 4195,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "gripEdgeTop" "value": "gripEdgeTop"
}, },
@ -1220,9 +1220,9 @@ description: Variables in memory after executing food-service-spatula.kcl
7.0 7.0
], ],
"tag": { "tag": {
"commentStart": 4165, "commentStart": 4195,
"end": 4177, "end": 4207,
"start": 4165, "start": 4195,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "gripEdgeTop" "value": "gripEdgeTop"
}, },
@ -1538,9 +1538,9 @@ description: Variables in memory after executing food-service-spatula.kcl
7.0 7.0
], ],
"tag": { "tag": {
"commentStart": 4165, "commentStart": 4195,
"end": 4177, "end": 4207,
"start": 4165, "start": 4195,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "gripEdgeTop" "value": "gripEdgeTop"
}, },
@ -1729,9 +1729,9 @@ description: Variables in memory after executing food-service-spatula.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2817, "commentStart": 2847,
"end": 2834, "end": 2864,
"start": 2817, "start": 2847,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "handleBottomEdge" "value": "handleBottomEdge"
}, },
@ -1756,9 +1756,9 @@ description: Variables in memory after executing food-service-spatula.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 2965, "commentStart": 2995,
"end": 2979, "end": 3009,
"start": 2965, "start": 2995,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "handleTopEdge" "value": "handleTopEdge"
}, },
@ -1800,9 +1800,9 @@ description: Variables in memory after executing food-service-spatula.kcl
3.5 3.5
], ],
"tag": { "tag": {
"commentStart": 2817, "commentStart": 2847,
"end": 2834, "end": 2864,
"start": 2817, "start": 2847,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "handleBottomEdge" "value": "handleBottomEdge"
}, },
@ -1863,9 +1863,9 @@ description: Variables in memory after executing food-service-spatula.kcl
91.3213 91.3213
], ],
"tag": { "tag": {
"commentStart": 2965, "commentStart": 2995,
"end": 2979, "end": 3009,
"start": 2965, "start": 2995,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "handleTopEdge" "value": "handleTopEdge"
}, },
@ -2211,9 +2211,9 @@ description: Variables in memory after executing food-service-spatula.kcl
3.5 3.5
], ],
"tag": { "tag": {
"commentStart": 2817, "commentStart": 2847,
"end": 2834, "end": 2864,
"start": 2817, "start": 2847,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "handleBottomEdge" "value": "handleBottomEdge"
}, },
@ -2274,9 +2274,9 @@ description: Variables in memory after executing food-service-spatula.kcl
91.3213 91.3213
], ],
"tag": { "tag": {
"commentStart": 2965, "commentStart": 2995,
"end": 2979, "end": 3009,
"start": 2965, "start": 2995,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "handleTopEdge" "value": "handleTopEdge"
}, },
@ -2536,9 +2536,9 @@ description: Variables in memory after executing food-service-spatula.kcl
"id": "[uuid]", "id": "[uuid]",
"sourceRange": [], "sourceRange": [],
"tag": { "tag": {
"commentStart": 4165, "commentStart": 4195,
"end": 4177, "end": 4207,
"start": 4165, "start": 4195,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "gripEdgeTop" "value": "gripEdgeTop"
}, },
@ -2698,9 +2698,9 @@ description: Variables in memory after executing food-service-spatula.kcl
7.0 7.0
], ],
"tag": { "tag": {
"commentStart": 4165, "commentStart": 4195,
"end": 4177, "end": 4207,
"start": 4165, "start": 4195,
"type": "TagDeclarator", "type": "TagDeclarator",
"value": "gripEdgeTop" "value": "gripEdgeTop"
}, },

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

@ -72,52 +72,52 @@ flowchart LR
129[Solid2d] 129[Solid2d]
end end
subgraph path130 [Path] subgraph path130 [Path]
130["Path<br>[3673, 3710, 0]"] 130["Path<br>[3686, 3723, 0]"]
131["Segment<br>[3673, 3710, 0]"] 131["Segment<br>[3686, 3723, 0]"]
132[Solid2d] 132[Solid2d]
end end
subgraph path137 [Path] subgraph path137 [Path]
137["Path<br>[3857, 3895, 0]"] 137["Path<br>[3867, 3905, 0]"]
138["Segment<br>[3857, 3895, 0]"] 138["Segment<br>[3867, 3905, 0]"]
139[Solid2d] 139[Solid2d]
end end
subgraph path149 [Path] subgraph path149 [Path]
149["Path<br>[4173, 4211, 0]"] 149["Path<br>[4183, 4221, 0]"]
150["Segment<br>[4173, 4211, 0]"] 150["Segment<br>[4183, 4221, 0]"]
151[Solid2d] 151[Solid2d]
end end
subgraph path158 [Path] subgraph path158 [Path]
158["Path<br>[4463, 4515, 0]"] 158["Path<br>[4473, 4525, 0]"]
159["Segment<br>[4463, 4515, 0]"] 159["Segment<br>[4473, 4525, 0]"]
160[Solid2d] 160[Solid2d]
end end
subgraph path166 [Path] subgraph path166 [Path]
166["Path<br>[4760, 4804, 0]"] 166["Path<br>[4770, 4814, 0]"]
167["Segment<br>[4810, 4850, 0]"] 167["Segment<br>[4820, 4860, 0]"]
168["Segment<br>[4856, 4875, 0]"] 168["Segment<br>[4866, 4885, 0]"]
169["Segment<br>[4881, 4900, 0]"] 169["Segment<br>[4891, 4910, 0]"]
170["Segment<br>[4906, 4925, 0]"] 170["Segment<br>[4916, 4935, 0]"]
171["Segment<br>[4931, 4956, 0]"] 171["Segment<br>[4941, 4966, 0]"]
172["Segment<br>[4962, 5070, 0]"] 172["Segment<br>[4972, 5080, 0]"]
173["Segment<br>[5076, 5132, 0]"] 173["Segment<br>[5086, 5142, 0]"]
174["Segment<br>[5138, 5145, 0]"] 174["Segment<br>[5148, 5155, 0]"]
175[Solid2d] 175[Solid2d]
end end
subgraph path185 [Path] subgraph path185 [Path]
185["Path<br>[5275, 5304, 0]"] 185["Path<br>[5285, 5314, 0]"]
186["Segment<br>[5310, 5331, 0]"] 186["Segment<br>[5320, 5341, 0]"]
187["Segment<br>[5337, 5377, 0]"] 187["Segment<br>[5347, 5387, 0]"]
188["Segment<br>[5383, 5423, 0]"] 188["Segment<br>[5393, 5433, 0]"]
189["Segment<br>[5429, 5470, 0]"] 189["Segment<br>[5439, 5480, 0]"]
190["Segment<br>[5476, 5498, 0]"] 190["Segment<br>[5486, 5508, 0]"]
191["Segment<br>[5504, 5525, 0]"] 191["Segment<br>[5514, 5535, 0]"]
192["Segment<br>[5531, 5556, 0]"] 192["Segment<br>[5541, 5566, 0]"]
193["Segment<br>[5562, 5602, 0]"] 193["Segment<br>[5572, 5612, 0]"]
194["Segment<br>[5608, 5649, 0]"] 194["Segment<br>[5618, 5659, 0]"]
195["Segment<br>[5655, 5696, 0]"] 195["Segment<br>[5665, 5706, 0]"]
196["Segment<br>[5702, 5723, 0]"] 196["Segment<br>[5712, 5733, 0]"]
197["Segment<br>[5729, 5785, 0]"] 197["Segment<br>[5739, 5795, 0]"]
198["Segment<br>[5791, 5798, 0]"] 198["Segment<br>[5801, 5808, 0]"]
199[Solid2d] 199[Solid2d]
end end
1["Plane<br>[242, 259, 0]"] 1["Plane<br>[242, 259, 0]"]
@ -192,31 +192,31 @@ flowchart LR
124[Wall] 124[Wall]
125[Wall] 125[Wall]
126["Plane<br>[3566, 3596, 0]"] 126["Plane<br>[3566, 3596, 0]"]
133["Sweep Extrusion<br>[3729, 3763, 0]"] 133["Sweep Extrusion<br>[3739, 3773, 0]"]
134[Wall] 134[Wall]
135["Cap Start"] 135["Cap Start"]
136["Cap End"] 136["Cap End"]
140["Sweep Extrusion<br>[4044, 4079, 0]"] 140["Sweep Extrusion<br>[4054, 4089, 0]"]
141[Wall] 141[Wall]
142["Sweep Extrusion<br>[4044, 4079, 0]"] 142["Sweep Extrusion<br>[4054, 4089, 0]"]
143["Sweep Extrusion<br>[4044, 4079, 0]"] 143["Sweep Extrusion<br>[4054, 4089, 0]"]
144["Sweep Extrusion<br>[4044, 4079, 0]"] 144["Sweep Extrusion<br>[4054, 4089, 0]"]
145["Sweep Extrusion<br>[4044, 4079, 0]"] 145["Sweep Extrusion<br>[4054, 4089, 0]"]
146["Sweep Extrusion<br>[4044, 4079, 0]"] 146["Sweep Extrusion<br>[4054, 4089, 0]"]
147["Sweep Extrusion<br>[4044, 4079, 0]"] 147["Sweep Extrusion<br>[4054, 4089, 0]"]
148["Sweep Extrusion<br>[4044, 4079, 0]"] 148["Sweep Extrusion<br>[4054, 4089, 0]"]
152["Sweep Extrusion<br>[4360, 4395, 0]"] 152["Sweep Extrusion<br>[4370, 4405, 0]"]
153[Wall] 153[Wall]
154["Sweep Extrusion<br>[4360, 4395, 0]"] 154["Sweep Extrusion<br>[4370, 4405, 0]"]
155["Sweep Extrusion<br>[4360, 4395, 0]"] 155["Sweep Extrusion<br>[4370, 4405, 0]"]
156["Sweep Extrusion<br>[4360, 4395, 0]"] 156["Sweep Extrusion<br>[4370, 4405, 0]"]
157["Plane<br>[4440, 4457, 0]"] 157["Plane<br>[4450, 4467, 0]"]
161["Sweep Extrusion<br>[4611, 4652, 0]"] 161["Sweep Extrusion<br>[4621, 4662, 0]"]
162[Wall] 162[Wall]
163["Cap Start"] 163["Cap Start"]
164["Cap End"] 164["Cap End"]
165["Plane<br>[4737, 4754, 0]"] 165["Plane<br>[4747, 4764, 0]"]
176["Sweep Revolve<br>[5151, 5168, 0]"] 176["Sweep Revolve<br>[5161, 5178, 0]"]
177[Wall] 177[Wall]
178[Wall] 178[Wall]
179[Wall] 179[Wall]
@ -224,8 +224,8 @@ flowchart LR
181[Wall] 181[Wall]
182[Wall] 182[Wall]
183[Wall] 183[Wall]
184["Plane<br>[5223, 5268, 0]"] 184["Plane<br>[5233, 5278, 0]"]
200["Sweep Extrusion<br>[5812, 5857, 0]"] 200["Sweep Extrusion<br>[5822, 5867, 0]"]
201[Wall] 201[Wall]
202[Wall] 202[Wall]
203[Wall] 203[Wall]
@ -254,9 +254,9 @@ flowchart LR
226["StartSketchOnPlane<br>[2115, 2157, 0]"] 226["StartSketchOnPlane<br>[2115, 2157, 0]"]
227["StartSketchOnFace<br>[2285, 2322, 0]"] 227["StartSketchOnFace<br>[2285, 2322, 0]"]
228["StartSketchOnPlane<br>[3552, 3597, 0]"] 228["StartSketchOnPlane<br>[3552, 3597, 0]"]
229["StartSketchOnFace<br>[3814, 3851, 0]"] 229["StartSketchOnFace<br>[3824, 3861, 0]"]
230["StartSketchOnFace<br>[4130, 4167, 0]"] 230["StartSketchOnFace<br>[4140, 4177, 0]"]
231["StartSketchOnPlane<br>[5209, 5269, 0]"] 231["StartSketchOnPlane<br>[5219, 5279, 0]"]
1 --- 2 1 --- 2
2 --- 3 2 --- 3
2 --- 4 2 --- 4

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

@ -5838,6 +5838,15 @@ description: Result of parsing french-press.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -5926,13 +5935,7 @@ description: Result of parsing french-press.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -5942,7 +5945,7 @@ description: Result of parsing french-press.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -5953,8 +5956,9 @@ description: Result of parsing french-press.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,

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

@ -891,16 +891,7 @@ description: Operations executed french-press.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -910,10 +901,18 @@ description: Operations executed french-press.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"labeledArgs": { "labeledArgs": {

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

@ -19,8 +19,8 @@ flowchart LR
28[Solid2d] 28[Solid2d]
end end
subgraph path42 [Path] subgraph path42 [Path]
42["Path<br>[4583, 4663, 0]"] 42["Path<br>[4593, 4673, 0]"]
43["Segment<br>[4583, 4663, 0]"] 43["Segment<br>[4593, 4673, 0]"]
44[Solid2d] 44[Solid2d]
end end
subgraph path46 [Path] subgraph path46 [Path]
@ -107,10 +107,10 @@ flowchart LR
38["SweepEdge Opposite"] 38["SweepEdge Opposite"]
39["SweepEdge Opposite"] 39["SweepEdge Opposite"]
40["SweepEdge Opposite"] 40["SweepEdge Opposite"]
41["Plane<br>[4560, 4577, 0]"] 41["Plane<br>[4570, 4587, 0]"]
45["Plane<br>[4186, 4206, 0]"] 45["Plane<br>[4186, 4206, 0]"]
52["Plane<br>[2695, 2715, 0]"] 52["Plane<br>[2695, 2715, 0]"]
72["Sweep Extrusion<br>[5006, 5048, 0]"] 72["Sweep Extrusion<br>[5026, 5068, 0]"]
73[Wall] 73[Wall]
74[Wall] 74[Wall]
75[Wall] 75[Wall]
@ -121,8 +121,8 @@ flowchart LR
80["SweepEdge Opposite"] 80["SweepEdge Opposite"]
81["SweepEdge Opposite"] 81["SweepEdge Opposite"]
82["SweepEdge Adjacent"] 82["SweepEdge Adjacent"]
83["Plane<br>[5542, 5577, 0]"] 83["Plane<br>[5562, 5597, 0]"]
109["Sweep Extrusion<br>[5660, 5711, 0]"] 109["Sweep Extrusion<br>[5680, 5731, 0]"]
110[Wall] 110[Wall]
111[Wall] 111[Wall]
112[Wall] 112[Wall]
@ -133,14 +133,14 @@ flowchart LR
117["SweepEdge Opposite"] 117["SweepEdge Opposite"]
118["SweepEdge Opposite"] 118["SweepEdge Opposite"]
119["SweepEdge Adjacent"] 119["SweepEdge Adjacent"]
120["EdgeCut Fillet<br>[5111, 5450, 0]"] 120["EdgeCut Fillet<br>[5131, 5470, 0]"]
121["EdgeCut Fillet<br>[5111, 5450, 0]"] 121["EdgeCut Fillet<br>[5131, 5470, 0]"]
122["EdgeCut Fillet<br>[5111, 5450, 0]"] 122["EdgeCut Fillet<br>[5131, 5470, 0]"]
123["EdgeCut Fillet<br>[5111, 5450, 0]"] 123["EdgeCut Fillet<br>[5131, 5470, 0]"]
124["EdgeCut Fillet<br>[5775, 6119, 0]"] 124["EdgeCut Fillet<br>[5795, 6139, 0]"]
125["EdgeCut Fillet<br>[5775, 6119, 0]"] 125["EdgeCut Fillet<br>[5795, 6139, 0]"]
126["EdgeCut Fillet<br>[5775, 6119, 0]"] 126["EdgeCut Fillet<br>[5795, 6139, 0]"]
127["EdgeCut Fillet<br>[5775, 6119, 0]"] 127["EdgeCut Fillet<br>[5795, 6139, 0]"]
128["StartSketchOnPlane<br>[894, 914, 0]"] 128["StartSketchOnPlane<br>[894, 914, 0]"]
129["StartSketchOnPlane<br>[894, 914, 0]"] 129["StartSketchOnPlane<br>[894, 914, 0]"]
130["StartSketchOnPlane<br>[4186, 4206, 0]"] 130["StartSketchOnPlane<br>[4186, 4206, 0]"]

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

@ -5613,6 +5613,15 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"abs_path": false, "abs_path": false,
@ -5651,13 +5660,7 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpression",
"type": "CallExpression" "type": "CallExpression"
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -5667,7 +5670,7 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -5678,8 +5681,9 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,
@ -6248,6 +6252,15 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"abs_path": false, "abs_path": false,
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
@ -6262,13 +6275,7 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
"start": 0, "start": 0,
"type": "Name", "type": "Name",
"type": "Name" "type": "Name"
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -6278,7 +6285,7 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -6289,8 +6296,9 @@ description: Result of parsing gridfinity-baseplate-magnets.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
} }
], ],
"commentStart": 0, "commentStart": 0,

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

@ -1108,7 +1108,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"name": "magnetBase", "name": "magnetBase",
"functionSourceRange": [ "functionSourceRange": [
4155, 4155,
4497, 4507,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -1166,16 +1166,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1185,17 +1176,25 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"type": "GroupEnd" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": { "value": {
"type": "Array", "type": "Array",
"value": [ "value": [
@ -1226,8 +1225,12 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
] ]
}, },
"sourceRange": [] "sourceRange": []
}
}, },
"sketch": { "name": "subtract2d",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1237,11 +1240,6 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{ {
"labeledArgs": { "labeledArgs": {
"length": { "length": {
@ -1367,7 +1365,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"name": "magnetBase", "name": "magnetBase",
"functionSourceRange": [ "functionSourceRange": [
4155, 4155,
4497, 4507,
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
@ -1425,16 +1423,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
}, },
{ {
"labeledArgs": { "labeledArgs": {
"holeSketch": { "tool": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
},
"sketch": {
"value": { "value": {
"type": "Sketch", "type": "Sketch",
"value": { "value": {
@ -1444,10 +1433,18 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
"name": "hole", "name": "subtract2d",
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": {
"value": {
"type": "Sketch",
"value": {
"artifactId": "[uuid]"
}
},
"sourceRange": []
}
}, },
{ {
"type": "GroupEnd" "type": "GroupEnd"

6
rust/kcl-lib/tests/kcl_samples/hex-nut/artifact_graph_flowchart.snap.md
View File

@ -11,12 +11,12 @@ flowchart LR
9[Solid2d] 9[Solid2d]
end end
subgraph path10 [Path] subgraph path10 [Path]
10["Path<br>[903, 963, 0]"] 10["Path<br>[916, 976, 0]"]
11["Segment<br>[903, 963, 0]"] 11["Segment<br>[916, 976, 0]"]
12[Solid2d] 12[Solid2d]
end end
1["Plane<br>[546, 564, 0]"] 1["Plane<br>[546, 564, 0]"]
13["Sweep Extrusion<br>[975, 996, 0]"] 13["Sweep Extrusion<br>[985, 1006, 0]"]
14[Wall] 14[Wall]
15[Wall] 15[Wall]
16[Wall] 16[Wall]

24
rust/kcl-lib/tests/kcl_samples/hex-nut/ast.snap
View File

@ -719,6 +719,15 @@ description: Result of parsing hex-nut.kcl
{ {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tool",
"start": 0,
"type": "Identifier"
},
"arg": {
"arguments": [ "arguments": [
{ {
"type": "LabeledArg", "type": "LabeledArg",
@ -863,13 +872,7 @@ description: Result of parsing hex-nut.kcl
"type": "CallExpressionKw", "type": "CallExpressionKw",
"type": "CallExpressionKw", "type": "CallExpressionKw",
"unlabeled": null "unlabeled": null
}, }
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
} }
], ],
"callee": { "callee": {
@ -879,7 +882,7 @@ description: Result of parsing hex-nut.kcl
"name": { "name": {
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"name": "hole", "name": "subtract2d",
"start": 0, "start": 0,
"type": "Identifier" "type": "Identifier"
}, },
@ -890,8 +893,9 @@ description: Result of parsing hex-nut.kcl
"commentStart": 0, "commentStart": 0,
"end": 0, "end": 0,
"start": 0, "start": 0,
"type": "CallExpression", "type": "CallExpressionKw",
"type": "CallExpression" "type": "CallExpressionKw",
"unlabeled": null
}, },
{ {
"arguments": [ "arguments": [

Some files were not shown because too many files have changed in this diff Show More