Declare std::offsetPlane in KCL (#6344)

* Declare std::offsetPlane in KCL

Signed-off-by: Nick Cameron <nrc@ncameron.org>

* Use two axes to define planes in KCL

Signed-off-by: Nick Cameron <nrc@ncameron.org>

---------

Signed-off-by: Nick Cameron <nrc@ncameron.org>

docs/kcl/index.md

@@ -75,7 +75,7 @@ layout: manual
   * [`map`](kcl/map)
   * [`max`](kcl/max)
   * [`min`](kcl/min)
-  * [`offsetPlane`](kcl/offsetPlane)
+  * [`offsetPlane`](kcl/std-offsetPlane)
   * [`patternCircular2d`](kcl/patternCircular2d)
   * [`patternCircular3d`](kcl/patternCircular3d)
   * [`patternLinear2d`](kcl/patternLinear2d)

docs/kcl/types/SketchSurface.md

@@ -30,7 +30,6 @@ A sketch type.
 | `origin` |[`Point3d`](/docs/kcl/types/Point3d)| Origin of the plane. | No |
 | `xAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the plane's X axis be? | No |
 | `yAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the plane's Y axis be? | No |
-| `zAxis` |[`Point3d`](/docs/kcl/types/Point3d)| The z-axis (normal). | No |
 
 
 ----
@@ -52,7 +51,6 @@ A face.
 | `value` |[`string`](/docs/kcl/types/string)| The tag of the face. | No |
 | `xAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the face's X axis be? | No |
 | `yAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the face's Y axis be? | No |
-| `zAxis` |[`Point3d`](/docs/kcl/types/Point3d)| The z-axis (normal). | No |
 | `solid` |[`Solid`](/docs/kcl/types/Solid)| The solid the face is on. | No |
 | `units` |[`UnitLen`](/docs/kcl/types/UnitLen)| A unit of length. | No |
 

public/kcl-samples/bench/bench-parts.kcl

@@ -126,7 +126,7 @@ fn armRestProfile(plane, offset) {
 
 export fn armRest(plane, offset) {
   path = armRestPath(  offsetPlane(plane, offset = offset))
-  profile = armRestProfile(  offsetPlane(-XZ, offset = 20), offset)
+  profile = armRestProfile(  offsetPlane(-XZ, offset = 20), -offset)
   sweep(profile, path = path)
   return 0
 }

public/kcl-samples/bench/main.kcl

@@ -17,8 +17,8 @@ import armRest from "bench-parts.kcl"
 
 // Create the dividers, these hold the seat and back slats
 divider(YZ)
-divider(offsetPlane(-YZ, offset = benchLength / 2))
 divider(offsetPlane(YZ, offset = benchLength / 2))
+divider(offsetPlane(YZ, offset = -benchLength / 2))
 
 // Create the connectors to join the dividers
 connector(offsetPlane(YZ, offset = -benchLength / 2), benchLength)
@@ -30,5 +30,5 @@ seatSlats(offsetPlane(YZ, offset = -benchLength / 2 - (dividerThickness / 2)), b
 backSlats(offsetPlane(YZ, offset = -benchLength / 2 - (dividerThickness / 2)), benchLength + dividerThickness)
 
 // Create the arm rests
-armRest(-YZ, benchLength / 2)
-armRest(-YZ, -benchLength / 2)
+armRest(YZ, benchLength / 2)
+armRest(YZ, -benchLength / 2)

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

@@ -202,19 +202,17 @@ plane000 = {
     height + binHeight * countBinHeight
   ],
   xAxis = [0.0, 1.0, 0.0],
-  yAxis = [0.0, 0.0, 1.0],
-  zAxis = [1.0, 0.0, 0.0]
+  yAxis = [0.0, 0.0, 1.0]
 }
 
 plane001 = {
   origin = [
     0.0,
-    cornerRadius,
+    countBinLength * (binLength + 2 * binTol) - cornerRadius,
     height + binHeight * countBinHeight
   ],
   xAxis = [1.0, 0.0, 0.0],
-  yAxis = [0.0, 0.0, 1.0],
-  zAxis = [0.0, 1.0, 0.0]
+  yAxis = [0.0, 0.0, 1.0]
 }
 
 plane002 = {
@@ -224,8 +222,7 @@ plane002 = {
     height + binHeight * countBinHeight
   ],
   xAxis = [0.0, 1.0, 0.0],
-  yAxis = [0.0, 0.0, 1.0],
-  zAxis = [1.0, 0.0, 0.0]
+  yAxis = [0.0, 0.0, 1.0]
 }
 
 // Extrude a single side of the lip of the bin

public/kcl-samples/multi-axis-robot/globals.kcl

@@ -4,10 +4,10 @@
 @settings(defaultLengthUnit = in)
 
 // Axis Angles
-export axisJ4 = 25
-export axisJ3 = 60
-export axisJ2 = 110
-export axisJ1 = 80
+export axisJ4 = 25deg
+export axisJ3 = 60deg
+export axisJ2 = 110deg
+export axisJ1 = 80deg
 
 // Robot Arm Base
 export basePlateRadius = 5
@@ -30,29 +30,26 @@ export axisJ3CArmThickness = 2.5
 export plane001 = {
   origin = [0.0, 0.0, baseHeight - 1.5 + 0.1],
   xAxis = [1.0, 0.0, 0.0],
-  yAxis = [0.0, 1.0, 0.0],
-  zAxis = [0.0, 0.0, 1.0]
+  yAxis = [0.0, 1.0, 0.0]
 }
 
 export plane002 = {
   origin = [0.0, 0.0, 0.0],
   xAxis = [
-    sin(toRadians(axisJ1)),
-    cos(toRadians(axisJ1)),
+    sin(axisJ1): number(in),
+    cos(axisJ1): number(in),
     0.0
   ],
-  yAxis = [0.0, 0.0, 1.0],
-  zAxis = [1.0, 0.0, 0.0]
+  yAxis = [0.0, 0.0, 1.0]
 }
 
 // Define Plane to Move J2 Axis Robot Arm
 export plane003 = {
   origin = [-0.1, 0.0, 0.0],
   xAxis = [
-    sin(toRadians(axisJ1)),
-    cos(toRadians(axisJ1)),
+    sin(axisJ1): number(in),
+    cos(axisJ1): number(in),
     0.0
   ],
-  yAxis = [0.0, 0.0, 1.0],
-  zAxis = [1.0, 0.0, 0.0]
+  yAxis = [0.0, 0.0, 1.0]
 }

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

@@ -62,8 +62,7 @@ customPlane = {
     z = 0
   },
   xAxis = { x = 1, y = 0, z = 0 },
-  yAxis = { x = 0, y = 0, z = 1 },
-  zAxis = { x = 0, y = -1, z = 0 }
+  yAxis = { x = 0, y = 0, z = 1 }
 }
 sketch003 = startSketchOn(customPlane)
   |> startProfileAt([0, 0], %)
@@ -98,19 +97,18 @@ customPlane2 = {
     y = 0,
     z = 0
   },
-  xAxis = { x = 0, y = -1, z = 0 },
-  yAxis = { x = 0, y = 0, z = 1 },
-  zAxis = { x = 1, y = 0, z = 0 }
+  xAxis = { x = 0, y = 1, z = 0 },
+  yAxis = { x = 0, y = 0, z = 1 }
 }
 sketch005 = startSketchOn(customPlane2)
   |> startProfileAt([0, 0], %)
   |> yLine(endAbsolute = height)
-  |> xLine(endAbsolute = wallsWidth)
+  |> xLine(endAbsolute = -wallsWidth)
   |> tangentialArc(endAbsolute = [
-       (frontLength - wallsWidth) / 2 + wallsWidth,
+       -1 * ((frontLength - wallsWidth) / 2 + wallsWidth),
        height - ((height - exitHeight) / 2)
      ])
-  |> tangentialArc(endAbsolute = [frontLength, exitHeight])
+  |> tangentialArc(endAbsolute = [-frontLength, exitHeight])
   |> yLine(endAbsolute = 0, tag = $seg03)
   |> close()
   |> extrude(length = wallThickness)
@@ -138,8 +136,7 @@ customPlane3 = {
     z = wallThickness
   },
   xAxis = { x = 0, y = -1, z = 0 },
-  yAxis = { x = 1, y = 0, z = 0 },
-  zAxis = { x = 0, y = 0, z = 1 }
+  yAxis = { x = 1, y = 0, z = 0 }
 }
 
 sketch008 = startSketchOn(customPlane3)

rust/.config/nextest.toml

@@ -6,7 +6,7 @@ uses-engine = { max-threads = 4 }
 after-engine = { max-threads = 12 }
 
 [profile.default]
-slow-timeout = { period = "90s", terminate-after = 1 }
+slow-timeout = { period = "180s", terminate-after = 1 }
 
 [profile.ci]
 slow-timeout = { period = "50s", terminate-after = 5 }

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

@@ -6,11 +6,12 @@
 mod tests;
 mod unbox;
 
-use std::collections::HashMap;
+use std::{collections::HashMap, fs};
 
 use convert_case::Casing;
 use inflector::{cases::camelcase::to_camel_case, Inflector};
 use once_cell::sync::Lazy;
+use proc_macro2::Span;
 use quote::{format_ident, quote, quote_spanned, ToTokens};
 use regex::Regex;
 use serde::Deserialize;
@@ -21,6 +22,16 @@ use syn::{
 };
 use unbox::unbox;
 
