able to go to and from app settings to executor settings for cli (#2236)

* settings from and into exefcutor settings Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> * settings Signed-off-by: Jess Frazelle <[email protected]> * ipdates Signed-off-by: Jess Frazelle <[email protected]> * ensure all have extrudes Signed-off-by: Jess Frazelle <[email protected]> * updates Signed-off-by: Jess Frazelle <[email protected]> --------- Signed-off-by: Jess Frazelle <[email protected]>
KittyCAD · Apr 25, 2024 · b950cc0 · b950cc0
1 parent c89780a
commit b950cc0
Show file tree

Hide file tree

Showing 51 changed files with 150 additions and 144 deletions.
diff --git a/docs/kcl/angleToMatchLengthX.md b/docs/kcl/angleToMatchLengthX.md
diff --git a/docs/kcl/angleToMatchLengthY.md b/docs/kcl/angleToMatchLengthY.md
diff --git a/docs/kcl/close.md b/docs/kcl/close.md
diff --git a/docs/kcl/lineTo.md b/docs/kcl/lineTo.md
diff --git a/docs/kcl/patternCircular2d.md b/docs/kcl/patternCircular2d.md
diff --git a/docs/kcl/patternLinear2d.md b/docs/kcl/patternLinear2d.md
diff --git a/docs/kcl/startProfileAt.md b/docs/kcl/startProfileAt.md
diff --git a/docs/kcl/startSketchAt.md b/docs/kcl/startSketchAt.md
diff --git a/docs/kcl/startSketchOn.md b/docs/kcl/startSketchOn.md
diff --git a/docs/kcl/std.json b/docs/kcl/std.json
@@ -1068,7 +1068,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "const part001 = startSketchOn('XY')\n  |> startProfileAt([0, 0], %)\n  |> line([1, 3.82], %, 'seg01')\n  |> angledLineToX([\n       -angleToMatchLengthX('seg01', 10, %),\n       5\n     ], %)\n  |> close(%)"
+      "const part001 = startSketchOn('XY')\n  |> startProfileAt([0, 0], %)\n  |> line([1, 3.82], %, 'seg01')\n  |> angledLineToX([\n       -angleToMatchLengthX('seg01', 10, %),\n       5\n     ], %)\n  |> close(%)\n  |> extrude(5, %)"
     ]
   },
   {
@@ -2074,7 +2074,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "const part001 = startSketchOn('XY')\n  |> startProfileAt([0, 0], %)\n  |> line([1, 3.82], %, 'seg01')\n  |> angledLineToX([\n       -angleToMatchLengthY('seg01', 10, %),\n       5\n     ], %)\n  |> close(%)"
+      "const part001 = startSketchOn('XY')\n  |> startProfileAt([0, 0], %)\n  |> line([1, 3.82], %, 'seg01')\n  |> angledLineToX([\n       -angleToMatchLengthY('seg01', 10, %),\n       5\n     ], %)\n  |> close(%)\n  |> extrude(5, %)"
     ]
   },
   {
@@ -22380,8 +22380,8 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "startSketchOn('XZ')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)\n  |> line([10, 0], %)\n  |> close(%)",
-      "startSketchOn('YZ')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)\n  |> line([10, 0], %)\n  |> close(%, \"edge1\")"
+      "startSketchOn('XZ')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)\n  |> line([10, 0], %)\n  |> close(%)\n  |> extrude(10, %)",
+      "startSketchOn('YZ')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)\n  |> line([10, 0], %)\n  |> close(%, \"edge1\")\n  |> extrude(10, %)"
     ]
   },
   {
@@ -43695,7 +43695,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "fn rectShape = (pos, w, l) => {\n  const rr = startSketchOn('YZ')\n    |> startProfileAt([pos[0] - (w / 2), pos[1] - (l / 2)], %)\n    |> lineTo([pos[0] + w / 2, pos[1] - (l / 2)], %, \"edge1\")\n    |> lineTo([pos[0] + w / 2, pos[1] + l / 2], %, \"edge2\")\n    |> lineTo([pos[0] - (w / 2), pos[1] + l / 2], %, \"edge3\")\n    |> close(%, \"edge4\")\n  return rr\n}\n\n// Create the mounting plate extrusion, holes, and fillets\nconst part = rectShape([0, 0], 20, 20)"
+      "fn rectShape = (pos, w, l) => {\n  const rr = startSketchOn('YZ')\n    |> startProfileAt([pos[0] - (w / 2), pos[1] - (l / 2)], %)\n    |> lineTo([pos[0] + w / 2, pos[1] - (l / 2)], %, \"edge1\")\n    |> lineTo([pos[0] + w / 2, pos[1] + l / 2], %, \"edge2\")\n    |> lineTo([pos[0] - (w / 2), pos[1] + l / 2], %, \"edge3\")\n    |> close(%, \"edge4\")\n  return rr\n}\n\n// Create the mounting plate extrusion, holes, and fillets\nconst part = rectShape([0, 0], 20, 20)\n  |> extrude(10, %)"
     ]
   },
   {
@@ -45900,7 +45900,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "const part = startSketchOn('XY')\n  |> circle([0, 0], 2, %)\n  |> patternCircular2d({\n       center: [20, 20],\n       repetitions: 12,\n       arcDegrees: 210,\n       rotateDuplicates: true\n     }, %)"
+      "const part = startSketchOn('XY')\n  |> circle([0, 0], 2, %)\n  |> patternCircular2d({\n       center: [20, 20],\n       repetitions: 12,\n       arcDegrees: 210,\n       rotateDuplicates: true\n     }, %)\n  |> extrude(1, %)"
     ]
   },
   {
@@ -50459,7 +50459,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "const part = startSketchOn('XY')\n  |> circle([0, 0], 2, %)\n  |> patternLinear2d({\n       axis: [0, 1],\n       repetitions: 12,\n       distance: 2\n     }, %)"
+      "const part = startSketchOn('XY')\n  |> circle([0, 0], 2, %)\n  |> patternLinear2d({\n       axis: [0, 1],\n       repetitions: 12,\n       distance: 2\n     }, %)\n  |> extrude(1, %)"
     ]
   },
   {
@@ -59318,7 +59318,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "startSketchOn('XY')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)"
+      "startSketchOn('XY')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)\n  |> line([10, 0], %)\n  |> close(%)\n  |> extrude(10, %)"
     ]
   },
   {
@@ -60312,7 +60312,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "startSketchAt([0, 0])\n  |> line([10, 10], %)"
+      "startSketchAt([0, 0])\n  |> line([10, 10], %)\n  |> line([20, 10], %, \"edge1\")\n  |> close(%, \"edge2\")\n  |> extrude(10, %)"
     ]
   },
   {
@@ -61585,7 +61585,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "startSketchOn('XY')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)\n  |> line([20, 10], %, \"edge1\")\n  |> close(%, \"edge2\")",
+      "startSketchOn('XY')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)\n  |> line([20, 10], %, \"edge1\")\n  |> close(%, \"edge2\")\n  |> extrude(10, %)",
       "fn cube = (pos, scale) => {\n  const sg = startSketchOn('XY')\n    |> startProfileAt(pos, %)\n    |> line([0, scale], %)\n    |> line([scale, 0], %)\n    |> line([0, -scale], %)\n    |> close(%)\n    |> extrude(scale, %)\n\n  return sg\n}\n\nconst box = cube([0, 0], 20)\n\nconst part001 = startSketchOn(box, \"start\")\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %)\n  |> line([20, 10], %, \"edge1\")\n  |> close(%)\n  |> extrude(20, %)"
     ]
   },
