Remove backwards compatibility tags (#3139)

* start removing backwards compat Signed-off-by: Jess Frazelle <[email protected]> * more Signed-off-by: Jess Frazelle <[email protected]> * add more Signed-off-by: Jess Frazelle <[email protected]> * fixups Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * std Signed-off-by: Jess Frazelle <[email protected]> * fix one Signed-off-by: Jess Frazelle <[email protected]> * fixes Signed-off-by: Jess Frazelle <[email protected]> * cleanup other backwards compatible shit Signed-off-by: Jess Frazelle <[email protected]> * cargo.lock Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * fixes Signed-off-by: Jess Frazelle <[email protected]> * update js tests Signed-off-by: Jess Frazelle <[email protected]> * fix playwright Signed-off-by: Jess Frazelle <[email protected]> --------- Signed-off-by: Jess Frazelle <[email protected]>
KittyCAD · Jul 31, 2024 · 4e37b86 · 4e37b86
1 parent 99bce46
commit 4e37b86
Show file tree

Hide file tree

Showing 32 changed files with 350 additions and 483 deletions.
diff --git a/docs/kcl/angledLineThatIntersects.md b/docs/kcl/angledLineThatIntersects.md
@@ -22,7 +22,7 @@ const exampleSketch = startSketchOn('XZ')
   |> lineTo([0, 20], %)
   |> angledLineThatIntersects({
        angle: 80,
-       intersectTag: 'lineToIntersect',
+       intersectTag: lineToIntersect,
        offset: 10
      }, %)
   |> close(%)

diff --git a/docs/kcl/getEdge.md b/docs/kcl/getEdge.md
@@ -23,7 +23,7 @@ const box = startSketchOn('XZ')
   |> close(%)
   |> extrude(10, %)
 
-const revolution = startSketchOn(box, "revolveAxis")
+const revolution = startSketchOn(box, revolveAxis)
   |> startProfileAt([5, 10], %)
   |> line([0, 10], %)
   |> line([2, 0], %)

diff --git a/docs/kcl/startSketchOn.md b/docs/kcl/startSketchOn.md
@@ -55,7 +55,7 @@ const exampleSketch = startSketchOn("XY")
 
 const example = extrude(10, exampleSketch)
 
-const exampleSketch002 = startSketchOn(example, 'sketchingFace')
+const exampleSketch002 = startSketchOn(example, sketchingFace)
   |> startProfileAt([1, 1], %)
   |> line([8, 0], %)
   |> line([0, 8], %)
@@ -64,7 +64,7 @@ const exampleSketch002 = startSketchOn(example, 'sketchingFace')
 
 const example002 = extrude(10, exampleSketch002)
 
-const exampleSketch003 = startSketchOn(example002, 'sketchingFace002')
+const exampleSketch003 = startSketchOn(example002, sketchingFace002)
   |> startProfileAt([-8, 12], %)
   |> line([0, 6], %)
   |> line([6, 0], %)

diff --git a/docs/kcl/std.json b/docs/kcl/std.json
@@ -23188,7 +23188,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "const exampleSketch = startSketchOn('XZ')\n  |> startProfileAt([0, 0], %)\n  |> lineTo([5, 10], %)\n  |> lineTo([-10, 10], %, $lineToIntersect)\n  |> lineTo([0, 20], %)\n  |> angledLineThatIntersects({\n       angle: 80,\n       intersectTag: 'lineToIntersect',\n       offset: 10\n     }, %)\n  |> close(%)\n\nconst example = extrude(10, exampleSketch)"
+      "const exampleSketch = startSketchOn('XZ')\n  |> startProfileAt([0, 0], %)\n  |> lineTo([5, 10], %)\n  |> lineTo([-10, 10], %, $lineToIntersect)\n  |> lineTo([0, 20], %)\n  |> angledLineThatIntersects({\n       angle: 80,\n       intersectTag: lineToIntersect,\n       offset: 10\n     }, %)\n  |> close(%)\n\nconst example = extrude(10, exampleSketch)"
     ]
   },
   {
@@ -67935,7 +67935,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "const box = startSketchOn('XZ')\n  |> startProfileAt([0, 0], %)\n  |> line([0, 10], %, $revolveAxis)\n  |> line([10, 0], %)\n  |> line([0, -10], %)\n  |> close(%)\n  |> extrude(10, %)\n\nconst revolution = startSketchOn(box, \"revolveAxis\")\n  |> startProfileAt([5, 10], %)\n  |> line([0, 10], %)\n  |> line([2, 0], %)\n  |> line([0, -10], %)\n  |> close(%)\n  |> revolve({\n       axis: getEdge(revolveAxis, box),\n       angle: 90\n     }, %)"
+      "const box = startSketchOn('XZ')\n  |> startProfileAt([0, 0], %)\n  |> line([0, 10], %, $revolveAxis)\n  |> line([10, 0], %)\n  |> line([0, -10], %)\n  |> close(%)\n  |> extrude(10, %)\n\nconst revolution = startSketchOn(box, revolveAxis)\n  |> startProfileAt([5, 10], %)\n  |> line([0, 10], %)\n  |> line([2, 0], %)\n  |> line([0, -10], %)\n  |> close(%)\n  |> revolve({\n       axis: getEdge(revolveAxis, box),\n       angle: 90\n     }, %)"
     ]
   },
   {
@@ -158522,7 +158522,7 @@
     "deprecated": false,
     "examples": [
       "const exampleSketch = startSketchOn(\"XY\")\n  |> startProfileAt([0, 0], %)\n  |> line([10, 0], %)\n  |> line([0, 10], %)\n  |> line([-10, 0], %)\n  |> close(%)\n\nconst example = extrude(5, exampleSketch)\n\nconst exampleSketch002 = startSketchOn(example, 'end')\n  |> startProfileAt([1, 1], %)\n  |> line([8, 0], %)\n  |> line([0, 8], %)\n  |> line([-8, 0], %)\n  |> close(%)\n\nconst example002 = extrude(5, exampleSketch002)\n\nconst exampleSketch003 = startSketchOn(example002, 'end')\n  |> startProfileAt([2, 2], %)\n  |> line([6, 0], %)\n  |> line([0, 6], %)\n  |> line([-6, 0], %)\n  |> close(%)\n\nconst example003 = extrude(5, exampleSketch003)",
-      "const exampleSketch = startSketchOn(\"XY\")\n  |> startProfileAt([0, 0], %)\n  |> line([10, 0], %)\n  |> line([0, 10], %, $sketchingFace)\n  |> line([-10, 0], %)\n  |> close(%)\n\nconst example = extrude(10, exampleSketch)\n\nconst exampleSketch002 = startSketchOn(example, 'sketchingFace')\n  |> startProfileAt([1, 1], %)\n  |> line([8, 0], %)\n  |> line([0, 8], %)\n  |> line([-8, 0], %)\n  |> close(%, $sketchingFace002)\n\nconst example002 = extrude(10, exampleSketch002)\n\nconst exampleSketch003 = startSketchOn(example002, 'sketchingFace002')\n  |> startProfileAt([-8, 12], %)\n  |> line([0, 6], %)\n  |> line([6, 0], %)\n  |> line([0, -6], %)\n  |> close(%)\n\nconst example003 = extrude(5, exampleSketch003)",
+      "const exampleSketch = startSketchOn(\"XY\")\n  |> startProfileAt([0, 0], %)\n  |> line([10, 0], %)\n  |> line([0, 10], %, $sketchingFace)\n  |> line([-10, 0], %)\n  |> close(%)\n\nconst example = extrude(10, exampleSketch)\n\nconst exampleSketch002 = startSketchOn(example, sketchingFace)\n  |> startProfileAt([1, 1], %)\n  |> line([8, 0], %)\n  |> line([0, 8], %)\n  |> line([-8, 0], %)\n  |> close(%, $sketchingFace002)\n\nconst example002 = extrude(10, exampleSketch002)\n\nconst exampleSketch003 = startSketchOn(example002, sketchingFace002)\n  |> startProfileAt([-8, 12], %)\n  |> line([0, 6], %)\n  |> line([6, 0], %)\n  |> line([0, -6], %)\n  |> close(%)\n\nconst example003 = extrude(5, exampleSketch003)",
       "const exampleSketch = startSketchOn('XY')\n  |> startProfileAt([4, 12], %)\n  |> line([2, 0], %)\n  |> line([0, -6], %)\n  |> line([4, -6], %)\n  |> line([0, -6], %)\n  |> line([-3.75, -4.5], %)\n  |> line([0, -5.5], %)\n  |> line([-2, 0], %)\n  |> close(%)\n\nconst example = revolve({ axis: 'y', angle: 180 }, exampleSketch)\n\nconst exampleSketch002 = startSketchOn(example, 'end')\n  |> startProfileAt([4.5, -5], %)\n  |> line([0, 5], %)\n  |> line([5, 0], %)\n  |> line([0, -5], %)\n  |> close(%)\n\nconst example002 = extrude(5, exampleSketch002)",
       "const a1 = startSketchOn({\n       plane: {\n         origin: { x: 0, y: 0, z: 0 },\n         x_axis: { x: 1, y: 0, z: 0 },\n         y_axis: { x: 0, y: 1, z: 0 },\n         z_axis: { x: 0, y: 0, z: 1 }\n       }\n     })\n  |> startProfileAt([0, 0], %)\n  |> line([100.0, 0], %)\n  |> yLine(-100.0, %)\n  |> xLine(-100.0, %)\n  |> yLine(100.0, %)\n  |> close(%)\n  |> extrude(3.14, %)"
     ]

diff --git a/e2e/playwright/flow-tests.spec.ts b/e2e/playwright/flow-tests.spec.ts
@@ -1016,18 +1016,18 @@ test.describe('Editor tests', () => {
   |> startProfileAt([0, 0], %)
   |> line([0, 10], %)
   |> line([10, 0], %)
-  |> line([0, -10], %, 'revolveAxis')
+  |> line([0, -10], %, $revolveAxis)
   |> close(%)
   |> extrude(10, %)
   
-  const sketch001 = startSketchOn(box, "revolveAxis")
+  const sketch001 = startSketchOn(box, revolveAxis)
   |> startProfileAt([5, 10], %)
   |> line([0, -10], %)
   |> line([2, 0], %)
   |> line([0, -10], %)
   |> close(%)
   |> revolve({
-  axis: getEdge('revolveAxis', box),
+  axis: getEdge(revolveAxis, box),
   angle: 90
   }, %)
       `

diff --git a/e2e/playwright/storageStates.ts b/e2e/playwright/storageStates.ts
@@ -71,15 +71,15 @@ export const TEST_CODE_GIZMO = `const part001 = startSketchOn('XZ')
 |> angledLine({ angle: 3 + 0, length: 3.14 + 0 }, %)
 |> lineTo([20.14 + 0, -0.14 + 0], %)
 |> xLineTo(29 + 0, %)
-|> yLine(-3.14 + 0, %, 'a')
+|> yLine(-3.14 + 0, %, $a)
 |> xLine(1.63, %)
 |> angledLineOfXLength({ angle: 3 + 0, length: 3.14 }, %)
 |> angledLineOfYLength({ angle: 30, length: 3 + 0 }, %)
 |> angledLineToX({ angle: 22.14 + 0, to: 12 }, %)
 |> angledLineToY({ angle: 30, to: 11.14 }, %)
 |> angledLineThatIntersects({
   angle: 3.14,
-  intersectTag: 'a',
+  intersectTag: a,
   offset: 0
 }, %)
 |> tangentialArcTo([13.14 + 0, 13.14], %)

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -15,7 +15,7 @@ tauri-build = { version = "2.0.0-beta.18", features = [] }
 
 [dependencies]
 anyhow = "1"
-kcl-lib = { version = "0.1.53", path = "../src/wasm-lib/kcl" }
+kcl-lib = { version = "0.2", path = "../src/wasm-lib/kcl" }
 kittycad = "0.3.7"
 log = "0.4.21"
 oauth2 = "4.4.2"