Move operations on solids to be declared in KCL (#6462)

* Declare chamfer in KCL

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

* Ignore more in the simulation tests

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

* Declare fillet in KCL

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

* Move shell and hollow to KCL

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

---------

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

docs/kcl/index.md

@@ -43,19 +43,16 @@ layout: manual
   * [`atan2`](kcl/atan2)
   * [`bezierCurve`](kcl/bezierCurve)
   * [`ceil`](kcl/ceil)
-  * [`chamfer`](kcl/chamfer)
   * [`circleThreePoint`](kcl/circleThreePoint)
   * [`clone`](kcl/clone)
   * [`close`](kcl/close)
   * [`extrude`](kcl/extrude)
-  * [`fillet`](kcl/fillet)
   * [`floor`](kcl/floor)
   * [`getCommonEdge`](kcl/getCommonEdge)
   * [`getNextAdjacentEdge`](kcl/getNextAdjacentEdge)
   * [`getOppositeEdge`](kcl/getOppositeEdge)
   * [`getPreviousAdjacentEdge`](kcl/getPreviousAdjacentEdge)
   * [`helix`](kcl/std-helix)
-  * [`hollow`](kcl/hollow)
   * [`intersect`](kcl/intersect)
   * [`involuteCircular`](kcl/involuteCircular)
   * [`lastSegX`](kcl/lastSegX)
@@ -100,7 +97,6 @@ layout: manual
   * [`segStart`](kcl/segStart)
   * [`segStartX`](kcl/segStartX)
   * [`segStartY`](kcl/segStartY)
-  * [`shell`](kcl/shell)
   * [`sqrt`](kcl/sqrt)
   * [`startProfile`](kcl/startProfile)
   * [`startSketchOn`](kcl/startSketchOn)
@@ -132,6 +128,11 @@ layout: manual
 * **std::sketch**
   * [`circle`](kcl/std-sketch-circle)
   * [`mirror2d`](kcl/std-sketch-mirror2d)
+* **std::solid**
+  * [`chamfer`](kcl/std-solid-chamfer)
+  * [`fillet`](kcl/std-solid-fillet)
+  * [`hollow`](kcl/std-solid-hollow)
+  * [`shell`](kcl/std-solid-shell)
 * **std::turns**
   * [`turns::HALF_TURN`](kcl/consts/std-turns-HALF_TURN)
   * [`turns::QUARTER_TURN`](kcl/consts/std-turns-QUARTER_TURN)

rust/kcl-lib/e2e/executor/main.rs

@@ -34,7 +34,7 @@ async fn kcl_test_fillet_duplicate_tags() {
         err.message(),
         "The same edge ID is being referenced multiple times, which is not allowed. Please select a different edge"
     );
-    assert_eq!(err.source_ranges().len(), 2);
+    assert_eq!(err.source_ranges().len(), 3);
 }
 
 #[tokio::test(flavor = "multi_thread")]

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

@@ -624,7 +624,9 @@ impl ArgData {
                     index + 2
                 ),
             )),