+#[proc_macro_attribute]
+pub fn stdlib(attr: proc_macro::TokenStream, item: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    do_output(do_stdlib(attr.into(), item.into()))
+}
+
+#[proc_macro_attribute]
+pub fn for_each_std_mod(_attr: proc_macro::TokenStream, item: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    do_for_each_std_mod(item.into()).into()
+}
+
 /// Describes an argument of a stdlib function.
 #[derive(Deserialize, Debug)]
 struct ArgMetadata {
@@ -73,11 +84,6 @@ struct StdlibMetadata {
     args: HashMap<String, ArgMetadata>,
 }
 
-#[proc_macro_attribute]
-pub fn stdlib(attr: proc_macro::TokenStream, item: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    do_output(do_stdlib(attr.into(), item.into()))
-}
-
 fn do_stdlib(
     attr: proc_macro2::TokenStream,
     item: proc_macro2::TokenStream,
@@ -86,6 +92,31 @@ fn do_stdlib(
     do_stdlib_inner(metadata, attr, item)
 }
 
+fn do_for_each_std_mod(item: proc_macro2::TokenStream) -> proc_macro2::TokenStream {
+    let item: syn::ItemFn = syn::parse2(item.clone()).unwrap();
+    let mut result = proc_macro2::TokenStream::new();
+    for name in fs::read_dir("kcl-lib/std").unwrap().filter_map(|e| {
+        let e = e.unwrap();
+        let filename = e.file_name();
+        filename.to_str().unwrap().strip_suffix(".kcl").map(str::to_owned)
+    }) {
+        let mut item = item.clone();
+        item.sig.ident = syn::Ident::new(&format!("{}_{}", item.sig.ident, name), Span::call_site());
+        let stmts = &item.block.stmts;
+        //let name = format!("\"{name}\"");
+        let block = quote! {
+            {
+                const STD_MOD_NAME: &str = #name;
+                #(#stmts)*
+            }
+        };
+        item.block = Box::new(syn::parse2(block).unwrap());
+        result.extend(Some(item.into_token_stream()));
+    }
+
+    result
+}
+
 fn do_output(res: Result<(proc_macro2::TokenStream, Vec<Error>), Error>) -> proc_macro::TokenStream {
     match res {
         Err(err) => err.to_compile_error().into(),
@@ -671,6 +702,7 @@ fn normalize_comment_string(s: String) -> Vec<String> {
 
 /// Represent an item without concern for its body which may (or may not)
 /// contain syntax errors.
+#[derive(Clone)]
 struct ItemFnForSignature {
     pub attrs: Vec<Attribute>,
     pub vis: Visibility,

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

@@ -61,8 +61,10 @@ impl CollectionVisitor {
                         format!("std::{}::", self.name)
                     };
                     let mut dd = match var.kind {
-                        VariableKind::Fn => DocData::Fn(FnData::from_ast(var, qual_name, preferred_prefix)),
-                        VariableKind::Const => DocData::Const(ConstData::from_ast(var, qual_name, preferred_prefix)),
+                        VariableKind::Fn => DocData::Fn(FnData::from_ast(var, qual_name, preferred_prefix, name)),
+                        VariableKind::Const => {
+                            DocData::Const(ConstData::from_ast(var, qual_name, preferred_prefix, name))
+                        }
                     };
 
                     dd.with_meta(&var.outer_attrs);
@@ -79,7 +81,7 @@ impl CollectionVisitor {
                     } else {
                         format!("std::{}::", self.name)
                     };
-                    let mut dd = DocData::Ty(TyData::from_ast(ty, qual_name, preferred_prefix));
+                    let mut dd = DocData::Ty(TyData::from_ast(ty, qual_name, preferred_prefix, name));
 
                     dd.with_meta(&ty.outer_attrs);
                     for a in &ty.outer_attrs {
@@ -114,6 +116,16 @@ impl DocData {
         }
     }
 
+    /// The name of the module in which the item is declared, e.g., `sketch`
+    #[allow(dead_code)]
+    pub fn module_name(&self) -> &str {
+        match self {
+            DocData::Fn(f) => &f.module_name,
+            DocData::Const(c) => &c.module_name,
+            DocData::Ty(t) => &t.module_name,
+        }
+    }
+
     #[allow(dead_code)]
     pub fn file_name(&self) -> String {
         match self {
@@ -132,6 +144,7 @@ impl DocData {
         }
     }
 
+    /// The path to the module through which the item is accessed, e.g., `std::sketch`
     #[allow(dead_code)]
     pub fn mod_name(&self) -> String {
         let q = match self {
@@ -217,6 +230,8 @@ pub struct ConstData {
     /// Code examples.
     /// These are tested and we know they compile and execute.
     pub examples: Vec<(String, ExampleProperties)>,
+
+    pub module_name: String,
 }
 
 impl ConstData {
@@ -224,6 +239,7 @@ impl ConstData {
         var: &crate::parsing::ast::types::VariableDeclaration,
         mut qual_name: String,
         preferred_prefix: &str,
+        module_name: &str,
     ) -> Self {
         assert_eq!(var.kind, crate::parsing::ast::types::VariableKind::Const);
 
@@ -263,6 +279,7 @@ impl ConstData {
             summary: None,
             description: None,
             examples: Vec::new(),
+            module_name: module_name.to_owned(),
         }
     }
 
@@ -334,6 +351,8 @@ pub struct FnData {
     pub examples: Vec<(String, ExampleProperties)>,
     #[allow(dead_code)]
     pub referenced_types: Vec<String>,
+
+    pub module_name: String,
 }
 
 impl FnData {
@@ -341,6 +360,7 @@ impl FnData {
         var: &crate::parsing::ast::types::VariableDeclaration,
         mut qual_name: String,
         preferred_prefix: &str,
+        module_name: &str,
     ) -> Self {
         assert_eq!(var.kind, crate::parsing::ast::types::VariableKind::Fn);
         let crate::parsing::ast::types::Expr::FunctionExpression(expr) = &var.declaration.init else {
@@ -375,6 +395,7 @@ impl FnData {
             description: None,
             examples: Vec::new(),
             referenced_types: referenced_types.into_iter().collect(),
+            module_name: module_name.to_owned(),
         }
     }
 
@@ -654,6 +675,8 @@ pub struct TyData {
     pub examples: Vec<(String, ExampleProperties)>,
     #[allow(dead_code)]
     pub referenced_types: Vec<String>,
+
+    pub module_name: String,
 }
 
 impl TyData {
@@ -661,6 +684,7 @@ impl TyData {
         ty: &crate::parsing::ast::types::TypeDeclaration,
         mut qual_name: String,
         preferred_prefix: &str,
+        module_name: &str,
     ) -> Self {
         let name = ty.name.name.clone();
         qual_name.push_str(&name);
@@ -684,6 +708,7 @@ impl TyData {
             description: None,
             examples: Vec::new(),
             referenced_types: referenced_types.into_iter().collect(),
+            module_name: module_name.to_owned(),
         }
     }
 
@@ -1009,6 +1034,8 @@ fn collect_type_names_from_primitive(ty: &PrimitiveType) -> String {
 
 #[cfg(test)]
 mod test {
+    use kcl_derive_docs::for_each_std_mod;
+
     use super::*;
 
     #[test]
@@ -1047,18 +1074,28 @@ mod test {
         );
     }
 
-    #[tokio::test(flavor = "multi_thread", worker_threads = 5)]
-    async fn test_examples() -> miette::Result<()> {
+    #[for_each_std_mod]
+    #[tokio::test(flavor = "multi_thread")]
+    async fn test_examples() {
         let std = walk_prelude();
+        let mut errs = Vec::new();
         for d in std {
+            if d.module_name() != STD_MOD_NAME {
+                continue;
+            }
+
             for (i, eg) in d.examples().enumerate() {
                 let result = match crate::test_server::execute_and_snapshot(eg, None).await {
                     Err(crate::errors::ExecError::Kcl(e)) => {
-                        return Err(miette::Report::new(crate::errors::Report {
+                        errs.push(
+                            miette::Report::new(crate::errors::Report {
                                 error: e.error,
                                 filename: format!("{}{i}", d.name()),
                                 kcl_source: eg.to_string(),
-                        }));
+                            })
+                            .to_string(),
+                        );
+                        continue;
                     }
                     Err(other_err) => panic!("{}", other_err),
                     Ok(img) => img,
@@ -1071,6 +1108,8 @@ mod test {
             }
         }
 
-        Ok(())
+        if !errs.is_empty() {
+            panic!("{}", errs.join("\n\n"));
+        }
     }
 }

rust/kcl-lib/src/execution/exec_ast.rs

@@ -1142,9 +1142,15 @@ impl Node<UnaryExpression> {
             }
             KclValue::Plane { value } => {
                 let mut plane = value.clone();
-                plane.z_axis.x *= -1.0;
-                plane.z_axis.y *= -1.0;
-                plane.z_axis.z *= -1.0;
+                if plane.x_axis.x != 0.0 {
+                    plane.x_axis.x *= -1.0;
+                }
+                if plane.x_axis.y != 0.0 {
+                    plane.x_axis.y *= -1.0;
+                }
+                if plane.x_axis.z != 0.0 {
+                    plane.x_axis.z *= -1.0;
+                }
 
                 plane.value = PlaneType::Uninit;
                 plane.id = exec_state.next_uuid();
@@ -2637,7 +2643,6 @@ p = {
   origin = { x = 0, y = 0, z = 0 },
   xAxis = { x = 1, y = 0, z = 0 },
   yAxis = { x = 0, y = 1, z = 0 },
-  zAxis = { x = 0, y = 0, z = 1 }
 }: Plane
 p2 = -p
 "#;
@@ -2649,7 +2654,11 @@ p2 = -p
             .get_from("p2", result.mem_env, SourceRange::default(), 0)
             .unwrap()
         {
-            KclValue::Plane { value } => assert_eq!(value.z_axis.z, -1.0),
+            KclValue::Plane { value } => {
+                assert_eq!(value.x_axis.x, -1.0);
+                assert_eq!(value.x_axis.y, 0.0);
+                assert_eq!(value.x_axis.z, 0.0);
+            }
             _ => unreachable!(),
         }
     }

rust/kcl-lib/src/execution/geometry.rs

@@ -285,8 +285,6 @@ pub struct Plane {
     pub x_axis: Point3d,
     /// What should the plane's Y axis be?
     pub y_axis: Point3d,
-    /// The z-axis (normal).
-    pub z_axis: Point3d,
     #[serde(skip)]
     pub meta: Vec<Metadata>,
 }
@@ -319,13 +317,6 @@ impl Plane {
                             z: 0.0,
                             units: UnitLen::Mm,
                         },
-                    z_axis:
-                        Point3d {
-                            x: 0.0,
-                            y: 0.0,
-                            z: 1.0,
-                            units: UnitLen::Mm,
-                        },
                     ..
                 } => return PlaneData::XY,
                 Self {
@@ -338,7 +329,7 @@ impl Plane {
                         },
                     x_axis:
                         Point3d {
-                            x: 1.0,
+                            x: -1.0,
                             y: 0.0,
                             z: 0.0,
                             units: UnitLen::Mm,
@@ -350,13 +341,6 @@ impl Plane {
                             z: 0.0,
                             units: UnitLen::Mm,
                         },
-                    z_axis:
-                        Point3d {
-                            x: 0.0,
-                            y: 0.0,
-                            z: -1.0,
-                            units: UnitLen::Mm,
-                        },
                     ..
                 } => return PlaneData::NegXY,
                 Self {
@@ -381,13 +365,6 @@ impl Plane {
                             z: 1.0,
                             units: UnitLen::Mm,
                         },
-                    z_axis:
-                        Point3d {
-                            x: 0.0,
-                            y: -1.0,
-                            z: 0.0,
-                            units: UnitLen::Mm,
-                        },
                     ..
                 } => return PlaneData::XZ,
                 Self {
@@ -400,7 +377,7 @@ impl Plane {
                         },
                     x_axis:
                         Point3d {
-                            x: 1.0,
+                            x: -1.0,
                             y: 0.0,
                             z: 0.0,
                             units: UnitLen::Mm,
@@ -412,13 +389,6 @@ impl Plane {
                             z: 1.0,
                             units: UnitLen::Mm,
                         },
-                    z_axis:
-                        Point3d {
-                            x: 0.0,
-                            y: 1.0,
-                            z: 0.0,
-                            units: UnitLen::Mm,
-                        },
                     ..
                 } => return PlaneData::NegXZ,
                 Self {
@@ -443,13 +413,6 @@ impl Plane {
                             z: 1.0,
                             units: UnitLen::Mm,
                         },
-                    z_axis:
-                        Point3d {
-                            x: 1.0,
-                            y: 0.0,
-                            z: 0.0,
-                            units: UnitLen::Mm,
-                        },
                     ..
                 } => return PlaneData::YZ,
                 Self {
@@ -463,7 +426,7 @@ impl Plane {
                     x_axis:
                         Point3d {
                             x: 0.0,
-                            y: 1.0,
+                            y: -1.0,
                             z: 0.0,
                             units: UnitLen::Mm,
                         },
@@ -474,13 +437,6 @@ impl Plane {
                             z: 1.0,
                             units: UnitLen::Mm,
                         },
-                    z_axis:
-                        Point3d {
-                            x: -1.0,
-                            y: 0.0,
-                            z: 0.0,
-                            units: UnitLen::Mm,
-                        },
                     ..
                 } => return PlaneData::NegYZ,
                 _ => {}
@@ -491,7 +447,6 @@ impl Plane {
             origin: self.origin,
             x_axis: self.x_axis,
             y_axis: self.y_axis,
-            z_axis: self.z_axis,
         }
     }
 
@@ -504,7 +459,6 @@ impl Plane {
                 origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
                 x_axis: Point3d::new(1.0, 0.0, 0.0, UnitLen::Mm),
                 y_axis: Point3d::new(0.0, 1.0, 0.0, UnitLen::Mm),
-                z_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Mm),
                 value: PlaneType::XY,
                 meta: vec![],
             },
@@ -512,9 +466,8 @@ impl Plane {
                 id,
                 artifact_id: id.into(),
                 origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
-                x_axis: Point3d::new(1.0, 0.0, 0.0, UnitLen::Mm),
+                x_axis: Point3d::new(-1.0, 0.0, 0.0, UnitLen::Mm),
                 y_axis: Point3d::new(0.0, 1.0, 0.0, UnitLen::Mm),
-                z_axis: Point3d::new(0.0, 0.0, -1.0, UnitLen::Mm),
                 value: PlaneType::XY,
                 meta: vec![],
             },
@@ -524,7 +477,6 @@ impl Plane {
                 origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
                 x_axis: Point3d::new(1.0, 0.0, 0.0, UnitLen::Mm),
                 y_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Mm),
-                z_axis: Point3d::new(0.0, -1.0, 0.0, UnitLen::Mm),
                 value: PlaneType::XZ,
                 meta: vec![],
             },
@@ -534,7 +486,6 @@ impl Plane {
                 origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
                 x_axis: Point3d::new(-1.0, 0.0, 0.0, UnitLen::Mm),
                 y_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Mm),
-                z_axis: Point3d::new(0.0, 1.0, 0.0, UnitLen::Mm),
                 value: PlaneType::XZ,
                 meta: vec![],
             },
@@ -544,7 +495,6 @@ impl Plane {
                 origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
                 x_axis: Point3d::new(0.0, 1.0, 0.0, UnitLen::Mm),
                 y_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Mm),
-                z_axis: Point3d::new(1.0, 0.0, 0.0, UnitLen::Mm),
                 value: PlaneType::YZ,
                 meta: vec![],
             },
@@ -552,18 +502,12 @@ impl Plane {
                 id,
                 artifact_id: id.into(),
                 origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
-                x_axis: Point3d::new(0.0, 1.0, 0.0, UnitLen::Mm),
+                x_axis: Point3d::new(0.0, -1.0, 0.0, UnitLen::Mm),
                 y_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Mm),
-                z_axis: Point3d::new(-1.0, 0.0, 0.0, UnitLen::Mm),
                 value: PlaneType::YZ,
                 meta: vec![],
             },
-            PlaneData::Plane {
-                origin,
-                x_axis,
-                y_axis,
-                z_axis,
-            } => {
+            PlaneData::Plane { origin, x_axis, y_axis } => {
                 let id = exec_state.next_uuid();
                 Plane {
                     id,
@@ -571,7 +515,6 @@ impl Plane {
                     origin,
                     x_axis,
                     y_axis,
-                    z_axis,
                     value: PlaneType::Custom,
                     meta: vec![],
                 }
@@ -600,8 +543,6 @@ pub struct Face {
     pub x_axis: Point3d,
     /// What should the face's Y axis be?
     pub y_axis: Point3d,
-    /// The z-axis (normal).
-    pub z_axis: Point3d,
     /// The solid the face is on.
     pub solid: Box<Solid>,
     pub units: UnitLen,
@@ -679,7 +620,8 @@ impl Sketch {
                     adjust_camera: false,
                     planar_normal: if let SketchSurface::Plane(plane) = &self.on {
                         // We pass in the normal for the plane here.
-                        Some(plane.z_axis.into())
+                        let normal = plane.x_axis.cross(&plane.y_axis);
+                        Some(normal.into())
                     } else {
                         None
                     },
@@ -723,12 +665,6 @@ impl SketchSurface {
             SketchSurface::Face(face) => face.y_axis,
         }
     }
-    pub(crate) fn z_axis(&self) -> Point3d {
-        match self {
-            SketchSurface::Plane(plane) => plane.z_axis,
-            SketchSurface::Face(face) => face.z_axis,
-        }
-    }
 }
 
 #[derive(Debug, Clone)]
@@ -969,6 +905,27 @@ impl Point3d {
     pub const fn is_zero(&self) -> bool {
         self.x == 0.0 && self.y == 0.0 && self.z == 0.0
     }
+
+    /// Calculate the cross product of this vector with another
+    pub fn cross(&self, other: &Self) -> Self {
+        let other = if other.units == self.units {
+            other
+        } else {
+            &Point3d {
+                x: self.units.adjust_to(other.x, self.units).0,
+                y: self.units.adjust_to(other.y, self.units).0,
+                z: self.units.adjust_to(other.z, self.units).0,
+                units: self.units,
+            }
+        };
+
+        Self {
+            x: self.y * other.z - self.z * other.y,
+            y: self.z * other.x - self.x * other.z,
+            z: self.x * other.y - self.y * other.x,
+            units: self.units,
+        }
+    }
 }
 
 impl From<[TyF64; 3]> for Point3d {

rust/kcl-lib/src/execution/types.rs

@@ -1043,10 +1043,6 @@ impl KclValue {
                         .get("yAxis")
                         .and_then(Point3d::from_kcl_val)
                         .ok_or(CoercionError::from(self))?;
-                    let z_axis = value
-                        .get("zAxis")
-                        .and_then(Point3d::from_kcl_val)
-                        .ok_or(CoercionError::from(self))?;
 
                     let id = exec_state.mod_local.id_generator.next_uuid();
                     let plane = Plane {
@@ -1055,7 +1051,6 @@ impl KclValue {
                         origin,
                         x_axis,
                         y_axis,
-                        z_axis,
                         value: super::PlaneType::Uninit,
                         meta: meta.clone(),
                     };

rust/kcl-lib/src/main.rs

@@ -43,5 +43,5 @@ async fn main() {
     .await
     .unwrap();
     let mut exec_state = ExecState::new(&ctx);
-    ctx.run(&program, &mut exec_state).await.unwrap();
+    ctx.run(&program, &mut exec_state).await.map_err(|e| e.error).unwrap();
 }

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

@@ -1108,7 +1108,6 @@ impl<'a> FromKclValue<'a> for super::sketch::PlaneData {
                 origin: value.origin,
                 x_axis: value.x_axis,
                 y_axis: value.y_axis,
-                z_axis: value.z_axis,
             });
         }
         // Case 1: predefined plane
@@ -1129,13 +1128,7 @@ impl<'a> FromKclValue<'a> for super::sketch::PlaneData {
         let origin = plane.get("origin").and_then(FromKclValue::from_kcl_val)?;
         let x_axis = plane.get("xAxis").and_then(FromKclValue::from_kcl_val)?;
         let y_axis = plane.get("yAxis").and_then(FromKclValue::from_kcl_val)?;
-        let z_axis = plane.get("zAxis").and_then(FromKclValue::from_kcl_val)?;
-        Some(Self::Plane {
-            origin,
-            x_axis,
-            y_axis,
-            z_axis,
-        })
+        Some(Self::Plane { origin, x_axis, y_axis })
     }
 }
 

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

@@ -109,7 +109,6 @@ lazy_static! {
         Box::new(crate::std::shell::Hollow),
         Box::new(crate::std::sweep::Sweep),
         Box::new(crate::std::loft::Loft),
-        Box::new(crate::std::planes::OffsetPlane),
         Box::new(crate::std::math::Acos),
         Box::new(crate::std::math::Asin),
         Box::new(crate::std::math::Atan),
@@ -207,6 +206,10 @@ pub(crate) fn std_fn(path: &str, fn_name: &str) -> (crate::std::StdFn, StdFnProp
             |e, a| Box::pin(crate::std::revolve::revolve(e, a)),
             StdFnProps::default("std::revolve").include_in_feature_tree(),
         ),
+        ("prelude", "offsetPlane") => (
+            |e, a| Box::pin(crate::std::planes::offset_plane(e, a)),
+            StdFnProps::default("std::offsetPlane").include_in_feature_tree(),
+        ),
         _ => unreachable!(),
     }
 }

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

@@ -1,6 +1,5 @@
 //! Standard library plane helpers.
 
-use kcl_derive_docs::stdlib;
 use kcmc::{each_cmd as mcmd, length_unit::LengthUnit, shared::Color, ModelingCmd};
 use kittycad_modeling_cmds as kcmc;
 
@@ -19,98 +18,6 @@ pub async fn offset_plane(exec_state: &mut ExecState, args: Args) -> Result<KclV
     Ok(KclValue::Plane { value: Box::new(plane) })
 }
 
-/// Offset a plane by a distance along its normal.
-///
-/// For example, if you offset the 'XZ' plane by 10, the new plane will be parallel to the 'XZ'
-/// plane and 10 units away from it.
-///
-/// ```no_run
-/// // Loft a square and a circle on the `XY` plane using offset.
-/// squareSketch = startSketchOn('XY')
-///     |> startProfileAt([-100, 200], %)
-///     |> line(end = [200, 0])
-///     |> line(end = [0, -200])
-///     |> line(end = [-200, 0])
-///     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-///     |> close()
-///
-/// circleSketch = startSketchOn(offsetPlane('XY', offset = 150))
-///     |> circle( center = [0, 100], radius = 50 )
-///
-/// loft([squareSketch, circleSketch])
-/// ```
-///
-/// ```no_run
-/// // Loft a square and a circle on the `XZ` plane using offset.
-/// squareSketch = startSketchOn('XZ')
-///     |> startProfileAt([-100, 200], %)
-///     |> line(end = [200, 0])
-///     |> line(end = [0, -200])
-///     |> line(end = [-200, 0])
-///     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-///     |> close()
-///
-/// circleSketch = startSketchOn(offsetPlane('XZ', offset = 150))
-///     |> circle( center = [0, 100], radius = 50 )
-///
-/// loft([squareSketch, circleSketch])
-/// ```
-///
-/// ```no_run
-/// // Loft a square and a circle on the `YZ` plane using offset.
-/// squareSketch = startSketchOn('YZ')
-///     |> startProfileAt([-100, 200], %)
-///     |> line(end = [200, 0])
-///     |> line(end = [0, -200])
-///     |> line(end = [-200, 0])
-///     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-///     |> close()
-///
-/// circleSketch = startSketchOn(offsetPlane('YZ', offset = 150))
-///     |> circle( center = [0, 100], radius = 50 )
-///
-/// loft([squareSketch, circleSketch])
-/// ```
-///
-/// ```no_run
-/// // Loft a square and a circle on the `-XZ` plane using offset.
-/// squareSketch = startSketchOn('-XZ')
-///     |> startProfileAt([-100, 200], %)
-///     |> line(end = [200, 0])
-///     |> line(end = [0, -200])
-///     |> line(end = [-200, 0])
-///     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-///     |> close()
-///
-/// circleSketch = startSketchOn(offsetPlane('-XZ', offset = -150))
-///     |> circle( center = [0, 100], radius = 50 )
-///
-/// loft([squareSketch, circleSketch])
-/// ```
-/// ```no_run
-/// // A circle on the XY plane
-/// startSketchOn("XY")
-///   |> startProfileAt([0, 0], %)
-///   |> circle( radius = 10, center = [0, 0] )
-///   
-/// // Triangle on the plane 4 units above
-/// startSketchOn(offsetPlane("XY", offset = 4))
-///   |> startProfileAt([0, 0], %)
-///   |> line(end = [10, 0])
-///   |> line(end = [0, 10])
-///   |> close()
-/// ```
-
-#[stdlib {
-    name = "offsetPlane",
-    feature_tree_operation = true,
-    keywords = true,
-    unlabeled_first = true,
-    args = {
-        plane = { docs = "The plane (e.g. XY) which this new plane is created from." },
-        offset = { docs = "Distance from the standard plane this new plane will be created at." },
-    }
-}]
 async fn inner_offset_plane(
     plane: PlaneData,
     offset: TyF64,
@@ -122,7 +29,8 @@ async fn inner_offset_plane(
     // standard planes themselves.
     plane.value = PlaneType::Custom;
 
-    plane.origin += plane.z_axis * offset.to_length_units(plane.origin.units);
+    let normal = plane.x_axis.cross(&plane.y_axis);
+    plane.origin += normal * offset.to_length_units(plane.origin.units);
     make_offset_plane_in_engine(&plane, exec_state, args).await?;
 
     Ok(plane)

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

@@ -960,9 +960,6 @@ pub enum PlaneData {
         /// What should the plane’s Y axis be?
         #[serde(rename = "yAxis")]
         y_axis: Point3d,
-        /// The z-axis (normal).
-        #[serde(rename = "zAxis")]
-        z_axis: Point3d,
     },
 }
 
@@ -1229,7 +1226,6 @@ async fn start_sketch_on_face(
         // TODO: get this from the extrude plane data.
         x_axis: solid.sketch.on.x_axis(),
         y_axis: solid.sketch.on.y_axis(),
-        z_axis: solid.sketch.on.z_axis(),
         units: solid.units,
         solid,
         meta: vec![args.source_range.into()],
@@ -1247,49 +1243,18 @@ async fn make_sketch_plane_from_orientation(
     let clobber = false;
     let size = LengthUnit(60.0);
     let hide = Some(true);
-    match data {
-        PlaneData::XY | PlaneData::NegXY | PlaneData::XZ | PlaneData::NegXZ | PlaneData::YZ | PlaneData::NegYZ => {
-            // TODO: ignoring the default planes here since we already created them, breaks the
-            // front end for the feature tree which is stupid and we should fix it.
-            let x_axis = match data {
-                PlaneData::NegXY => Point3d::new(-1.0, 0.0, 0.0, UnitLen::Mm),
-                PlaneData::NegXZ => Point3d::new(-1.0, 0.0, 0.0, UnitLen::Mm),
-                PlaneData::NegYZ => Point3d::new(0.0, -1.0, 0.0, UnitLen::Mm),
-                _ => plane.x_axis,
-            };
     args.batch_modeling_cmd(
         plane.id,
         ModelingCmd::from(mcmd::MakePlane {
             clobber,
             origin: plane.origin.into(),
             size,
-                    x_axis: x_axis.into(),
+            x_axis: plane.x_axis.into(),
             y_axis: plane.y_axis.into(),
             hide,
         }),
     )
     .await?;
-        }
-        PlaneData::Plane {
-            origin,
-            x_axis,
-            y_axis,
-            z_axis: _,
-        } => {
-            args.batch_modeling_cmd(
-                plane.id,
-                ModelingCmd::from(mcmd::MakePlane {
-                    clobber,
-                    origin: origin.into(),
-                    size,
-                    x_axis: x_axis.into(),
-                    y_axis: y_axis.into(),
-                    hide,
-                }),
-            )
-            .await?;
-        }
-    }
 
     Ok(Box::new(plane))
 }
@@ -1384,7 +1349,8 @@ pub(crate) async fn inner_start_profile_at(
                 adjust_camera: false,
                 planar_normal: if let SketchSurface::Plane(plane) = &sketch_surface {
                     // We pass in the normal for the plane here.
-                    Some(plane.z_axis.into())
+                    let normal = plane.x_axis.cross(&plane.y_axis);
+                    Some(normal.into())
                 } else {
                     None
                 },

rust/kcl-lib/std/prelude.kcl

@@ -12,21 +12,18 @@ export XY = {
   origin = { x = 0, y = 0, z = 0 },
   xAxis = { x = 1, y = 0, z = 0 },
   yAxis = { x = 0, y = 1, z = 0 },
-  zAxis = { x = 0, y = 0, z = 1 },
 }: Plane
 
 export XZ = {
   origin = { x = 0, y = 0, z = 0 },
   xAxis = { x = 1, y = 0, z = 0 },
   yAxis = { x = 0, y = 0, z = 1 },
-  zAxis = { x = 0, y = -1, z = 0 },
 }: Plane
 
 export YZ = {
   origin = { x = 0, y = 0, z = 0 },
   xAxis = { x = 0, y = 1, z = 0 },
   yAxis = { x = 0, y = 0, z = 1 },
-  zAxis = { x = 1, y = 0, z = 0 },
 }: Plane
 
 export X = {
@@ -449,3 +446,93 @@ export fn toRadians(@num: number(rad)): number(rad) {
 export fn toDegrees(@num: number(deg)): number(deg) {
   return num
 }
+
+/// Offset a plane by a distance along its normal.
+///
+/// For example, if you offset the `XZ` plane by 10, the new plane will be parallel to the `XZ`
+/// plane and 10 units away from it.
+///
+/// ```
+/// // Loft a square and a circle on the `XY` plane using offset.
+/// squareSketch = startSketchOn(XY)
+///     |> startProfileAt([-100, 200], %)
+///     |> line(end = [200, 0])
+///     |> line(end = [0, -200])
+///     |> line(end = [-200, 0])
+///     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+///     |> close()
+///
+/// circleSketch = startSketchOn(offsetPlane(XY, offset = 150))
+///     |> circle( center = [0, 100], radius = 50 )
+///
+/// loft([squareSketch, circleSketch])
+/// ```
+///
+/// ```
+/// // Loft a square and a circle on the `XZ` plane using offset.
+/// squareSketch = startSketchOn(XZ)
+///     |> startProfileAt([-100, 200], %)
+///     |> line(end = [200, 0])
+///     |> line(end = [0, -200])
+///     |> line(end = [-200, 0])
+///     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+///     |> close()
+///
+/// circleSketch = startSketchOn(offsetPlane(XZ, offset = 150))
+///     |> circle( center = [0, 100], radius = 50 )
+///
+/// loft([squareSketch, circleSketch])
+/// ```
+///
+/// ```
+/// // Loft a square and a circle on the `YZ` plane using offset.
+/// squareSketch = startSketchOn(YZ)
+///     |> startProfileAt([-100, 200], %)
+///     |> line(end = [200, 0])
+///     |> line(end = [0, -200])
+///     |> line(end = [-200, 0])
+///     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+///     |> close()
+///
+/// circleSketch = startSketchOn(offsetPlane(YZ, offset = 150))
+///     |> circle( center = [0, 100], radius = 50 )
+///
+/// loft([squareSketch, circleSketch])
+/// ```
+///
+/// ```
+/// // Loft a square and a circle on the `-XZ` plane using offset.
+/// squareSketch = startSketchOn(-XZ)
+///     |> startProfileAt([-100, 200], %)
+///     |> line(end = [200, 0])
+///     |> line(end = [0, -200])
+///     |> line(end = [-200, 0])
+///     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+///     |> close()
+///
+/// circleSketch = startSketchOn(offsetPlane(-XZ, offset = 150))
+///     |> circle(center = [0, 100], radius = 50)
+///
+/// loft([squareSketch, circleSketch])
+/// ```
+///
+/// ```
+/// // A circle on the XY plane
+/// startSketchOn(XY)
+///   |> startProfileAt([0, 0], %)
+///   |> circle( radius = 10, center = [0, 0] )
+///
+/// // Triangle on the plane 4 units above
+/// startSketchOn(offsetPlane(XY, offset = 4))
+///   |> startProfileAt([0, 0], %)
+///   |> line(end = [10, 0])
+///   |> line(end = [0, 10])
+///   |> close()
+/// ```
+@(impl = std_rust)
+export fn offsetPlane(
+  /// The plane (e.g. `XY`) which this new plane is created from.
+  @plane: Plane,
+  /// Distance from the standard plane this new plane will be created at.
+  offset: number(Length),
+): Plane {}

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

@@ -212,14 +212,6 @@ description: Variables in memory after executing angled_line.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {

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

@@ -191,14 +191,6 @@ description: Variables in memory after executing artifact_graph_example_code1.kc
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -395,14 +387,6 @@ description: Variables in memory after executing artifact_graph_example_code1.kc
               "type": "Mm"
             }
           },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
-          },
           "solid": {
             "type": "Solid",
             "id": "[uuid]",
@@ -589,14 +573,6 @@ description: Variables in memory after executing artifact_graph_example_code1.kc
                   "units": {
                     "type": "Mm"
                   }
-                },
-                "zAxis": {
-                  "x": 0.0,
-                  "y": 0.0,
-                  "z": 1.0,
-                  "units": {
-                    "type": "Mm"
-                  }
                 }
               },
               "start": {
@@ -850,14 +826,6 @@ description: Variables in memory after executing artifact_graph_example_code1.kc
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -999,14 +967,6 @@ description: Variables in memory after executing artifact_graph_example_code1.kc
             "type": "Mm"
           }
         },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
-        },
         "solid": {
           "type": "Solid",
           "id": "[uuid]",
@@ -1193,14 +1153,6 @@ description: Variables in memory after executing artifact_graph_example_code1.kc
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {

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

@@ -210,7 +210,7 @@ description: Artifact commands artifact_graph_example_code_no_3d.kcl
       "planar_normal": {
         "x": 0.0,
         "y": 1.0,
-        "z": 0.0
+        "z": -0.0
       }
     }
   },

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

@@ -166,14 +166,6 @@ description: Variables in memory after executing artifact_graph_example_code_no_
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 1.0,
-          "y": 0.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -317,14 +309,6 @@ description: Variables in memory after executing artifact_graph_example_code_no_
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {

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

@@ -4,6 +4,15 @@ description: Operations executed artifact_graph_example_code_offset_planes.kcl
 ---
 [
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "String",
+        "value": "XY"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -22,18 +31,18 @@ description: Operations executed artifact_graph_example_code_offset_planes.kcl
         "sourceRange": []
       }
     },
+    "sourceRange": []
+  },
+  {
+    "type": "KclStdLibCall",
     "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
     "unlabeledArg": {
       "value": {
         "type": "String",
-        "value": "XY"
+        "value": "XZ"
       },
       "sourceRange": []
-    }
     },
-  {
     "labeledArgs": {
       "offset": {
         "value": {
@@ -52,18 +61,18 @@ description: Operations executed artifact_graph_example_code_offset_planes.kcl
         "sourceRange": []
       }
     },
+    "sourceRange": []
+  },
+  {
+    "type": "KclStdLibCall",
     "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
     "unlabeledArg": {
       "value": {
         "type": "String",
-        "value": "XZ"
+        "value": "YZ"
       },
       "sourceRange": []
-    }
     },
-  {
     "labeledArgs": {
       "offset": {
         "value": {
@@ -82,16 +91,7 @@ description: Operations executed artifact_graph_example_code_offset_planes.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "String",
-        "value": "YZ"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {

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

@@ -32,14 +32,6 @@ description: Variables in memory after executing artifact_graph_example_code_off
         "units": {
           "type": "Mm"
         }
-      },
-      "zAxis": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 1.0,
-        "units": {
-          "type": "Mm"
-        }
       }
     }
   },
@@ -72,14 +64,6 @@ description: Variables in memory after executing artifact_graph_example_code_off
         "units": {
           "type": "Mm"
         }
-      },
-      "zAxis": {
-        "x": 0.0,
-        "y": -1.0,
-        "z": 0.0,
-        "units": {
-          "type": "Mm"
-        }
       }
     }
   },
@@ -112,14 +96,6 @@ description: Variables in memory after executing artifact_graph_example_code_off
         "units": {
           "type": "Mm"
         }
-      },
-      "zAxis": {
-        "x": 1.0,
-        "y": 0.0,
-        "z": 0.0,
-        "units": {
-          "type": "Mm"
-        }
       }
     }
   },
@@ -177,14 +153,6 @@ description: Variables in memory after executing artifact_graph_example_code_off
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {

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

@@ -153,14 +153,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": -1.0,
-            "z": 0.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -333,14 +325,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
               "type": "Mm"
             }
           },
-          "zAxis": {
-            "x": 0.0,
-            "y": -1.0,
-            "z": 0.0,
-            "units": {
-              "type": "Mm"
-            }
-          },
           "solid": {
             "type": "Solid",
             "id": "[uuid]",
@@ -489,14 +473,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                   "units": {
                     "type": "Mm"
                   }
-                },
-                "zAxis": {
-                  "x": 0.0,
-                  "y": -1.0,
-                  "z": 0.0,
-                  "units": {
-                    "type": "Mm"
-                  }
                 }
               },
               "start": {
@@ -717,14 +693,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
               "type": "Mm"
             }
           },
-          "zAxis": {
-            "x": 0.0,
-            "y": -1.0,
-            "z": 0.0,
-            "units": {
-              "type": "Mm"
-            }
-          },
           "solid": {
             "type": "Solid",
             "id": "[uuid]",
@@ -854,14 +822,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                     "type": "Mm"
                   }
                 },
-                "zAxis": {
-                  "x": 0.0,
-                  "y": -1.0,
-                  "z": 0.0,
-                  "units": {
-                    "type": "Mm"
-                  }
-                },
                 "solid": {
                   "type": "Solid",
                   "id": "[uuid]",
@@ -1010,14 +970,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                         "units": {
                           "type": "Mm"
                         }
-                      },
-                      "zAxis": {
-                        "x": 0.0,
-                        "y": -1.0,
-                        "z": 0.0,
-                        "units": {
-                          "type": "Mm"
-                        }
                       }
                     },
                     "start": {
@@ -1268,14 +1220,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
               "type": "Mm"
             }
           },