@@ -65584,7 +65584,7 @@
     "unpublished": false,
     "deprecated": false,
     "examples": [
-      "startSketchOn('-YZ')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %, \"edge0\")\n  |> tangentialArcTo([10, 0], %)\n  |> close(%)"
+      "startSketchOn('-YZ')\n  |> startProfileAt([0, 0], %)\n  |> line([10, 10], %, \"edge0\")\n  |> tangentialArcTo([10, 0], %)\n  |> close(%)\n  |> extrude(10, %)"
     ]
   },
   {

diff --git a/docs/kcl/tangentialArcTo.md b/docs/kcl/tangentialArcTo.md
diff --git a/src/wasm-lib/derive-docs/src/lib.rs b/src/wasm-lib/derive-docs/src/lib.rs
@@ -775,15 +775,11 @@ fn generate_code_block_test(
             if let Ok(addr) = std::env::var("LOCAL_ENGINE_ADDR") {
                 client.set_base_url(addr);
             }
-            let ws = client
-                .modeling()
-                .commands_ws(None, None, None, None, None,None, Some(false))
-                .await.unwrap();
 
             let tokens = crate::token::lexer(#code_block).unwrap();
             let parser = crate::parser::Parser::new(tokens);
             let program = parser.ast().unwrap();
-            let ctx = crate::executor::ExecutorContext::new(ws, Default::default()).await.unwrap();
+            let ctx = crate::executor::ExecutorContext::new(&client, Default::default()).await.unwrap();
 
             ctx.run(program, None).await.unwrap();
 

diff --git a/src/wasm-lib/derive-docs/tests/array.gen b/src/wasm-lib/derive-docs/tests/array.gen
@@ -20,15 +20,10 @@ mod test_examples_show {
             client.set_base_url(addr);
         }
 
-        let ws = client
-            .modeling()
-            .commands_ws(None, None, None, None, None, None, Some(false))
-            .await
-            .unwrap();
         let tokens = crate::token::lexer("This is another code block.\nyes sirrr.\nshow").unwrap();
         let parser = crate::parser::Parser::new(tokens);
         let program = parser.ast().unwrap();
-        let ctx = crate::executor::ExecutorContext::new(ws, Default::default())
+        let ctx = crate::executor::ExecutorContext::new(&client, Default::default())
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
@@ -96,15 +91,10 @@ mod test_examples_show {
             client.set_base_url(addr);
         }
 
-        let ws = client
-            .modeling()
-            .commands_ws(None, None, None, None, None, None, Some(false))
-            .await
-            .unwrap();
         let tokens = crate::token::lexer("This is code.\nIt does other shit.\nshow").unwrap();
         let parser = crate::parser::Parser::new(tokens);
         let program = parser.ast().unwrap();
-        let ctx = crate::executor::ExecutorContext::new(ws, Default::default())
+        let ctx = crate::executor::ExecutorContext::new(&client, Default::default())
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();

diff --git a/src/wasm-lib/derive-docs/tests/box.gen b/src/wasm-lib/derive-docs/tests/box.gen
@@ -20,15 +20,10 @@ mod test_examples_show {
             client.set_base_url(addr);
         }
 
-        let ws = client
-            .modeling()
-            .commands_ws(None, None, None, None, None, None, Some(false))
-            .await
-            .unwrap();
         let tokens = crate::token::lexer("This is code.\nIt does other shit.\nshow").unwrap();
         let parser = crate::parser::Parser::new(tokens);
         let program = parser.ast().unwrap();
-        let ctx = crate::executor::ExecutorContext::new(ws, Default::default())
+        let ctx = crate::executor::ExecutorContext::new(&client, Default::default())
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();

diff --git a/src/wasm-lib/derive-docs/tests/doc_comment_with_code.gen b/src/wasm-lib/derive-docs/tests/doc_comment_with_code.gen
@@ -20,16 +20,11 @@ mod test_examples_my_func {
             client.set_base_url(addr);
         }
 
-        let ws = client
-            .modeling()
-            .commands_ws(None, None, None, None, None, None, Some(false))
-            .await
-            .unwrap();
         let tokens =
             crate::token::lexer("This is another code block.\nyes sirrr.\nmyFunc").unwrap();
         let parser = crate::parser::Parser::new(tokens);
         let program = parser.ast().unwrap();
-        let ctx = crate::executor::ExecutorContext::new(ws, Default::default())
+        let ctx = crate::executor::ExecutorContext::new(&client, Default::default())
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
@@ -97,15 +92,10 @@ mod test_examples_my_func {
             client.set_base_url(addr);
         }
 
-        let ws = client
-            .modeling()
-            .commands_ws(None, None, None, None, None, None, Some(false))
-            .await
-            .unwrap();
         let tokens = crate::token::lexer("This is code.\nIt does other shit.\nmyFunc").unwrap();
         let parser = crate::parser::Parser::new(tokens);
         let program = parser.ast().unwrap();
-        let ctx = crate::executor::ExecutorContext::new(ws, Default::default())
+        let ctx = crate::executor::ExecutorContext::new(&client, Default::default())
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();

diff --git a/src/wasm-lib/derive-docs/tests/doc_comment_with_code_on_ignored_function.gen b/src/wasm-lib/derive-docs/tests/doc_comment_with_code_on_ignored_function.gen
@@ -21,16 +21,11 @@ mod test_examples_import {
             client.set_base_url(addr);
         }
 
-        let ws = client
-            .modeling()
-            .commands_ws(None, None, None, None, None, None, Some(false))
-            .await
-            .unwrap();
         let tokens =
             crate::token::lexer("This is another code block.\nyes sirrr.\nimport").unwrap();
         let parser = crate::parser::Parser::new(tokens);
         let program = parser.ast().unwrap();
-        let ctx = crate::executor::ExecutorContext::new(ws, Default::default())
+        let ctx = crate::executor::ExecutorContext::new(&client, Default::default())
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
@@ -99,15 +94,10 @@ mod test_examples_import {
             client.set_base_url(addr);
         }
 
-        let ws = client
-            .modeling()
-            .commands_ws(None, None, None, None, None, None, Some(false))
-            .await
-            .unwrap();
         let tokens = crate::token::lexer("This is code.\nIt does other shit.\nimport").unwrap();
         let parser = crate::parser::Parser::new(tokens);
         let program = parser.ast().unwrap();
-        let ctx = crate::executor::ExecutorContext::new(ws, Default::default())
+        let ctx = crate::executor::ExecutorContext::new(&client, Default::default())
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();

diff --git a/src/wasm-lib/derive-docs/tests/lineTo.gen b/src/wasm-lib/derive-docs/tests/lineTo.gen
@@ -20,16 +20,11 @@ mod test_examples_line_to {
             client.set_base_url(addr);
         }
 
-        let ws = client
-            .modeling()
-            .commands_ws(None, None, None, None, None, None, Some(false))
-            .await
-            .unwrap();
         let tokens =
             crate::token::lexer("This is another code block.\nyes sirrr.\nlineTo").unwrap();
         let parser = crate::parser::Parser::new(tokens);
         let program = parser.ast().unwrap();
-        let ctx = crate::executor::ExecutorContext::new(ws, Default::default())
+        let ctx = crate::executor::ExecutorContext::new(&client, Default::default())
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
@@ -97,15 +92,10 @@ mod test_examples_line_to {
             client.set_base_url(addr);
         }
 
-        let ws = client
-            .modeling()
-            .commands_ws(None, None, None, None, None, None, Some(false))
-            .await
-            .unwrap();
         let tokens = crate::token::lexer("This is code.\nIt does other shit.\nlineTo").unwrap();
         let parser = crate::parser::Parser::new(tokens);
         let program = parser.ast().unwrap();
-        let ctx = crate::executor::ExecutorContext::new(ws, Default::default())
+        let ctx = crate::executor::ExecutorContext::new(&client, Default::default())
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();

diff --git a/src/wasm-lib/derive-docs/tests/min.gen b/src/wasm-lib/derive-docs/tests/min.gen
@@ -20,15 +20,10 @@ mod test_examples_min {
             client.set_base_url(addr);
         }
 
-        let ws = client
-            .modeling()
-            .commands_ws(None, None, None, None, None, None, Some(false))
-            .await
-            .unwrap();
         let tokens = crate::token::lexer("This is another code block.\nyes sirrr.\nmin").unwrap();
         let parser = crate::parser::Parser::new(tokens);
         let program = parser.ast().unwrap();
-        let ctx = crate::executor::ExecutorContext::new(ws, Default::default())
+        let ctx = crate::executor::ExecutorContext::new(&client, Default::default())
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();
@@ -96,15 +91,10 @@ mod test_examples_min {
             client.set_base_url(addr);
         }
 
-        let ws = client
-            .modeling()
-            .commands_ws(None, None, None, None, None, None, Some(false))
-            .await
-            .unwrap();
         let tokens = crate::token::lexer("This is code.\nIt does other shit.\nmin").unwrap();
         let parser = crate::parser::Parser::new(tokens);
         let program = parser.ast().unwrap();
-        let ctx = crate::executor::ExecutorContext::new(ws, Default::default())
+        let ctx = crate::executor::ExecutorContext::new(&client, Default::default())
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();

diff --git a/src/wasm-lib/derive-docs/tests/option.gen b/src/wasm-lib/derive-docs/tests/option.gen
@@ -20,15 +20,10 @@ mod test_examples_show {
             client.set_base_url(addr);
         }
 
-        let ws = client
-            .modeling()
-            .commands_ws(None, None, None, None, None, None, Some(false))
-            .await
-            .unwrap();
         let tokens = crate::token::lexer("This is code.\nIt does other shit.\nshow").unwrap();
         let parser = crate::parser::Parser::new(tokens);
         let program = parser.ast().unwrap();
-        let ctx = crate::executor::ExecutorContext::new(ws, Default::default())
+        let ctx = crate::executor::ExecutorContext::new(&client, Default::default())
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();

diff --git a/src/wasm-lib/derive-docs/tests/option_input_format.gen b/src/wasm-lib/derive-docs/tests/option_input_format.gen
@@ -20,15 +20,10 @@ mod test_examples_import {
             client.set_base_url(addr);
         }
 
-        let ws = client
-            .modeling()
-            .commands_ws(None, None, None, None, None, None, Some(false))
-            .await
-            .unwrap();
         let tokens = crate::token::lexer("This is code.\nIt does other shit.\nimport").unwrap();
         let parser = crate::parser::Parser::new(tokens);
         let program = parser.ast().unwrap();
-        let ctx = crate::executor::ExecutorContext::new(ws, Default::default())
+        let ctx = crate::executor::ExecutorContext::new(&client, Default::default())
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();

diff --git a/src/wasm-lib/derive-docs/tests/return_vec_box_sketch_group.gen b/src/wasm-lib/derive-docs/tests/return_vec_box_sketch_group.gen
@@ -20,15 +20,10 @@ mod test_examples_import {
             client.set_base_url(addr);
         }
 
-        let ws = client
-            .modeling()
-            .commands_ws(None, None, None, None, None, None, Some(false))
-            .await
-            .unwrap();
         let tokens = crate::token::lexer("This is code.\nIt does other shit.\nimport").unwrap();
         let parser = crate::parser::Parser::new(tokens);
         let program = parser.ast().unwrap();
-        let ctx = crate::executor::ExecutorContext::new(ws, Default::default())
+        let ctx = crate::executor::ExecutorContext::new(&client, Default::default())
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();

diff --git a/src/wasm-lib/derive-docs/tests/return_vec_sketch_group.gen b/src/wasm-lib/derive-docs/tests/return_vec_sketch_group.gen
@@ -20,15 +20,10 @@ mod test_examples_import {
             client.set_base_url(addr);
         }
 
-        let ws = client
-            .modeling()
-            .commands_ws(None, None, None, None, None, None, Some(false))
-            .await
-            .unwrap();
         let tokens = crate::token::lexer("This is code.\nIt does other shit.\nimport").unwrap();
         let parser = crate::parser::Parser::new(tokens);
         let program = parser.ast().unwrap();
-        let ctx = crate::executor::ExecutorContext::new(ws, Default::default())
+        let ctx = crate::executor::ExecutorContext::new(&client, Default::default())
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();

diff --git a/src/wasm-lib/derive-docs/tests/show.gen b/src/wasm-lib/derive-docs/tests/show.gen
@@ -20,15 +20,10 @@ mod test_examples_show {
             client.set_base_url(addr);
         }
 
-        let ws = client
-            .modeling()
-            .commands_ws(None, None, None, None, None, None, Some(false))
-            .await
-            .unwrap();
         let tokens = crate::token::lexer("This is code.\nIt does other shit.\nshow").unwrap();
         let parser = crate::parser::Parser::new(tokens);
         let program = parser.ast().unwrap();
-        let ctx = crate::executor::ExecutorContext::new(ws, Default::default())
+        let ctx = crate::executor::ExecutorContext::new(&client, Default::default())
             .await
             .unwrap();
         ctx.run(program, None).await.unwrap();