diff --git a/docs/kcl/chamfer.md b/docs/kcl/chamfer.md index b8c870044..49ff42ac0 100644 --- a/docs/kcl/chamfer.md +++ b/docs/kcl/chamfer.md @@ -81,7 +81,7 @@ sketch001 = startSketchOn(part001, chamfer1) |> line(end = [2, 0]) |> line(end = [0, 2]) |> line(end = [-2, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> extrude(length = 10) ``` diff --git a/docs/kcl/loft.md b/docs/kcl/loft.md index ba48f202d..e180a8d27 100644 --- a/docs/kcl/loft.md +++ b/docs/kcl/loft.md @@ -37,14 +37,14 @@ squareSketch = startSketchOn('XY') |> line(end = [200, 0]) |> line(end = [0, -200]) |> line(end = [-200, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() triangleSketch = startSketchOn(offsetPlane('XY', 75)) |> startProfileAt([0, 125], %) |> line(end = [-15, -30]) |> line(end = [30, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() loft([squareSketch, triangleSketch]) @@ -59,7 +59,7 @@ squareSketch = startSketchOn('XY') |> line(end = [200, 0]) |> line(end = [0, -200]) |> line(end = [-200, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() circleSketch0 = startSketchOn(offsetPlane('XY', 75)) @@ -84,7 +84,7 @@ squareSketch = startSketchOn('XY') |> line(end = [200, 0]) |> line(end = [0, -200]) |> line(end = [-200, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() circleSketch0 = startSketchOn(offsetPlane('XY', 75)) diff --git a/docs/kcl/offsetPlane.md b/docs/kcl/offsetPlane.md index 94de22911..c120a845f 100644 --- a/docs/kcl/offsetPlane.md +++ b/docs/kcl/offsetPlane.md @@ -34,7 +34,7 @@ squareSketch = startSketchOn('XY') |> line(end = [200, 0]) |> line(end = [0, -200]) |> line(end = [-200, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() circleSketch = startSketchOn(offsetPlane('XY', 150)) @@ -52,7 +52,7 @@ squareSketch = startSketchOn('XZ') |> line(end = [200, 0]) |> line(end = [0, -200]) |> line(end = [-200, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() circleSketch = startSketchOn(offsetPlane('XZ', 150)) @@ -70,7 +70,7 @@ squareSketch = startSketchOn('YZ') |> line(end = [200, 0]) |> line(end = [0, -200]) |> line(end = [-200, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() circleSketch = startSketchOn(offsetPlane('YZ', 150)) @@ -88,7 +88,7 @@ squareSketch = startSketchOn('-XZ') |> line(end = [200, 0]) |> line(end = [0, -200]) |> line(end = [-200, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() circleSketch = startSketchOn(offsetPlane('-XZ', -150)) diff --git a/docs/kcl/revolve.md b/docs/kcl/revolve.md index 23d84c29b..c65e830df 100644 --- a/docs/kcl/revolve.md +++ b/docs/kcl/revolve.md @@ -153,7 +153,7 @@ sketch001 = startSketchOn('XY') |> startProfileAt([10, 0], %) |> line(end = [5, -5]) |> line(end = [5, 5]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() part001 = revolve({ diff --git a/docs/kcl/std.json b/docs/kcl/std.json index eac4507df..0f9d5cada 100644 --- a/docs/kcl/std.json +++ b/docs/kcl/std.json @@ -56546,7 +56546,7 @@ "deprecated": false, "examples": [ "// Chamfer a mounting plate.\nwidth = 20\nlength = 10\nthickness = 1\nchamferLength = 2\n\nmountingPlateSketch = startSketchOn(\"XY\")\n |> startProfileAt([-width / 2, -length / 2], %)\n |> line(endAbsolute = [width / 2, -length / 2], tag = $edge1)\n |> line(endAbsolute = [width / 2, length / 2], tag = $edge2)\n |> line(endAbsolute = [-width / 2, length / 2], tag = $edge3)\n |> close(tag = $edge4)\n\nmountingPlate = extrude(mountingPlateSketch, length = thickness)\n |> chamfer({\n length = chamferLength,\n tags = [\n getNextAdjacentEdge(edge1),\n getNextAdjacentEdge(edge2),\n getNextAdjacentEdge(edge3),\n getNextAdjacentEdge(edge4)\n ]\n }, %)", - "// Sketch on the face of a chamfer.\nfn cube(pos, scale) {\n sg = startSketchOn('XY')\n |> startProfileAt(pos, %)\n |> line(end = [0, scale])\n |> line(end = [scale, 0])\n |> line(end = [0, -scale])\n\n return sg\n}\n\npart001 = cube([0, 0], 20)\n |> close(tag = $line1)\n |> extrude(length = 20)\n |> chamfer({\n length = 10,\n tags = [getOppositeEdge(line1)]\n }, %, $chamfer1) // We tag the chamfer to reference it later.\n\nsketch001 = startSketchOn(part001, chamfer1)\n |> startProfileAt([10, 10], %)\n |> line(end = [2, 0])\n |> line(end = [0, 2])\n |> line(end = [-2, 0])\n |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n |> close()\n |> extrude(length = 10)" + "// Sketch on the face of a chamfer.\nfn cube(pos, scale) {\n sg = startSketchOn('XY')\n |> startProfileAt(pos, %)\n |> line(end = [0, scale])\n |> line(end = [scale, 0])\n |> line(end = [0, -scale])\n\n return sg\n}\n\npart001 = cube([0, 0], 20)\n |> close(tag = $line1)\n |> extrude(length = 20)\n |> chamfer({\n length = 10,\n tags = [getOppositeEdge(line1)]\n }, %, $chamfer1) // We tag the chamfer to reference it later.\n\nsketch001 = startSketchOn(part001, chamfer1)\n |> startProfileAt([10, 10], %)\n |> line(end = [2, 0])\n |> line(end = [0, 2])\n |> line(end = [-2, 0])\n |> line(endAbsolute = profileStart(%))\n |> close()\n |> extrude(length = 10)" ] }, { @@ -113919,9 +113919,9 @@ "unpublished": false, "deprecated": false, "examples": [ - "// Loft a square and a triangle.\nsquareSketch = startSketchOn('XY')\n |> startProfileAt([-100, 200], %)\n |> line(end = [200, 0])\n |> line(end = [0, -200])\n |> line(end = [-200, 0])\n |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n |> close()\n\ntriangleSketch = startSketchOn(offsetPlane('XY', 75))\n |> startProfileAt([0, 125], %)\n |> line(end = [-15, -30])\n |> line(end = [30, 0])\n |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n |> close()\n\nloft([squareSketch, triangleSketch])", - "// Loft a square, a circle, and another circle.\nsquareSketch = startSketchOn('XY')\n |> startProfileAt([-100, 200], %)\n |> line(end = [200, 0])\n |> line(end = [0, -200])\n |> line(end = [-200, 0])\n |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n |> close()\n\ncircleSketch0 = startSketchOn(offsetPlane('XY', 75))\n |> circle({ center = [0, 100], radius = 50 }, %)\n\ncircleSketch1 = startSketchOn(offsetPlane('XY', 150))\n |> circle({ center = [0, 100], radius = 20 }, %)\n\nloft([\n squareSketch,\n circleSketch0,\n circleSketch1\n])", - "// Loft a square, a circle, and another circle with options.\nsquareSketch = startSketchOn('XY')\n |> startProfileAt([-100, 200], %)\n |> line(end = [200, 0])\n |> line(end = [0, -200])\n |> line(end = [-200, 0])\n |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n |> close()\n\ncircleSketch0 = startSketchOn(offsetPlane('XY', 75))\n |> circle({ center = [0, 100], radius = 50 }, %)\n\ncircleSketch1 = startSketchOn(offsetPlane('XY', 150))\n |> circle({ center = [0, 100], radius = 20 }, %)\n\nloft([\n squareSketch,\n circleSketch0,\n circleSketch1\n], baseCurveIndex = 0, bezApproximateRational = false, tolerance = 0.000001, vDegree = 2)" + "// Loft a square and a triangle.\nsquareSketch = startSketchOn('XY')\n |> startProfileAt([-100, 200], %)\n |> line(end = [200, 0])\n |> line(end = [0, -200])\n |> line(end = [-200, 0])\n |> line(endAbsolute = profileStart(%))\n |> close()\n\ntriangleSketch = startSketchOn(offsetPlane('XY', 75))\n |> startProfileAt([0, 125], %)\n |> line(end = [-15, -30])\n |> line(end = [30, 0])\n |> line(endAbsolute = profileStart(%))\n |> close()\n\nloft([squareSketch, triangleSketch])", + "// Loft a square, a circle, and another circle.\nsquareSketch = startSketchOn('XY')\n |> startProfileAt([-100, 200], %)\n |> line(end = [200, 0])\n |> line(end = [0, -200])\n |> line(end = [-200, 0])\n |> line(endAbsolute = profileStart(%))\n |> close()\n\ncircleSketch0 = startSketchOn(offsetPlane('XY', 75))\n |> circle({ center = [0, 100], radius = 50 }, %)\n\ncircleSketch1 = startSketchOn(offsetPlane('XY', 150))\n |> circle({ center = [0, 100], radius = 20 }, %)\n\nloft([\n squareSketch,\n circleSketch0,\n circleSketch1\n])", + "// Loft a square, a circle, and another circle with options.\nsquareSketch = startSketchOn('XY')\n |> startProfileAt([-100, 200], %)\n |> line(end = [200, 0])\n |> line(end = [0, -200])\n |> line(end = [-200, 0])\n |> line(endAbsolute = profileStart(%))\n |> close()\n\ncircleSketch0 = startSketchOn(offsetPlane('XY', 75))\n |> circle({ center = [0, 100], radius = 50 }, %)\n\ncircleSketch1 = startSketchOn(offsetPlane('XY', 150))\n |> circle({ center = [0, 100], radius = 20 }, %)\n\nloft([\n squareSketch,\n circleSketch0,\n circleSketch1\n], baseCurveIndex = 0, bezApproximateRational = false, tolerance = 0.000001, vDegree = 2)" ] }, { @@ -125140,10 +125140,10 @@ "unpublished": false, "deprecated": false, "examples": [ - "// Loft a square and a circle on the `XY` plane using offset.\nsquareSketch = startSketchOn('XY')\n |> startProfileAt([-100, 200], %)\n |> line(end = [200, 0])\n |> line(end = [0, -200])\n |> line(end = [-200, 0])\n |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n |> close()\n\ncircleSketch = startSketchOn(offsetPlane('XY', 150))\n |> circle({ center = [0, 100], radius = 50 }, %)\n\nloft([squareSketch, circleSketch])", - "// Loft a square and a circle on the `XZ` plane using offset.\nsquareSketch = startSketchOn('XZ')\n |> startProfileAt([-100, 200], %)\n |> line(end = [200, 0])\n |> line(end = [0, -200])\n |> line(end = [-200, 0])\n |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n |> close()\n\ncircleSketch = startSketchOn(offsetPlane('XZ', 150))\n |> circle({ center = [0, 100], radius = 50 }, %)\n\nloft([squareSketch, circleSketch])", - "// Loft a square and a circle on the `YZ` plane using offset.\nsquareSketch = startSketchOn('YZ')\n |> startProfileAt([-100, 200], %)\n |> line(end = [200, 0])\n |> line(end = [0, -200])\n |> line(end = [-200, 0])\n |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n |> close()\n\ncircleSketch = startSketchOn(offsetPlane('YZ', 150))\n |> circle({ center = [0, 100], radius = 50 }, %)\n\nloft([squareSketch, circleSketch])", - "// Loft a square and a circle on the `-XZ` plane using offset.\nsquareSketch = startSketchOn('-XZ')\n |> startProfileAt([-100, 200], %)\n |> line(end = [200, 0])\n |> line(end = [0, -200])\n |> line(end = [-200, 0])\n |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n |> close()\n\ncircleSketch = startSketchOn(offsetPlane('-XZ', -150))\n |> circle({ center = [0, 100], radius = 50 }, %)\n\nloft([squareSketch, circleSketch])", + "// Loft a square and a circle on the `XY` plane using offset.\nsquareSketch = startSketchOn('XY')\n |> startProfileAt([-100, 200], %)\n |> line(end = [200, 0])\n |> line(end = [0, -200])\n |> line(end = [-200, 0])\n |> line(endAbsolute = profileStart(%))\n |> close()\n\ncircleSketch = startSketchOn(offsetPlane('XY', 150))\n |> circle({ center = [0, 100], radius = 50 }, %)\n\nloft([squareSketch, circleSketch])", + "// Loft a square and a circle on the `XZ` plane using offset.\nsquareSketch = startSketchOn('XZ')\n |> startProfileAt([-100, 200], %)\n |> line(end = [200, 0])\n |> line(end = [0, -200])\n |> line(end = [-200, 0])\n |> line(endAbsolute = profileStart(%))\n |> close()\n\ncircleSketch = startSketchOn(offsetPlane('XZ', 150))\n |> circle({ center = [0, 100], radius = 50 }, %)\n\nloft([squareSketch, circleSketch])", + "// Loft a square and a circle on the `YZ` plane using offset.\nsquareSketch = startSketchOn('YZ')\n |> startProfileAt([-100, 200], %)\n |> line(end = [200, 0])\n |> line(end = [0, -200])\n |> line(end = [-200, 0])\n |> line(endAbsolute = profileStart(%))\n |> close()\n\ncircleSketch = startSketchOn(offsetPlane('YZ', 150))\n |> circle({ center = [0, 100], radius = 50 }, %)\n\nloft([squareSketch, circleSketch])", + "// Loft a square and a circle on the `-XZ` plane using offset.\nsquareSketch = startSketchOn('-XZ')\n |> startProfileAt([-100, 200], %)\n |> line(end = [200, 0])\n |> line(end = [0, -200])\n |> line(end = [-200, 0])\n |> line(endAbsolute = profileStart(%))\n |> close()\n\ncircleSketch = startSketchOn(offsetPlane('-XZ', -150))\n |> circle({ center = [0, 100], radius = 50 }, %)\n\nloft([squareSketch, circleSketch])", "// A circle on the XY plane\nstartSketchOn(\"XY\")\n |> startProfileAt([0, 0], %)\n |> circle({ radius = 10, center = [0, 0] }, %)\n\n// Triangle on the plane 4 units above\nstartSketchOn(offsetPlane(\"XY\", 4))\n |> startProfileAt([0, 0], %)\n |> line(end = [10, 0])\n |> line(end = [0, 10])\n |> close()" ] }, @@ -178520,7 +178520,7 @@ "box = startSketchOn('XY')\n |> startProfileAt([0, 0], %)\n |> line(end = [0, 20])\n |> line(end = [20, 0])\n |> line(end = [0, -20])\n |> close()\n |> extrude(length = 20)\n\nsketch001 = startSketchOn(box, \"END\")\n |> circle({ center = [10, 10], radius = 4 }, %)\n |> revolve({ angle = -90, axis = 'y' }, %)", "box = startSketchOn('XY')\n |> startProfileAt([0, 0], %)\n |> line(end = [0, 20])\n |> line(end = [20, 0])\n |> line(end = [0, -20], tag = $revolveAxis)\n |> close()\n |> extrude(length = 20)\n\nsketch001 = startSketchOn(box, \"END\")\n |> circle({ center = [10, 10], radius = 4 }, %)\n |> revolve({\n angle = 90,\n axis = getOppositeEdge(revolveAxis)\n }, %)", "box = startSketchOn('XY')\n |> startProfileAt([0, 0], %)\n |> line(end = [0, 20])\n |> line(end = [20, 0])\n |> line(end = [0, -20], tag = $revolveAxis)\n |> close()\n |> extrude(length = 20)\n\nsketch001 = startSketchOn(box, \"END\")\n |> circle({ center = [10, 10], radius = 4 }, %)\n |> revolve({\n angle = 90,\n axis = getOppositeEdge(revolveAxis),\n tolerance = 0.0001\n }, %)", - "sketch001 = startSketchOn('XY')\n |> startProfileAt([10, 0], %)\n |> line(end = [5, -5])\n |> line(end = [5, 5])\n |> line(endAbsolute = [profileStartX(%), profileStartY(%)])\n |> close()\n\npart001 = revolve({\n axis = {\n custom = {\n axis = [0.0, 1.0],\n origin = [0.0, 0.0]\n }\n }\n}, sketch001)" + "sketch001 = startSketchOn('XY')\n |> startProfileAt([10, 0], %)\n |> line(end = [5, -5])\n |> line(end = [5, 5])\n |> line(endAbsolute = profileStart(%))\n |> close()\n\npart001 = revolve({\n axis = {\n custom = {\n axis = [0.0, 1.0],\n origin = [0.0, 0.0]\n }\n }\n}, sketch001)" ] }, { diff --git a/docs/kcl/types.md b/docs/kcl/types.md index 5e786e0af..293a855d4 100644 --- a/docs/kcl/types.md +++ b/docs/kcl/types.md @@ -97,7 +97,7 @@ startSketchOn('XZ') segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $rectangleSegmentC001) - |> lineTo([profileStartX(%), profileStartY(%)], %) + |> lineTo(profileStart(%), %) |> close(%) ``` @@ -130,7 +130,7 @@ fn rect(origin) { segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $rectangleSegmentC001) - |> lineTo([profileStartX(%), profileStartY(%)], %) + |> lineTo(profileStart(%), %) |> close(%) } @@ -158,7 +158,7 @@ fn rect(origin) { segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $rectangleSegmentC001) - |> lineTo([profileStartX(%), profileStartY(%)], %) + |> lineTo(profileStart(%), %) |> close(%) } diff --git a/e2e/playwright/code-pane-and-errors.spec.ts b/e2e/playwright/code-pane-and-errors.spec.ts index b7d875b04..0dbdbb110 100644 --- a/e2e/playwright/code-pane-and-errors.spec.ts +++ b/e2e/playwright/code-pane-and-errors.spec.ts @@ -22,7 +22,7 @@ test.describe('Code pane and errors', () => { |> startProfileAt([0, 0], %) |> line(end = [10, 0]) |> line(end = [-5, 10]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = 5)` ) diff --git a/e2e/playwright/command-bar-tests.spec.ts b/e2e/playwright/command-bar-tests.spec.ts index 86c36f02f..4c3bc32d2 100644 --- a/e2e/playwright/command-bar-tests.spec.ts +++ b/e2e/playwright/command-bar-tests.spec.ts @@ -56,7 +56,7 @@ test.describe('Command bar tests', () => { |> line(end = [0, 10]) |> line(end = [10, 0]) |> line(end = [0, -10]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -10)` ) diff --git a/e2e/playwright/feature-tree-pane.spec.ts b/e2e/playwright/feature-tree-pane.spec.ts index 38be31a8c..4c6d06699 100644 --- a/e2e/playwright/feature-tree-pane.spec.ts +++ b/e2e/playwright/feature-tree-pane.spec.ts @@ -10,7 +10,7 @@ export fn triangle() { |> startProfileAt([0, 0], %) |> xLine(10, %) |> line(end = [-10, -5]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() } @@ -19,7 +19,7 @@ sketch001 = startSketchOn('XZ') |> startProfileAt([20, 10], %) |> line(end = [10, 10]) |> angledLine([-45, length001], %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() revolve001 = revolve({ axis = "X" }, sketch001) triangle() @@ -30,7 +30,7 @@ sketch002 = startSketchOn(plane001) |> line(end = [5, -15]) |> xLine(-10, %) |> line(endAbsolute = [-40, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch002, length = 10) ` diff --git a/e2e/playwright/point-click.spec.ts b/e2e/playwright/point-click.spec.ts index f672527ba..fc5048bc2 100644 --- a/e2e/playwright/point-click.spec.ts +++ b/e2e/playwright/point-click.spec.ts @@ -228,7 +228,7 @@ test.describe('verify sketch on chamfer works', () => { segAng(rectangleSegmentA002), -segLen(rectangleSegmentA002) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close()`, }) @@ -259,7 +259,7 @@ test.describe('verify sketch on chamfer works', () => { segAng(rectangleSegmentA003), -segLen(rectangleSegmentA003) ], %, $rectangleSegmentC002) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close()`, }) await sketchOnAChamfer({ @@ -284,7 +284,7 @@ test.describe('verify sketch on chamfer works', () => { segAng(rectangleSegmentA003), -segLen(rectangleSegmentA003) ], %, $rectangleSegmentC002) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close()`, }) /// last one @@ -308,7 +308,7 @@ test.describe('verify sketch on chamfer works', () => { segAng(rectangleSegmentA005), -segLen(rectangleSegmentA005) ], %, $rectangleSegmentC004) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close()`, }) @@ -326,7 +326,7 @@ test.describe('verify sketch on chamfer works', () => { segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $yo) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02) + |> line(endAbsolute = profileStart(%), tag = $seg02) |> close() extrude001 = extrude(sketch001, length = 100) |> chamfer({ @@ -353,7 +353,7 @@ test.describe('verify sketch on chamfer works', () => { segAng(rectangleSegmentA005), -segLen(rectangleSegmentA005) ], %, $rectangleSegmentC004) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() sketch004 = startSketchOn(extrude001, seg05) |> startProfileAt([82.57,322.96], %) @@ -366,7 +366,7 @@ test.describe('verify sketch on chamfer works', () => { segAng(rectangleSegmentA004), -segLen(rectangleSegmentA004) ], %, $rectangleSegmentC003) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() sketch003 = startSketchOn(extrude001, seg04) |> startProfileAt([-209.64,255.28], %) @@ -379,7 +379,7 @@ test.describe('verify sketch on chamfer works', () => { segAng(rectangleSegmentA003), -segLen(rectangleSegmentA003) ], %, $rectangleSegmentC002) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() sketch002 = startSketchOn(extrude001, seg03) |> startProfileAt([205.96,254.59], %) @@ -392,7 +392,7 @@ test.describe('verify sketch on chamfer works', () => { segAng(rectangleSegmentA002), -segLen(rectangleSegmentA002) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() `, { shouldNormalise: true } @@ -447,7 +447,7 @@ test.describe('verify sketch on chamfer works', () => { segAng(rectangleSegmentA002), -segLen(rectangleSegmentA002) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close()`, }) await editor.expectEditor.toContain( @@ -462,7 +462,7 @@ test.describe('verify sketch on chamfer works', () => { segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $yo) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02) + |> line(endAbsolute = profileStart(%), tag = $seg02) |> close() extrude001 = extrude(sketch001, length = 100) chamf = chamfer({ @@ -488,7 +488,7 @@ sketch002 = startSketchOn(extrude001, seg03) segAng(rectangleSegmentA002), -segLen(rectangleSegmentA002) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() `, { shouldNormalise: true } @@ -1098,7 +1098,7 @@ test(`Fillet point-and-click`, async ({ |> line(end = [0, 12]) |> line(end = [24, 0]) |> line(end = [0, -12]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -12) ` @@ -1330,7 +1330,7 @@ test(`Fillet point-and-click delete`, async ({ |> line(end = [0, 12]) |> line(end = [24, 0], tag = $seg02) |> line(end = [0, -12]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg01) + |> line(endAbsolute = profileStart(%), tag = $seg01) |> close() extrude001 = extrude(sketch001, length = -12) |> fillet({ radius = 5, tags = [seg01] }, %) // fillet01 @@ -1474,7 +1474,7 @@ test(`Chamfer point-and-click`, async ({ |> line(end = [0, 12]) |> line(end = [24, 0]) |> line(end = [0, -12]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -12) ` @@ -1702,7 +1702,7 @@ test(`Chamfer point-and-click delete`, async ({ |> line(end = [0, 12]) |> line(end = [24, 0], tag = $seg02) |> line(end = [0, -12]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg01) + |> line(endAbsolute = profileStart(%), tag = $seg01) |> close() extrude001 = extrude(sketch001, length = -12) |> chamfer({ length = 5, tags = [seg01] }, %) // chamfer01 @@ -1945,7 +1945,7 @@ test('Shell point-and-click wall', async ({ |> xLine(40, %) |> yLine(-60, %) |> xLine(-40, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = 40) ` @@ -2189,7 +2189,7 @@ sketch001 = startSketchOn('XZ') segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $rectangleSegmentC001) -|> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +|> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = 200) sketch002 = startSketchOn(extrude001, rectangleSegmentA001) @@ -2203,7 +2203,7 @@ segAng(rectangleSegmentA002) - 90, segAng(rectangleSegmentA002), -segLen(rectangleSegmentA002) ], %, $rectangleSegmentC002) -|> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +|> line(endAbsolute = profileStart(%)) |> close() ` @@ -2248,7 +2248,7 @@ segAng(rectangleSegmentA001) - 90, segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $rectangleSegmentC001) -|> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +|> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = 50) sketch002 = startSketchOn(extrude001, rectangleSegmentA001) @@ -2298,7 +2298,7 @@ radius = 8.69 segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = 5) sketch003 = startSketchOn(extrude001, 'START') diff --git a/e2e/playwright/projects.spec.ts b/e2e/playwright/projects.spec.ts index cf4d3c22c..cc0223422 100644 --- a/e2e/playwright/projects.spec.ts +++ b/e2e/playwright/projects.spec.ts @@ -1464,7 +1464,7 @@ test.fixme( |> line(end = [324.07, 27.199], tag = $seg01) |> line(end = [118.328, -291.754]) |> line(end = [-180.04, -202.08]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = 200)`) await page.waitForTimeout(800) diff --git a/e2e/playwright/prompt-to-edit.spec.ts b/e2e/playwright/prompt-to-edit.spec.ts index aaf5bbefc..612295f93 100644 --- a/e2e/playwright/prompt-to-edit.spec.ts +++ b/e2e/playwright/prompt-to-edit.spec.ts @@ -8,7 +8,7 @@ profile001 = startProfileAt([57.81, 250.51], sketch001) |> line(end = [83.37, -34.61], tag = $seg01) |> line(end = [19.66, -116.4]) |> line(end = [-221.8, -41.69]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(profile001, length = 200) sketch002 = startSketchOn('XZ') @@ -16,7 +16,7 @@ sketch002 = startSketchOn('XZ') |> xLine(173.71, %) |> line(end = [-22.12, -94.4]) |> xLine(-156.98, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude002 = extrude(sketch002, length = 50) sketch003 = startSketchOn('XY') @@ -30,7 +30,7 @@ sketch003 = startSketchOn('XY') segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude003 = extrude(sketch003, length = 20) ` diff --git a/e2e/playwright/regression-tests.spec.ts b/e2e/playwright/regression-tests.spec.ts index 156d9da18..531d071b8 100644 --- a/e2e/playwright/regression-tests.spec.ts +++ b/e2e/playwright/regression-tests.spec.ts @@ -23,7 +23,7 @@ test.describe('Regression tests', () => { sketch001 = startSketchAt([-0, -0]) |> line(end = [0, 0]) |> line(end = [-4.84, -5.29]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close()` ) }) @@ -67,7 +67,7 @@ test.describe('Regression tests', () => { segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = 50) ` diff --git a/e2e/playwright/sketch-tests.spec.ts b/e2e/playwright/sketch-tests.spec.ts index 0a8fd7a84..f96a174c3 100644 --- a/e2e/playwright/sketch-tests.spec.ts +++ b/e2e/playwright/sketch-tests.spec.ts @@ -754,7 +754,7 @@ test.describe('Sketch tests', () => { |> startProfileAt([${roundOff(scale * 69.6)}, ${roundOff(scale * 34.8)}], %) |> xLine(${roundOff(scale * 139.19)}, %) |> yLine(-${roundOff(scale * 139.2)}, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close()` await expect( @@ -854,7 +854,7 @@ test.describe('Sketch tests', () => { |> line(end = [1.32, 0.38]) |> line(end = [1.02, -1.32], tag = $seg01) |> line(end = [-1.01, -0.77]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() ` ) @@ -912,7 +912,7 @@ test.describe('Sketch tests', () => { |> line(end = [1.32, 0.38]) |> line(end = [1.02, -1.32], tag = $seg01) |> line(end = [-1.01, -0.77]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = 5) ` @@ -955,7 +955,7 @@ test.describe('Sketch tests', () => { |> line(end = [1.32, 0.38]) |> line(end = [1.02, -1.32], tag = $seg01) |> line(end = [-1.01, -0.77]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = 5) sketch002 = startSketchOn(extrude001, 'END') diff --git a/e2e/playwright/testing-constraints.spec.ts b/e2e/playwright/testing-constraints.spec.ts index 343ccabd0..ea8a57c59 100644 --- a/e2e/playwright/testing-constraints.spec.ts +++ b/e2e/playwright/testing-constraints.spec.ts @@ -92,7 +92,7 @@ test.describe('Testing constraints', () => { |> xLine(-385.34, %, $seg_what) |> yLine(-170.06, %) |> xLine(segLen(seg_what), %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)])` + |> line(endAbsolute = profileStart(%))` ) }) const u = await getUtils(page) @@ -158,7 +158,7 @@ test.describe('Testing constraints', () => { |> xLine(-425.34, %, $seg_what) |> yLine(-264.06, %) |> xLine(segLen(seg_what), %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)])` + |> line(endAbsolute = profileStart(%))` ) const isChecked = await createNewVariableCheckbox.isChecked() @@ -292,7 +292,7 @@ test.describe('Testing constraints', () => { |> xLine(-425.34, %, $seg_what) |> yLine(-264.06, %) |> xLine(segLen(seg_what), %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)])` + |> line(endAbsolute = profileStart(%))` ) }) const u = await getUtils(page) @@ -402,7 +402,7 @@ test.describe('Testing constraints', () => { |> xLine(-425.34, %, $seg_what) |> yLine(-264.06, %) |> xLine(segLen(seg_what), %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)])` + |> line(endAbsolute = profileStart(%))` ) }) const u = await getUtils(page) @@ -517,7 +517,7 @@ test.describe('Testing constraints', () => { |> xLine(-425.34, %, $seg_what) |> yLine(-264.06, %) |> xLine(segLen(seg_what), %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)])` + |> line(endAbsolute = profileStart(%))` ) }) const u = await getUtils(page) @@ -619,7 +619,7 @@ test.describe('Testing constraints', () => { |> xLine(-425.34, %, $seg_what) |> yLine(-264.06, %) |> xLine(segLen(seg_what), %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)])` + |> line(endAbsolute = profileStart(%))` ) }) const u = await getUtils(page) @@ -707,7 +707,7 @@ part002 = startSketchOn('XZ') |> xLine(-425.34, %, $seg_what) |> yLine(-264.06, %) |> xLine(segLen(seg_what), %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)])` + |> line(endAbsolute = profileStart(%))` ) }) const u = await getUtils(page) @@ -785,7 +785,7 @@ part002 = startSketchOn('XZ') |> xLine(-425.34, %, $seg_what) |> yLine(-264.06, %) |> xLine(segLen(seg_what), %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)])` + |> line(endAbsolute = profileStart(%))` ) }) const u = await getUtils(page) @@ -887,7 +887,7 @@ part002 = startSketchOn('XZ') |> xLine(-425.34, %, $seg_what) |> yLine(-264.06, %) |> xLine(segLen(seg_what), %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)])` + |> line(endAbsolute = profileStart(%))` ) }) const u = await getUtils(page) @@ -968,7 +968,7 @@ part002 = startSketchOn('XZ') |> xLine(-425.34, %, $seg_what) |> yLine(-264.06, %) |> xLine(segLen(seg_what), %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)])` + |> line(endAbsolute = profileStart(%))` ) }) const u = await getUtils(page) diff --git a/e2e/playwright/testing-selections.spec.ts b/e2e/playwright/testing-selections.spec.ts index 14d392f69..f4a2f1828 100644 --- a/e2e/playwright/testing-selections.spec.ts +++ b/e2e/playwright/testing-selections.spec.ts @@ -266,7 +266,7 @@ test.describe('Testing selections', () => { |> startProfileAt([-79.26, 95.04], %) |> line(end = [112.54, 127.64], tag = $seg02) |> line(end = [170.36, -121.61], tag = $seg01) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = 50) sketch005 = startSketchOn(extrude001, 'END') @@ -274,19 +274,19 @@ test.describe('Testing selections', () => { |> line(end = [-8.44, 36.61]) |> line(end = [49.4, 2.05]) |> line(end = [29.69, -46.95]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() sketch003 = startSketchOn(extrude001, seg01) |> startProfileAt([21.23, 17.81], %) |> line(end = [51.97, 21.32]) |> line(end = [4.07, -22.75]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() sketch002 = startSketchOn(extrude001, seg02) |> startProfileAt([-100.54, 16.99], %) |> line(end = [0, 20.03]) |> line(end = [62.61, 0], tag = $seg03) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude002 = extrude(sketch002, length = 50) sketch004 = startSketchOn(extrude002, seg03) @@ -294,7 +294,7 @@ test.describe('Testing selections', () => { |> line(end = [-4.72, 22.84]) |> line(end = [28.8, 6.71]) |> line(end = [9.19, -25.33]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude003 = extrude(sketch004, length = 20) pipeLength = 40 @@ -435,7 +435,7 @@ test.describe('Testing selections', () => { |> startProfileAt([-79.26, 95.04], %) |> line(end = [112.54, 127.64], tag = $seg02) |> line(end = [170.36, -121.61], tag = $seg01) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = 50) launderExtrudeThroughVar = extrude001 @@ -443,7 +443,7 @@ test.describe('Testing selections', () => { |> startProfileAt([-100.54, 16.99], %) |> line(end = [0, 20.03]) |> line(end = [62.61, 0], tag = $seg03) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() ` ) @@ -728,7 +728,7 @@ test.describe('Testing selections', () => { segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $yo) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02) + |> line(endAbsolute = profileStart(%), tag = $seg02) |> close() extrude001 = extrude(sketch001, length = 100) |> chamfer({ @@ -883,7 +883,7 @@ test.describe('Testing selections', () => { |> startProfileAt([-12.94, 6.6], %) |> line(end = [2.45, -0.2]) |> line(end = [-2, -1.25]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() ` await u.codeLocator.fill(codeToAdd) @@ -988,7 +988,7 @@ test.describe('Testing selections', () => { |> startProfileAt([-79.26, 95.04], %) |> line(end = [112.54, 127.64]) |> line(end = [170.36, -121.61], tag = $seg01) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = 50) ` diff --git a/e2e/playwright/testing-settings.spec.ts b/e2e/playwright/testing-settings.spec.ts index 83dd0306f..d30fe951e 100644 --- a/e2e/playwright/testing-settings.spec.ts +++ b/e2e/playwright/testing-settings.spec.ts @@ -717,7 +717,7 @@ test.describe('Testing settings', () => { |> line(end = [5, 0]) |> line(end = [0, 5]) |> line(end = [-5, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = 5) ` diff --git a/e2e/playwright/various.spec.ts b/e2e/playwright/various.spec.ts index 3146807b2..4544aae9b 100644 --- a/e2e/playwright/various.spec.ts +++ b/e2e/playwright/various.spec.ts @@ -522,7 +522,7 @@ extrude001 = extrude(sketch001, length = 5 + 7)` |> startProfileAt([-12.94, 6.6], %) |> line(end = [2.45, -0.2]) |> line(end = [-2.6, -1.25]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() `) ) @@ -560,7 +560,7 @@ extrude001 = extrude(sketch001, length = 5 + 7)` |> startProfileAt([-12.83, 6.7], %) |> line(end = [${[2.28, 2.35]}, -${0.07}]) |> line(end = [-3.05, -1.47]) -|> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +|> line(endAbsolute = profileStart(%)) |> close()` await expect(page.locator('.cm-content')).toHaveText(result.regExp) diff --git a/src/lang/modifyAst.test.ts b/src/lang/modifyAst.test.ts index 6ea87dea2..99bdb3845 100644 --- a/src/lang/modifyAst.test.ts +++ b/src/lang/modifyAst.test.ts @@ -749,7 +749,7 @@ sketch003 = startSketchOn('XZ') |> startProfileAt([3.82, 13.6], %) |> line(end = [-2.94, 2.7]) |> line(end = [7.7, 0.16]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close()`, codeAfter: `myVar = 5\n`, lineOfInterest: 'line(end = [-2.94, 2.7])', @@ -794,7 +794,7 @@ sketch001 = startSketchOn('XZ') |> line(end = [-11.18, -2.15]) |> line(end = [5.41, -9.61]) |> line(end = [-8.54, -2.51]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001 = extrude(sketch001, length = 5) sketch002 = startSketchOn(extrude001, seg01) @@ -804,7 +804,7 @@ sketch002 = startSketchOn(extrude001, seg01) |> angledLine([-86, segLen(seg02)], %) |> line(end = [-3.97, -0.53]) |> line(end = [0.3, 0.84]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close()`, codeAfter: `myVar = 5 sketch001 = startSketchOn('XZ') @@ -815,7 +815,7 @@ sketch001 = startSketchOn('XZ') |> line(end = [-11.18, -2.15]) |> line(end = [5.41, -9.61]) |> line(end = [-8.54, -2.51]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() sketch002 = startSketchOn({ plane = { @@ -831,7 +831,7 @@ sketch002 = startSketchOn({ |> angledLine([-86, segLen(seg02)], %) |> line(end = [-3.97, -0.53]) |> line(end = [0.3, 0.84]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() `, lineOfInterest: 'line(end = [-11.18, -2.15])', @@ -850,7 +850,7 @@ sketch001 = startSketchOn('XZ') |> line(end = [-11.18, -2.15]) |> line(end = [5.41, -9.61]) |> line(end = [-8.54, -2.51]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001 = extrude(sketch001, length = 5) sketch002 = startSketchOn(extrude001, seg01) @@ -860,7 +860,7 @@ sketch002 = startSketchOn(extrude001, seg01) |> angledLine([-86, segLen(seg02)], %) |> line(end = [-3.97, -0.53]) |> line(end = [0.3, 0.84]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close()`, codeAfter: `myVar = 5 sketch001 = startSketchOn('XZ') @@ -871,7 +871,7 @@ sketch001 = startSketchOn('XZ') |> line(end = [-11.18, -2.15]) |> line(end = [5.41, -9.61]) |> line(end = [-8.54, -2.51]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() sketch002 = startSketchOn({ plane = { @@ -887,7 +887,7 @@ sketch002 = startSketchOn({ |> angledLine([-86, segLen(seg02)], %) |> line(end = [-3.97, -0.53]) |> line(end = [0.3, 0.84]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() `, lineOfInterest: 'startProfileAt([4.46, 5.12], %, $tag)', diff --git a/src/lang/modifyAst/addEdgeTreatment.test.ts b/src/lang/modifyAst/addEdgeTreatment.test.ts index e877c812a..addccd20d 100644 --- a/src/lang/modifyAst/addEdgeTreatment.test.ts +++ b/src/lang/modifyAst/addEdgeTreatment.test.ts @@ -173,7 +173,7 @@ describe('Testing getPathToExtrudeForSegmentSelection', () => { |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15)` const selectedSegmentSnippet = `line(end = [20, 0])` @@ -190,7 +190,7 @@ extrude001 = extrude(sketch001, length = -15)` |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> extrude(length = 15)` const selectedSegmentSnippet = `line(end = [20, 0])` @@ -207,21 +207,21 @@ extrude001 = extrude(sketch001, length = -15)` |> line(end = [15, 0]) |> line(end = [0, -15]) |> line(end = [-15, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() sketch002 = startSketchOn('XY') |> startProfileAt([30, 30], %) |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() sketch003 = startSketchOn('XY') |> startProfileAt([30, -30], %) |> line(end = [25, 0]) |> line(end = [0, -25]) |> line(end = [-25, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) extrude002 = extrude(sketch002, length = -15) @@ -240,21 +240,21 @@ extrude003 = extrude(sketch003, length = -15)` |> line(end = [15, 0]) |> line(end = [0, -15]) |> line(end = [-15, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() sketch002 = startSketchOn('XY') |> startProfileAt([30, 30], %) |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() sketch003 = startSketchOn('XY') |> startProfileAt([30, -30], %) |> line(end = [25, 0]) |> line(end = [0, -25]) |> line(end = [-25, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) extrude003 = extrude(sketch003, length = -15)` @@ -400,7 +400,7 @@ Object.values(EdgeTreatmentType).forEach( |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15)` const segmentSnippets = ['line(end = [0, -20])'] @@ -409,7 +409,7 @@ extrude001 = extrude(sketch001, length = -15)` |> line(end = [20, 0]) |> line(end = [0, -20], tag = $seg01) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01] }, %)` @@ -427,7 +427,7 @@ extrude001 = extrude(sketch001, length = -15) |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> extrude(length = -15)` const segmentSnippets = ['line(end = [0, -20])'] @@ -436,7 +436,7 @@ extrude001 = extrude(sketch001, length = -15) |> line(end = [20, 0]) |> line(end = [0, -20], tag = $seg01) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> extrude(length = -15) |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01] }, %)` @@ -454,7 +454,7 @@ extrude001 = extrude(sketch001, length = -15) |> line(end = [20, 0]) |> line(end = [0, -20], tag = $seg01) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15)` const segmentSnippets = ['line(end = [0, -20], tag = $seg01)'] @@ -463,7 +463,7 @@ extrude001 = extrude(sketch001, length = -15)` |> line(end = [20, 0]) |> line(end = [0, -20], tag = $seg01) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01] }, %)` @@ -481,7 +481,7 @@ extrude001 = extrude(sketch001, length = -15) |> line(end = [20, 0], tag = $seg01) |> line(end = [0, -20]) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15)` const segmentSnippets = ['line(end = [-20, 0])'] @@ -490,7 +490,7 @@ extrude001 = extrude(sketch001, length = -15)` |> line(end = [20, 0], tag = $seg01) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg02) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg02] }, %)` @@ -508,7 +508,7 @@ extrude001 = extrude(sketch001, length = -15) |> line(end = [20, 0], tag = $seg01) |> line(end = [0, -20]) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) |> fillet({ radius = 5, tags = [seg01] }, %)` @@ -518,7 +518,7 @@ extrude001 = extrude(sketch001, length = -15) |> line(end = [20, 0], tag = $seg01) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg02) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) |> fillet({ radius = 5, tags = [seg01] }, %) @@ -537,7 +537,7 @@ extrude001 = extrude(sketch001, length = -15) |> line(end = [20, 0], tag = $seg01) |> line(end = [0, -20]) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) |> chamfer({ length = 5, tags = [seg01] }, %)` @@ -547,7 +547,7 @@ extrude001 = extrude(sketch001, length = -15) |> line(end = [20, 0], tag = $seg01) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg02) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) |> chamfer({ length = 5, tags = [seg01] }, %) @@ -566,7 +566,7 @@ extrude001 = extrude(sketch001, length = -15) |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15)` const segmentSnippets = ['line(end = [20, 0])', 'line(end = [-20, 0])'] @@ -575,7 +575,7 @@ extrude001 = extrude(sketch001, length = -15)` |> line(end = [20, 0], tag = $seg01) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg02) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01, seg02] }, %)` @@ -593,7 +593,7 @@ extrude001 = extrude(sketch001, length = -15) |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) sketch002 = startSketchOn('XY') @@ -601,7 +601,7 @@ sketch002 = startSketchOn('XY') |> line(end = [15, 0]) |> line(end = [0, -15]) |> line(end = [-15, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude002 = extrude(sketch002, length = -25)` // <--- body 2 const segmentSnippets = [ @@ -614,7 +614,7 @@ extrude002 = extrude(sketch002, length = -25)` // <--- body 2 |> line(end = [20, 0], tag = $seg01) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg02) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01, seg02] }, %) @@ -623,7 +623,7 @@ sketch002 = startSketchOn('XY') |> line(end = [15, 0]) |> line(end = [0, -15], tag = $seg03) |> line(end = [-15, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude002 = extrude(sketch002, length = -25) |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg03] }, %)` // <-- able to add a new one @@ -644,7 +644,7 @@ extrude002 = extrude(sketch002, length = -25) |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg01) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01] }, %)` @@ -654,7 +654,7 @@ extrude001 = extrude(sketch001, length = -15) |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg01) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15)` @@ -670,7 +670,7 @@ extrude001 = extrude(sketch001, length = -15)` |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg01) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) fillet001 = ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01] }, extrude001)` @@ -680,7 +680,7 @@ fillet001 = ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01] }, extru |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg01) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15)` @@ -697,7 +697,7 @@ extrude001 = extrude(sketch001, length = -15)` |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg01) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) fillet001 = ${edgeTreatmentType}({ ${parameterName} = 3, tags = [getOppositeEdge(seg01)] }, extrude001)` @@ -707,7 +707,7 @@ fillet001 = ${edgeTreatmentType}({ ${parameterName} = 3, tags = [getOppositeEdge |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg01) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15)` @@ -723,7 +723,7 @@ extrude001 = extrude(sketch001, length = -15)` |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg01) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) fillet001 = ${edgeTreatmentType}({ ${parameterName} = 3, tags = [getNextAdjacentEdge(seg01)] }, extrude001)` @@ -733,7 +733,7 @@ fillet001 = ${edgeTreatmentType}({ ${parameterName} = 3, tags = [getNextAdjacent |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg01) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15)` @@ -750,7 +750,7 @@ extrude001 = extrude(sketch001, length = -15)` |> line(end = [20, 0], tag = $seg01) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg02) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01] }, %) @@ -763,7 +763,7 @@ chamfer001 = chamfer({ length = 5, tags = [getOppositeEdge(seg01)] }, extrude001 |> line(end = [20, 0], tag = $seg01) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg02) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) |> fillet({ @@ -788,7 +788,7 @@ chamfer001 = chamfer({ |> line(end = [20, 0], tag = $seg01) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg02) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01] }, %) @@ -801,7 +801,7 @@ chamfer001 = chamfer({ length = 5, tags = [getOppositeEdge(seg01)] }, extrude001 |> line(end = [20, 0], tag = $seg01) |> line(end = [0, -20]) |> line(end = [-20, 0], tag = $seg02) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -15) |> ${edgeTreatmentType}({ ${parameterName} = 3, tags = [seg01] }, %) @@ -934,7 +934,7 @@ describe('Testing button states', () => { |> line(end = [0, 10]) |> line(end = [10, 0]) |> line(end = [0, -10]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -10) ` @@ -944,7 +944,7 @@ describe('Testing button states', () => { |> line(end = [0, 10]) |> line(end = [10, 0]) |> line(end = [0, -10]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() ` // body is missing diff --git a/src/lang/queryAst.test.ts b/src/lang/queryAst.test.ts index bd0e1fc40..3bb7da908 100644 --- a/src/lang/queryAst.test.ts +++ b/src/lang/queryAst.test.ts @@ -496,7 +496,7 @@ sketch002 = startSketchOn(extrude001, seg01) |> startProfileAt([-12.94, 6.6], %) |> line(end = [2.45, -0.2]) |> line(end = [-2, -1.25]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() sketch003 = startSketchOn(extrude001, 'END') |> startProfileAt([8.14, 2.8], %) @@ -506,7 +506,7 @@ sketch003 = startSketchOn(extrude001, 'END') |> line(end = [3.12, 1.74]) |> line(end = [1.91, -4.09]) |> line(end = [-5.6, -2.75]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> extrude(length = 3.14) ` @@ -573,7 +573,7 @@ sketch002 = startSketchOn(extrude001, $seg01) |> startProfileAt([-12.94, 6.6], %) |> line(end = [2.45, -0.2]) |> line(end = [-2, -1.25]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() ` const ast = assertParse(exampleCode) @@ -752,7 +752,7 @@ describe('Testing specific sketch getNodeFromPath workflow', () => { |> xLine(-0.15, %) |> line([-0.02, 0.21], %) |> line([-0.08, 0.05], %) - |> lineTo([profileStartX(%), profileStartY(%)], %) + |> lineTo(profileStart(%), %) ` expect(recasted).toEqual(expectedCode) }) @@ -766,7 +766,7 @@ describe('Testing specific sketch getNodeFromPath workflow', () => { |> xLine(-0.15, %) |> line([-0.02, 0.21], %) |> line([-0.08, 0.05], %) -|> lineTo([profileStartX(%), profileStartY(%)], %) +|> lineTo(profileStart(%), %) ` const ast = assertParse(openSketch) const sketchSnippet = `startProfileAt([0.02, 0.22], %)` @@ -792,7 +792,7 @@ describe('Testing specific sketch getNodeFromPath workflow', () => { |> xLine(-0.15, %) |> line([-0.02, 0.21], %) |> line([-0.08, 0.05], %) - |> lineTo([profileStartX(%), profileStartY(%)], %) + |> lineTo(profileStart(%), %) |> close() ` expect(recasted).toEqual(expectedCode) diff --git a/src/lang/std/sketch.test.ts b/src/lang/std/sketch.test.ts index 733463583..f22571854 100644 --- a/src/lang/std/sketch.test.ts +++ b/src/lang/std/sketch.test.ts @@ -289,7 +289,7 @@ describe('testing addTagForSketchOnFace', () => { segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02) + |> line(endAbsolute = profileStart(%), tag = $seg02) |> close() extrude001 = extrude(sketch001, length = 100) ${insertCode} diff --git a/src/lang/std/sketchcombos.test.ts b/src/lang/std/sketchcombos.test.ts index dcc30e3cd..dbd7685df 100644 --- a/src/lang/std/sketchcombos.test.ts +++ b/src/lang/std/sketchcombos.test.ts @@ -144,14 +144,14 @@ describe('testing transformAstForSketchLines for equal length constraint', () => |> startProfileAt([0, 0], %) |> line(end = [5, 5]) |> line(end = [-2, 5]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close()` const expectedModifiedScript = `sketch001 = startSketchOn('XZ') |> startProfileAt([0, 0], %) |> line(end = [5, 5], tag = $seg01) |> angledLine([112, segLen(seg01)], %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() ` diff --git a/src/lib/rectangleTool.test.ts b/src/lib/rectangleTool.test.ts index cfb26cc03..856b36e62 100644 --- a/src/lib/rectangleTool.test.ts +++ b/src/lib/rectangleTool.test.ts @@ -29,7 +29,7 @@ describe('library rectangleTool helper functions', () => { segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $rectangleSegmentC001) -|> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +|> line(endAbsolute = profileStart(%)) |> close() ` // Create ast @@ -82,7 +82,7 @@ segAng(rectangleSegmentA001), segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() ` const recasted = recast(ast) diff --git a/src/test-utils.test.ts b/src/test-utils.test.ts index 0370f4472..022f1a13d 100644 --- a/src/test-utils.test.ts +++ b/src/test-utils.test.ts @@ -7,7 +7,7 @@ test('normaliseKclNumbers', () => { |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001 = extrude(sketch001, length = -15)`) ).toBe(`sketch001 = startSketchOn('XY') @@ -15,7 +15,7 @@ const extrude001 = extrude(sketch001, length = -15)`) |> line(end = [12.34, 0]) |> line(end = [0, -12.34]) |> line(end = [-12.34, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001 = extrude(sketch001, length = -12.34)`) expect( @@ -25,7 +25,7 @@ const extrude001 = extrude(sketch001, length = -12.34)`) |> line(end = [20, 0]) |> line(end = [0, -20]) |> line(end = [-20, 0]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001 = extrude(sketch001, length = -15)`, false @@ -35,7 +35,7 @@ const extrude001 = extrude(sketch001, length = -15)`, |> line(end = [12.34, 12.34]) |> line(end = [12.34, -12.34]) |> line(end = [-12.34, 12.34]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001 = extrude(sketch001, length = -12.34)`) }) diff --git a/src/wasm-lib/kcl/src/execution/mod.rs b/src/wasm-lib/kcl/src/execution/mod.rs index 8ff5a1cb7..10620f584 100644 --- a/src/wasm-lib/kcl/src/execution/mod.rs +++ b/src/wasm-lib/kcl/src/execution/mod.rs @@ -4240,7 +4240,7 @@ shell({ faces = ['end'], thickness = 0.25 }, firstSketch)"#; |> xLine(305.11, %, $seg01) |> yLine(-291.85, %) |> xLine(-segLen(seg01), %) -|> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +|> line(endAbsolute = profileStart(%)) |> close() |> extrude(length = 40.14) |> shell({ @@ -4269,7 +4269,7 @@ shell({ faces = ['end'], thickness = 0.25 }, firstSketch)"#; |> xLine(305.11, %, $seg01) |> yLine(-291.85, %) |> xLine(-segLen(seg01), %) -|> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +|> line(endAbsolute = profileStart(%)) |> close() |> extrude(length = 40.14) |> shell({ diff --git a/src/wasm-lib/kcl/src/std/chamfer.rs b/src/wasm-lib/kcl/src/std/chamfer.rs index 650353863..1751a9c76 100644 --- a/src/wasm-lib/kcl/src/std/chamfer.rs +++ b/src/wasm-lib/kcl/src/std/chamfer.rs @@ -92,7 +92,7 @@ pub async fn chamfer(exec_state: &mut ExecState, args: Args) -> Result line(end = [2, 0]) /// |> line(end = [0, 2]) /// |> line(end = [-2, 0]) -/// |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +/// |> line(endAbsolute = profileStart(%)) /// |> close() /// |> extrude(length = 10) /// ``` diff --git a/src/wasm-lib/kcl/src/std/loft.rs b/src/wasm-lib/kcl/src/std/loft.rs index 748758204..5f8e92945 100644 --- a/src/wasm-lib/kcl/src/std/loft.rs +++ b/src/wasm-lib/kcl/src/std/loft.rs @@ -54,14 +54,14 @@ pub async fn loft(exec_state: &mut ExecState, args: Args) -> Result line(end = [200, 0]) /// |> line(end = [0, -200]) /// |> line(end = [-200, 0]) -/// |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +/// |> line(endAbsolute = profileStart(%)) /// |> close() /// /// triangleSketch = startSketchOn(offsetPlane('XY', 75)) /// |> startProfileAt([0, 125], %) /// |> line(end = [-15, -30]) /// |> line(end = [30, 0]) -/// |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +/// |> line(endAbsolute = profileStart(%)) /// |> close() /// /// loft([squareSketch, triangleSketch]) @@ -74,7 +74,7 @@ pub async fn loft(exec_state: &mut ExecState, args: Args) -> Result line(end = [200, 0]) /// |> line(end = [0, -200]) /// |> line(end = [-200, 0]) -/// |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +/// |> line(endAbsolute = profileStart(%)) /// |> close() /// /// circleSketch0 = startSketchOn(offsetPlane('XY', 75)) @@ -93,7 +93,7 @@ pub async fn loft(exec_state: &mut ExecState, args: Args) -> Result line(end = [200, 0]) /// |> line(end = [0, -200]) /// |> line(end = [-200, 0]) -/// |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +/// |> line(endAbsolute = profileStart(%)) /// |> close() /// /// circleSketch0 = startSketchOn(offsetPlane('XY', 75)) diff --git a/src/wasm-lib/kcl/src/std/planes.rs b/src/wasm-lib/kcl/src/std/planes.rs index 1cba336ae..093dcbe96 100644 --- a/src/wasm-lib/kcl/src/std/planes.rs +++ b/src/wasm-lib/kcl/src/std/planes.rs @@ -70,7 +70,7 @@ pub async fn offset_plane(exec_state: &mut ExecState, args: Args) -> Result line(end = [200, 0]) /// |> line(end = [0, -200]) /// |> line(end = [-200, 0]) -/// |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +/// |> line(endAbsolute = profileStart(%)) /// |> close() /// /// circleSketch = startSketchOn(offsetPlane('XY', 150)) @@ -86,7 +86,7 @@ pub async fn offset_plane(exec_state: &mut ExecState, args: Args) -> Result line(end = [200, 0]) /// |> line(end = [0, -200]) /// |> line(end = [-200, 0]) -/// |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +/// |> line(endAbsolute = profileStart(%)) /// |> close() /// /// circleSketch = startSketchOn(offsetPlane('XZ', 150)) @@ -102,7 +102,7 @@ pub async fn offset_plane(exec_state: &mut ExecState, args: Args) -> Result line(end = [200, 0]) /// |> line(end = [0, -200]) /// |> line(end = [-200, 0]) -/// |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +/// |> line(endAbsolute = profileStart(%)) /// |> close() /// /// circleSketch = startSketchOn(offsetPlane('YZ', 150)) @@ -118,7 +118,7 @@ pub async fn offset_plane(exec_state: &mut ExecState, args: Args) -> Result line(end = [200, 0]) /// |> line(end = [0, -200]) /// |> line(end = [-200, 0]) -/// |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +/// |> line(endAbsolute = profileStart(%)) /// |> close() /// /// circleSketch = startSketchOn(offsetPlane('-XZ', -150)) diff --git a/src/wasm-lib/kcl/src/std/revolve.rs b/src/wasm-lib/kcl/src/std/revolve.rs index 09248b4f5..3e1b2ae03 100644 --- a/src/wasm-lib/kcl/src/std/revolve.rs +++ b/src/wasm-lib/kcl/src/std/revolve.rs @@ -162,7 +162,7 @@ pub async fn revolve(exec_state: &mut ExecState, args: Args) -> Result startProfileAt([10, 0], %) /// |> line(end = [5, -5]) /// |> line(end = [5, 5]) -/// |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) +/// |> line(endAbsolute = profileStart(%)) /// |> close() /// /// part001 = revolve({ diff --git a/src/wasm-lib/kcl/tests/artifact_graph_example_code1/input.kcl b/src/wasm-lib/kcl/tests/artifact_graph_example_code1/input.kcl index 8ab4969db..6678f1de1 100644 --- a/src/wasm-lib/kcl/tests/artifact_graph_example_code1/input.kcl +++ b/src/wasm-lib/kcl/tests/artifact_graph_example_code1/input.kcl @@ -3,7 +3,7 @@ sketch001 = startSketchOn('XY') |> line(end = [0, 10]) |> line(end = [10.55, 0], tag = $seg01) |> line(end = [0, -10], tag = $seg02) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = -10) |> fillet({ radius = 5, tags = [seg01] }, %) @@ -11,6 +11,6 @@ sketch002 = startSketchOn(extrude001, seg02) |> startProfileAt([-2, -6], %) |> line(end = [2, 3]) |> line(end = [2, -3]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude002 = extrude(sketch002, length = 5) diff --git a/src/wasm-lib/kcl/tests/artifact_graph_example_code_no_3d/input.kcl b/src/wasm-lib/kcl/tests/artifact_graph_example_code_no_3d/input.kcl index 32b542974..bf79aed59 100644 --- a/src/wasm-lib/kcl/tests/artifact_graph_example_code_no_3d/input.kcl +++ b/src/wasm-lib/kcl/tests/artifact_graph_example_code_no_3d/input.kcl @@ -9,7 +9,7 @@ sketch003 = startSketchOn('YZ') segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() sketch004 = startSketchOn('-XZ') |> startProfileAt([0, 14.36], %) diff --git a/src/wasm-lib/kcl/tests/artifact_graph_sketch_on_face_etc/input.kcl b/src/wasm-lib/kcl/tests/artifact_graph_sketch_on_face_etc/input.kcl index 6253d95e4..058e9a013 100644 --- a/src/wasm-lib/kcl/tests/artifact_graph_sketch_on_face_etc/input.kcl +++ b/src/wasm-lib/kcl/tests/artifact_graph_sketch_on_face_etc/input.kcl @@ -2,27 +2,27 @@ sketch001 = startSketchOn('XZ') |> startProfileAt([0, 0], %) |> line(end = [4, 8]) |> line(end = [5, -8], tag = $seg01) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude001 = extrude(sketch001, length = 6) sketch002 = startSketchOn(extrude001, seg01) |> startProfileAt([-0.5, 0.5], %) |> line(end = [2, 5]) |> line(end = [2, -5]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude002 = extrude(sketch002, length = 5) sketch003 = startSketchOn(extrude002, 'END') |> startProfileAt([1, 1.5], %) |> line(end = [0.5, 2], tag = $seg02) |> line(end = [1, -2]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude003 = extrude(sketch003, length = 4) sketch004 = startSketchOn(extrude003, seg02) |> startProfileAt([-3, 14], %) |> line(end = [0.5, 1]) |> line(end = [0.5, -2]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() extrude004 = extrude(sketch004, length = 3) diff --git a/src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times-different-order/input.kcl b/src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times-different-order/input.kcl index 7d0c5dca2..9188a85ed 100644 --- a/src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times-different-order/input.kcl +++ b/src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times-different-order/input.kcl @@ -9,7 +9,7 @@ sketch001 = startSketchOn('XZ') segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02) + |> line(endAbsolute = profileStart(%), tag = $seg02) |> close(%) extrude001 = extrude(sketch001, length = 100) |> fillet({ radius = 20, tags = [seg01] }, %) @@ -30,7 +30,7 @@ sketch003 = startSketchOn(extrude001, seg04) segAng(rectangleSegmentA003), -segLen(rectangleSegmentA003) ], %, $rectangleSegmentC002) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close(%) sketch002 = startSketchOn(extrude001, seg03) |> startProfileAt([159.25, 278.35], %) @@ -43,6 +43,6 @@ sketch002 = startSketchOn(extrude001, seg03) segAng(rectangleSegmentA002), -segLen(rectangleSegmentA002) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close(%) extrude002 = extrude(sketch002, length = 50) diff --git a/src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times/input.kcl b/src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times/input.kcl index b39d9cd65..f873919f9 100644 --- a/src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times/input.kcl +++ b/src/wasm-lib/kcl/tests/sketch-on-chamfer-two-times/input.kcl @@ -9,7 +9,7 @@ sketch001 = startSketchOn('XZ') segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02) + |> line(endAbsolute = profileStart(%), tag = $seg02) |> close(%) extrude001 = extrude(sketch001, length = 100) |> fillet({ radius = 20, tags = [seg01] }, %) @@ -30,7 +30,7 @@ sketch003 = startSketchOn(extrude001, seg04) segAng(rectangleSegmentA003), -segLen(rectangleSegmentA003) ], %, $rectangleSegmentC002) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close(%) sketch002 = startSketchOn(extrude001, seg03) |> startProfileAt([159.25, 278.35], %) @@ -43,6 +43,6 @@ sketch002 = startSketchOn(extrude001, seg03) segAng(rectangleSegmentA002), -segLen(rectangleSegmentA002) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close(%) extrude002 = extrude(sketch002, length = 50) diff --git a/src/wasm-lib/kcl/tests/sketch_on_face_after_fillets_referencing_face/input.kcl b/src/wasm-lib/kcl/tests/sketch_on_face_after_fillets_referencing_face/input.kcl index 01f3c69e7..2e32a01f7 100644 --- a/src/wasm-lib/kcl/tests/sketch_on_face_after_fillets_referencing_face/input.kcl +++ b/src/wasm-lib/kcl/tests/sketch_on_face_after_fillets_referencing_face/input.kcl @@ -46,6 +46,6 @@ sketch001 = startSketchOn(bracket, seg01) |> line(end = [2.17, -0.03]) |> line(end = [-0.07, -1.8]) |> line(end = [-2.07, 0.05]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close(%) |> extrude(length = 10) diff --git a/src/wasm-lib/tests/executor/inputs/e2e-can-sketch-on-chamfer-no-pipeExpr.kcl b/src/wasm-lib/tests/executor/inputs/e2e-can-sketch-on-chamfer-no-pipeExpr.kcl index ead71f435..f78386734 100644 --- a/src/wasm-lib/tests/executor/inputs/e2e-can-sketch-on-chamfer-no-pipeExpr.kcl +++ b/src/wasm-lib/tests/executor/inputs/e2e-can-sketch-on-chamfer-no-pipeExpr.kcl @@ -9,7 +9,7 @@ const sketch001 = startSketchOn('XZ') segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $yo) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02) + |> line(endAbsolute = profileStart(%), tag = $seg02) |> close() const extrude001 = extrude(sketch001, length = 100) const chamf = chamfer({ diff --git a/src/wasm-lib/tests/executor/inputs/e2e-can-sketch-on-chamfer.kcl b/src/wasm-lib/tests/executor/inputs/e2e-can-sketch-on-chamfer.kcl index 0d18d5e9f..ffc81770c 100644 --- a/src/wasm-lib/tests/executor/inputs/e2e-can-sketch-on-chamfer.kcl +++ b/src/wasm-lib/tests/executor/inputs/e2e-can-sketch-on-chamfer.kcl @@ -9,7 +9,7 @@ const sketch001 = startSketchOn('XZ') segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $yo) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02) + |> line(endAbsolute = profileStart(%), tag = $seg02) |> close() const extrude001 = extrude(sketch001, length = 100) |> chamfer({ diff --git a/src/wasm-lib/tests/executor/inputs/router-template-slate.kcl b/src/wasm-lib/tests/executor/inputs/router-template-slate.kcl index 5942946e1..a7adc042e 100644 --- a/src/wasm-lib/tests/executor/inputs/router-template-slate.kcl +++ b/src/wasm-lib/tests/executor/inputs/router-template-slate.kcl @@ -30,7 +30,7 @@ const sketch001 = startSketchOn('XZ') angleStart: 180, radius: radius - templateGap }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001 = extrude(sketch001, length = 5) const sketch002 = startSketchOn(extrude001, 'START') @@ -47,7 +47,7 @@ const sketch002 = startSketchOn(extrude001, 'START') segAng(rectangleSegmentA001, %), -segLen(rectangleSegmentA001, %) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002 = extrude(sketch002, length = 7.5) const sketch003 = startSketchOn(extrude001, 'START') @@ -64,6 +64,6 @@ const sketch003 = startSketchOn(extrude001, 'START') segAng(rectangleSegmentA002, %), -segLen(rectangleSegmentA002, %) ], %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude003 = extrude(sketch003, length = 7.5) diff --git a/src/wasm-lib/tests/executor/inputs/scoped-tags.kcl b/src/wasm-lib/tests/executor/inputs/scoped-tags.kcl index 24c075a08..20b66f604 100644 --- a/src/wasm-lib/tests/executor/inputs/scoped-tags.kcl +++ b/src/wasm-lib/tests/executor/inputs/scoped-tags.kcl @@ -10,7 +10,7 @@ fn rect = (origin) => { segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() } diff --git a/src/wasm-lib/tests/executor/inputs/server-rack-heavy.kcl b/src/wasm-lib/tests/executor/inputs/server-rack-heavy.kcl index 909b6f600..a511f83a7 100644 --- a/src/wasm-lib/tests/executor/inputs/server-rack-heavy.kcl +++ b/src/wasm-lib/tests/executor/inputs/server-rack-heavy.kcl @@ -28,7 +28,7 @@ fn caster = (originStart) => { |> xLine(3.543, %) |> yLine(3.543, %) |> xLine(-3.543, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> hole(circle({ center: [ (3.543 - 2.756) / 2, @@ -113,7 +113,7 @@ const sketch001l = startSketchOn(plane001) |> xLine(serverDepth + .8, %) |> angledLineToY({ angle: -45, to: 1 }, %) |> xLine(-serverDepth + 2 - .8, %, $seg01) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001l = extrude(sketch001l, length = 1) @@ -125,7 +125,7 @@ const sketch002l = startSketchOn(plane001) to: serverDepth - 1 + .8 }, %) |> yLine(-railHeight * 1.75, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002l = extrude(sketch002l, length = 1) @@ -140,7 +140,7 @@ const sketch003l = startSketchOn(plane001) to: railHeight * 1.75 - 1 + 2 }, %) |> xLine(serverDepth - 2 + .8, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude003l = extrude(sketch003l, length = 1) @@ -152,7 +152,7 @@ const sketch004l = startSketchOn(plane001) to: railHeight * 1.75 + 2 - 1 }, %) |> yLine(-railHeight * 1.75, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude004l = extrude(sketch004l, length = 1) @@ -161,7 +161,7 @@ const sketch005l = startSketchOn(plane001) |> line(end = [-serverDepth + 2.25, railHeight * 1.75], tag = $lineToIntersect4) |> xLine(1, %) |> line(end = [serverDepth - 2.25, -railHeight * 1.75], tag = $lineToIntersect5) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude005l = extrude(sketch005l, length = 1) @@ -174,7 +174,7 @@ const sketch006l = startSketchOn(plane001) }, %) |> angledLine({ angle: -70, length: 1.414 }, %) |> angledLineToY({ angle: 70 + 180, to: 2 - 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude006l = extrude(sketch006l, length = 1) @@ -193,7 +193,7 @@ const sketch007l = startSketchOn(plane001) angle: 70 + 180, to: railHeight * 1.75 + 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude007l = extrude(sketch007l, length = 1) @@ -216,7 +216,7 @@ const sketch001w = startSketchOn(plane002) |> xLine(depth, %) |> angledLineToY({ angle: -45, to: 1 }, %) |> xLine(-depth + 2, %, $seg01w) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001w = extrude(sketch001w, length = 1) @@ -225,7 +225,7 @@ const sketch002w = startSketchOn(plane002) |> yLine(railHeight * 1.75 + 2, %) |> angledLineToX({ angle: -135, to: depth - 1 }, %) |> yLine(-railHeight * 1.75, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002w = extrude(sketch002w, length = 1) @@ -237,7 +237,7 @@ const sketch003w = startSketchOn(plane002) to: railHeight * 1.75 - 1 + 2 }, %) |> xLine(depth - 2, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude003w = extrude(sketch003w, length = 1) @@ -249,7 +249,7 @@ const sketch004w = startSketchOn(plane002) to: railHeight * 1.75 + 2 - 1 }, %) |> yLine(-railHeight * 1.75, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude004w = extrude(sketch004w, length = 1) @@ -258,7 +258,7 @@ const sketch005w = startSketchOn(plane002) |> angledLine({ angle: -23, length: 35.5 }, %) |> angledLine({ angle: -23 + 90 + 45, length: 1.413 }, %) |> angledLineToX({ angle: -23, to: 1 }, %, $lineToIntersect) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude005w = extrude(sketch005w, length = 1) @@ -274,7 +274,7 @@ const sketch006w = startSketchOn(plane002) intersectTag: lineToIntersect, offset: 0 }, %, $lineToIntersect2) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude006w = extrude(sketch006w, length = 1) @@ -287,7 +287,7 @@ const sketch007w = startSketchOn(plane002) intersectTag: lineToIntersect2, offset: 0 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude007w = extrude(sketch007w, length = 1) @@ -304,7 +304,7 @@ const sketch008w = startSketchOn(plane002) intersectTag: lineToIntersect, offset: 0 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude008w = extrude(sketch008w, length = 1) @@ -313,7 +313,7 @@ const sketch009w = startSketchOn(plane002) |> angledLine({ angle: -23 - 45, length: 1.414 }, %) |> angledLine({ angle: 90 - 23, length: 28 }, %) |> angledLine({ angle: -23 + 45, length: -1.414 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude009w = extrude(sketch009w, length = 1) @@ -322,7 +322,7 @@ const sketch010w = startSketchOn(plane002) |> angledLine({ angle: -23 - 45, length: 1.414 }, %) |> angledLine({ angle: 180 - 23, length: 28 }, %) |> angledLine({ angle: -23 + 45, length: 1.414 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude010w = extrude(sketch010w, length = 1) @@ -334,7 +334,7 @@ const sketch011w = startSketchOn(plane002) |> angledLine({ angle: 90 - 23, length: 28 - 2 }, %) |> angledLine({ angle: -23 - 45, length: -1.414 }, %) |> angledLine({ angle: 90 - 23 + 180, length: 28 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude011w = extrude(sketch011w, length = 1) @@ -346,7 +346,7 @@ const sketch012w = startSketchOn(plane002) |> angledLine({ angle: 180 - 23, length: 28 - 2 }, %) |> angledLine({ angle: -23 - 45, length: -1.414 }, %) |> angledLine({ angle: -23, length: 28 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude012w = extrude(sketch012w, length = 1) @@ -358,7 +358,7 @@ const sketch013w = startSketchOn(plane002) |> angledLine({ angle: -23, length: 1 }, %) |> angledLineToX({ angle: -23 + 90, to: 1 }, %) |> yLine(2.56, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude013w = extrude(sketch013w, length = 1) @@ -370,7 +370,7 @@ const sketch014w = startSketchOn(plane002) |> angledLine({ angle: -23 - 90, length: 36 / 2 }, %) |> angledLine({ angle: -23, length: 1 }, %) |> angledLine({ angle: -23 - 90, length: -36 / 2 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude014w = extrude(sketch014w, length = 1) @@ -382,7 +382,7 @@ const sketch015w = startSketchOn(plane002) |> angledLine({ angle: -23 - 90, length: 36 / 2 }, %) |> angledLine({ angle: -23, length: 1 }, %) |> angledLine({ angle: -23 - 90, length: -36 / 2 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude015w = extrude(sketch015w, length = 1) @@ -394,7 +394,7 @@ const sketch016w = startSketchOn(plane002) |> angledLine({ angle: -23 - 90, length: 36 / 2 }, %) |> angledLine({ angle: -23, length: 1 }, %) |> angledLine({ angle: -23 - 90, length: -36 / 2 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude016w = extrude(sketch016w, length = 1) @@ -414,7 +414,7 @@ const sketch017w = startSketchOn(plane002) angleEnd: -23, radius: 7 / 2 + 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude017w = extrude(sketch017w, length = 1) @@ -434,7 +434,7 @@ const sketch018w = startSketchOn(plane002) angleEnd: -23, radius: 7 / 2 + 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude018w = extrude(sketch018w, length = 1) @@ -443,7 +443,7 @@ const sketch019w = startSketchOn(plane002) |> angledLine({ angle: -23, length: 7 }, %) |> angledLine({ angle: -23 + 90, length: -1 }, %) |> angledLineToX({ angle: -23, to: 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude019w = extrude(sketch019w, length = 1) @@ -455,7 +455,7 @@ const sketch020w = startSketchOn(plane002) |> angledLine({ angle: -23, length: 7 }, %) |> angledLine({ angle: -23 + 90, length: -1 }, %) |> angledLine({ angle: -23 + 180, length: 7 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude020w = extrude(sketch020w, length = 1) @@ -464,7 +464,7 @@ const sketch021w = startSketchOn(plane002) |> angledLineToX({ angle: -23, to: depth - 1 }, %) |> yLine(-1.1, %) |> angledLineToX({ angle: -23, to: 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude021w = extrude(sketch021w, length = 1) @@ -476,7 +476,7 @@ const sketch022w = startSketchOn(plane002) }, %) |> xLine(-2.56, %) |> angledLineToX({ angle: -23, to: depth - 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude022w = extrude(sketch022w, length = 1) @@ -488,7 +488,7 @@ const sketch023w = startSketchOn(plane002) }, %) |> xLine(1.086, %) |> angledLineToX({ angle: 90 - 23, to: 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude023w = extrude(sketch023w, length = 1) @@ -497,7 +497,7 @@ const sketch024w = startSketchOn(plane002) |> angledLineToY({ angle: -23, to: 1 }, %) |> xLine(-2.56, %) |> angledLineToX({ angle: -23, to: 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude024w = extrude(sketch024w, length = 1) @@ -506,7 +506,7 @@ const sketch025w = startSketchOn(plane002) |> angledLineToY({ angle: -23, to: 1 }, %) |> xLine(-2.56, %) |> angledLineToX({ angle: -23, to: 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude025w = extrude(sketch025w, length = 1) @@ -525,7 +525,7 @@ const sketch005 = startSketchOn(plane003) |> line(end = [-width + 2, 3]) |> line(end = [0, 1]) |> line(end = [width - 2, -3]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude005 = extrude(sketch005, length = 1) @@ -535,7 +535,7 @@ const sketch006 = startSketchOn(plane003) |> line(end = [-width + 2, 3]) |> line(end = [0, 1]) |> line(end = [width - 2, -3]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude006 = extrude(sketch006, length = 1) @@ -549,7 +549,7 @@ const sketch007 = startSketchOn(plane003) width - 2, depth - serverDepth - 5 + .6 ], %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude007 = extrude(sketch007, length = 1) @@ -558,7 +558,7 @@ const sketch008 = startSketchOn(plane003) |> line(end = [-width + 2, -depth + serverDepth + 4.4]) |> line(end = [0, -1.32]) |> line(end = [width - 2, depth - serverDepth - 4.4]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude008 = extrude(sketch008, length = 1) @@ -578,7 +578,7 @@ const sketch005t = startSketchOn(plane004) |> line(end = [-width + 2, 3]) |> line(end = [0, 1]) |> line(end = [width - 2, -3]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude005t = extrude(sketch005t, length = -1) @@ -592,7 +592,7 @@ const sketch007t = startSketchOn(plane004) width - 2, depth - serverDepth - 5 + .6 ], %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude007t = extrude(sketch007t, length = -1) @@ -601,7 +601,7 @@ const sketch008t = startSketchOn(plane004) |> line(end = [-width + 2, 3]) |> line(end = [0, 1]) |> line(end = [width - 2, -3]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude008t = extrude(sketch008t, length = -1) @@ -610,7 +610,7 @@ const sketch009t = startSketchOn(plane004) |> line(end = [-width + 2, -depth + serverDepth + 4.4]) |> line(end = [0, -1.32]) |> line(end = [width - 2, depth - serverDepth - 4.4]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude009t = extrude(sketch009t, length = -1) @@ -656,7 +656,7 @@ const sketch001fl = startSketchOn(planeXZfl) segAng(rectangleSegmentA001fl), -segLen(rectangleSegmentA001fl) ], %, $rectangleSegmentC001fl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001fl = extrude(sketch001fl, length = thickness) @@ -672,7 +672,7 @@ const sketch002fl = startSketchOn(planeYZfl) segAng(rectangleSegmentA002fl), -segLen(rectangleSegmentA002fl) ], %, $rectangleSegmentC002fl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002fl = extrude(sketch002fl, length = thickness) @@ -708,7 +708,7 @@ const sketch004fl = startSketchOn(extrude002fl, 'START') segAng(rectangleSegmentA003fl), -segLen(rectangleSegmentA003fl) ], %, $rectangleSegmentC003fl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -729,7 +729,7 @@ const sketch005fl = startSketchOn(extrude002fl, 'START') segAng(rectangleSegmentA004fl), -segLen(rectangleSegmentA004fl) ], %, $rectangleSegmentC004fl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -753,7 +753,7 @@ const sketch006fl = startSketchOn(extrude002fl, 'START') segAng(rectangleSegmentA005fl), -segLen(rectangleSegmentA005fl) ], %, $rectangleSegmentC005fl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -774,7 +774,7 @@ const sketch007fl = startSketchOn(extrude001fl, 'START') segAng(rectangleSegmentA006fl), -segLen(rectangleSegmentA006fl) ], %, $rectangleSegmentC006fl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -795,7 +795,7 @@ const sketch008fl = startSketchOn(extrude001fl, 'START') segAng(rectangleSegmentA007fl), -segLen(rectangleSegmentA007fl) ], %, $rectangleSegmentC007fl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -819,7 +819,7 @@ const sketch009fl = startSketchOn(extrude001fl, 'START') segAng(rectangleSegmentA008fl), -segLen(rectangleSegmentA008fl) ], %, $rectangleSegmentC008fl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -837,7 +837,7 @@ const sketch010fl = startSketchOn(extrude001fl, 'START') |> xLine(0.75 - .438, %) |> tangentialArcTo([-0.66 - originStart[0],originStart[2] + .81 + .438 / 2], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() |> patternLinear2d({ axis: [0, 1], @@ -858,7 +858,7 @@ const sketch011fl = startSketchOn(extrude001fl, 'START') railHeight * 1.75 / 2 - (.438 / 2) ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() const extrude011fl = extrude(sketch011fl, length = -thickness) @@ -875,7 +875,7 @@ const sketch012fl = startSketchOn(extrude001fl, 'START') railHeight * 1.75 - .81 - (.438 / 2) ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() |> patternLinear2d({ axis: [0, -1], @@ -933,7 +933,7 @@ const sketch001fr = startSketchOn(planeXZfr) segAng(rectangleSegmentA001fr), -segLen(rectangleSegmentA001fr) ], %, $rectangleSegmentC001fr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001fr = extrude(sketch001fr, length = thickness) @@ -949,7 +949,7 @@ const sketch002fr = startSketchOn(planeYZfr) segAng(rectangleSegmentA002fr), -segLen(rectangleSegmentA002fr) ], %, $rectangleSegmentC002fr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002fr = extrude(sketch002fr, length = thickness) @@ -990,7 +990,7 @@ const sketch004fr = startSketchOn(extrude002fr, 'START') segAng(rectangleSegmentA003fr), -segLen(rectangleSegmentA003fr) ], %, $rectangleSegmentC003fr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1014,7 +1014,7 @@ const sketch005fr = startSketchOn(extrude002fr, 'START') segAng(rectangleSegmentA004fr), -segLen(rectangleSegmentA004fr) ], %, $rectangleSegmentC004fr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1038,7 +1038,7 @@ const sketch006fr = startSketchOn(extrude002fr, 'START') segAng(rectangleSegmentA005fr), -segLen(rectangleSegmentA005fr) ], %, $rectangleSegmentC005fr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1062,7 +1062,7 @@ const sketch007fr = startSketchOn(extrude001fr, 'START') segAng(rectangleSegmentA006fr), -segLen(rectangleSegmentA006fr) ], %, $rectangleSegmentC006fr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1086,7 +1086,7 @@ const sketch008fr = startSketchOn(extrude001fr, 'START') segAng(rectangleSegmentA007fr), -segLen(rectangleSegmentA007fr) ], %, $rectangleSegmentC007fr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1110,7 +1110,7 @@ const sketch009fr = startSketchOn(extrude001fr, 'START') segAng(rectangleSegmentA008fr), -segLen(rectangleSegmentA008fr) ], %, $rectangleSegmentC008fr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1131,7 +1131,7 @@ const sketch010fr = startSketchOn(extrude001fr, 'START') originStart[2] + .81 + .438 / 2 ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1152,7 +1152,7 @@ const sketch011fr = startSketchOn(extrude001fr, 'START') originStart[2] + railHeight * 1.75 / 2 - (.438 / 2) ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() const extrude011fr = extrude(sketch011fr, length = -thickness) @@ -1169,7 +1169,7 @@ const sketch012fr = startSketchOn(extrude001fr, 'START') originStart[2] + railHeight * 1.75 - .81 - (.438 / 2) ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() |> patternLinear2d({ axis: [0, -1], @@ -1227,7 +1227,7 @@ const sketch001rr = startSketchOn(planeXZrr) segAng(rectangleSegmentA001rr), -segLen(rectangleSegmentA001rr) ], %, $rectangleSegmentC001rr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001rr = extrude(sketch001rr, length = thickness) @@ -1243,7 +1243,7 @@ const sketch002rr = startSketchOn(planeYZrr) segAng(rectangleSegmentA002rr), -segLen(rectangleSegmentA002rr) ], %, $rectangleSegmentC002rr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002rr = extrude(sketch002rr, length = thickness) @@ -1284,7 +1284,7 @@ const sketch004rr = startSketchOn(extrude002rr, 'START') segAng(rectangleSegmentA003rr), -segLen(rectangleSegmentA003rr) ], %, $rectangleSegmentC003rr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1308,7 +1308,7 @@ const sketch005rr = startSketchOn(extrude002rr, 'START') segAng(rectangleSegmentA004rr), -segLen(rectangleSegmentA004rr) ], %, $rectangleSegmentC004rr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1332,7 +1332,7 @@ const sketch006rr = startSketchOn(extrude002rr, 'START') segAng(rectangleSegmentA005rr), -segLen(rectangleSegmentA005rr) ], %, $rectangleSegmentC005rr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1356,7 +1356,7 @@ const sketch007rr = startSketchOn(extrude001rr, 'START') segAng(rectangleSegmentA006rr), -segLen(rectangleSegmentA006rr) ], %, $rectangleSegmentC006rr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1380,7 +1380,7 @@ const sketch008rr = startSketchOn(extrude001rr, 'START') segAng(rectangleSegmentA007rr), -segLen(rectangleSegmentA007rr) ], %, $rectangleSegmentC007rr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1404,7 +1404,7 @@ const sketch009rr = startSketchOn(extrude001rr, 'START') segAng(rectangleSegmentA008rr), -segLen(rectangleSegmentA008rr) ], %, $rectangleSegmentC008rr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1425,7 +1425,7 @@ const sketch010rr = startSketchOn(extrude001rr, 'START') originStart[2] + .81 + .438 / 2 ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1446,7 +1446,7 @@ const sketch011rr = startSketchOn(extrude001rr, 'START') originStart[2] + railHeight * 1.75 / 2 - (.438 / 2) ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() const extrude011rr = extrude(sketch011rr, length = -thickness) @@ -1463,7 +1463,7 @@ const sketch012rr = startSketchOn(extrude001rr, 'START') originStart[2] + railHeight * 1.75 - .81 - (.438 / 2) ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() |> patternLinear2d({ axis: [0, -1], @@ -1520,7 +1520,7 @@ const sketch001rl = startSketchOn(planeXZrl) segAng(rectangleSegmentA001rl), -segLen(rectangleSegmentA001rl) ], %, $rectangleSegmentC001rl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001rl = extrude(sketch001rl, length = thickness) @@ -1536,7 +1536,7 @@ const sketch002rl = startSketchOn(planeYZrl) segAng(rectangleSegmentA002rl), -segLen(rectangleSegmentA002rl) ], %, $rectangleSegmentC002rl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002rl = extrude(sketch002rl, length = thickness) @@ -1577,7 +1577,7 @@ const sketch004rl = startSketchOn(extrude002rl, 'START') segAng(rectangleSegmentA003rl), -segLen(rectangleSegmentA003rl) ], %, $rectangleSegmentC003rl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1601,7 +1601,7 @@ const sketch005rl = startSketchOn(extrude002rl, 'START') segAng(rectangleSegmentA004rl), -segLen(rectangleSegmentA004rl) ], %, $rectangleSegmentC004rl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1625,7 +1625,7 @@ const sketch006rl = startSketchOn(extrude002rl, 'START') segAng(rectangleSegmentA005rl), -segLen(rectangleSegmentA005rl) ], %, $rectangleSegmentC005rl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1649,7 +1649,7 @@ const sketch007rl = startSketchOn(extrude001rl, 'START') segAng(rectangleSegmentA006rl), -segLen(rectangleSegmentA006rl) ], %, $rectangleSegmentC006rl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1673,7 +1673,7 @@ const sketch008rl = startSketchOn(extrude001rl, 'START') segAng(rectangleSegmentA007rl), -segLen(rectangleSegmentA007rl) ], %, $rectangleSegmentC007rl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1697,7 +1697,7 @@ const sketch009rl = startSketchOn(extrude001rl, 'START') segAng(rectangleSegmentA008rl), -segLen(rectangleSegmentA008rl) ], %, $rectangleSegmentC008rl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1718,7 +1718,7 @@ const sketch010rl = startSketchOn(extrude001rl, 'START') originStart[2] + .81 + .438 / 2 ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1739,7 +1739,7 @@ const sketch011rl = startSketchOn(extrude001rl, 'START') originStart[2] + railHeight * 1.75 / 2 - (.438 / 2) ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() const extrude011rl = extrude(sketch011rl, length = -thickness) @@ -1756,7 +1756,7 @@ const sketch012rl = startSketchOn(extrude001rl, 'START') originStart[2] + railHeight * 1.75 - .81 - (.438 / 2) ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() |> patternLinear2d({ axis: [0, -1], @@ -1802,7 +1802,7 @@ fn streamServer = (serverPos) => { segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001s = extrude(sketch001s, length = 7) @@ -1825,7 +1825,7 @@ fn streamServer = (serverPos) => { |> yLine(-0.42, %) |> line(end = [0.34, -0.15]) |> yLine(-2.97, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002s = extrude(sketch002s, length = 1.8 / 2) @@ -1849,7 +1849,7 @@ fn streamServer = (serverPos) => { |> yLine(-0.42, %) |> line(end = [0.34, -0.15]) |> yLine(-2.97, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude003s = extrude(sketch003s, length = 1.8 / 2) diff --git a/src/wasm-lib/tests/executor/inputs/server-rack-lite.kcl b/src/wasm-lib/tests/executor/inputs/server-rack-lite.kcl index be802801e..ab48d7597 100644 --- a/src/wasm-lib/tests/executor/inputs/server-rack-lite.kcl +++ b/src/wasm-lib/tests/executor/inputs/server-rack-lite.kcl @@ -26,7 +26,7 @@ fn caster = (originStart) => { |> xLine(3.543, %) |> yLine(3.543, %) |> xLine(-3.543, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> hole(circle({ center: [ (3.543 - 2.756) / 2, @@ -111,7 +111,7 @@ const sketch001l = startSketchOn(plane001) |> xLine(serverDepth + .8, %) |> angledLineToY({ angle: -45, to: 1 }, %) |> xLine(-serverDepth + 2 - .8, %, $seg01) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001l = extrude(sketch001l, length = 1) @@ -123,7 +123,7 @@ const sketch002l = startSketchOn(plane001) to: serverDepth - 1 + .8 }, %) |> yLine(-railHeight * 1.75, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002l = extrude(sketch002l, length = 1) @@ -138,7 +138,7 @@ const sketch003l = startSketchOn(plane001) to: railHeight * 1.75 - 1 + 2 }, %) |> xLine(serverDepth - 2 + .8, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude003l = extrude(sketch003l, length = 1) @@ -150,7 +150,7 @@ const sketch004l = startSketchOn(plane001) to: railHeight * 1.75 + 2 - 1 }, %) |> yLine(-railHeight * 1.75, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude004l = extrude(sketch004l, length = 1) @@ -159,7 +159,7 @@ const sketch005l = startSketchOn(plane001) |> line(end = [-serverDepth + 2.25, railHeight * 1.75], tag = $lineToIntersect4) |> xLine(1, %) |> line(end = [serverDepth - 2.25, -railHeight * 1.75], tag = $lineToIntersect5) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude005l = extrude(sketch005l, length = 1) @@ -172,7 +172,7 @@ const sketch006l = startSketchOn(plane001) }, %) |> angledLine({ angle: -70, length: 1.414 }, %) |> angledLineToY({ angle: 70 + 180, to: 2 - 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude006l = extrude(sketch006l, length = 1) @@ -191,7 +191,7 @@ const sketch007l = startSketchOn(plane001) angle: 70 + 180, to: railHeight * 1.75 + 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude007l = extrude(sketch007l, length = 1) @@ -214,7 +214,7 @@ const sketch001w = startSketchOn(plane002) |> xLine(depth, %) |> angledLineToY({ angle: -45, to: 1 }, %) |> xLine(-depth + 2, %, $seg01w) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001w = extrude(sketch001w, length = 1) @@ -223,7 +223,7 @@ const sketch002w = startSketchOn(plane002) |> yLine(railHeight * 1.75 + 2, %) |> angledLineToX({ angle: -135, to: depth - 1 }, %) |> yLine(-railHeight * 1.75, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002w = extrude(sketch002w, length = 1) @@ -235,7 +235,7 @@ const sketch003w = startSketchOn(plane002) to: railHeight * 1.75 - 1 + 2 }, %) |> xLine(depth - 2, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude003w = extrude(sketch003w, length = 1) @@ -247,7 +247,7 @@ const sketch004w = startSketchOn(plane002) to: railHeight * 1.75 + 2 - 1 }, %) |> yLine(-railHeight * 1.75, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude004w = extrude(sketch004w, length = 1) @@ -256,7 +256,7 @@ const sketch005w = startSketchOn(plane002) |> angledLine({ angle: -23, length: 35.5 }, %) |> angledLine({ angle: -23 + 90 + 45, length: 1.413 }, %) |> angledLineToX({ angle: -23, to: 1 }, %, $lineToIntersect) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude005w = extrude(sketch005w, length = 1) @@ -272,7 +272,7 @@ const sketch006w = startSketchOn(plane002) intersectTag: lineToIntersect, offset: 0 }, %, $lineToIntersect2) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude006w = extrude(sketch006w, length = 1) @@ -285,7 +285,7 @@ const sketch007w = startSketchOn(plane002) intersectTag: lineToIntersect2, offset: 0 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude007w = extrude(sketch007w, length = 1) @@ -302,7 +302,7 @@ const sketch008w = startSketchOn(plane002) intersectTag: lineToIntersect, offset: 0 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude008w = extrude(sketch008w, length = 1) @@ -311,7 +311,7 @@ const sketch009w = startSketchOn(plane002) |> angledLine({ angle: -23 - 45, length: 1.414 }, %) |> angledLine({ angle: 90 - 23, length: 28 }, %) |> angledLine({ angle: -23 + 45, length: -1.414 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude009w = extrude(sketch009w, length = 1) @@ -320,7 +320,7 @@ const sketch010w = startSketchOn(plane002) |> angledLine({ angle: -23 - 45, length: 1.414 }, %) |> angledLine({ angle: 180 - 23, length: 28 }, %) |> angledLine({ angle: -23 + 45, length: 1.414 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude010w = extrude(sketch010w, length = 1) @@ -332,7 +332,7 @@ const sketch011w = startSketchOn(plane002) |> angledLine({ angle: 90 - 23, length: 28 - 2 }, %) |> angledLine({ angle: -23 - 45, length: -1.414 }, %) |> angledLine({ angle: 90 - 23 + 180, length: 28 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude011w = extrude(sketch011w, length = 1) @@ -344,7 +344,7 @@ const sketch012w = startSketchOn(plane002) |> angledLine({ angle: 180 - 23, length: 28 - 2 }, %) |> angledLine({ angle: -23 - 45, length: -1.414 }, %) |> angledLine({ angle: -23, length: 28 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude012w = extrude(sketch012w, length = 1) @@ -356,7 +356,7 @@ const sketch013w = startSketchOn(plane002) |> angledLine({ angle: -23, length: 1 }, %) |> angledLineToX({ angle: -23 + 90, to: 1 }, %) |> yLine(2.56, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude013w = extrude(sketch013w, length = 1) @@ -368,7 +368,7 @@ const sketch014w = startSketchOn(plane002) |> angledLine({ angle: -23 - 90, length: 36 / 2 }, %) |> angledLine({ angle: -23, length: 1 }, %) |> angledLine({ angle: -23 - 90, length: -36 / 2 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude014w = extrude(sketch014w, length = 1) @@ -380,7 +380,7 @@ const sketch015w = startSketchOn(plane002) |> angledLine({ angle: -23 - 90, length: 36 / 2 }, %) |> angledLine({ angle: -23, length: 1 }, %) |> angledLine({ angle: -23 - 90, length: -36 / 2 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude015w = extrude(sketch015w, length = 1) @@ -392,7 +392,7 @@ const sketch016w = startSketchOn(plane002) |> angledLine({ angle: -23 - 90, length: 36 / 2 }, %) |> angledLine({ angle: -23, length: 1 }, %) |> angledLine({ angle: -23 - 90, length: -36 / 2 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude016w = extrude(sketch016w, length = 1) @@ -412,7 +412,7 @@ const sketch017w = startSketchOn(plane002) angleEnd: -23, radius: 7 / 2 + 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude017w = extrude(sketch017w, length = 1) @@ -432,7 +432,7 @@ const sketch018w = startSketchOn(plane002) angleEnd: -23, radius: 7 / 2 + 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude018w = extrude(sketch018w, length = 1) @@ -441,7 +441,7 @@ const sketch019w = startSketchOn(plane002) |> angledLine({ angle: -23, length: 7 }, %) |> angledLine({ angle: -23 + 90, length: -1 }, %) |> angledLineToX({ angle: -23, to: 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude019w = extrude(sketch019w, length = 1) @@ -453,7 +453,7 @@ const sketch020w = startSketchOn(plane002) |> angledLine({ angle: -23, length: 7 }, %) |> angledLine({ angle: -23 + 90, length: -1 }, %) |> angledLine({ angle: -23 + 180, length: 7 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude020w = extrude(sketch020w, length = 1) @@ -462,7 +462,7 @@ const sketch021w = startSketchOn(plane002) |> angledLineToX({ angle: -23, to: depth - 1 }, %) |> yLine(-1.1, %) |> angledLineToX({ angle: -23, to: 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude021w = extrude(sketch021w, length = 1) @@ -474,7 +474,7 @@ const sketch022w = startSketchOn(plane002) }, %) |> xLine(-2.56, %) |> angledLineToX({ angle: -23, to: depth - 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude022w = extrude(sketch022w, length = 1) @@ -486,7 +486,7 @@ const sketch023w = startSketchOn(plane002) }, %) |> xLine(1.086, %) |> angledLineToX({ angle: 90 - 23, to: 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude023w = extrude(sketch023w, length = 1) @@ -495,7 +495,7 @@ const sketch024w = startSketchOn(plane002) |> angledLineToY({ angle: -23, to: 1 }, %) |> xLine(-2.56, %) |> angledLineToX({ angle: -23, to: 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude024w = extrude(sketch024w, length = 1) @@ -504,7 +504,7 @@ const sketch025w = startSketchOn(plane002) |> angledLineToY({ angle: -23, to: 1 }, %) |> xLine(-2.56, %) |> angledLineToX({ angle: -23, to: 1 }, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude025w = extrude(sketch025w, length = 1) @@ -523,7 +523,7 @@ const sketch005 = startSketchOn(plane003) |> line(end = [-width + 2, 3]) |> line(end = [0, 1]) |> line(end = [width - 2, -3]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude005 = extrude(sketch005, length = 1) @@ -533,7 +533,7 @@ const sketch006 = startSketchOn(plane003) |> line(end = [-width + 2, 3]) |> line(end = [0, 1]) |> line(end = [width - 2, -3]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude006 = extrude(sketch006, length = 1) @@ -547,7 +547,7 @@ const sketch007 = startSketchOn(plane003) width - 2, depth - serverDepth - 5 + .6 ], %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude007 = extrude(sketch007, length = 1) @@ -556,7 +556,7 @@ const sketch008 = startSketchOn(plane003) |> line(end = [-width + 2, -depth + serverDepth + 4.4]) |> line(end = [0, -1.32]) |> line(end = [width - 2, depth - serverDepth - 4.4]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude008 = extrude(sketch008, length = 1) @@ -576,7 +576,7 @@ const sketch005t = startSketchOn(plane004) |> line(end = [-width + 2, 3]) |> line(end = [0, 1]) |> line(end = [width - 2, -3]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude005t = extrude(sketch005t, length = -1) @@ -590,7 +590,7 @@ const sketch007t = startSketchOn(plane004) width - 2, depth - serverDepth - 5 + .6 ], %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude007t = extrude(sketch007t, length = -1) @@ -599,7 +599,7 @@ const sketch008t = startSketchOn(plane004) |> line(end = [-width + 2, 3]) |> line(end = [0, 1]) |> line(end = [width - 2, -3]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude008t = extrude(sketch008t, length = -1) @@ -608,7 +608,7 @@ const sketch009t = startSketchOn(plane004) |> line(end = [-width + 2, -depth + serverDepth + 4.4]) |> line(end = [0, -1.32]) |> line(end = [width - 2, depth - serverDepth - 4.4]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude009t = extrude(sketch009t, length = -1) @@ -662,7 +662,7 @@ const sketch001fl = startSketchOn(planeXZfl) segAng(rectangleSegmentA001fl), -segLen(rectangleSegmentA001fl) ], %, $rectangleSegmentC001fl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001fl = extrude(sketch001fl, length = thickness) @@ -678,7 +678,7 @@ const sketch002fl = startSketchOn(planeYZfl) segAng(rectangleSegmentA002fl), -segLen(rectangleSegmentA002fl) ], %, $rectangleSegmentC002fl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002fl = extrude(sketch002fl, length = thickness) @@ -717,7 +717,7 @@ const sketch010fl = startSketchOn(extrude001fl, 'START') originStart[2] + .81 + .438 / 2 ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() |> patternLinear2d({ axis: [0, 1], @@ -738,7 +738,7 @@ const sketch011fl = startSketchOn(extrude001fl, 'START') originStart[2] + railHeight * 1.75 / 2 - (.438 / 2) ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() const extrude011fl = extrude(sketch011fl, length = -thickness) @@ -755,7 +755,7 @@ const sketch012fl = startSketchOn(extrude001fl, 'START') originStart[2] + railHeight * 1.75 - .81 - (.438 / 2) ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() |> patternLinear2d({ axis: [0, -1], @@ -813,7 +813,7 @@ const sketch001fr = startSketchOn(planeXZfr) segAng(rectangleSegmentA001fr), -segLen(rectangleSegmentA001fr) ], %, $rectangleSegmentC001fr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001fr = extrude(sketch001fr, length = thickness) @@ -829,7 +829,7 @@ const sketch002fr = startSketchOn(planeYZfr) segAng(rectangleSegmentA002fr), -segLen(rectangleSegmentA002fr) ], %, $rectangleSegmentC002fr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002fr = extrude(sketch002fr, length = thickness) @@ -867,7 +867,7 @@ const sketch010fr = startSketchOn(extrude001fr, 'START') originStart[2] + .81 + .438 / 2 ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() |> patternLinear2d({ axis: [0, 1], @@ -888,7 +888,7 @@ const sketch011fr = startSketchOn(extrude001fr, 'START') originStart[2] + railHeight * 1.75 / 2 - (.438 / 2) ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() const extrude011fr = extrude(sketch011fr, length = -thickness) @@ -905,7 +905,7 @@ const sketch012fr = startSketchOn(extrude001fr, 'START') originStart[2] + railHeight * 1.75 - .81 - (.438 / 2) ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() |> patternLinear2d({ axis: [0, -1], @@ -963,7 +963,7 @@ const sketch001rr = startSketchOn(planeXZrr) segAng(rectangleSegmentA001rr), -segLen(rectangleSegmentA001rr) ], %, $rectangleSegmentC001rr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001rr = extrude(sketch001rr, length = thickness) @@ -979,7 +979,7 @@ const sketch002rr = startSketchOn(planeYZrr) segAng(rectangleSegmentA002rr), -segLen(rectangleSegmentA002rr) ], %, $rectangleSegmentC002rr) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002rr = extrude(sketch002rr, length = thickness) @@ -1017,7 +1017,7 @@ const sketch010rr = startSketchOn(extrude001rr, 'START') originStart[2] + .81 + .438 / 2 ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1038,7 +1038,7 @@ const sketch011rr = startSketchOn(extrude001rr, 'START') originStart[2] + railHeight * 1.75 / 2 - (.438 / 2) ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() const extrude011rr = extrude(sketch011rr, length = -thickness) @@ -1055,7 +1055,7 @@ const sketch012rr = startSketchOn(extrude001rr, 'START') originStart[2] + railHeight * 1.75 - .81 - (.438 / 2) ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() |> patternLinear2d({ axis: [0, -1], @@ -1112,7 +1112,7 @@ const sketch001rl = startSketchOn(planeXZrl) segAng(rectangleSegmentA001rl), -segLen(rectangleSegmentA001rl) ], %, $rectangleSegmentC001rl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001rl = extrude(sketch001rl, length = thickness) @@ -1128,7 +1128,7 @@ const sketch002rl = startSketchOn(planeYZrl) segAng(rectangleSegmentA002rl), -segLen(rectangleSegmentA002rl) ], %, $rectangleSegmentC002rl) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002rl = extrude(sketch002rl, length = thickness) @@ -1166,7 +1166,7 @@ const sketch010rl = startSketchOn(extrude001rl, 'START') originStart[2] + .81 + .438 / 2 ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() |> patternLinear2d({ axis: [0, 1], @@ -1187,7 +1187,7 @@ const sketch011rl = startSketchOn(extrude001rl, 'START') originStart[2] + railHeight * 1.75 / 2 - (.438 / 2) ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() const extrude011rl = extrude(sketch011rl, length = -thickness) @@ -1204,7 +1204,7 @@ const sketch012rl = startSketchOn(extrude001rl, 'START') originStart[2] + railHeight * 1.75 - .81 - (.438 / 2) ], %) |> xLine(-0.75 + .438, %) - |> tangentialArcTo([profileStartX(%), profileStartY(%)], %) + |> tangentialArcTo(profileStart(%), %) |> close() |> patternLinear2d({ axis: [0, -1], @@ -1249,7 +1249,7 @@ fn streamServer = (serverPos) => { segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001s = extrude(sketch001s, length = 7) @@ -1272,7 +1272,7 @@ fn streamServer = (serverPos) => { |> yLine(-0.42, %) |> line(end = [0.34, -0.15]) |> yLine(-2.97, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002s = extrude(sketch002s, length = 1.8 / 2) @@ -1296,7 +1296,7 @@ fn streamServer = (serverPos) => { |> yLine(-0.42, %) |> line(end = [0.34, -0.15]) |> yLine(-2.97, %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude003s = extrude(sketch003s, length = 1.8 / 2) diff --git a/src/wasm-lib/tests/executor/inputs/sketch-on-chamfer-two-times-different-order.kcl b/src/wasm-lib/tests/executor/inputs/sketch-on-chamfer-two-times-different-order.kcl index 9fbb0463f..51b6de125 100644 --- a/src/wasm-lib/tests/executor/inputs/sketch-on-chamfer-two-times-different-order.kcl +++ b/src/wasm-lib/tests/executor/inputs/sketch-on-chamfer-two-times-different-order.kcl @@ -9,7 +9,7 @@ const sketch001 = startSketchOn('XZ') segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude001 = extrude(sketch001, length = 100) |> fillet({ radius: 20, tags: [seg01] }, %) @@ -30,7 +30,7 @@ const sketch003 = startSketchOn(extrude001, seg04) segAng(rectangleSegmentA003), -segLen(rectangleSegmentA003) ], %, $rectangleSegmentC002) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const sketch002 = startSketchOn(extrude001, seg03) |> startProfileAt([159.25, 278.35], %) @@ -43,6 +43,6 @@ const sketch002 = startSketchOn(extrude001, seg03) segAng(rectangleSegmentA002), -segLen(rectangleSegmentA002) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002 = extrude(sketch002, length = 50) diff --git a/src/wasm-lib/tests/executor/inputs/sketch-on-chamfer-two-times.kcl b/src/wasm-lib/tests/executor/inputs/sketch-on-chamfer-two-times.kcl index a461a4bc3..97219a3c6 100644 --- a/src/wasm-lib/tests/executor/inputs/sketch-on-chamfer-two-times.kcl +++ b/src/wasm-lib/tests/executor/inputs/sketch-on-chamfer-two-times.kcl @@ -9,7 +9,7 @@ const sketch001 = startSketchOn('XZ') segAng(rectangleSegmentA001), -segLen(rectangleSegmentA001) ], %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02) + |> line(endAbsolute = profileStart(%), tag = $seg02) |> close() const extrude001 = extrude(sketch001, length = 100) |> fillet({ radius: 20, tags: [seg01] }, %) @@ -30,7 +30,7 @@ const sketch003 = startSketchOn(extrude001, seg04) segAng(rectangleSegmentA003), -segLen(rectangleSegmentA003) ], %, $rectangleSegmentC002) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const sketch002 = startSketchOn(extrude001, seg03) |> startProfileAt([159.25, 278.35], %) @@ -43,6 +43,6 @@ const sketch002 = startSketchOn(extrude001, seg03) segAng(rectangleSegmentA002), -segLen(rectangleSegmentA002) ], %, $rectangleSegmentC001) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() const extrude002 = extrude(sketch002, length = 50) diff --git a/src/wasm-lib/tests/executor/inputs/sketch_on_face_after_fillets_referencing_face.kcl b/src/wasm-lib/tests/executor/inputs/sketch_on_face_after_fillets_referencing_face.kcl index c123b1e79..322cc9e37 100644 --- a/src/wasm-lib/tests/executor/inputs/sketch_on_face_after_fillets_referencing_face.kcl +++ b/src/wasm-lib/tests/executor/inputs/sketch_on_face_after_fillets_referencing_face.kcl @@ -50,6 +50,6 @@ sketch001 = startSketchOn(bracket, seg01) |> line(end = [2.17, -0.03]) |> line(end = [-0.07, -1.8]) |> line(end = [-2.07, 0.05]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> extrude(length = 10) diff --git a/src/wasm-lib/tests/executor/main.rs b/src/wasm-lib/tests/executor/main.rs index 5dab4f38d..75cb72d15 100644 --- a/src/wasm-lib/tests/executor/main.rs +++ b/src/wasm-lib/tests/executor/main.rs @@ -1372,7 +1372,7 @@ profile001 = plane001 |> line(end = [235.72, -8.16]) |> line(end = [13.27, -253.07]) |> line(end = [-247.97, -19.39]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() profile002 = plane001 @@ -1380,7 +1380,7 @@ profile002 = plane001 |> line(end = [247.96, -4.03]) |> line(end = [-17.26, -116.79]) |> line(end = [-235.87, 12.66]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() sketch001 = [profile001, profile002] @@ -1401,7 +1401,7 @@ sketch001 = plane001 |> line(end = [235.72, -8.16]) |> line(end = [13.27, -253.07]) |> line(end = [-247.97, -19.39]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> extrude(length = 10) @@ -1410,7 +1410,7 @@ sketch002 = plane001 |> line(end = [247.96, -4.03]) |> line(end = [-17.26, -116.79]) |> line(end = [-235.87, 12.66]) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> extrude(length = 10) @@ -1531,7 +1531,7 @@ async fn kcl_test_shell_with_tag() { |> xLine(305.11, %, $seg01) |> yLine(-291.85, %) |> xLine(-segLen(seg01), %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> extrude(length = 40.14) |> shell({ @@ -1995,7 +1995,7 @@ async fn kcl_test_error_no_auth_websocket() { |> xLine(305.11, %, $seg01) |> yLine(-291.85, %) |> xLine(-segLen(seg01), %) - |> line(endAbsolute = [profileStartX(%), profileStartY(%)]) + |> line(endAbsolute = profileStart(%)) |> close() |> extrude(length = 40.14) |> shell({