-          "zAxis": {
-            "x": 0.0,
-            "y": -1.0,
-            "z": 0.0,
-            "units": {
-              "type": "Mm"
-            }
-          },
           "solid": {
             "type": "Solid",
             "id": "[uuid]",
@@ -1417,14 +1361,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                     "type": "Mm"
                   }
                 },
-                "zAxis": {
-                  "x": 0.0,
-                  "y": -1.0,
-                  "z": 0.0,
-                  "units": {
-                    "type": "Mm"
-                  }
-                },
                 "solid": {
                   "type": "Solid",
                   "id": "[uuid]",
@@ -1554,14 +1490,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                           "type": "Mm"
                         }
                       },
-                      "zAxis": {
-                        "x": 0.0,
-                        "y": -1.0,
-                        "z": 0.0,
-                        "units": {
-                          "type": "Mm"
-                        }
-                      },
                       "solid": {
                         "type": "Solid",
                         "id": "[uuid]",
@@ -1710,14 +1638,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                               "units": {
                                 "type": "Mm"
                               }
-                            },
-                            "zAxis": {
-                              "x": 0.0,
-                              "y": -1.0,
-                              "z": 0.0,
-                              "units": {
-                                "type": "Mm"
-                              }
                             }
                           },
                           "start": {
@@ -2000,14 +1920,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": -1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -2145,14 +2057,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
             "type": "Mm"
           }
         },
-        "zAxis": {
-          "x": 0.0,
-          "y": -1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
-        },
         "solid": {
           "type": "Solid",
           "id": "[uuid]",
@@ -2301,14 +2205,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": -1.0,
-                "z": 0.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -2488,14 +2384,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
             "type": "Mm"
           }
         },
-        "zAxis": {
-          "x": 0.0,
-          "y": -1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
-        },
         "solid": {
           "type": "Solid",
           "id": "[uuid]",
@@ -2625,14 +2513,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                   "type": "Mm"
                 }
               },
-              "zAxis": {
-                "x": 0.0,
-                "y": -1.0,
-                "z": 0.0,
-                "units": {
-                  "type": "Mm"
-                }
-              },
               "solid": {
                 "type": "Solid",
                 "id": "[uuid]",
@@ -2781,14 +2661,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                       "units": {
                         "type": "Mm"
                       }
-                    },
-                    "zAxis": {
-                      "x": 0.0,
-                      "y": -1.0,
-                      "z": 0.0,
-                      "units": {
-                        "type": "Mm"
-                      }
                     }
                   },
                   "start": {
@@ -3004,14 +2876,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
             "type": "Mm"
           }
         },
-        "zAxis": {
-          "x": 0.0,
-          "y": -1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
-        },
         "solid": {
           "type": "Solid",
           "id": "[uuid]",
@@ -3153,14 +3017,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                   "type": "Mm"
                 }
               },
-              "zAxis": {
-                "x": 0.0,
-                "y": -1.0,
-                "z": 0.0,
-                "units": {
-                  "type": "Mm"
-                }
-              },
               "solid": {
                 "type": "Solid",
                 "id": "[uuid]",
@@ -3290,14 +3146,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                         "type": "Mm"
                       }
                     },
-                    "zAxis": {
-                      "x": 0.0,
-                      "y": -1.0,
-                      "z": 0.0,
-                      "units": {
-                        "type": "Mm"
-                      }
-                    },
                     "solid": {
                       "type": "Solid",
                       "id": "[uuid]",
@@ -3446,14 +3294,6 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                             "units": {
                               "type": "Mm"
                             }
-                          },
-                          "zAxis": {
-                            "x": 0.0,
-                            "y": -1.0,
-                            "z": 0.0,
-                            "units": {
-                              "type": "Mm"
-                            }
                           }
                         },
                         "start": {

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

@@ -184,14 +184,6 @@ description: Variables in memory after executing basic_fillet_cube_close_opposit
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {

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

@@ -172,14 +172,6 @@ description: Variables in memory after executing basic_fillet_cube_end.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {

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

@@ -196,14 +196,6 @@ description: Variables in memory after executing basic_fillet_cube_next_adjacent
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {

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

@@ -196,14 +196,6 @@ description: Variables in memory after executing basic_fillet_cube_previous_adja
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {

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

@@ -172,14 +172,6 @@ description: Variables in memory after executing basic_fillet_cube_start.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {

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

@@ -134,14 +134,6 @@ description: Variables in memory after executing big_number_angle_to_match_lengt
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {

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

@@ -134,14 +134,6 @@ description: Variables in memory after executing big_number_angle_to_match_lengt
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {

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

@@ -82,14 +82,6 @@ description: Variables in memory after executing circle_three_point.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {

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

@@ -969,7 +969,7 @@ description: Artifact commands crazy_multi_profile.kcl
       "planar_normal": {
         "x": 0.0,
         "y": 1.0,
-        "z": 0.0
+        "z": -0.0
       }
     }
   },
@@ -1046,7 +1046,7 @@ description: Artifact commands crazy_multi_profile.kcl
       "planar_normal": {
         "x": 0.0,
         "y": 1.0,
-        "z": 0.0
+        "z": -0.0
       }
     }
   },
@@ -1148,7 +1148,7 @@ description: Artifact commands crazy_multi_profile.kcl
       "planar_normal": {
         "x": 0.0,
         "y": 1.0,
-        "z": 0.0
+        "z": -0.0
       }
     }
   },
@@ -1250,7 +1250,7 @@ description: Artifact commands crazy_multi_profile.kcl
       "planar_normal": {
         "x": 0.0,
         "y": 1.0,
-        "z": 0.0
+        "z": -0.0
       }
     }
   },
@@ -1326,7 +1326,7 @@ description: Artifact commands crazy_multi_profile.kcl
       "planar_normal": {
         "x": 0.0,
         "y": 1.0,
-        "z": 0.0
+        "z": -0.0
       }
     }
   },
@@ -1445,7 +1445,7 @@ description: Artifact commands crazy_multi_profile.kcl
       "planar_normal": {
         "x": 0.0,
         "y": 1.0,
-        "z": 0.0
+        "z": -0.0
       }
     }
   },

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