-            Some("Axis2d | Edge") | Some("Axis3d | Edge") => Some((index, format!(r#"{label}${{{}:X}}"#, index))),
+            Some("Axis2d | Edge") | Some("Axis3d | Edge") => Some((index, format!(r#"{label}${{{index}:X}}"#))),
+            Some("Edge") => Some((index, format!(r#"{label}${{{index}:tag_or_edge_fn}}"#))),
+            Some("[Edge; 1+]") => Some((index, format!(r#"{label}[${{{index}:tag_or_edge_fn}}]"#))),
 
             Some("string") => Some((index, format!(r#"{label}${{{}:"string"}}"#, index))),
             Some("bool") => Some((index, format!(r#"{label}${{{}:false}}"#, index))),
@@ -1009,7 +1011,7 @@ fn collect_type_names(acc: &mut HashSet<String>, ty: &Type) {
             acc.insert(collect_type_names_from_primitive(primitive_type));
         }
         Type::Array { ty, .. } => {
-            acc.insert(collect_type_names_from_primitive(ty));
+            collect_type_names(acc, ty);
         }
         Type::Union { tys } => tys.iter().for_each(|t| {
             acc.insert(collect_type_names_from_primitive(t));

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

@@ -913,12 +913,12 @@ mod tests {
 
     #[test]
     fn get_autocomplete_snippet_fillet() {
-        let fillet_fn: Box<dyn StdLibFn> = Box::new(crate::std::fillet::Fillet);
+        let data = kcl_doc::walk_prelude();
-        let snippet = fillet_fn.to_autocomplete_snippet().unwrap();
+        let DocData::Fn(fillet_fn) = data.into_iter().find(|d| d.name() == "fillet").unwrap() else {
-        assert_eq!(
+            panic!();
-            snippet,
+        };
-            r#"fillet(${0:%}, radius = ${1:3.14}, tags = [${2:"tag_or_edge_fn"}])"#
+        let snippet = fillet_fn.to_autocomplete_snippet();
-        );
+        assert_eq!(snippet, r#"fillet(radius = ${0:3.14}, tags = [${1:tag_or_edge_fn}])"#);
     }
 
     #[test]

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

@@ -64,6 +64,14 @@ impl RuntimeType {
         RuntimeType::Primitive(PrimitiveType::Plane)
     }
 
+    pub fn face() -> Self {
+        RuntimeType::Primitive(PrimitiveType::Face)
+    }
+
+    pub fn tag() -> Self {
+        RuntimeType::Primitive(PrimitiveType::Tag)
+    }
+
     pub fn bool() -> Self {
         RuntimeType::Primitive(PrimitiveType::Boolean)
     }
@@ -130,7 +138,7 @@ impl RuntimeType {
         match value {
             Type::Primitive(pt) => Self::from_parsed_primitive(pt, exec_state, source_range),
             Type::Array { ty, len } => {
-                Self::from_parsed_primitive(ty, exec_state, source_range).map(|t| RuntimeType::Array(Box::new(t), len))
+                Self::from_parsed(*ty, exec_state, source_range).map(|t| RuntimeType::Array(Box::new(t), len))
             }
             Type::Union { tys } => tys
                 .into_iter()
@@ -1138,8 +1146,12 @@ impl KclValue {
                 _ => Err(self.into()),
             },
             PrimitiveType::Tag => match value {
-                KclValue::TagDeclarator { .. } => Ok(value.clone()),
+                KclValue::TagDeclarator { .. } | KclValue::TagIdentifier { .. } | KclValue::Uuid { .. } => {
-                KclValue::TagIdentifier { .. } => Ok(value.clone()),
+                    Ok(value.clone())
+                }
+                s @ KclValue::String { value, .. } if ["start", "end", "START", "END"].contains(&&**value) => {
+                    Ok(s.clone())
+                }
                 _ => Err(self.into()),
             },
         }
@@ -1292,12 +1304,12 @@ impl KclValue {
             KclValue::HomArray { ty, value, .. } => {
                 Some(RuntimeType::Array(Box::new(ty.clone()), ArrayLen::Known(value.len())))
             }
-            KclValue::TagIdentifier(_) | KclValue::TagDeclarator(_) => Some(RuntimeType::Primitive(PrimitiveType::Tag)),
+            KclValue::TagIdentifier(_) | KclValue::TagDeclarator(_) | KclValue::Uuid { .. } => {
-            KclValue::Function { .. }
+                Some(RuntimeType::Primitive(PrimitiveType::Tag))
-            | KclValue::Module { .. }
+            }
-            | KclValue::KclNone { .. }
+            KclValue::Function { .. } | KclValue::Module { .. } | KclValue::KclNone { .. } | KclValue::Type { .. } => {
-            | KclValue::Type { .. }
+                None
-            | KclValue::Uuid { .. } => None,
+            }
         }
     }
 }

rust/kcl-lib/src/lsp/kcl/hover.rs

@@ -347,7 +347,7 @@ impl Node<Type> {
         let range = self.as_source_range();
         if range.contains(pos) {
             match &self.inner {
-                Type::Array { ty, .. } | Type::Primitive(ty) => {
+                ty @ Type::Array { .. } | ty @ Type::Primitive(_) => {
                     let mut name = ty.to_string();
                     if name.ends_with(')') {
                         name.truncate(name.find('(').unwrap());

rust/kcl-lib/src/lsp/tests.rs

@@ -2396,7 +2396,7 @@ async fn kcl_test_kcl_lsp_diagnostics_on_execution_error() {
 
     // Get the diagnostics.
     // TODO warnings being stomped by execution errors?
-    assert_diagnostic_count(server.diagnostics_map.get("file:///test.kcl").as_deref(), 1);
+    assert_diagnostic_count(server.diagnostics_map.get("file:///test.kcl").as_deref(), 2);
 
     // Update the text.
     let new_text = r#"part001 = startSketchOn(XY)

rust/kcl-lib/src/modules.rs

@@ -91,6 +91,7 @@ pub(crate) fn read_std(mod_name: &str) -> Option<&'static str> {
         "sketch" => Some(include_str!("../std/sketch.kcl")),
         "turns" => Some(include_str!("../std/turns.kcl")),
         "types" => Some(include_str!("../std/types.kcl")),
+        "solid" => Some(include_str!("../std/solid.kcl")),
         _ => None,
     }
 }

rust/kcl-lib/src/parsing/ast/types/mod.rs

@@ -3129,12 +3129,13 @@ impl fmt::Display for PrimitiveType {
 #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
 #[ts(export)]
 #[serde(tag = "type")]
+#[allow(clippy::large_enum_variant)]
 pub enum Type {
     /// A primitive type.
     Primitive(PrimitiveType),
     // An array of a primitive type.
     Array {
-        ty: PrimitiveType,
+        ty: Box<Type>,
         len: ArrayLen,
     },
     // Union/enum types
@@ -3784,14 +3785,14 @@ const cylinder = startSketchOn('-XZ')
         assert_eq!(
             params[0].type_.as_ref().unwrap().inner,
             Type::Array {
-                ty: PrimitiveType::Number(NumericSuffix::None),
+                ty: Box::new(Type::Primitive(PrimitiveType::Number(NumericSuffix::None))),
                 len: ArrayLen::None
             }
         );
         assert_eq!(
             params[1].type_.as_ref().unwrap().inner,
             Type::Array {
-                ty: PrimitiveType::String,
+                ty: Box::new(Type::Primitive(PrimitiveType::String)),
                 len: ArrayLen::None
             }
         );
@@ -3822,7 +3823,7 @@ const cylinder = startSketchOn('-XZ')
         assert_eq!(
             params[0].type_.as_ref().unwrap().inner,
             Type::Array {
-                ty: PrimitiveType::Number(NumericSuffix::None),
+                ty: Box::new(Type::Primitive(PrimitiveType::Number(NumericSuffix::None))),
                 len: ArrayLen::None
             }
         );
@@ -3862,7 +3863,7 @@ const cylinder = startSketchOn('-XZ')
                         ),
                         type_: Some(Node::new(
                             Type::Array {
-                                ty: PrimitiveType::String,
+                                ty: Box::new(Type::Primitive(PrimitiveType::String)),
                                 len: ArrayLen::None
                             },
                             59,
@@ -3951,7 +3952,7 @@ const cylinder = startSketchOn('-XZ')
                         ),
                         type_: Some(Node::new(
                             Type::Array {
-                                ty: PrimitiveType::String,
+                                ty: Box::new(Type::Primitive(PrimitiveType::String)),
                                 len: ArrayLen::None
                             },
                             37,

rust/kcl-lib/src/parsing/parser.rs

@@ -2819,7 +2819,7 @@ fn array_type(i: &mut TokenSlice) -> PResult<Node<Type>> {
     }
 
     open_bracket(i)?;
-    let ty = primitive_type(i)?;
+    let ty = argument_type(i)?;
     let len = opt((
         semi_colon,
         opt_whitespace,
@@ -2858,7 +2858,7 @@ fn array_type(i: &mut TokenSlice) -> PResult<Node<Type>> {
         ArrayLen::None
     };
 
-    Ok(ty.map(|ty| Type::Array { ty, len }))
+    Ok(ty.map(|ty| Type::Array { ty: Box::new(ty), len }))
 }
 
 fn uom_for_type(i: &mut TokenSlice) -> PResult<NumericSuffix> {

rust/kcl-lib/src/simulation_tests.rs

@@ -299,6 +299,8 @@ fn assert_common_snapshots(
                 "[].labeledArgs.*.value.**[].from[]" => rounded_redaction(4),
                 "[].labeledArgs.*.value.**[].to[]" => rounded_redaction(4),
                 ".**.sourceRange" => Vec::new(),
+                ".**.functionSourceRange" => Vec::new(),
+                ".**.moduleId" => 0,
             });
         })
     }));

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

@@ -1,7 +1,6 @@
 //! Standard library chamfers.
 
 use anyhow::Result;
-use kcl_derive_docs::stdlib;
 use kcmc::{each_cmd as mcmd, length_unit::LengthUnit, shared::CutType, ModelingCmd};
 use kittycad_modeling_cmds as kcmc;
 
@@ -31,81 +30,6 @@ pub async fn chamfer(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
     Ok(KclValue::Solid { value })
 }
 
-/// Cut a straight transitional edge along a tagged path.
-///
-/// Chamfer is similar in function and use to a fillet, except
-/// a fillet will blend the transition along an edge, rather than cut
-/// a sharp, straight transitional edge.
-///
-/// ```no_run
-/// // Chamfer a mounting plate.
-/// width = 20
-/// length = 10
-/// thickness = 1
-/// chamferLength = 2
-///
-/// mountingPlateSketch = startSketchOn(XY)
-///   |> startProfile(at = [-width/2, -length/2])
-///   |> line(endAbsolute = [width/2, -length/2], tag = $edge1)
-///   |> line(endAbsolute = [width/2, length/2], tag = $edge2)
-///   |> line(endAbsolute = [-width/2, length/2], tag = $edge3)
-///   |> close(tag = $edge4)
-///
-/// mountingPlate = extrude(mountingPlateSketch, length = thickness)
-///   |> chamfer(
-///     length = chamferLength,
-///     tags = [
-///       getNextAdjacentEdge(edge1),
-///       getNextAdjacentEdge(edge2),
-///       getNextAdjacentEdge(edge3),
-///       getNextAdjacentEdge(edge4)
-///     ],
-///   )
-/// ```
-///
-/// ```no_run
-/// // Sketch on the face of a chamfer.
-/// fn cube(pos, scale) {
-/// sg = startSketchOn(XY)
-///     |> startProfile(at = pos)
-///     |> line(end = [0, scale])
-///     |> line(end = [scale, 0])
-///     |> line(end = [0, -scale])
-///
-///     return sg
-/// }
-///
-/// part001 = cube([0,0], 20)
-///     |> close(tag = $line1)
-///     |> extrude(length = 20)
-///     // We tag the chamfer to reference it later.
-///     |> chamfer(
-///         length = 10,
-///         tags = [getOppositeEdge(line1)],
-///         tag = $chamfer1,
-///     )  
-///
-/// sketch001 = startSketchOn(part001, face = chamfer1)
-///     |> startProfile(at = [10, 10])
-///     |> line(end = [2, 0])
-///     |> line(end = [0, 2])
-///     |> line(end = [-2, 0])
-///     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
-///     |> close()
-///     |> extrude(length = 10)
-/// ```
-#[stdlib {
-    name = "chamfer",
-    feature_tree_operation = true,
-    keywords = true,
-    unlabeled_first = true,
-    args = {
-        solid = { docs = "The solid whose edges should be chamfered" },
-        length = { docs = "The length of the chamfer" },
-        tags = { docs = "The paths you want to chamfer" },
-        tag = { docs = "Create a new tag which refers to this chamfer"},
-    }
-}]
 async fn inner_chamfer(
     solid: Box<Solid>,
     length: TyF64,

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

@@ -2,7 +2,6 @@
 
 use anyhow::Result;
 use indexmap::IndexMap;
-use kcl_derive_docs::stdlib;
 use kcmc::{each_cmd as mcmd, length_unit::LengthUnit, shared::CutType, ModelingCmd};
 use kittycad_modeling_cmds as kcmc;
 use schemars::JsonSchema;
@@ -75,75 +74,6 @@ pub async fn fillet(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
     Ok(KclValue::Solid { value })
 }
 
-/// Blend a transitional edge along a tagged path, smoothing the sharp edge.
-///
-/// Fillet is similar in function and use to a chamfer, except
-/// a chamfer will cut a sharp transition along an edge while fillet
-/// will smoothly blend the transition.
-///
-/// ```no_run
-/// width = 20
-/// length = 10
-/// thickness = 1
-/// filletRadius = 2
-///
-/// mountingPlateSketch = startSketchOn("XY")
-///   |> startProfile(at = [-width/2, -length/2])
-///   |> line(endAbsolute = [width/2, -length/2], tag = $edge1)
-///   |> line(endAbsolute = [width/2, length/2], tag = $edge2)
-///   |> line(endAbsolute = [-width/2, length/2], tag = $edge3)
-///   |> close(tag = $edge4)
-///
-/// mountingPlate = extrude(mountingPlateSketch, length = thickness)
-///   |> fillet(
-///     radius = filletRadius,
-///     tags = [
-///       getNextAdjacentEdge(edge1),
-///       getNextAdjacentEdge(edge2),
-///       getNextAdjacentEdge(edge3),
-///       getNextAdjacentEdge(edge4)
-///     ],
-///   )
-/// ```
-///
-/// ```no_run
-/// width = 20
-/// length = 10
-/// thickness = 1
-/// filletRadius = 1
-///
-/// mountingPlateSketch = startSketchOn("XY")
-///   |> startProfile(at = [-width/2, -length/2])
-///   |> line(endAbsolute = [width/2, -length/2], tag = $edge1)
-///   |> line(endAbsolute = [width/2, length/2], tag = $edge2)
-///   |> line(endAbsolute = [-width/2, length/2], tag = $edge3)
-///   |> close(tag = $edge4)
-///
-/// mountingPlate = extrude(mountingPlateSketch, length = thickness)
-///   |> fillet(
-///     radius = filletRadius,
-///     tolerance = 0.000001,
-///     tags = [
-///       getNextAdjacentEdge(edge1),
-///       getNextAdjacentEdge(edge2),
-///       getNextAdjacentEdge(edge3),
-///       getNextAdjacentEdge(edge4)
-///     ],
-///   )
-/// ```
-#[stdlib {
-    name = "fillet",
-    feature_tree_operation = true,
-    keywords = true,
-    unlabeled_first = true,
-    args = {
-        solid = { docs = "The solid whose edges should be filletted" },
-        radius = { docs = "The radius of the fillet" },
-        tags = { docs = "The paths you want to fillet" },
-        tolerance = { docs = "The tolerance for this fillet" },
-        tag = { docs = "Create a new tag which refers to this fillet"},
-    }
-}]
 async fn inner_fillet(
     solid: Box<Solid>,
     radius: TyF64,

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

@@ -101,14 +101,10 @@ lazy_static! {
         Box::new(crate::std::array::Map),
         Box::new(crate::std::array::Push),
         Box::new(crate::std::array::Pop),
-        Box::new(crate::std::chamfer::Chamfer),
-        Box::new(crate::std::fillet::Fillet),
         Box::new(crate::std::edge::GetOppositeEdge),
         Box::new(crate::std::edge::GetNextAdjacentEdge),
         Box::new(crate::std::edge::GetPreviousAdjacentEdge),
         Box::new(crate::std::edge::GetCommonEdge),
-        Box::new(crate::std::shell::Shell),
-        Box::new(crate::std::shell::Hollow),
         Box::new(crate::std::sweep::Sweep),
         Box::new(crate::std::loft::Loft),
         Box::new(crate::std::math::Acos),
@@ -212,6 +208,22 @@ pub(crate) fn std_fn(path: &str, fn_name: &str) -> (crate::std::StdFn, StdFnProp
             |e, a| Box::pin(crate::std::planes::offset_plane(e, a)),
             StdFnProps::default("std::offsetPlane").include_in_feature_tree(),
         ),
+        ("solid", "fillet") => (
+            |e, a| Box::pin(crate::std::fillet::fillet(e, a)),
+            StdFnProps::default("std::solid::fillet").include_in_feature_tree(),
+        ),
+        ("solid", "chamfer") => (
+            |e, a| Box::pin(crate::std::chamfer::chamfer(e, a)),
+            StdFnProps::default("std::solid::chamfer").include_in_feature_tree(),
+        ),
+        ("solid", "shell") => (
+            |e, a| Box::pin(crate::std::shell::shell(e, a)),
+            StdFnProps::default("std::solid::shell").include_in_feature_tree(),
+        ),
+        ("solid", "hollow") => (
+            |e, a| Box::pin(crate::std::shell::hollow(e, a)),
+            StdFnProps::default("std::solid::hollow").include_in_feature_tree(),
+        ),
         _ => unreachable!(),
     }
 }

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

@@ -1,14 +1,16 @@
 //! Standard library shells.
 
 use anyhow::Result;
-use kcl_derive_docs::stdlib;
 use kcmc::{each_cmd as mcmd, length_unit::LengthUnit, ModelingCmd};
 use kittycad_modeling_cmds as kcmc;
 
 use super::args::TyF64;
 use crate::{
     errors::{KclError, KclErrorDetails},
-    execution::{types::RuntimeType, ExecState, KclValue, Solid},
+    execution::{
+        types::{ArrayLen, RuntimeType},
+        ExecState, KclValue, Solid,
+    },
     std::{sketch::FaceTag, Args},
 };
 
@@ -16,169 +18,16 @@ use crate::{
 pub async fn shell(exec_state: &mut ExecState, args: Args) -> Result<KclValue, KclError> {
     let solids = args.get_unlabeled_kw_arg_typed("solids", &RuntimeType::solids(), exec_state)?;
     let thickness: TyF64 = args.get_kw_arg_typed("thickness", &RuntimeType::length(), exec_state)?;
-    let faces = args.get_kw_arg("faces")?;
+    let faces = args.get_kw_arg_typed(
+        "faces",
+        &RuntimeType::Array(Box::new(RuntimeType::tag()), ArrayLen::NonEmpty),
+        exec_state,
+    )?;
 
     let result = inner_shell(solids, thickness, faces, exec_state, args).await?;
     Ok(result.into())
 }
 
-/// Remove volume from a 3-dimensional shape such that a wall of the
-/// provided thickness remains, taking volume starting at the provided
-/// face, leaving it open in that direction.
-///
-/// ```no_run
-/// // Remove the end face for the extrusion.
-/// firstSketch = startSketchOn(XY)
-///     |> startProfile(at = [-12, 12])
-///     |> line(end = [24, 0])
-///     |> line(end = [0, -24])
-///     |> line(end = [-24, 0])
-///     |> close()
-///     |> extrude(length = 6)
-///
-/// // Remove the end face for the extrusion.
-/// shell(
-///     firstSketch,
-///     faces = [END],
-///     thickness = 0.25,
-/// )
-/// ```
-///
-/// ```no_run
-/// // Remove the start face for the extrusion.
-/// firstSketch = startSketchOn(-XZ)
-///     |> startProfile(at = [-12, 12])
-///     |> line(end = [24, 0])
-///     |> line(end = [0, -24])
-///     |> line(end = [-24, 0])
-///     |> close()
-///     |> extrude(length = 6)
-///
-/// // Remove the start face for the extrusion.
-/// shell(
-///     firstSketch,
-///     faces = [START],
-///     thickness = 0.25,
-/// )
-/// ```
-///
-/// ```no_run
-/// // Remove a tagged face and the end face for the extrusion.
-/// firstSketch = startSketchOn(XY)
-///     |> startProfile(at = [-12, 12])
-///     |> line(end = [24, 0])
-///     |> line(end = [0, -24])
-///     |> line(end = [-24, 0], tag = $myTag)
-///     |> close()
-///     |> extrude(length = 6)
-///
-/// // Remove a tagged face for the extrusion.
-/// shell(
-///     firstSketch,
-///     faces = [myTag],
-///     thickness = 0.25,
-/// )
-/// ```
-///
-/// ```no_run
-/// // Remove multiple faces at once.
-/// firstSketch = startSketchOn(XY)
-///     |> startProfile(at = [-12, 12])
-///     |> line(end = [24, 0])
-///     |> line(end = [0, -24])
-///     |> line(end = [-24, 0], tag = $myTag)
-///     |> close()
-///     |> extrude(length = 6)
-///
-/// // Remove a tagged face and the end face for the extrusion.
-/// shell(
-///     firstSketch,
-///     faces = [myTag, END],
-///     thickness = 0.25,
-/// )
-/// ```
-///
-/// ```no_run
-/// // Shell a sketch on face.
-/// size = 100
-/// case = startSketchOn(-XZ)
-///     |> startProfile(at = [-size, -size])
-///     |> line(end = [2 * size, 0])
-///     |> line(end = [0, 2 * size])
-///     |> tangentialArc(endAbsolute = [-size, size])
-///     |> close()
-///     |> extrude(length = 65)
-///
-/// thing1 = startSketchOn(case, face = END)
-///     |> circle( center = [-size / 2, -size / 2], radius = 25 )
-///     |> extrude(length = 50)
-///
-/// thing2 = startSketchOn(case, face = END)
-///     |> circle( center = [size / 2, -size / 2], radius = 25 )
-///     |> extrude(length = 50)
-///
-/// // We put "case" in the shell function to shell the entire object.
-/// shell(case, faces = [START], thickness = 5)
-/// ```
-///
-/// ```no_run
-/// // Shell a sketch on face object on the end face.
-/// size = 100
-/// case = startSketchOn(XY)
-///     |> startProfile(at = [-size, -size])
-///     |> line(end = [2 * size, 0])
-///     |> line(end = [0, 2 * size])
-///     |> tangentialArc(endAbsolute = [-size, size])
-///     |> close()
-///     |> extrude(length = 65)
-///
-/// thing1 = startSketchOn(case, face = END)
-///     |> circle( center = [-size / 2, -size / 2], radius = 25 )
-///     |> extrude(length = 50)
-///
-/// thing2 = startSketchOn(case, face = END)
-///     |> circle( center = [size / 2, -size / 2], radius = 25 )
-///     |> extrude(length = 50)
-///
-/// // We put "thing1" in the shell function to shell the end face of the object.
-/// shell(thing1, faces = [END], thickness = 5)
-/// ```
-///
-/// ```no_run
-/// // Shell sketched on face objects on the end face, include all sketches to shell
-/// // the entire object.
-///
-/// size = 100
-/// case = startSketchOn(XY)
-///     |> startProfile(at = [-size, -size])
-///     |> line(end = [2 * size, 0])
-///     |> line(end = [0, 2 * size])
-///     |> tangentialArc(endAbsolute = [-size, size])
-///     |> close()
-///     |> extrude(length = 65)
-///
-/// thing1 = startSketchOn(case, face = END)
-///     |> circle( center = [-size / 2, -size / 2], radius = 25 )
-///     |> extrude(length = 50)
-///
-/// thing2 = startSketchOn(case, face = END)
-///     |> circle( center = [size / 2, -size / 2], radius = 25)
-///     |> extrude(length = 50)
-///
-/// // We put "thing1" and "thing2" in the shell function to shell the end face of the object.
-/// shell([thing1, thing2], faces = [END], thickness = 5)
-/// ```
-#[stdlib {
-    name = "shell",
-    feature_tree_operation = true,
-    keywords = true,
-    unlabeled_first = true,
-    args = {
-        solids = { docs = "Which solid (or solids) to shell out"},
-        thickness = {docs = "The thickness of the shell"},
-        faces = {docs = "The faces you want removed"},
-    }
-}]
 async fn inner_shell(
     solids: Vec<Solid>,
     thickness: TyF64,
@@ -253,66 +102,6 @@ pub async fn hollow(exec_state: &mut ExecState, args: Args) -> Result<KclValue,
     Ok(KclValue::Solid { value })
 }
 
-/// Make the inside of a 3D object hollow.
-///
-/// Remove volume from a 3-dimensional shape such that a wall of the
-/// provided thickness remains around the exterior of the shape.
-///
-/// ```no_run
-/// // Hollow a basic sketch.
-/// firstSketch = startSketchOn(XY)
-///     |> startProfile(at = [-12, 12])
-///     |> line(end = [24, 0])
-///     |> line(end = [0, -24])
-///     |> line(end = [-24, 0])
-///     |> close()
-///     |> extrude(length = 6)
-///     |> hollow(thickness = 0.25)
-/// ```
-///
-/// ```no_run
-/// // Hollow a basic sketch.
-/// firstSketch = startSketchOn(-XZ)
-///     |> startProfile(at = [-12, 12])
-///     |> line(end = [24, 0])
-///     |> line(end = [0, -24])
-///     |> line(end = [-24, 0])
-///     |> close()
-///     |> extrude(length = 6)
-///     |> hollow(thickness = 0.5)
-/// ```
-///
-/// ```no_run
-/// // Hollow a sketch on face object.
-/// size = 100
-/// case = startSketchOn(-XZ)
-///     |> startProfile(at = [-size, -size])
-///     |> line(end = [2 * size, 0])
-///     |> line(end = [0, 2 * size])
-///     |> tangentialArc(endAbsolute = [-size, size])
-///     |> close()
-///     |> extrude(length = 65)
-///
-/// thing1 = startSketchOn(case, face = END)
-///     |> circle( center = [-size / 2, -size / 2], radius = 25 )
-///     |> extrude(length = 50)
-///
-/// thing2 = startSketchOn(case, face = END)
-///     |> circle( center = [size / 2, -size / 2], radius = 25 )
-///     |> extrude(length = 50)
-///
-/// hollow(case, thickness = 0.5)
-/// ```
-#[stdlib {
-    name = "hollow",
-    feature_tree_operation = true,
-    keywords = true,
-    unlabeled_first = true,
-    args = {
-        solid = { docs = "Which solid to shell out" },
-        thickness = {docs = "The thickness of the shell" },
-    }
-}]
 async fn inner_hollow(
     solid: Box<Solid>,
     thickness: TyF64,

rust/kcl-lib/std/prelude.kcl

@@ -6,6 +6,7 @@
 export import * from "std::types"
 export import * from "std::math"
 export import * from "std::sketch"
+export import * from "std::solid"
 export import "std::turns"
 
 export XY = {

rust/kcl-lib/std/solid.kcl

@@ -0,0 +1,364 @@
+@no_std
+@settings(defaultLengthUnit = mm)
+
+import Face from "std::types"
+
+/// Blend a transitional edge along a tagged path, smoothing the sharp edge.
+///
+/// Fillet is similar in function and use to a chamfer, except
+/// a chamfer will cut a sharp transition along an edge while fillet
+/// will smoothly blend the transition.
+///
+/// ```
+/// width = 20
+/// length = 10
+/// thickness = 1
+/// filletRadius = 2
+///
+/// mountingPlateSketch = startSketchOn(XY)
+///   |> startProfile(at = [-width/2, -length/2])
+///   |> line(endAbsolute = [width/2, -length/2], tag = $edge1)
+///   |> line(endAbsolute = [width/2, length/2], tag = $edge2)
+///   |> line(endAbsolute = [-width/2, length/2], tag = $edge3)
+///   |> close(tag = $edge4)
+///
+/// mountingPlate = extrude(mountingPlateSketch, length = thickness)
+///   |> fillet(
+///     radius = filletRadius,
+///     tags = [
+///       getNextAdjacentEdge(edge1),
+///       getNextAdjacentEdge(edge2),
+///       getNextAdjacentEdge(edge3),
+///       getNextAdjacentEdge(edge4)
+///     ],
+///   )
+/// ```
+///
+/// ```
+/// width = 20
+/// length = 10
+/// thickness = 1
+/// filletRadius = 1
+///
+/// mountingPlateSketch = startSketchOn(XY)
+///   |> startProfile(at = [-width/2, -length/2])
+///   |> line(endAbsolute = [width/2, -length/2], tag = $edge1)
+///   |> line(endAbsolute = [width/2, length/2], tag = $edge2)
+///   |> line(endAbsolute = [-width/2, length/2], tag = $edge3)
+///   |> close(tag = $edge4)
+///
+/// mountingPlate = extrude(mountingPlateSketch, length = thickness)
+///   |> fillet(
+///     radius = filletRadius,
+///     tolerance = 0.000001,
+///     tags = [
+///       getNextAdjacentEdge(edge1),
+///       getNextAdjacentEdge(edge2),
+///       getNextAdjacentEdge(edge3),
+///       getNextAdjacentEdge(edge4)
+///     ],
+///   )
+/// ```
+@(impl = std_rust)
+export fn fillet(
+  /// The solid whose edges should be filletted
+  @solid: Solid,
+  /// The radius of the fillet
+  radius: number(Length),
+  /// The paths you want to fillet
+  tags: [Edge; 1+],
+  /// The tolerance for this fillet
+  tolerance?: number(Length),
+  /// Create a new tag which refers to this fillet
+  tag?: tag,
+): Solid {}
+
+/// Cut a straight transitional edge along a tagged path.
+///
+/// Chamfer is similar in function and use to a fillet, except
+/// a fillet will blend the transition along an edge, rather than cut
+/// a sharp, straight transitional edge.
+///
+/// ```
+/// // Chamfer a mounting plate.
+/// width = 20
+/// length = 10
+/// thickness = 1
+/// chamferLength = 2
+///
+/// mountingPlateSketch = startSketchOn(XY)
+///   |> startProfile(at = [-width/2, -length/2])
+///   |> line(endAbsolute = [width/2, -length/2], tag = $edge1)
+///   |> line(endAbsolute = [width/2, length/2], tag = $edge2)
+///   |> line(endAbsolute = [-width/2, length/2], tag = $edge3)
+///   |> close(tag = $edge4)
+///
+/// mountingPlate = extrude(mountingPlateSketch, length = thickness)
+///   |> chamfer(
+///     length = chamferLength,
+///     tags = [
+///       getNextAdjacentEdge(edge1),
+///       getNextAdjacentEdge(edge2),
+///       getNextAdjacentEdge(edge3),
+///       getNextAdjacentEdge(edge4)
+///     ],
+///   )
+/// ```
+///
+/// ```
+/// // Sketch on the face of a chamfer.
+/// fn cube(pos, scale) {
+/// sg = startSketchOn(XY)
+///     |> startProfile(at = pos)
+///     |> line(end = [0, scale])
+///     |> line(end = [scale, 0])
+///     |> line(end = [0, -scale])
+///
+///     return sg
+/// }
+///
+/// part001 = cube([0,0], 20)
+///     |> close(tag = $line1)
+///     |> extrude(length = 20)
+///     // We tag the chamfer to reference it later.
+///     |> chamfer(
+///         length = 10,
+///         tags = [getOppositeEdge(line1)],
+///         tag = $chamfer1,
+///     )  
+///
+/// sketch001 = startSketchOn(part001, face = chamfer1)
+///     |> startProfile(at = [10, 10])
+///     |> line(end = [2, 0])
+///     |> line(end = [0, 2])
+///     |> line(end = [-2, 0])
+///     |> line(endAbsolute = [profileStartX(%), profileStartY(%)])
+///     |> close()
+///     |> extrude(length = 10)
+/// ```
+@(impl = std_rust)
+export fn chamfer(
+  /// The solid whose edges should be chamfered
+  @solid: Solid,
+  /// The length of the chamfer
+  length: number(Length),
+  /// The paths you want to chamfer
+  tags: [Edge; 1+],
+  /// Create a new tag which refers to this chamfer
+  tag?: tag,
+): Solid {}
+
+/// Remove volume from a 3-dimensional shape such that a wall of the
+/// provided thickness remains, taking volume starting at the provided
+/// face, leaving it open in that direction.
+///
+/// ```
+/// // Remove the end face for the extrusion.
+/// firstSketch = startSketchOn(XY)
+///     |> startProfile(at = [-12, 12])
+///     |> line(end = [24, 0])
+///     |> line(end = [0, -24])
+///     |> line(end = [-24, 0])
+///     |> close()
+///     |> extrude(length = 6)
+///
+/// // Remove the end face for the extrusion.
+/// shell(
+///     firstSketch,
+///     faces = [END],
+///     thickness = 0.25,
+/// )
+/// ```
+///
+/// ```
+/// // Remove the start face for the extrusion.
+/// firstSketch = startSketchOn(-XZ)
+///     |> startProfile(at = [-12, 12])
+///     |> line(end = [24, 0])
+///     |> line(end = [0, -24])
+///     |> line(end = [-24, 0])
+///     |> close()
+///     |> extrude(length = 6)
+///
+/// // Remove the start face for the extrusion.
+/// shell(
+///     firstSketch,
+///     faces = [START],
+///     thickness = 0.25,
+/// )
+/// ```
+///
+/// ```
+/// // Remove a tagged face and the end face for the extrusion.
+/// firstSketch = startSketchOn(XY)
+///     |> startProfile(at = [-12, 12])
+///     |> line(end = [24, 0])
+///     |> line(end = [0, -24])
+///     |> line(end = [-24, 0], tag = $myTag)
+///     |> close()
+///     |> extrude(length = 6)
+///
+/// // Remove a tagged face for the extrusion.
+/// shell(
+///     firstSketch,
+///     faces = [myTag],
+///     thickness = 0.25,
+/// )
+/// ```
+///
+/// ```
+/// // Remove multiple faces at once.
+/// firstSketch = startSketchOn(XY)
+///     |> startProfile(at = [-12, 12])
+///     |> line(end = [24, 0])
+///     |> line(end = [0, -24])
+///     |> line(end = [-24, 0], tag = $myTag)
+///     |> close()
+///     |> extrude(length = 6)
+///
+/// // Remove a tagged face and the end face for the extrusion.
+/// shell(
+///     firstSketch,
+///     faces = [myTag, END],
+///     thickness = 0.25,
+/// )
+/// ```
+///
+/// ```
+/// // Shell a sketch on face.
+/// size = 100
+/// case = startSketchOn(-XZ)
+///     |> startProfile(at = [-size, -size])
+///     |> line(end = [2 * size, 0])
+///     |> line(end = [0, 2 * size])
+///     |> tangentialArc(endAbsolute = [-size, size])
+///     |> close()
+///     |> extrude(length = 65)
+///
+/// thing1 = startSketchOn(case, face = END)
+///     |> circle( center = [-size / 2, -size / 2], radius = 25 )
+///     |> extrude(length = 50)
+///
+/// thing2 = startSketchOn(case, face = END)
+///     |> circle( center = [size / 2, -size / 2], radius = 25 )
+///     |> extrude(length = 50)
+///
+/// // We put "case" in the shell function to shell the entire object.
+/// shell(case, faces = [START], thickness = 5)
+/// ```
+///
+/// ```
+/// // Shell a sketch on face object on the end face.
+/// size = 100
+/// case = startSketchOn(XY)
+///     |> startProfile(at = [-size, -size])
+///     |> line(end = [2 * size, 0])
+///     |> line(end = [0, 2 * size])
+///     |> tangentialArc(endAbsolute = [-size, size])
+///     |> close()
+///     |> extrude(length = 65)
+///
+/// thing1 = startSketchOn(case, face = END)
+///     |> circle( center = [-size / 2, -size / 2], radius = 25 )
+///     |> extrude(length = 50)
+///
+/// thing2 = startSketchOn(case, face = END)
+///     |> circle( center = [size / 2, -size / 2], radius = 25 )
+///     |> extrude(length = 50)
+///
+/// // We put "thing1" in the shell function to shell the end face of the object.
+/// shell(thing1, faces = [END], thickness = 5)
+/// ```
+///
+/// ```
+/// // Shell sketched on face objects on the end face, include all sketches to shell
+/// // the entire object.
+///
+/// size = 100
+/// case = startSketchOn(XY)
+///     |> startProfile(at = [-size, -size])
+///     |> line(end = [2 * size, 0])
+///     |> line(end = [0, 2 * size])
+///     |> tangentialArc(endAbsolute = [-size, size])
+///     |> close()
+///     |> extrude(length = 65)
+///
+/// thing1 = startSketchOn(case, face = END)
+///     |> circle( center = [-size / 2, -size / 2], radius = 25 )
+///     |> extrude(length = 50)
+///
+/// thing2 = startSketchOn(case, face = END)
+///     |> circle( center = [size / 2, -size / 2], radius = 25)
+///     |> extrude(length = 50)
+///
+/// // We put "thing1" and "thing2" in the shell function to shell the end face of the object.
+/// shell([thing1, thing2], faces = [END], thickness = 5)
+/// ```
+@(impl = std_rust)
+export fn shell(
+  /// Which solid (or solids) to shell out
+  @solids: [Solid; 1+],
+  /// The thickness of the shell
+  thickness: number(Length),
+  /// The faces you want removed
+  faces: [tag; 1+],
+): [Solid] {}
+
+
+/// Make the inside of a 3D object hollow.
+///
+/// Remove volume from a 3-dimensional shape such that a wall of the
+/// provided thickness remains around the exterior of the shape.
+///
+/// ```
+/// // Hollow a basic sketch.
+/// firstSketch = startSketchOn(XY)
+///     |> startProfile(at = [-12, 12])
+///     |> line(end = [24, 0])
+///     |> line(end = [0, -24])
+///     |> line(end = [-24, 0])
+///     |> close()
+///     |> extrude(length = 6)
+///     |> hollow (thickness = 0.25)
+/// ```
+///
+/// ```
+/// // Hollow a basic sketch.
+/// firstSketch = startSketchOn(-XZ)
+///     |> startProfile(at = [-12, 12])
+///     |> line(end = [24, 0])
+///     |> line(end = [0, -24])
+///     |> line(end = [-24, 0])
+///     |> close()
+///     |> extrude(length = 6)
+///     |> hollow (thickness = 0.5)
+/// ```
+///
+/// ```
+/// // Hollow a sketch on face object.
+/// size = 100
+/// case = startSketchOn(-XZ)
+///     |> startProfile(at = [-size, -size])
+///     |> line(end = [2 * size, 0])
+///     |> line(end = [0, 2 * size])
+///     |> tangentialArc(endAbsolute = [-size, size])
+///     |> close()
+///     |> extrude(length = 65)
+///
+/// thing1 = startSketchOn(case, face = END)
+///     |> circle( center = [-size / 2, -size / 2], radius = 25 )
+///     |> extrude(length = 50)
+///
+/// thing2 = startSketchOn(case, face = END)
+///     |> circle( center = [size / 2, -size / 2], radius = 25 )
+///     |> extrude(length = 50)
+///
+/// hollow(case, thickness = 0.5)
+/// ```
+@(impl = std_rust)
+export fn hollow(
+  /// Which solid to hollow out
+  @solid: Solid,
+  /// The thickness of the remaining shell
+  thickness: number(Length),
+): Solid {}

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

@@ -8,11 +8,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -26,11 +22,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -44,11 +36,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -62,11 +50,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -80,11 +64,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -98,11 +78,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -116,11 +92,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -134,11 +106,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -152,11 +120,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -170,11 +134,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -188,11 +148,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -206,11 +162,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -224,11 +176,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -242,11 +190,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -260,11 +204,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -278,11 +218,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -296,11 +232,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -314,11 +246,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -332,11 +260,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -350,11 +274,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -368,11 +288,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -386,11 +302,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -404,11 +316,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -422,11 +330,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -440,11 +344,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -458,11 +358,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -476,11 +372,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -494,11 +386,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -512,11 +400,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -530,11 +414,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -548,11 +428,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -566,11 +442,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -584,11 +456,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -602,11 +470,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -620,11 +484,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -638,11 +498,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -656,11 +512,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -674,11 +526,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -692,11 +540,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -710,11 +554,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -728,11 +568,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -746,11 +582,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -764,11 +596,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -782,11 +610,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -800,11 +624,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -818,11 +638,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -836,11 +652,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -854,11 +666,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -872,11 +680,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -890,11 +694,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -908,11 +708,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -926,11 +722,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -944,11 +736,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -962,11 +750,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -980,11 +764,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -998,11 +778,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1016,11 +792,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1034,11 +806,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1052,11 +820,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1070,11 +834,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1088,11 +848,7 @@ description: Operations executed add_lots.kcl
     "group": {
       "type": "FunctionCall",
       "name": "f",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4,
-        26,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -51,6 +51,17 @@ description: Operations executed artifact_graph_example_code1.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -82,18 +93,7 @@ description: Operations executed artifact_graph_example_code1.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "labeledArgs": {

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

@@ -1,25 +1,25 @@
 ```mermaid
 flowchart LR
   subgraph path2 [Path]
-    2["Path<br>[76, 116, 6]"]
+    2["Path<br>[76, 116, 7]"]
-    3["Segment<br>[122, 139, 6]"]
+    3["Segment<br>[122, 139, 7]"]
-    4["Segment<br>[145, 163, 6]"]
+    4["Segment<br>[145, 163, 7]"]
-    5["Segment<br>[169, 187, 6]"]
+    5["Segment<br>[169, 187, 7]"]
-    6["Segment<br>[193, 249, 6]"]
+    6["Segment<br>[193, 249, 7]"]
-    7["Segment<br>[255, 262, 6]"]
+    7["Segment<br>[255, 262, 7]"]
     8[Solid2d]
   end
   subgraph path25 [Path]
-    25["Path<br>[76, 114, 7]"]
+    25["Path<br>[76, 114, 8]"]
-    26["Segment<br>[120, 137, 7]"]
+    26["Segment<br>[120, 137, 8]"]
-    27["Segment<br>[143, 161, 7]"]
+    27["Segment<br>[143, 161, 8]"]
-    28["Segment<br>[167, 185, 7]"]
+    28["Segment<br>[167, 185, 8]"]
-    29["Segment<br>[191, 247, 7]"]
+    29["Segment<br>[191, 247, 8]"]
-    30["Segment<br>[253, 260, 7]"]
+    30["Segment<br>[253, 260, 8]"]
     31[Solid2d]
   end
-  1["Plane<br>[47, 66, 6]"]
+  1["Plane<br>[47, 66, 7]"]
-  9["Sweep Extrusion<br>[268, 290, 6]"]
+  9["Sweep Extrusion<br>[268, 290, 7]"]
   10[Wall]
   11[Wall]
   12[Wall]
@@ -34,8 +34,8 @@ flowchart LR
   21["SweepEdge Adjacent"]
   22["SweepEdge Opposite"]
   23["SweepEdge Adjacent"]
-  24["Plane<br>[47, 66, 7]"]
+  24["Plane<br>[47, 66, 8]"]
-  32["Sweep Extrusion<br>[266, 288, 7]"]
+  32["Sweep Extrusion<br>[266, 288, 8]"]
   33[Wall]
   34[Wall]
   35[Wall]

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

@@ -8,7 +8,7 @@ description: Operations executed assembly_mixed_units_cubes.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "cubeIn",
-      "moduleId": 6
+      "moduleId": 0
     },
     "sourceRange": []
   },
@@ -67,7 +67,7 @@ description: Operations executed assembly_mixed_units_cubes.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "cubeMm",
-      "moduleId": 7
+      "moduleId": 0
     },
     "sourceRange": []
   },

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

@@ -5,10 +5,10 @@ description: Variables in memory after executing assembly_mixed_units_cubes.kcl
 {
   "cubeIn": {
     "type": "Module",
-    "value": 6
+    "value": 7
   },
   "cubeMm": {
     "type": "Module",
-    "value": 7
+    "value": 8
   }
 }

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

@@ -1,17 +1,17 @@
 ```mermaid
 flowchart LR
   subgraph path2 [Path]
-    2["Path<br>[197, 232, 6]"]
+    2["Path<br>[197, 232, 7]"]
-    3["Segment<br>[197, 232, 6]"]
+    3["Segment<br>[197, 232, 7]"]
     4[Solid2d]
   end
   subgraph path6 [Path]
-    6["Path<br>[113, 148, 7]"]
+    6["Path<br>[113, 148, 8]"]
-    7["Segment<br>[113, 148, 7]"]
+    7["Segment<br>[113, 148, 8]"]
     8[Solid2d]
   end
-  1["Plane<br>[172, 191, 6]"]
+  1["Plane<br>[172, 191, 7]"]
-  5["Plane<br>[88, 107, 7]"]
+  5["Plane<br>[88, 107, 8]"]
   1 --- 2
   2 --- 3
   2 --- 4

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

@@ -8,7 +8,7 @@ description: Operations executed assembly_non_default_units.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "other1",
-      "moduleId": 6
+      "moduleId": 0
     },
     "sourceRange": []
   },
@@ -35,7 +35,7 @@ description: Operations executed assembly_non_default_units.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "other2",
-      "moduleId": 7
+      "moduleId": 0
     },
     "sourceRange": []
   },

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

@@ -5,10 +5,10 @@ description: Variables in memory after executing assembly_non_default_units.kcl
 {
   "other1": {
     "type": "Module",
-    "value": 6
+    "value": 7
   },
   "other2": {
     "type": "Module",
-    "value": 7
+    "value": 8
   }
 }

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

@@ -51,6 +51,17 @@ description: Operations executed basic_fillet_cube_close_opposite.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -86,17 +97,6 @@ description: Operations executed basic_fillet_cube_close_opposite.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   }
 ]

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

@@ -51,6 +51,17 @@ description: Operations executed basic_fillet_cube_end.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -86,17 +97,6 @@ description: Operations executed basic_fillet_cube_end.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   }
 ]

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

@@ -51,6 +51,17 @@ description: Operations executed basic_fillet_cube_next_adjacent.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -81,17 +92,6 @@ description: Operations executed basic_fillet_cube_next_adjacent.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   }
 ]

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

@@ -51,6 +51,17 @@ description: Operations executed basic_fillet_cube_previous_adjacent.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -81,17 +92,6 @@ description: Operations executed basic_fillet_cube_previous_adjacent.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   }
 ]

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

@@ -51,6 +51,17 @@ description: Operations executed basic_fillet_cube_start.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -87,17 +98,6 @@ description: Operations executed basic_fillet_cube_start.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   }
 ]

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

@@ -8,11 +8,7 @@ description: Operations executed computed_var.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -8,11 +8,7 @@ description: Operations executed cube.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cube",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        7,
-        404,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {
         "center": {

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

@@ -8,11 +8,7 @@ description: Operations executed cube_with_error.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cube",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        7,
-        392,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -66,6 +66,17 @@ description: Operations executed fillet-and-shell.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -108,29 +119,14 @@ description: Operations executed fillet-and-shell.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "type": "GroupBegin",
     "group": {
       "type": "FunctionCall",
       "name": "m25Screw",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1289,
-        1527,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -216,11 +212,7 @@ description: Operations executed fillet-and-shell.kcl
     "group": {
       "type": "FunctionCall",
       "name": "m25Screw",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1289,
-        1527,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -306,11 +298,7 @@ description: Operations executed fillet-and-shell.kcl
     "group": {
       "type": "FunctionCall",
       "name": "m25Screw",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1289,
-        1527,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -396,11 +384,7 @@ description: Operations executed fillet-and-shell.kcl
     "group": {
       "type": "FunctionCall",
       "name": "m25Screw",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1289,
-        1527,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -482,6 +466,22 @@ description: Operations executed fillet-and-shell.kcl
     "type": "GroupEnd"
   },
   {
+    "type": "KclStdLibCall",
+    "name": "shell",
+    "unlabeledArg": {
+      "value": {
+        "type": "Array",
+        "value": [
+          {
+            "type": "Solid",
+            "value": {
+              "artifactId": "[uuid]"
+            }
+          }
+        ]
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "faces": {
         "value": {
@@ -512,17 +512,6 @@ description: Operations executed fillet-and-shell.kcl
         "sourceRange": []
       }
     },
-    "name": "shell",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   }
 ]

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

@@ -8,11 +8,7 @@ description: Operations executed function_sketch.kcl
     "group": {
       "type": "FunctionCall",
       "name": "box",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        6,
-        220,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -8,11 +8,7 @@ description: Operations executed function_sketch_with_position.kcl
     "group": {
       "type": "FunctionCall",
       "name": "box",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        6,
-        218,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -3598,7 +3598,7 @@ description: Variables in memory after executing import_async.kcl
   },
   "screw": {
     "type": "Module",
-    "value": 6
+    "value": 7
   },
   "start": {
     "type": "Sketch",

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

@@ -8,7 +8,7 @@ description: Operations executed import_foreign.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "cube",
-      "moduleId": 6
+      "moduleId": 0
     },
     "sourceRange": []
   },

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

@@ -5,7 +5,7 @@ description: Variables in memory after executing import_foreign.kcl
 {
   "cube": {
     "type": "Module",
-    "value": 6
+    "value": 7
   },
   "model": {
     "type": "ImportedGeometry",

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

@@ -1,19 +1,19 @@
 ```mermaid
 flowchart LR
   subgraph path2 [Path]
-    2["Path<br>[75, 101, 6]"]
+    2["Path<br>[75, 101, 7]"]
-    3["Segment<br>[107, 125, 6]"]
+    3["Segment<br>[107, 125, 7]"]
-    4["Segment<br>[131, 150, 6]"]
+    4["Segment<br>[131, 150, 7]"]
-    5["Segment<br>[156, 175, 6]"]
+    5["Segment<br>[156, 175, 7]"]
-    6["Segment<br>[181, 200, 6]"]
+    6["Segment<br>[181, 200, 7]"]
-    7["Segment<br>[206, 231, 6]"]
+    7["Segment<br>[206, 231, 7]"]
-    8["Segment<br>[237, 258, 6]"]
+    8["Segment<br>[237, 258, 7]"]
-    9["Segment<br>[264, 283, 6]"]
+    9["Segment<br>[264, 283, 7]"]
-    10["Segment<br>[289, 296, 6]"]
+    10["Segment<br>[289, 296, 7]"]
     11[Solid2d]
   end
-  1["Plane<br>[52, 69, 6]"]
+  1["Plane<br>[52, 69, 7]"]
-  12["Sweep Revolve<br>[302, 319, 6]"]
+  12["Sweep Revolve<br>[302, 319, 7]"]
   13[Wall]
   14[Wall]
   15[Wall]

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

@@ -1,11 +1,11 @@
 ```mermaid
 flowchart LR
   subgraph path2 [Path]
-    2["Path<br>[102, 138, 6]"]
+    2["Path<br>[102, 138, 7]"]
-    3["Segment<br>[102, 138, 6]"]
+    3["Segment<br>[102, 138, 7]"]
     4[Solid2d]
   end
-  1["Plane<br>[77, 96, 6]"]
+  1["Plane<br>[77, 96, 7]"]
   1 --- 2
   2 --- 3
   2 --- 4

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

@@ -8,7 +8,7 @@ description: Operations executed import_transform.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "screw",
-      "moduleId": 6
+      "moduleId": 0
     },
     "sourceRange": []
   },

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

@@ -5,6 +5,6 @@ description: Variables in memory after executing import_transform.kcl
 {
   "screw": {
     "type": "Module",
-    "value": 6
+    "value": 7
   }
 }

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

@@ -1,12 +1,12 @@
 ```mermaid
 flowchart LR
   subgraph path2 [Path]
-    2["Path<br>[82, 118, 6]"]
+    2["Path<br>[82, 118, 7]"]
-    3["Segment<br>[82, 118, 6]"]
+    3["Segment<br>[82, 118, 7]"]
     4[Solid2d]
   end
-  1["Plane<br>[59, 76, 6]"]
+  1["Plane<br>[59, 76, 7]"]
-  5["Sweep Extrusion<br>[124, 144, 6]"]
+  5["Sweep Extrusion<br>[124, 144, 7]"]
   6[Wall]
   7["Cap Start"]
   8["Cap End"]

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

@@ -8,7 +8,7 @@ description: Operations executed import_whole.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "foo",
-      "moduleId": 6
+      "moduleId": 0
     },
     "sourceRange": []
   },

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

@@ -113,6 +113,6 @@ description: Variables in memory after executing import_whole.kcl
   },
   "foo": {
     "type": "Module",
-    "value": 6
+    "value": 7
   }
 }

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

@@ -8,11 +8,7 @@ description: Operations executed intersect_cubes.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cube",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        7,
-        356,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -73,11 +69,7 @@ description: Operations executed intersect_cubes.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cube",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        7,
-        356,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -8,11 +8,7 @@ description: Operations executed 80-20-rail.kcl
     "group": {
       "type": "FunctionCall",
       "name": "rail8020",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        239,
-        6542,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -91,6 +87,17 @@ description: Operations executed 80-20-rail.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -181,9 +188,11 @@ description: Operations executed 80-20-rail.kcl
         "sourceRange": []
       }
     },
+    "sourceRange": []
+  },
+  {
+    "type": "KclStdLibCall",
     "name": "fillet",
-    "sourceRange": [],
-    "type": "StdLibCall",
     "unlabeledArg": {
       "value": {
         "type": "Solid",
@@ -192,9 +201,7 @@ description: Operations executed 80-20-rail.kcl
         }
       },
       "sourceRange": []
-    }
+    },
-  },
-  {
     "labeledArgs": {
       "radius": {
         "value": {
@@ -285,18 +292,7 @@ description: Operations executed 80-20-rail.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "type": "GroupEnd"

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

@@ -1,164 +1,164 @@
 ```mermaid
 flowchart LR
   subgraph path2 [Path]
-    2["Path<br>[323, 370, 6]"]
+    2["Path<br>[323, 370, 7]"]
-    3["Segment<br>[376, 444, 6]"]
+    3["Segment<br>[376, 444, 7]"]
-    4["Segment<br>[450, 550, 6]"]
+    4["Segment<br>[450, 550, 7]"]
-    5["Segment<br>[556, 673, 6]"]
+    5["Segment<br>[556, 673, 7]"]
-    6["Segment<br>[679, 764, 6]"]
+    6["Segment<br>[679, 764, 7]"]
-    7["Segment<br>[770, 777, 6]"]
+    7["Segment<br>[770, 777, 7]"]
     8[Solid2d]
   end
   subgraph path9 [Path]
-    9["Path<br>[801, 836, 6]"]
+    9["Path<br>[801, 836, 7]"]
-    10["Segment<br>[801, 836, 6]"]
+    10["Segment<br>[801, 836, 7]"]
     11[Solid2d]
   end
   subgraph path12 [Path]
-    12["Path<br>[861, 1008, 6]"]
+    12["Path<br>[861, 1008, 7]"]
-    13["Segment<br>[861, 1008, 6]"]
+    13["Segment<br>[861, 1008, 7]"]
     14[Solid2d]
   end
   subgraph path15 [Path]
-    15["Path<br>[1033, 1181, 6]"]
+    15["Path<br>[1033, 1181, 7]"]
-    16["Segment<br>[1033, 1181, 6]"]
+    16["Segment<br>[1033, 1181, 7]"]
     17[Solid2d]
   end
   subgraph path18 [Path]
-    18["Path<br>[1206, 1354, 6]"]
+    18["Path<br>[1206, 1354, 7]"]
-    19["Segment<br>[1206, 1354, 6]"]
+    19["Segment<br>[1206, 1354, 7]"]
     20[Solid2d]
   end
   subgraph path21 [Path]
-    21["Path<br>[1379, 1528, 6]"]
+    21["Path<br>[1379, 1528, 7]"]
-    22["Segment<br>[1379, 1528, 6]"]
+    22["Segment<br>[1379, 1528, 7]"]
     23[Solid2d]
   end
   subgraph path39 [Path]
-    39["Path<br>[1696, 1752, 6]"]
+    39["Path<br>[1696, 1752, 7]"]
-    40["Segment<br>[1758, 1823, 6]"]
+    40["Segment<br>[1758, 1823, 7]"]
-    41["Segment<br>[1829, 1881, 6]"]
+    41["Segment<br>[1829, 1881, 7]"]
-    42["Segment<br>[1887, 1938, 6]"]
+    42["Segment<br>[1887, 1938, 7]"]
-    43["Segment<br>[1944, 1996, 6]"]
+    43["Segment<br>[1944, 1996, 7]"]
-    44["Segment<br>[2002, 2068, 6]"]
+    44["Segment<br>[2002, 2068, 7]"]
-    45["Segment<br>[2074, 2126, 6]"]
+    45["Segment<br>[2074, 2126, 7]"]
-    46["Segment<br>[2132, 2164, 6]"]
+    46["Segment<br>[2132, 2164, 7]"]
-    47["Segment<br>[2170, 2235, 6]"]
+    47["Segment<br>[2170, 2235, 7]"]
-    48["Segment<br>[2241, 2248, 6]"]
+    48["Segment<br>[2241, 2248, 7]"]
     49[Solid2d]
   end
   subgraph path78 [Path]
-    78["Path<br>[2597, 2710, 6]"]
+    78["Path<br>[2597, 2710, 7]"]
-    79["Segment<br>[2716, 2771, 6]"]
+    79["Segment<br>[2716, 2771, 7]"]
-    80["Segment<br>[2777, 2812, 6]"]
+    80["Segment<br>[2777, 2812, 7]"]
-    81["Segment<br>[2818, 2873, 6]"]
+    81["Segment<br>[2818, 2873, 7]"]
-    82["Segment<br>[2879, 2915, 6]"]
+    82["Segment<br>[2879, 2915, 7]"]
-    83["Segment<br>[2921, 2976, 6]"]
+    83["Segment<br>[2921, 2976, 7]"]
-    84["Segment<br>[2982, 3018, 6]"]
+    84["Segment<br>[2982, 3018, 7]"]
-    85["Segment<br>[3024, 3079, 6]"]
+    85["Segment<br>[3024, 3079, 7]"]
-    86["Segment<br>[3085, 3141, 6]"]
+    86["Segment<br>[3085, 3141, 7]"]
   end
   subgraph path113 [Path]
-    113["Path<br>[3290, 3341, 6]"]
+    113["Path<br>[3290, 3341, 7]"]
-    114["Segment<br>[3290, 3341, 6]"]
+    114["Segment<br>[3290, 3341, 7]"]
     115[Solid2d]
   end
   subgraph path120 [Path]
-    120["Path<br>[3520, 3582, 6]"]
+    120["Path<br>[3520, 3582, 7]"]
-    121["Segment<br>[3588, 3656, 6]"]
+    121["Segment<br>[3588, 3656, 7]"]
-    122["Segment<br>[3662, 3762, 6]"]
+    122["Segment<br>[3662, 3762, 7]"]
-    123["Segment<br>[3768, 3885, 6]"]
+    123["Segment<br>[3768, 3885, 7]"]
-    124["Segment<br>[3891, 3976, 6]"]
+    124["Segment<br>[3891, 3976, 7]"]
-    125["Segment<br>[3982, 3989, 6]"]
+    125["Segment<br>[3982, 3989, 7]"]
     126[Solid2d]
   end
   subgraph path127 [Path]
-    127["Path<br>[4013, 4064, 6]"]
+    127["Path<br>[4013, 4064, 7]"]
-    128["Segment<br>[4013, 4064, 6]"]
+    128["Segment<br>[4013, 4064, 7]"]
     129[Solid2d]
   end
   subgraph path130 [Path]
-    130["Path<br>[4089, 4236, 6]"]
+    130["Path<br>[4089, 4236, 7]"]
-    131["Segment<br>[4089, 4236, 6]"]
+    131["Segment<br>[4089, 4236, 7]"]
     132[Solid2d]
   end
   subgraph path133 [Path]
-    133["Path<br>[4261, 4409, 6]"]
+    133["Path<br>[4261, 4409, 7]"]
-    134["Segment<br>[4261, 4409, 6]"]
+    134["Segment<br>[4261, 4409, 7]"]
     135[Solid2d]
   end
   subgraph path136 [Path]
-    136["Path<br>[4434, 4582, 6]"]
+    136["Path<br>[4434, 4582, 7]"]
-    137["Segment<br>[4434, 4582, 6]"]
+    137["Segment<br>[4434, 4582, 7]"]
     138[Solid2d]
   end
   subgraph path139 [Path]
-    139["Path<br>[4607, 4756, 6]"]
+    139["Path<br>[4607, 4756, 7]"]
-    140["Segment<br>[4607, 4756, 6]"]
+    140["Segment<br>[4607, 4756, 7]"]
     141[Solid2d]
   end
   subgraph path157 [Path]
-    157["Path<br>[4898, 4936, 6]"]
+    157["Path<br>[4898, 4936, 7]"]
-    158["Segment<br>[4898, 4936, 6]"]
+    158["Segment<br>[4898, 4936, 7]"]
     159[Solid2d]
   end
   subgraph path165 [Path]
-    165["Path<br>[5009, 5045, 6]"]
+    165["Path<br>[5009, 5045, 7]"]
-    166["Segment<br>[5009, 5045, 6]"]
+    166["Segment<br>[5009, 5045, 7]"]
     167[Solid2d]
   end
   subgraph path181 [Path]
-    181["Path<br>[277, 327, 7]"]
+    181["Path<br>[277, 327, 8]"]
-    182["Segment<br>[277, 327, 7]"]
+    182["Segment<br>[277, 327, 8]"]
     183[Solid2d]
   end
   subgraph path191 [Path]
-    191["Path<br>[502, 537, 7]"]
+    191["Path<br>[502, 537, 8]"]
-    192["Segment<br>[502, 537, 7]"]
+    192["Segment<br>[502, 537, 8]"]
     193[Solid2d]
   end
   subgraph path203 [Path]
-    203["Path<br>[216, 255, 8]"]
+    203["Path<br>[216, 255, 9]"]
-    204["Segment<br>[261, 291, 8]"]
+    204["Segment<br>[261, 291, 9]"]
-    205["Segment<br>[297, 336, 8]"]
+    205["Segment<br>[297, 336, 9]"]
-    206["Segment<br>[342, 366, 8]"]
+    206["Segment<br>[342, 366, 9]"]
-    207["Segment<br>[372, 396, 8]"]
+    207["Segment<br>[372, 396, 9]"]
-    208["Segment<br>[402, 443, 8]"]
+    208["Segment<br>[402, 443, 9]"]
-    209["Segment<br>[449, 487, 8]"]
+    209["Segment<br>[449, 487, 9]"]
-    210["Segment<br>[493, 516, 8]"]
+    210["Segment<br>[493, 516, 9]"]
-    211["Segment<br>[522, 539, 8]"]
+    211["Segment<br>[522, 539, 9]"]
-    212["Segment<br>[545, 566, 8]"]
+    212["Segment<br>[545, 566, 9]"]
-    213["Segment<br>[572, 659, 8]"]
+    213["Segment<br>[572, 659, 9]"]
-    214["Segment<br>[665, 702, 8]"]
+    214["Segment<br>[665, 702, 9]"]
-    215["Segment<br>[708, 745, 8]"]
+    215["Segment<br>[708, 745, 9]"]
-    216["Segment<br>[751, 758, 8]"]
+    216["Segment<br>[751, 758, 9]"]
     217[Solid2d]
   end
   subgraph path243 [Path]
-    243["Path<br>[1100, 1212, 8]"]
+    243["Path<br>[1100, 1212, 9]"]
-    244["Segment<br>[1220, 1289, 8]"]
+    244["Segment<br>[1220, 1289, 9]"]
-    245["Segment<br>[1297, 1641, 8]"]
+    245["Segment<br>[1297, 1641, 9]"]
-    246["Segment<br>[1649, 1995, 8]"]
+    246["Segment<br>[1649, 1995, 9]"]
-    247["Segment<br>[2003, 2244, 8]"]
+    247["Segment<br>[2003, 2244, 9]"]
-    248["Segment<br>[2252, 2259, 8]"]
+    248["Segment<br>[2252, 2259, 9]"]
     249[Solid2d]
   end
   subgraph path251 [Path]
-    251["Path<br>[1100, 1212, 8]"]
+    251["Path<br>[1100, 1212, 9]"]
-    252["Segment<br>[1220, 1289, 8]"]
+    252["Segment<br>[1220, 1289, 9]"]
-    253["Segment<br>[1297, 1641, 8]"]
+    253["Segment<br>[1297, 1641, 9]"]
-    254["Segment<br>[1649, 1995, 8]"]
+    254["Segment<br>[1649, 1995, 9]"]
-    255["Segment<br>[2003, 2244, 8]"]
+    255["Segment<br>[2003, 2244, 9]"]
-    256["Segment<br>[2252, 2259, 8]"]
+    256["Segment<br>[2252, 2259, 9]"]
     257[Solid2d]
   end
   subgraph path259 [Path]
-    259["Path<br>[1100, 1212, 8]"]
+    259["Path<br>[1100, 1212, 9]"]
-    264["Segment<br>[2252, 2259, 8]"]
+    264["Segment<br>[2252, 2259, 9]"]
     265[Solid2d]
   end
-  1["Plane<br>[300, 317, 6]"]
+  1["Plane<br>[300, 317, 7]"]
-  24["Sweep Extrusion<br>[1535, 1554, 6]"]
+  24["Sweep Extrusion<br>[1535, 1554, 7]"]
   25[Wall]
   26[Wall]
   27[Wall]
@@ -173,7 +173,7 @@ flowchart LR
   36["SweepEdge Adjacent"]
   37["SweepEdge Opposite"]
   38["SweepEdge Adjacent"]
-  50["Sweep Extrusion<br>[2388, 2408, 6]"]
+  50["Sweep Extrusion<br>[2388, 2408, 7]"]
   51[Wall]
   52[Wall]
   53[Wall]
@@ -198,10 +198,10 @@ flowchart LR
   72["SweepEdge Adjacent"]
   73["SweepEdge Opposite"]
   74["SweepEdge Adjacent"]
-  75["Sweep Extrusion<br>[2388, 2408, 6]"]
+  75["Sweep Extrusion<br>[2388, 2408, 7]"]
-  76["Sweep Extrusion<br>[2388, 2408, 6]"]
+  76["Sweep Extrusion<br>[2388, 2408, 7]"]
-  77["Sweep Extrusion<br>[2388, 2408, 6]"]
+  77["Sweep Extrusion<br>[2388, 2408, 7]"]
-  87["Sweep Extrusion<br>[3147, 3182, 6]"]
+  87["Sweep Extrusion<br>[3147, 3182, 7]"]
   88[Wall]
   89[Wall]
   90[Wall]
@@ -227,11 +227,11 @@ flowchart LR
   110["SweepEdge Adjacent"]
   111["SweepEdge Opposite"]
   112["SweepEdge Adjacent"]
-  116["Sweep Extrusion<br>[3347, 3385, 6]"]
+  116["Sweep Extrusion<br>[3347, 3385, 7]"]
   117[Wall]
   118["SweepEdge Opposite"]
   119["SweepEdge Adjacent"]
-  142["Sweep Extrusion<br>[4763, 4782, 6]"]
+  142["Sweep Extrusion<br>[4763, 4782, 7]"]
   143[Wall]
   144[Wall]
   145[Wall]
@@ -246,41 +246,41 @@ flowchart LR
   154["SweepEdge Adjacent"]
   155["SweepEdge Opposite"]
   156["SweepEdge Adjacent"]
-  160["Sweep Extrusion<br>[4942, 4962, 6]"]
+  160["Sweep Extrusion<br>[4942, 4962, 7]"]
   161[Wall]
   162["Cap End"]
   163["SweepEdge Opposite"]
   164["SweepEdge Adjacent"]
-  168["Sweep Extrusion<br>[5051, 5072, 6]"]
+  168["Sweep Extrusion<br>[5051, 5072, 7]"]
   169[Wall]
   170["SweepEdge Opposite"]
   171["SweepEdge Adjacent"]
-  172["EdgeCut Fillet<br>[5113, 5624, 6]"]
+  172["EdgeCut Fillet<br>[5113, 5624, 7]"]
-  173["EdgeCut Fillet<br>[5113, 5624, 6]"]
+  173["EdgeCut Fillet<br>[5113, 5624, 7]"]
-  174["EdgeCut Fillet<br>[5113, 5624, 6]"]
+  174["EdgeCut Fillet<br>[5113, 5624, 7]"]
-  175["EdgeCut Fillet<br>[5113, 5624, 6]"]
+  175["EdgeCut Fillet<br>[5113, 5624, 7]"]
-  176["EdgeCut Fillet<br>[5113, 5624, 6]"]
+  176["EdgeCut Fillet<br>[5113, 5624, 7]"]
-  177["EdgeCut Fillet<br>[5113, 5624, 6]"]
+  177["EdgeCut Fillet<br>[5113, 5624, 7]"]
-  178["EdgeCut Fillet<br>[5113, 5624, 6]"]
+  178["EdgeCut Fillet<br>[5113, 5624, 7]"]
-  179["EdgeCut Fillet<br>[5113, 5624, 6]"]
+  179["EdgeCut Fillet<br>[5113, 5624, 7]"]
-  180["Plane<br>[204, 231, 7]"]
+  180["Plane<br>[204, 231, 8]"]
-  184["Sweep Extrusion<br>[333, 353, 7]"]
+  184["Sweep Extrusion<br>[333, 353, 8]"]
   185[Wall]
   186["Cap Start"]
   187["Cap End"]
   188["SweepEdge Opposite"]
   189["SweepEdge Adjacent"]
-  190["Plane<br>[467, 495, 7]"]
+  190["Plane<br>[467, 495, 8]"]
-  194["Sweep Extrusion<br>[543, 564, 7]"]
+  194["Sweep Extrusion<br>[543, 564, 8]"]
   195[Wall]
   196["Cap Start"]
   197["Cap End"]
   198["SweepEdge Opposite"]
   199["SweepEdge Adjacent"]
-  200["EdgeCut Fillet<br>[394, 452, 7]"]
+  200["EdgeCut Fillet<br>[394, 452, 8]"]
-  201["EdgeCut Fillet<br>[394, 452, 7]"]
+  201["EdgeCut Fillet<br>[394, 452, 8]"]
-  202["Plane<br>[193, 210, 8]"]
+  202["Plane<br>[193, 210, 9]"]
-  218["Sweep Revolve<br>[764, 846, 8]"]
+  218["Sweep Revolve<br>[764, 846, 9]"]
   219[Wall]
   220[Wall]
   221[Wall]
@@ -304,14 +304,14 @@ flowchart LR
   239["SweepEdge Adjacent"]
   240["SweepEdge Adjacent"]
   241["SweepEdge Adjacent"]
-  242["Plane<br>[1053, 1091, 8]"]
+  242["Plane<br>[1053, 1091, 9]"]
-  250["Plane<br>[1053, 1091, 8]"]
+  250["Plane<br>[1053, 1091, 9]"]
-  258["Plane<br>[1053, 1091, 8]"]
+  258["Plane<br>[1053, 1091, 9]"]
   260["SweepEdge Opposite"]
   261["SweepEdge Opposite"]
   262["SweepEdge Opposite"]
   263["SweepEdge Opposite"]
-  266["Sweep Loft<br>[2378, 2498, 8]"]
+  266["Sweep Loft<br>[2378, 2498, 9]"]
   267[Wall]
   268[Wall]
   269[Wall]
@@ -322,17 +322,17 @@ flowchart LR
   274["SweepEdge Adjacent"]
   275["SweepEdge Adjacent"]
   276["SweepEdge Adjacent"]
-  277["StartSketchOnFace<br>[1647, 1690, 6]"]
+  277["StartSketchOnFace<br>[1647, 1690, 7]"]
-  278["StartSketchOnFace<br>[2548, 2591, 6]"]
+  278["StartSketchOnFace<br>[2548, 2591, 7]"]
-  279["StartSketchOnFace<br>[3247, 3284, 6]"]
+  279["StartSketchOnFace<br>[3247, 3284, 7]"]
-  280["StartSketchOnFace<br>[3471, 3508, 6]"]
+  280["StartSketchOnFace<br>[3471, 3508, 7]"]
-  281["StartSketchOnFace<br>[4849, 4892, 6]"]
+  281["StartSketchOnFace<br>[4849, 4892, 7]"]
-  282["StartSketchOnFace<br>[4964, 5003, 6]"]
+  282["StartSketchOnFace<br>[4964, 5003, 7]"]
-  283["StartSketchOnPlane<br>[244, 271, 7]"]
+  283["StartSketchOnPlane<br>[244, 271, 8]"]
-  284["StartSketchOnPlane<br>[453, 496, 7]"]
+  284["StartSketchOnPlane<br>[453, 496, 8]"]
-  285["StartSketchOnPlane<br>[1039, 1092, 8]"]
+  285["StartSketchOnPlane<br>[1039, 1092, 9]"]
-  286["StartSketchOnPlane<br>[1039, 1092, 8]"]
+  286["StartSketchOnPlane<br>[1039, 1092, 9]"]
-  287["StartSketchOnPlane<br>[1039, 1092, 8]"]
+  287["StartSketchOnPlane<br>[1039, 1092, 9]"]
   1 --- 2
   1 --- 9
   1 --- 12

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

@@ -8,7 +8,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "fanHousing",
-      "moduleId": 6
+      "moduleId": 0
     },
     "sourceRange": []
   },
@@ -663,6 +663,17 @@ description: Operations executed axial-fan.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -721,18 +732,7 @@ description: Operations executed axial-fan.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "type": "GroupEnd"
@@ -742,7 +742,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "motor",
-      "moduleId": 7
+      "moduleId": 0
     },
     "sourceRange": []
   },
@@ -824,6 +824,17 @@ description: Operations executed axial-fan.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -859,18 +870,7 @@ description: Operations executed axial-fan.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "type": "KclStdLibCall",
@@ -957,7 +957,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "fan",
-      "moduleId": 8
+      "moduleId": 0
     },
     "sourceRange": []
   },
@@ -1067,11 +1067,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "fanBlade",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        997,
-        2279,
-        8
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1127,11 +1123,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1145,11 +1137,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1163,11 +1151,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1181,11 +1165,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1199,11 +1179,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1217,11 +1193,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1235,11 +1207,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1253,11 +1221,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1271,11 +1235,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1289,11 +1249,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1307,11 +1263,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1325,11 +1277,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1343,11 +1291,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1361,11 +1305,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1379,11 +1319,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1397,11 +1333,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1415,11 +1347,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1433,11 +1361,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1451,11 +1375,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1469,11 +1389,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1487,11 +1403,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1505,11 +1417,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1523,11 +1431,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1541,11 +1445,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1562,11 +1462,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "fanBlade",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        997,
-        2279,
-        8
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1622,11 +1518,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1640,11 +1532,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1658,11 +1546,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1676,11 +1560,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1694,11 +1574,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1712,11 +1588,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1730,11 +1602,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1748,11 +1616,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1766,11 +1630,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1784,11 +1644,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1802,11 +1658,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1820,11 +1672,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1838,11 +1686,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1856,11 +1700,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1874,11 +1714,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1892,11 +1728,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1910,11 +1742,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1928,11 +1756,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1946,11 +1770,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1964,11 +1784,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1982,11 +1798,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2000,11 +1812,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2018,11 +1826,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2036,11 +1840,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2057,11 +1857,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "fanBlade",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        997,
-        2279,
-        8
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2117,11 +1913,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2135,11 +1927,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2153,11 +1941,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2171,11 +1955,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2189,11 +1969,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2207,11 +1983,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2225,11 +1997,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2243,11 +2011,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2261,11 +2025,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2279,11 +2039,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2297,11 +2053,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2315,11 +2067,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2333,11 +2081,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2351,11 +2095,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2369,11 +2109,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2387,11 +2123,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2405,11 +2137,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2423,11 +2151,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2441,11 +2165,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2459,11 +2179,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2477,11 +2193,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2495,11 +2207,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2513,11 +2221,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2531,11 +2235,7 @@ description: Operations executed axial-fan.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -5,14 +5,14 @@ description: Variables in memory after executing axial-fan.kcl
 {
   "fan": {
     "type": "Module",
-    "value": 8
+    "value": 9
   },
   "fanHousing": {
     "type": "Module",
-    "value": 6
+    "value": 7
   },
   "motor": {
     "type": "Module",
-    "value": 7
+    "value": 8
   }
 }

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

@@ -380,11 +380,7 @@ description: Operations executed ball-bearing.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -398,11 +394,7 @@ description: Operations executed ball-bearing.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -1,239 +1,239 @@
 ```mermaid
 flowchart LR
   subgraph path2 [Path]
-    2["Path<br>[361, 394, 6]"]
+    2["Path<br>[361, 394, 7]"]
-    3["Segment<br>[402, 428, 6]"]
+    3["Segment<br>[402, 428, 7]"]
-    4["Segment<br>[436, 498, 6]"]
+    4["Segment<br>[436, 498, 7]"]
-    5["Segment<br>[506, 568, 6]"]
+    5["Segment<br>[506, 568, 7]"]
-    6["Segment<br>[576, 639, 6]"]
+    6["Segment<br>[576, 639, 7]"]
-    7["Segment<br>[647, 672, 6]"]
+    7["Segment<br>[647, 672, 7]"]
-    8["Segment<br>[680, 700, 6]"]
+    8["Segment<br>[680, 700, 7]"]
-    9["Segment<br>[708, 732, 6]"]
+    9["Segment<br>[708, 732, 7]"]
-    10["Segment<br>[740, 802, 6]"]
+    10["Segment<br>[740, 802, 7]"]
-    11["Segment<br>[810, 835, 6]"]
+    11["Segment<br>[810, 835, 7]"]
-    12["Segment<br>[843, 863, 6]"]
+    12["Segment<br>[843, 863, 7]"]
-    13["Segment<br>[871, 895, 6]"]
+    13["Segment<br>[871, 895, 7]"]
-    14["Segment<br>[903, 964, 6]"]
+    14["Segment<br>[903, 964, 7]"]
-    15["Segment<br>[972, 1033, 6]"]
+    15["Segment<br>[972, 1033, 7]"]
-    16["Segment<br>[1041, 1066, 6]"]
+    16["Segment<br>[1041, 1066, 7]"]
-    17["Segment<br>[1074, 1098, 6]"]
+    17["Segment<br>[1074, 1098, 7]"]
-    18["Segment<br>[1106, 1168, 6]"]
+    18["Segment<br>[1106, 1168, 7]"]
-    19["Segment<br>[1176, 1201, 6]"]
+    19["Segment<br>[1176, 1201, 7]"]
-    20["Segment<br>[1209, 1236, 6]"]
+    20["Segment<br>[1209, 1236, 7]"]
-    21["Segment<br>[1244, 1305, 6]"]
+    21["Segment<br>[1244, 1305, 7]"]
-    22["Segment<br>[1313, 1357, 6]"]
+    22["Segment<br>[1313, 1357, 7]"]
-    23["Segment<br>[1365, 1372, 6]"]
+    23["Segment<br>[1365, 1372, 7]"]
     24[Solid2d]
   end
   subgraph path89 [Path]
-    89["Path<br>[361, 394, 6]"]
+    89["Path<br>[361, 394, 7]"]
-    90["Segment<br>[402, 428, 6]"]
+    90["Segment<br>[402, 428, 7]"]
-    91["Segment<br>[436, 498, 6]"]
+    91["Segment<br>[436, 498, 7]"]
-    92["Segment<br>[506, 568, 6]"]
+    92["Segment<br>[506, 568, 7]"]
-    93["Segment<br>[576, 639, 6]"]
+    93["Segment<br>[576, 639, 7]"]
-    94["Segment<br>[647, 672, 6]"]
+    94["Segment<br>[647, 672, 7]"]
-    95["Segment<br>[680, 700, 6]"]
+    95["Segment<br>[680, 700, 7]"]
-    96["Segment<br>[708, 732, 6]"]
+    96["Segment<br>[708, 732, 7]"]
-    97["Segment<br>[740, 802, 6]"]
+    97["Segment<br>[740, 802, 7]"]
-    98["Segment<br>[810, 835, 6]"]
+    98["Segment<br>[810, 835, 7]"]
-    99["Segment<br>[843, 863, 6]"]
+    99["Segment<br>[843, 863, 7]"]
-    100["Segment<br>[871, 895, 6]"]
+    100["Segment<br>[871, 895, 7]"]
-    101["Segment<br>[903, 964, 6]"]
+    101["Segment<br>[903, 964, 7]"]
-    102["Segment<br>[972, 1033, 6]"]
+    102["Segment<br>[972, 1033, 7]"]
-    103["Segment<br>[1041, 1066, 6]"]
+    103["Segment<br>[1041, 1066, 7]"]
-    104["Segment<br>[1074, 1098, 6]"]
+    104["Segment<br>[1074, 1098, 7]"]
-    105["Segment<br>[1106, 1168, 6]"]
+    105["Segment<br>[1106, 1168, 7]"]
-    106["Segment<br>[1176, 1201, 6]"]
+    106["Segment<br>[1176, 1201, 7]"]
-    107["Segment<br>[1209, 1236, 6]"]
+    107["Segment<br>[1209, 1236, 7]"]
-    108["Segment<br>[1244, 1305, 6]"]
+    108["Segment<br>[1244, 1305, 7]"]
-    109["Segment<br>[1313, 1357, 6]"]
+    109["Segment<br>[1313, 1357, 7]"]
-    110["Segment<br>[1365, 1372, 6]"]
+    110["Segment<br>[1365, 1372, 7]"]
     111[Solid2d]
   end
   subgraph path176 [Path]
-    176["Path<br>[361, 394, 6]"]
+    176["Path<br>[361, 394, 7]"]
-    177["Segment<br>[402, 428, 6]"]
+    177["Segment<br>[402, 428, 7]"]
-    178["Segment<br>[436, 498, 6]"]
+    178["Segment<br>[436, 498, 7]"]
-    179["Segment<br>[506, 568, 6]"]
+    179["Segment<br>[506, 568, 7]"]
-    180["Segment<br>[576, 639, 6]"]
+    180["Segment<br>[576, 639, 7]"]
-    181["Segment<br>[647, 672, 6]"]
+    181["Segment<br>[647, 672, 7]"]
-    182["Segment<br>[680, 700, 6]"]
+    182["Segment<br>[680, 700, 7]"]
-    183["Segment<br>[708, 732, 6]"]
+    183["Segment<br>[708, 732, 7]"]
-    184["Segment<br>[740, 802, 6]"]
+    184["Segment<br>[740, 802, 7]"]
-    185["Segment<br>[810, 835, 6]"]
+    185["Segment<br>[810, 835, 7]"]
-    186["Segment<br>[843, 863, 6]"]
+    186["Segment<br>[843, 863, 7]"]
-    187["Segment<br>[871, 895, 6]"]
+    187["Segment<br>[871, 895, 7]"]
-    188["Segment<br>[903, 964, 6]"]
+    188["Segment<br>[903, 964, 7]"]
-    189["Segment<br>[972, 1033, 6]"]
+    189["Segment<br>[972, 1033, 7]"]
-    190["Segment<br>[1041, 1066, 6]"]
+    190["Segment<br>[1041, 1066, 7]"]
-    191["Segment<br>[1074, 1098, 6]"]
+    191["Segment<br>[1074, 1098, 7]"]
-    192["Segment<br>[1106, 1168, 6]"]
+    192["Segment<br>[1106, 1168, 7]"]
-    193["Segment<br>[1176, 1201, 6]"]
+    193["Segment<br>[1176, 1201, 7]"]
-    194["Segment<br>[1209, 1236, 6]"]
+    194["Segment<br>[1209, 1236, 7]"]
-    195["Segment<br>[1244, 1305, 6]"]
+    195["Segment<br>[1244, 1305, 7]"]
-    196["Segment<br>[1313, 1357, 6]"]
+    196["Segment<br>[1313, 1357, 7]"]
-    197["Segment<br>[1365, 1372, 6]"]
+    197["Segment<br>[1365, 1372, 7]"]
     198[Solid2d]
   end
   subgraph path262 [Path]
-    262["Path<br>[361, 394, 6]"]
+    262["Path<br>[361, 394, 7]"]
-    263["Segment<br>[402, 428, 6]"]
+    263["Segment<br>[402, 428, 7]"]
-    264["Segment<br>[436, 498, 6]"]
+    264["Segment<br>[436, 498, 7]"]
-    265["Segment<br>[506, 568, 6]"]
+    265["Segment<br>[506, 568, 7]"]
-    266["Segment<br>[576, 639, 6]"]
+    266["Segment<br>[576, 639, 7]"]
-    267["Segment<br>[647, 672, 6]"]
+    267["Segment<br>[647, 672, 7]"]
-    268["Segment<br>[680, 700, 6]"]
+    268["Segment<br>[680, 700, 7]"]
-    269["Segment<br>[708, 732, 6]"]
+    269["Segment<br>[708, 732, 7]"]
-    270["Segment<br>[740, 802, 6]"]
+    270["Segment<br>[740, 802, 7]"]
-    271["Segment<br>[810, 835, 6]"]
+    271["Segment<br>[810, 835, 7]"]
-    272["Segment<br>[843, 863, 6]"]
+    272["Segment<br>[843, 863, 7]"]
-    273["Segment<br>[871, 895, 6]"]
+    273["Segment<br>[871, 895, 7]"]
-    274["Segment<br>[903, 964, 6]"]
+    274["Segment<br>[903, 964, 7]"]
-    275["Segment<br>[972, 1033, 6]"]
+    275["Segment<br>[972, 1033, 7]"]
-    276["Segment<br>[1041, 1066, 6]"]
+    276["Segment<br>[1041, 1066, 7]"]
-    277["Segment<br>[1074, 1098, 6]"]
+    277["Segment<br>[1074, 1098, 7]"]
-    278["Segment<br>[1106, 1168, 6]"]
+    278["Segment<br>[1106, 1168, 7]"]
-    279["Segment<br>[1176, 1201, 6]"]
+    279["Segment<br>[1176, 1201, 7]"]
-    280["Segment<br>[1209, 1236, 6]"]
+    280["Segment<br>[1209, 1236, 7]"]
-    281["Segment<br>[1244, 1305, 6]"]
+    281["Segment<br>[1244, 1305, 7]"]
-    282["Segment<br>[1313, 1357, 6]"]
+    282["Segment<br>[1313, 1357, 7]"]
-    283["Segment<br>[1365, 1372, 6]"]
+    283["Segment<br>[1365, 1372, 7]"]
     284[Solid2d]
   end
   subgraph path349 [Path]
-    349["Path<br>[361, 394, 6]"]
+    349["Path<br>[361, 394, 7]"]
-    350["Segment<br>[402, 428, 6]"]
+    350["Segment<br>[402, 428, 7]"]
-    351["Segment<br>[436, 498, 6]"]
+    351["Segment<br>[436, 498, 7]"]
-    352["Segment<br>[506, 568, 6]"]
+    352["Segment<br>[506, 568, 7]"]
-    353["Segment<br>[576, 639, 6]"]
+    353["Segment<br>[576, 639, 7]"]
-    354["Segment<br>[647, 672, 6]"]
+    354["Segment<br>[647, 672, 7]"]
-    355["Segment<br>[680, 700, 6]"]
+    355["Segment<br>[680, 700, 7]"]
-    356["Segment<br>[708, 732, 6]"]
+    356["Segment<br>[708, 732, 7]"]
-    357["Segment<br>[740, 802, 6]"]
+    357["Segment<br>[740, 802, 7]"]
-    358["Segment<br>[810, 835, 6]"]
+    358["Segment<br>[810, 835, 7]"]
-    359["Segment<br>[843, 863, 6]"]
+    359["Segment<br>[843, 863, 7]"]
-    360["Segment<br>[871, 895, 6]"]
+    360["Segment<br>[871, 895, 7]"]
-    361["Segment<br>[903, 964, 6]"]
+    361["Segment<br>[903, 964, 7]"]
-    362["Segment<br>[972, 1033, 6]"]
+    362["Segment<br>[972, 1033, 7]"]
-    363["Segment<br>[1041, 1066, 6]"]
+    363["Segment<br>[1041, 1066, 7]"]
-    364["Segment<br>[1074, 1098, 6]"]
+    364["Segment<br>[1074, 1098, 7]"]
-    365["Segment<br>[1106, 1168, 6]"]
+    365["Segment<br>[1106, 1168, 7]"]
-    366["Segment<br>[1176, 1201, 6]"]
+    366["Segment<br>[1176, 1201, 7]"]
-    367["Segment<br>[1209, 1236, 6]"]
+    367["Segment<br>[1209, 1236, 7]"]
-    368["Segment<br>[1244, 1305, 6]"]
+    368["Segment<br>[1244, 1305, 7]"]
-    369["Segment<br>[1313, 1357, 6]"]
+    369["Segment<br>[1313, 1357, 7]"]
-    370["Segment<br>[1365, 1372, 6]"]
+    370["Segment<br>[1365, 1372, 7]"]
     371[Solid2d]
   end
   subgraph path435 [Path]
-    435["Path<br>[361, 394, 6]"]
+    435["Path<br>[361, 394, 7]"]
-    436["Segment<br>[402, 428, 6]"]
+    436["Segment<br>[402, 428, 7]"]
-    437["Segment<br>[436, 498, 6]"]
+    437["Segment<br>[436, 498, 7]"]
-    438["Segment<br>[506, 568, 6]"]
+    438["Segment<br>[506, 568, 7]"]
-    439["Segment<br>[576, 639, 6]"]
+    439["Segment<br>[576, 639, 7]"]
-    440["Segment<br>[647, 672, 6]"]
+    440["Segment<br>[647, 672, 7]"]
-    441["Segment<br>[680, 700, 6]"]
+    441["Segment<br>[680, 700, 7]"]
-    442["Segment<br>[708, 732, 6]"]
+    442["Segment<br>[708, 732, 7]"]
-    443["Segment<br>[740, 802, 6]"]
+    443["Segment<br>[740, 802, 7]"]
-    444["Segment<br>[810, 835, 6]"]
+    444["Segment<br>[810, 835, 7]"]
-    445["Segment<br>[843, 863, 6]"]
+    445["Segment<br>[843, 863, 7]"]
-    446["Segment<br>[871, 895, 6]"]
+    446["Segment<br>[871, 895, 7]"]
-    447["Segment<br>[903, 964, 6]"]
+    447["Segment<br>[903, 964, 7]"]
-    448["Segment<br>[972, 1033, 6]"]
+    448["Segment<br>[972, 1033, 7]"]
-    449["Segment<br>[1041, 1066, 6]"]
+    449["Segment<br>[1041, 1066, 7]"]
-    450["Segment<br>[1074, 1098, 6]"]
+    450["Segment<br>[1074, 1098, 7]"]
-    451["Segment<br>[1106, 1168, 6]"]
+    451["Segment<br>[1106, 1168, 7]"]
-    452["Segment<br>[1176, 1201, 6]"]
+    452["Segment<br>[1176, 1201, 7]"]
-    453["Segment<br>[1209, 1236, 6]"]
+    453["Segment<br>[1209, 1236, 7]"]
-    454["Segment<br>[1244, 1305, 6]"]
+    454["Segment<br>[1244, 1305, 7]"]
-    455["Segment<br>[1313, 1357, 6]"]
+    455["Segment<br>[1313, 1357, 7]"]
-    456["Segment<br>[1365, 1372, 6]"]
+    456["Segment<br>[1365, 1372, 7]"]
     457[Solid2d]
   end
   subgraph path522 [Path]
-    522["Path<br>[1762, 1786, 6]"]
+    522["Path<br>[1762, 1786, 7]"]
   end
   subgraph path523 [Path]
-    523["Path<br>[1794, 1920, 6]"]
+    523["Path<br>[1794, 1920, 7]"]
-    524["Segment<br>[1794, 1920, 6]"]
+    524["Segment<br>[1794, 1920, 7]"]
-    525["Segment<br>[1794, 1920, 6]"]
+    525["Segment<br>[1794, 1920, 7]"]
-    526["Segment<br>[1794, 1920, 6]"]
+    526["Segment<br>[1794, 1920, 7]"]
-    527["Segment<br>[1794, 1920, 6]"]
+    527["Segment<br>[1794, 1920, 7]"]
-    528["Segment<br>[1794, 1920, 6]"]
+    528["Segment<br>[1794, 1920, 7]"]
-    529["Segment<br>[1794, 1920, 6]"]
+    529["Segment<br>[1794, 1920, 7]"]
-    530["Segment<br>[1794, 1920, 6]"]
+    530["Segment<br>[1794, 1920, 7]"]
     531[Solid2d]
   end
   subgraph path553 [Path]
-    553["Path<br>[1762, 1786, 6]"]
+    553["Path<br>[1762, 1786, 7]"]
   end
   subgraph path554 [Path]
-    554["Path<br>[1794, 1920, 6]"]
+    554["Path<br>[1794, 1920, 7]"]
-    555["Segment<br>[1794, 1920, 6]"]
+    555["Segment<br>[1794, 1920, 7]"]
-    556["Segment<br>[1794, 1920, 6]"]
+    556["Segment<br>[1794, 1920, 7]"]
-    557["Segment<br>[1794, 1920, 6]"]
+    557["Segment<br>[1794, 1920, 7]"]
-    558["Segment<br>[1794, 1920, 6]"]
+    558["Segment<br>[1794, 1920, 7]"]
-    559["Segment<br>[1794, 1920, 6]"]
+    559["Segment<br>[1794, 1920, 7]"]
-    560["Segment<br>[1794, 1920, 6]"]
+    560["Segment<br>[1794, 1920, 7]"]
-    561["Segment<br>[1794, 1920, 6]"]
+    561["Segment<br>[1794, 1920, 7]"]
     562[Solid2d]
   end
   subgraph path585 [Path]
-    585["Path<br>[2196, 2223, 6]"]
+    585["Path<br>[2196, 2223, 7]"]
-    586["Segment<br>[2231, 2253, 6]"]
+    586["Segment<br>[2231, 2253, 7]"]
-    587["Segment<br>[2261, 2283, 6]"]
+    587["Segment<br>[2261, 2283, 7]"]
-    588["Segment<br>[2291, 2313, 6]"]
+    588["Segment<br>[2291, 2313, 7]"]
-    589["Segment<br>[2321, 2344, 6]"]
+    589["Segment<br>[2321, 2344, 7]"]
-    590["Segment<br>[2352, 2375, 6]"]
+    590["Segment<br>[2352, 2375, 7]"]
-    591["Segment<br>[2383, 2418, 6]"]
+    591["Segment<br>[2383, 2418, 7]"]
-    592["Segment<br>[2426, 2433, 6]"]
+    592["Segment<br>[2426, 2433, 7]"]
     593[Solid2d]
   end
   subgraph path618 [Path]
-    618["Path<br>[2705, 2734, 6]"]
+    618["Path<br>[2705, 2734, 7]"]
-    619["Segment<br>[2742, 2777, 6]"]
+    619["Segment<br>[2742, 2777, 7]"]
-    620["Segment<br>[2785, 2810, 6]"]
+    620["Segment<br>[2785, 2810, 7]"]
-    621["Segment<br>[2818, 2854, 6]"]
+    621["Segment<br>[2818, 2854, 7]"]
-    622["Segment<br>[2862, 2886, 6]"]
+    622["Segment<br>[2862, 2886, 7]"]
-    623["Segment<br>[2894, 2928, 6]"]
+    623["Segment<br>[2894, 2928, 7]"]
-    624["Segment<br>[2936, 2971, 6]"]
+    624["Segment<br>[2936, 2971, 7]"]
-    625["Segment<br>[2979, 2986, 6]"]
+    625["Segment<br>[2979, 2986, 7]"]
     626[Solid2d]
   end
   subgraph path650 [Path]
-    650["Path<br>[3261, 3288, 6]"]
+    650["Path<br>[3261, 3288, 7]"]
-    651["Segment<br>[3296, 3315, 6]"]
+    651["Segment<br>[3296, 3315, 7]"]
-    652["Segment<br>[3323, 3372, 6]"]
+    652["Segment<br>[3323, 3372, 7]"]
   end
   subgraph path654 [Path]
-    654["Path<br>[3472, 3505, 6]"]
+    654["Path<br>[3472, 3505, 7]"]
-    655["Segment<br>[3513, 3532, 6]"]
+    655["Segment<br>[3513, 3532, 7]"]
-    656["Segment<br>[3540, 3562, 6]"]
+    656["Segment<br>[3540, 3562, 7]"]
-    657["Segment<br>[3570, 3593, 6]"]
+    657["Segment<br>[3570, 3593, 7]"]
-    658["Segment<br>[3601, 3621, 6]"]
+    658["Segment<br>[3601, 3621, 7]"]
-    659["Segment<br>[3629, 3653, 6]"]
+    659["Segment<br>[3629, 3653, 7]"]
-    660["Segment<br>[3661, 3684, 6]"]
+    660["Segment<br>[3661, 3684, 7]"]
-    661["Segment<br>[3692, 3699, 6]"]
+    661["Segment<br>[3692, 3699, 7]"]
     662[Solid2d]
   end
   subgraph path688 [Path]
-    688["Path<br>[3261, 3288, 6]"]
+    688["Path<br>[3261, 3288, 7]"]
-    689["Segment<br>[3296, 3315, 6]"]
+    689["Segment<br>[3296, 3315, 7]"]
-    690["Segment<br>[3323, 3372, 6]"]
+    690["Segment<br>[3323, 3372, 7]"]
   end
   subgraph path692 [Path]
-    692["Path<br>[3472, 3505, 6]"]
+    692["Path<br>[3472, 3505, 7]"]
-    693["Segment<br>[3513, 3532, 6]"]
+    693["Segment<br>[3513, 3532, 7]"]
-    694["Segment<br>[3540, 3562, 6]"]
+    694["Segment<br>[3540, 3562, 7]"]
-    695["Segment<br>[3570, 3593, 6]"]
+    695["Segment<br>[3570, 3593, 7]"]
-    696["Segment<br>[3601, 3621, 6]"]
+    696["Segment<br>[3601, 3621, 7]"]
-    697["Segment<br>[3629, 3653, 6]"]
+    697["Segment<br>[3629, 3653, 7]"]
-    698["Segment<br>[3661, 3684, 6]"]
+    698["Segment<br>[3661, 3684, 7]"]
-    699["Segment<br>[3692, 3699, 6]"]
+    699["Segment<br>[3692, 3699, 7]"]
     700[Solid2d]
   end
-  1["Plane<br>[333, 353, 6]"]
+  1["Plane<br>[333, 353, 7]"]
-  25["Sweep Extrusion<br>[1460, 1498, 6]"]
+  25["Sweep Extrusion<br>[1460, 1498, 7]"]
   26[Wall]
   27[Wall]
   28[Wall]
@@ -296,8 +296,8 @@ flowchart LR
   85["SweepEdge Adjacent"]
   86["SweepEdge Opposite"]
   87["SweepEdge Adjacent"]
-  88["Plane<br>[333, 353, 6]"]
+  88["Plane<br>[333, 353, 7]"]
-  112["Sweep Extrusion<br>[1536, 1575, 6]"]
+  112["Sweep Extrusion<br>[1536, 1575, 7]"]
   113[Wall]
   114[Wall]
   115[Wall]
@@ -361,7 +361,7 @@ flowchart LR
   173["SweepEdge Opposite"]
   174["SweepEdge Adjacent"]
   175["Plane<br>[823, 864, 0]"]
-  199["Sweep Extrusion<br>[1460, 1498, 6]"]
+  199["Sweep Extrusion<br>[1460, 1498, 7]"]
   200[Wall]
   201[Wall]
   202[Wall]
@@ -424,7 +424,7 @@ flowchart LR
   259["SweepEdge Adjacent"]
   260["SweepEdge Opposite"]
   261["SweepEdge Adjacent"]
-  285["Sweep Extrusion<br>[1536, 1575, 6]"]
+  285["Sweep Extrusion<br>[1536, 1575, 7]"]
   286[Wall]
   287[Wall]
   288[Wall]
@@ -488,7 +488,7 @@ flowchart LR
   346["SweepEdge Opposite"]
   347["SweepEdge Adjacent"]
   348["Plane<br>[874, 916, 0]"]
-  372["Sweep Extrusion<br>[1460, 1498, 6]"]
+  372["Sweep Extrusion<br>[1460, 1498, 7]"]
   373[Wall]
   374[Wall]
   375[Wall]
@@ -551,7 +551,7 @@ flowchart LR
   432["SweepEdge Adjacent"]
   433["SweepEdge Opposite"]
   434["SweepEdge Adjacent"]
-  458["Sweep Extrusion<br>[1536, 1575, 6]"]
+  458["Sweep Extrusion<br>[1536, 1575, 7]"]
   459[Wall]
   460[Wall]
   461[Wall]
@@ -615,7 +615,7 @@ flowchart LR
   519["SweepEdge Opposite"]
   520["SweepEdge Adjacent"]
   521["Plane<br>[975, 1017, 0]"]
-  532["Sweep Extrusion<br>[2022, 2046, 6]"]
+  532["Sweep Extrusion<br>[2022, 2046, 7]"]
   533[Wall]
   534[Wall]
   535[Wall]
@@ -636,7 +636,7 @@ flowchart LR
   550["SweepEdge Adjacent"]
   551["SweepEdge Opposite"]
   552["SweepEdge Adjacent"]
-  563["Sweep Extrusion<br>[2088, 2112, 6]"]
+  563["Sweep Extrusion<br>[2088, 2112, 7]"]
   564[Wall]
   565[Wall]
   566[Wall]
@@ -658,7 +658,7 @@ flowchart LR
   582["SweepEdge Opposite"]
   583["SweepEdge Adjacent"]
   584["Plane<br>[1068, 1135, 0]"]
-  594["Sweep Extrusion<br>[2596, 2620, 6]"]
+  594["Sweep Extrusion<br>[2596, 2620, 7]"]
   595[Wall]
   596[Wall]
   597[Wall]
@@ -679,10 +679,10 @@ flowchart LR
   612["SweepEdge Adjacent"]
   613["SweepEdge Opposite"]
   614["SweepEdge Adjacent"]
-  615["Sweep Extrusion<br>[2596, 2620, 6]"]
+  615["Sweep Extrusion<br>[2596, 2620, 7]"]
-  616["Sweep Extrusion<br>[2596, 2620, 6]"]
+  616["Sweep Extrusion<br>[2596, 2620, 7]"]
   617["Plane<br>[1205, 1272, 0]"]
-  627["Sweep Extrusion<br>[3156, 3180, 6]"]
+  627["Sweep Extrusion<br>[3156, 3180, 7]"]
   628[Wall]
   629[Wall]
   630[Wall]
@@ -703,10 +703,10 @@ flowchart LR
   645["SweepEdge Adjacent"]
   646["SweepEdge Opposite"]
   647["SweepEdge Adjacent"]
-  648["Sweep Extrusion<br>[3156, 3180, 6]"]
+  648["Sweep Extrusion<br>[3156, 3180, 7]"]
-  649["Plane<br>[3780, 3815, 6]"]
+  649["Plane<br>[3780, 3815, 7]"]
-  653["Plane<br>[3846, 3875, 6]"]
+  653["Plane<br>[3846, 3875, 7]"]
-  663["Sweep Sweep<br>[3888, 3915, 6]"]
+  663["Sweep Sweep<br>[3888, 3915, 7]"]
   664[Wall]
   665[Wall]
   666[Wall]
@@ -730,9 +730,9 @@ flowchart LR
   684["SweepEdge Adjacent"]
   685["SweepEdge Opposite"]
   686["SweepEdge Adjacent"]
-  687["Plane<br>[3780, 3815, 6]"]
+  687["Plane<br>[3780, 3815, 7]"]
-  691["Plane<br>[3846, 3875, 6]"]
+  691["Plane<br>[3846, 3875, 7]"]
-  701["Sweep Sweep<br>[3888, 3915, 6]"]
+  701["Sweep Sweep<br>[3888, 3915, 7]"]
   702[Wall]
   703[Wall]
   704[Wall]
@@ -756,18 +756,18 @@ flowchart LR
   722["SweepEdge Adjacent"]
   723["SweepEdge Opposite"]
   724["SweepEdge Adjacent"]
-  725["StartSketchOnPlane<br>[333, 353, 6]"]
+  725["StartSketchOnPlane<br>[333, 353, 7]"]
-  726["StartSketchOnPlane<br>[333, 353, 6]"]
+  726["StartSketchOnPlane<br>[333, 353, 7]"]
-  727["StartSketchOnPlane<br>[333, 353, 6]"]
+  727["StartSketchOnPlane<br>[333, 353, 7]"]
-  728["StartSketchOnPlane<br>[333, 353, 6]"]
+  728["StartSketchOnPlane<br>[333, 353, 7]"]
-  729["StartSketchOnPlane<br>[1734, 1754, 6]"]
+  729["StartSketchOnPlane<br>[1734, 1754, 7]"]
-  730["StartSketchOnPlane<br>[1734, 1754, 6]"]
+  730["StartSketchOnPlane<br>[1734, 1754, 7]"]
-  731["StartSketchOnPlane<br>[2168, 2188, 6]"]
+  731["StartSketchOnPlane<br>[2168, 2188, 7]"]
-  732["StartSketchOnPlane<br>[2677, 2697, 6]"]
+  732["StartSketchOnPlane<br>[2677, 2697, 7]"]
-  733["StartSketchOnPlane<br>[3233, 3253, 6]"]
+  733["StartSketchOnPlane<br>[3233, 3253, 7]"]
-  734["StartSketchOnPlane<br>[3444, 3464, 6]"]
+  734["StartSketchOnPlane<br>[3444, 3464, 7]"]
-  735["StartSketchOnPlane<br>[3233, 3253, 6]"]
+  735["StartSketchOnPlane<br>[3233, 3253, 7]"]
-  736["StartSketchOnPlane<br>[3444, 3464, 6]"]
+  736["StartSketchOnPlane<br>[3444, 3464, 7]"]
   1 --- 2
   2 --- 3
   2 --- 4

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

@@ -8,11 +8,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "divider",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1412,
-        1683,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -23,11 +19,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "dividerSketch",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        309,
-        1393,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -88,11 +80,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "dividerSketch",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        309,
-        1393,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -149,6 +137,22 @@ description: Operations executed bench.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "shell",
+    "unlabeledArg": {
+      "value": {
+        "type": "Array",
+        "value": [
+          {
+            "type": "Solid",
+            "value": {
+              "artifactId": "[uuid]"
+            }
+          }
+        ]
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "faces": {
         "value": {
@@ -179,20 +183,25 @@ description: Operations executed bench.kcl
         "sourceRange": []
       }
     },
-    "name": "shell",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "shell",
+    "unlabeledArg": {
+      "value": {
+        "type": "Array",
+        "value": [
+          {
+            "type": "Solid",
+            "value": {
+              "artifactId": "[uuid]"
+            }
+          }
+        ]
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "faces": {
         "value": {
@@ -223,18 +232,7 @@ description: Operations executed bench.kcl
         "sourceRange": []
       }
     },
-    "name": "shell",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "type": "GroupEnd"
@@ -274,11 +272,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "divider",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1412,
-        1683,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -289,11 +283,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "dividerSketch",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        309,
-        1393,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -354,11 +344,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "dividerSketch",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        309,
-        1393,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -415,6 +401,22 @@ description: Operations executed bench.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "shell",
+    "unlabeledArg": {
+      "value": {
+        "type": "Array",
+        "value": [
+          {
+            "type": "Solid",
+            "value": {
+              "artifactId": "[uuid]"
+            }
+          }
+        ]
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "faces": {
         "value": {
@@ -445,20 +447,25 @@ description: Operations executed bench.kcl
         "sourceRange": []
       }
     },
-    "name": "shell",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "shell",
+    "unlabeledArg": {
+      "value": {
+        "type": "Array",
+        "value": [
+          {
+            "type": "Solid",
+            "value": {
+              "artifactId": "[uuid]"
+            }
+          }
+        ]
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "faces": {
         "value": {
@@ -489,18 +496,7 @@ description: Operations executed bench.kcl
         "sourceRange": []
       }
     },
-    "name": "shell",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "type": "GroupEnd"
@@ -540,11 +536,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "divider",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1412,
-        1683,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -555,11 +547,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "dividerSketch",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        309,
-        1393,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -620,11 +608,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "dividerSketch",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        309,
-        1393,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -681,6 +665,22 @@ description: Operations executed bench.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "shell",
+    "unlabeledArg": {
+      "value": {
+        "type": "Array",
+        "value": [
+          {
+            "type": "Solid",
+            "value": {
+              "artifactId": "[uuid]"
+            }
+          }
+        ]
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "faces": {
         "value": {
@@ -711,20 +711,25 @@ description: Operations executed bench.kcl
         "sourceRange": []
       }
     },
-    "name": "shell",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "shell",
+    "unlabeledArg": {
+      "value": {
+        "type": "Array",
+        "value": [
+          {
+            "type": "Solid",
+            "value": {
+              "artifactId": "[uuid]"
+            }
+          }
+        ]
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "faces": {
         "value": {
@@ -755,18 +760,7 @@ description: Operations executed bench.kcl
         "sourceRange": []
       }
     },
-    "name": "shell",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "type": "GroupEnd"
@@ -806,11 +800,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "connector",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1962,
-        2125,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -821,11 +811,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "connectorSketch",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1703,
-        1941,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -886,11 +872,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "connectorSketch",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1703,
-        1941,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -984,11 +966,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "seatSlats",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        2547,
-        2633,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -999,11 +977,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "seatSlatSketch",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        2144,
-        2526,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1114,11 +1088,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "backSlats",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        3102,
-        3193,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1129,11 +1099,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "backSlatsSketch",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        2653,
-        3081,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1208,11 +1174,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "armRest",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        3739,
-        3928,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1253,11 +1215,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "armRestPath",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        3209,
-        3393,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1316,11 +1274,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "armRestProfile",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        3412,
-        3720,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1377,11 +1331,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "armRest",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        3739,
-        3928,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1422,11 +1372,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "armRestPath",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        3209,
-        3393,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1485,11 +1431,7 @@ description: Operations executed bench.kcl
     "group": {
       "type": "FunctionCall",
       "name": "armRestProfile",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        3412,
-        3720,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -106,6 +106,22 @@ description: Operations executed bottle.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "shell",
+    "unlabeledArg": {
+      "value": {
+        "type": "Array",
+        "value": [
+          {
+            "type": "Solid",
+            "value": {
+              "artifactId": "[uuid]"
+            }
+          }
+        ]
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "faces": {
         "value": {
@@ -136,17 +152,6 @@ description: Operations executed bottle.kcl
         "sourceRange": []
       }
     },
-    "name": "shell",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   }
 ]

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

@@ -197,6 +197,17 @@ description: Operations executed bracket.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -227,9 +238,11 @@ description: Operations executed bracket.kcl
         "sourceRange": []
       }
     },
+    "sourceRange": []
+  },
+  {
+    "type": "KclStdLibCall",
     "name": "fillet",
-    "sourceRange": [],
-    "type": "StdLibCall",
     "unlabeledArg": {
       "value": {
         "type": "Solid",
@@ -238,9 +251,7 @@ description: Operations executed bracket.kcl
         }
       },
       "sourceRange": []
-    }
+    },
-  },
-  {
     "labeledArgs": {
       "radius": {
         "value": {
@@ -271,9 +282,11 @@ description: Operations executed bracket.kcl
         "sourceRange": []
       }
     },
+    "sourceRange": []
+  },
+  {
+    "type": "KclStdLibCall",
     "name": "fillet",
-    "sourceRange": [],
-    "type": "StdLibCall",
     "unlabeledArg": {
       "value": {
         "type": "Solid",
@@ -282,9 +295,7 @@ description: Operations executed bracket.kcl
         }
       },
       "sourceRange": []
-    }
+    },
-  },
-  {
     "labeledArgs": {
       "radius": {
         "value": {
@@ -329,17 +340,6 @@ description: Operations executed bracket.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   }
 ]

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

@@ -1,264 +1,264 @@
 ```mermaid
 flowchart LR
   subgraph path2 [Path]
-    2["Path<br>[571, 622, 7]"]
+    2["Path<br>[571, 622, 8]"]
-    3["Segment<br>[571, 622, 7]"]
+    3["Segment<br>[571, 622, 8]"]
     4[Solid2d]
   end
   subgraph path11 [Path]
-    11["Path<br>[812, 868, 7]"]
+    11["Path<br>[812, 868, 8]"]
-    12["Segment<br>[812, 868, 7]"]
+    12["Segment<br>[812, 868, 8]"]
     13[Solid2d]
   end
   subgraph path19 [Path]
-    19["Path<br>[998, 1051, 7]"]
+    19["Path<br>[998, 1051, 8]"]
-    20["Segment<br>[998, 1051, 7]"]
+    20["Segment<br>[998, 1051, 8]"]
     21[Solid2d]
   end
   subgraph path30 [Path]
-    30["Path<br>[1439, 1479, 7]"]
+    30["Path<br>[1439, 1479, 8]"]
-    31["Segment<br>[1439, 1479, 7]"]
+    31["Segment<br>[1439, 1479, 8]"]
     32[Solid2d]
   end
   subgraph path38 [Path]
-    38["Path<br>[1588, 1639, 7]"]
+    38["Path<br>[1588, 1639, 8]"]
-    39["Segment<br>[1588, 1639, 7]"]
+    39["Segment<br>[1588, 1639, 8]"]
     40[Solid2d]
   end
   subgraph path47 [Path]
-    47["Path<br>[1777, 1830, 7]"]
+    47["Path<br>[1777, 1830, 8]"]
-    48["Segment<br>[1777, 1830, 7]"]
+    48["Segment<br>[1777, 1830, 8]"]
     49[Solid2d]
   end
   subgraph path58 [Path]
-    58["Path<br>[2078, 2150, 7]"]
+    58["Path<br>[2078, 2150, 8]"]
-    59["Segment<br>[2078, 2150, 7]"]
+    59["Segment<br>[2078, 2150, 8]"]
     60[Solid2d]
   end
   subgraph path81 [Path]
-    81["Path<br>[2412, 2443, 7]"]
+    81["Path<br>[2412, 2443, 8]"]
-    82["Segment<br>[2449, 2469, 7]"]
+    82["Segment<br>[2449, 2469, 8]"]
-    83["Segment<br>[2475, 2495, 7]"]
+    83["Segment<br>[2475, 2495, 8]"]
-    84["Segment<br>[2501, 2522, 7]"]
+    84["Segment<br>[2501, 2522, 8]"]
-    85["Segment<br>[2528, 2584, 7]"]
+    85["Segment<br>[2528, 2584, 8]"]
-    86["Segment<br>[2590, 2597, 7]"]
+    86["Segment<br>[2590, 2597, 8]"]
     87[Solid2d]
   end
   subgraph path106 [Path]
-    106["Path<br>[2904, 2936, 7]"]
+    106["Path<br>[2904, 2936, 8]"]
-    107["Segment<br>[2942, 2963, 7]"]
+    107["Segment<br>[2942, 2963, 8]"]
-    108["Segment<br>[2969, 2989, 7]"]
+    108["Segment<br>[2969, 2989, 8]"]
-    109["Segment<br>[2995, 3015, 7]"]
+    109["Segment<br>[2995, 3015, 8]"]
-    110["Segment<br>[3021, 3077, 7]"]
+    110["Segment<br>[3021, 3077, 8]"]
-    111["Segment<br>[3083, 3090, 7]"]
+    111["Segment<br>[3083, 3090, 8]"]
     112[Solid2d]
   end
   subgraph path132 [Path]
-    132["Path<br>[354, 410, 6]"]
+    132["Path<br>[354, 410, 7]"]
-    133["Segment<br>[354, 410, 6]"]
+    133["Segment<br>[354, 410, 7]"]
     134[Solid2d]
   end
   subgraph path135 [Path]
-    135["Path<br>[434, 490, 6]"]
+    135["Path<br>[434, 490, 7]"]
-    136["Segment<br>[434, 490, 6]"]
+    136["Segment<br>[434, 490, 7]"]
     137[Solid2d]
   end
   subgraph path144 [Path]
-    144["Path<br>[657, 713, 6]"]
+    144["Path<br>[657, 713, 7]"]
-    145["Segment<br>[657, 713, 6]"]
+    145["Segment<br>[657, 713, 7]"]
     146[Solid2d]
   end
   subgraph path147 [Path]
-    147["Path<br>[737, 793, 6]"]
+    147["Path<br>[737, 793, 7]"]
-    148["Segment<br>[737, 793, 6]"]
+    148["Segment<br>[737, 793, 7]"]
     149[Solid2d]
   end
   subgraph path156 [Path]
-    156["Path<br>[939, 993, 6]"]
+    156["Path<br>[939, 993, 7]"]
-    157["Segment<br>[939, 993, 6]"]
+    157["Segment<br>[939, 993, 7]"]
     158[Solid2d]
   end
   subgraph path167 [Path]
-    167["Path<br>[1276, 1337, 6]"]
+    167["Path<br>[1276, 1337, 7]"]
-    168["Segment<br>[1276, 1337, 6]"]
+    168["Segment<br>[1276, 1337, 7]"]
     169[Solid2d]
   end
   subgraph path179 [Path]
-    179["Path<br>[1695, 1741, 6]"]
+    179["Path<br>[1695, 1741, 7]"]
-    180["Segment<br>[1747, 1799, 6]"]
+    180["Segment<br>[1747, 1799, 7]"]
-    181["Segment<br>[1805, 1878, 6]"]
+    181["Segment<br>[1805, 1878, 7]"]
-    182["Segment<br>[1884, 1906, 6]"]
+    182["Segment<br>[1884, 1906, 7]"]
-    183["Segment<br>[1912, 1968, 6]"]
+    183["Segment<br>[1912, 1968, 7]"]
-    184["Segment<br>[1974, 1981, 6]"]
+    184["Segment<br>[1974, 1981, 7]"]
     185[Solid2d]
   end
   subgraph path195 [Path]
-    195["Path<br>[2113, 2159, 6]"]
+    195["Path<br>[2113, 2159, 7]"]
-    196["Segment<br>[2165, 2217, 6]"]
+    196["Segment<br>[2165, 2217, 7]"]
-    197["Segment<br>[2223, 2298, 6]"]
+    197["Segment<br>[2223, 2298, 7]"]
-    198["Segment<br>[2304, 2341, 6]"]
+    198["Segment<br>[2304, 2341, 7]"]
-    199["Segment<br>[2347, 2403, 6]"]
+    199["Segment<br>[2347, 2403, 7]"]
-    200["Segment<br>[2409, 2416, 6]"]
+    200["Segment<br>[2409, 2416, 7]"]
     201[Solid2d]
   end
   subgraph path212 [Path]
-    212["Path<br>[2897, 2944, 6]"]
+    212["Path<br>[2897, 2944, 7]"]
-    213["Segment<br>[2952, 3289, 6]"]
+    213["Segment<br>[2952, 3289, 7]"]
-    214["Segment<br>[3297, 3329, 6]"]
+    214["Segment<br>[3297, 3329, 7]"]
-    215["Segment<br>[3337, 3678, 6]"]
+    215["Segment<br>[3337, 3678, 7]"]
-    216["Segment<br>[3686, 3742, 6]"]
+    216["Segment<br>[3686, 3742, 7]"]
-    217["Segment<br>[3750, 3757, 6]"]
+    217["Segment<br>[3750, 3757, 7]"]
     218[Solid2d]
   end
   subgraph path235 [Path]
-    235["Path<br>[2897, 2944, 6]"]
+    235["Path<br>[2897, 2944, 7]"]
-    236["Segment<br>[2952, 3289, 6]"]
+    236["Segment<br>[2952, 3289, 7]"]
-    237["Segment<br>[3297, 3329, 6]"]
+    237["Segment<br>[3297, 3329, 7]"]
-    238["Segment<br>[3337, 3678, 6]"]
+    238["Segment<br>[3337, 3678, 7]"]
-    239["Segment<br>[3686, 3742, 6]"]
+    239["Segment<br>[3686, 3742, 7]"]
-    240["Segment<br>[3750, 3757, 6]"]
+    240["Segment<br>[3750, 3757, 7]"]
     241[Solid2d]
   end
   subgraph path258 [Path]
-    258["Path<br>[4285, 4380, 6]"]
+    258["Path<br>[4285, 4380, 7]"]
-    259["Segment<br>[4386, 4419, 6]"]
+    259["Segment<br>[4386, 4419, 7]"]
-    260["Segment<br>[4425, 4476, 6]"]
+    260["Segment<br>[4425, 4476, 7]"]
-    261["Segment<br>[4482, 4515, 6]"]
+    261["Segment<br>[4482, 4515, 7]"]
-    262["Segment<br>[4521, 4571, 6]"]
+    262["Segment<br>[4521, 4571, 7]"]
-    263["Segment<br>[4577, 4618, 6]"]
+    263["Segment<br>[4577, 4618, 7]"]
-    264["Segment<br>[4624, 4673, 6]"]
+    264["Segment<br>[4624, 4673, 7]"]
-    265["Segment<br>[4679, 4712, 6]"]
+    265["Segment<br>[4679, 4712, 7]"]
-    266["Segment<br>[4718, 4752, 6]"]
+    266["Segment<br>[4718, 4752, 7]"]
-    267["Segment<br>[4758, 4792, 6]"]
+    267["Segment<br>[4758, 4792, 7]"]
-    268["Segment<br>[4798, 4850, 6]"]
+    268["Segment<br>[4798, 4850, 7]"]
-    269["Segment<br>[4856, 4890, 6]"]
+    269["Segment<br>[4856, 4890, 7]"]
-    270["Segment<br>[4896, 4972, 6]"]
+    270["Segment<br>[4896, 4972, 7]"]
-    271["Segment<br>[4978, 5011, 6]"]
+    271["Segment<br>[4978, 5011, 7]"]
-    272["Segment<br>[5017, 5093, 6]"]
+    272["Segment<br>[5017, 5093, 7]"]
-    273["Segment<br>[5099, 5133, 6]"]
+    273["Segment<br>[5099, 5133, 7]"]
-    274["Segment<br>[5139, 5213, 6]"]
+    274["Segment<br>[5139, 5213, 7]"]
-    275["Segment<br>[5219, 5253, 6]"]
+    275["Segment<br>[5219, 5253, 7]"]
-    276["Segment<br>[5259, 5310, 6]"]
+    276["Segment<br>[5259, 5310, 7]"]
-    277["Segment<br>[5316, 5378, 6]"]
+    277["Segment<br>[5316, 5378, 7]"]
-    278["Segment<br>[5384, 5435, 6]"]
+    278["Segment<br>[5384, 5435, 7]"]
-    279["Segment<br>[5441, 5475, 6]"]
+    279["Segment<br>[5441, 5475, 7]"]
-    280["Segment<br>[5481, 5514, 6]"]
+    280["Segment<br>[5481, 5514, 7]"]
-    281["Segment<br>[5520, 5553, 6]"]
+    281["Segment<br>[5520, 5553, 7]"]
-    282["Segment<br>[5559, 5566, 6]"]
+    282["Segment<br>[5559, 5566, 7]"]
     283[Solid2d]
   end
   subgraph path334 [Path]
-    334["Path<br>[713, 753, 9]"]
+    334["Path<br>[713, 753, 10]"]
-    335["Segment<br>[761, 808, 9]"]
+    335["Segment<br>[761, 808, 10]"]
-    336["Segment<br>[816, 852, 9]"]
+    336["Segment<br>[816, 852, 10]"]
-    337["Segment<br>[860, 890, 9]"]
+    337["Segment<br>[860, 890, 10]"]
-    338["Segment<br>[898, 943, 9]"]
+    338["Segment<br>[898, 943, 10]"]
-    339["Segment<br>[951, 991, 9]"]
+    339["Segment<br>[951, 991, 10]"]
-    340["Segment<br>[999, 1034, 9]"]
+    340["Segment<br>[999, 1034, 10]"]
-    341["Segment<br>[1042, 1080, 9]"]
+    341["Segment<br>[1042, 1080, 10]"]
-    342["Segment<br>[1088, 1110, 9]"]
+    342["Segment<br>[1088, 1110, 10]"]
-    343["Segment<br>[1118, 1125, 9]"]
+    343["Segment<br>[1118, 1125, 10]"]
     344[Solid2d]
   end
   subgraph path365 [Path]
-    365["Path<br>[511, 592, 8]"]
+    365["Path<br>[511, 592, 9]"]
-    366["Segment<br>[598, 699, 8]"]
+    366["Segment<br>[598, 699, 9]"]
-    367["Segment<br>[705, 763, 8]"]
+    367["Segment<br>[705, 763, 9]"]
-    368["Segment<br>[769, 853, 8]"]
+    368["Segment<br>[769, 853, 9]"]
-    369["Segment<br>[859, 918, 8]"]
+    369["Segment<br>[859, 918, 9]"]
-    370["Segment<br>[924, 1009, 8]"]
+    370["Segment<br>[924, 1009, 9]"]
-    371["Segment<br>[1015, 1074, 8]"]
+    371["Segment<br>[1015, 1074, 9]"]
-    372["Segment<br>[1080, 1203, 8]"]
+    372["Segment<br>[1080, 1203, 9]"]
-    373["Segment<br>[1209, 1268, 8]"]
+    373["Segment<br>[1209, 1268, 9]"]
-    374["Segment<br>[1274, 1409, 8]"]
+    374["Segment<br>[1274, 1409, 9]"]
-    375["Segment<br>[1415, 1474, 8]"]
+    375["Segment<br>[1415, 1474, 9]"]
-    376["Segment<br>[1480, 1604, 8]"]
+    376["Segment<br>[1480, 1604, 9]"]
-    377["Segment<br>[1610, 1669, 8]"]
+    377["Segment<br>[1610, 1669, 9]"]
-    378["Segment<br>[1675, 1760, 8]"]
+    378["Segment<br>[1675, 1760, 9]"]
-    379["Segment<br>[1766, 1825, 8]"]
+    379["Segment<br>[1766, 1825, 9]"]
-    380["Segment<br>[1831, 1916, 8]"]
+    380["Segment<br>[1831, 1916, 9]"]
-    381["Segment<br>[1922, 1980, 8]"]
+    381["Segment<br>[1922, 1980, 9]"]
-    382["Segment<br>[1986, 1993, 8]"]
+    382["Segment<br>[1986, 1993, 9]"]
     383[Solid2d]
   end
   subgraph path439 [Path]
-    439["Path<br>[487, 544, 10]"]
+    439["Path<br>[487, 544, 11]"]
-    440["Segment<br>[550, 684, 10]"]
+    440["Segment<br>[550, 684, 11]"]
-    441["Segment<br>[690, 737, 10]"]
+    441["Segment<br>[690, 737, 11]"]
-    442["Segment<br>[743, 840, 10]"]
+    442["Segment<br>[743, 840, 11]"]
-    443["Segment<br>[846, 878, 10]"]
+    443["Segment<br>[846, 878, 11]"]
-    444["Segment<br>[884, 916, 10]"]
+    444["Segment<br>[884, 916, 11]"]
-    445["Segment<br>[922, 953, 10]"]
+    445["Segment<br>[922, 953, 11]"]
-    446["Segment<br>[959, 1074, 10]"]
+    446["Segment<br>[959, 1074, 11]"]
-    447["Segment<br>[1080, 1112, 10]"]
+    447["Segment<br>[1080, 1112, 11]"]
-    448["Segment<br>[1118, 1150, 10]"]
+    448["Segment<br>[1118, 1150, 11]"]
-    449["Segment<br>[1156, 1187, 10]"]
+    449["Segment<br>[1156, 1187, 11]"]
-    450["Segment<br>[1193, 1286, 10]"]
+    450["Segment<br>[1193, 1286, 11]"]
-    451["Segment<br>[1292, 1339, 10]"]
+    451["Segment<br>[1292, 1339, 11]"]
-    452["Segment<br>[1345, 1418, 10]"]
+    452["Segment<br>[1345, 1418, 11]"]
-    453["Segment<br>[1424, 1431, 10]"]
+    453["Segment<br>[1424, 1431, 11]"]
     454[Solid2d]
   end
-  1["Plane<br>[548, 565, 7]"]
+  1["Plane<br>[548, 565, 8]"]
-  5["Sweep Extrusion<br>[631, 687, 7]"]
+  5["Sweep Extrusion<br>[631, 687, 8]"]
   6[Wall]
   7["Cap Start"]
   8["Cap End"]
   9["SweepEdge Opposite"]
   10["SweepEdge Adjacent"]
-  14["Sweep Extrusion<br>[881, 943, 7]"]
+  14["Sweep Extrusion<br>[881, 943, 8]"]
   15[Wall]
   16["Cap End"]
   17["SweepEdge Opposite"]
   18["SweepEdge Adjacent"]
-  22["Sweep Extrusion<br>[1198, 1277, 7]"]
+  22["Sweep Extrusion<br>[1198, 1277, 8]"]
   23[Wall]
   24["SweepEdge Opposite"]
   25["SweepEdge Adjacent"]
-  26["Sweep Extrusion<br>[1198, 1277, 7]"]
+  26["Sweep Extrusion<br>[1198, 1277, 8]"]
-  27["Sweep Extrusion<br>[1198, 1277, 7]"]
+  27["Sweep Extrusion<br>[1198, 1277, 8]"]
-  28["Sweep Extrusion<br>[1198, 1277, 7]"]
+  28["Sweep Extrusion<br>[1198, 1277, 8]"]
-  29["Sweep Extrusion<br>[1198, 1277, 7]"]
+  29["Sweep Extrusion<br>[1198, 1277, 8]"]
-  33["Sweep Extrusion<br>[1485, 1518, 7]"]
+  33["Sweep Extrusion<br>[1485, 1518, 8]"]
   34[Wall]
   35["Cap End"]
   36["SweepEdge Opposite"]
   37["SweepEdge Adjacent"]
-  41["Sweep Extrusion<br>[1654, 1719, 7]"]
+  41["Sweep Extrusion<br>[1654, 1719, 8]"]
   42[Wall]
   43["Cap Start"]
   44["Cap End"]
   45["SweepEdge Opposite"]
   46["SweepEdge Adjacent"]
-  50["Sweep Extrusion<br>[1977, 2021, 7]"]
+  50["Sweep Extrusion<br>[1977, 2021, 8]"]
   51[Wall]
   52["SweepEdge Opposite"]
   53["SweepEdge Adjacent"]
-  54["Sweep Extrusion<br>[1977, 2021, 7]"]
+  54["Sweep Extrusion<br>[1977, 2021, 8]"]
-  55["Sweep Extrusion<br>[1977, 2021, 7]"]
+  55["Sweep Extrusion<br>[1977, 2021, 8]"]
-  56["Sweep Extrusion<br>[1977, 2021, 7]"]
+  56["Sweep Extrusion<br>[1977, 2021, 8]"]
-  57["Sweep Extrusion<br>[1977, 2021, 7]"]
+  57["Sweep Extrusion<br>[1977, 2021, 8]"]
-  61["Sweep Extrusion<br>[2305, 2349, 7]"]
+  61["Sweep Extrusion<br>[2305, 2349, 8]"]
   62[Wall]
   63["Cap End"]
   64["SweepEdge Opposite"]
   65["SweepEdge Adjacent"]
-  66["Sweep Extrusion<br>[2305, 2349, 7]"]
+  66["Sweep Extrusion<br>[2305, 2349, 8]"]
-  67["Sweep Extrusion<br>[2305, 2349, 7]"]
+  67["Sweep Extrusion<br>[2305, 2349, 8]"]
-  68["Sweep Extrusion<br>[2305, 2349, 7]"]
+  68["Sweep Extrusion<br>[2305, 2349, 8]"]
-  69["Sweep Extrusion<br>[2305, 2349, 7]"]
+  69["Sweep Extrusion<br>[2305, 2349, 8]"]
-  70["Sweep Extrusion<br>[2305, 2349, 7]"]
+  70["Sweep Extrusion<br>[2305, 2349, 8]"]
-  71["Sweep Extrusion<br>[2305, 2349, 7]"]
+  71["Sweep Extrusion<br>[2305, 2349, 8]"]
-  72["Sweep Extrusion<br>[2305, 2349, 7]"]
+  72["Sweep Extrusion<br>[2305, 2349, 8]"]
-  73["Sweep Extrusion<br>[2305, 2349, 7]"]
+  73["Sweep Extrusion<br>[2305, 2349, 8]"]
-  74["Sweep Extrusion<br>[2305, 2349, 7]"]
+  74["Sweep Extrusion<br>[2305, 2349, 8]"]
-  75["Sweep Extrusion<br>[2305, 2349, 7]"]
+  75["Sweep Extrusion<br>[2305, 2349, 8]"]
-  76["Sweep Extrusion<br>[2305, 2349, 7]"]
+  76["Sweep Extrusion<br>[2305, 2349, 8]"]
-  77["Sweep Extrusion<br>[2305, 2349, 7]"]
+  77["Sweep Extrusion<br>[2305, 2349, 8]"]
-  78["Sweep Extrusion<br>[2305, 2349, 7]"]
+  78["Sweep Extrusion<br>[2305, 2349, 8]"]
-  79["Sweep Extrusion<br>[2305, 2349, 7]"]
+  79["Sweep Extrusion<br>[2305, 2349, 8]"]
-  80["Sweep Extrusion<br>[2305, 2349, 7]"]
+  80["Sweep Extrusion<br>[2305, 2349, 8]"]
-  88["Sweep Extrusion<br>[2763, 2831, 7]"]
+  88["Sweep Extrusion<br>[2763, 2831, 8]"]
   89[Wall]
   90[Wall]
   91[Wall]
@@ -272,11 +272,11 @@ flowchart LR
   99["SweepEdge Adjacent"]
   100["SweepEdge Opposite"]
   101["SweepEdge Adjacent"]
-  102["Sweep Extrusion<br>[2763, 2831, 7]"]
+  102["Sweep Extrusion<br>[2763, 2831, 8]"]
-  103["Sweep Extrusion<br>[2763, 2831, 7]"]
+  103["Sweep Extrusion<br>[2763, 2831, 8]"]
-  104["Sweep Extrusion<br>[2763, 2831, 7]"]
+  104["Sweep Extrusion<br>[2763, 2831, 8]"]
-  105["Sweep Extrusion<br>[2763, 2831, 7]"]
+  105["Sweep Extrusion<br>[2763, 2831, 8]"]
-  113["Sweep Extrusion<br>[3253, 3327, 7]"]
+  113["Sweep Extrusion<br>[3253, 3327, 8]"]
   114[Wall]
   115[Wall]
   116[Wall]
@@ -290,41 +290,41 @@ flowchart LR
   124["SweepEdge Adjacent"]
   125["SweepEdge Opposite"]
   126["SweepEdge Adjacent"]
-  127["Sweep Extrusion<br>[3253, 3327, 7]"]
+  127["Sweep Extrusion<br>[3253, 3327, 8]"]
-  128["Sweep Extrusion<br>[3253, 3327, 7]"]
+  128["Sweep Extrusion<br>[3253, 3327, 8]"]
-  129["Sweep Extrusion<br>[3253, 3327, 7]"]
+  129["Sweep Extrusion<br>[3253, 3327, 8]"]
-  130["Sweep Extrusion<br>[3253, 3327, 7]"]
+  130["Sweep Extrusion<br>[3253, 3327, 8]"]
-  131["Plane<br>[331, 348, 6]"]
+  131["Plane<br>[331, 348, 7]"]
-  138["Sweep Extrusion<br>[497, 530, 6]"]
+  138["Sweep Extrusion<br>[497, 530, 7]"]
   139[Wall]
   140["Cap Start"]
   141["Cap End"]
   142["SweepEdge Opposite"]
   143["SweepEdge Adjacent"]
-  150["Sweep Extrusion<br>[800, 833, 6]"]
+  150["Sweep Extrusion<br>[800, 833, 7]"]
   151[Wall]
   152["Cap Start"]
   153["Cap End"]
   154["SweepEdge Opposite"]
   155["SweepEdge Adjacent"]
-  159["Sweep Extrusion<br>[1140, 1174, 6]"]
+  159["Sweep Extrusion<br>[1140, 1174, 7]"]
   160[Wall]
   161["SweepEdge Opposite"]
   162["SweepEdge Adjacent"]
-  163["Sweep Extrusion<br>[1140, 1174, 6]"]
+  163["Sweep Extrusion<br>[1140, 1174, 7]"]
-  164["Sweep Extrusion<br>[1140, 1174, 6]"]
+  164["Sweep Extrusion<br>[1140, 1174, 7]"]
-  165["Sweep Extrusion<br>[1140, 1174, 6]"]
+  165["Sweep Extrusion<br>[1140, 1174, 7]"]
-  166["Sweep Extrusion<br>[1140, 1174, 6]"]
+  166["Sweep Extrusion<br>[1140, 1174, 7]"]
-  170["Sweep Extrusion<br>[1484, 1518, 6]"]
+  170["Sweep Extrusion<br>[1484, 1518, 7]"]
   171[Wall]
   172["SweepEdge Opposite"]
   173["SweepEdge Adjacent"]
-  174["Sweep Extrusion<br>[1484, 1518, 6]"]
+  174["Sweep Extrusion<br>[1484, 1518, 7]"]
-  175["Sweep Extrusion<br>[1484, 1518, 6]"]
+  175["Sweep Extrusion<br>[1484, 1518, 7]"]
-  176["Sweep Extrusion<br>[1484, 1518, 6]"]
+  176["Sweep Extrusion<br>[1484, 1518, 7]"]
-  177["Sweep Extrusion<br>[1484, 1518, 6]"]
+  177["Sweep Extrusion<br>[1484, 1518, 7]"]
-  178["Plane<br>[1672, 1689, 6]"]
+  178["Plane<br>[1672, 1689, 7]"]
-  186["Sweep Revolve<br>[1987, 2004, 6]"]
+  186["Sweep Revolve<br>[1987, 2004, 7]"]
   187[Wall]
   188[Wall]
   189[Wall]
@@ -332,8 +332,8 @@ flowchart LR
   191["SweepEdge Adjacent"]
   192["SweepEdge Adjacent"]
   193["SweepEdge Adjacent"]
-  194["Plane<br>[2090, 2107, 6]"]
+  194["Plane<br>[2090, 2107, 7]"]
-  202["Sweep Revolve<br>[2422, 2439, 6]"]
+  202["Sweep Revolve<br>[2422, 2439, 7]"]
   203[Wall]
   204[Wall]
   205[Wall]
@@ -342,8 +342,8 @@ flowchart LR
   208["SweepEdge Adjacent"]
   209["SweepEdge Adjacent"]
   210["SweepEdge Adjacent"]
-  211["Plane<br>[2866, 2889, 6]"]
+  211["Plane<br>[2866, 2889, 7]"]
-  219["Sweep Extrusion<br>[3805, 3851, 6]"]
+  219["Sweep Extrusion<br>[3805, 3851, 7]"]
   220[Wall]
   221[Wall]
   222[Wall]
@@ -358,8 +358,8 @@ flowchart LR
   231["SweepEdge Adjacent"]
   232["SweepEdge Opposite"]
   233["SweepEdge Adjacent"]
-  234["Plane<br>[2866, 2889, 6]"]
+  234["Plane<br>[2866, 2889, 7]"]
-  242["Sweep Extrusion<br>[3805, 3851, 6]"]
+  242["Sweep Extrusion<br>[3805, 3851, 7]"]
   243[Wall]
   244[Wall]
   245[Wall]
@@ -374,8 +374,8 @@ flowchart LR
   254["SweepEdge Adjacent"]
   255["SweepEdge Opposite"]
   256["SweepEdge Adjacent"]
-  257["Plane<br>[4262, 4279, 6]"]
+  257["Plane<br>[4262, 4279, 7]"]
-  284["Sweep Revolve<br>[5572, 5589, 6]"]
+  284["Sweep Revolve<br>[5572, 5589, 7]"]
   285[Wall]
   286[Wall]
   287[Wall]
@@ -424,8 +424,8 @@ flowchart LR
   330["SweepEdge Adjacent"]
   331["SweepEdge Adjacent"]
   332["SweepEdge Adjacent"]
-  333["Plane<br>[679, 705, 9]"]
+  333["Plane<br>[679, 705, 10]"]
-  345["Sweep Revolve<br>[1133, 1150, 9]"]
+  345["Sweep Revolve<br>[1133, 1150, 10]"]
   346[Wall]
   347[Wall]
   348[Wall]
@@ -444,8 +444,8 @@ flowchart LR
   361["SweepEdge Adjacent"]
   362["SweepEdge Adjacent"]
   363["SweepEdge Adjacent"]
-  364["Plane<br>[488, 505, 8]"]
+  364["Plane<br>[488, 505, 9]"]
-  384["Sweep Revolve<br>[2031, 2081, 8]"]
+  384["Sweep Revolve<br>[2031, 2081, 9]"]
   385[Wall]
   386[Wall]
   387[Wall]
@@ -499,8 +499,8 @@ flowchart LR
   435["SweepEdge Adjacent"]
   436["SweepEdge Opposite"]
   437["SweepEdge Adjacent"]
-  438["Plane<br>[464, 481, 10]"]
+  438["Plane<br>[464, 481, 11]"]
-  455["Sweep Revolve<br>[1484, 1513, 10]"]
+  455["Sweep Revolve<br>[1484, 1513, 11]"]
   456[Wall]
   457[Wall]
   458[Wall]
@@ -529,17 +529,17 @@ flowchart LR
   481["SweepEdge Adjacent"]
   482["SweepEdge Adjacent"]
   483["SweepEdge Adjacent"]
-  484["StartSketchOnFace<br>[774, 806, 7]"]
+  484["StartSketchOnFace<br>[774, 806, 8]"]
-  485["StartSketchOnFace<br>[956, 992, 7]"]
+  485["StartSketchOnFace<br>[956, 992, 8]"]
-  486["StartSketchOnFace<br>[1399, 1433, 7]"]
+  486["StartSketchOnFace<br>[1399, 1433, 8]"]
-  487["StartSketchOnFace<br>[1543, 1582, 7]"]
+  487["StartSketchOnFace<br>[1543, 1582, 8]"]
-  488["StartSketchOnFace<br>[1733, 1771, 7]"]
+  488["StartSketchOnFace<br>[1733, 1771, 8]"]
-  489["StartSketchOnFace<br>[2038, 2072, 7]"]
+  489["StartSketchOnFace<br>[2038, 2072, 8]"]
-  490["StartSketchOnFace<br>[2372, 2406, 7]"]
+  490["StartSketchOnFace<br>[2372, 2406, 8]"]
-  491["StartSketchOnFace<br>[2860, 2898, 7]"]
+  491["StartSketchOnFace<br>[2860, 2898, 8]"]
-  492["StartSketchOnFace<br>[617, 651, 6]"]
+  492["StartSketchOnFace<br>[617, 651, 7]"]
-  493["StartSketchOnFace<br>[894, 933, 6]"]
+  493["StartSketchOnFace<br>[894, 933, 7]"]
-  494["StartSketchOnFace<br>[1236, 1270, 6]"]
+  494["StartSketchOnFace<br>[1236, 1270, 7]"]
   1 --- 2
   2 --- 3
   2 ---- 5

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

@@ -8,7 +8,7 @@ description: Operations executed car-wheel-assembly.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "carRotor",
-      "moduleId": 7
+      "moduleId": 0
     },
     "sourceRange": []
   },
@@ -718,7 +718,7 @@ description: Operations executed car-wheel-assembly.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "carWheel",
-      "moduleId": 6
+      "moduleId": 0
     },
     "sourceRange": []
   },
@@ -1249,11 +1249,7 @@ description: Operations executed car-wheel-assembly.kcl
     "group": {
       "type": "FunctionCall",
       "name": "spoke",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        2592,
-        4131,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1640,11 +1636,7 @@ description: Operations executed car-wheel-assembly.kcl
     "group": {
       "type": "FunctionCall",
       "name": "spoke",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        2592,
-        4131,
-        6
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2135,7 +2127,7 @@ description: Operations executed car-wheel-assembly.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "lugNut",
-      "moduleId": 9
+      "moduleId": 0
     },
     "sourceRange": []
   },
@@ -2144,11 +2136,7 @@ description: Operations executed car-wheel-assembly.kcl
     "group": {
       "type": "FunctionCall",
       "name": "lug",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        637,
-        1240,
-        9
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2584,7 +2572,7 @@ description: Operations executed car-wheel-assembly.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "brakeCaliper",
-      "moduleId": 8
+      "moduleId": 0
     },
     "sourceRange": []
   },
@@ -2718,7 +2706,7 @@ description: Operations executed car-wheel-assembly.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "carTire",
-      "moduleId": 10
+      "moduleId": 0
     },
     "sourceRange": []
   },

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

@@ -31,7 +31,7 @@ description: Variables in memory after executing car-wheel-assembly.kcl
   },
   "brakeCaliper": {
     "type": "Module",
-    "value": 8
+    "value": 9
   },
   "c1": {
     "type": "TagIdentifier",
@@ -105,15 +105,15 @@ description: Variables in memory after executing car-wheel-assembly.kcl
   },
   "carRotor": {
     "type": "Module",
-    "value": 7
+    "value": 8
   },
   "carTire": {
     "type": "Module",
-    "value": 10
+    "value": 11
   },
   "carWheel": {
     "type": "Module",
-    "value": 6
+    "value": 7
   },
   "drillAndSlotCount": {
     "type": "Number",
@@ -183,7 +183,7 @@ description: Variables in memory after executing car-wheel-assembly.kcl
   },
   "lugNut": {
     "type": "Module",
-    "value": 9
+    "value": 10
   },
   "lugSpacing": {
     "type": "Number",

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

@@ -188,11 +188,7 @@ description: Operations executed color-cube.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sketchRectangle",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        730,
-        1327,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -238,11 +234,7 @@ description: Operations executed color-cube.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sketchRectangle",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        730,
-        1327,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -288,11 +280,7 @@ description: Operations executed color-cube.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sketchRectangle",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        730,
-        1327,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -338,11 +326,7 @@ description: Operations executed color-cube.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sketchRectangle",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        730,
-        1327,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -388,11 +372,7 @@ description: Operations executed color-cube.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sketchRectangle",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        730,
-        1327,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -438,11 +418,7 @@ description: Operations executed color-cube.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sketchRectangle",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        730,
-        1327,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -8,11 +8,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cycloidalGear",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        265,
-        1605,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -23,11 +19,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "gearSketch",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        491,
-        1396,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -83,11 +75,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -101,11 +89,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -119,11 +103,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -137,11 +117,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -155,11 +131,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -173,11 +145,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -191,11 +159,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -209,11 +173,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -255,11 +215,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "gearSketch",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        491,
-        1396,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -315,11 +271,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -333,11 +285,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -351,11 +299,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -369,11 +313,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -387,11 +327,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -405,11 +341,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -423,11 +355,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -441,11 +369,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -487,11 +411,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "gearSketch",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        491,
-        1396,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -547,11 +467,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -565,11 +481,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -583,11 +495,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -601,11 +509,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -619,11 +523,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -637,11 +537,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -655,11 +551,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -673,11 +565,7 @@ description: Operations executed cycloidal-gear.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -8,11 +8,7 @@ description: Operations executed dodecahedron.kcl
     "group": {
       "type": "FunctionCall",
       "name": "createFaceTemplate",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        445,
-        872,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -73,11 +69,7 @@ description: Operations executed dodecahedron.kcl
     "group": {
       "type": "FunctionCall",
       "name": "createFaceTemplate",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        445,
-        872,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -138,11 +130,7 @@ description: Operations executed dodecahedron.kcl
     "group": {
       "type": "FunctionCall",
       "name": "createFaceTemplate",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        445,
-        872,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -203,11 +191,7 @@ description: Operations executed dodecahedron.kcl
     "group": {
       "type": "FunctionCall",
       "name": "createFaceTemplate",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        445,
-        872,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -268,11 +252,7 @@ description: Operations executed dodecahedron.kcl
     "group": {
       "type": "FunctionCall",
       "name": "createFaceTemplate",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        445,
-        872,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -333,11 +313,7 @@ description: Operations executed dodecahedron.kcl
     "group": {
       "type": "FunctionCall",
       "name": "createFaceTemplate",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        445,
-        872,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -398,11 +374,7 @@ description: Operations executed dodecahedron.kcl
     "group": {
       "type": "FunctionCall",
       "name": "createFaceTemplate",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        445,
-        872,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -463,11 +435,7 @@ description: Operations executed dodecahedron.kcl
     "group": {
       "type": "FunctionCall",
       "name": "createFaceTemplate",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        445,
-        872,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -528,11 +496,7 @@ description: Operations executed dodecahedron.kcl
     "group": {
       "type": "FunctionCall",
       "name": "createFaceTemplate",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        445,
-        872,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -593,11 +557,7 @@ description: Operations executed dodecahedron.kcl
     "group": {
       "type": "FunctionCall",
       "name": "createFaceTemplate",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        445,
-        872,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -658,11 +618,7 @@ description: Operations executed dodecahedron.kcl
     "group": {
       "type": "FunctionCall",
       "name": "createFaceTemplate",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        445,
-        872,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -723,11 +679,7 @@ description: Operations executed dodecahedron.kcl
     "group": {
       "type": "FunctionCall",
       "name": "createFaceTemplate",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        445,
-        872,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -788,11 +740,7 @@ description: Operations executed dodecahedron.kcl
     "group": {
       "type": "FunctionCall",
       "name": "createIntersection",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1933,
-        2219,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -803,11 +751,7 @@ description: Operations executed dodecahedron.kcl
     "group": {
       "type": "FunctionCall",
       "name": "calculateArrayLength",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1786,
-        1910,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -51,6 +51,17 @@ description: Operations executed enclosure.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -93,9 +104,11 @@ description: Operations executed enclosure.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
+  },
-    "type": "StdLibCall",
+  {
+    "type": "KclStdLibCall",
+    "name": "shell",
     "unlabeledArg": {
       "value": {
         "type": "Solid",
@@ -104,9 +117,7 @@ description: Operations executed enclosure.kcl
         }
       },
       "sourceRange": []
-    }
+    },
-  },
-  {
     "labeledArgs": {
       "faces": {
         "value": {
@@ -137,29 +148,14 @@ description: Operations executed enclosure.kcl
         "sourceRange": []
       }
     },
-    "name": "shell",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "type": "GroupBegin",
     "group": {
       "type": "FunctionCall",
       "name": "function001",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1285,
-        1864,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -422,11 +418,7 @@ description: Operations executed enclosure.kcl
     "group": {
       "type": "FunctionCall",
       "name": "function001",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1285,
-        1864,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -689,11 +681,7 @@ description: Operations executed enclosure.kcl
     "group": {
       "type": "FunctionCall",
       "name": "function001",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1285,
-        1864,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -956,11 +944,7 @@ description: Operations executed enclosure.kcl
     "group": {
       "type": "FunctionCall",
       "name": "function001",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1285,
-        1864,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1366,6 +1350,17 @@ description: Operations executed enclosure.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -1408,18 +1403,7 @@ description: Operations executed enclosure.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -1577,6 +1561,17 @@ description: Operations executed enclosure.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -1619,17 +1614,6 @@ description: Operations executed enclosure.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   }
 ]

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

@@ -8,11 +8,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "primaryTube",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        330,
-        1438,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -23,11 +19,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -41,11 +33,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -59,11 +47,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -77,11 +61,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -345,11 +325,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "primaryTube",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        330,
-        1438,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -360,11 +336,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -378,11 +350,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -396,11 +364,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -414,11 +378,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -682,11 +642,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "primaryTube",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        330,
-        1438,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -697,11 +653,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -715,11 +667,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -733,11 +681,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -751,11 +695,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1019,11 +959,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "primaryTube",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        330,
-        1438,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1034,11 +970,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1052,11 +984,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1070,11 +998,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1088,11 +1012,7 @@ description: Operations executed exhaust-manifold.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1599,6 +1519,17 @@ description: Operations executed exhaust-manifold.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -1633,9 +1564,11 @@ description: Operations executed exhaust-manifold.kcl
         "sourceRange": []
       }
     },
+    "sourceRange": []
+  },
+  {
+    "type": "KclStdLibCall",
     "name": "fillet",
-    "sourceRange": [],
-    "type": "StdLibCall",
     "unlabeledArg": {
       "value": {
         "type": "Solid",
@@ -1644,9 +1577,7 @@ description: Operations executed exhaust-manifold.kcl
         }
       },
       "sourceRange": []
-    }
+    },
-  },
-  {
     "labeledArgs": {
       "radius": {
         "value": {
@@ -1681,17 +1612,6 @@ description: Operations executed exhaust-manifold.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   }
 ]

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

@@ -8,11 +8,7 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
     "group": {
       "type": "FunctionCall",
       "name": "bracketSketch",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1181,
-        1705,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -246,6 +242,17 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -288,18 +295,7 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -551,6 +547,17 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -585,18 +592,7 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -943,6 +939,17 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -977,18 +984,7 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "labeledArgs": {

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

@@ -23,11 +23,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "slot",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        462,
-        1318,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -38,11 +34,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toDegrees",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11933,
-        11982,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -56,11 +48,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -74,11 +62,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -92,11 +76,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -110,11 +90,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -131,11 +107,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "slot",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        462,
-        1318,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -146,11 +118,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toDegrees",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11933,
-        11982,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -164,11 +132,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -182,11 +146,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -200,11 +160,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -218,11 +174,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -239,11 +191,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "slot",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        462,
-        1318,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -254,11 +202,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toDegrees",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11933,
-        11982,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -272,11 +216,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -290,11 +230,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -308,11 +244,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -326,11 +258,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -450,6 +378,17 @@ description: Operations executed food-service-spatula.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -484,18 +423,7 @@ description: Operations executed food-service-spatula.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "type": "KclStdLibCall",
@@ -575,6 +503,17 @@ description: Operations executed food-service-spatula.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -609,18 +548,7 @@ description: Operations executed food-service-spatula.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -875,11 +803,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "slot",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        462,
-        1318,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -890,11 +814,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -908,11 +828,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -926,11 +842,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -944,11 +856,7 @@ description: Operations executed food-service-spatula.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -1174,6 +1174,17 @@ description: Operations executed french-press.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "shell",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "faces": {
         "value": {
@@ -1204,18 +1215,7 @@ description: Operations executed french-press.kcl
         "sourceRange": []
       }
     },
-    "name": "shell",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "labeledArgs": {

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

@@ -55,11 +55,7 @@ description: Operations executed gear-rack.kcl
     "group": {
       "type": "FunctionCall",
       "name": "tooth",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        813,
-        1294,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -38,11 +38,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
     "group": {
       "type": "FunctionCall",
       "name": "face",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        869,
-        1153,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -282,11 +278,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
     "group": {
       "type": "FunctionCall",
       "name": "face",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        869,
-        1153,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1106,11 +1098,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
     "group": {
       "type": "FunctionCall",
       "name": "magnetBase",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4155,
-        4507,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1136,11 +1124,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
     "group": {
       "type": "FunctionCall",
       "name": "magnetCenterCutout",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        2668,
-        4095,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1273,6 +1257,17 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -1315,18 +1310,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "type": "KclStdLibCall",
@@ -1363,11 +1347,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
     "group": {
       "type": "FunctionCall",
       "name": "magnetBase",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4155,
-        4507,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1393,11 +1373,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
     "group": {
       "type": "FunctionCall",
       "name": "magnetCenterCutout",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        2668,
-        4095,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1482,6 +1458,17 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -1524,18 +1511,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "labeledArgs": {

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

@@ -38,11 +38,7 @@ description: Operations executed gridfinity-baseplate.kcl
     "group": {
       "type": "FunctionCall",
       "name": "face",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        746,
-        1030,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -282,11 +278,7 @@ description: Operations executed gridfinity-baseplate.kcl
     "group": {
       "type": "FunctionCall",
       "name": "face",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        746,
-        1030,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/ops.snap

@@ -38,11 +38,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
     "group": {
       "type": "FunctionCall",
       "name": "face",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1134,
-        1477,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -282,11 +278,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
     "group": {
       "type": "FunctionCall",
       "name": "face",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1134,
-        1477,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -614,6 +606,17 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -656,18 +659,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -1546,6 +1538,17 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -1588,9 +1591,11 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
+  },
-    "type": "StdLibCall",
+  {
+    "type": "KclStdLibCall",
+    "name": "shell",
     "unlabeledArg": {
       "value": {
         "type": "Solid",
@@ -1599,9 +1604,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
         }
       },
       "sourceRange": []
-    }
+    },
-  },
-  {
     "labeledArgs": {
       "faces": {
         "value": {
@@ -1632,29 +1635,14 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
         "sourceRange": []
       }
     },
-    "name": "shell",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "type": "GroupBegin",
     "group": {
       "type": "FunctionCall",
       "name": "lipFace",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        5273,
-        5900,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1848,11 +1836,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
     "group": {
       "type": "FunctionCall",
       "name": "lipFace",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        5273,
-        5900,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2344,11 +2328,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
     "group": {
       "type": "FunctionCall",
       "name": "lipFace",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        5273,
-        5900,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2617,11 +2597,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
     "group": {
       "type": "FunctionCall",
       "name": "lipFace",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        5273,
-        5900,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

rust/kcl-lib/tests/kcl_samples/gridfinity-bins/ops.snap

@@ -38,11 +38,7 @@ description: Operations executed gridfinity-bins.kcl
     "group": {
       "type": "FunctionCall",
       "name": "face",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        875,
-        1218,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -282,11 +278,7 @@ description: Operations executed gridfinity-bins.kcl
     "group": {
       "type": "FunctionCall",
       "name": "face",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        875,
-        1218,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -614,6 +606,17 @@ description: Operations executed gridfinity-bins.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -656,18 +659,7 @@ description: Operations executed gridfinity-bins.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -1546,6 +1538,17 @@ description: Operations executed gridfinity-bins.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -1588,9 +1591,11 @@ description: Operations executed gridfinity-bins.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
+  },
-    "type": "StdLibCall",
+  {
+    "type": "KclStdLibCall",
+    "name": "shell",
     "unlabeledArg": {
       "value": {
         "type": "Solid",
@@ -1599,9 +1604,7 @@ description: Operations executed gridfinity-bins.kcl
         }
       },
       "sourceRange": []
-    }
+    },
-  },
-  {
     "labeledArgs": {
       "faces": {
         "value": {
@@ -1632,17 +1635,6 @@ description: Operations executed gridfinity-bins.kcl
         "sourceRange": []
       }
     },
-    "name": "shell",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   }
 ]

rust/kcl-lib/tests/kcl_samples/hex-nut/ops.snap

@@ -8,11 +8,7 @@ description: Operations executed hex-nut.kcl
     "group": {
       "type": "FunctionCall",
       "name": "hexNut",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        504,
-        1030,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -51,6 +51,17 @@ description: Operations executed keyboard.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -95,18 +106,7 @@ description: Operations executed keyboard.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -192,11 +192,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -210,11 +206,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -228,11 +220,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -560,11 +548,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -892,11 +876,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1224,11 +1204,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1556,11 +1532,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1888,11 +1860,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2220,11 +2188,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2552,11 +2516,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2884,11 +2844,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -3216,11 +3172,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -3548,11 +3500,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -3880,11 +3828,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -4212,11 +4156,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -4544,11 +4484,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -4876,11 +4812,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -5208,11 +5140,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -5540,11 +5468,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -5872,11 +5796,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -6204,11 +6124,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -6536,11 +6452,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -6868,11 +6780,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "keyFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1887,
-        2977,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -7200,11 +7108,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -7218,11 +7122,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "sin",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -7236,11 +7136,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "z",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        4855,
-        5834,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -7473,11 +7369,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "o",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        5881,
-        6826,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -7929,11 +7821,7 @@ description: Operations executed keyboard.kcl
     "group": {
       "type": "FunctionCall",
       "name": "o",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        5881,
-        6826,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -55,11 +55,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -183,11 +179,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -256,11 +248,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -329,11 +317,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -402,11 +386,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -530,11 +510,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -603,11 +579,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -676,11 +648,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -749,11 +717,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -822,11 +786,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -895,11 +855,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -968,11 +924,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1041,11 +993,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1114,11 +1062,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1187,11 +1131,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1260,11 +1200,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1333,11 +1269,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1406,11 +1338,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1479,11 +1407,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "kitLeg",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        6061,
-        6874,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1541,11 +1465,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1617,11 +1537,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "kitLeg",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        6061,
-        6874,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1679,11 +1595,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1755,11 +1667,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "kitEar",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        7061,
-        7976,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1770,11 +1678,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1844,11 +1748,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1917,11 +1817,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1990,11 +1886,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2066,11 +1958,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "kitEar",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        7061,
-        7976,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2081,11 +1969,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2155,11 +2039,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2228,11 +2108,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2301,11 +2177,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2377,11 +2249,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2451,11 +2319,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2525,11 +2389,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2599,11 +2459,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2673,11 +2529,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2747,11 +2599,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2821,11 +2669,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2895,11 +2739,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2969,11 +2809,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -3043,11 +2879,7 @@ description: Operations executed kitt.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pixelBox",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        95,
-        503,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

rust/kcl-lib/tests/kcl_samples/makeup-mirror/ops.snap

@@ -8,11 +8,7 @@ description: Operations executed makeup-mirror.kcl
     "group": {
       "type": "FunctionCall",
       "name": "hingeFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        507,
-        686,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -103,11 +99,7 @@ description: Operations executed makeup-mirror.kcl
     "group": {
       "type": "FunctionCall",
       "name": "hingeFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        507,
-        686,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -198,11 +190,7 @@ description: Operations executed makeup-mirror.kcl
     "group": {
       "type": "FunctionCall",
       "name": "hingeFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        507,
-        686,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -293,11 +281,7 @@ description: Operations executed makeup-mirror.kcl
     "group": {
       "type": "FunctionCall",
       "name": "hingeFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        507,
-        686,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -388,11 +372,7 @@ description: Operations executed makeup-mirror.kcl
     "group": {
       "type": "FunctionCall",
       "name": "hingeFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        507,
-        686,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -483,11 +463,7 @@ description: Operations executed makeup-mirror.kcl
     "group": {
       "type": "FunctionCall",
       "name": "hingeFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        507,
-        686,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -578,11 +554,7 @@ description: Operations executed makeup-mirror.kcl
     "group": {
       "type": "FunctionCall",
       "name": "hingeFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        507,
-        686,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -673,11 +645,7 @@ description: Operations executed makeup-mirror.kcl
     "group": {
       "type": "FunctionCall",
       "name": "armFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1160,
-        1337,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -738,11 +706,7 @@ description: Operations executed makeup-mirror.kcl
     "group": {
       "type": "FunctionCall",
       "name": "armFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1160,
-        1337,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -803,11 +767,7 @@ description: Operations executed makeup-mirror.kcl
     "group": {
       "type": "FunctionCall",
       "name": "mirrorFn",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1510,
-        2267,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

rust/kcl-lib/tests/kcl_samples/mounting-plate/ops.snap

@@ -8,11 +8,7 @@ description: Operations executed mounting-plate.kcl
     "group": {
       "type": "FunctionCall",
       "name": "rectShape",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        520,
-        888,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -194,6 +190,17 @@ description: Operations executed mounting-plate.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -236,17 +243,6 @@ description: Operations executed mounting-plate.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   }
 ]

rust/kcl-lib/tests/kcl_samples/multi-axis-robot/artifact_graph_flowchart.snap.md

@@ -1,162 +1,162 @@
 ```mermaid
 flowchart LR
   subgraph path2 [Path]
-    2["Path<br>[224, 279, 6]"]
+    2["Path<br>[224, 279, 7]"]
-    3["Segment<br>[285, 365, 6]"]
+    3["Segment<br>[285, 365, 7]"]
-    4["Segment<br>[371, 483, 6]"]
+    4["Segment<br>[371, 483, 7]"]
-    5["Segment<br>[489, 606, 6]"]
+    5["Segment<br>[489, 606, 7]"]
-    6["Segment<br>[612, 697, 6]"]
+    6["Segment<br>[612, 697, 7]"]
-    7["Segment<br>[703, 710, 6]"]
+    7["Segment<br>[703, 710, 7]"]
     8[Solid2d]
   end
   subgraph path28 [Path]
-    28["Path<br>[1151, 1208, 6]"]
+    28["Path<br>[1151, 1208, 7]"]
-    29["Segment<br>[1151, 1208, 6]"]
+    29["Segment<br>[1151, 1208, 7]"]
     30[Solid2d]
   end
   subgraph path37 [Path]
-    37["Path<br>[1411, 1448, 6]"]
+    37["Path<br>[1411, 1448, 7]"]
-    38["Segment<br>[1411, 1448, 6]"]
+    38["Segment<br>[1411, 1448, 7]"]
     39[Solid2d]
   end
   subgraph path45 [Path]
-    45["Path<br>[1585, 1725, 6]"]
+    45["Path<br>[1585, 1725, 7]"]
-    46["Segment<br>[1585, 1725, 6]"]
+    46["Segment<br>[1585, 1725, 7]"]
     47[Solid2d]
   end
   subgraph path55 [Path]
-    55["Path<br>[1976, 2116, 6]"]
+    55["Path<br>[1976, 2116, 7]"]
-    56["Segment<br>[1976, 2116, 6]"]
+    56["Segment<br>[1976, 2116, 7]"]
     57[Solid2d]
   end
   subgraph path66 [Path]
-    66["Path<br>[203, 263, 7]"]
+    66["Path<br>[203, 263, 8]"]
-    67["Segment<br>[203, 263, 7]"]
+    67["Segment<br>[203, 263, 8]"]
     68[Solid2d]
   end
   subgraph path76 [Path]
-    76["Path<br>[493, 529, 7]"]
+    76["Path<br>[493, 529, 8]"]
-    77["Segment<br>[535, 572, 7]"]
+    77["Segment<br>[535, 572, 8]"]
-    78["Segment<br>[578, 633, 7]"]
+    78["Segment<br>[578, 633, 8]"]
-    79["Segment<br>[639, 688, 7]"]
+    79["Segment<br>[639, 688, 8]"]
-    80["Segment<br>[694, 750, 7]"]
+    80["Segment<br>[694, 750, 8]"]
-    81["Segment<br>[756, 763, 7]"]
+    81["Segment<br>[756, 763, 8]"]
     82[Solid2d]
   end
   subgraph path98 [Path]
-    98["Path<br>[865, 1040, 7]"]
+    98["Path<br>[865, 1040, 8]"]
-    99["Segment<br>[865, 1040, 7]"]
+    99["Segment<br>[865, 1040, 8]"]
     100[Solid2d]
   end
   subgraph path107 [Path]
-    107["Path<br>[1249, 1396, 7]"]
+    107["Path<br>[1249, 1396, 8]"]
-    108["Segment<br>[1249, 1396, 7]"]
+    108["Segment<br>[1249, 1396, 8]"]
     109[Solid2d]
   end
   subgraph path118 [Path]
-    118["Path<br>[1718, 1892, 7]"]
+    118["Path<br>[1718, 1892, 8]"]
-    119["Segment<br>[1718, 1892, 7]"]
+    119["Segment<br>[1718, 1892, 8]"]
     120[Solid2d]
   end
   subgraph path127 [Path]
-    127["Path<br>[2117, 2157, 7]"]
+    127["Path<br>[2117, 2157, 8]"]
-    128["Segment<br>[2117, 2157, 7]"]
+    128["Segment<br>[2117, 2157, 8]"]
     129[Solid2d]
   end
   subgraph path139 [Path]
-    139["Path<br>[251, 394, 8]"]
+    139["Path<br>[251, 394, 9]"]
-    140["Segment<br>[400, 483, 8]"]
+    140["Segment<br>[400, 483, 9]"]
-    141["Segment<br>[489, 541, 8]"]
+    141["Segment<br>[489, 541, 9]"]
-    142["Segment<br>[547, 630, 8]"]
+    142["Segment<br>[547, 630, 9]"]
-    143["Segment<br>[636, 692, 8]"]
+    143["Segment<br>[636, 692, 9]"]
-    144["Segment<br>[698, 705, 8]"]
+    144["Segment<br>[698, 705, 9]"]
     145[Solid2d]
   end
   subgraph path161 [Path]
-    161["Path<br>[826, 890, 8]"]
+    161["Path<br>[826, 890, 9]"]
-    162["Segment<br>[826, 890, 8]"]
+    162["Segment<br>[826, 890, 9]"]
     163[Solid2d]
   end
   subgraph path170 [Path]
-    170["Path<br>[1064, 1272, 8]"]
+    170["Path<br>[1064, 1272, 9]"]
-    171["Segment<br>[1064, 1272, 8]"]
+    171["Segment<br>[1064, 1272, 9]"]
     172[Solid2d]
   end
   subgraph path179 [Path]
-    179["Path<br>[1480, 1524, 8]"]
+    179["Path<br>[1480, 1524, 9]"]
-    180["Segment<br>[1480, 1524, 8]"]
+    180["Segment<br>[1480, 1524, 9]"]
     181[Solid2d]
   end
   subgraph path194 [Path]
-    194["Path<br>[1767, 1959, 8]"]
+    194["Path<br>[1767, 1959, 9]"]
-    195["Segment<br>[1767, 1959, 8]"]
+    195["Segment<br>[1767, 1959, 9]"]
     196[Solid2d]
   end
   subgraph path205 [Path]
-    205["Path<br>[2317, 2492, 8]"]
+    205["Path<br>[2317, 2492, 9]"]
-    206["Segment<br>[2317, 2492, 8]"]
+    206["Segment<br>[2317, 2492, 9]"]
     207[Solid2d]
   end
   subgraph path214 [Path]
-    214["Path<br>[271, 504, 9]"]
+    214["Path<br>[271, 504, 10]"]
-    215["Segment<br>[510, 596, 9]"]
+    215["Segment<br>[510, 596, 10]"]
-    216["Segment<br>[602, 656, 9]"]
+    216["Segment<br>[602, 656, 10]"]
-    217["Segment<br>[662, 748, 9]"]
+    217["Segment<br>[662, 748, 10]"]
-    218["Segment<br>[754, 824, 9]"]
+    218["Segment<br>[754, 824, 10]"]
-    219["Segment<br>[830, 837, 9]"]
+    219["Segment<br>[830, 837, 10]"]
     220[Solid2d]
   end
   subgraph path236 [Path]
-    236["Path<br>[956, 1165, 9]"]
+    236["Path<br>[956, 1165, 10]"]
-    237["Segment<br>[956, 1165, 9]"]
+    237["Segment<br>[956, 1165, 10]"]
     238[Solid2d]
   end
   subgraph path245 [Path]
-    245["Path<br>[1375, 1564, 9]"]
+    245["Path<br>[1375, 1564, 10]"]
-    246["Segment<br>[1375, 1564, 9]"]
+    246["Segment<br>[1375, 1564, 10]"]
     247[Solid2d]
   end
   subgraph path260 [Path]
-    260["Path<br>[1990, 2276, 9]"]
+    260["Path<br>[1990, 2276, 10]"]
-    261["Segment<br>[1990, 2276, 9]"]
+    261["Segment<br>[1990, 2276, 10]"]
     262[Solid2d]
   end
   subgraph path269 [Path]
-    269["Path<br>[2380, 2664, 9]"]
+    269["Path<br>[2380, 2664, 10]"]
-    270["Segment<br>[2380, 2664, 9]"]
+    270["Segment<br>[2380, 2664, 10]"]
     271[Solid2d]
   end
   subgraph path278 [Path]
-    278["Path<br>[2823, 2861, 9]"]
+    278["Path<br>[2823, 2861, 10]"]
-    279["Segment<br>[2823, 2861, 9]"]
+    279["Segment<br>[2823, 2861, 10]"]
     280[Solid2d]
   end
   subgraph path287 [Path]
-    287["Path<br>[2996, 3221, 9]"]
+    287["Path<br>[2996, 3221, 10]"]
-    288["Segment<br>[3227, 3295, 9]"]
+    288["Segment<br>[3227, 3295, 10]"]
-    289["Segment<br>[3301, 3411, 9]"]
+    289["Segment<br>[3301, 3411, 10]"]
-    290["Segment<br>[3417, 3485, 9]"]
+    290["Segment<br>[3417, 3485, 10]"]
-    291["Segment<br>[3491, 3567, 9]"]
+    291["Segment<br>[3491, 3567, 10]"]
-    292["Segment<br>[3573, 3649, 9]"]
+    292["Segment<br>[3573, 3649, 10]"]
-    293["Segment<br>[3655, 3729, 9]"]
+    293["Segment<br>[3655, 3729, 10]"]
-    294["Segment<br>[3735, 3791, 9]"]
+    294["Segment<br>[3735, 3791, 10]"]
-    295["Segment<br>[3797, 3804, 9]"]
+    295["Segment<br>[3797, 3804, 10]"]
     296[Solid2d]
   end
   subgraph path321 [Path]
-    321["Path<br>[3938, 4163, 9]"]
+    321["Path<br>[3938, 4163, 10]"]
-    322["Segment<br>[4169, 4239, 9]"]
+    322["Segment<br>[4169, 4239, 10]"]
-    323["Segment<br>[4245, 4360, 9]"]
+    323["Segment<br>[4245, 4360, 10]"]
-    324["Segment<br>[4366, 4436, 9]"]
+    324["Segment<br>[4366, 4436, 10]"]
-    325["Segment<br>[4442, 4520, 9]"]
+    325["Segment<br>[4442, 4520, 10]"]
-    326["Segment<br>[4526, 4604, 9]"]
+    326["Segment<br>[4526, 4604, 10]"]
-    327["Segment<br>[4610, 4686, 9]"]
+    327["Segment<br>[4610, 4686, 10]"]
-    328["Segment<br>[4692, 4748, 9]"]
+    328["Segment<br>[4692, 4748, 10]"]
-    329["Segment<br>[4754, 4761, 9]"]
+    329["Segment<br>[4754, 4761, 10]"]
     330[Solid2d]
   end
-  1["Plane<br>[201, 218, 6]"]
+  1["Plane<br>[201, 218, 7]"]
-  9["Sweep Extrusion<br>[724, 771, 6]"]
+  9["Sweep Extrusion<br>[724, 771, 7]"]
   10[Wall]
   11[Wall]
   12[Wall]
@@ -171,44 +171,44 @@ flowchart LR
   21["SweepEdge Adjacent"]
   22["SweepEdge Opposite"]
   23["SweepEdge Adjacent"]
-  24["EdgeCut Chamfer<br>[777, 1054, 6]"]
+  24["EdgeCut Chamfer<br>[777, 1054, 7]"]
-  25["EdgeCut Chamfer<br>[777, 1054, 6]"]
+  25["EdgeCut Chamfer<br>[777, 1054, 7]"]
-  26["EdgeCut Chamfer<br>[777, 1054, 6]"]
+  26["EdgeCut Chamfer<br>[777, 1054, 7]"]
-  27["EdgeCut Chamfer<br>[777, 1054, 6]"]
+  27["EdgeCut Chamfer<br>[777, 1054, 7]"]
-  31["Sweep Extrusion<br>[1222, 1288, 6]"]
+  31["Sweep Extrusion<br>[1222, 1288, 7]"]
   32[Wall]
   33["Cap End"]
   34["SweepEdge Opposite"]
   35["SweepEdge Adjacent"]
-  36["EdgeCut Fillet<br>[1294, 1355, 6]"]
+  36["EdgeCut Fillet<br>[1294, 1355, 7]"]
-  40["Sweep Extrusion<br>[1462, 1492, 6]"]
+  40["Sweep Extrusion<br>[1462, 1492, 7]"]
   41[Wall]
   42["Cap End"]
   43["SweepEdge Opposite"]
   44["SweepEdge Adjacent"]
-  48["Sweep Extrusion<br>[1873, 1920, 6]"]
+  48["Sweep Extrusion<br>[1873, 1920, 7]"]
   49[Wall]
   50["SweepEdge Opposite"]
   51["SweepEdge Adjacent"]
-  52["Sweep Extrusion<br>[1873, 1920, 6]"]
+  52["Sweep Extrusion<br>[1873, 1920, 7]"]
-  53["Sweep Extrusion<br>[1873, 1920, 6]"]
+  53["Sweep Extrusion<br>[1873, 1920, 7]"]
-  54["Sweep Extrusion<br>[1873, 1920, 6]"]
+  54["Sweep Extrusion<br>[1873, 1920, 7]"]
-  58["Sweep Extrusion<br>[2252, 2299, 6]"]
+  58["Sweep Extrusion<br>[2252, 2299, 7]"]
   59[Wall]
   60["SweepEdge Opposite"]
   61["SweepEdge Adjacent"]
-  62["Sweep Extrusion<br>[2252, 2299, 6]"]
+  62["Sweep Extrusion<br>[2252, 2299, 7]"]
-  63["Sweep Extrusion<br>[2252, 2299, 6]"]
+  63["Sweep Extrusion<br>[2252, 2299, 7]"]
-  64["Sweep Extrusion<br>[2252, 2299, 6]"]
+  64["Sweep Extrusion<br>[2252, 2299, 7]"]
-  65["Plane<br>[174, 197, 7]"]
+  65["Plane<br>[174, 197, 8]"]
-  69["Sweep Extrusion<br>[277, 315, 7]"]
+  69["Sweep Extrusion<br>[277, 315, 8]"]
   70[Wall]
   71["Cap Start"]
   72["Cap End"]
   73["SweepEdge Opposite"]
   74["SweepEdge Adjacent"]
-  75["Plane<br>[464, 487, 7]"]
+  75["Plane<br>[464, 487, 8]"]
-  83["Sweep Extrusion<br>[778, 808, 7]"]
+  83["Sweep Extrusion<br>[778, 808, 8]"]
   84[Wall]
   85[Wall]
   86[Wall]
@@ -223,36 +223,36 @@ flowchart LR
   95["SweepEdge Adjacent"]
   96["SweepEdge Opposite"]
   97["SweepEdge Adjacent"]
-  101["Sweep Extrusion<br>[1054, 1086, 7]"]
+  101["Sweep Extrusion<br>[1054, 1086, 8]"]
   102[Wall]
   103["Cap End"]
   104["SweepEdge Opposite"]
   105["SweepEdge Adjacent"]
-  106["EdgeCut Fillet<br>[1092, 1154, 7]"]
+  106["EdgeCut Fillet<br>[1092, 1154, 8]"]
-  110["Sweep Extrusion<br>[1629, 1661, 7]"]
+  110["Sweep Extrusion<br>[1629, 1661, 8]"]
   111[Wall]
   112["Cap End"]
   113["SweepEdge Opposite"]
   114["SweepEdge Adjacent"]
-  115["Sweep Extrusion<br>[1629, 1661, 7]"]
+  115["Sweep Extrusion<br>[1629, 1661, 8]"]
-  116["Sweep Extrusion<br>[1629, 1661, 7]"]
+  116["Sweep Extrusion<br>[1629, 1661, 8]"]
-  117["Sweep Extrusion<br>[1629, 1661, 7]"]
+  117["Sweep Extrusion<br>[1629, 1661, 8]"]
-  121["Sweep Extrusion<br>[1906, 1939, 7]"]
+  121["Sweep Extrusion<br>[1906, 1939, 8]"]
   122[Wall]
   123["Cap End"]
   124["SweepEdge Opposite"]
   125["SweepEdge Adjacent"]
-  126["Plane<br>[2088, 2111, 7]"]
+  126["Plane<br>[2088, 2111, 8]"]
-  130["Sweep Extrusion<br>[2159, 2190, 7]"]
+  130["Sweep Extrusion<br>[2159, 2190, 8]"]
   131[Wall]
   132["Cap Start"]
   133["Cap End"]
   134["SweepEdge Opposite"]
   135["SweepEdge Adjacent"]
-  136["EdgeCut Fillet<br>[321, 383, 7]"]
+  136["EdgeCut Fillet<br>[321, 383, 8]"]
-  137["EdgeCut Fillet<br>[1945, 2007, 7]"]
+  137["EdgeCut Fillet<br>[1945, 2007, 8]"]
-  138["Plane<br>[222, 245, 8]"]
+  138["Plane<br>[222, 245, 9]"]
-  146["Sweep Extrusion<br>[719, 767, 8]"]
+  146["Sweep Extrusion<br>[719, 767, 9]"]
   147[Wall]
   148[Wall]
   149[Wall]
@@ -267,45 +267,45 @@ flowchart LR
   158["SweepEdge Adjacent"]
   159["SweepEdge Opposite"]
   160["SweepEdge Adjacent"]
-  164["Sweep Extrusion<br>[905, 938, 8]"]
+  164["Sweep Extrusion<br>[905, 938, 9]"]
   165[Wall]
   166["Cap End"]
   167["SweepEdge Opposite"]
   168["SweepEdge Adjacent"]
-  169["EdgeCut Fillet<br>[944, 1006, 8]"]
+  169["EdgeCut Fillet<br>[944, 1006, 9]"]
-  173["Sweep Extrusion<br>[1287, 1317, 8]"]
+  173["Sweep Extrusion<br>[1287, 1317, 9]"]
   174[Wall]
   175["Cap End"]
   176["SweepEdge Opposite"]
   177["SweepEdge Adjacent"]
-  178["EdgeCut Fillet<br>[1323, 1385, 8]"]
+  178["EdgeCut Fillet<br>[1323, 1385, 9]"]
-  182["Sweep Extrusion<br>[1677, 1710, 8]"]
+  182["Sweep Extrusion<br>[1677, 1710, 9]"]
   183[Wall]
   184["Cap End"]
   185["SweepEdge Opposite"]
   186["SweepEdge Adjacent"]
-  187["Sweep Extrusion<br>[1677, 1710, 8]"]
+  187["Sweep Extrusion<br>[1677, 1710, 9]"]
-  188["Sweep Extrusion<br>[1677, 1710, 8]"]
+  188["Sweep Extrusion<br>[1677, 1710, 9]"]
-  189["Sweep Extrusion<br>[1677, 1710, 8]"]
+  189["Sweep Extrusion<br>[1677, 1710, 9]"]
-  190["Sweep Extrusion<br>[1677, 1710, 8]"]
+  190["Sweep Extrusion<br>[1677, 1710, 9]"]
-  191["Sweep Extrusion<br>[1677, 1710, 8]"]
+  191["Sweep Extrusion<br>[1677, 1710, 9]"]
-  192["Sweep Extrusion<br>[1677, 1710, 8]"]
+  192["Sweep Extrusion<br>[1677, 1710, 9]"]
-  193["Sweep Extrusion<br>[1677, 1710, 8]"]
+  193["Sweep Extrusion<br>[1677, 1710, 9]"]
-  197["Sweep Extrusion<br>[2227, 2260, 8]"]
+  197["Sweep Extrusion<br>[2227, 2260, 9]"]
   198[Wall]
   199["Cap End"]
   200["SweepEdge Opposite"]
   201["SweepEdge Adjacent"]
-  202["Sweep Extrusion<br>[2227, 2260, 8]"]
+  202["Sweep Extrusion<br>[2227, 2260, 9]"]
-  203["Sweep Extrusion<br>[2227, 2260, 8]"]
+  203["Sweep Extrusion<br>[2227, 2260, 9]"]
-  204["Sweep Extrusion<br>[2227, 2260, 8]"]
+  204["Sweep Extrusion<br>[2227, 2260, 9]"]
-  208["Sweep Extrusion<br>[2494, 2524, 8]"]
+  208["Sweep Extrusion<br>[2494, 2524, 9]"]
   209[Wall]
   210["Cap End"]
   211["SweepEdge Opposite"]
   212["SweepEdge Adjacent"]
-  213["Plane<br>[242, 265, 9]"]
+  213["Plane<br>[242, 265, 10]"]
-  221["Sweep Extrusion<br>[851, 899, 9]"]
+  221["Sweep Extrusion<br>[851, 899, 10]"]
   222[Wall]
   223[Wall]
   224[Wall]
@@ -320,43 +320,43 @@ flowchart LR
   233["SweepEdge Adjacent"]
   234["SweepEdge Opposite"]
   235["SweepEdge Adjacent"]
-  239["Sweep Extrusion<br>[1180, 1213, 9]"]
+  239["Sweep Extrusion<br>[1180, 1213, 10]"]
   240[Wall]
   241["Cap End"]
   242["SweepEdge Opposite"]
   243["SweepEdge Adjacent"]
-  244["EdgeCut Fillet<br>[1219, 1281, 9]"]
+  244["EdgeCut Fillet<br>[1219, 1281, 10]"]
-  248["Sweep Extrusion<br>[1829, 1862, 9]"]
+  248["Sweep Extrusion<br>[1829, 1862, 10]"]
   249[Wall]
   250["Cap End"]
   251["SweepEdge Opposite"]
   252["SweepEdge Adjacent"]
-  253["Sweep Extrusion<br>[1829, 1862, 9]"]
+  253["Sweep Extrusion<br>[1829, 1862, 10]"]
-  254["Sweep Extrusion<br>[1829, 1862, 9]"]
+  254["Sweep Extrusion<br>[1829, 1862, 10]"]
-  255["Sweep Extrusion<br>[1829, 1862, 9]"]
+  255["Sweep Extrusion<br>[1829, 1862, 10]"]
-  256["Sweep Extrusion<br>[1829, 1862, 9]"]
+  256["Sweep Extrusion<br>[1829, 1862, 10]"]
-  257["Sweep Extrusion<br>[1829, 1862, 9]"]
+  257["Sweep Extrusion<br>[1829, 1862, 10]"]
-  258["Sweep Extrusion<br>[1829, 1862, 9]"]
+  258["Sweep Extrusion<br>[1829, 1862, 10]"]
-  259["Sweep Extrusion<br>[1829, 1862, 9]"]
+  259["Sweep Extrusion<br>[1829, 1862, 10]"]
-  263["Sweep Extrusion<br>[2290, 2323, 9]"]
+  263["Sweep Extrusion<br>[2290, 2323, 10]"]
   264[Wall]
   265["Cap Start"]
   266["Cap End"]
   267["SweepEdge Opposite"]
   268["SweepEdge Adjacent"]
-  272["Sweep Extrusion<br>[2679, 2712, 9]"]
+  272["Sweep Extrusion<br>[2679, 2712, 10]"]
   273[Wall]
   274["Cap Start"]
   275["Cap End"]
   276["SweepEdge Opposite"]
   277["SweepEdge Adjacent"]
-  281["Sweep Extrusion<br>[2876, 2910, 9]"]
+  281["Sweep Extrusion<br>[2876, 2910, 10]"]
   282[Wall]
   283["Cap Start"]
   284["Cap End"]
   285["SweepEdge Opposite"]
   286["SweepEdge Adjacent"]
-  297["Sweep Extrusion<br>[3819, 3852, 9]"]
+  297["Sweep Extrusion<br>[3819, 3852, 10]"]
   298[Wall]
   299[Wall]
   300[Wall]
@@ -380,7 +380,7 @@ flowchart LR
   318["SweepEdge Adjacent"]
   319["SweepEdge Opposite"]
   320["SweepEdge Adjacent"]
-  331["Sweep Extrusion<br>[4763, 4796, 9]"]
+  331["Sweep Extrusion<br>[4763, 4796, 10]"]
   332[Wall]
   333[Wall]
   334[Wall]
@@ -404,25 +404,25 @@ flowchart LR
   352["SweepEdge Adjacent"]
   353["SweepEdge Opposite"]
   354["SweepEdge Adjacent"]
-  355["StartSketchOnFace<br>[1108, 1145, 6]"]
+  355["StartSketchOnFace<br>[1108, 1145, 7]"]
-  356["StartSketchOnFace<br>[1368, 1405, 6]"]
+  356["StartSketchOnFace<br>[1368, 1405, 7]"]
-  357["StartSketchOnFace<br>[1542, 1579, 6]"]
+  357["StartSketchOnFace<br>[1542, 1579, 7]"]
-  358["StartSketchOnFace<br>[1933, 1970, 6]"]
+  358["StartSketchOnFace<br>[1933, 1970, 7]"]
-  359["StartSketchOnFace<br>[822, 859, 7]"]
+  359["StartSketchOnFace<br>[822, 859, 8]"]
-  360["StartSketchOnFace<br>[1206, 1243, 7]"]
+  360["StartSketchOnFace<br>[1206, 1243, 8]"]
-  361["StartSketchOnFace<br>[1675, 1712, 7]"]
+  361["StartSketchOnFace<br>[1675, 1712, 8]"]
-  362["StartSketchOnFace<br>[781, 820, 8]"]
+  362["StartSketchOnFace<br>[781, 820, 9]"]
-  363["StartSketchOnFace<br>[1019, 1058, 8]"]
+  363["StartSketchOnFace<br>[1019, 1058, 9]"]
-  364["StartSketchOnFace<br>[1437, 1474, 8]"]
+  364["StartSketchOnFace<br>[1437, 1474, 9]"]
-  365["StartSketchOnFace<br>[1724, 1761, 8]"]
+  365["StartSketchOnFace<br>[1724, 1761, 9]"]
-  366["StartSketchOnFace<br>[2274, 2311, 8]"]
+  366["StartSketchOnFace<br>[2274, 2311, 9]"]
-  367["StartSketchOnFace<br>[913, 950, 9]"]
+  367["StartSketchOnFace<br>[913, 950, 10]"]
-  368["StartSketchOnFace<br>[1332, 1369, 9]"]
+  368["StartSketchOnFace<br>[1332, 1369, 10]"]
-  369["StartSketchOnFace<br>[1945, 1984, 9]"]
+  369["StartSketchOnFace<br>[1945, 1984, 10]"]
-  370["StartSketchOnFace<br>[2337, 2374, 9]"]
+  370["StartSketchOnFace<br>[2337, 2374, 10]"]
-  371["StartSketchOnFace<br>[2778, 2817, 9]"]
+  371["StartSketchOnFace<br>[2778, 2817, 10]"]
-  372["StartSketchOnFace<br>[2951, 2990, 9]"]
+  372["StartSketchOnFace<br>[2951, 2990, 10]"]
-  373["StartSketchOnFace<br>[3893, 3932, 9]"]
+  373["StartSketchOnFace<br>[3893, 3932, 10]"]
   1 --- 2
   2 --- 3
   2 --- 4

rust/kcl-lib/tests/kcl_samples/multi-axis-robot/program_memory.snap

@@ -5,18 +5,18 @@ description: Variables in memory after executing multi-axis-robot.kcl
 {
   "j2RobotArm": {
     "type": "Module",
-    "value": 8
+    "value": 9
   },
   "j3RobotArm": {
     "type": "Module",
-    "value": 9
+    "value": 10
   },
   "robotArmBase": {
     "type": "Module",
-    "value": 6
+    "value": 7
   },
   "rotatingBase": {
     "type": "Module",
-    "value": 7
+    "value": 8
   }
 }

rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/artifact_graph_flowchart.snap.md

@@ -1,206 +1,206 @@
 ```mermaid
 flowchart LR
   subgraph path2 [Path]
-    2["Path<br>[595, 688, 8]"]
+    2["Path<br>[595, 688, 9]"]
-    3["Segment<br>[595, 688, 8]"]
+    3["Segment<br>[595, 688, 9]"]
     4[Solid2d]
   end
   subgraph path6 [Path]
-    6["Path<br>[917, 972, 8]"]
+    6["Path<br>[917, 972, 9]"]
-    7["Segment<br>[917, 972, 8]"]
+    7["Segment<br>[917, 972, 9]"]
     8[Solid2d]
   end
   subgraph path15 [Path]
-    15["Path<br>[1202, 1261, 8]"]
+    15["Path<br>[1202, 1261, 9]"]
-    16["Segment<br>[1202, 1261, 8]"]
+    16["Segment<br>[1202, 1261, 9]"]
     17[Solid2d]
   end
   subgraph path23 [Path]
-    23["Path<br>[1368, 1428, 8]"]
+    23["Path<br>[1368, 1428, 9]"]
-    24["Segment<br>[1368, 1428, 8]"]
+    24["Segment<br>[1368, 1428, 9]"]
     25[Solid2d]
   end
   subgraph path31 [Path]
-    31["Path<br>[1590, 1643, 8]"]
+    31["Path<br>[1590, 1643, 9]"]
-    32["Segment<br>[1590, 1643, 8]"]
+    32["Segment<br>[1590, 1643, 9]"]
     33[Solid2d]
   end
   subgraph path39 [Path]
-    39["Path<br>[595, 688, 8]"]
+    39["Path<br>[595, 688, 9]"]
-    40["Segment<br>[595, 688, 8]"]
+    40["Segment<br>[595, 688, 9]"]
     41[Solid2d]
   end
   subgraph path43 [Path]
-    43["Path<br>[917, 972, 8]"]
+    43["Path<br>[917, 972, 9]"]
-    44["Segment<br>[917, 972, 8]"]
+    44["Segment<br>[917, 972, 9]"]
     45[Solid2d]
   end
   subgraph path52 [Path]
-    52["Path<br>[1202, 1261, 8]"]
+    52["Path<br>[1202, 1261, 9]"]
-    53["Segment<br>[1202, 1261, 8]"]
+    53["Segment<br>[1202, 1261, 9]"]
     54[Solid2d]
   end
   subgraph path60 [Path]
-    60["Path<br>[1368, 1428, 8]"]
+    60["Path<br>[1368, 1428, 9]"]
-    61["Segment<br>[1368, 1428, 8]"]
+    61["Segment<br>[1368, 1428, 9]"]
     62[Solid2d]
   end
   subgraph path68 [Path]
-    68["Path<br>[1590, 1643, 8]"]
+    68["Path<br>[1590, 1643, 9]"]
-    69["Segment<br>[1590, 1643, 8]"]
+    69["Segment<br>[1590, 1643, 9]"]
     70[Solid2d]
   end
   subgraph path76 [Path]
-    76["Path<br>[422, 484, 7]"]
+    76["Path<br>[422, 484, 8]"]
-    77["Segment<br>[422, 484, 7]"]
+    77["Segment<br>[422, 484, 8]"]
     78[Solid2d]
   end
   subgraph path85 [Path]
-    85["Path<br>[622, 682, 7]"]
+    85["Path<br>[622, 682, 8]"]
-    86["Segment<br>[622, 682, 7]"]
+    86["Segment<br>[622, 682, 8]"]
     87[Solid2d]
   end
   subgraph path93 [Path]
-    93["Path<br>[411, 463, 9]"]
+    93["Path<br>[411, 463, 10]"]
-    94["Segment<br>[411, 463, 9]"]
+    94["Segment<br>[411, 463, 10]"]
     95[Solid2d]
   end
   subgraph path102 [Path]
-    102["Path<br>[601, 653, 9]"]
+    102["Path<br>[601, 653, 10]"]
-    103["Segment<br>[601, 653, 9]"]
+    103["Segment<br>[601, 653, 10]"]
     104[Solid2d]
   end
   subgraph path110 [Path]
-    110["Path<br>[439, 509, 10]"]
+    110["Path<br>[439, 509, 11]"]
-    111["Segment<br>[439, 509, 10]"]
+    111["Segment<br>[439, 509, 11]"]
     112[Solid2d]
   end
   subgraph path121 [Path]
-    121["Path<br>[778, 865, 10]"]
+    121["Path<br>[778, 865, 11]"]
-    122["Segment<br>[873, 924, 10]"]
+    122["Segment<br>[873, 924, 11]"]
-    123["Segment<br>[932, 983, 10]"]
+    123["Segment<br>[932, 983, 11]"]
-    124["Segment<br>[991, 1042, 10]"]
+    124["Segment<br>[991, 1042, 11]"]
-    125["Segment<br>[1050, 1100, 10]"]
+    125["Segment<br>[1050, 1100, 11]"]
-    126["Segment<br>[1108, 1158, 10]"]
+    126["Segment<br>[1108, 1158, 11]"]
-    127["Segment<br>[1166, 1173, 10]"]
+    127["Segment<br>[1166, 1173, 11]"]
     128[Solid2d]
   end
   subgraph path149 [Path]
-    149["Path<br>[1312, 1381, 10]"]
+    149["Path<br>[1312, 1381, 11]"]
-    150["Segment<br>[1312, 1381, 10]"]
+    150["Segment<br>[1312, 1381, 11]"]
     151[Solid2d]
   end
   subgraph path158 [Path]
-    158["Path<br>[425, 515, 11]"]
+    158["Path<br>[425, 515, 12]"]
-    159["Segment<br>[523, 573, 11]"]
+    159["Segment<br>[523, 573, 12]"]
-    160["Segment<br>[581, 631, 11]"]
+    160["Segment<br>[581, 631, 12]"]
-    161["Segment<br>[639, 689, 11]"]
+    161["Segment<br>[639, 689, 12]"]
-    162["Segment<br>[697, 746, 11]"]
+    162["Segment<br>[697, 746, 12]"]
-    163["Segment<br>[754, 803, 11]"]
+    163["Segment<br>[754, 803, 12]"]
-    164["Segment<br>[811, 818, 11]"]
+    164["Segment<br>[811, 818, 12]"]
     165[Solid2d]
   end
   subgraph path187 [Path]
-    187["Path<br>[967, 1019, 11]"]
+    187["Path<br>[967, 1019, 12]"]
-    188["Segment<br>[967, 1019, 11]"]
+    188["Segment<br>[967, 1019, 12]"]
     189[Solid2d]
   end
   subgraph path195 [Path]
-    195["Path<br>[325, 383, 12]"]
+    195["Path<br>[325, 383, 13]"]
-    196["Segment<br>[325, 383, 12]"]
+    196["Segment<br>[325, 383, 13]"]
     197[Solid2d]
   end
   subgraph path204 [Path]
-    204["Path<br>[527, 582, 12]"]
+    204["Path<br>[527, 582, 13]"]
-    205["Segment<br>[527, 582, 12]"]
+    205["Segment<br>[527, 582, 13]"]
     206[Solid2d]
   end
   subgraph path212 [Path]
-    212["Path<br>[325, 383, 12]"]
+    212["Path<br>[325, 383, 13]"]
-    213["Segment<br>[325, 383, 12]"]
+    213["Segment<br>[325, 383, 13]"]
     214[Solid2d]
   end
   subgraph path221 [Path]
-    221["Path<br>[527, 582, 12]"]
+    221["Path<br>[527, 582, 13]"]
-    222["Segment<br>[527, 582, 12]"]
+    222["Segment<br>[527, 582, 13]"]
     223[Solid2d]
   end
-  1["Plane<br>[570, 587, 8]"]
+  1["Plane<br>[570, 587, 9]"]
-  5["Plane<br>[892, 909, 8]"]
+  5["Plane<br>[892, 909, 9]"]
-  9["Sweep Extrusion<br>[1020, 1060, 8]"]
+  9["Sweep Extrusion<br>[1020, 1060, 9]"]
   10[Wall]
   11["Cap Start"]
   12["Cap End"]
   13["SweepEdge Opposite"]
   14["SweepEdge Adjacent"]
-  18["Sweep Extrusion<br>[1269, 1306, 8]"]
+  18["Sweep Extrusion<br>[1269, 1306, 9]"]
   19[Wall]
   20["Cap End"]
   21["SweepEdge Opposite"]
   22["SweepEdge Adjacent"]
-  26["Sweep Extrusion<br>[1436, 1474, 8]"]
+  26["Sweep Extrusion<br>[1436, 1474, 9]"]
   27[Wall]
   28["Cap End"]
   29["SweepEdge Opposite"]
   30["SweepEdge Adjacent"]
-  34["Sweep Extrusion<br>[1651, 1693, 8]"]
+  34["Sweep Extrusion<br>[1651, 1693, 9]"]
   35[Wall]
   36["SweepEdge Opposite"]
   37["SweepEdge Adjacent"]
-  38["Plane<br>[570, 587, 8]"]
+  38["Plane<br>[570, 587, 9]"]
-  42["Plane<br>[892, 909, 8]"]
+  42["Plane<br>[892, 909, 9]"]
-  46["Sweep Extrusion<br>[1020, 1060, 8]"]
+  46["Sweep Extrusion<br>[1020, 1060, 9]"]
   47[Wall]
   48["Cap Start"]
   49["Cap End"]
   50["SweepEdge Opposite"]
   51["SweepEdge Adjacent"]
-  55["Sweep Extrusion<br>[1269, 1306, 8]"]
+  55["Sweep Extrusion<br>[1269, 1306, 9]"]
   56[Wall]
   57["Cap End"]
   58["SweepEdge Opposite"]
   59["SweepEdge Adjacent"]
-  63["Sweep Extrusion<br>[1436, 1474, 8]"]
+  63["Sweep Extrusion<br>[1436, 1474, 9]"]
   64[Wall]
   65["Cap End"]
   66["SweepEdge Opposite"]
   67["SweepEdge Adjacent"]
-  71["Sweep Extrusion<br>[1651, 1693, 8]"]
+  71["Sweep Extrusion<br>[1651, 1693, 9]"]
   72[Wall]
   73["SweepEdge Opposite"]
   74["SweepEdge Adjacent"]
-  75["Plane<br>[399, 416, 7]"]
+  75["Plane<br>[399, 416, 8]"]
-  79["Sweep Extrusion<br>[490, 526, 7]"]
+  79["Sweep Extrusion<br>[490, 526, 8]"]
   80[Wall]
   81["Cap Start"]
   82["Cap End"]
   83["SweepEdge Opposite"]
   84["SweepEdge Adjacent"]
-  88["Sweep Extrusion<br>[688, 725, 7]"]
+  88["Sweep Extrusion<br>[688, 725, 8]"]
   89[Wall]
   90["SweepEdge Opposite"]
   91["SweepEdge Adjacent"]
-  92["Plane<br>[386, 403, 9]"]
+  92["Plane<br>[386, 403, 10]"]
-  96["Sweep Extrusion<br>[471, 504, 9]"]
+  96["Sweep Extrusion<br>[471, 504, 10]"]
   97[Wall]
   98["Cap Start"]
   99["Cap End"]
   100["SweepEdge Opposite"]
   101["SweepEdge Adjacent"]
-  105["Sweep Extrusion<br>[661, 698, 9]"]
+  105["Sweep Extrusion<br>[661, 698, 10]"]
   106[Wall]
   107["SweepEdge Opposite"]
   108["SweepEdge Adjacent"]
-  109["Plane<br>[414, 431, 10]"]
+  109["Plane<br>[414, 431, 11]"]
-  113["Sweep Extrusion<br>[517, 550, 10]"]
+  113["Sweep Extrusion<br>[517, 550, 11]"]
   114[Wall]
   115["Cap Start"]
   116["Cap End"]
   117["SweepEdge Opposite"]
   118["SweepEdge Adjacent"]
-  119["EdgeCut Fillet<br>[558, 624, 10]"]
+  119["EdgeCut Fillet<br>[558, 624, 11]"]
-  120["EdgeCut Fillet<br>[558, 624, 10]"]
+  120["EdgeCut Fillet<br>[558, 624, 11]"]
-  129["Sweep Extrusion<br>[1181, 1221, 10]"]
+  129["Sweep Extrusion<br>[1181, 1221, 11]"]
   130[Wall]
   131[Wall]
   132[Wall]
@@ -220,13 +220,13 @@ flowchart LR
   146["SweepEdge Adjacent"]
   147["SweepEdge Opposite"]
   148["SweepEdge Adjacent"]
-  152["Sweep Extrusion<br>[1389, 1417, 10]"]
+  152["Sweep Extrusion<br>[1389, 1417, 11]"]
   153[Wall]
   154["Cap End"]
   155["SweepEdge Opposite"]
   156["SweepEdge Adjacent"]
-  157["Plane<br>[400, 417, 11]"]
+  157["Plane<br>[400, 417, 12]"]
-  166["Sweep Extrusion<br>[826, 859, 11]"]
+  166["Sweep Extrusion<br>[826, 859, 12]"]
   167[Wall]
   168[Wall]
   169[Wall]
@@ -247,45 +247,45 @@ flowchart LR
   184["SweepEdge Adjacent"]
   185["SweepEdge Opposite"]
   186["SweepEdge Adjacent"]
-  190["Sweep Extrusion<br>[1027, 1064, 11]"]
+  190["Sweep Extrusion<br>[1027, 1064, 12]"]
   191[Wall]
   192["SweepEdge Opposite"]
   193["SweepEdge Adjacent"]
-  194["Plane<br>[300, 317, 12]"]
+  194["Plane<br>[300, 317, 13]"]
-  198["Sweep Extrusion<br>[391, 422, 12]"]
+  198["Sweep Extrusion<br>[391, 422, 13]"]
   199[Wall]
   200["Cap Start"]
   201["Cap End"]
   202["SweepEdge Opposite"]
   203["SweepEdge Adjacent"]
-  207["Sweep Extrusion<br>[590, 622, 12]"]
+  207["Sweep Extrusion<br>[590, 622, 13]"]
   208[Wall]
   209["SweepEdge Opposite"]
   210["SweepEdge Adjacent"]
-  211["Plane<br>[300, 317, 12]"]
+  211["Plane<br>[300, 317, 13]"]
-  215["Sweep Extrusion<br>[391, 422, 12]"]
+  215["Sweep Extrusion<br>[391, 422, 13]"]
   216[Wall]
   217["Cap Start"]
   218["Cap End"]
   219["SweepEdge Opposite"]
   220["SweepEdge Adjacent"]
-  224["Sweep Extrusion<br>[590, 622, 12]"]
+  224["Sweep Extrusion<br>[590, 622, 13]"]
   225[Wall]
   226["SweepEdge Opposite"]
   227["SweepEdge Adjacent"]
-  228["StartSketchOnFace<br>[1155, 1194, 8]"]
+  228["StartSketchOnFace<br>[1155, 1194, 9]"]
-  229["StartSketchOnFace<br>[1323, 1360, 8]"]
+  229["StartSketchOnFace<br>[1323, 1360, 9]"]
-  230["StartSketchOnFace<br>[1544, 1582, 8]"]
+  230["StartSketchOnFace<br>[1544, 1582, 9]"]
-  231["StartSketchOnFace<br>[1155, 1194, 8]"]
+  231["StartSketchOnFace<br>[1155, 1194, 9]"]
-  232["StartSketchOnFace<br>[1323, 1360, 8]"]
+  232["StartSketchOnFace<br>[1323, 1360, 9]"]
-  233["StartSketchOnFace<br>[1544, 1582, 8]"]
+  233["StartSketchOnFace<br>[1544, 1582, 9]"]
-  234["StartSketchOnFace<br>[579, 616, 7]"]
+  234["StartSketchOnFace<br>[579, 616, 8]"]
-  235["StartSketchOnFace<br>[556, 593, 9]"]
+  235["StartSketchOnFace<br>[556, 593, 10]"]
-  236["StartSketchOnFace<br>[733, 770, 10]"]
+  236["StartSketchOnFace<br>[733, 770, 11]"]
-  237["StartSketchOnFace<br>[1269, 1304, 10]"]
+  237["StartSketchOnFace<br>[1269, 1304, 11]"]
-  238["StartSketchOnFace<br>[922, 959, 11]"]
+  238["StartSketchOnFace<br>[922, 959, 12]"]
-  239["StartSketchOnFace<br>[484, 519, 12]"]
+  239["StartSketchOnFace<br>[484, 519, 13]"]
-  240["StartSketchOnFace<br>[484, 519, 12]"]
+  240["StartSketchOnFace<br>[484, 519, 13]"]
   1 --- 2
   2 --- 3
   2 --- 4

rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/ops.snap

@@ -8,11 +8,7 @@ description: Operations executed pipe-flange-assembly.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -26,11 +22,7 @@ description: Operations executed pipe-flange-assembly.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -44,11 +36,7 @@ description: Operations executed pipe-flange-assembly.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -62,11 +50,7 @@ description: Operations executed pipe-flange-assembly.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -80,11 +64,7 @@ description: Operations executed pipe-flange-assembly.kcl
     "group": {
       "type": "FunctionCall",
       "name": "flange",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        509,
-        1753,
-        8
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -373,11 +353,7 @@ description: Operations executed pipe-flange-assembly.kcl
     "group": {
       "type": "FunctionCall",
       "name": "flange",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        509,
-        1753,
-        8
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -666,7 +642,7 @@ description: Operations executed pipe-flange-assembly.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "gasket",
-      "moduleId": 7
+      "moduleId": 0
     },
     "sourceRange": []
   },
@@ -780,11 +756,7 @@ description: Operations executed pipe-flange-assembly.kcl
     "group": {
       "type": "FunctionCall",
       "name": "washer",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        331,
-        757,
-        9
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1167,11 +1139,7 @@ description: Operations executed pipe-flange-assembly.kcl
     "group": {
       "type": "FunctionCall",
       "name": "bolt",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        358,
-        1507,
-        10
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1225,6 +1193,17 @@ description: Operations executed pipe-flange-assembly.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -1260,18 +1239,7 @@ description: Operations executed pipe-flange-assembly.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -1540,11 +1508,7 @@ description: Operations executed pipe-flange-assembly.kcl
     "group": {
       "type": "FunctionCall",
       "name": "hexNut",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        344,
-        1123,
-        11
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1809,11 +1773,7 @@ description: Operations executed pipe-flange-assembly.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pipe",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        256,
-        675,
-        12
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1929,11 +1889,7 @@ description: Operations executed pipe-flange-assembly.kcl
     "group": {
       "type": "FunctionCall",
       "name": "pipe",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        256,
-        675,
-        12
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },

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

@@ -198,7 +198,7 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
   },
   "gasket": {
     "type": "Module",
-    "value": 7
+    "value": 8
   },
   "gasketInnerDiameter": {
     "type": "Number",

rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/ops.snap

@@ -51,6 +51,17 @@ description: Operations executed sheet-metal-bracket.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -95,18 +106,7 @@ description: Operations executed sheet-metal-bracket.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "labeledArgs": {

rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/ops.snap

@@ -8,11 +8,7 @@ description: Operations executed socket-head-cap-screw.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -26,11 +22,7 @@ description: Operations executed socket-head-cap-screw.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -87,6 +79,17 @@ description: Operations executed socket-head-cap-screw.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -122,18 +125,7 @@ description: Operations executed socket-head-cap-screw.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -246,6 +238,17 @@ description: Operations executed socket-head-cap-screw.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -276,17 +279,6 @@ description: Operations executed socket-head-cap-screw.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   }
 ]

rust/kcl-lib/tests/kcl_samples/walkie-talkie/artifact_graph_flowchart.snap.md

@@ -1,186 +1,186 @@
 ```mermaid
 flowchart LR
   subgraph path2 [Path]
-    2["Path<br>[391, 434, 7]"]
+    2["Path<br>[391, 434, 8]"]
-    3["Segment<br>[440, 478, 7]"]
+    3["Segment<br>[440, 478, 8]"]
-    4["Segment<br>[484, 524, 7]"]
+    4["Segment<br>[484, 524, 8]"]
-    5["Segment<br>[530, 569, 7]"]
+    5["Segment<br>[530, 569, 8]"]
-    6["Segment<br>[575, 597, 7]"]
+    6["Segment<br>[575, 597, 8]"]
     7[Solid2d]
   end
   subgraph path27 [Path]
-    27["Path<br>[968, 1093, 7]"]
+    27["Path<br>[968, 1093, 8]"]
-    28["Segment<br>[1099, 1157, 7]"]
+    28["Segment<br>[1099, 1157, 8]"]
-    29["Segment<br>[1163, 1288, 7]"]
+    29["Segment<br>[1163, 1288, 8]"]
-    30["Segment<br>[1294, 1352, 7]"]
+    30["Segment<br>[1294, 1352, 8]"]
-    31["Segment<br>[1358, 1486, 7]"]
+    31["Segment<br>[1358, 1486, 8]"]
-    32["Segment<br>[1492, 1553, 7]"]
+    32["Segment<br>[1492, 1553, 8]"]
-    33["Segment<br>[1559, 1688, 7]"]
+    33["Segment<br>[1559, 1688, 8]"]
-    34["Segment<br>[1694, 1754, 7]"]
+    34["Segment<br>[1694, 1754, 8]"]
-    35["Segment<br>[1760, 1767, 7]"]
+    35["Segment<br>[1760, 1767, 8]"]
     36[Solid2d]
   end
   subgraph path63 [Path]
-    63["Path<br>[1922, 1976, 7]"]
+    63["Path<br>[1922, 1976, 8]"]
-    64["Segment<br>[1982, 2023, 7]"]
+    64["Segment<br>[1982, 2023, 8]"]
-    65["Segment<br>[2029, 2058, 7]"]
+    65["Segment<br>[2029, 2058, 8]"]
-    66["Segment<br>[2064, 2094, 7]"]
+    66["Segment<br>[2064, 2094, 8]"]
-    67["Segment<br>[2100, 2156, 7]"]
+    67["Segment<br>[2100, 2156, 8]"]
-    68["Segment<br>[2162, 2169, 7]"]
+    68["Segment<br>[2162, 2169, 8]"]
     69[Solid2d]
   end
   subgraph path84 [Path]
-    84["Path<br>[2312, 2349, 7]"]
+    84["Path<br>[2312, 2349, 8]"]
-    85["Segment<br>[2355, 2386, 7]"]
+    85["Segment<br>[2355, 2386, 8]"]
-    86["Segment<br>[2392, 2425, 7]"]
+    86["Segment<br>[2392, 2425, 8]"]
-    87["Segment<br>[2431, 2463, 7]"]
+    87["Segment<br>[2431, 2463, 8]"]
-    88["Segment<br>[2469, 2476, 7]"]
+    88["Segment<br>[2469, 2476, 8]"]
     89[Solid2d]
   end
   subgraph path105 [Path]
-    105["Path<br>[330, 355, 9]"]
+    105["Path<br>[330, 355, 10]"]
-    106["Segment<br>[361, 394, 9]"]
+    106["Segment<br>[361, 394, 10]"]
-    107["Segment<br>[400, 435, 9]"]
+    107["Segment<br>[400, 435, 10]"]
-    108["Segment<br>[441, 475, 9]"]
+    108["Segment<br>[441, 475, 10]"]
-    109["Segment<br>[481, 488, 9]"]
+    109["Segment<br>[481, 488, 10]"]
     110[Solid2d]
   end
   subgraph path112 [Path]
-    112["Path<br>[624, 750, 9]"]
+    112["Path<br>[624, 750, 10]"]
     117[Solid2d]
   end
   subgraph path130 [Path]
-    130["Path<br>[478, 532, 8]"]
+    130["Path<br>[478, 532, 9]"]
-    131["Segment<br>[538, 565, 8]"]
+    131["Segment<br>[538, 565, 9]"]
-    132["Segment<br>[571, 600, 8]"]
+    132["Segment<br>[571, 600, 9]"]
-    133["Segment<br>[606, 634, 8]"]
+    133["Segment<br>[606, 634, 9]"]
-    134["Segment<br>[640, 696, 8]"]
+    134["Segment<br>[640, 696, 9]"]
-    135["Segment<br>[702, 709, 8]"]
+    135["Segment<br>[702, 709, 9]"]
     136[Solid2d]
   end
   subgraph path138 [Path]
-    138["Path<br>[980, 1027, 8]"]
+    138["Path<br>[980, 1027, 9]"]
-    139["Segment<br>[1033, 1074, 8]"]
+    139["Segment<br>[1033, 1074, 9]"]
-    140["Segment<br>[1080, 1122, 8]"]
+    140["Segment<br>[1080, 1122, 9]"]
-    141["Segment<br>[1128, 1170, 8]"]
+    141["Segment<br>[1128, 1170, 9]"]
-    142["Segment<br>[1176, 1183, 8]"]
+    142["Segment<br>[1176, 1183, 9]"]
     143[Solid2d]
   end
   subgraph path145 [Path]
-    145["Path<br>[1441, 1600, 8]"]
+    145["Path<br>[1441, 1600, 9]"]
-    146["Segment<br>[1606, 1682, 8]"]
+    146["Segment<br>[1606, 1682, 9]"]
-    147["Segment<br>[1688, 1849, 8]"]
+    147["Segment<br>[1688, 1849, 9]"]
-    148["Segment<br>[1855, 1931, 8]"]
+    148["Segment<br>[1855, 1931, 9]"]
-    149["Segment<br>[1937, 2101, 8]"]
+    149["Segment<br>[1937, 2101, 9]"]
-    150["Segment<br>[2107, 2184, 8]"]
+    150["Segment<br>[2107, 2184, 9]"]
-    151["Segment<br>[2190, 2353, 8]"]
+    151["Segment<br>[2190, 2353, 9]"]
-    152["Segment<br>[2359, 2435, 8]"]
+    152["Segment<br>[2359, 2435, 9]"]
-    153["Segment<br>[2441, 2448, 8]"]
+    153["Segment<br>[2441, 2448, 9]"]
     154[Solid2d]
   end
   subgraph path156 [Path]
-    156["Path<br>[123, 210, 13]"]
+    156["Path<br>[123, 210, 14]"]
-    157["Segment<br>[218, 247, 13]"]
+    157["Segment<br>[218, 247, 14]"]
-    158["Segment<br>[255, 283, 13]"]
+    158["Segment<br>[255, 283, 14]"]
-    159["Segment<br>[291, 369, 13]"]
+    159["Segment<br>[291, 369, 14]"]
-    160["Segment<br>[377, 424, 13]"]
+    160["Segment<br>[377, 424, 14]"]
-    161["Segment<br>[432, 460, 13]"]
+    161["Segment<br>[432, 460, 14]"]
-    162["Segment<br>[468, 497, 13]"]
+    162["Segment<br>[468, 497, 14]"]
-    163["Segment<br>[505, 534, 13]"]
+    163["Segment<br>[505, 534, 14]"]
-    164["Segment<br>[542, 608, 13]"]
+    164["Segment<br>[542, 608, 14]"]
-    165["Segment<br>[616, 644, 13]"]
+    165["Segment<br>[616, 644, 14]"]
-    166["Segment<br>[652, 681, 13]"]
+    166["Segment<br>[652, 681, 14]"]
-    167["Segment<br>[689, 751, 13]"]
+    167["Segment<br>[689, 751, 14]"]
-    168["Segment<br>[759, 787, 13]"]
+    168["Segment<br>[759, 787, 14]"]
-    169["Segment<br>[795, 829, 13]"]
+    169["Segment<br>[795, 829, 14]"]
-    170["Segment<br>[837, 867, 13]"]
+    170["Segment<br>[837, 867, 14]"]
-    171["Segment<br>[875, 943, 13]"]
+    171["Segment<br>[875, 943, 14]"]
-    172["Segment<br>[951, 958, 13]"]
+    172["Segment<br>[951, 958, 14]"]
     173[Solid2d]
   end
   subgraph path175 [Path]
-    175["Path<br>[1092, 1190, 13]"]
+    175["Path<br>[1092, 1190, 14]"]
-    176["Segment<br>[1198, 1276, 13]"]
+    176["Segment<br>[1198, 1276, 14]"]
-    177["Segment<br>[1284, 1331, 13]"]
+    177["Segment<br>[1284, 1331, 14]"]
-    178["Segment<br>[1339, 1419, 13]"]
+    178["Segment<br>[1339, 1419, 14]"]
-    179["Segment<br>[1427, 1434, 13]"]
+    179["Segment<br>[1427, 1434, 14]"]
     180[Solid2d]
   end
   subgraph path182 [Path]
-    182["Path<br>[1531, 1628, 13]"]
+    182["Path<br>[1531, 1628, 14]"]
-    183["Segment<br>[1636, 1714, 13]"]
+    183["Segment<br>[1636, 1714, 14]"]
-    184["Segment<br>[1722, 1770, 13]"]
+    184["Segment<br>[1722, 1770, 14]"]
-    185["Segment<br>[1778, 1858, 13]"]
+    185["Segment<br>[1778, 1858, 14]"]
-    186["Segment<br>[1866, 1873, 13]"]
+    186["Segment<br>[1866, 1873, 14]"]
     187[Solid2d]
   end
   subgraph path189 [Path]
-    189["Path<br>[1092, 1190, 13]"]
+    189["Path<br>[1092, 1190, 14]"]
-    190["Segment<br>[1198, 1276, 13]"]
+    190["Segment<br>[1198, 1276, 14]"]
-    191["Segment<br>[1284, 1331, 13]"]
+    191["Segment<br>[1284, 1331, 14]"]
-    192["Segment<br>[1339, 1419, 13]"]
+    192["Segment<br>[1339, 1419, 14]"]
-    193["Segment<br>[1427, 1434, 13]"]
+    193["Segment<br>[1427, 1434, 14]"]
     194[Solid2d]
   end
   subgraph path196 [Path]
-    196["Path<br>[1531, 1628, 13]"]
+    196["Path<br>[1531, 1628, 14]"]
-    197["Segment<br>[1636, 1714, 13]"]
+    197["Segment<br>[1636, 1714, 14]"]
-    198["Segment<br>[1722, 1770, 13]"]
+    198["Segment<br>[1722, 1770, 14]"]
-    199["Segment<br>[1778, 1858, 13]"]
+    199["Segment<br>[1778, 1858, 14]"]
-    200["Segment<br>[1866, 1873, 13]"]
+    200["Segment<br>[1866, 1873, 14]"]
     201[Solid2d]
   end
   subgraph path230 [Path]
-    230["Path<br>[261, 354, 10]"]
+    230["Path<br>[261, 354, 11]"]
-    231["Segment<br>[360, 409, 10]"]
+    231["Segment<br>[360, 409, 11]"]
-    232["Segment<br>[415, 465, 10]"]
+    232["Segment<br>[415, 465, 11]"]
-    233["Segment<br>[471, 521, 10]"]
+    233["Segment<br>[471, 521, 11]"]
-    234["Segment<br>[527, 545, 10]"]
+    234["Segment<br>[527, 545, 11]"]
     235[Solid2d]
   end
   subgraph path256 [Path]
-    256["Path<br>[309, 339, 11]"]
+    256["Path<br>[309, 339, 12]"]
-    257["Segment<br>[345, 377, 11]"]
+    257["Segment<br>[345, 377, 12]"]
-    258["Segment<br>[383, 416, 11]"]
+    258["Segment<br>[383, 416, 12]"]
-    259["Segment<br>[422, 470, 11]"]
+    259["Segment<br>[422, 470, 12]"]
-    260["Segment<br>[476, 503, 11]"]
+    260["Segment<br>[476, 503, 12]"]
-    261["Segment<br>[509, 516, 11]"]
+    261["Segment<br>[509, 516, 12]"]
     262[Solid2d]
   end
   subgraph path274 [Path]
-    274["Path<br>[398, 423, 12]"]
+    274["Path<br>[398, 423, 13]"]
-    275["Segment<br>[431, 489, 12]"]
+    275["Segment<br>[431, 489, 13]"]
-    276["Segment<br>[497, 556, 12]"]
+    276["Segment<br>[497, 556, 13]"]
-    277["Segment<br>[564, 607, 12]"]
+    277["Segment<br>[564, 607, 13]"]
-    278["Segment<br>[615, 622, 12]"]
+    278["Segment<br>[615, 622, 13]"]
     279[Solid2d]
   end
   subgraph path298 [Path]
-    298["Path<br>[398, 423, 12]"]
+    298["Path<br>[398, 423, 13]"]
-    299["Segment<br>[431, 489, 12]"]
+    299["Segment<br>[431, 489, 13]"]
-    300["Segment<br>[497, 556, 12]"]
+    300["Segment<br>[497, 556, 13]"]
-    301["Segment<br>[564, 607, 12]"]
+    301["Segment<br>[564, 607, 13]"]
-    302["Segment<br>[615, 622, 12]"]
+    302["Segment<br>[615, 622, 13]"]
     303[Solid2d]
   end
   subgraph path322 [Path]
-    322["Path<br>[398, 423, 12]"]
+    322["Path<br>[398, 423, 13]"]
-    323["Segment<br>[431, 489, 12]"]
+    323["Segment<br>[431, 489, 13]"]
-    324["Segment<br>[497, 556, 12]"]
+    324["Segment<br>[497, 556, 13]"]
-    325["Segment<br>[564, 607, 12]"]
+    325["Segment<br>[564, 607, 13]"]
-    326["Segment<br>[615, 622, 12]"]
+    326["Segment<br>[615, 622, 13]"]
     327[Solid2d]
   end
   subgraph path346 [Path]
-    346["Path<br>[398, 423, 12]"]
+    346["Path<br>[398, 423, 13]"]
-    347["Segment<br>[431, 489, 12]"]
+    347["Segment<br>[431, 489, 13]"]
-    348["Segment<br>[497, 556, 12]"]
+    348["Segment<br>[497, 556, 13]"]
-    349["Segment<br>[564, 607, 12]"]
+    349["Segment<br>[564, 607, 13]"]
-    350["Segment<br>[615, 622, 12]"]
+    350["Segment<br>[615, 622, 13]"]
     351[Solid2d]
   end
-  1["Plane<br>[368, 385, 7]"]
+  1["Plane<br>[368, 385, 8]"]
-  8["Sweep Extrusion<br>[603, 633, 7]"]
+  8["Sweep Extrusion<br>[603, 633, 8]"]
   9[Wall]
   10[Wall]
   11[Wall]
@@ -195,11 +195,11 @@ flowchart LR
   20["SweepEdge Adjacent"]
   21["SweepEdge Opposite"]
   22["SweepEdge Adjacent"]
-  23["EdgeCut Chamfer<br>[639, 870, 7]"]
+  23["EdgeCut Chamfer<br>[639, 870, 8]"]
-  24["EdgeCut Chamfer<br>[639, 870, 7]"]
+  24["EdgeCut Chamfer<br>[639, 870, 8]"]
-  25["EdgeCut Chamfer<br>[639, 870, 7]"]
+  25["EdgeCut Chamfer<br>[639, 870, 8]"]
-  26["EdgeCut Chamfer<br>[639, 870, 7]"]
+  26["EdgeCut Chamfer<br>[639, 870, 8]"]
-  37["Sweep Extrusion<br>[1781, 1824, 7]"]
+  37["Sweep Extrusion<br>[1781, 1824, 8]"]
   38[Wall]
   39[Wall]
   40[Wall]
@@ -225,7 +225,7 @@ flowchart LR
   60["SweepEdge Adjacent"]
   61["SweepEdge Opposite"]
   62["SweepEdge Adjacent"]
-  70["Sweep Extrusion<br>[2183, 2226, 7]"]
+  70["Sweep Extrusion<br>[2183, 2226, 8]"]
   71[Wall]
   72[Wall]
   73[Wall]
@@ -239,7 +239,7 @@ flowchart LR
   81["SweepEdge Adjacent"]
   82["SweepEdge Opposite"]
   83["SweepEdge Adjacent"]
-  90["Sweep Extrusion<br>[2478, 2511, 7]"]
+  90["Sweep Extrusion<br>[2478, 2511, 8]"]
   91[Wall]
   92[Wall]
   93[Wall]
@@ -253,13 +253,13 @@ flowchart LR
   101["SweepEdge Adjacent"]
   102["SweepEdge Opposite"]
   103["SweepEdge Adjacent"]
-  104["Plane<br>[307, 324, 9]"]
+  104["Plane<br>[307, 324, 10]"]
-  111["Plane<br>[535, 574, 9]"]
+  111["Plane<br>[535, 574, 10]"]
   113["SweepEdge Opposite"]
   114["SweepEdge Opposite"]
   115["SweepEdge Opposite"]
   116["SweepEdge Opposite"]
-  118["Sweep Loft<br>[914, 957, 9]"]
+  118["Sweep Loft<br>[914, 957, 10]"]
   119[Wall]
   120[Wall]
   121[Wall]
@@ -270,15 +270,15 @@ flowchart LR
   126["SweepEdge Adjacent"]
   127["SweepEdge Adjacent"]
   128["SweepEdge Adjacent"]
-  129["Plane<br>[455, 472, 8]"]
+  129["Plane<br>[455, 472, 9]"]
-  137["Plane<br>[957, 974, 8]"]
+  137["Plane<br>[957, 974, 9]"]
-  144["Plane<br>[1418, 1435, 8]"]
+  144["Plane<br>[1418, 1435, 9]"]
-  155["Plane<br>[2589, 2606, 8]"]
+  155["Plane<br>[2589, 2606, 9]"]
-  174["Plane<br>[2659, 2676, 8]"]
+  174["Plane<br>[2659, 2676, 9]"]
-  181["Plane<br>[2731, 2748, 8]"]
+  181["Plane<br>[2731, 2748, 9]"]
-  188["Plane<br>[2802, 2819, 8]"]
+  188["Plane<br>[2802, 2819, 9]"]
-  195["Plane<br>[2873, 2890, 8]"]
+  195["Plane<br>[2873, 2890, 9]"]
-  202["Sweep Extrusion<br>[2914, 2945, 8]"]
+  202["Sweep Extrusion<br>[2914, 2945, 9]"]
   203[Wall]
   204[Wall]
   205[Wall]
@@ -305,8 +305,8 @@ flowchart LR
   226["SweepEdge Adjacent"]
   227["SweepEdge Opposite"]
   228["SweepEdge Adjacent"]
-  229["Plane<br>[238, 255, 10]"]
+  229["Plane<br>[238, 255, 11]"]
-  236["Sweep Extrusion<br>[591, 643, 10]"]
+  236["Sweep Extrusion<br>[591, 643, 11]"]
   237[Wall]
   238[Wall]
   239[Wall]
@@ -321,12 +321,12 @@ flowchart LR
   248["SweepEdge Adjacent"]
   249["SweepEdge Opposite"]
   250["SweepEdge Adjacent"]
-  251["EdgeCut Fillet<br>[649, 855, 10]"]
+  251["EdgeCut Fillet<br>[649, 855, 11]"]
-  252["EdgeCut Fillet<br>[649, 855, 10]"]
+  252["EdgeCut Fillet<br>[649, 855, 11]"]
-  253["EdgeCut Fillet<br>[649, 855, 10]"]
+  253["EdgeCut Fillet<br>[649, 855, 11]"]
-  254["EdgeCut Fillet<br>[649, 855, 10]"]
+  254["EdgeCut Fillet<br>[649, 855, 11]"]
-  255["Plane<br>[286, 303, 11]"]
+  255["Plane<br>[286, 303, 12]"]
-  263["Sweep Revolve<br>[522, 539, 11]"]
+  263["Sweep Revolve<br>[522, 539, 12]"]
   264[Wall]
   265[Wall]
   266[Wall]
@@ -336,8 +336,8 @@ flowchart LR
   270["SweepEdge Adjacent"]
   271["SweepEdge Adjacent"]
   272["SweepEdge Adjacent"]
-  273["Plane<br>[373, 390, 12]"]
+  273["Plane<br>[373, 390, 13]"]
-  280["Sweep Extrusion<br>[634, 681, 12]"]
+  280["Sweep Extrusion<br>[634, 681, 13]"]
   281[Wall]
   282[Wall]
   283[Wall]
@@ -352,10 +352,10 @@ flowchart LR
   292["SweepEdge Adjacent"]
   293["SweepEdge Opposite"]
   294["SweepEdge Adjacent"]
-  295["EdgeCut Chamfer<br>[689, 835, 12]"]
+  295["EdgeCut Chamfer<br>[689, 835, 13]"]
-  296["EdgeCut Chamfer<br>[689, 835, 12]"]
+  296["EdgeCut Chamfer<br>[689, 835, 13]"]
-  297["Plane<br>[373, 390, 12]"]
+  297["Plane<br>[373, 390, 13]"]
-  304["Sweep Extrusion<br>[634, 681, 12]"]
+  304["Sweep Extrusion<br>[634, 681, 13]"]
   305[Wall]
   306[Wall]
   307[Wall]
@@ -370,10 +370,10 @@ flowchart LR
   316["SweepEdge Adjacent"]
   317["SweepEdge Opposite"]
   318["SweepEdge Adjacent"]
-  319["EdgeCut Chamfer<br>[689, 835, 12]"]
+  319["EdgeCut Chamfer<br>[689, 835, 13]"]
-  320["EdgeCut Chamfer<br>[689, 835, 12]"]
+  320["EdgeCut Chamfer<br>[689, 835, 13]"]
-  321["Plane<br>[373, 390, 12]"]
+  321["Plane<br>[373, 390, 13]"]
-  328["Sweep Extrusion<br>[634, 681, 12]"]
+  328["Sweep Extrusion<br>[634, 681, 13]"]
   329[Wall]
   330[Wall]
   331[Wall]
@@ -388,10 +388,10 @@ flowchart LR
   340["SweepEdge Adjacent"]
   341["SweepEdge Opposite"]
   342["SweepEdge Adjacent"]
-  343["EdgeCut Chamfer<br>[689, 835, 12]"]
+  343["EdgeCut Chamfer<br>[689, 835, 13]"]
-  344["EdgeCut Chamfer<br>[689, 835, 12]"]
+  344["EdgeCut Chamfer<br>[689, 835, 13]"]
-  345["Plane<br>[373, 390, 12]"]
+  345["Plane<br>[373, 390, 13]"]
-  352["Sweep Extrusion<br>[634, 681, 12]"]
+  352["Sweep Extrusion<br>[634, 681, 13]"]
   353[Wall]
   354[Wall]
   355[Wall]
@@ -406,12 +406,12 @@ flowchart LR
   364["SweepEdge Adjacent"]
   365["SweepEdge Opposite"]
   366["SweepEdge Adjacent"]
-  367["EdgeCut Chamfer<br>[689, 835, 12]"]
+  367["EdgeCut Chamfer<br>[689, 835, 13]"]
-  368["EdgeCut Chamfer<br>[689, 835, 12]"]
+  368["EdgeCut Chamfer<br>[689, 835, 13]"]
-  369["StartSketchOnFace<br>[931, 962, 7]"]
+  369["StartSketchOnFace<br>[931, 962, 8]"]
-  370["StartSketchOnFace<br>[1877, 1916, 7]"]
+  370["StartSketchOnFace<br>[1877, 1916, 8]"]
-  371["StartSketchOnFace<br>[2267, 2306, 7]"]
+  371["StartSketchOnFace<br>[2267, 2306, 8]"]
-  372["StartSketchOnPlane<br>[594, 618, 9]"]
+  372["StartSketchOnPlane<br>[594, 618, 10]"]
   1 --- 2
   2 --- 3
   2 --- 4

rust/kcl-lib/tests/kcl_samples/walkie-talkie/ops.snap

@@ -8,7 +8,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "body",
-      "moduleId": 7
+      "moduleId": 0
     },
     "sourceRange": []
   },
@@ -60,6 +60,17 @@ description: Operations executed walkie-talkie.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "chamfer",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "length": {
         "value": {
@@ -102,18 +113,7 @@ description: Operations executed walkie-talkie.kcl
         "sourceRange": []
       }
     },
-    "name": "chamfer",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "labeledArgs": {
@@ -143,11 +143,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -161,11 +157,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -179,11 +171,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -197,11 +185,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -215,11 +199,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -233,11 +213,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -251,11 +227,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -269,11 +241,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -432,7 +400,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "antenna",
-      "moduleId": 9
+      "moduleId": 0
     },
     "sourceRange": []
   },
@@ -532,7 +500,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "case",
-      "moduleId": 8
+      "moduleId": 0
     },
     "sourceRange": []
   },
@@ -586,11 +554,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -604,11 +568,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -622,11 +582,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -640,11 +596,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -658,11 +610,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -676,11 +624,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -694,11 +638,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "toRadians",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        11503,
-        11552,
-        1
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -712,11 +652,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "cos",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        0,
-        0,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1652,11 +1588,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "zLogo",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        69,
-        977,
-        13
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1710,11 +1642,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "oLogo",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1035,
-        1456,
-        13
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1768,11 +1696,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "oLogo2",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1474,
-        1895,
-        13
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1826,11 +1750,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "oLogo",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1035,
-        1456,
-        13
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1884,11 +1804,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "oLogo2",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        1474,
-        1895,
-        13
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -1962,7 +1878,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "talkButton",
-      "moduleId": 10
+      "moduleId": 0
     },
     "sourceRange": []
   },
@@ -2014,6 +1930,17 @@ description: Operations executed walkie-talkie.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "fillet",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "radius": {
         "value": {
@@ -2056,18 +1983,7 @@ description: Operations executed walkie-talkie.kcl
         "sourceRange": []
       }
     },
-    "name": "fillet",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "type": "GroupEnd"
@@ -2077,7 +1993,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "ModuleInstance",
       "name": "knob",
-      "moduleId": 11
+      "moduleId": 0
     },
     "sourceRange": []
   },
@@ -2190,11 +2106,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "button",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        308,
-        891,
-        12
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2248,6 +2160,17 @@ description: Operations executed walkie-talkie.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "chamfer",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "length": {
         "value": {
@@ -2282,18 +2205,7 @@ description: Operations executed walkie-talkie.kcl
         "sourceRange": []
       }
     },
-    "name": "chamfer",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "type": "GroupEnd"
@@ -2303,11 +2215,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "button",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        308,
-        891,
-        12
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2361,6 +2269,17 @@ description: Operations executed walkie-talkie.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "chamfer",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "length": {
         "value": {
@@ -2395,18 +2314,7 @@ description: Operations executed walkie-talkie.kcl
         "sourceRange": []
       }
     },
-    "name": "chamfer",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "type": "GroupEnd"
@@ -2416,11 +2324,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "button",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        308,
-        891,
-        12
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2474,6 +2378,17 @@ description: Operations executed walkie-talkie.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "chamfer",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "length": {
         "value": {
@@ -2508,18 +2423,7 @@ description: Operations executed walkie-talkie.kcl
         "sourceRange": []
       }
     },
-    "name": "chamfer",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "type": "GroupEnd"
@@ -2529,11 +2433,7 @@ description: Operations executed walkie-talkie.kcl
     "group": {
       "type": "FunctionCall",
       "name": "button",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        308,
-        891,
-        12
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -2587,6 +2487,17 @@ description: Operations executed walkie-talkie.kcl
     }
   },
   {
+    "type": "KclStdLibCall",
+    "name": "chamfer",
+    "unlabeledArg": {
+      "value": {
+        "type": "Solid",
+        "value": {
+          "artifactId": "[uuid]"
+        }
+      },
+      "sourceRange": []
+    },
     "labeledArgs": {
       "length": {
         "value": {
@@ -2621,18 +2532,7 @@ description: Operations executed walkie-talkie.kcl
         "sourceRange": []
       }
     },
-    "name": "chamfer",
+    "sourceRange": []
-    "sourceRange": [],
-    "type": "StdLibCall",
-    "unlabeledArg": {
-      "value": {
-        "type": "Solid",
-        "value": {
-          "artifactId": "[uuid]"
-        }
-      },
-      "sourceRange": []
-    }
   },
   {
     "type": "GroupEnd"

rust/kcl-lib/tests/kcl_samples/walkie-talkie/program_memory.snap

@@ -5,7 +5,7 @@ description: Variables in memory after executing walkie-talkie.kcl
 {
   "antenna": {
     "type": "Module",
-    "value": 9
+    "value": 10
   },
   "antennaBaseHeight": {
     "type": "Number",
@@ -74,7 +74,7 @@ description: Variables in memory after executing walkie-talkie.kcl
   },
   "body": {
     "type": "Module",
-    "value": 7
+    "value": 8
   },
   "button": {
     "type": "Function"
@@ -120,7 +120,7 @@ description: Variables in memory after executing walkie-talkie.kcl
   },
   "case": {
     "type": "Module",
-    "value": 8
+    "value": 9
   },
   "caseTolerance": {
     "type": "Number",
@@ -163,7 +163,7 @@ description: Variables in memory after executing walkie-talkie.kcl
   },
   "knob": {
     "type": "Module",
-    "value": 11
+    "value": 12
   },
   "knobDiameter": {
     "type": "Number",
@@ -330,7 +330,7 @@ description: Variables in memory after executing walkie-talkie.kcl
   },
   "talkButton": {
     "type": "Module",
-    "value": 10
+    "value": 11
   },
   "talkButtonHeight": {
     "type": "Number",

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

@@ -8,11 +8,7 @@ description: Operations executed kw_fn.kcl
     "group": {
       "type": "FunctionCall",
       "name": "increment",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        12,
-        35,
-        0
-      ],
       "unlabeledArg": null,
       "labeledArgs": {}
     },
@@ -26,11 +22,7 @@ description: Operations executed kw_fn.kcl
     "group": {
       "type": "FunctionCall",
       "name": "add",
-      "functionSourceRange": [
+      "functionSourceRange": [],
-        43,
-        77,
-        0
-      ],
       "unlabeledArg": {
         "value": {
           "type": "Number",