@@ -1,85 +1,85 @@
 ```mermaid
 flowchart LR
   subgraph path2 [Path]
-    2["Path<br>[45, 85, 0]"]
-    3["Segment<br>[91, 129, 0]"]
-    4["Segment<br>[135, 174, 0]"]
-    5["Segment<br>[180, 236, 0]"]
-    6["Segment<br>[242, 249, 0]"]
+    2["Path<br>[43, 83, 0]"]
+    3["Segment<br>[89, 127, 0]"]
+    4["Segment<br>[133, 172, 0]"]
+    5["Segment<br>[178, 234, 0]"]
+    6["Segment<br>[240, 247, 0]"]
     7[Solid2d]
   end
   subgraph path20 [Path]
-    20["Path<br>[361, 401, 0]"]
-    21["Segment<br>[407, 431, 0]"]
-    22["Segment<br>[437, 462, 0]"]
+    20["Path<br>[359, 399, 0]"]
+    21["Segment<br>[405, 429, 0]"]
+    22["Segment<br>[435, 460, 0]"]
   end
   subgraph path23 [Path]
-    23["Path<br>[476, 515, 0]"]
-    24["Segment<br>[521, 586, 0]"]
-    25["Segment<br>[592, 660, 0]"]
-    26["Segment<br>[666, 754, 0]"]
-    27["Segment<br>[760, 816, 0]"]
-    28["Segment<br>[822, 829, 0]"]
+    23["Path<br>[474, 513, 0]"]
+    24["Segment<br>[519, 584, 0]"]
+    25["Segment<br>[590, 658, 0]"]
+    26["Segment<br>[664, 752, 0]"]
+    27["Segment<br>[758, 814, 0]"]
+    28["Segment<br>[820, 827, 0]"]
     29[Solid2d]
   end
   subgraph path30 [Path]
-    30["Path<br>[843, 882, 0]"]
-    31["Segment<br>[888, 908, 0]"]
-    32["Segment<br>[914, 940, 0]"]
-    33["Segment<br>[946, 1002, 0]"]
-    34["Segment<br>[1008, 1015, 0]"]
+    30["Path<br>[841, 880, 0]"]
+    31["Segment<br>[886, 906, 0]"]
+    32["Segment<br>[912, 938, 0]"]
+    33["Segment<br>[944, 1000, 0]"]
+    34["Segment<br>[1006, 1013, 0]"]
     35[Solid2d]
   end
   subgraph path36 [Path]
-    36["Path<br>[1029, 1084, 0]"]
-    37["Segment<br>[1029, 1084, 0]"]
+    36["Path<br>[1027, 1082, 0]"]
+    37["Segment<br>[1027, 1082, 0]"]
     38[Solid2d]
   end
   subgraph path39 [Path]
-    39["Path<br>[1098, 1137, 0]"]
-    40["Segment<br>[1143, 1167, 0]"]
-    41["Segment<br>[1173, 1198, 0]"]
-    42["Segment<br>[1204, 1260, 0]"]
-    43["Segment<br>[1266, 1273, 0]"]
+    39["Path<br>[1096, 1135, 0]"]
+    40["Segment<br>[1141, 1165, 0]"]
+    41["Segment<br>[1171, 1196, 0]"]
+    42["Segment<br>[1202, 1258, 0]"]
+    43["Segment<br>[1264, 1271, 0]"]
     44[Solid2d]
   end
   subgraph path59 [Path]
-    59["Path<br>[1445, 1483, 0]"]
-    60["Segment<br>[1489, 1513, 0]"]
-    61["Segment<br>[1519, 1544, 0]"]
+    59["Path<br>[1441, 1479, 0]"]
+    60["Segment<br>[1485, 1509, 0]"]
+    61["Segment<br>[1515, 1540, 0]"]
   end
   subgraph path62 [Path]
-    62["Path<br>[1558, 1597, 0]"]
-    63["Segment<br>[1603, 1627, 0]"]
-    64["Segment<br>[1633, 1658, 0]"]
-    65["Segment<br>[1664, 1720, 0]"]
-    66["Segment<br>[1726, 1733, 0]"]
+    62["Path<br>[1554, 1593, 0]"]
+    63["Segment<br>[1599, 1623, 0]"]
+    64["Segment<br>[1629, 1654, 0]"]
+    65["Segment<br>[1660, 1716, 0]"]
+    66["Segment<br>[1722, 1729, 0]"]
     67[Solid2d]
   end
   subgraph path68 [Path]
-    68["Path<br>[1747, 1786, 0]"]
-    69["Segment<br>[1792, 1815, 0]"]
-    70["Segment<br>[1821, 1846, 0]"]
-    71["Segment<br>[1852, 1908, 0]"]
-    72["Segment<br>[1914, 1921, 0]"]
+    68["Path<br>[1743, 1782, 0]"]
+    69["Segment<br>[1788, 1811, 0]"]
+    70["Segment<br>[1817, 1842, 0]"]
+    71["Segment<br>[1848, 1904, 0]"]
+    72["Segment<br>[1910, 1917, 0]"]
     73[Solid2d]
   end
   subgraph path74 [Path]
-    74["Path<br>[1935, 1991, 0]"]
-    75["Segment<br>[1935, 1991, 0]"]
+    74["Path<br>[1931, 1987, 0]"]
+    75["Segment<br>[1931, 1987, 0]"]
     76[Solid2d]
   end
   subgraph path77 [Path]
-    77["Path<br>[2005, 2045, 0]"]
-    78["Segment<br>[2051, 2116, 0]"]
-    79["Segment<br>[2122, 2190, 0]"]
-    80["Segment<br>[2196, 2284, 0]"]
-    81["Segment<br>[2290, 2346, 0]"]
-    82["Segment<br>[2352, 2359, 0]"]
+    77["Path<br>[2001, 2041, 0]"]
+    78["Segment<br>[2047, 2112, 0]"]
+    79["Segment<br>[2118, 2186, 0]"]
+    80["Segment<br>[2192, 2280, 0]"]
+    81["Segment<br>[2286, 2342, 0]"]
+    82["Segment<br>[2348, 2355, 0]"]
     83[Solid2d]
   end
-  1["Plane<br>[12, 31, 0]"]
-  8["Sweep Extrusion<br>[263, 295, 0]"]
+  1["Plane<br>[12, 29, 0]"]
+  8["Sweep Extrusion<br>[261, 293, 0]"]
   9[Wall]
   10[Wall]
   11[Wall]
@@ -91,8 +91,8 @@ flowchart LR
   17["SweepEdge Adjacent"]
   18["SweepEdge Opposite"]
   19["SweepEdge Adjacent"]
-  45["Sweep RevolveAboutEdge<br>[1287, 1353, 0]"]
-  46["Sweep Extrusion<br>[1367, 1398, 0]"]
+  45["Sweep RevolveAboutEdge<br>[1285, 1351, 0]"]
+  46["Sweep Extrusion<br>[1365, 1396, 0]"]
   47[Wall]
   48[Wall]
   49[Wall]
@@ -104,8 +104,8 @@ flowchart LR
   55["SweepEdge Adjacent"]
   56["SweepEdge Opposite"]
   57["SweepEdge Adjacent"]
-  58["Plane<br>[1411, 1431, 0]"]
-  84["Sweep Extrusion<br>[2373, 2406, 0]"]
+  58["Plane<br>[1409, 1427, 0]"]
+  84["Sweep Extrusion<br>[2369, 2402, 0]"]
   85[Wall]
   86[Wall]
   87[Wall]
@@ -120,7 +120,7 @@ flowchart LR
   96["SweepEdge Adjacent"]
   97["SweepEdge Opposite"]
   98["SweepEdge Adjacent"]
-  99["Sweep RevolveAboutEdge<br>[2420, 2465, 0]"]
+  99["Sweep RevolveAboutEdge<br>[2416, 2461, 0]"]
   100[Wall]
   101[Wall]
   102[Wall]
@@ -132,7 +132,7 @@ flowchart LR
   108["SweepEdge Adjacent"]
   109["SweepEdge Opposite"]
   110["SweepEdge Adjacent"]
-  111["StartSketchOnFace<br>[308, 347, 0]"]
+  111["StartSketchOnFace<br>[306, 345, 0]"]
   1 --- 2
   2 --- 3
   2 --- 4

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

@@ -20,13 +20,20 @@ description: Result of parsing crazy_multi_profile.kcl
           "init": {
             "arguments": [
               {
+                "abs_path": false,
                 "commentStart": 0,
                 "end": 0,
-                "raw": "'XZ'",
+                "name": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": "XZ",
                   "start": 0,
-                "type": "Literal",
-                "type": "Literal",
-                "value": "XZ"
+                  "type": "Identifier"
+                },
+                "path": [],
+                "start": 0,
+                "type": "Name",
+                "type": "Name"
               }
             ],
             "callee": {
@@ -2561,13 +2568,28 @@ description: Result of parsing crazy_multi_profile.kcl
           "init": {
             "arguments": [
               {
+                "argument": {
+                  "abs_path": false,
                   "commentStart": 0,
                   "end": 0,
-                "raw": "'-XZ'",
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "XZ",
                     "start": 0,
-                "type": "Literal",
-                "type": "Literal",
-                "value": "-XZ"
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                },
+                "commentStart": 0,
+                "end": 0,
+                "operator": "-",
+                "start": 0,
+                "type": "UnaryExpression",
+                "type": "UnaryExpression"
               }
             ],
             "callee": {

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

@@ -1,4 +1,4 @@
-sketch001 = startSketchOn('XZ')
+sketch001 = startSketchOn(XZ)
 profile001 = startProfileAt([6.71, -3.66], sketch001)
   |> line(end = [2.65, 9.02], tag = $seg02)
   |> line(end = [3.73, -9.36], tag = $seg01)
@@ -28,7 +28,7 @@ profile006 = startProfileAt([9.65, 3.82], sketch002)
   |> close()
 revolve001 = revolve(profile004, angle = 45, axis = getNextAdjacentEdge(seg01))
 extrude002 = extrude(profile006, length = 4)
-sketch003 = startSketchOn('-XZ')
+sketch003 = startSketchOn(-XZ)
 profile007 = startProfileAt([4.8, 7.55], sketch003)
   |> line(end = [7.39, 2.58])
   |> line(end = [7.02, -2.85])

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

@@ -7,8 +7,8 @@ description: Operations executed crazy_multi_profile.kcl
     "labeledArgs": {
       "planeOrSolid": {
         "value": {
-          "type": "String",
-          "value": "XZ"
+          "type": "Plane",
+          "artifact_id": "[uuid]"
         },
         "sourceRange": []
       }
@@ -154,8 +154,8 @@ description: Operations executed crazy_multi_profile.kcl
     "labeledArgs": {
       "planeOrSolid": {
         "value": {
-          "type": "String",
-          "value": "-XZ"
+          "type": "Plane",
+          "artifact_id": "[uuid]"
         },
         "sourceRange": []
       }

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

@@ -15,9 +15,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 122,
-            "end": 128,
-            "start": 122,
+            "commentStart": 120,
+            "end": 126,
+            "start": 120,
             "type": "TagDeclarator",
             "value": "seg02"
           },
@@ -28,9 +28,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 167,
-            "end": 173,
-            "start": 167,
+            "commentStart": 165,
+            "end": 171,
+            "start": 165,
             "type": "TagDeclarator",
             "value": "seg01"
           },
@@ -58,9 +58,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               -3.66
             ],
             "tag": {
-              "commentStart": 122,
-              "end": 128,
-              "start": 122,
+              "commentStart": 120,
+              "end": 126,
+              "start": 120,
               "type": "TagDeclarator",
               "value": "seg02"
             },
@@ -83,9 +83,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               5.36
             ],
             "tag": {
-              "commentStart": 167,
-              "end": 173,
-              "start": 167,
+              "commentStart": 165,
+              "end": 171,
+              "start": 165,
               "type": "TagDeclarator",
               "value": "seg01"
             },
@@ -165,14 +165,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": -1.0,
-            "z": 0.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -349,14 +341,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               "type": "Mm"
             }
           },
-          "zAxis": {
-            "x": 0.0,
-            "y": -1.0,
-            "z": 0.0,
-            "units": {
-              "type": "Mm"
-            }
-          },
           "solid": {
             "type": "Solid",
             "id": "[uuid]",
@@ -367,9 +351,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                 "id": "[uuid]",
                 "sourceRange": [],
                 "tag": {
-                  "commentStart": 122,
-                  "end": 128,
-                  "start": 122,
+                  "commentStart": 120,
+                  "end": 126,
+                  "start": 120,
                   "type": "TagDeclarator",
                   "value": "seg02"
                 },
@@ -380,9 +364,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                 "id": "[uuid]",
                 "sourceRange": [],
                 "tag": {
-                  "commentStart": 167,
-                  "end": 173,
-                  "start": 167,
+                  "commentStart": 165,
+                  "end": 171,
+                  "start": 165,
                   "type": "TagDeclarator",
                   "value": "seg01"
                 },
@@ -410,9 +394,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                     -3.66
                   ],
                   "tag": {
-                    "commentStart": 122,
-                    "end": 128,
-                    "start": 122,
+                    "commentStart": 120,
+                    "end": 126,
+                    "start": 120,
                     "type": "TagDeclarator",
                     "value": "seg02"
                   },
@@ -435,9 +419,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                     5.36
                   ],
                   "tag": {
-                    "commentStart": 167,
-                    "end": 173,
-                    "start": 167,
+                    "commentStart": 165,
+                    "end": 171,
+                    "start": 165,
                     "type": "TagDeclarator",
                     "value": "seg01"
                   },
@@ -517,14 +501,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   "units": {
                     "type": "Mm"
                   }
-                },
-                "zAxis": {
-                  "x": 0.0,
-                  "y": -1.0,
-                  "z": 0.0,
-                  "units": {
-                    "type": "Mm"
-                  }
                 }
               },
               "start": {
@@ -618,9 +594,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "id": "[uuid]",
           "sourceRange": [],
           "tag": {
-            "commentStart": 2094,
-            "end": 2115,
-            "start": 2094,
+            "commentStart": 2090,
+            "end": 2111,
+            "start": 2090,
             "type": "TagDeclarator",
             "value": "rectangleSegmentA002"
           },
@@ -662,9 +638,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               -6.39
             ],
             "tag": {
-              "commentStart": 2094,
-              "end": 2115,
-              "start": 2094,
+              "commentStart": 2090,
+              "end": 2111,
+              "start": 2090,
               "type": "TagDeclarator",
               "value": "rectangleSegmentA002"
             },
@@ -782,14 +758,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 1.0,
-            "z": 0.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -847,9 +815,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             -3.66
           ],
           "tag": {
-            "commentStart": 122,
-            "end": 128,
-            "start": 122,
+            "commentStart": 120,
+            "end": 126,
+            "start": 120,
             "type": "TagDeclarator",
             "value": "seg02"
           },
@@ -872,9 +840,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             5.36
           ],
           "tag": {
-            "commentStart": 167,
-            "end": 173,
-            "start": 167,
+            "commentStart": 165,
+            "end": 171,
+            "start": 165,
             "type": "TagDeclarator",
             "value": "seg01"
           },
@@ -954,14 +922,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": -1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -1065,14 +1025,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "type": "Mm"
           }
         },
-        "zAxis": {
-          "x": 0.0,
-          "y": -1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
-        },
         "solid": {
           "type": "Solid",
           "id": "[uuid]",
@@ -1083,9 +1035,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 122,
-                "end": 128,
-                "start": 122,
+                "commentStart": 120,
+                "end": 126,
+                "start": 120,
                 "type": "TagDeclarator",
                 "value": "seg02"
               },
@@ -1096,9 +1048,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 167,
-                "end": 173,
-                "start": 167,
+                "commentStart": 165,
+                "end": 171,
+                "start": 165,
                 "type": "TagDeclarator",
                 "value": "seg01"
               },
@@ -1126,9 +1078,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   -3.66
                 ],
                 "tag": {
-                  "commentStart": 122,
-                  "end": 128,
-                  "start": 122,
+                  "commentStart": 120,
+                  "end": 126,
+                  "start": 120,
                   "type": "TagDeclarator",
                   "value": "seg02"
                 },
@@ -1151,9 +1103,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   5.36
                 ],
                 "tag": {
-                  "commentStart": 167,
-                  "end": 173,
-                  "start": 167,
+                  "commentStart": 165,
+                  "end": 171,
+                  "start": 165,
                   "type": "TagDeclarator",
                   "value": "seg01"
                 },
@@ -1233,14 +1185,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": -1.0,
-                "z": 0.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -1330,9 +1274,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             13.3
           ],
           "tag": {
-            "commentStart": 564,
-            "end": 585,
-            "start": 564,
+            "commentStart": 562,
+            "end": 583,
+            "start": 562,
             "type": "TagDeclarator",
             "value": "rectangleSegmentA001"
           },
@@ -1443,14 +1387,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "type": "Mm"
           }
         },
-        "zAxis": {
-          "x": 0.0,
-          "y": -1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
-        },
         "solid": {
           "type": "Solid",
           "id": "[uuid]",
@@ -1461,9 +1397,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 122,
-                "end": 128,
-                "start": 122,
+                "commentStart": 120,
+                "end": 126,
+                "start": 120,
                 "type": "TagDeclarator",
                 "value": "seg02"
               },
@@ -1474,9 +1410,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 167,
-                "end": 173,
-                "start": 167,
+                "commentStart": 165,
+                "end": 171,
+                "start": 165,
                 "type": "TagDeclarator",
                 "value": "seg01"
               },
@@ -1504,9 +1440,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   -3.66
                 ],
                 "tag": {
-                  "commentStart": 122,
-                  "end": 128,
-                  "start": 122,
+                  "commentStart": 120,
+                  "end": 126,
+                  "start": 120,
                   "type": "TagDeclarator",
                   "value": "seg02"
                 },
@@ -1529,9 +1465,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   5.36
                 ],
                 "tag": {
-                  "commentStart": 167,
-                  "end": 173,
-                  "start": 167,
+                  "commentStart": 165,
+                  "end": 171,
+                  "start": 165,
                   "type": "TagDeclarator",
                   "value": "seg01"
                 },
@@ -1611,14 +1547,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": -1.0,
-                "z": 0.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -1802,14 +1730,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "type": "Mm"
           }
         },
-        "zAxis": {
-          "x": 0.0,
-          "y": -1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
-        },
         "solid": {
           "type": "Solid",
           "id": "[uuid]",
@@ -1820,9 +1740,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 122,
-                "end": 128,
-                "start": 122,
+                "commentStart": 120,
+                "end": 126,
+                "start": 120,
                 "type": "TagDeclarator",
                 "value": "seg02"
               },
@@ -1833,9 +1753,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 167,
-                "end": 173,
-                "start": 167,
+                "commentStart": 165,
+                "end": 171,
+                "start": 165,
                 "type": "TagDeclarator",
                 "value": "seg01"
               },
@@ -1863,9 +1783,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   -3.66
                 ],
                 "tag": {
-                  "commentStart": 122,
-                  "end": 128,
-                  "start": 122,
+                  "commentStart": 120,
+                  "end": 126,
+                  "start": 120,
                   "type": "TagDeclarator",
                   "value": "seg02"
                 },
@@ -1888,9 +1808,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   5.36
                 ],
                 "tag": {
-                  "commentStart": 167,
-                  "end": 173,
-                  "start": 167,
+                  "commentStart": 165,
+                  "end": 171,
+                  "start": 165,
                   "type": "TagDeclarator",
                   "value": "seg01"
                 },
@@ -1970,14 +1890,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": -1.0,
-                "z": 0.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -2104,14 +2016,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "type": "Mm"
           }
         },
-        "zAxis": {
-          "x": 0.0,
-          "y": -1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
-        },
         "solid": {
           "type": "Solid",
           "id": "[uuid]",
@@ -2122,9 +2026,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 122,
-                "end": 128,
-                "start": 122,
+                "commentStart": 120,
+                "end": 126,
+                "start": 120,
                 "type": "TagDeclarator",
                 "value": "seg02"
               },
@@ -2135,9 +2039,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 167,
-                "end": 173,
-                "start": 167,
+                "commentStart": 165,
+                "end": 171,
+                "start": 165,
                 "type": "TagDeclarator",
                 "value": "seg01"
               },
@@ -2165,9 +2069,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   -3.66
                 ],
                 "tag": {
-                  "commentStart": 122,
-                  "end": 128,
-                  "start": 122,
+                  "commentStart": 120,
+                  "end": 126,
+                  "start": 120,
                   "type": "TagDeclarator",
                   "value": "seg02"
                 },
@@ -2190,9 +2094,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   5.36
                 ],
                 "tag": {
-                  "commentStart": 167,
-                  "end": 173,
-                  "start": 167,
+                  "commentStart": 165,
+                  "end": 171,
+                  "start": 165,
                   "type": "TagDeclarator",
                   "value": "seg01"
                 },
@@ -2272,14 +2176,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": -1.0,
-                "z": 0.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -2457,14 +2353,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "type": "Mm"
           }
         },
-        "zAxis": {
-          "x": 0.0,
-          "y": -1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
-        },
         "solid": {
           "type": "Solid",
           "id": "[uuid]",
@@ -2475,9 +2363,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 122,
-                "end": 128,
-                "start": 122,
+                "commentStart": 120,
+                "end": 126,
+                "start": 120,
                 "type": "TagDeclarator",
                 "value": "seg02"
               },
@@ -2488,9 +2376,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               "id": "[uuid]",
               "sourceRange": [],
               "tag": {
-                "commentStart": 167,
-                "end": 173,
-                "start": 167,
+                "commentStart": 165,
+                "end": 171,
+                "start": 165,
                 "type": "TagDeclarator",
                 "value": "seg01"
               },
@@ -2518,9 +2406,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   -3.66
                 ],
                 "tag": {
-                  "commentStart": 122,
-                  "end": 128,
-                  "start": 122,
+                  "commentStart": 120,
+                  "end": 126,
+                  "start": 120,
                   "type": "TagDeclarator",
                   "value": "seg02"
                 },
@@ -2543,9 +2431,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   5.36
                 ],
                 "tag": {
-                  "commentStart": 167,
-                  "end": 173,
-                  "start": 167,
+                  "commentStart": 165,
+                  "end": 171,
+                  "start": 165,
                   "type": "TagDeclarator",
                   "value": "seg01"
                 },
@@ -2625,14 +2513,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": -1.0,
-                "z": 0.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -2779,14 +2659,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -2925,14 +2797,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -3071,14 +2935,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -3166,14 +3022,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -3217,9 +3065,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             -6.39
           ],
           "tag": {
-            "commentStart": 2094,
-            "end": 2115,
-            "start": 2094,
+            "commentStart": 2090,
+            "end": 2111,
+            "start": 2090,
             "type": "TagDeclarator",
             "value": "rectangleSegmentA002"
           },
@@ -3337,14 +3185,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -3497,14 +3337,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               "type": "Mm"
             }
           },
-          "zAxis": {
-            "x": 0.0,
-            "y": -1.0,
-            "z": 0.0,
-            "units": {
-              "type": "Mm"
-            }
-          },
           "solid": {
             "type": "Solid",
             "id": "[uuid]",
@@ -3515,9 +3347,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                 "id": "[uuid]",
                 "sourceRange": [],
                 "tag": {
-                  "commentStart": 122,
-                  "end": 128,
-                  "start": 122,
+                  "commentStart": 120,
+                  "end": 126,
+                  "start": 120,
                   "type": "TagDeclarator",
                   "value": "seg02"
                 },
@@ -3528,9 +3360,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                 "id": "[uuid]",
                 "sourceRange": [],
                 "tag": {
-                  "commentStart": 167,
-                  "end": 173,
-                  "start": 167,
+                  "commentStart": 165,
+                  "end": 171,
+                  "start": 165,
                   "type": "TagDeclarator",
                   "value": "seg01"
                 },
@@ -3558,9 +3390,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                     -3.66
                   ],
                   "tag": {
-                    "commentStart": 122,
-                    "end": 128,
-                    "start": 122,
+                    "commentStart": 120,
+                    "end": 126,
+                    "start": 120,
                     "type": "TagDeclarator",
                     "value": "seg02"
                   },
@@ -3583,9 +3415,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                     5.36
                   ],
                   "tag": {
-                    "commentStart": 167,
-                    "end": 173,
-                    "start": 167,
+                    "commentStart": 165,
+                    "end": 171,
+                    "start": 165,
                     "type": "TagDeclarator",
                     "value": "seg01"
                   },
@@ -3665,14 +3497,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   "units": {
                     "type": "Mm"
                   }
-                },
-                "zAxis": {
-                  "x": 0.0,
-                  "y": -1.0,
-                  "z": 0.0,
-                  "units": {
-                    "type": "Mm"
-                  }
                 }
               },
               "start": {
@@ -3892,14 +3716,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 1.0,
-            "z": 0.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -3974,14 +3790,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
         "units": {
           "type": "Mm"
         }
-      },
-      "zAxis": {
-        "x": 0.0,
-        "y": -1.0,
-        "z": 0.0,
-        "units": {
-          "type": "Mm"
-        }
       }
     }
   },
@@ -4007,14 +3815,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "type": "Mm"
         }
       },
-      "zAxis": {
-        "x": 0.0,
-        "y": -1.0,
-        "z": 0.0,
-        "units": {
-          "type": "Mm"
-        }
-      },
       "solid": {
         "type": "Solid",
         "id": "[uuid]",
@@ -4025,9 +3825,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "id": "[uuid]",
             "sourceRange": [],
             "tag": {
-              "commentStart": 122,
-              "end": 128,
-              "start": 122,
+              "commentStart": 120,
+              "end": 126,
+              "start": 120,
               "type": "TagDeclarator",
               "value": "seg02"
             },
@@ -4038,9 +3838,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "id": "[uuid]",
             "sourceRange": [],
             "tag": {
-              "commentStart": 167,
-              "end": 173,
-              "start": 167,
+              "commentStart": 165,
+              "end": 171,
+              "start": 165,
               "type": "TagDeclarator",
               "value": "seg01"
             },
@@ -4068,9 +3868,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                 -3.66
               ],
               "tag": {
-                "commentStart": 122,
-                "end": 128,
-                "start": 122,
+                "commentStart": 120,
+                "end": 126,
+                "start": 120,
                 "type": "TagDeclarator",
                 "value": "seg02"
               },
@@ -4093,9 +3893,9 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                 5.36
               ],
               "tag": {
-                "commentStart": 167,
-                "end": 173,
-                "start": 167,
+                "commentStart": 165,
+                "end": 171,
+                "start": 165,
                 "type": "TagDeclarator",
                 "value": "seg01"
               },
@@ -4175,14 +3975,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               "units": {
                 "type": "Mm"
               }
-            },
-            "zAxis": {
-              "x": 0.0,
-              "y": -1.0,
-              "z": 0.0,
-              "units": {
-                "type": "Mm"
-              }
             }
           },
           "start": {
@@ -4261,14 +4053,6 @@ description: Variables in memory after executing crazy_multi_profile.kcl
         "units": {
           "type": "Mm"
         }
-      },
-      "zAxis": {
-        "x": 0.0,
-        "y": 1.0,
-        "z": 0.0,
-        "units": {
-          "type": "Mm"
-        }
       }
     }
   }

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

@@ -170,14 +170,6 @@ description: Variables in memory after executing cube.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {

rust/kcl-lib/tests/fillet-and-shell/program_memory.snap

@@ -209,14 +209,6 @@ description: Variables in memory after executing fillet-and-shell.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -608,14 +600,6 @@ description: Variables in memory after executing fillet-and-shell.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {

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

@@ -92,14 +92,6 @@ description: Variables in memory after executing flush_batch_on_end.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -225,14 +217,6 @@ description: Variables in memory after executing flush_batch_on_end.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -351,14 +335,6 @@ description: Variables in memory after executing flush_batch_on_end.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -466,14 +442,6 @@ description: Variables in memory after executing flush_batch_on_end.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -536,14 +504,6 @@ description: Variables in memory after executing flush_batch_on_end.kcl
         "units": {
           "type": "Mm"
         }
-      },
-      "zAxis": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 1.0,
-        "units": {
-          "type": "Mm"
-        }
       }
     }
   }

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

@@ -151,14 +151,6 @@ description: Variables in memory after executing function_sketch.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {

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

@@ -151,14 +151,6 @@ description: Variables in memory after executing function_sketch_with_position.k
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {

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

@@ -82,14 +82,6 @@ description: Variables in memory after executing helix_simple.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": -1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {

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

@@ -573,14 +573,6 @@ description: Variables in memory after executing i_shape.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -1422,14 +1414,6 @@ description: Variables in memory after executing i_shape.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -1704,14 +1688,6 @@ description: Variables in memory after executing i_shape.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {

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

@@ -76,14 +76,6 @@ description: Variables in memory after executing import_whole.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {

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

@@ -151,14 +151,6 @@ description: Variables in memory after executing intersect_cubes.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -339,14 +331,6 @@ description: Variables in memory after executing intersect_cubes.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -527,14 +511,6 @@ description: Variables in memory after executing intersect_cubes.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {

rust/kcl-lib/tests/kcl_samples/80-20-rail/artifact_commands.snap

@@ -66,7 +66,7 @@ description: Artifact commands 80-20-rail.kcl
       "planar_normal": {
         "x": 0.0,
         "y": 1.0,
-        "z": 0.0
+        "z": -0.0
       }
     }
   },
@@ -1365,7 +1365,7 @@ description: Artifact commands 80-20-rail.kcl
       "planar_normal": {
         "x": 0.0,
         "y": 1.0,
-        "z": 0.0
+        "z": -0.0
       }
     }
   },
@@ -1459,7 +1459,7 @@ description: Artifact commands 80-20-rail.kcl
       "planar_normal": {
         "x": 0.0,
         "y": 1.0,
-        "z": 0.0
+        "z": -0.0
       }
     }
   },

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

@@ -757,6 +757,15 @@ description: Operations executed axial-fan.kcl
     "sourceRange": []
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -775,16 +784,7 @@ description: Operations executed axial-fan.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -883,6 +883,15 @@ description: Operations executed axial-fan.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -901,16 +910,7 @@ description: Operations executed axial-fan.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -1088,6 +1088,15 @@ description: Operations executed axial-fan.kcl
     "sourceRange": []
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -1106,16 +1115,7 @@ description: Operations executed axial-fan.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -1138,8 +1138,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1174,8 +1174,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1210,8 +1210,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1246,8 +1246,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1282,8 +1282,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1318,8 +1318,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1354,8 +1354,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1390,8 +1390,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1426,8 +1426,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1462,8 +1462,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1498,8 +1498,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1534,8 +1534,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1583,6 +1583,15 @@ description: Operations executed axial-fan.kcl
     "sourceRange": []
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -1601,16 +1610,7 @@ description: Operations executed axial-fan.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -1633,8 +1633,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1669,8 +1669,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1705,8 +1705,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1741,8 +1741,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1777,8 +1777,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1813,8 +1813,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1849,8 +1849,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1885,8 +1885,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1921,8 +1921,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1957,8 +1957,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1993,8 +1993,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -2029,8 +2029,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -2078,6 +2078,15 @@ description: Operations executed axial-fan.kcl
     "sourceRange": []
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -2096,16 +2105,7 @@ description: Operations executed axial-fan.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -2128,8 +2128,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -2164,8 +2164,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -2200,8 +2200,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -2236,8 +2236,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -2272,8 +2272,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -2308,8 +2308,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -2344,8 +2344,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -2380,8 +2380,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -2416,8 +2416,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -2452,8 +2452,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -2488,8 +2488,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -2524,8 +2524,8 @@ description: Operations executed axial-fan.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,

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

@@ -4,6 +4,15 @@ description: Operations executed ball-bearing.kcl
 ---
 [
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -22,16 +31,7 @@ description: Operations executed ball-bearing.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -382,8 +382,8 @@ description: Operations executed ball-bearing.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -924,6 +924,15 @@ description: Operations executed ball-bearing.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -942,16 +951,7 @@ description: Operations executed ball-bearing.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {

rust/kcl-lib/tests/kcl_samples/bench/artifact_commands.snap

@@ -35,7 +35,7 @@ description: Artifact commands bench.kcl
     "command": {
       "type": "make_plane",
       "origin": {
-        "x": -28.0,
+        "x": 28.0,
         "y": 0.0,
         "z": 0.0
       },
@@ -74,7 +74,7 @@ description: Artifact commands bench.kcl
     "command": {
       "type": "make_plane",
       "origin": {
-        "x": 28.0,
+        "x": -28.0,
         "y": 0.0,
         "z": 0.0
       },
@@ -1994,9 +1994,9 @@ description: Artifact commands bench.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": -1.0,
-        "y": -0.0,
-        "z": -0.0
+        "x": 1.0,
+        "y": 0.0,
+        "z": 0.0
       }
     }
   },
@@ -2385,9 +2385,9 @@ description: Artifact commands bench.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": -1.0,
-        "y": -0.0,
-        "z": -0.0
+        "x": 1.0,
+        "y": 0.0,
+        "z": 0.0
       }
     }
   },
@@ -2836,9 +2836,9 @@ description: Artifact commands bench.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": -1.0,
-        "y": -0.0,
-        "z": -0.0
+        "x": 1.0,
+        "y": 0.0,
+        "z": 0.0
       }
     }
   },
@@ -3227,9 +3227,9 @@ description: Artifact commands bench.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": -1.0,
-        "y": -0.0,
-        "z": -0.0
+        "x": 1.0,
+        "y": 0.0,
+        "z": 0.0
       }
     }
   },
@@ -7414,7 +7414,7 @@ description: Artifact commands bench.kcl
     "command": {
       "type": "make_plane",
       "origin": {
-        "x": -28.0,
+        "x": 28.0,
         "y": 0.0,
         "z": 0.0
       },
@@ -7457,9 +7457,9 @@ description: Artifact commands bench.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": -1.0,
-        "y": -0.0,
-        "z": -0.0
+        "x": 1.0,
+        "y": 0.0,
+        "z": 0.0
       }
     }
   },
@@ -7543,7 +7543,7 @@ description: Artifact commands bench.kcl
         "z": 0.0
       },
       "x_axis": {
-        "x": 1.0,
+        "x": -1.0,
         "y": 0.0,
         "z": 0.0
       },
@@ -7581,7 +7581,7 @@ description: Artifact commands bench.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": -0.0,
+        "x": 0.0,
         "y": 1.0,
         "z": -0.0
       }
@@ -7601,7 +7601,7 @@ description: Artifact commands bench.kcl
       "type": "move_path_pen",
       "path": "[uuid]",
       "to": {
-        "x": 28.0,
+        "x": -28.0,
         "y": 32.4,
         "z": 0.0
       }
@@ -7907,7 +7907,7 @@ description: Artifact commands bench.kcl
     "command": {
       "type": "make_plane",
       "origin": {
-        "x": 28.0,
+        "x": -28.0,
         "y": 0.0,
         "z": 0.0
       },
@@ -7950,9 +7950,9 @@ description: Artifact commands bench.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": -1.0,
-        "y": -0.0,
-        "z": -0.0
+        "x": 1.0,
+        "y": 0.0,
+        "z": 0.0
       }
     }
   },
@@ -8036,7 +8036,7 @@ description: Artifact commands bench.kcl
         "z": 0.0
       },
       "x_axis": {
-        "x": 1.0,
+        "x": -1.0,
         "y": 0.0,
         "z": 0.0
       },
@@ -8074,7 +8074,7 @@ description: Artifact commands bench.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": -0.0,
+        "x": 0.0,
         "y": 1.0,
         "z": -0.0
       }
@@ -8094,7 +8094,7 @@ description: Artifact commands bench.kcl
       "type": "move_path_pen",
       "path": "[uuid]",
       "to": {
-        "x": -28.0,
+        "x": 28.0,
         "y": 32.4,
         "z": 0.0
       }

rust/kcl-lib/tests/kcl_samples/bench/artifact_graph_flowchart.snap.md

@@ -360,7 +360,7 @@ flowchart LR
   172["SweepEdge Adjacent"]
   173["SweepEdge Opposite"]
   174["SweepEdge Adjacent"]
-  175["Plane<br>[823, 865, 0]"]
+  175["Plane<br>[823, 864, 0]"]
   199["Sweep Extrusion<br>[1460, 1498, 6]"]
   200[Wall]
   201[Wall]
@@ -487,7 +487,7 @@ flowchart LR
   345["SweepEdge Adjacent"]
   346["SweepEdge Opposite"]
   347["SweepEdge Adjacent"]
-  348["Plane<br>[875, 916, 0]"]
+  348["Plane<br>[874, 916, 0]"]
   372["Sweep Extrusion<br>[1460, 1498, 6]"]
   373[Wall]
   374[Wall]
@@ -706,7 +706,7 @@ flowchart LR
   648["Sweep Extrusion<br>[3156, 3180, 6]"]
   649["Plane<br>[3780, 3815, 6]"]
   653["Plane<br>[3846, 3875, 6]"]
-  663["Sweep Sweep<br>[3887, 3914, 6]"]
+  663["Sweep Sweep<br>[3888, 3915, 6]"]
   664[Wall]
   665[Wall]
   666[Wall]
@@ -732,7 +732,7 @@ flowchart LR
   686["SweepEdge Adjacent"]
   687["Plane<br>[3780, 3815, 6]"]
   691["Plane<br>[3846, 3875, 6]"]
-  701["Sweep Sweep<br>[3887, 3914, 6]"]
+  701["Sweep Sweep<br>[3888, 3915, 6]"]
   702[Wall]
   703[Wall]
   704[Wall]
@@ -1085,66 +1085,66 @@ flowchart LR
   176 --- 197
   176 ---- 199
   176 --- 198
-  177 --- 219
-  177 --- 260
-  177 --- 261
-  178 --- 218
-  178 --- 258
-  178 --- 259
-  179 --- 217
-  179 --- 256
-  179 --- 257
-  180 --- 216
-  180 --- 254
-  180 --- 255
-  181 --- 215
-  181 --- 252
-  181 --- 253
-  182 --- 214
-  182 --- 250
-  182 --- 251
-  183 --- 213
-  183 --- 248
-  183 --- 249
-  184 --- 212
-  184 --- 246
-  184 --- 247
-  185 --- 211
-  185 --- 244
-  185 --- 245
-  186 --- 210
-  186 --- 242
-  186 --- 243
-  187 --- 209
-  187 --- 240
-  187 --- 241
-  188 --- 208
-  188 --- 238
-  188 --- 239
-  189 --- 207
-  189 --- 236
-  189 --- 237
-  190 --- 206
-  190 --- 234
-  190 --- 235
-  191 --- 205
-  191 --- 232
-  191 --- 233
-  192 --- 204
-  192 --- 230
-  192 --- 231
-  193 --- 203
-  193 --- 228
-  193 --- 229
-  194 --- 202
-  194 --- 226
-  194 --- 227
-  195 --- 201
-  195 --- 224
-  195 --- 225
-  196 --- 200
-  196 --- 222
-  196 --- 223
+  177 --- 200
+  177 --- 222
+  177 --- 223
+  178 --- 201
+  178 --- 224
+  178 --- 225
+  179 --- 202
+  179 --- 226
+  179 --- 227
+  180 --- 203
+  180 --- 228
+  180 --- 229
+  181 --- 204
+  181 --- 230
+  181 --- 231
+  182 --- 205
+  182 --- 232
+  182 --- 233
+  183 --- 206
+  183 --- 234
+  183 --- 235
+  184 --- 207
+  184 --- 236
+  184 --- 237
+  185 --- 208
+  185 --- 238
+  185 --- 239
+  186 --- 209
+  186 --- 240
+  186 --- 241
+  187 --- 210
+  187 --- 242
+  187 --- 243
+  188 --- 211
+  188 --- 244
+  188 --- 245
+  189 --- 212
+  189 --- 246
+  189 --- 247
+  190 --- 213
+  190 --- 248
+  190 --- 249
+  191 --- 214
+  191 --- 250
+  191 --- 251
+  192 --- 215
+  192 --- 252
+  192 --- 253
+  193 --- 216
+  193 --- 254
+  193 --- 255
+  194 --- 217
+  194 --- 256
+  194 --- 257
+  195 --- 218
+  195 --- 258
+  195 --- 259
+  196 --- 219
+  196 --- 260
+  196 --- 261
   199 --- 200
   199 --- 201
   199 --- 202
@@ -1230,66 +1230,66 @@ flowchart LR
   262 --- 283
   262 ---- 285
   262 --- 284
-  263 --- 305
-  263 --- 346
-  263 --- 347
-  264 --- 304
-  264 --- 344
-  264 --- 345
-  265 --- 303
-  265 --- 342
-  265 --- 343
-  266 --- 302
-  266 --- 340
-  266 --- 341
-  267 --- 301
-  267 --- 338
-  267 --- 339
-  268 --- 300
-  268 --- 336
-  268 --- 337
-  269 --- 299
-  269 --- 334
-  269 --- 335
-  270 --- 298
-  270 --- 332
-  270 --- 333
-  271 --- 297
-  271 --- 330
-  271 --- 331
-  272 --- 296
-  272 --- 328
-  272 --- 329
-  273 --- 295
-  273 --- 326
-  273 --- 327
-  274 --- 294
-  274 --- 324
-  274 --- 325
-  275 --- 293
-  275 --- 322
-  275 --- 323
-  276 --- 292
-  276 --- 320
-  276 --- 321
-  277 --- 291
-  277 --- 318
-  277 --- 319
-  278 --- 290
-  278 --- 316
-  278 --- 317
-  279 --- 289
-  279 --- 314
-  279 --- 315
-  280 --- 288
-  280 --- 312
-  280 --- 313
-  281 --- 287
-  281 --- 310
-  281 --- 311
-  282 --- 286
-  282 --- 308
-  282 --- 309
+  263 --- 286
+  263 --- 308
+  263 --- 309
+  264 --- 287
+  264 --- 310
+  264 --- 311
+  265 --- 288
+  265 --- 312
+  265 --- 313
+  266 --- 289
+  266 --- 314
+  266 --- 315
+  267 --- 290
+  267 --- 316
+  267 --- 317
+  268 --- 291
+  268 --- 318
+  268 --- 319
+  269 --- 292
+  269 --- 320
+  269 --- 321
+  270 --- 293
+  270 --- 322
+  270 --- 323
+  271 --- 294
+  271 --- 324
+  271 --- 325
+  272 --- 295
+  272 --- 326
+  272 --- 327
+  273 --- 296
+  273 --- 328
+  273 --- 329
+  274 --- 297
+  274 --- 330
+  274 --- 331
+  275 --- 298
+  275 --- 332
+  275 --- 333
+  276 --- 299
+  276 --- 334
+  276 --- 335
+  277 --- 300
+  277 --- 336
+  277 --- 337
+  278 --- 301
+  278 --- 338
+  278 --- 339
+  279 --- 302
+  279 --- 340
+  279 --- 341
+  280 --- 303
+  280 --- 342
+  280 --- 343
+  281 --- 304
+  281 --- 344
+  281 --- 345
+  282 --- 305
+  282 --- 346
+  282 --- 347
   285 --- 286
   285 --- 287
   285 --- 288

rust/kcl-lib/tests/kcl_samples/bench/ast.snap

@@ -353,7 +353,6 @@ description: Result of parsing bench.kcl
               "type": "CallExpressionKw",
               "type": "CallExpressionKw",
               "unlabeled": {
-                "argument": {
                 "abs_path": false,
                 "commentStart": 0,
                 "end": 0,
@@ -368,13 +367,6 @@ description: Result of parsing bench.kcl
                 "start": 0,
                 "type": "Name",
                 "type": "Name"
-                },
-                "commentStart": 0,
-                "end": 0,
-                "operator": "-",
-                "start": 0,
-                "type": "UnaryExpression",
-                "type": "UnaryExpression"
               }
             }
           ],
@@ -423,6 +415,7 @@ description: Result of parsing bench.kcl
                     "commentStart": 0,
                     "end": 0,
                     "left": {
+                      "argument": {
                         "abs_path": false,
                         "commentStart": 0,
                         "end": 0,
@@ -438,6 +431,13 @@ description: Result of parsing bench.kcl
                         "type": "Name",
                         "type": "Name"
                       },
+                      "commentStart": 0,
+                      "end": 0,
+                      "operator": "-",
+                      "start": 0,
+                      "type": "UnaryExpression",
+                      "type": "UnaryExpression"
+                    },
                     "operator": "/",
                     "right": {
                       "commentStart": 0,
@@ -1100,7 +1100,6 @@ description: Result of parsing bench.kcl
         "expression": {
           "arguments": [
             {
-              "argument": {
               "abs_path": false,
               "commentStart": 0,
               "end": 0,
@@ -1116,13 +1115,6 @@ description: Result of parsing bench.kcl
               "type": "Name",
               "type": "Name"
             },
-              "commentStart": 0,
-              "end": 0,
-              "operator": "-",
-              "start": 0,
-              "type": "UnaryExpression",
-              "type": "UnaryExpression"
-            },
             {
               "commentStart": 0,
               "end": 0,
@@ -1196,7 +1188,6 @@ description: Result of parsing bench.kcl
         "expression": {
           "arguments": [
             {
-              "argument": {
               "abs_path": false,
               "commentStart": 0,
               "end": 0,
@@ -1212,13 +1203,6 @@ description: Result of parsing bench.kcl
               "type": "Name",
               "type": "Name"
             },
-              "commentStart": 0,
-              "end": 0,
-              "operator": "-",
-              "start": 0,
-              "type": "UnaryExpression",
-              "type": "UnaryExpression"
-            },
             {
               "commentStart": 0,
               "end": 0,

rust/kcl-lib/tests/kcl_samples/bench/ops.snap

@@ -240,6 +240,15 @@ description: Operations executed bench.kcl
     "type": "GroupEnd"
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -258,16 +267,7 @@ description: Operations executed bench.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "type": "GroupBegin",
@@ -506,272 +506,15 @@ description: Operations executed bench.kcl
     "type": "GroupEnd"
   },
   {
-    "labeledArgs": {
-      "offset": {
-        "value": {
-          "type": "Number",
-          "value": 28.0,
-          "ty": {
-            "type": "Default",
-            "len": {
-              "type": "Mm"
-            },
-            "angle": {
-              "type": "Degrees"
-            }
-          }
-        },
-        "sourceRange": []
-      }
-    },
+    "type": "KclStdLibCall",
     "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
     "unlabeledArg": {
       "value": {
         "type": "Plane",
         "artifact_id": "[uuid]"
       },
       "sourceRange": []
-    }
     },
-  {
-    "type": "GroupBegin",
-    "group": {
-      "type": "FunctionCall",
-      "name": "divider",
-      "functionSourceRange": [
-        1412,
-        1683,
-        6
-      ],
-      "unlabeledArg": null,
-      "labeledArgs": {}
-    },
-    "sourceRange": []
-  },
-  {
-    "type": "GroupBegin",
-    "group": {
-      "type": "FunctionCall",
-      "name": "dividerSketch",
-      "functionSourceRange": [
-        309,
-        1393,
-        6
-      ],
-      "unlabeledArg": null,
-      "labeledArgs": {}
-    },
-    "sourceRange": []
-  },
-  {
-    "labeledArgs": {
-      "planeOrSolid": {
-        "value": {
-          "type": "Plane",
-          "artifact_id": "[uuid]"
-        },
-        "sourceRange": []
-      }
-    },
-    "name": "startSketchOn",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": null
-  },
-  {
-    "type": "GroupEnd"
-  },
-  {
-    "labeledArgs": {
-      "length": {
-        "value": {
-          "type": "Number",
-          "value": 2.0,
-          "ty": {
-            "type": "Default",
-            "len": {
-              "type": "Mm"
-            },
-            "angle": {
-              "type": "Degrees"
-            }
-          }
-        },
-        "sourceRange": []
-      }
-    },
-    "name": "extrude",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Sketch",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
-  },
-  {
-    "type": "GroupBegin",
-    "group": {
-      "type": "FunctionCall",
-      "name": "dividerSketch",
-      "functionSourceRange": [
-        309,
-        1393,
-        6
-      ],
-      "unlabeledArg": null,
-      "labeledArgs": {}
-    },
-    "sourceRange": []
-  },
-  {
-    "labeledArgs": {
-      "planeOrSolid": {
-        "value": {
-          "type": "Plane",
-          "artifact_id": "[uuid]"
-        },
-        "sourceRange": []
-      }
-    },
-    "name": "startSketchOn",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": null
-  },
-  {
-    "type": "GroupEnd"
-  },
-  {
-    "labeledArgs": {
-      "length": {
-        "value": {
-          "type": "Number",
-          "value": -2.0,
-          "ty": {
-            "type": "Default",
-            "len": {
-              "type": "Mm"
-            },
-            "angle": {
-              "type": "Degrees"
-            }
-          }
-        },
-        "sourceRange": []
-      }
-    },
-    "name": "extrude",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Sketch",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
-  },
-  {
-    "labeledArgs": {
-      "faces": {
-        "value": {
-          "type": "Array",
-          "value": [
-            {
-              "type": "String",
-              "value": "end"
-            }
-          ]
-        },
-        "sourceRange": []
-      },
-      "thickness": {
-        "value": {
-          "type": "Number",
-          "value": 1.5,
-          "ty": {
-            "type": "Default",
-            "len": {
-              "type": "Mm"
-            },
-            "angle": {
-              "type": "Degrees"
-            }
-          }
-        },
-        "sourceRange": []
-      }
-    },
-    "name": "shell",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
-  },
-  {
-    "labeledArgs": {
-      "faces": {
-        "value": {
-          "type": "Array",
-          "value": [
-            {
-              "type": "String",
-              "value": "start"
-            }
-          ]
-        },
-        "sourceRange": []
-      },
-      "thickness": {
-        "value": {
-          "type": "Number",
-          "value": 1.5,
-          "ty": {
-            "type": "Default",
-            "len": {
-              "type": "Mm"
-            },
-            "angle": {
-              "type": "Degrees"
-            }
-          }
-        },
-        "sourceRange": []
-      }
-    },
-    "name": "shell",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
-  },
-  {
-    "type": "GroupEnd"
-  },
-  {
     "labeledArgs": {
       "offset": {
         "value": {
@@ -790,10 +533,41 @@ description: Operations executed bench.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
+    "sourceRange": []
+  },
+  {
+    "type": "GroupBegin",
+    "group": {
+      "type": "FunctionCall",
+      "name": "divider",
+      "functionSourceRange": [
+        1412,
+        1683,
+        6
+      ],
+      "unlabeledArg": null,
+      "labeledArgs": {}
+    },
+    "sourceRange": []
+  },
+  {
+    "type": "GroupBegin",
+    "group": {
+      "type": "FunctionCall",
+      "name": "dividerSketch",
+      "functionSourceRange": [
+        309,
+        1393,
+        6
+      ],
+      "unlabeledArg": null,
+      "labeledArgs": {}
+    },
+    "sourceRange": []
+  },
+  {
+    "labeledArgs": {
+      "planeOrSolid": {
         "value": {
           "type": "Plane",
           "artifact_id": "[uuid]"
@@ -801,6 +575,232 @@ description: Operations executed bench.kcl
         "sourceRange": []
       }
     },
+    "name": "startSketchOn",
+    "sourceRange": [],
+    "type": "StdLibCall",
+    "unlabeledArg": null
+  },
+  {
+    "type": "GroupEnd"
+  },
+  {
+    "labeledArgs": {
+      "length": {
+        "value": {
+          "type": "Number",
+          "value": 2.0,
+          "ty": {
+            "type": "Default",
+            "len": {
+              "type": "Mm"
+            },
+            "angle": {
+              "type": "Degrees"
+            }
+          }
+        },
+        "sourceRange": []
+      }
+    },
+    "name": "extrude",
+    "sourceRange": [],
+    "type": "StdLibCall",
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    }
+  },
+  {
+    "type": "GroupBegin",
+    "group": {
+      "type": "FunctionCall",
+      "name": "dividerSketch",
+      "functionSourceRange": [
+        309,
+        1393,
+        6
+      ],
+      "unlabeledArg": null,
+      "labeledArgs": {}
+    },
+    "sourceRange": []
+  },
+  {
+    "labeledArgs": {
+      "planeOrSolid": {
+        "value": {
+          "type": "Plane",
+          "artifact_id": "[uuid]"
+        },
+        "sourceRange": []
+      }
+    },
+    "name": "startSketchOn",
+    "sourceRange": [],
+    "type": "StdLibCall",
+    "unlabeledArg": null
+  },
+  {
+    "type": "GroupEnd"
+  },
+  {
+    "labeledArgs": {
+      "length": {
+        "value": {
+          "type": "Number",
+          "value": -2.0,
+          "ty": {
+            "type": "Default",
+            "len": {
+              "type": "Mm"
+            },
+            "angle": {
+              "type": "Degrees"
+            }
+          }
+        },
+        "sourceRange": []
+      }
+    },
+    "name": "extrude",
+    "sourceRange": [],
+    "type": "StdLibCall",
+    "unlabeledArg": {
+      "value": {
+        "type": "Sketch",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    }
+  },
+  {
+    "labeledArgs": {
+      "faces": {
+        "value": {
+          "type": "Array",
+          "value": [
+            {
+              "type": "String",
+              "value": "end"
+            }
+          ]
+        },
+        "sourceRange": []
+      },
+      "thickness": {
+        "value": {
+          "type": "Number",
+          "value": 1.5,
+          "ty": {
+            "type": "Default",
+            "len": {
+              "type": "Mm"
+            },
+            "angle": {
+              "type": "Degrees"
+            }
+          }
+        },
+        "sourceRange": []
+      }
+    },
+    "name": "shell",
+    "sourceRange": [],
+    "type": "StdLibCall",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    }
+  },
+  {
+    "labeledArgs": {
+      "faces": {
+        "value": {
+          "type": "Array",
+          "value": [
+            {
+              "type": "String",
+              "value": "start"
+            }
+          ]
+        },
+        "sourceRange": []
+      },
+      "thickness": {
+        "value": {
+          "type": "Number",
+          "value": 1.5,
+          "ty": {
+            "type": "Default",
+            "len": {
+              "type": "Mm"
+            },
+            "angle": {
+              "type": "Degrees"
+            }
+          }
+        },
+        "sourceRange": []
+      }
+    },
+    "name": "shell",
+    "sourceRange": [],
+    "type": "StdLibCall",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    }
+  },
+  {
+    "type": "GroupEnd"
+  },
+  {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
+    "labeledArgs": {
+      "offset": {
+        "value": {
+          "type": "Number",
+          "value": -28.0,
+          "ty": {
+            "type": "Default",
+            "len": {
+              "type": "Mm"
+            },
+            "angle": {
+              "type": "Degrees"
+            }
+          }
+        },
+        "sourceRange": []
+      }
+    },
+    "sourceRange": []
+  },
   {
     "type": "GroupBegin",
     "group": {
@@ -950,6 +950,15 @@ description: Operations executed bench.kcl
     "type": "GroupEnd"
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -968,16 +977,7 @@ description: Operations executed bench.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "type": "GroupBegin",
@@ -1080,6 +1080,15 @@ description: Operations executed bench.kcl
     "type": "GroupEnd"
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -1098,16 +1107,7 @@ description: Operations executed bench.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "type": "GroupBegin",
@@ -1210,7 +1210,7 @@ description: Operations executed bench.kcl
       "name": "armRest",
       "functionSourceRange": [
         3739,
-        3927,
+        3928,
         6
       ],
       "unlabeledArg": null,
@@ -1219,6 +1219,15 @@ description: Operations executed bench.kcl
     "sourceRange": []
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -1237,16 +1246,7 @@ description: Operations executed bench.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "type": "GroupBegin",
@@ -1282,6 +1282,15 @@ description: Operations executed bench.kcl
     "type": "GroupEnd"
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -1300,16 +1309,7 @@ description: Operations executed bench.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "type": "GroupBegin",
@@ -1379,7 +1379,7 @@ description: Operations executed bench.kcl
       "name": "armRest",
       "functionSourceRange": [
         3739,
-        3927,
+        3928,
         6
       ],
       "unlabeledArg": null,
@@ -1388,6 +1388,15 @@ description: Operations executed bench.kcl
     "sourceRange": []
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -1406,16 +1415,7 @@ description: Operations executed bench.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "type": "GroupBegin",
@@ -1451,6 +1451,15 @@ description: Operations executed bench.kcl
     "type": "GroupEnd"
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -1469,16 +1478,7 @@ description: Operations executed bench.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "type": "GroupBegin",

rust/kcl-lib/tests/kcl_samples/bottle/program_memory.snap

@@ -131,14 +131,6 @@ description: Variables in memory after executing bottle.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -266,14 +258,6 @@ description: Variables in memory after executing bottle.kcl
               "type": "Mm"
             }
           },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
-          },
           "solid": {
             "type": "Solid",
             "id": "[uuid]",
@@ -400,14 +384,6 @@ description: Variables in memory after executing bottle.kcl
                   "units": {
                     "type": "Mm"
                   }
-                },
-                "zAxis": {
-                  "x": 0.0,
-                  "y": 0.0,
-                  "z": 1.0,
-                  "units": {
-                    "type": "Mm"
-                  }
                 }
               },
               "start": {
@@ -545,14 +521,6 @@ description: Variables in memory after executing bottle.kcl
               "type": "Mm"
             }
           },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
-          },
           "solid": {
             "type": "Solid",
             "id": "[uuid]",
@@ -679,14 +647,6 @@ description: Variables in memory after executing bottle.kcl
                   "units": {
                     "type": "Mm"
                   }
-                },
-                "zAxis": {
-                  "x": 0.0,
-                  "y": 0.0,
-                  "z": 1.0,
-                  "units": {
-                    "type": "Mm"
-                  }
                 }
               },
               "start": {

rust/kcl-lib/tests/kcl_samples/bracket/program_memory.snap

@@ -304,14 +304,6 @@ description: Variables in memory after executing bracket.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": -1.0,
-            "z": 0.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -589,14 +581,6 @@ description: Variables in memory after executing bracket.kcl
                   "type": "Mm"
                 }
               },
-              "zAxis": {
-                "x": 0.0,
-                "y": -1.0,
-                "z": 0.0,
-                "units": {
-                  "type": "Mm"
-                }
-              },
               "solid": {
                 "type": "Solid",
                 "id": "[uuid]",
@@ -883,14 +867,6 @@ description: Variables in memory after executing bracket.kcl
                       "units": {
                         "type": "Mm"
                       }
-                    },
-                    "zAxis": {
-                      "x": 0.0,
-                      "y": -1.0,
-                      "z": 0.0,
-                      "units": {
-                        "type": "Mm"
-                      }
                     }
                   },
                   "start": {
@@ -1054,14 +1030,6 @@ description: Variables in memory after executing bracket.kcl
                   "type": "Mm"
                 }
               },
-              "zAxis": {
-                "x": 0.0,
-                "y": -1.0,
-                "z": 0.0,
-                "units": {
-                  "type": "Mm"
-                }
-              },
               "solid": {
                 "type": "Solid",
                 "id": "[uuid]",
@@ -1348,14 +1316,6 @@ description: Variables in memory after executing bracket.kcl
                       "units": {
                         "type": "Mm"
                       }
-                    },
-                    "zAxis": {
-                      "x": 0.0,
-                      "y": -1.0,
-                      "z": 0.0,
-                      "units": {
-                        "type": "Mm"
-                      }
                     }
                   },
                   "start": {
@@ -1519,14 +1479,6 @@ description: Variables in memory after executing bracket.kcl
                   "type": "Mm"
                 }
               },
-              "zAxis": {
-                "x": 0.0,
-                "y": -1.0,
-                "z": 0.0,
-                "units": {
-                  "type": "Mm"
-                }
-              },
               "solid": {
                 "type": "Solid",
                 "id": "[uuid]",
@@ -1813,14 +1765,6 @@ description: Variables in memory after executing bracket.kcl
                       "units": {
                         "type": "Mm"
                       }
-                    },
-                    "zAxis": {
-                      "x": 0.0,
-                      "y": -1.0,
-                      "z": 0.0,
-                      "units": {
-                        "type": "Mm"
-                      }
                     }
                   },
                   "start": {
@@ -1984,14 +1928,6 @@ description: Variables in memory after executing bracket.kcl
                   "type": "Mm"
                 }
               },
-              "zAxis": {
-                "x": 0.0,
-                "y": -1.0,
-                "z": 0.0,
-                "units": {
-                  "type": "Mm"
-                }
-              },
               "solid": {
                 "type": "Solid",
                 "id": "[uuid]",
@@ -2278,14 +2214,6 @@ description: Variables in memory after executing bracket.kcl
                       "units": {
                         "type": "Mm"
                       }
-                    },
-                    "zAxis": {
-                      "x": 0.0,
-                      "y": -1.0,
-                      "z": 0.0,
-                      "units": {
-                        "type": "Mm"
-                      }
                     }
                   },
                   "start": {
@@ -2519,14 +2447,6 @@ description: Variables in memory after executing bracket.kcl
                   "type": "Mm"
                 }
               },
-              "zAxis": {
-                "x": 0.0,
-                "y": -1.0,
-                "z": 0.0,
-                "units": {
-                  "type": "Mm"
-                }
-              },
               "solid": {
                 "type": "Solid",
                 "id": "[uuid]",
@@ -2813,14 +2733,6 @@ description: Variables in memory after executing bracket.kcl
                       "units": {
                         "type": "Mm"
                       }
-                    },
-                    "zAxis": {
-                      "x": 0.0,
-                      "y": -1.0,
-                      "z": 0.0,
-                      "units": {
-                        "type": "Mm"
-                      }
                     }
                   },
                   "start": {
@@ -2984,14 +2896,6 @@ description: Variables in memory after executing bracket.kcl
                   "type": "Mm"
                 }
               },
-              "zAxis": {
-                "x": 0.0,
-                "y": -1.0,
-                "z": 0.0,
-                "units": {
-                  "type": "Mm"
-                }
-              },
               "solid": {
                 "type": "Solid",
                 "id": "[uuid]",
@@ -3278,14 +3182,6 @@ description: Variables in memory after executing bracket.kcl
                       "units": {
                         "type": "Mm"
                       }
-                    },
-                    "zAxis": {
-                      "x": 0.0,
-                      "y": -1.0,
-                      "z": 0.0,
-                      "units": {
-                        "type": "Mm"
-                      }
                     }
                   },
                   "start": {

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

@@ -2291,7 +2291,7 @@ description: Artifact commands car-wheel-assembly.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": 0.0,
+        "x": -0.02,
         "y": 0.0,
         "z": 1.0
       }
@@ -2430,7 +2430,7 @@ description: Artifact commands car-wheel-assembly.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": 0.0,
+        "x": -0.02,
         "y": 0.0,
         "z": 1.0
       }
@@ -2709,8 +2709,8 @@ description: Artifact commands car-wheel-assembly.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": 0.0,
-        "y": 0.0,
+        "x": 0.02,
+        "y": -0.0,
         "z": 1.0
       }
     }
@@ -2848,8 +2848,8 @@ description: Artifact commands car-wheel-assembly.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": 0.0,
-        "y": 0.0,
+        "x": 0.02,
+        "y": -0.0,
         "z": 1.0
       }
     }
@@ -9231,7 +9231,7 @@ description: Artifact commands car-wheel-assembly.kcl
       "planar_normal": {
         "x": 0.0,
         "y": 0.0,
-        "z": 1.0
+        "z": -1.0
       }
     }
   },

rust/kcl-lib/tests/kcl_samples/color-cube/artifact_commands.snap

@@ -157,7 +157,7 @@ description: Artifact commands color-cube.kcl
         "z": 0.0
       },
       "x_axis": {
-        "x": 1.0,
+        "x": -1.0,
         "y": 0.0,
         "z": 0.0
       },
@@ -1608,7 +1608,7 @@ description: Artifact commands color-cube.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": -0.0,
+        "x": 0.0,
         "y": 1.0,
         "z": -0.0
       }
@@ -1727,7 +1727,7 @@ description: Artifact commands color-cube.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": -0.0,
+        "x": 0.0,
         "y": 1.0,
         "z": -0.0
       }

rust/kcl-lib/tests/kcl_samples/color-cube/artifact_graph_flowchart.snap.md

@@ -328,18 +328,18 @@ flowchart LR
   117 --- 122
   117 ---- 124
   117 --- 123
-  118 --- 125
-  118 --- 131
-  118 --- 132
-  119 --- 126
-  119 --- 133
-  119 --- 134
-  120 --- 127
-  120 --- 135
-  120 --- 136
-  121 --- 128
-  121 --- 137
-  121 --- 138
+  118 --- 128
+  118 --- 137
+  118 --- 138
+  119 --- 127
+  119 --- 135
+  119 --- 136
+  120 --- 126
+  120 --- 133
+  120 --- 134
+  121 --- 125
+  121 --- 131
+  121 --- 132
   124 --- 125
   124 --- 126
   124 --- 127

rust/kcl-lib/tests/kcl_samples/color-cube/ops.snap

@@ -4,6 +4,15 @@ description: Operations executed color-cube.kcl
 ---
 [
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -22,18 +31,18 @@ description: Operations executed color-cube.kcl
         "sourceRange": []
       }
     },
+    "sourceRange": []
+  },
+  {
+    "type": "KclStdLibCall",
     "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
     "unlabeledArg": {
       "value": {
         "type": "Plane",
         "artifact_id": "[uuid]"
       },
       "sourceRange": []
-    }
     },
-  {
     "labeledArgs": {
       "offset": {
         "value": {
@@ -52,18 +61,18 @@ description: Operations executed color-cube.kcl
         "sourceRange": []
       }
     },
+    "sourceRange": []
+  },
+  {
+    "type": "KclStdLibCall",
     "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
     "unlabeledArg": {
       "value": {
         "type": "Plane",
         "artifact_id": "[uuid]"
       },
       "sourceRange": []
-    }
     },
-  {
     "labeledArgs": {
       "offset": {
         "value": {
@@ -82,18 +91,18 @@ description: Operations executed color-cube.kcl
         "sourceRange": []
       }
     },
+    "sourceRange": []
+  },
+  {
+    "type": "KclStdLibCall",
     "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
     "unlabeledArg": {
       "value": {
         "type": "Plane",
         "artifact_id": "[uuid]"
       },
       "sourceRange": []
-    }
     },
-  {
     "labeledArgs": {
       "offset": {
         "value": {
@@ -112,18 +121,18 @@ description: Operations executed color-cube.kcl
         "sourceRange": []
       }
     },
+    "sourceRange": []
+  },
+  {
+    "type": "KclStdLibCall",
     "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
     "unlabeledArg": {
       "value": {
         "type": "Plane",
         "artifact_id": "[uuid]"
       },
       "sourceRange": []
-    }
     },
-  {
     "labeledArgs": {
       "offset": {
         "value": {
@@ -142,18 +151,18 @@ description: Operations executed color-cube.kcl
         "sourceRange": []
       }
     },
+    "sourceRange": []
+  },
+  {
+    "type": "KclStdLibCall",
     "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
     "unlabeledArg": {
       "value": {
         "type": "Plane",
         "artifact_id": "[uuid]"
       },
       "sourceRange": []
-    }
     },
-  {
     "labeledArgs": {
       "offset": {
         "value": {
@@ -172,16 +181,7 @@ description: Operations executed color-cube.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "type": "GroupBegin",

rust/kcl-lib/tests/kcl_samples/color-cube/program_memory.snap

@@ -32,14 +32,6 @@ description: Variables in memory after executing color-cube.kcl
         "units": {
           "type": "Mm"
         }
-      },
-      "zAxis": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 1.0,
-        "units": {
-          "type": "Mm"
-        }
       }
     }
   },
@@ -85,14 +77,6 @@ description: Variables in memory after executing color-cube.kcl
         "units": {
           "type": "Mm"
         }
-      },
-      "zAxis": {
-        "x": 0.0,
-        "y": -1.0,
-        "z": 0.0,
-        "units": {
-          "type": "Mm"
-        }
       }
     }
   },
@@ -137,7 +121,7 @@ description: Variables in memory after executing color-cube.kcl
         }
       },
       "xAxis": {
-        "x": 1.0,
+        "x": -1.0,
         "y": 0.0,
         "z": 0.0,
         "units": {
@@ -151,14 +135,6 @@ description: Variables in memory after executing color-cube.kcl
         "units": {
           "type": "Mm"
         }
-      },
-      "zAxis": {
-        "x": -0.0,
-        "y": 1.0,
-        "z": -0.0,
-        "units": {
-          "type": "Mm"
-        }
       }
     }
   },
@@ -191,14 +167,6 @@ description: Variables in memory after executing color-cube.kcl
         "units": {
           "type": "Mm"
         }
-      },
-      "zAxis": {
-        "x": 1.0,
-        "y": 0.0,
-        "z": 0.0,
-        "units": {
-          "type": "Mm"
-        }
       }
     }
   },
@@ -260,14 +228,6 @@ description: Variables in memory after executing color-cube.kcl
         "units": {
           "type": "Mm"
         }
-      },
-      "zAxis": {
-        "x": 1.0,
-        "y": 0.0,
-        "z": 0.0,
-        "units": {
-          "type": "Mm"
-        }
       }
     }
   },
@@ -300,14 +260,6 @@ description: Variables in memory after executing color-cube.kcl
         "units": {
           "type": "Mm"
         }
-      },
-      "zAxis": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 1.0,
-        "units": {
-          "type": "Mm"
-        }
       }
     }
   }

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

@@ -34,6 +34,15 @@ description: Operations executed cycloidal-gear.kcl
     "sourceRange": []
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -52,16 +61,7 @@ description: Operations executed cycloidal-gear.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -84,8 +84,8 @@ description: Operations executed cycloidal-gear.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -120,8 +120,8 @@ description: Operations executed cycloidal-gear.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -156,8 +156,8 @@ description: Operations executed cycloidal-gear.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -192,8 +192,8 @@ description: Operations executed cycloidal-gear.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -267,6 +267,15 @@ description: Operations executed cycloidal-gear.kcl
     "sourceRange": []
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -285,16 +294,7 @@ description: Operations executed cycloidal-gear.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -317,8 +317,8 @@ description: Operations executed cycloidal-gear.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -353,8 +353,8 @@ description: Operations executed cycloidal-gear.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -389,8 +389,8 @@ description: Operations executed cycloidal-gear.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -425,8 +425,8 @@ description: Operations executed cycloidal-gear.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -500,6 +500,15 @@ description: Operations executed cycloidal-gear.kcl
     "sourceRange": []
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -518,16 +527,7 @@ description: Operations executed cycloidal-gear.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -550,8 +550,8 @@ description: Operations executed cycloidal-gear.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -586,8 +586,8 @@ description: Operations executed cycloidal-gear.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -622,8 +622,8 @@ description: Operations executed cycloidal-gear.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -658,8 +658,8 @@ description: Operations executed cycloidal-gear.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,

rust/kcl-lib/tests/kcl_samples/dodecahedron/program_memory.snap

@@ -173,14 +173,6 @@ description: Variables in memory after executing dodecahedron.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -361,14 +353,6 @@ description: Variables in memory after executing dodecahedron.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -549,14 +533,6 @@ description: Variables in memory after executing dodecahedron.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -737,14 +713,6 @@ description: Variables in memory after executing dodecahedron.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -925,14 +893,6 @@ description: Variables in memory after executing dodecahedron.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -1113,14 +1073,6 @@ description: Variables in memory after executing dodecahedron.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -1301,14 +1253,6 @@ description: Variables in memory after executing dodecahedron.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -1489,14 +1433,6 @@ description: Variables in memory after executing dodecahedron.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -1677,14 +1613,6 @@ description: Variables in memory after executing dodecahedron.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -1865,14 +1793,6 @@ description: Variables in memory after executing dodecahedron.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -2053,14 +1973,6 @@ description: Variables in memory after executing dodecahedron.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -2241,14 +2153,6 @@ description: Variables in memory after executing dodecahedron.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {

rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/ops.snap

@@ -98,6 +98,15 @@ description: Operations executed dual-basin-utility-sink.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -116,16 +125,7 @@ description: Operations executed dual-basin-utility-sink.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -253,6 +253,15 @@ description: Operations executed dual-basin-utility-sink.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -271,16 +280,7 @@ description: Operations executed dual-basin-utility-sink.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -365,6 +365,15 @@ description: Operations executed dual-basin-utility-sink.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -383,16 +392,7 @@ description: Operations executed dual-basin-utility-sink.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -496,6 +496,15 @@ description: Operations executed dual-basin-utility-sink.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -514,16 +523,7 @@ description: Operations executed dual-basin-utility-sink.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -705,6 +705,15 @@ description: Operations executed dual-basin-utility-sink.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -723,16 +732,7 @@ description: Operations executed dual-basin-utility-sink.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -860,6 +860,15 @@ description: Operations executed dual-basin-utility-sink.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -878,16 +887,7 @@ description: Operations executed dual-basin-utility-sink.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {

rust/kcl-lib/tests/kcl_samples/enclosure/program_memory.snap

@@ -215,14 +215,6 @@ description: Variables in memory after executing enclosure.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -562,14 +554,6 @@ description: Variables in memory after executing enclosure.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -902,14 +886,6 @@ description: Variables in memory after executing enclosure.kcl
               "type": "Mm"
             }
           },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
-          },
           "solid": {
             "type": "Solid",
             "id": "[uuid]",
@@ -1120,14 +1096,6 @@ description: Variables in memory after executing enclosure.kcl
                   "units": {
                     "type": "Mm"
                   }
-                },
-                "zAxis": {
-                  "x": 0.0,
-                  "y": 0.0,
-                  "z": 1.0,
-                  "units": {
-                    "type": "Mm"
-                  }
                 }
               },
               "start": {
@@ -1639,14 +1607,6 @@ description: Variables in memory after executing enclosure.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -1846,14 +1806,6 @@ description: Variables in memory after executing enclosure.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -2046,14 +1998,6 @@ description: Variables in memory after executing enclosure.kcl
             "type": "Mm"
           }
         },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
-        },
         "solid": {
           "type": "Solid",
           "id": "[uuid]",
@@ -2264,14 +2208,6 @@ description: Variables in memory after executing enclosure.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {

rust/kcl-lib/tests/kcl_samples/exhaust-manifold/artifact_commands.snap

@@ -66,7 +66,7 @@ description: Artifact commands exhaust-manifold.kcl
       "planar_normal": {
         "x": 1.0,
         "y": 0.0,
-        "z": 0.0
+        "z": -0.0
       }
     }
   },
@@ -467,9 +467,9 @@ description: Artifact commands exhaust-manifold.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": 1.0,
-        "y": 0.0,
-        "z": 0.0
+        "x": 0.9998476951563913,
+        "y": 0.01745240643728351,
+        "z": -0.0
       }
     }
   },
@@ -870,9 +870,9 @@ description: Artifact commands exhaust-manifold.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": 1.0,
-        "y": 0.0,
-        "z": 0.0
+        "x": 0.9114032766354453,
+        "y": 0.4115143586051088,
+        "z": -0.0
       }
     }
   },
@@ -1273,9 +1273,9 @@ description: Artifact commands exhaust-manifold.kcl
       "animated": false,
       "adjust_camera": false,
       "planar_normal": {
-        "x": 1.0,
-        "y": 0.0,
-        "z": 0.0
+        "x": 0.9048270524660196,
+        "y": 0.4257792915650726,
+        "z": -0.0
       }
     }
   },

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

@@ -24,8 +24,8 @@ description: Operations executed exhaust-manifold.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -60,8 +60,8 @@ description: Operations executed exhaust-manifold.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -362,8 +362,8 @@ description: Operations executed exhaust-manifold.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -398,8 +398,8 @@ description: Operations executed exhaust-manifold.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -700,8 +700,8 @@ description: Operations executed exhaust-manifold.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -736,8 +736,8 @@ description: Operations executed exhaust-manifold.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1038,8 +1038,8 @@ description: Operations executed exhaust-manifold.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -1074,8 +1074,8 @@ description: Operations executed exhaust-manifold.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,

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

@@ -621,14 +621,6 @@ description: Variables in memory after executing exhaust-manifold.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {

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

@@ -95,14 +95,6 @@ description: Variables in memory after executing flange.kcl
               "type": "Mm"
             }
           },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
-          },
           "solid": {
             "type": "Solid",
             "id": "[uuid]",
@@ -174,14 +166,6 @@ description: Variables in memory after executing flange.kcl
                   "units": {
                     "type": "Mm"
                   }
-                },
-                "zAxis": {
-                  "x": 0.0,
-                  "y": 0.0,
-                  "z": 1.0,
-                  "units": {
-                    "type": "Mm"
-                  }
                 }
               },
               "start": {
@@ -342,11 +326,90 @@ description: Variables in memory after executing flange.kcl
               "units": {
                 "type": "Mm"
               }
+            }
           },
-            "zAxis": {
+          "start": {
+            "from": [
+              2.0625,
+              0.0
+            ],
+            "to": [
+              2.0625,
+              0.0
+            ],
+            "units": {
+              "type": "Inches"
+            },
+            "tag": null,
+            "__geoMeta": {
+              "id": "[uuid]",
+              "sourceRange": []
+            }
+          },
+          "artifactId": "[uuid]",
+          "originalId": "[uuid]",
+          "units": {
+            "type": "Inches"
+          }
+        }
+      },
+      {
+        "type": "Sketch",
+        "value": {
+          "type": "Sketch",
+          "id": "[uuid]",
+          "paths": [
+            {
+              "__geoMeta": {
+                "id": "[uuid]",
+                "sourceRange": []
+              },
+              "ccw": true,
+              "center": [
+                1.75,
+                0.0
+              ],
+              "from": [
+                2.0625,
+                0.0
+              ],
+              "radius": 0.3125,
+              "tag": null,
+              "to": [
+                2.0625,
+                0.0
+              ],
+              "type": "Circle",
+              "units": {
+                "type": "Inches"
+              }
+            }
+          ],
+          "on": {
+            "type": "plane",
+            "id": "[uuid]",
+            "artifactId": "[uuid]",
+            "value": "XY",
+            "origin": {
               "x": 0.0,
               "y": 0.0,
-              "z": 1.0,
+              "z": 0.0,
+              "units": {
+                "type": "Mm"
+              }
+            },
+            "xAxis": {
+              "x": 1.0,
+              "y": 0.0,
+              "z": 0.0,
+              "units": {
+                "type": "Mm"
+              }
+            },
+            "yAxis": {
+              "x": 0.0,
+              "y": 1.0,
+              "z": 0.0,
               "units": {
                 "type": "Mm"
               }
@@ -437,14 +500,6 @@ description: Variables in memory after executing flange.kcl
               "units": {
                 "type": "Mm"
               }
-            },
-            "zAxis": {
-              "x": 0.0,
-              "y": 0.0,
-              "z": 1.0,
-              "units": {
-                "type": "Mm"
-              }
             }
           },
           "start": {
@@ -532,109 +587,6 @@ description: Variables in memory after executing flange.kcl
               "units": {
                 "type": "Mm"
               }
-            },
-            "zAxis": {
-              "x": 0.0,
-              "y": 0.0,
-              "z": 1.0,
-              "units": {
-                "type": "Mm"
-              }
-            }
-          },
-          "start": {
-            "from": [
-              2.0625,
-              0.0
-            ],
-            "to": [
-              2.0625,
-              0.0
-            ],
-            "units": {
-              "type": "Inches"
-            },
-            "tag": null,
-            "__geoMeta": {
-              "id": "[uuid]",
-              "sourceRange": []
-            }
-          },
-          "artifactId": "[uuid]",
-          "originalId": "[uuid]",
-          "units": {
-            "type": "Inches"
-          }
-        }
-      },
-      {
-        "type": "Sketch",
-        "value": {
-          "type": "Sketch",
-          "id": "[uuid]",
-          "paths": [
-            {
-              "__geoMeta": {
-                "id": "[uuid]",
-                "sourceRange": []
-              },
-              "ccw": true,
-              "center": [
-                1.75,
-                0.0
-              ],
-              "from": [
-                2.0625,
-                0.0
-              ],
-              "radius": 0.3125,
-              "tag": null,
-              "to": [
-                2.0625,
-                0.0
-              ],
-              "type": "Circle",
-              "units": {
-                "type": "Inches"
-              }
-            }
-          ],
-          "on": {
-            "type": "plane",
-            "id": "[uuid]",
-            "artifactId": "[uuid]",
-            "value": "XY",
-            "origin": {
-              "x": 0.0,
-              "y": 0.0,
-              "z": 0.0,
-              "units": {
-                "type": "Mm"
-              }
-            },
-            "xAxis": {
-              "x": 1.0,
-              "y": 0.0,
-              "z": 0.0,
-              "units": {
-                "type": "Mm"
-              }
-            },
-            "yAxis": {
-              "x": 0.0,
-              "y": 1.0,
-              "z": 0.0,
-              "units": {
-                "type": "Mm"
-              }
-            },
-            "zAxis": {
-              "x": 0.0,
-              "y": 0.0,
-              "z": 1.0,
-              "units": {
-                "type": "Mm"
-              }
             }
           },
           "start": {
@@ -737,14 +689,6 @@ description: Variables in memory after executing flange.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -898,14 +842,6 @@ description: Variables in memory after executing flange.kcl
               "type": "Mm"
             }
           },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
-          },
           "solid": {
             "type": "Solid",
             "id": "[uuid]",
@@ -970,14 +906,6 @@ description: Variables in memory after executing flange.kcl
                     "type": "Mm"
                   }
                 },
-                "zAxis": {
-                  "x": 0.0,
-                  "y": 0.0,
-                  "z": 1.0,
-                  "units": {
-                    "type": "Mm"
-                  }
-                },
                 "solid": {
                   "type": "Solid",
                   "id": "[uuid]",
@@ -1049,14 +977,6 @@ description: Variables in memory after executing flange.kcl
                         "units": {
                           "type": "Mm"
                         }
-                      },
-                      "zAxis": {
-                        "x": 0.0,
-                        "y": 0.0,
-                        "z": 1.0,
-                        "units": {
-                          "type": "Mm"
-                        }
                       }
                     },
                     "start": {
@@ -1230,14 +1150,6 @@ description: Variables in memory after executing flange.kcl
               "type": "Mm"
             }
           },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
-          },
           "solid": {
             "type": "Solid",
             "id": "[uuid]",
@@ -1309,14 +1221,6 @@ description: Variables in memory after executing flange.kcl
                   "units": {
                     "type": "Mm"
                   }
-                },
-                "zAxis": {
-                  "x": 0.0,
-                  "y": 0.0,
-                  "z": 1.0,
-                  "units": {
-                    "type": "Mm"
-                  }
                 }
               },
               "start": {

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

@@ -348,14 +348,6 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": -1.0,
-            "z": 0.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -918,14 +910,6 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": -1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -1267,14 +1251,6 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 1.0,
-            "y": 0.0,
-            "z": 0.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -1429,14 +1405,6 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 1.0,
-            "y": 0.0,
-            "z": 0.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -2069,14 +2037,6 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -2361,14 +2321,6 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -2658,14 +2610,6 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -2950,14 +2894,6 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.0,
-                "y": 0.0,
-                "z": 1.0,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {

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

@@ -39,8 +39,8 @@ description: Operations executed food-service-spatula.kcl
       "type": "FunctionCall",
       "name": "toDegrees",
       "functionSourceRange": [
-        12033,
-        12082,
+        11927,
+        11976,
         1
       ],
       "unlabeledArg": null,
@@ -57,8 +57,8 @@ description: Operations executed food-service-spatula.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -93,8 +93,8 @@ description: Operations executed food-service-spatula.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -147,8 +147,8 @@ description: Operations executed food-service-spatula.kcl
       "type": "FunctionCall",
       "name": "toDegrees",
       "functionSourceRange": [
-        12033,
-        12082,
+        11927,
+        11976,
         1
       ],
       "unlabeledArg": null,
@@ -165,8 +165,8 @@ description: Operations executed food-service-spatula.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -201,8 +201,8 @@ description: Operations executed food-service-spatula.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -255,8 +255,8 @@ description: Operations executed food-service-spatula.kcl
       "type": "FunctionCall",
       "name": "toDegrees",
       "functionSourceRange": [
-        12033,
-        12082,
+        11927,
+        11976,
         1
       ],
       "unlabeledArg": null,
@@ -273,8 +273,8 @@ description: Operations executed food-service-spatula.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -309,8 +309,8 @@ description: Operations executed food-service-spatula.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -501,6 +501,15 @@ description: Operations executed food-service-spatula.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -519,16 +528,7 @@ description: Operations executed food-service-spatula.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -894,8 +894,8 @@ description: Operations executed food-service-spatula.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,
@@ -930,8 +930,8 @@ description: Operations executed food-service-spatula.kcl
       "type": "FunctionCall",
       "name": "toRadians",
       "functionSourceRange": [
-        11603,
-        11652,
+        11497,
+        11546,
         1
       ],
       "unlabeledArg": null,

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

@@ -197,14 +197,6 @@ description: Variables in memory after executing food-service-spatula.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": 0.0,
-            "z": 1.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -414,14 +406,6 @@ description: Variables in memory after executing food-service-spatula.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -484,14 +468,6 @@ description: Variables in memory after executing food-service-spatula.kcl
         "units": {
           "type": "Mm"
         }
-      },
-      "zAxis": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 1.0,
-        "units": {
-          "type": "Mm"
-        }
       }
     }
   },
@@ -825,14 +801,6 @@ description: Variables in memory after executing food-service-spatula.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.939693,
-            "y": -0.0,
-            "z": 0.34202,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -1038,14 +1006,6 @@ description: Variables in memory after executing food-service-spatula.kcl
             "type": "Mm"
           }
         },
-        "zAxis": {
-          "x": 0.939693,
-          "y": -0.0,
-          "z": 0.34202,
-          "units": {
-            "type": "Mm"
-          }
-        },
         "solid": {
           "type": "Solid",
           "id": "[uuid]",
@@ -1348,14 +1308,6 @@ description: Variables in memory after executing food-service-spatula.kcl
                 "units": {
                   "type": "Mm"
                 }
-              },
-              "zAxis": {
-                "x": 0.939693,
-                "y": -0.0,
-                "z": 0.34202,
-                "units": {
-                  "type": "Mm"
-                }
               }
             },
             "start": {
@@ -1674,14 +1626,6 @@ description: Variables in memory after executing food-service-spatula.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.939693,
-          "y": -0.0,
-          "z": 0.34202,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -1744,14 +1688,6 @@ description: Variables in memory after executing food-service-spatula.kcl
         "units": {
           "type": "Mm"
         }
-      },
-      "zAxis": {
-        "x": 0.939693,
-        "y": -0.0,
-        "z": 0.34202,
-        "units": {
-          "type": "Mm"
-        }
       }
     }
   },
@@ -2028,14 +1964,6 @@ description: Variables in memory after executing food-service-spatula.kcl
             "units": {
               "type": "Mm"
             }
-          },
-          "zAxis": {
-            "x": 0.0,
-            "y": -1.0,
-            "z": 0.0,
-            "units": {
-              "type": "Mm"
-            }
           }
         },
         "start": {
@@ -2447,14 +2375,6 @@ description: Variables in memory after executing food-service-spatula.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": -1.0,
-          "z": 0.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -2521,14 +2441,6 @@ description: Variables in memory after executing food-service-spatula.kcl
         "units": {
           "type": "Mm"
         }
-      },
-      "zAxis": {
-        "x": 0.0,
-        "y": -1.0,
-        "z": 0.0,
-        "units": {
-          "type": "Mm"
-        }
       }
     }
   },
@@ -2572,14 +2484,6 @@ description: Variables in memory after executing food-service-spatula.kcl
           "type": "Mm"
         }
       },
-      "zAxis": {
-        "x": 0.939693,
-        "y": -0.0,
-        "z": 0.34202,
-        "units": {
-          "type": "Mm"
-        }
-      },
       "solid": {
         "type": "Solid",
         "id": "[uuid]",
@@ -2882,14 +2786,6 @@ description: Variables in memory after executing food-service-spatula.kcl
               "units": {
                 "type": "Mm"
               }
-            },
-            "zAxis": {
-              "x": 0.939693,
-              "y": -0.0,
-              "z": 0.34202,
-              "units": {
-                "type": "Mm"
-              }
             }
           },
           "start": {
@@ -3078,14 +2974,6 @@ description: Variables in memory after executing food-service-spatula.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -3253,14 +3141,6 @@ description: Variables in memory after executing food-service-spatula.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -3428,14 +3308,6 @@ description: Variables in memory after executing food-service-spatula.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {
@@ -3605,14 +3477,6 @@ description: Variables in memory after executing food-service-spatula.kcl
           "units": {
             "type": "Mm"
           }
-        },
-        "zAxis": {
-          "x": 0.0,
-          "y": 0.0,
-          "z": 1.0,
-          "units": {
-            "type": "Mm"
-          }
         }
       },
       "start": {

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

@@ -331,7 +331,7 @@ description: Artifact commands french-press.kcl
       "adjust_camera": false,
       "planar_normal": {
         "x": 1.0,
-        "y": 0.0,
+        "y": -1.0,
         "z": 0.0
       }
     }
@@ -702,7 +702,7 @@ description: Artifact commands french-press.kcl
       "adjust_camera": false,
       "planar_normal": {
         "x": 1.0,
-        "y": 0.0,
+        "y": -1.0,
         "z": 0.0
       }
     }

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

@@ -494,6 +494,15 @@ description: Operations executed french-press.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -512,16 +521,7 @@ description: Operations executed french-press.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -845,6 +845,15 @@ description: Operations executed french-press.kcl
     "sourceRange": []
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -863,16 +872,7 @@ description: Operations executed french-press.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -1320,6 +1320,15 @@ description: Operations executed french-press.kcl
     "sourceRange": []
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -1338,16 +1347,7 @@ description: Operations executed french-press.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "labeledArgs": {

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

@@ -4,6 +4,15 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
 ---
 [
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -22,16 +31,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "type": "GroupBegin",
@@ -248,6 +248,15 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -266,16 +275,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "type": "GroupBegin",
@@ -1331,6 +1331,15 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "offsetPlane",
+    "unlabeledArg": {
+      "value": {
+        "type": "Plane",
+        "artifact_id": "[uuid]"
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "offset": {
         "value": {
@@ -1349,16 +1358,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
         "sourceRange": []
       }
     },
-    "name": "offsetPlane",
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Plane",
-        "artifact_id": "[uuid]"
-      },
     "sourceRange": []
-    }
   },
   {
     "type": "GroupBegin",