lint default planes and add a suggestion (#6587)

lint default planes and other plane cleanup

Signed-off-by: Jess Frazelle <github@jessfraz.com>

.github/workflows/cargo-test.yml

@@ -17,7 +17,7 @@ jobs:
     name: Build test artifacts
     runs-on:
       - runs-on=${{ github.run_id }}
-      - runner=32cpu-linux-x64
+      - runner=8cpu-linux-x64
       - extras=s3-cache
     steps:
       - uses: runs-on/action@v1
@@ -138,6 +138,7 @@ jobs:
       - extras=s3-cache
     needs: build-test-artifacts
     strategy:
+      fail-fast: false
       matrix:
         partitionIndex: [1, 2, 3, 4, 5, 6]
         partitionTotal: [6]

docs/kcl/std.json

@@ -262906,6 +262906,14 @@
                   ],
                   "properties": {
                     "plane": {
+                      "$ref": "#/components/schemas/PlaneInfo"
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              ]
+            },
+            "PlaneInfo": {
               "type": "object",
               "required": [
                 "origin",
@@ -262922,7 +262930,7 @@
                   ]
                 },
                 "xAxis": {
-                          "description": "What should the plane’s X axis be?",
+                  "description": "What should the plane's X axis be?",
                   "allOf": [
                     {
                       "$ref": "#/components/schemas/Point3d"
@@ -262930,7 +262938,7 @@
                   ]
                 },
                 "yAxis": {
-                          "description": "What should the plane’s Y axis be?",
+                  "description": "What should the plane's Y axis be?",
                   "allOf": [
                     {
                       "$ref": "#/components/schemas/Point3d"
@@ -262938,11 +262946,6 @@
                   ]
                 }
               }
-                    }
-                  },
-                  "additionalProperties": false
-                }
-              ]
             },
             "Point3d": {
               "type": "object",
@@ -264659,6 +264662,14 @@
                   ],
                   "properties": {
                     "plane": {
+                      "$ref": "#/components/schemas/PlaneInfo"
+                    }
+                  },
+                  "additionalProperties": false
+                }
+              ]
+            },
+            "PlaneInfo": {
               "type": "object",
               "required": [
                 "origin",
@@ -264675,7 +264686,7 @@
                   ]
                 },
                 "xAxis": {
-                          "description": "What should the plane’s X axis be?",
+                  "description": "What should the plane's X axis be?",
                   "allOf": [
                     {
                       "$ref": "#/components/schemas/Point3d"
@@ -264683,7 +264694,7 @@
                   ]
                 },
                 "yAxis": {
-                          "description": "What should the plane’s Y axis be?",
+                  "description": "What should the plane's Y axis be?",
                   "allOf": [
                     {
                       "$ref": "#/components/schemas/Point3d"
@@ -264691,11 +264702,6 @@
                   ]
                 }
               }
-                    }
-                  },
-                  "additionalProperties": false
-                }
-              ]
             },
             "Point3d": {
               "type": "object",

docs/kcl/types/PlaneData.md

@@ -96,7 +96,7 @@ A defined plane.
 
 | Property | Type | Description | Required |
 |----------|------|-------------|----------|
-| `plane` |`object`|  | No |
+| `plane` |[`PlaneInfo`](/docs/kcl/types/PlaneInfo)|  | No |
 
 
 ----

docs/kcl/types/PlaneInfo.md

@@ -0,0 +1,22 @@
+---
+title: "PlaneInfo"
+excerpt: ""
+layout: manual
+---
+
+
+**Type:** `object`
+
+
+
+
+
+## Properties
+
+| Property | Type | Description | Required |
+|----------|------|-------------|----------|
+| `origin` |[`Point3d`](/docs/kcl/types/Point3d)| Origin of the plane. | No |
+| `xAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the plane's X axis be? | No |
+| `yAxis` |[`Point3d`](/docs/kcl/types/Point3d)| What should the plane's Y axis be? | No |
+
+

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

@@ -33,6 +33,7 @@ use kcmc::{
     ModelingCmd,
 };
 use kittycad_modeling_cmds as kcmc;
+use parse_display::{Display, FromStr};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use tokio::sync::RwLock;
@@ -42,7 +43,7 @@ use uuid::Uuid;
 use crate::execution::ArtifactCommand;
 use crate::{
     errors::{KclError, KclErrorDetails},
-    execution::{types::UnitLen, DefaultPlanes, IdGenerator, Point3d},
+    execution::{types::UnitLen, DefaultPlanes, IdGenerator, PlaneInfo, Point3d},
     SourceRange,
 };
 
@@ -50,6 +51,40 @@ lazy_static::lazy_static! {
     pub static ref GRID_OBJECT_ID: uuid::Uuid = uuid::Uuid::parse_str("cfa78409-653d-4c26-96f1-7c45fb784840").unwrap();
 
     pub static ref GRID_SCALE_TEXT_OBJECT_ID: uuid::Uuid = uuid::Uuid::parse_str("10782f33-f588-4668-8bcd-040502d26590").unwrap();
+
+    pub static ref DEFAULT_PLANE_INFO: IndexMap<PlaneName, PlaneInfo> = IndexMap::from([
+            (PlaneName::Xy,PlaneInfo{
+                origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
+                x_axis: Point3d::new(1.0, 0.0, 0.0, UnitLen::Unknown),
+                y_axis: Point3d::new(0.0, 1.0, 0.0, UnitLen::Unknown),
+            }),
+            (PlaneName::NegXy,
+           PlaneInfo{
+                origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
+                x_axis: Point3d::new(-1.0, 0.0, 0.0, UnitLen::Unknown),
+                y_axis: Point3d::new(0.0, 1.0, 0.0, UnitLen::Unknown),
+            }),
+            (PlaneName::Xz, PlaneInfo{
+                origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
+                x_axis: Point3d::new(1.0, 0.0, 0.0, UnitLen::Unknown),
+                y_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Unknown),
+            }),
+            (PlaneName::NegXz, PlaneInfo{
+                origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
+                x_axis: Point3d::new(-1.0, 0.0, 0.0, UnitLen::Unknown),
+                y_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Unknown),
+            }),
+            (PlaneName::Yz, PlaneInfo{
+                origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
+                x_axis: Point3d::new(0.0, 1.0, 0.0, UnitLen::Unknown),
+                y_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Unknown),
+            }),
+            (PlaneName::NegYz, PlaneInfo{
+                origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
+                x_axis: Point3d::new(0.0, -1.0, 0.0, UnitLen::Unknown),
+                y_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Unknown),
+            }),
+            ]);
 }
 
 #[derive(Default, Debug)]
@@ -608,31 +643,23 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
     async fn make_default_plane(
         &self,
         plane_id: uuid::Uuid,
-        x_axis: Point3d,
+        info: &PlaneInfo,
-        y_axis: Point3d,
         color: Option<Color>,
         source_range: SourceRange,
         id_generator: &mut IdGenerator,
     ) -> Result<uuid::Uuid, KclError> {
         // Create new default planes.
         let default_size = 100.0;
-        let default_origin = Point3d {
-            x: 0.0,
-            y: 0.0,
-            z: 0.0,
-            units: UnitLen::Mm,
-        }
-        .into();
 
         self.batch_modeling_cmd(
             plane_id,
             source_range,
             &ModelingCmd::from(mcmd::MakePlane {
                 clobber: false,
-                origin: default_origin,
+                origin: info.origin.into(),
                 size: LengthUnit(default_size),
-                x_axis: x_axis.into(),
+                x_axis: info.x_axis.into(),
-                y_axis: y_axis.into(),
+                y_axis: info.y_axis.into(),
                 hide: Some(true),
             }),
         )
@@ -656,22 +683,10 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
         id_generator: &mut IdGenerator,
         source_range: SourceRange,
     ) -> Result<DefaultPlanes, KclError> {
-        let plane_settings: Vec<(PlaneName, Uuid, Point3d, Point3d, Option<Color>)> = vec![
+        let plane_settings: Vec<(PlaneName, Uuid, Option<Color>)> = vec![
             (
                 PlaneName::Xy,
                 id_generator.next_uuid(),
-                Point3d {
-                    x: 1.0,
-                    y: 0.0,
-                    z: 0.0,
-                    units: UnitLen::Mm,
-                },
-                Point3d {
-                    x: 0.0,
-                    y: 1.0,
-                    z: 0.0,
-                    units: UnitLen::Mm,
-                },
                 Some(Color {
                     r: 0.7,
                     g: 0.28,
@@ -682,18 +697,6 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
             (
                 PlaneName::Yz,
                 id_generator.next_uuid(),
-                Point3d {
-                    x: 0.0,
-                    y: 1.0,
-                    z: 0.,
-                    units: UnitLen::Mm,
-                },
-                Point3d {
-                    x: 0.0,
-                    y: 0.0,
-                    z: 1.0,
-                    units: UnitLen::Mm,
-                },
                 Some(Color {
                     r: 0.28,
                     g: 0.7,
@@ -704,18 +707,6 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
             (
                 PlaneName::Xz,
                 id_generator.next_uuid(),
-                Point3d {
-                    x: 1.0,
-                    y: 0.0,
-                    z: 0.0,
-                    units: UnitLen::Mm,
-                },
-                Point3d {
-                    x: 0.0,
-                    y: 0.0,
-                    z: 1.0,
-                    units: UnitLen::Mm,
-                },
                 Some(Color {
                     r: 0.28,
                     g: 0.28,
@@ -723,64 +714,23 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
                     a: 0.4,
                 }),
             ),
-            (
+            (PlaneName::NegXy, id_generator.next_uuid(), None),
-                PlaneName::NegXy,
+            (PlaneName::NegYz, id_generator.next_uuid(), None),
-                id_generator.next_uuid(),
+            (PlaneName::NegXz, id_generator.next_uuid(), None),
-                Point3d {
-                    x: -1.0,
-                    y: 0.0,
-                    z: 0.0,
-                    units: UnitLen::Mm,
-                },
-                Point3d {
-                    x: 0.0,
-                    y: 1.0,
-                    z: 0.0,
-                    units: UnitLen::Mm,
-                },
-                None,
-            ),
-            (
-                PlaneName::NegYz,
-                id_generator.next_uuid(),
-                Point3d {
-                    x: 0.0,
-                    y: -1.0,
-                    z: 0.0,
-                    units: UnitLen::Mm,
-                },
-                Point3d {
-                    x: 0.0,
-                    y: 0.0,
-                    z: 1.0,
-                    units: UnitLen::Mm,
-                },
-                None,
-            ),
-            (
-                PlaneName::NegXz,
-                id_generator.next_uuid(),
-                Point3d {
-                    x: -1.0,
-                    y: 0.0,
-                    z: 0.0,
-                    units: UnitLen::Mm,
-                },
-                Point3d {
-                    x: 0.0,
-                    y: 0.0,
-                    z: 1.0,
-                    units: UnitLen::Mm,
-                },
-                None,
-            ),
         ];
 
         let mut planes = HashMap::new();
-        for (name, plane_id, x_axis, y_axis, color) in plane_settings {
+        for (name, plane_id, color) in plane_settings {
+            let info = DEFAULT_PLANE_INFO.get(&name).ok_or_else(|| {
+                // We should never get here.
+                KclError::Engine(KclErrorDetails {
+                    message: format!("Failed to get default plane info for: {:?}", name),
+                    source_ranges: vec![source_range],
+                })
+            })?;
             planes.insert(
                 name,
-                self.make_default_plane(plane_id, x_axis, y_axis, color, source_range, id_generator)
+                self.make_default_plane(plane_id, info, color, source_range, id_generator)
                     .await?,
             );
         }
@@ -907,21 +857,27 @@ pub trait EngineManager: std::fmt::Debug + Send + Sync + 'static {
     async fn close(&self);
 }
 
-#[derive(Debug, Hash, Eq, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
+#[derive(Debug, Hash, Eq, Copy, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema, Display, FromStr)]
 #[ts(export)]
 #[serde(rename_all = "camelCase")]
 pub enum PlaneName {
     /// The XY plane.
+    #[display("XY")]
     Xy,
     /// The opposite side of the XY plane.
+    #[display("-XY")]
     NegXy,
     /// The XZ plane.
+    #[display("XZ")]
     Xz,
     /// The opposite side of the XZ plane.
+    #[display("-XZ")]
     NegXz,
     /// The YZ plane.
+    #[display("YZ")]
     Yz,
     /// The opposite side of the YZ plane.
+    #[display("-YZ")]
     NegYz,
 }
 

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

@@ -1168,14 +1168,14 @@ impl Node<UnaryExpression> {
             }
             KclValue::Plane { value } => {
                 let mut plane = value.clone();
-                if plane.x_axis.x != 0.0 {
+                if plane.info.x_axis.x != 0.0 {
-                    plane.x_axis.x *= -1.0;
+                    plane.info.x_axis.x *= -1.0;
                 }
-                if plane.x_axis.y != 0.0 {
+                if plane.info.x_axis.y != 0.0 {
-                    plane.x_axis.y *= -1.0;
+                    plane.info.x_axis.y *= -1.0;
                 }
-                if plane.x_axis.z != 0.0 {
+                if plane.info.x_axis.z != 0.0 {
-                    plane.x_axis.z *= -1.0;
+                    plane.info.x_axis.z *= -1.0;
                 }
 
                 plane.value = PlaneType::Uninit;
@@ -2694,9 +2694,9 @@ p2 = -p
             .unwrap()
         {
             KclValue::Plane { value } => {
-                assert_eq!(value.x_axis.x, -1.0);
+                assert_eq!(value.info.x_axis.x, -1.0);
-                assert_eq!(value.x_axis.y, 0.0);
+                assert_eq!(value.info.x_axis.y, 0.0);
-                assert_eq!(value.x_axis.z, 0.0);
+                assert_eq!(value.info.x_axis.z, 0.0);
             }
             _ => unreachable!(),
         }

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

@@ -8,6 +8,8 @@ use parse_display::{Display, FromStr};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
+use crate::engine::{PlaneName, DEFAULT_PLANE_INFO};
+use crate::errors::KclErrorDetails;
 #[cfg(feature = "artifact-graph")]
 use crate::execution::ArtifactId;
 use crate::{
@@ -281,17 +283,26 @@ pub struct Plane {
     pub artifact_id: ArtifactId,
     // The code for the plane either a string or custom.
     pub value: PlaneType,
+    /// The information for the plane.
+    #[serde(flatten)]
+    pub info: PlaneInfo,
+    #[serde(skip)]
+    pub meta: Vec<Metadata>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, ts_rs::TS, JsonSchema)]
+#[ts(export)]
+#[serde(rename_all = "camelCase")]
+pub struct PlaneInfo {
     /// Origin of the plane.
     pub origin: Point3d,
     /// What should the plane's X axis be?
     pub x_axis: Point3d,
     /// What should the plane's Y axis be?
     pub y_axis: Point3d,
-    #[serde(skip)]
-    pub meta: Vec<Metadata>,
 }
 
-impl Plane {
+impl PlaneInfo {
     pub(crate) fn into_plane_data(self) -> PlaneData {
         if self.origin.is_zero() {
             match self {
@@ -317,7 +328,6 @@ impl Plane {
                             z: 0.0,
                             units: _,
                         },
-                    ..
                 } => return PlaneData::XY,
                 Self {
                     origin:
@@ -341,7 +351,6 @@ impl Plane {
                             z: 0.0,
                             units: _,
                         },
-                    ..
                 } => return PlaneData::NegXY,
                 Self {
                     origin:
@@ -365,7 +374,6 @@ impl Plane {
                             z: 1.0,
                             units: _,
                         },
-                    ..
                 } => return PlaneData::XZ,
                 Self {
                     origin:
@@ -389,7 +397,6 @@ impl Plane {
                             z: 1.0,
                             units: _,
                         },
-                    ..
                 } => return PlaneData::NegXZ,
                 Self {
                     origin:
@@ -413,7 +420,6 @@ impl Plane {
                             z: 1.0,
                             units: _,
                         },
-                    ..
                 } => return PlaneData::YZ,
                 Self {
                     origin:
@@ -437,96 +443,78 @@ impl Plane {
                             z: 1.0,
                             units: _,
                         },
-                    ..
                 } => return PlaneData::NegYZ,
                 _ => {}
             }
         }
 
-        PlaneData::Plane {
+        PlaneData::Plane(Self {
             origin: self.origin,
             x_axis: self.x_axis,
             y_axis: self.y_axis,
+        })
     }
 }
 
-    pub(crate) fn from_plane_data(value: PlaneData, exec_state: &mut ExecState) -> Self {
+impl TryFrom<PlaneData> for PlaneInfo {
-        let id = exec_state.next_uuid();
+    type Error = KclError;
+
+    fn try_from(value: PlaneData) -> Result<Self, Self::Error> {
+        if let PlaneData::Plane(info) = value {
+            return Ok(info);
+        }
+        let name = match value {
+            PlaneData::XY => PlaneName::Xy,
+            PlaneData::NegXY => PlaneName::NegXy,
+            PlaneData::XZ => PlaneName::Xz,
+            PlaneData::NegXZ => PlaneName::NegXz,
+            PlaneData::YZ => PlaneName::Yz,
+            PlaneData::NegYZ => PlaneName::NegYz,
+            PlaneData::Plane(_) => {
+                // We will never get here since we already checked for PlaneData::Plane.
+                return Err(KclError::Internal(KclErrorDetails {
+                    message: format!("PlaneData {:?} not found", value),
+                    source_ranges: Default::default(),
+                }));
+            }
+        };
+
+        let info = DEFAULT_PLANE_INFO.get(&name).ok_or_else(|| {
+            KclError::Internal(KclErrorDetails {
+                message: format!("Plane {} not found", name),
+                source_ranges: Default::default(),
+            })
+        })?;
+
+        Ok(info.clone())
+    }
+}
+
+impl From<PlaneData> for PlaneType {
+    fn from(value: PlaneData) -> Self {
         match value {
-            PlaneData::XY => Plane {
+            PlaneData::XY => PlaneType::XY,
-                id,
+            PlaneData::NegXY => PlaneType::XY,
-                #[cfg(feature = "artifact-graph")]
+            PlaneData::XZ => PlaneType::XZ,
-                artifact_id: id.into(),
+            PlaneData::NegXZ => PlaneType::XZ,
-                origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
+            PlaneData::YZ => PlaneType::YZ,
-                x_axis: Point3d::new(1.0, 0.0, 0.0, UnitLen::Unknown),
+            PlaneData::NegYZ => PlaneType::YZ,
-                y_axis: Point3d::new(0.0, 1.0, 0.0, UnitLen::Unknown),
+            PlaneData::Plane(_) => PlaneType::Custom,
-                value: PlaneType::XY,
+        }
-                meta: vec![],
+    }
-            },
+}
-            PlaneData::NegXY => Plane {
+
-                id,
+impl Plane {
-                #[cfg(feature = "artifact-graph")]
+    pub(crate) fn from_plane_data(value: PlaneData, exec_state: &mut ExecState) -> Result<Self, KclError> {
-                artifact_id: id.into(),
-                origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
-                x_axis: Point3d::new(-1.0, 0.0, 0.0, UnitLen::Unknown),
-                y_axis: Point3d::new(0.0, 1.0, 0.0, UnitLen::Unknown),
-                value: PlaneType::XY,
-                meta: vec![],
-            },
-            PlaneData::XZ => Plane {
-                id,
-                #[cfg(feature = "artifact-graph")]
-                artifact_id: id.into(),
-                origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
-                x_axis: Point3d::new(1.0, 0.0, 0.0, UnitLen::Unknown),
-                y_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Unknown),
-                value: PlaneType::XZ,
-                meta: vec![],
-            },
-            PlaneData::NegXZ => Plane {
-                id,
-                #[cfg(feature = "artifact-graph")]
-                artifact_id: id.into(),
-                origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
-                x_axis: Point3d::new(-1.0, 0.0, 0.0, UnitLen::Unknown),
-                y_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Unknown),
-                value: PlaneType::XZ,
-                meta: vec![],
-            },
-            PlaneData::YZ => Plane {
-                id,
-                #[cfg(feature = "artifact-graph")]
-                artifact_id: id.into(),
-                origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
-                x_axis: Point3d::new(0.0, 1.0, 0.0, UnitLen::Unknown),
-                y_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Unknown),
-                value: PlaneType::YZ,
-                meta: vec![],
-            },
-            PlaneData::NegYZ => Plane {
-                id,
-                #[cfg(feature = "artifact-graph")]
-                artifact_id: id.into(),
-                origin: Point3d::new(0.0, 0.0, 0.0, UnitLen::Mm),
-                x_axis: Point3d::new(0.0, -1.0, 0.0, UnitLen::Unknown),
-                y_axis: Point3d::new(0.0, 0.0, 1.0, UnitLen::Unknown),
-                value: PlaneType::YZ,
-                meta: vec![],
-            },
-            PlaneData::Plane { origin, x_axis, y_axis } => {
         let id = exec_state.next_uuid();
-                Plane {
+        Ok(Plane {
             id,
             #[cfg(feature = "artifact-graph")]
             artifact_id: id.into(),
-                    origin,
+            info: PlaneInfo::try_from(value.clone())?,
-                    x_axis,
+            value: value.into(),
-                    y_axis,
-                    value: PlaneType::Custom,
             meta: vec![],
-                }
+        })
-            }
-        }
     }
 
     /// The standard planes are XY, YZ and XZ (in both positive and negative)
@@ -629,7 +617,7 @@ impl Sketch {
                     adjust_camera: false,
                     planar_normal: if let SketchSurface::Plane(plane) = &self.on {
                         // We pass in the normal for the plane here.
-                        let normal = plane.x_axis.axes_cross_product(&plane.y_axis);
+                        let normal = plane.info.x_axis.axes_cross_product(&plane.info.y_axis);
                         Some(normal.into())
                     } else {
                         None
@@ -664,13 +652,13 @@ impl SketchSurface {
     }
     pub(crate) fn x_axis(&self) -> Point3d {
         match self {
-            SketchSurface::Plane(plane) => plane.x_axis,
+            SketchSurface::Plane(plane) => plane.info.x_axis,
             SketchSurface::Face(face) => face.x_axis,
         }
     }
     pub(crate) fn y_axis(&self) -> Point3d {
         match self {
-            SketchSurface::Plane(plane) => plane.y_axis,
+            SketchSurface::Plane(plane) => plane.info.y_axis,
             SketchSurface::Face(face) => face.y_axis,
         }
     }

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

@@ -4,6 +4,7 @@ use anyhow::Result;
 use schemars::JsonSchema;
 use serde::Serialize;
 
+use super::types::UnitType;
 use crate::{
     errors::KclErrorDetails,
     execution::{
@@ -19,8 +20,6 @@ use crate::{
     CompilationError, KclError, ModuleId, SourceRange,
 };
 
-use super::types::UnitType;
-
 pub type KclObjectFields = HashMap<String, KclValue>;
 
 /// Any KCL value.

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

@@ -8,7 +8,7 @@ use crate::{
     execution::{
         kcl_value::{KclValue, TypeDef},
         memory::{self},
-        ExecState, Plane, Point3d,
+        ExecState, Plane, PlaneInfo, Point3d,
     },
     parsing::{
         ast::types::{PrimitiveType as AstPrimitiveType, Type},
@@ -1076,9 +1076,11 @@ impl KclValue {
                         id,
                         #[cfg(feature = "artifact-graph")]
                         artifact_id: id.into(),
+                        info: PlaneInfo {
                             origin,
                             x_axis: x_axis.normalize(),
                             y_axis: y_axis.normalize(),
+                        },
                         value: super::PlaneType::Uninit,
                         meta: meta.clone(),
                     };
@@ -1364,7 +1366,7 @@ mod test {
             KclValue::TagIdentifier(Box::new("foo".parse().unwrap())),
             KclValue::TagDeclarator(Box::new(crate::parsing::ast::types::TagDeclarator::new("foo"))),
             KclValue::Plane {
-                value: Box::new(Plane::from_plane_data(crate::std::sketch::PlaneData::XY, exec_state)),
+                value: Box::new(Plane::from_plane_data(crate::std::sketch::PlaneData::XY, exec_state).unwrap()),
             },
             // No easy way to make a Face, Sketch, Solid, or Helix
             KclValue::ImportedGeometry(crate::execution::ImportedGeometry::new(

rust/kcl-lib/src/lint/checks/default_plane.rs

@@ -0,0 +1,93 @@
+use anyhow::Result;
+
+use crate::{
+    errors::Suggestion,
+    lint::rule::{def_finding, Discovered, Finding},
+    walk::Node,
+};
+
+use super::offset_plane::start_sketch_on_check_specific_plane;
+
+def_finding!(
+    Z0002,
+    "default plane should be called versus explicitly defined",
+    "\
+startSketchOn should be a default plane in this case ✏️
+
+The startSketchOn stdlib function has the ability to define a default Plane
+to begin the sketch on.
+
+These are the default planes: XY, -XY, XZ, -XZ, YZ, -YZ.
+"
+);
+
+pub fn lint_should_be_default_plane(node: Node) -> Result<Vec<Discovered>> {
+    let Some((call_source_range, plane_name, offset)) = start_sketch_on_check_specific_plane(node)? else {
+        return Ok(vec![]);
+    };
+    // We only care about the default planes.
+    if offset != 0.0 {
+        return Ok(vec![]);
+    }
+    let suggestion = Suggestion {
+        title: "use defaultPlane instead".to_owned(),
+        insert: format!("{}", plane_name),
+        source_range: call_source_range,
+    };
+    Ok(vec![Z0002.at(
+        format!(
+            "custom plane in startSketchOn; defaultPlane {} would work here",
+            plane_name
+        ),
+        call_source_range,
+        Some(suggestion),
+    )])
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{lint_should_be_default_plane, Z0002};
+    use crate::lint::rule::{test_finding, test_no_finding};
+
+    test_finding!(
+        z0002_bad_sketch_on,
+        lint_should_be_default_plane,
+        Z0002,
+        "\
+startSketchOn({
+    origin = { x = 0, y = 0, z = 0 },
+    xAxis = { x = 1, y = 0, z = 0 },
+    yAxis = { x = 0, y = 0, z = 1 },
+})
+|> startProfile(at = [0, 0])
+",
+        "custom plane in startSketchOn; defaultPlane XZ would work here",
+        Some("XZ".to_string())
+    );
+
+    test_no_finding!(
+        z0002_good_sketch_on,
+        lint_should_be_default_plane,
+        Z0002,
+        "\
+startSketchOn({
+    origin = { x = 10, y = -14.3, z = 0 },
+    xAxis = { x = 1, y = 0, z = 0 },
+    yAxis = { x = 0, y = 0, z = 1 },
+})
+"
+    );
+
+    test_no_finding!(
+        z0002_offset_plane,
+        lint_should_be_default_plane,
+        Z0002,
+        "\
+startSketchOn({
+    origin = { x = 0, y = -14.3, z = 0 },
+    xAxis = { x = 1, y = 0, z = 0 },
+    yAxis = { x = 0, y = 0, z = 1 },
+})
+"
+    );
+}

rust/kcl-lib/src/lint/checks/mod.rs

@@ -1,5 +1,7 @@
 mod camel_case;
+mod default_plane;
 mod offset_plane;
 
 pub use camel_case::{lint_object_properties, lint_variables, Z0001};
+pub use default_plane::{lint_should_be_default_plane, Z0002};
 pub use offset_plane::{lint_should_be_offset_plane, Z0003};

rust/kcl-lib/src/lint/checks/offset_plane.rs

@@ -1,9 +1,9 @@
-use std::collections::HashMap;
-
 use anyhow::Result;
 
 use crate::{
+    engine::{PlaneName, DEFAULT_PLANE_INFO},
     errors::Suggestion,
+    execution::{types::UnitLen, PlaneInfo, Point3d},
     lint::rule::{def_finding, Discovered, Finding},
     parsing::ast::types::{BinaryPart, Expr, LiteralValue, ObjectExpression, UnaryOperator},
     walk::Node,
@@ -28,136 +28,25 @@ use offsetPlane where possible.
 );
 
 pub fn lint_should_be_offset_plane(node: Node) -> Result<Vec<Discovered>> {
-    let Node::CallExpression(call) = node else {
+    let Some((call_source_range, plane_name, offset)) = start_sketch_on_check_specific_plane(node)? else {
         return Ok(vec![]);
     };
-
+    // We don't care about the default planes.
-    if call.inner.callee.inner.name.name != "startSketchOn" {
+    if offset == 0.0 {
         return Ok(vec![]);
     }
-
+    let suggestion = Suggestion {
-    if call.arguments.len() != 1 {
-        // we only look for single-argument object patterns, if there's more
-        // than that we don't have a plane decl
-        return Ok(vec![]);
-    }
-
-    let Expr::ObjectExpression(arg) = &call.arguments[0] else {
-        return Ok(vec![]);
-    };
-
-    let mut origin: Option<(f64, f64, f64)> = None;
-    let mut x_vec: Option<(f64, f64, f64)> = None;
-    let mut y_vec: Option<(f64, f64, f64)> = None;
-
-    for property in &arg.inner.properties {
-        let Expr::ObjectExpression(ref point) = property.inner.value else {
-            return Ok(vec![]);
-        };
-
-        let Some((x, y, z)) = get_xyz(&point.inner) else {
-            return Ok(vec![]);
-        };
-
-        let property_name = &property.inner.key.inner.name;
-
-        match property_name.as_str() {
-            "origin" => origin = Some((x, y, z)),
-            "xAxis" => x_vec = Some((x, y, z)),
-            "yAxis" => y_vec = Some((x, y, z)),
-            _ => {
-                continue;
-            }
-        };
-    }
-
-    let Some(origin) = origin else { return Ok(vec![]) };
-    let Some(x_vec) = x_vec else { return Ok(vec![]) };
-    let Some(y_vec) = y_vec else { return Ok(vec![]) };
-
-    if [origin.0, origin.1, origin.2].iter().filter(|v| **v == 0.0).count() < 2 {
-        return Ok(vec![]);
-    }
-    // two of the origin values are 0, 0; let's work it out and check
-    // what's **up**
-
-    /// This will attempt to very poorly translate orientation to a letter
-    /// if it's possible to do so. The engine will norm these vectors, so
-    /// we'll just use logic off 0 for now, but this sucks, generally speaking.
-    fn vector_to_letter<'a>(x: f64, y: f64, z: f64) -> Option<&'a str> {
-        if x > 0.0 && y == 0.0 && z == 0.0 {
-            return Some("X");
-        }
-        if x < 0.0 && y == 0.0 && z == 0.0 {
-            return Some("-X");
-        }
-
-        if x == 0.0 && y > 0.0 && z == 0.0 {
-            return Some("Y");
-        }
-        if x == 0.0 && y < 0.0 && z == 0.0 {
-            return Some("-Y");
-        }
-
-        if x == 0.0 && y == 0.0 && z > 0.0 {
-            return Some("Z");
-        }
-        if x == 0.0 && y == 0.0 && z < 0.0 {
-            return Some("-Z");
-        }
-
-        None
-    }
-
-    let allowed_planes = HashMap::from([
-        // allowed built-in planes
-        ("XY".to_owned(), true),
-        ("-XY".to_owned(), true),
-        ("XZ".to_owned(), true),
-        ("-XZ".to_owned(), true),
-        ("YZ".to_owned(), true),
-        ("-YZ".to_owned(), true),
-    ]);
-    // Currently, the engine **ONLY** accepts[1] the following:
-    //
-    // XY
-    // -XY
-    // XZ
-    // -XZ
-    // YZ
-    // -YZ
-    //
-    // [1]: https://zoo.dev/docs/kcl/types/PlaneData
-
-    let plane_name = format!(
-        "{}{}",
-        vector_to_letter(x_vec.0, x_vec.1, x_vec.2).unwrap_or(""),
-        vector_to_letter(y_vec.0, y_vec.1, y_vec.2).unwrap_or(""),
-    );
-
-    if !allowed_planes.contains_key(&plane_name) {
-        return Ok(vec![]);
-    };
-
-    let call_source_range = SourceRange::new(
-        call.arguments[0].start(),
-        call.arguments[0].end(),
-        call.arguments[0].module_id(),
-    );
-
-    let offset = get_offset(origin, x_vec, y_vec);
-    let suggestion = offset.map(|offset| Suggestion {
         title: "use offsetPlane instead".to_owned(),
         insert: format!("offsetPlane({}, offset = {})", plane_name, offset),
         source_range: call_source_range,
-    });
+    };
     Ok(vec![Z0003.at(
         format!(
             "custom plane in startSketchOn; offsetPlane from {} would work here",
             plane_name
         ),
         call_source_range,
-        suggestion,
+        Some(suggestion),
     )])
 }
 
@@ -205,35 +94,172 @@ fn get_xyz(point: &ObjectExpression) -> Option<(f64, f64, f64)> {
     Some((x?, y?, z?))
 }
 
-fn get_offset(origin: (f64, f64, f64), x_axis: (f64, f64, f64), y_axis: (f64, f64, f64)) -> Option<f64> {
+fn get_offset(info: &PlaneInfo) -> Option<f64> {
     // Check which number is not a 1 or -1, or zero.
     // Return that back out since that is the offset.
 
     // This is a bit of a hack, but it works for now.
     // We can do better later.
-    if origin.0 != 1.0 && origin.0 != -1.0 && origin.0 != 0.0 {
+    if info.origin.x != 1.0 && info.origin.x != -1.0 && info.origin.x != 0.0 {
-        return Some(origin.0);
+        return Some(info.origin.x);
-    } else if origin.1 != 1.0 && origin.1 != -1.0 && origin.1 != 0.0 {
+    } else if info.origin.y != 1.0 && info.origin.y != -1.0 && info.origin.y != 0.0 {
-        return Some(origin.1);
+        return Some(info.origin.y);
-    } else if origin.2 != 1.0 && origin.2 != -1.0 && origin.2 != 0.0 {
+    } else if info.origin.z != 1.0 && info.origin.z != -1.0 && info.origin.z != 0.0 {
-        return Some(origin.2);
+        return Some(info.origin.z);
-    } else if x_axis.0 != 1.0 && x_axis.0 != -1.0 && x_axis.0 != 0.0 {
+    } else if info.x_axis.x != 1.0 && info.x_axis.x != -1.0 && info.x_axis.x != 0.0 {
-        return Some(x_axis.0);
+        return Some(info.x_axis.x);
-    } else if x_axis.1 != 1.0 && x_axis.1 != -1.0 && x_axis.1 != 0.0 {
+    } else if info.x_axis.y != 1.0 && info.x_axis.y != -1.0 && info.x_axis.y != 0.0 {
-        return Some(x_axis.1);
+        return Some(info.x_axis.y);
-    } else if x_axis.2 != 1.0 && x_axis.2 != -1.0 && x_axis.2 != 0.0 {
+    } else if info.x_axis.z != 1.0 && info.x_axis.z != -1.0 && info.x_axis.z != 0.0 {
-        return Some(x_axis.2);
+        return Some(info.x_axis.z);
-    } else if y_axis.0 != 1.0 && y_axis.0 != -1.0 && y_axis.0 != 0.0 {
+    } else if info.y_axis.x != 1.0 && info.y_axis.x != -1.0 && info.y_axis.x != 0.0 {
-        return Some(y_axis.0);
+        return Some(info.y_axis.x);
-    } else if y_axis.1 != 1.0 && y_axis.1 != -1.0 && y_axis.1 != 0.0 {
+    } else if info.y_axis.y != 1.0 && info.y_axis.y != -1.0 && info.y_axis.y != 0.0 {
-        return Some(y_axis.1);
+        return Some(info.y_axis.y);
-    } else if y_axis.2 != 1.0 && y_axis.2 != -1.0 && y_axis.2 != 0.0 {
+    } else if info.y_axis.z != 1.0 && info.y_axis.z != -1.0 && info.y_axis.z != 0.0 {
-        return Some(y_axis.2);
+        return Some(info.y_axis.z);
     }
 
     None
 }
 
+pub fn start_sketch_on_check_specific_plane(node: Node) -> Result<Option<(SourceRange, PlaneName, f64)>> {
+    let Node::CallExpression(call) = node else {
+        return Ok(None);
+    };
+
+    if call.inner.callee.inner.name.name != "startSketchOn" {
+        return Ok(None);
+    }
+
+    if call.arguments.len() != 1 {
+        // we only look for single-argument object patterns, if there's more
+        // than that we don't have a plane decl
+        return Ok(None);
+    }
+
+    let call_source_range = SourceRange::new(
+        call.arguments[0].start(),
+        call.arguments[0].end(),
+        call.arguments[0].module_id(),
+    );
+
+    let Expr::ObjectExpression(arg) = &call.arguments[0] else {
+        return Ok(None);
+    };
+
+    let mut origin: Option<Point3d> = None;
+    let mut x_vec: Option<Point3d> = None;
+    let mut y_vec: Option<Point3d> = None;
+
+    for property in &arg.inner.properties {
+        let Expr::ObjectExpression(ref point) = property.inner.value else {
+            return Ok(None);
+        };
+
+        let Some((x, y, z)) = get_xyz(&point.inner) else {
+            return Ok(None);
+        };
+
+        let property_name = &property.inner.key.inner.name;
+
+        match property_name.as_str() {
+            "origin" => {
+                origin = Some(Point3d {
+                    x,
+                    y,
+                    z,
+                    units: UnitLen::Mm,
+                })
+            }
+            "xAxis" => {
+                x_vec = Some(Point3d {
+                    x,
+                    y,
+                    z,
+                    units: UnitLen::Unknown,
+                })
+            }
+            "yAxis" => {
+                y_vec = Some(Point3d {
+                    x,
+                    y,
+                    z,
+                    units: UnitLen::Unknown,
+                })
+            }
+            _ => {
+                continue;
+            }
+        };
+    }
+
+    let (Some(origin), Some(x_vec), Some(y_vec)) = (origin, x_vec, y_vec) else {
+        return Ok(None);
+    };
+
+    if [origin.x, origin.y, origin.z].iter().filter(|v| **v == 0.0).count() < 2 {
+        return Ok(None);
+    }
+
+    let plane_info = PlaneInfo {
+        origin,
+        x_axis: x_vec,
+        y_axis: y_vec,
+    };
+
+    // Return early if we have a default plane.
+    if let Some((name, _)) = DEFAULT_PLANE_INFO.iter().find(|(_, plane)| **plane == plane_info) {
+        return Ok(Some((call_source_range, *name, 0.0)));
+    }
+
+    let normalized_plane_info = normalize_plane_info(&plane_info);
+
+    println!("normalized plane info: {:?}", normalized_plane_info);
+
+    // Check our default planes.
+    let Some((matched_plane_name, _)) = DEFAULT_PLANE_INFO
+        .iter()
+        .find(|(_, plane)| **plane == normalized_plane_info)
+    else {
+        return Ok(None);
+    };
+
+    let Some(offset) = get_offset(&plane_info) else {
+        return Ok(None);
+    };
+
+    Ok(Some((call_source_range, *matched_plane_name, offset)))
+}
+
+// Clone the plane info and normalize any number that is not zero to 1.0 or -1.0 (if negative)
+// so we can compare it to the built-in planes.
+fn normalize_plane_info(plane_info: &PlaneInfo) -> PlaneInfo {
+    let mut normalized_plane_info = plane_info.clone();
+    normalized_plane_info.origin = Point3d {
+        x: 0.0,
+        y: 0.0,
+        z: 0.0,
+        units: normalized_plane_info.origin.units,
+    };
+    normalized_plane_info.y_axis.x = if normalized_plane_info.y_axis.x != 0.0 {
+        normalized_plane_info.y_axis.x.signum()
+    } else {
+        0.0
+    };
+    normalized_plane_info.y_axis.y = if normalized_plane_info.y_axis.y != 0.0 {
+        normalized_plane_info.y_axis.y.signum()
+    } else {
+        0.0
+    };
+    normalized_plane_info.y_axis.z = if normalized_plane_info.y_axis.z != 0.0 {
+        normalized_plane_info.y_axis.z.signum()
+    } else {
+        0.0
+    };
+    normalized_plane_info
+}
+
 #[cfg(test)]
 mod tests {
     use super::{lint_should_be_offset_plane, Z0003};
@@ -265,6 +291,19 @@ startSketchOn({
     xAxis = { x = 1, y = 0, z = 0 },
     yAxis = { x = 0, y = 0, z = 1 },
 })
+"
+    );
+
+    test_no_finding!(
+        z0003_default_plane,
+        lint_should_be_offset_plane,
+        Z0003,
+        "\
+startSketchOn({
+    origin = { x = 0, y = 0, z = 0 },
+    xAxis = { x = 1, y = 0, z = 0 },
+    yAxis = { x = 0, y = 0, z = 1 },
+})
 "
     );
 }

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

@@ -323,6 +323,7 @@ impl Node<Program> {
         let rules = vec![
             crate::lint::checks::lint_variables,
             crate::lint::checks::lint_object_properties,
+            crate::lint::checks::lint_should_be_default_plane,
             crate::lint::checks::lint_should_be_offset_plane,
         ];
 

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

@@ -15,8 +15,8 @@ use crate::{
     execution::{
         kcl_value::FunctionSource,
         types::{NumericType, PrimitiveType, RuntimeType, UnitAngle, UnitLen, UnitType},
-        ExecState, ExecutorContext, ExtrudeSurface, Helix, KclObjectFields, KclValue, Metadata, Sketch, SketchSurface,
+        ExecState, ExecutorContext, ExtrudeSurface, Helix, KclObjectFields, KclValue, Metadata, PlaneInfo, Sketch,
-        Solid, TagIdentifier,
+        SketchSurface, Solid, TagIdentifier,
     },
     parsing::ast::types::TagNode,
     source_range::SourceRange,
@@ -984,11 +984,11 @@ impl<'a> FromKclValue<'a> for super::sketch::PlaneData {
     fn from_kcl_val(arg: &'a KclValue) -> Option<Self> {
         // Case 0: actual plane
         if let KclValue::Plane { value } = arg {
-            return Some(Self::Plane {
+            return Some(Self::Plane(PlaneInfo {
-                origin: value.origin,
+                origin: value.info.origin,
-                x_axis: value.x_axis,
+                x_axis: value.info.x_axis,
-                y_axis: value.y_axis,
+                y_axis: value.info.y_axis,
-            });
+            }));
         }
         // Case 1: predefined plane
         if let Some(s) = arg.as_str() {
@@ -1008,7 +1008,7 @@ impl<'a> FromKclValue<'a> for super::sketch::PlaneData {
         let origin = plane.get("origin").and_then(FromKclValue::from_kcl_val)?;
         let x_axis = plane.get("xAxis").and_then(FromKclValue::from_kcl_val)?;
         let y_axis = plane.get("yAxis").and_then(FromKclValue::from_kcl_val)?;
-        Some(Self::Plane { origin, x_axis, y_axis })
+        Some(Self::Plane(PlaneInfo { origin, x_axis, y_axis }))
     }
 }
 

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

@@ -24,13 +24,13 @@ async fn inner_offset_plane(
     exec_state: &mut ExecState,
     args: &Args,
 ) -> Result<Plane, KclError> {
-    let mut plane = Plane::from_plane_data(plane, exec_state);
+    let mut plane = Plane::from_plane_data(plane, exec_state)?;
     // Though offset planes might be derived from standard planes, they are not
     // standard planes themselves.
     plane.value = PlaneType::Custom;
 
-    let normal = plane.x_axis.axes_cross_product(&plane.y_axis);
+    let normal = plane.info.x_axis.axes_cross_product(&plane.info.y_axis);
-    plane.origin += normal * offset.to_length_units(plane.origin.units);
+    plane.info.origin += normal * offset.to_length_units(plane.info.origin.units);
     make_offset_plane_in_engine(&plane, exec_state, args).await?;
 
     Ok(plane)
@@ -53,10 +53,10 @@ async fn make_offset_plane_in_engine(plane: &Plane, exec_state: &mut ExecState,
         plane.id,
         ModelingCmd::from(mcmd::MakePlane {
             clobber: false,
-            origin: plane.origin.into(),
+            origin: plane.info.origin.into(),
             size: LengthUnit(default_size),
-            x_axis: plane.x_axis.into(),
+            x_axis: plane.info.x_axis.into(),
-            y_axis: plane.y_axis.into(),
+            y_axis: plane.info.y_axis.into(),
             hide: Some(false),
         }),
     )

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

@@ -18,7 +18,7 @@ use crate::{
     errors::{KclError, KclErrorDetails},
     execution::{
         types::{ArrayLen, NumericType, PrimitiveType, RuntimeType, UnitLen},
-        BasePath, ExecState, Face, GeoMeta, KclValue, Path, Plane, Point2d, Point3d, Sketch, SketchSurface, Solid,
+        BasePath, ExecState, Face, GeoMeta, KclValue, Path, Plane, PlaneInfo, Point2d, Sketch, SketchSurface, Solid,
         TagEngineInfo, TagIdentifier,
     },
     parsing::ast::types::TagNode,
@@ -953,16 +953,7 @@ pub enum PlaneData {
     #[serde(rename = "-YZ", alias = "-yz")]
     NegYZ,
     /// A defined plane.
-    Plane {
+    Plane(PlaneInfo),
-        /// Origin of the plane.
-        origin: Point3d,
-        /// What should the plane’s X axis be?
-        #[serde(rename = "xAxis")]
-        x_axis: Point3d,
-        /// What should the plane’s Y axis be?
-        #[serde(rename = "yAxis")]
-        y_axis: Point3d,
-    },
 }
 
 /// Start a sketch on a specific plane or face.
@@ -1177,13 +1168,13 @@ async fn inner_start_sketch_on(
         }
         SketchData::Plane(plane) => {
             if plane.value == crate::exec::PlaneType::Uninit {
-                if plane.origin.units == UnitLen::Unknown {
+                if plane.info.origin.units == UnitLen::Unknown {
                     return Err(KclError::Semantic(KclErrorDetails {
                         message: "Origin of plane has unknown units".to_string(),
                         source_ranges: vec![args.source_range],
                     }));
                 }
-                let plane = make_sketch_plane_from_orientation(plane.into_plane_data(), exec_state, args).await?;
+                let plane = make_sketch_plane_from_orientation(plane.info.into_plane_data(), exec_state, args).await?;
                 Ok(SketchSurface::Plane(plane))
             } else {
                 // Create artifact used only by the UI, not the engine.
@@ -1252,7 +1243,7 @@ async fn make_sketch_plane_from_orientation(
     exec_state: &mut ExecState,
     args: &Args,
 ) -> Result<Box<Plane>, KclError> {
-    let plane = Plane::from_plane_data(data.clone(), exec_state);
+    let plane = Plane::from_plane_data(data.clone(), exec_state)?;
 
     // Create the plane on the fly.
     let clobber = false;
@@ -1262,10 +1253,10 @@ async fn make_sketch_plane_from_orientation(
         plane.id,
         ModelingCmd::from(mcmd::MakePlane {
             clobber,
-            origin: plane.origin.into(),
+            origin: plane.info.origin.into(),
             size,
-            x_axis: plane.x_axis.into(),
+            x_axis: plane.info.x_axis.into(),
-            y_axis: plane.y_axis.into(),
+            y_axis: plane.info.y_axis.into(),
             hide,
         }),
     )
@@ -1374,7 +1365,7 @@ pub(crate) async fn inner_start_profile(
                 adjust_camera: false,
                 planar_normal: if let SketchSurface::Plane(plane) = &sketch_surface {
                     // We pass in the normal for the plane here.
-                    let normal = plane.x_axis.axes_cross_product(&plane.y_axis);
+                    let normal = plane.info.x_axis.axes_cross_product(&plane.info.y_axis);
                     Some(normal.into())
                 } else {
                     None

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

@@ -185,10 +185,8 @@ description: Variables in memory after executing angled_line.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -197,6 +195,8 @@ description: Variables in memory after executing angled_line.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

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

@@ -164,10 +164,8 @@ description: Variables in memory after executing artifact_graph_example_code1.kc
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -176,6 +174,8 @@ description: Variables in memory after executing artifact_graph_example_code1.kc
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -546,10 +546,8 @@ description: Variables in memory after executing artifact_graph_example_code1.kc
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XY",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -558,6 +556,8 @@ description: Variables in memory after executing artifact_graph_example_code1.kc
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XY",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -799,10 +799,8 @@ description: Variables in memory after executing artifact_graph_example_code1.kc
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -811,6 +809,8 @@ description: Variables in memory after executing artifact_graph_example_code1.kc
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -1126,10 +1126,8 @@ description: Variables in memory after executing artifact_graph_example_code1.kc
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1138,6 +1136,8 @@ description: Variables in memory after executing artifact_graph_example_code1.kc
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,

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

@@ -139,10 +139,8 @@ description: Variables in memory after executing artifact_graph_example_code_no_
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "YZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -151,6 +149,8 @@ description: Variables in memory after executing artifact_graph_example_code_no_
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "YZ",
         "xAxis": {
           "x": 0.0,
           "y": 1.0,
@@ -282,10 +282,8 @@ description: Variables in memory after executing artifact_graph_example_code_no_
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -294,6 +292,8 @@ description: Variables in memory after executing artifact_graph_example_code_no_
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": -1.0,
           "y": 0.0,

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

@@ -6,9 +6,8 @@ description: Variables in memory after executing artifact_graph_example_code_off
   "offsetPlane001": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "Custom",
+      "id": "[uuid]",
       "origin": {
         "x": 0.0,
         "y": 0.0,
@@ -17,6 +16,7 @@ description: Variables in memory after executing artifact_graph_example_code_off
           "type": "Mm"
         }
       },
+      "value": "Custom",
       "xAxis": {
         "x": 1.0,
         "y": 0.0,
@@ -38,9 +38,8 @@ description: Variables in memory after executing artifact_graph_example_code_off
   "offsetPlane002": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "Custom",
+      "id": "[uuid]",
       "origin": {
         "x": 0.0,
         "y": 50.0,
@@ -49,6 +48,7 @@ description: Variables in memory after executing artifact_graph_example_code_off
           "type": "Mm"
         }
       },
+      "value": "Custom",
       "xAxis": {
         "x": 1.0,
         "y": 0.0,
@@ -70,9 +70,8 @@ description: Variables in memory after executing artifact_graph_example_code_off
   "offsetPlane003": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "Custom",
+      "id": "[uuid]",
       "origin": {
         "x": 10.0,
         "y": 0.0,
@@ -81,6 +80,7 @@ description: Variables in memory after executing artifact_graph_example_code_off
           "type": "Mm"
         }
       },
+      "value": "Custom",
       "xAxis": {
         "x": 0.0,
         "y": 1.0,
@@ -126,10 +126,8 @@ description: Variables in memory after executing artifact_graph_example_code_off
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "Custom",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -138,6 +136,8 @@ description: Variables in memory after executing artifact_graph_example_code_off
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "Custom",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,

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

@@ -126,10 +126,8 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -138,6 +136,8 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -446,10 +446,8 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -458,6 +456,8 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -943,10 +943,8 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                       }
                     ],
                     "on": {
-                      "type": "plane",
-                      "id": "[uuid]",
                       "artifactId": "[uuid]",
-                      "value": "XZ",
+                      "id": "[uuid]",
                       "origin": {
                         "x": 0.0,
                         "y": 0.0,
@@ -955,6 +953,8 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                           "type": "Mm"
                         }
                       },
+                      "type": "plane",
+                      "value": "XZ",
                       "xAxis": {
                         "x": 1.0,
                         "y": 0.0,
@@ -1611,10 +1611,8 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                             }
                           ],
                           "on": {
-                            "type": "plane",
-                            "id": "[uuid]",
                             "artifactId": "[uuid]",
-                            "value": "XZ",
+                            "id": "[uuid]",
                             "origin": {
                               "x": 0.0,
                               "y": 0.0,
@@ -1623,6 +1621,8 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                                 "type": "Mm"
                               }
                             },
+                            "type": "plane",
+                            "value": "XZ",
                             "xAxis": {
                               "x": 1.0,
                               "y": 0.0,
@@ -1893,10 +1893,8 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -1905,6 +1903,8 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -2178,10 +2178,8 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -2190,6 +2188,8 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -2634,10 +2634,8 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XZ",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -2646,6 +2644,8 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XZ",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -3267,10 +3267,8 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                           }
                         ],
                         "on": {
-                          "type": "plane",
-                          "id": "[uuid]",
                           "artifactId": "[uuid]",
-                          "value": "XZ",
+                          "id": "[uuid]",
                           "origin": {
                             "x": 0.0,
                             "y": 0.0,
@@ -3279,6 +3277,8 @@ description: Variables in memory after executing artifact_graph_sketch_on_face_e
                               "type": "Mm"
                             }
                           },
+                          "type": "plane",
+                          "value": "XZ",
                           "xAxis": {
                             "x": 1.0,
                             "y": 0.0,

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

@@ -157,10 +157,8 @@ description: Variables in memory after executing basic_fillet_cube_close_opposit
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -169,6 +167,8 @@ description: Variables in memory after executing basic_fillet_cube_close_opposit
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

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

@@ -145,10 +145,8 @@ description: Variables in memory after executing basic_fillet_cube_end.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -157,6 +155,8 @@ description: Variables in memory after executing basic_fillet_cube_end.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

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

@@ -169,10 +169,8 @@ description: Variables in memory after executing basic_fillet_cube_next_adjacent
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -181,6 +179,8 @@ description: Variables in memory after executing basic_fillet_cube_next_adjacent
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

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

@@ -169,10 +169,8 @@ description: Variables in memory after executing basic_fillet_cube_previous_adja
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -181,6 +179,8 @@ description: Variables in memory after executing basic_fillet_cube_previous_adja
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

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

@@ -145,10 +145,8 @@ description: Variables in memory after executing basic_fillet_cube_start.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -157,6 +155,8 @@ description: Variables in memory after executing basic_fillet_cube_start.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

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

@@ -55,10 +55,8 @@ description: Variables in memory after executing circle_three_point.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -67,6 +65,8 @@ description: Variables in memory after executing circle_three_point.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

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

@@ -215,10 +215,8 @@ description: Variables in memory after executing clone_w_fillets.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -227,6 +225,8 @@ description: Variables in memory after executing clone_w_fillets.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -482,10 +482,8 @@ description: Variables in memory after executing clone_w_fillets.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -494,6 +492,8 @@ description: Variables in memory after executing clone_w_fillets.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -670,10 +670,8 @@ description: Variables in memory after executing clone_w_fillets.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -682,6 +680,8 @@ description: Variables in memory after executing clone_w_fillets.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,

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

@@ -121,10 +121,8 @@ description: Variables in memory after executing clone_w_shell.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -133,6 +131,8 @@ description: Variables in memory after executing clone_w_shell.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -301,10 +301,8 @@ description: Variables in memory after executing clone_w_shell.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -313,6 +311,8 @@ description: Variables in memory after executing clone_w_shell.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -452,10 +452,8 @@ description: Variables in memory after executing clone_w_shell.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -464,6 +462,8 @@ description: Variables in memory after executing clone_w_shell.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

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

@@ -138,10 +138,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -150,6 +148,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -474,10 +474,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -486,6 +484,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -731,10 +731,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -743,6 +741,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": -1.0,
             "y": 0.0,
@@ -895,10 +895,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -907,6 +905,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -1158,10 +1158,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1170,6 +1168,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -1520,10 +1520,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1532,6 +1530,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -1863,10 +1863,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1875,6 +1873,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -2149,10 +2149,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -2161,6 +2159,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -2486,10 +2486,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -2498,6 +2496,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -2632,10 +2632,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -2644,6 +2642,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": -1.0,
           "y": 0.0,
@@ -2770,10 +2770,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -2782,6 +2780,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": -1.0,
           "y": 0.0,
@@ -2908,10 +2908,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -2920,6 +2918,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": -1.0,
           "y": 0.0,
@@ -2995,10 +2995,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -3007,6 +3005,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": -1.0,
           "y": 0.0,
@@ -3158,10 +3158,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -3170,6 +3168,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": -1.0,
           "y": 0.0,
@@ -3470,10 +3470,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -3482,6 +3480,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -3689,10 +3689,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -3701,6 +3699,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": -1.0,
             "y": 0.0,
@@ -3764,9 +3764,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
   "sketch001": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "XZ",
+      "id": "[uuid]",
       "origin": {
         "x": 0.0,
         "y": 0.0,
@@ -3775,6 +3774,7 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "type": "Mm"
         }
       },
+      "value": "XZ",
       "xAxis": {
         "x": 1.0,
         "y": 0.0,
@@ -3948,10 +3948,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
             }
           ],
           "on": {
-            "type": "plane",
-            "id": "[uuid]",
             "artifactId": "[uuid]",
-            "value": "XZ",
+            "id": "[uuid]",
             "origin": {
               "x": 0.0,
               "y": 0.0,
@@ -3960,6 +3958,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
                 "type": "Mm"
               }
             },
+            "type": "plane",
+            "value": "XZ",
             "xAxis": {
               "x": 1.0,
               "y": 0.0,
@@ -4027,9 +4027,8 @@ description: Variables in memory after executing crazy_multi_profile.kcl
   "sketch003": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "XZ",
+      "id": "[uuid]",
       "origin": {
         "x": 0.0,
         "y": 0.0,
@@ -4038,6 +4037,7 @@ description: Variables in memory after executing crazy_multi_profile.kcl
           "type": "Mm"
         }
       },
+      "value": "XZ",
       "xAxis": {
         "x": -1.0,
         "y": 0.0,

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

@@ -143,10 +143,8 @@ description: Variables in memory after executing cube.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -155,6 +153,8 @@ description: Variables in memory after executing cube.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

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

@@ -182,10 +182,8 @@ description: Variables in memory after executing fillet-and-shell.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -194,6 +192,8 @@ description: Variables in memory after executing fillet-and-shell.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -573,10 +573,8 @@ description: Variables in memory after executing fillet-and-shell.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -585,6 +583,8 @@ description: Variables in memory after executing fillet-and-shell.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,

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

@@ -65,10 +65,8 @@ description: Variables in memory after executing flush_batch_on_end.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -77,6 +75,8 @@ description: Variables in memory after executing flush_batch_on_end.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -190,10 +190,8 @@ description: Variables in memory after executing flush_batch_on_end.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -202,6 +200,8 @@ description: Variables in memory after executing flush_batch_on_end.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -308,10 +308,8 @@ description: Variables in memory after executing flush_batch_on_end.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -320,6 +318,8 @@ description: Variables in memory after executing flush_batch_on_end.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -415,10 +415,8 @@ description: Variables in memory after executing flush_batch_on_end.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -427,6 +425,8 @@ description: Variables in memory after executing flush_batch_on_end.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -478,9 +478,8 @@ description: Variables in memory after executing flush_batch_on_end.kcl
   "sketch000": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "XY",
+      "id": "[uuid]",
       "origin": {
         "x": 0.0,
         "y": 0.0,
@@ -489,6 +488,7 @@ description: Variables in memory after executing flush_batch_on_end.kcl
           "type": "Mm"
         }
       },
+      "value": "XY",
       "xAxis": {
         "x": 1.0,
         "y": 0.0,

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

@@ -124,10 +124,8 @@ description: Variables in memory after executing function_sketch.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -136,6 +134,8 @@ description: Variables in memory after executing function_sketch.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

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

@@ -124,10 +124,8 @@ description: Variables in memory after executing function_sketch_with_position.k
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -136,6 +134,8 @@ description: Variables in memory after executing function_sketch_with_position.k
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

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

@@ -55,10 +55,8 @@ description: Variables in memory after executing helix_simple.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -67,6 +65,8 @@ description: Variables in memory after executing helix_simple.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,

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

@@ -546,10 +546,8 @@ description: Variables in memory after executing i_shape.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -558,6 +556,8 @@ description: Variables in memory after executing i_shape.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -1387,10 +1387,8 @@ description: Variables in memory after executing i_shape.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -1399,6 +1397,8 @@ description: Variables in memory after executing i_shape.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -1661,10 +1661,8 @@ description: Variables in memory after executing i_shape.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -1673,6 +1671,8 @@ description: Variables in memory after executing i_shape.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,

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

@@ -998,10 +998,8 @@ description: Variables in memory after executing import_async.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -1010,6 +1008,8 @@ description: Variables in memory after executing import_async.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -2076,10 +2076,8 @@ description: Variables in memory after executing import_async.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XY",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -2088,6 +2086,8 @@ description: Variables in memory after executing import_async.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XY",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -3607,10 +3607,8 @@ description: Variables in memory after executing import_async.kcl
       "id": "[uuid]",
       "paths": [],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -3619,6 +3617,8 @@ description: Variables in memory after executing import_async.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -3673,9 +3673,8 @@ description: Variables in memory after executing import_async.kcl
   "surface001": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "XY",
+      "id": "[uuid]",
       "origin": {
         "x": 0.0,
         "y": 0.0,
@@ -3684,6 +3683,7 @@ description: Variables in memory after executing import_async.kcl
           "type": "Mm"
         }
       },
+      "value": "XY",
       "xAxis": {
         "x": 1.0,
         "y": 0.0,
@@ -7600,10 +7600,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -7612,6 +7610,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -11557,10 +11557,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -11569,6 +11567,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -15514,10 +15514,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -15526,6 +15524,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -19471,10 +19471,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -19483,6 +19481,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -23428,10 +23428,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -23440,6 +23438,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -27385,10 +27385,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -27397,6 +27395,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -31342,10 +31342,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -31354,6 +31352,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -35299,10 +35299,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -35311,6 +35309,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -39256,10 +39256,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -39268,6 +39266,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -43213,10 +43213,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -43225,6 +43223,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -47170,10 +47170,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -47182,6 +47180,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -51127,10 +51127,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -51139,6 +51137,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -55084,10 +55084,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -55096,6 +55094,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -59041,10 +59041,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -59053,6 +59051,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -62998,10 +62998,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -63010,6 +63008,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -66955,10 +66955,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -66967,6 +66965,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -70912,10 +70912,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -70924,6 +70922,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -74869,10 +74869,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -74881,6 +74879,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -78826,10 +78826,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -78838,6 +78836,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -82783,10 +82783,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -82795,6 +82793,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -86740,10 +86740,8 @@ description: Variables in memory after executing import_async.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -86752,6 +86750,8 @@ description: Variables in memory after executing import_async.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,

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

@@ -49,10 +49,8 @@ description: Variables in memory after executing import_whole.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -61,6 +59,8 @@ description: Variables in memory after executing import_whole.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

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

@@ -124,10 +124,8 @@ description: Variables in memory after executing intersect_cubes.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -136,6 +134,8 @@ description: Variables in memory after executing intersect_cubes.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -304,10 +304,8 @@ description: Variables in memory after executing intersect_cubes.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -316,6 +314,8 @@ description: Variables in memory after executing intersect_cubes.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -484,10 +484,8 @@ description: Variables in memory after executing intersect_cubes.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -496,6 +494,8 @@ description: Variables in memory after executing intersect_cubes.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

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

@@ -7,7 +7,7 @@ flowchart LR
     33["Segment<br>[556, 673, 8]"]
     34["Segment<br>[679, 764, 8]"]
     35["Segment<br>[770, 777, 8]"]
-    110[Solid2d]
+    108[Solid2d]
   end
   subgraph path9 [Path]
     9["Path<br>[801, 836, 8]"]
@@ -17,22 +17,22 @@ flowchart LR
   subgraph path10 [Path]
     10["Path<br>[861, 1008, 8]"]
     37["Segment<br>[861, 1008, 8]"]
-    117[Solid2d]
+    118[Solid2d]
   end
   subgraph path11 [Path]
     11["Path<br>[1033, 1181, 8]"]
     38["Segment<br>[1033, 1181, 8]"]
-    99[Solid2d]
+    101[Solid2d]
   end
   subgraph path12 [Path]
     12["Path<br>[1206, 1354, 8]"]
     39["Segment<br>[1206, 1354, 8]"]
-    112[Solid2d]
+    113[Solid2d]
   end
   subgraph path13 [Path]
     13["Path<br>[1379, 1528, 8]"]
     40["Segment<br>[1379, 1528, 8]"]
-    113[Solid2d]
+    114[Solid2d]
   end
   subgraph path14 [Path]
     14["Path<br>[1696, 1752, 8]"]
@@ -45,7 +45,7 @@ flowchart LR
     47["Segment<br>[2132, 2164, 8]"]
     48["Segment<br>[2170, 2235, 8]"]
     49["Segment<br>[2241, 2248, 8]"]
-    98[Solid2d]
+    99[Solid2d]
   end
   subgraph path15 [Path]
     15["Path<br>[2597, 2710, 8]"]
@@ -61,7 +61,7 @@ flowchart LR
   subgraph path16 [Path]
     16["Path<br>[3290, 3341, 8]"]
     58["Segment<br>[3290, 3341, 8]"]
-    109[Solid2d]
+    107[Solid2d]
   end
   subgraph path17 [Path]
     17["Path<br>[3520, 3582, 8]"]
@@ -75,7 +75,7 @@ flowchart LR
   subgraph path18 [Path]
     18["Path<br>[4013, 4064, 8]"]
     64["Segment<br>[4013, 4064, 8]"]
-    101[Solid2d]
+    103[Solid2d]
   end
   subgraph path19 [Path]
     19["Path<br>[4089, 4236, 8]"]
@@ -85,37 +85,37 @@ flowchart LR
   subgraph path20 [Path]
     20["Path<br>[4261, 4409, 8]"]
     66["Segment<br>[4261, 4409, 8]"]
-    100[Solid2d]
+    102[Solid2d]
   end
   subgraph path21 [Path]
     21["Path<br>[4434, 4582, 8]"]
     67["Segment<br>[4434, 4582, 8]"]
-    115[Solid2d]
+    116[Solid2d]
   end
   subgraph path22 [Path]
     22["Path<br>[4607, 4756, 8]"]
     68["Segment<br>[4607, 4756, 8]"]
-    114[Solid2d]
+    115[Solid2d]
   end
   subgraph path23 [Path]
     23["Path<br>[4898, 4936, 8]"]
     69["Segment<br>[4898, 4936, 8]"]
-    116[Solid2d]
+    117[Solid2d]
   end
   subgraph path24 [Path]
     24["Path<br>[5009, 5045, 8]"]
     70["Segment<br>[5009, 5045, 8]"]
-    111[Solid2d]
+    110[Solid2d]
   end
   subgraph path25 [Path]
     25["Path<br>[277, 327, 10]"]
     71["Segment<br>[277, 327, 10]"]
-    107[Solid2d]
+    111[Solid2d]
   end
   subgraph path26 [Path]
     26["Path<br>[502, 537, 10]"]
     72["Segment<br>[502, 537, 10]"]
-    108[Solid2d]
+    112[Solid2d]
   end
   subgraph path27 [Path]
     27["Path<br>[216, 255, 11]"]
@@ -132,30 +132,30 @@ flowchart LR
     83["Segment<br>[665, 702, 11]"]
     84["Segment<br>[708, 745, 11]"]
     85["Segment<br>[751, 758, 11]"]
-    97[Solid2d]
+    98[Solid2d]
   end
   subgraph path28 [Path]
     28["Path<br>[1113, 1215, 11]"]
-    86["Segment<br>[1223, 1292, 11]"]
+    95["Segment<br>[2205, 2212, 11]"]
-    88["Segment<br>[1300, 1624, 11]"]
+    97[Solid2d]
-    90["Segment<br>[1632, 1958, 11]"]
-    93["Segment<br>[1966, 2197, 11]"]
-    96["Segment<br>[2205, 2212, 11]"]
-    102[Solid2d]
   end
   subgraph path29 [Path]
     29["Path<br>[1113, 1215, 11]"]
-    87["Segment<br>[1223, 1292, 11]"]
+    86["Segment<br>[1223, 1292, 11]"]
-    89["Segment<br>[1300, 1624, 11]"]
+    88["Segment<br>[1300, 1624, 11]"]
     91["Segment<br>[1632, 1958, 11]"]
-    92["Segment<br>[1966, 2197, 11]"]
+    93["Segment<br>[1966, 2197, 11]"]
-    95["Segment<br>[2205, 2212, 11]"]
+    96["Segment<br>[2205, 2212, 11]"]
-    103[Solid2d]
+    100[Solid2d]
   end
   subgraph path30 [Path]
     30["Path<br>[1113, 1215, 11]"]
+    87["Segment<br>[1223, 1292, 11]"]
+    89["Segment<br>[1300, 1624, 11]"]
+    90["Segment<br>[1632, 1958, 11]"]
+    92["Segment<br>[1966, 2197, 11]"]
     94["Segment<br>[2205, 2212, 11]"]
-    118[Solid2d]
+    109[Solid2d]
   end
   1["Plane<br>[300, 317, 8]"]
   2["Plane<br>[204, 231, 10]"]
@@ -333,25 +333,25 @@ flowchart LR
   3 --- 26
   4 --- 27
   5 --- 28
-  6 --- 29
+  6 --- 30
-  7 --- 30
+  7 --- 29
   8 --- 31
   8 --- 32
   8 --- 33
   8 --- 34
   8 --- 35
-  8 --- 110
+  8 --- 108
   8 ---- 119
   9 --- 36
   9 --- 104
   10 --- 37
-  10 --- 117
+  10 --- 118
   11 --- 38
-  11 --- 99
+  11 --- 101
   12 --- 39
-  12 --- 112
+  12 --- 113
   13 --- 40
-  13 --- 113
+  13 --- 114
   14 --- 41
   14 --- 42
   14 --- 43
@@ -361,9 +361,9 @@ flowchart LR
   14 --- 47
   14 --- 48
   14 --- 49
-  14 --- 98
+  14 --- 99
   14 ---- 123
-  188 --- 14
+  187 --- 14
   15 --- 50
   15 --- 51
   15 --- 52
@@ -373,11 +373,11 @@ flowchart LR
   15 --- 56
   15 --- 57
   15 ---- 124
-  188 --- 15
+  187 --- 15
   16 --- 58
-  16 --- 109
+  16 --- 107
   16 ---- 125
-  183 --- 16
+  184 --- 16
   17 --- 59
   17 --- 60
   17 --- 61
@@ -385,35 +385,35 @@ flowchart LR
   17 --- 63
   17 --- 105
   17 ---- 126
-  183 --- 17
+  184 --- 17
   18 --- 64
-  18 --- 101
+  18 --- 103
-  183 --- 18
+  184 --- 18
   19 --- 65
   19 --- 106
-  183 --- 19
+  184 --- 19
   20 --- 66
-  20 --- 100
+  20 --- 102
-  183 --- 20
+  184 --- 20
   21 --- 67
-  21 --- 115
+  21 --- 116
-  183 --- 21
+  184 --- 21
   22 --- 68
-  22 --- 114
+  22 --- 115
-  183 --- 22
+  184 --- 22
   23 --- 69
-  23 --- 116
+  23 --- 117
   23 ---- 127
-  188 --- 23
+  187 --- 23
   24 --- 70
-  24 --- 111
+  24 --- 110
   24 ---- 128
   182 --- 24
   25 --- 71
-  25 --- 107
+  25 --- 111
   25 ---- 129
   26 --- 72
-  26 --- 108
+  26 --- 112
   26 ---- 130
   27 --- 73
   27 --- 74
@@ -428,146 +428,146 @@ flowchart LR
   27 --- 83
   27 --- 84
   27 --- 85
-  27 --- 97
+  27 --- 98
   27 ---- 131
-  28 --- 86
+  28 --- 95
-  28 --- 88
+  28 --- 97
-  28 --- 90
+  28 x---> 132
-  28 --- 93
+  28 x--> 211
-  28 --- 96
+  28 x--> 212
-  28 --- 102
+  28 x--> 213
-  28 ---- 132
+  28 x--> 214
-  29 --- 87
+  29 --- 86
-  29 --- 89
+  29 --- 88
   29 --- 91
-  29 --- 92
+  29 --- 93
-  29 --- 95
+  29 --- 96
-  29 --- 103
+  29 --- 100
   29 x---> 132
+  30 --- 87
+  30 --- 89
+  30 --- 90
+  30 --- 92
   30 --- 94
-  30 --- 118
+  30 --- 109
-  30 x---> 132
+  30 ---- 132
-  30 x--> 201
+  31 --- 163
-  30 x--> 202
+  31 x--> 181
-  30 x--> 203
+  31 --- 208
-  30 x--> 204
+  31 --- 252
-  31 --- 166
+  32 --- 164
-  31 x--> 180
+  32 x--> 181
-  31 --- 211
+  32 --- 210
-  31 --- 255
+  32 --- 253
-  32 --- 167
+  33 --- 165
-  32 x--> 180
+  33 x--> 181
-  32 --- 213
+  33 --- 209
-  32 --- 256
+  33 --- 255
-  33 --- 168
+  34 --- 162
-  33 x--> 180
+  34 x--> 181
-  33 --- 212
+  34 --- 207
-  33 --- 258
+  34 --- 254
-  34 --- 165
+  41 --- 170
-  34 x--> 180
+  41 x--> 187
-  34 --- 210
+  41 --- 219
-  34 --- 257
+  41 --- 267
-  41 --- 169
+  42 --- 176
-  41 x--> 188
+  42 x--> 187
-  41 --- 218
+  42 --- 217
-  41 --- 266
+  42 --- 262
-  42 --- 175
+  43 --- 177
-  42 x--> 188
+  43 x--> 187
-  42 --- 216
+  43 --- 222
-  42 --- 261
+  43 --- 263
-  43 --- 176
+  44 --- 174
-  43 x--> 188
+  44 x--> 187
-  43 --- 221
+  44 --- 221
-  43 --- 262
+  44 --- 260
-  44 --- 173
+  45 --- 172
-  44 x--> 188
+  45 x--> 187
-  44 --- 220
+  45 --- 218
-  44 --- 259
+  45 --- 264
-  45 --- 171
+  46 --- 175
-  45 x--> 188
+  46 x--> 187
-  45 --- 217
+  46 --- 220
-  45 --- 263
+  46 --- 261
-  46 --- 174
+  47 --- 173
-  46 x--> 188
+  47 x--> 187
-  46 --- 219
+  47 --- 215
-  46 --- 260
+  47 --- 266
-  47 --- 172
+  48 --- 171
-  47 x--> 188
+  48 x--> 187
-  47 --- 214
+  48 --- 216
-  47 --- 265
+  48 --- 265
-  48 --- 170
+  50 --- 153
-  48 x--> 188
+  50 x--> 187
-  48 --- 215
+  50 --- 194
-  48 --- 264
+  50 --- 242
-  50 --- 152
+  51 --- 149
-  50 x--> 188
+  51 x--> 187
-  50 --- 193
+  51 --- 196
-  50 --- 241
+  51 --- 246
-  51 --- 148
+  52 --- 152
-  51 x--> 188
+  52 x--> 187
-  51 --- 195
+  52 --- 197
-  51 --- 245
+  52 --- 244
-  52 --- 151
+  53 --- 154
-  52 x--> 188
+  53 x--> 187
-  52 --- 196
+  53 --- 199
-  52 --- 243
+  53 --- 241
-  53 --- 153
+  54 --- 150
-  53 x--> 188
+  54 x--> 187
-  53 --- 198
+  54 --- 200
-  53 --- 240
+  54 --- 240
-  54 --- 149
+  55 --- 156
-  54 x--> 188
+  55 x--> 187
-  54 --- 199
+  55 --- 198
-  54 --- 239
+  55 --- 239
-  55 --- 155
+  56 --- 151
-  55 x--> 188
+  56 x--> 187
-  55 --- 197
+  56 --- 195
-  55 --- 238
+  56 --- 245
-  56 --- 150
+  57 --- 155
-  56 x--> 188
+  57 x--> 187
-  56 --- 194
+  57 --- 201
-  56 --- 244
+  57 --- 243
-  57 --- 154
-  57 x--> 188
-  57 --- 200
-  57 --- 242
   58 --- 133
-  58 x--> 183
+  58 x--> 184
   58 --- 190
   58 --- 223
-  59 --- 163
+  59 --- 161
-  59 x--> 178
+  59 x--> 180
-  59 --- 207
+  59 --- 205
-  59 --- 251
+  59 --- 249
-  60 --- 160
+  60 --- 158
-  60 x--> 178
+  60 x--> 180
-  60 --- 206
+  60 --- 204
-  60 --- 250
+  60 --- 248
-  61 --- 161
+  61 --- 159
-  61 x--> 178
+  61 x--> 180
-  61 --- 205
+  61 --- 203
-  61 --- 253
+  61 --- 251
-  62 --- 162
+  62 --- 160
-  62 x--> 178
+  62 x--> 180
-  62 --- 208
+  62 --- 206
-  62 --- 252
+  62 --- 250
   69 --- 135
-  69 x--> 188
+  69 x--> 187
   69 --- 192
   69 --- 225
   70 --- 134
   70 x--> 182
   70 --- 191
   70 --- 224
-  71 --- 177
+  71 --- 157
-  71 x--> 181
+  71 x--> 179
-  71 --- 222
+  71 --- 202
-  71 --- 267
+  71 --- 247
-  71 --- 276
+  71 --- 277
-  72 --- 164
+  72 --- 148
-  72 x--> 179
+  72 x--> 178
-  72 --- 209
+  72 --- 193
-  72 --- 254
+  72 --- 238
   131 <--x 73
   73 --- 144
   73 --- 231
@@ -604,37 +604,36 @@ flowchart LR
   131 <--x 84
   84 --- 147
   84 --- 233
-  86 --- 159
+  87 --- 169
-  86 x--> 185
+  87 x--> 188
-  86 --- 203
+  87 --- 212
-  86 --- 249
+  87 --- 257
-  88 --- 158
+  89 --- 168
-  88 x--> 185
+  89 x--> 188
-  88 --- 204
+  89 --- 214
-  88 --- 248
+  89 --- 258
-  90 --- 156
+  90 --- 167
-  90 x--> 185
+  90 x--> 188
-  90 --- 201
+  90 --- 211
-  90 --- 246
+  90 --- 256
-  93 --- 157
+  92 --- 166
-  93 x--> 185
+  92 x--> 188
-  93 --- 202
+  92 --- 213
-  93 --- 247
+  92 --- 259
+  119 --- 162
+  119 --- 163
+  119 --- 164
   119 --- 165
-  119 --- 166
+  119 --- 181
-  119 --- 167
+  119 --- 187
-  119 --- 168
+  119 --- 207
-  119 --- 180
+  119 --- 208
-  119 --- 188
+  119 --- 209
   119 --- 210
-  119 --- 211
+  119 --- 252
-  119 --- 212
+  119 --- 253
-  119 --- 213
+  119 --- 254
   119 --- 255
-  119 --- 256
-  119 --- 257
-  119 --- 258
-  123 --- 169
   123 --- 170
   123 --- 171
   123 --- 172
@@ -642,7 +641,7 @@ flowchart LR
   123 --- 174
   123 --- 175
   123 --- 176
-  123 --- 214
+  123 --- 177
   123 --- 215
   123 --- 216
   123 --- 217
@@ -650,7 +649,7 @@ flowchart LR
   123 --- 219
   123 --- 220
   123 --- 221
-  123 --- 259
+  123 --- 222
   123 --- 260
   123 --- 261
   123 --- 262
@@ -658,7 +657,7 @@ flowchart LR
   123 --- 264
   123 --- 265
   123 --- 266
-  124 --- 148
+  123 --- 267
   124 --- 149
   124 --- 150
   124 --- 151
@@ -666,8 +665,8 @@ flowchart LR
   124 --- 153
   124 --- 154
   124 --- 155
-  124 --- 183
+  124 --- 156
-  124 --- 193
+  124 --- 184
   124 --- 194
   124 --- 195
   124 --- 196
@@ -675,7 +674,7 @@ flowchart LR
   124 --- 198
   124 --- 199
   124 --- 200
-  124 --- 238
+  124 --- 201
   124 --- 239
   124 --- 240
   124 --- 241
@@ -683,23 +682,24 @@ flowchart LR
   124 --- 243
   124 --- 244
   124 --- 245
+  124 --- 246
   125 --- 133
   125 --- 190
   125 --- 223
+  126 --- 158
+  126 --- 159
   126 --- 160
   126 --- 161
-  126 --- 162
+  126 --- 180
-  126 --- 163
-  126 --- 178
   126 --- 186
+  126 --- 203
+  126 --- 204
   126 --- 205
   126 --- 206
-  126 --- 207
+  126 --- 248
-  126 --- 208
+  126 --- 249
   126 --- 250
   126 --- 251
-  126 --- 252
-  126 --- 253
   127 --- 135
   127 --- 182
   127 --- 192
@@ -707,16 +707,16 @@ flowchart LR
   128 --- 134
   128 --- 191
   128 --- 224
-  129 --- 177
+  129 --- 157
-  129 --- 181
+  129 --- 179
-  129 --- 189
+  129 --- 185
-  129 --- 222
+  129 --- 202
-  129 --- 267
+  129 --- 247
-  130 --- 164
+  130 --- 148
-  130 --- 179
+  130 --- 178
-  130 --- 187
+  130 --- 183
-  130 --- 209
+  130 --- 193
-  130 --- 254
+  130 --- 238
   131 --- 136
   131 --- 137
   131 --- 138
@@ -741,20 +741,20 @@ flowchart LR
   131 --- 235
   131 --- 236
   131 --- 237
-  132 --- 156
+  132 --- 166
-  132 --- 157
+  132 --- 167
-  132 --- 158
+  132 --- 168
-  132 --- 159
+  132 --- 169
-  132 --- 184
+  132 --- 188
-  132 --- 185
+  132 --- 189
-  132 --- 201
+  132 --- 211
-  132 --- 202
+  132 --- 212
-  132 --- 203
+  132 --- 213
-  132 --- 204
+  132 --- 214
-  132 --- 246
+  132 --- 256
-  132 --- 247
+  132 --- 257
-  132 --- 248
+  132 --- 258
-  132 --- 249
+  132 --- 259
   190 <--x 133
   223 <--x 133
   191 <--x 134
@@ -785,116 +785,116 @@ flowchart LR
   235 <--x 146
   229 <--x 147
   233 <--x 147
-  195 <--x 148
+  193 <--x 148
-  241 <--x 148
+  238 <--x 148
-  245 <--x 148
+  196 <--x 149
-  199 <--x 149
+  242 <--x 149
-  239 <--x 149
+  246 <--x 149
-  240 <--x 149
+  200 <--x 150
-  194 <--x 150
+  240 <--x 150
-  238 <--x 150
+  241 <--x 150
-  244 <--x 150
+  195 <--x 151
-  196 <--x 151
+  239 <--x 151
-  243 <--x 151
   245 <--x 151
-  193 <--x 152
+  197 <--x 152
-  241 <--x 152
+  244 <--x 152
-  242 <--x 152
+  246 <--x 152
-  198 <--x 153
+  194 <--x 153
-  240 <--x 153
+  242 <--x 153
   243 <--x 153
-  200 <--x 154
+  199 <--x 154
-  242 <--x 154
+  241 <--x 154
   244 <--x 154
-  197 <--x 155
+  201 <--x 155
-  238 <--x 155
+  243 <--x 155
-  239 <--x 155
+  245 <--x 155
-  201 <--x 156
+  198 <--x 156
-  246 <--x 156
+  239 <--x 156
-  247 <--x 156
+  240 <--x 156
-  202 <--x 157
   247 <--x 157
-  249 <--x 157
   204 <--x 158
-  246 <--x 158
-  248 <--x 158
   203 <--x 159
-  248 <--x 159
-  249 <--x 159
   206 <--x 160
   205 <--x 161
-  208 <--x 162
+  207 <--x 162
-  207 <--x 163
+  208 <--x 163
-  209 <--x 164
+  210 <--x 164
-  254 <--x 164
+  209 <--x 165
-  210 <--x 165
+  213 <--x 166
-  211 <--x 166
+  257 <--x 166
-  213 <--x 167
+  259 <--x 166
-  212 <--x 168
+  211 <--x 167
-  218 <--x 169
+  256 <--x 167
-  261 <--x 169
+  259 <--x 167
-  266 <--x 169
+  214 <--x 168
-  215 <--x 170
+  256 <--x 168
-  264 <--x 170
+  258 <--x 168
-  266 <--x 170
+  212 <--x 169
-  217 <--x 171
+  257 <--x 169
-  260 <--x 171
+  258 <--x 169
-  263 <--x 171
+  219 <--x 170
-  214 <--x 172
+  262 <--x 170
+  267 <--x 170
+  216 <--x 171
+  265 <--x 171
+  267 <--x 171
+  218 <--x 172
+  261 <--x 172
   264 <--x 172
-  265 <--x 172
+  215 <--x 173
-  220 <--x 173
+  265 <--x 173
-  259 <--x 173
+  266 <--x 173
-  263 <--x 173
+  221 <--x 174
-  219 <--x 174
   260 <--x 174
-  265 <--x 174
+  264 <--x 174
-  216 <--x 175
+  220 <--x 175
   261 <--x 175
-  262 <--x 175
+  266 <--x 175
-  221 <--x 176
+  217 <--x 176
-  259 <--x 176
   262 <--x 176
-  267 <--x 177
+  263 <--x 176
-  214 <--x 180
+  222 <--x 177
-  215 <--x 180
+  260 <--x 177
-  216 <--x 180
+  263 <--x 177
-  217 <--x 180
+  215 <--x 181
-  218 <--x 180
+  216 <--x 181
-  219 <--x 180
+  217 <--x 181
-  220 <--x 180
+  218 <--x 181
-  221 <--x 180
+  219 <--x 181
+  220 <--x 181
+  221 <--x 181
+  222 <--x 181
   192 <--x 182
   193 <--x 183
-  194 <--x 183
+  194 <--x 184
-  195 <--x 183
+  195 <--x 184
-  196 <--x 183
+  196 <--x 184
-  197 <--x 183
+  197 <--x 184
-  198 <--x 183
+  198 <--x 184
-  199 <--x 183
+  199 <--x 184
-  200 <--x 183
+  200 <--x 184
   201 <--x 184
-  202 <--x 184
+  203 <--x 186
-  203 <--x 184
+  204 <--x 186
-  204 <--x 184
   205 <--x 186
   206 <--x 186
-  207 <--x 186
+  190 <--x 187
-  208 <--x 186
+  191 <--x 187
+  207 <--x 187
+  208 <--x 187
   209 <--x 187
-  190 <--x 188
+  210 <--x 187
-  191 <--x 188
+  211 <--x 189
-  210 <--x 188
+  212 <--x 189
-  211 <--x 188
+  213 <--x 189
-  212 <--x 188
+  214 <--x 189
-  213 <--x 188
+  202 <--x 276
-  222 <--x 277
+  248 <--x 271
-  250 <--x 271
+  249 <--x 272
-  251 <--x 272
+  250 <--x 273
-  252 <--x 273
+  251 <--x 270
-  253 <--x 270
+  252 <--x 269
-  255 <--x 269
+  253 <--x 274
-  256 <--x 274
+  254 <--x 275
-  257 <--x 275
+  255 <--x 268
-  258 <--x 268
 ```

rust/kcl-lib/tests/kcl_samples/ball-bearing/artifact_graph_flowchart.snap.md

@@ -3,18 +3,18 @@ flowchart LR
   subgraph path8 [Path]
     8["Path<br>[664, 726, 0]"]
     15["Segment<br>[664, 726, 0]"]
-    30[Solid2d]
+    32[Solid2d]
   end
   subgraph path9 [Path]
     9["Path<br>[750, 796, 0]"]
     16["Segment<br>[750, 796, 0]"]
-    32[Solid2d]
+    31[Solid2d]
   end
   subgraph path10 [Path]
     10["Path<br>[980, 1036, 0]"]
     17["Segment<br>[1042, 1101, 0]"]
     18["Segment<br>[1107, 1114, 0]"]
-    28[Solid2d]
+    30[Solid2d]
   end
   subgraph path11 [Path]
     11["Path<br>[1484, 1612, 0]"]
@@ -22,30 +22,30 @@ flowchart LR
     20["Segment<br>[1684, 1715, 0]"]
     21["Segment<br>[1721, 1749, 0]"]
     22["Segment<br>[1755, 1762, 0]"]
-    29[Solid2d]
+    27[Solid2d]
   end
   subgraph path12 [Path]
     12["Path<br>[2096, 2238, 0]"]
     23["Segment<br>[2096, 2238, 0]"]
-    27[Solid2d]
+    28[Solid2d]
   end
   subgraph path13 [Path]
     13["Path<br>[2632, 2685, 0]"]
     24["Segment<br>[2632, 2685, 0]"]
-    31[Solid2d]
+    26[Solid2d]
   end
   subgraph path14 [Path]
     14["Path<br>[2709, 2783, 0]"]
     25["Segment<br>[2709, 2783, 0]"]
-    26[Solid2d]
+    29[Solid2d]
   end
   1["Plane<br>[610, 657, 0]"]
   2["Plane<br>[957, 974, 0]"]
   3["Plane<br>[1461, 1478, 0]"]
   4["Plane<br>[2073, 2090, 0]"]
   5["Plane<br>[2578, 2625, 0]"]
-  6["StartSketchOnPlane<br>[596, 658, 0]"]
+  6["StartSketchOnPlane<br>[2564, 2626, 0]"]
-  7["StartSketchOnPlane<br>[2564, 2626, 0]"]
+  7["StartSketchOnPlane<br>[596, 658, 0]"]
   33["Sweep Extrusion<br>[848, 900, 0]"]
   34["Sweep Revolve<br>[1196, 1226, 0]"]
   35["Sweep Revolve<br>[1804, 1834, 0]"]
@@ -77,109 +77,109 @@ flowchart LR
   61["SweepEdge Adjacent"]
   62["SweepEdge Adjacent"]
   63["SweepEdge Adjacent"]
-  1 <--x 6
+  1 <--x 7
   1 --- 8
   1 --- 9
   2 --- 10
   3 --- 11
   4 --- 12
-  5 <--x 7
+  5 <--x 6
   5 --- 13
   5 --- 14
   8 --- 15
-  8 --- 30
+  8 --- 32
   8 ---- 33
   9 --- 16
-  9 --- 32
+  9 --- 31
   10 --- 17
   10 --- 18
-  10 --- 28
+  10 --- 30
   10 ---- 34
   11 --- 19
   11 --- 20
   11 --- 21
   11 --- 22
-  11 --- 29
+  11 --- 27
   11 ---- 35
   12 --- 23
-  12 --- 27
+  12 --- 28
   12 ---- 36
   13 --- 24
-  13 --- 31
+  13 --- 26
   13 ---- 37
   14 --- 25
-  14 --- 26
+  14 --- 29
-  15 --- 39
+  15 --- 46
-  15 x--> 48
+  15 x--> 49
-  15 --- 54
+  15 --- 55
-  15 --- 57
+  15 --- 63
   34 <--x 17
   17 --- 45
-  17 x--> 63
+  17 x--> 62
   34 <--x 18
-  18 --- 46
+  18 --- 44
-  18 --- 63
+  18 --- 62
   35 <--x 19
-  19 --- 42
+  19 --- 43
-  19 --- 61
+  19 --- 60
   35 <--x 20
-  20 --- 43
+  20 --- 41
-  20 --- 59
+  20 --- 58
   35 <--x 21
-  21 --- 41
+  21 --- 42
-  21 --- 62
+  21 --- 61
   35 <--x 22
-  22 --- 44
+  22 --- 40
-  22 --- 60
+  22 --- 59
   23 --- 38
   23 x--> 47
   23 --- 53
   23 --- 56
-  24 --- 40
+  24 --- 39
-  24 x--> 49
+  24 x--> 48
-  24 --- 55
+  24 --- 54
-  24 --- 58
+  24 --- 57
-  33 --- 39
+  33 --- 46
-  33 --- 48
+  33 --- 49
-  33 --- 51
+  33 --- 52
-  33 --- 54
+  33 --- 55
-  33 --- 57
+  33 --- 63
+  34 --- 44
   34 --- 45
-  34 --- 46
+  34 --- 62
-  34 --- 63
+  35 --- 40
   35 --- 41
   35 --- 42
   35 --- 43
-  35 --- 44
+  35 --- 58
   35 --- 59
   35 --- 60
   35 --- 61
-  35 --- 62
   36 --- 38
   36 --- 47
   36 --- 50
   36 --- 53
   36 --- 56
-  37 --- 40
+  37 --- 39
-  37 --- 49
+  37 --- 48
-  37 --- 52
+  37 --- 51
-  37 --- 55
+  37 --- 54
-  37 --- 58
+  37 --- 57
   53 <--x 38
   56 <--x 38
   54 <--x 39
   57 <--x 39
-  55 <--x 40
+  59 <--x 40
-  58 <--x 40
+  61 <--x 40
-  59 <--x 41
+  58 <--x 41
-  62 <--x 41
+  60 <--x 41
-  60 <--x 42
+  58 <--x 42
   61 <--x 42
   59 <--x 43
-  61 <--x 43
+  60 <--x 43
-  60 <--x 44
   62 <--x 44
-  63 <--x 45
+  62 <--x 45
+  55 <--x 46
   63 <--x 46
   53 <--x 50
   54 <--x 51

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

@@ -78,10 +78,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -90,6 +88,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -212,10 +212,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -224,6 +222,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -346,10 +346,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -358,6 +356,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -480,10 +480,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -492,6 +490,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -614,10 +614,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -626,6 +624,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -748,10 +748,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -760,6 +758,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -882,10 +882,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -894,6 +892,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -1016,10 +1016,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1028,6 +1026,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -1150,10 +1150,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1162,6 +1160,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -1284,10 +1284,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1296,6 +1294,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -1400,10 +1400,8 @@ description: Variables in memory after executing ball-bearing.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -1412,6 +1410,8 @@ description: Variables in memory after executing ball-bearing.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -1581,10 +1581,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1593,6 +1591,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -1767,10 +1767,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1779,6 +1777,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -1953,10 +1953,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1965,6 +1963,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -2139,10 +2139,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -2151,6 +2149,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -2325,10 +2325,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -2337,6 +2335,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -2511,10 +2511,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -2523,6 +2521,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -2697,10 +2697,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -2709,6 +2707,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -2883,10 +2883,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -2895,6 +2893,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -3069,10 +3069,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -3081,6 +3079,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -3255,10 +3255,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -3267,6 +3265,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -3409,10 +3409,8 @@ description: Variables in memory after executing ball-bearing.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -3421,6 +3419,8 @@ description: Variables in memory after executing ball-bearing.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -3535,10 +3535,8 @@ description: Variables in memory after executing ball-bearing.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -3547,6 +3545,8 @@ description: Variables in memory after executing ball-bearing.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -3630,10 +3630,8 @@ description: Variables in memory after executing ball-bearing.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "Custom",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -3642,6 +3640,8 @@ description: Variables in memory after executing ball-bearing.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "Custom",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -3746,10 +3746,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -3758,6 +3756,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -3854,10 +3854,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -3866,6 +3864,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -3962,10 +3962,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -3974,6 +3972,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -4070,10 +4070,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -4082,6 +4080,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -4178,10 +4178,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -4190,6 +4188,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -4286,10 +4286,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -4298,6 +4296,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -4394,10 +4394,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -4406,6 +4404,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -4502,10 +4502,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -4514,6 +4512,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -4610,10 +4610,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -4622,6 +4620,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -4718,10 +4718,8 @@ description: Variables in memory after executing ball-bearing.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -4730,6 +4728,8 @@ description: Variables in memory after executing ball-bearing.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -4815,10 +4815,8 @@ description: Variables in memory after executing ball-bearing.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -4827,6 +4825,8 @@ description: Variables in memory after executing ball-bearing.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -4941,10 +4941,8 @@ description: Variables in memory after executing ball-bearing.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -4953,6 +4951,8 @@ description: Variables in memory after executing ball-bearing.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -5036,10 +5036,8 @@ description: Variables in memory after executing ball-bearing.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "Custom",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -5048,6 +5046,8 @@ description: Variables in memory after executing ball-bearing.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "Custom",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,

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

@@ -104,10 +104,8 @@ description: Variables in memory after executing bottle.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -116,6 +114,8 @@ description: Variables in memory after executing bottle.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -357,10 +357,8 @@ description: Variables in memory after executing bottle.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XY",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -369,6 +367,8 @@ description: Variables in memory after executing bottle.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XY",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -620,10 +620,8 @@ description: Variables in memory after executing bottle.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XY",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -632,6 +630,8 @@ description: Variables in memory after executing bottle.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XY",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,

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

@@ -277,10 +277,8 @@ description: Variables in memory after executing bracket.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -289,6 +287,8 @@ description: Variables in memory after executing bracket.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -840,10 +840,8 @@ description: Variables in memory after executing bracket.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XZ",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -852,6 +850,8 @@ description: Variables in memory after executing bracket.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XZ",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -1289,10 +1289,8 @@ description: Variables in memory after executing bracket.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XZ",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -1301,6 +1299,8 @@ description: Variables in memory after executing bracket.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XZ",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -1738,10 +1738,8 @@ description: Variables in memory after executing bracket.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XZ",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -1750,6 +1748,8 @@ description: Variables in memory after executing bracket.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XZ",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -2187,10 +2187,8 @@ description: Variables in memory after executing bracket.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XZ",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -2199,6 +2197,8 @@ description: Variables in memory after executing bracket.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XZ",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -2706,10 +2706,8 @@ description: Variables in memory after executing bracket.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XZ",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -2718,6 +2716,8 @@ description: Variables in memory after executing bracket.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XZ",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -3155,10 +3155,8 @@ description: Variables in memory after executing bracket.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XZ",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -3167,6 +3165,8 @@ description: Variables in memory after executing bracket.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XZ",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,

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

@@ -2,56 +2,56 @@
 flowchart LR
   subgraph path7 [Path]
     7["Path<br>[773, 813, 0]"]
-    17["Segment<br>[821, 886, 0]"]
+    16["Segment<br>[821, 886, 0]"]
-    24["Segment<br>[894, 991, 0]"]
+    21["Segment<br>[894, 991, 0]"]
-    28["Segment<br>[999, 1116, 0]"]
+    25["Segment<br>[999, 1116, 0]"]
-    33["Segment<br>[1124, 1180, 0]"]
+    35["Segment<br>[1124, 1180, 0]"]
-    37["Segment<br>[1188, 1195, 0]"]
+    40["Segment<br>[1188, 1195, 0]"]
     43[Solid2d]
   end
   subgraph path8 [Path]
     8["Path<br>[773, 813, 0]"]
-    14["Segment<br>[821, 886, 0]"]
+    15["Segment<br>[821, 886, 0]"]
-    22["Segment<br>[894, 991, 0]"]
+    19["Segment<br>[894, 991, 0]"]
-    25["Segment<br>[999, 1116, 0]"]
+    30["Segment<br>[999, 1116, 0]"]
-    34["Segment<br>[1124, 1180, 0]"]
+    31["Segment<br>[1124, 1180, 0]"]
-    39["Segment<br>[1188, 1195, 0]"]
+    41["Segment<br>[1188, 1195, 0]"]
     44[Solid2d]
   end
   subgraph path9 [Path]
     9["Path<br>[773, 813, 0]"]
-    16["Segment<br>[821, 886, 0]"]
+    18["Segment<br>[821, 886, 0]"]
-    21["Segment<br>[894, 991, 0]"]
+    23["Segment<br>[894, 991, 0]"]
-    27["Segment<br>[999, 1116, 0]"]
+    26["Segment<br>[999, 1116, 0]"]
-    31["Segment<br>[1124, 1180, 0]"]
+    33["Segment<br>[1124, 1180, 0]"]
-    41["Segment<br>[1188, 1195, 0]"]
+    37["Segment<br>[1188, 1195, 0]"]
     45[Solid2d]
   end
   subgraph path10 [Path]
     10["Path<br>[773, 813, 0]"]
-    13["Segment<br>[821, 886, 0]"]
+    14["Segment<br>[821, 886, 0]"]
-    19["Segment<br>[894, 991, 0]"]
+    24["Segment<br>[894, 991, 0]"]
-    30["Segment<br>[999, 1116, 0]"]
+    28["Segment<br>[999, 1116, 0]"]
-    32["Segment<br>[1124, 1180, 0]"]
+    34["Segment<br>[1124, 1180, 0]"]
-    42["Segment<br>[1188, 1195, 0]"]
+    38["Segment<br>[1188, 1195, 0]"]
     46[Solid2d]
   end
   subgraph path11 [Path]
     11["Path<br>[773, 813, 0]"]
-    15["Segment<br>[821, 886, 0]"]
+    13["Segment<br>[821, 886, 0]"]
-    23["Segment<br>[894, 991, 0]"]
+    22["Segment<br>[894, 991, 0]"]
-    26["Segment<br>[999, 1116, 0]"]
+    27["Segment<br>[999, 1116, 0]"]
-    36["Segment<br>[1124, 1180, 0]"]
+    32["Segment<br>[1124, 1180, 0]"]
-    38["Segment<br>[1188, 1195, 0]"]
+    39["Segment<br>[1188, 1195, 0]"]
     47[Solid2d]
   end
   subgraph path12 [Path]
     12["Path<br>[773, 813, 0]"]
-    18["Segment<br>[821, 886, 0]"]
+    17["Segment<br>[821, 886, 0]"]
     20["Segment<br>[894, 991, 0]"]
     29["Segment<br>[999, 1116, 0]"]
-    35["Segment<br>[1124, 1180, 0]"]
+    36["Segment<br>[1124, 1180, 0]"]
-    40["Segment<br>[1188, 1195, 0]"]
+    42["Segment<br>[1188, 1195, 0]"]
     48[Solid2d]
   end
   1["Plane<br>[356, 390, 0]"]
@@ -150,150 +150,150 @@ flowchart LR
   136["SweepEdge Adjacent"]
   137["SweepEdge Adjacent"]
   138["SweepEdge Adjacent"]
-  1 --- 7
+  1 --- 8
   2 --- 12
   3 --- 10
   4 --- 9
-  5 --- 8
+  5 --- 11
-  6 --- 11
+  6 --- 7
-  7 --- 17
+  7 --- 16
-  7 --- 24
+  7 --- 21
-  7 --- 28
+  7 --- 25
-  7 --- 33
+  7 --- 35
-  7 --- 37
+  7 --- 40
   7 --- 43
-  7 ---- 52
+  7 ---- 49
-  8 --- 14
+  8 --- 15
-  8 --- 22
+  8 --- 19
-  8 --- 25
+  8 --- 30
-  8 --- 34
+  8 --- 31
-  8 --- 39
+  8 --- 41
   8 --- 44
-  8 ---- 51
+  8 ---- 50
-  9 --- 16
+  9 --- 18
-  9 --- 21
+  9 --- 23
-  9 --- 27
+  9 --- 26
-  9 --- 31
+  9 --- 33
-  9 --- 41
+  9 --- 37
   9 --- 45
-  9 ---- 49
+  9 ---- 54
-  10 --- 13
+  10 --- 14
-  10 --- 19
+  10 --- 24
-  10 --- 30
+  10 --- 28
-  10 --- 32
+  10 --- 34
-  10 --- 42
+  10 --- 38
   10 --- 46
-  10 ---- 54
+  10 ---- 51
-  11 --- 15
+  11 --- 13
-  11 --- 23
+  11 --- 22
-  11 --- 26
+  11 --- 27
-  11 --- 36
+  11 --- 32
-  11 --- 38
+  11 --- 39
   11 --- 47
-  11 ---- 50
+  11 ---- 52
-  12 --- 18
+  12 --- 17
   12 --- 20
   12 --- 29
-  12 --- 35
+  12 --- 36
-  12 --- 40
+  12 --- 42
   12 --- 48
   12 ---- 53
-  13 --- 76
+  13 --- 67
-  13 x--> 84
+  13 x--> 82
-  13 --- 114
+  13 --- 103
-  13 --- 135
+  13 --- 129
-  14 --- 64
+  14 --- 65
   14 x--> 81
   14 --- 101
-  14 --- 125
+  14 --- 124
-  15 --- 60
+  15 --- 61
   15 x--> 80
-  15 --- 96
+  15 --- 98
-  15 --- 120
+  15 --- 122
   16 --- 57
   16 x--> 79
-  16 --- 94
+  16 --- 92
-  16 --- 117
+  16 --- 118
-  17 --- 69
+  17 --- 73
-  17 x--> 82
+  17 x--> 83
-  17 --- 103
+  17 --- 107
-  17 --- 129
+  17 --- 131
-  18 --- 72
+  18 --- 78
-  18 x--> 83
+  18 x--> 84
-  18 --- 108
+  18 --- 111
-  18 --- 131
+  18 --- 135
-  19 --- 75
+  19 --- 59
-  19 x--> 84
+  19 x--> 80
-  19 --- 112
+  19 --- 96
-  19 --- 137
+  19 --- 121
   20 --- 71
   20 x--> 83
-  20 --- 107
+  20 --- 109
   20 --- 133
-  21 --- 58
+  21 --- 56
   21 x--> 79
   21 --- 91
   21 --- 115
-  22 --- 65
+  22 --- 70
-  22 x--> 81
+  22 x--> 82
-  22 --- 100
+  22 --- 104
-  22 --- 126
+  22 --- 130
-  23 --- 61
+  23 --- 77
-  23 x--> 80
+  23 x--> 84
-  23 --- 98
+  23 --- 113
-  23 --- 119
+  23 --- 137
-  24 --- 70
+  24 --- 66
-  24 x--> 82
+  24 x--> 81
-  24 --- 106
+  24 --- 99
-  24 --- 130
+  24 --- 125
-  25 --- 63
+  25 --- 55
-  25 x--> 81
+  25 x--> 79
-  25 --- 102
+  25 --- 94
-  25 --- 123
+  25 --- 117
-  26 --- 59
+  26 --- 75
-  26 x--> 80
+  26 x--> 84
-  26 --- 95
+  26 --- 114
-  26 --- 122
+  26 --- 138
-  27 --- 56
+  27 --- 68
-  27 x--> 79
+  27 x--> 82
-  27 --- 92
+  27 --- 106
-  27 --- 116
+  27 --- 127
-  28 --- 67
+  28 --- 63
-  28 x--> 82
+  28 x--> 81
-  28 --- 105
+  28 --- 100
-  28 --- 128
+  28 --- 123
-  29 --- 73
+  29 --- 72
   29 x--> 83
-  29 --- 110
+  29 --- 108
-  29 --- 134
+  29 --- 132
-  30 --- 78
+  30 --- 62
-  30 x--> 84
+  30 x--> 80
-  30 --- 113
+  30 --- 95
-  30 --- 138
+  30 --- 120
-  31 --- 55
+  31 --- 60
-  31 x--> 79
+  31 x--> 80
-  31 --- 93
+  31 --- 97
-  31 --- 118
+  31 --- 119
-  32 --- 77
+  32 --- 69
-  32 x--> 84
+  32 x--> 82
-  32 --- 111
+  32 --- 105
-  32 --- 136
+  32 --- 128
-  33 --- 68
+  33 --- 76
-  33 x--> 82
+  33 x--> 84
-  33 --- 104
+  33 --- 112
-  33 --- 127
+  33 --- 136
-  34 --- 66
+  34 --- 64
   34 x--> 81
-  34 --- 99
+  34 --- 102
-  34 --- 124
+  34 --- 126
-  35 --- 74
+  35 --- 58
-  35 x--> 83
+  35 x--> 79
-  35 --- 109
+  35 --- 93
-  35 --- 132
+  35 --- 116
-  36 --- 62
+  36 --- 74
-  36 x--> 80
+  36 x--> 83
-  36 --- 97
+  36 --- 110
-  36 --- 121
+  36 --- 134
   49 --- 55
   49 --- 56
   49 --- 57
@@ -378,78 +378,78 @@ flowchart LR
   54 --- 136
   54 --- 137
   54 --- 138
-  93 <--x 55
+  94 <--x 55
-  116 <--x 55
+  115 <--x 55
-  118 <--x 55
+  117 <--x 55
-  92 <--x 56
+  91 <--x 56
   115 <--x 56
-  116 <--x 56
+  118 <--x 56
-  94 <--x 57
+  92 <--x 57
-  117 <--x 57
+  116 <--x 57
   118 <--x 57
-  91 <--x 58
+  93 <--x 58
-  115 <--x 58
+  116 <--x 58
   117 <--x 58
-  95 <--x 59
+  96 <--x 59
-  119 <--x 59
+  121 <--x 59
   122 <--x 59
-  96 <--x 60
+  97 <--x 60
+  119 <--x 60
   120 <--x 60
-  121 <--x 60
   98 <--x 61
   119 <--x 61
-  120 <--x 61
+  122 <--x 61
-  97 <--x 62
+  95 <--x 62
+  120 <--x 62
   121 <--x 62
-  122 <--x 62
+  100 <--x 63
-  102 <--x 63
   123 <--x 63
-  126 <--x 63
+  125 <--x 63
-  101 <--x 64
+  102 <--x 64
-  124 <--x 64
+  123 <--x 64
-  125 <--x 64
+  126 <--x 64
-  100 <--x 65
+  101 <--x 65
-  125 <--x 65
+  124 <--x 65
   126 <--x 65
   99 <--x 66
-  123 <--x 66
   124 <--x 66
-  105 <--x 67
+  125 <--x 66
+  103 <--x 67
   128 <--x 67
-  130 <--x 67
+  129 <--x 67
-  104 <--x 68
+  106 <--x 68
   127 <--x 68
-  128 <--x 68
+  130 <--x 68
-  103 <--x 69
+  105 <--x 69
   127 <--x 69
-  129 <--x 69
+  128 <--x 69
-  106 <--x 70
+  104 <--x 70
   129 <--x 70
   130 <--x 70
-  107 <--x 71
+  109 <--x 71
   131 <--x 71
   133 <--x 71
   108 <--x 72
-  131 <--x 72
   132 <--x 72
-  110 <--x 73
+  133 <--x 72
-  133 <--x 73
+  107 <--x 73
+  131 <--x 73
   134 <--x 73
-  109 <--x 74
+  110 <--x 74
   132 <--x 74
   134 <--x 74
-  112 <--x 75
+  114 <--x 75
-  135 <--x 75
   137 <--x 75
-  114 <--x 76
+  138 <--x 75
-  135 <--x 76
+  112 <--x 76
   136 <--x 76
-  111 <--x 77
+  138 <--x 76
-  136 <--x 77
+  113 <--x 77
-  138 <--x 77
+  135 <--x 77
-  113 <--x 78
+  137 <--x 77
-  137 <--x 78
+  111 <--x 78
-  138 <--x 78
+  135 <--x 78
+  136 <--x 78
   91 <--x 85
   92 <--x 85
   93 <--x 85

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

@@ -6,9 +6,8 @@ description: Variables in memory after executing color-cube.kcl
   "bluePlane": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "Custom",
+      "id": "[uuid]",
       "origin": {
         "x": 0.0,
         "y": 0.0,
@@ -17,6 +16,7 @@ description: Variables in memory after executing color-cube.kcl
           "type": "Mm"
         }
       },
+      "value": "Custom",
       "xAxis": {
         "x": 1.0,
         "y": 0.0,
@@ -51,9 +51,8 @@ description: Variables in memory after executing color-cube.kcl
   "greenPlane": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "Custom",
+      "id": "[uuid]",
       "origin": {
         "x": 0.0,
         "y": 50.0,
@@ -62,6 +61,7 @@ description: Variables in memory after executing color-cube.kcl
           "type": "Mm"
         }
       },
+      "value": "Custom",
       "xAxis": {
         "x": 1.0,
         "y": 0.0,
@@ -109,9 +109,8 @@ description: Variables in memory after executing color-cube.kcl
   "purplePlane": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "Custom",
+      "id": "[uuid]",
       "origin": {
         "x": 0.0,
         "y": -50.0,
@@ -120,6 +119,7 @@ description: Variables in memory after executing color-cube.kcl
           "type": "Mm"
         }
       },
+      "value": "Custom",
       "xAxis": {
         "x": -1.0,
         "y": 0.0,
@@ -141,9 +141,8 @@ description: Variables in memory after executing color-cube.kcl
   "redPlane": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "Custom",
+      "id": "[uuid]",
       "origin": {
         "x": 49.0,
         "y": 0.0,
@@ -152,6 +151,7 @@ description: Variables in memory after executing color-cube.kcl
           "type": "Mm"
         }
       },
+      "value": "Custom",
       "xAxis": {
         "x": 0.0,
         "y": 1.0,
@@ -202,9 +202,8 @@ description: Variables in memory after executing color-cube.kcl
   "tealPlane": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "Custom",
+      "id": "[uuid]",
       "origin": {
         "x": -50.0,
         "y": 0.0,
@@ -213,6 +212,7 @@ description: Variables in memory after executing color-cube.kcl
           "type": "Mm"
         }
       },
+      "value": "Custom",
       "xAxis": {
         "x": 0.0,
         "y": 1.0,
@@ -234,9 +234,8 @@ description: Variables in memory after executing color-cube.kcl
   "yellowPlane": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "Custom",
+      "id": "[uuid]",
       "origin": {
         "x": 0.0,
         "y": 0.0,
@@ -245,6 +244,7 @@ description: Variables in memory after executing color-cube.kcl
           "type": "Mm"
         }
       },
+      "value": "Custom",
       "xAxis": {
         "x": 1.0,
         "y": 0.0,

rust/kcl-lib/tests/kcl_samples/cycloidal-gear/artifact_graph_flowchart.snap.md

@@ -13,6 +13,11 @@ flowchart LR
   end
   subgraph path8 [Path]
     8["Path<br>[644, 858, 0]"]
+    26["Segment<br>[1275, 1283, 0]"]
+    32[Solid2d]
+  end
+  subgraph path9 [Path]
+    9["Path<br>[644, 858, 0]"]
     14["Segment<br>[868, 952, 0]"]
     15["Segment<br>[962, 1014, 0]"]
     18["Segment<br>[1024, 1071, 0]"]
@@ -20,27 +25,22 @@ flowchart LR
     22["Segment<br>[1143, 1190, 0]"]
     24["Segment<br>[1200, 1265, 0]"]
     25["Segment<br>[1275, 1283, 0]"]
-    34[Solid2d]
+    36[Solid2d]
-  end
-  subgraph path9 [Path]
-    9["Path<br>[644, 858, 0]"]
-    26["Segment<br>[1275, 1283, 0]"]
-    35[Solid2d]
   end
   subgraph path10 [Path]
     10["Path<br>[1311, 1361, 0]"]
-    30["Segment<br>[1311, 1361, 0]"]
+    29["Segment<br>[1311, 1361, 0]"]
-    32[Solid2d]
+    33[Solid2d]
   end
   subgraph path11 [Path]
     11["Path<br>[1311, 1361, 0]"]
-    28["Segment<br>[1311, 1361, 0]"]
+    30["Segment<br>[1311, 1361, 0]"]
-    33[Solid2d]
+    34[Solid2d]
   end
   subgraph path12 [Path]
     12["Path<br>[1311, 1361, 0]"]
-    29["Segment<br>[1311, 1361, 0]"]
+    28["Segment<br>[1311, 1361, 0]"]
-    36[Solid2d]
+    35[Solid2d]
   end
   1["Plane<br>[600, 633, 0]"]
   2["Plane<br>[600, 633, 0]"]
@@ -69,15 +69,15 @@ flowchart LR
   55["SweepEdge Adjacent"]
   56["SweepEdge Adjacent"]
   57["SweepEdge Adjacent"]
-  1 <--x 5
+  1 <--x 6
-  1 --- 8
+  1 --- 7
-  1 --- 11
+  1 --- 12
-  2 <--x 6
+  2 <--x 4
-  2 --- 9
+  2 --- 8
-  2 --- 12
+  2 --- 10
-  3 <--x 4
+  3 <--x 5
-  3 --- 7
+  3 --- 9
-  3 --- 10
+  3 --- 11
   7 --- 13
   7 --- 16
   7 --- 17
@@ -87,54 +87,54 @@ flowchart LR
   7 --- 27
   7 --- 31
   7 x---> 37
-  8 --- 14
+  8 --- 26
-  8 --- 15
+  8 --- 32
-  8 --- 18
+  8 x---> 37
-  8 --- 20
+  8 x--> 46
-  8 --- 22
+  8 x--> 47
-  8 --- 24
+  8 x--> 48
-  8 --- 25
+  8 x--> 49
-  8 --- 34
+  8 x--> 50
-  8 ---- 37
+  8 x--> 51
-  9 --- 26
+  9 --- 14
-  9 --- 35
+  9 --- 15
-  9 x---> 37
+  9 --- 18
-  9 x--> 46
+  9 --- 20
-  9 x--> 47
+  9 --- 22
-  9 x--> 48
+  9 --- 24
-  9 x--> 49
+  9 --- 25
-  9 x--> 50
+  9 --- 36
-  9 x--> 51
+  9 ---- 37
-  10 --- 30
+  10 --- 29
-  10 --- 32
+  10 --- 33
-  11 --- 28
+  11 --- 30
-  11 --- 33
+  11 --- 34
-  12 --- 29
+  12 --- 28
-  12 --- 36
+  12 --- 35
   14 --- 40
   14 x--> 44
-  14 --- 50
+  14 --- 46
   14 --- 55
   15 --- 39
   15 x--> 44
-  15 --- 46
+  15 --- 51
-  15 --- 54
+  15 --- 52
-  18 --- 41
+  18 --- 38
   18 x--> 44
   18 --- 48
   18 --- 53
-  20 --- 43
+  20 --- 41
   20 x--> 44
-  20 --- 49
+  20 --- 50
-  20 --- 57
+  20 --- 56
-  22 --- 42
+  22 --- 43
   22 x--> 44
-  22 --- 47
+  22 --- 49
-  22 --- 52
+  22 --- 54
-  24 --- 38
+  24 --- 42
   24 x--> 44
-  24 --- 51
+  24 --- 47
-  24 --- 56
+  24 --- 57
   37 --- 38
   37 --- 39
   37 --- 40
@@ -155,23 +155,23 @@ flowchart LR
   37 --- 55
   37 --- 56
   37 --- 57
-  51 <--x 38
+  48 <--x 38
-  55 <--x 38
+  53 <--x 38
   56 <--x 38
-  46 <--x 39
+  51 <--x 39
+  52 <--x 39
   53 <--x 39
-  54 <--x 39
+  46 <--x 40
-  50 <--x 40
+  52 <--x 40
-  54 <--x 40
   55 <--x 40
-  48 <--x 41
+  50 <--x 41
-  53 <--x 41
+  54 <--x 41
-  57 <--x 41
+  56 <--x 41
   47 <--x 42
-  52 <--x 42
+  55 <--x 42
-  56 <--x 42
+  57 <--x 42
   49 <--x 43
-  52 <--x 43
+  54 <--x 43
   57 <--x 43
   46 <--x 45
   47 <--x 45

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

@@ -146,10 +146,8 @@ description: Variables in memory after executing dodecahedron.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -158,6 +156,8 @@ description: Variables in memory after executing dodecahedron.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -326,10 +326,8 @@ description: Variables in memory after executing dodecahedron.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -338,6 +336,8 @@ description: Variables in memory after executing dodecahedron.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -506,10 +506,8 @@ description: Variables in memory after executing dodecahedron.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -518,6 +516,8 @@ description: Variables in memory after executing dodecahedron.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -686,10 +686,8 @@ description: Variables in memory after executing dodecahedron.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -698,6 +696,8 @@ description: Variables in memory after executing dodecahedron.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -866,10 +866,8 @@ description: Variables in memory after executing dodecahedron.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -878,6 +876,8 @@ description: Variables in memory after executing dodecahedron.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -1046,10 +1046,8 @@ description: Variables in memory after executing dodecahedron.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1058,6 +1056,8 @@ description: Variables in memory after executing dodecahedron.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -1226,10 +1226,8 @@ description: Variables in memory after executing dodecahedron.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1238,6 +1236,8 @@ description: Variables in memory after executing dodecahedron.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -1406,10 +1406,8 @@ description: Variables in memory after executing dodecahedron.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1418,6 +1416,8 @@ description: Variables in memory after executing dodecahedron.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -1586,10 +1586,8 @@ description: Variables in memory after executing dodecahedron.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1598,6 +1596,8 @@ description: Variables in memory after executing dodecahedron.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -1766,10 +1766,8 @@ description: Variables in memory after executing dodecahedron.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1778,6 +1776,8 @@ description: Variables in memory after executing dodecahedron.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -1946,10 +1946,8 @@ description: Variables in memory after executing dodecahedron.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1958,6 +1956,8 @@ description: Variables in memory after executing dodecahedron.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -2126,10 +2126,8 @@ description: Variables in memory after executing dodecahedron.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -2138,6 +2136,8 @@ description: Variables in memory after executing dodecahedron.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,

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

@@ -7,47 +7,47 @@ flowchart LR
     29["Segment<br>[495, 612, 0]"]
     30["Segment<br>[618, 703, 0]"]
     31["Segment<br>[709, 716, 0]"]
-    70[Solid2d]
+    67[Solid2d]
   end
   subgraph path9 [Path]
     9["Path<br>[1597, 1680, 0]"]
     33["Segment<br>[1597, 1680, 0]"]
-    62[Solid2d]
+    59[Solid2d]
   end
   subgraph path10 [Path]
     10["Path<br>[1597, 1680, 0]"]
     32["Segment<br>[1597, 1680, 0]"]
-    67[Solid2d]
+    60[Solid2d]
   end
   subgraph path11 [Path]
     11["Path<br>[1597, 1680, 0]"]
     34["Segment<br>[1597, 1680, 0]"]
-    72[Solid2d]
+    66[Solid2d]
   end
   subgraph path12 [Path]
     12["Path<br>[1597, 1680, 0]"]
     35["Segment<br>[1597, 1680, 0]"]
-    73[Solid2d]
+    75[Solid2d]
   end
   subgraph path13 [Path]
     13["Path<br>[1706, 1773, 0]"]
-    38["Segment<br>[1706, 1773, 0]"]
+    37["Segment<br>[1706, 1773, 0]"]
-    59[Solid2d]
+    62[Solid2d]
   end
   subgraph path14 [Path]
     14["Path<br>[1706, 1773, 0]"]
-    39["Segment<br>[1706, 1773, 0]"]
+    36["Segment<br>[1706, 1773, 0]"]
-    63[Solid2d]
+    70[Solid2d]
   end
   subgraph path15 [Path]
     15["Path<br>[1706, 1773, 0]"]
-    37["Segment<br>[1706, 1773, 0]"]
+    39["Segment<br>[1706, 1773, 0]"]
-    64[Solid2d]
+    72[Solid2d]
   end
   subgraph path16 [Path]
     16["Path<br>[1706, 1773, 0]"]
-    36["Segment<br>[1706, 1773, 0]"]
+    38["Segment<br>[1706, 1773, 0]"]
-    66[Solid2d]
+    73[Solid2d]
   end
   subgraph path17 [Path]
     17["Path<br>[2341, 2376, 0]"]
@@ -56,12 +56,12 @@ flowchart LR
     42["Segment<br>[2559, 2676, 0]"]
     43["Segment<br>[2682, 2767, 0]"]
     44["Segment<br>[2773, 2780, 0]"]
-    75[Solid2d]
+    63[Solid2d]
   end
   subgraph path18 [Path]
     18["Path<br>[2804, 2960, 0]"]
     45["Segment<br>[2804, 2960, 0]"]
-    58[Solid2d]
+    74[Solid2d]
   end
   subgraph path19 [Path]
     19["Path<br>[2985, 3152, 0]"]
@@ -71,12 +71,12 @@ flowchart LR
   subgraph path20 [Path]
     20["Path<br>[3177, 3335, 0]"]
     47["Segment<br>[3177, 3335, 0]"]
-    60[Solid2d]
+    64[Solid2d]
   end
   subgraph path21 [Path]
     21["Path<br>[3360, 3529, 0]"]
     48["Segment<br>[3360, 3529, 0]"]
-    69[Solid2d]
+    61[Solid2d]
   end
   subgraph path22 [Path]
     22["Path<br>[3972, 4056, 0]"]
@@ -90,22 +90,22 @@ flowchart LR
   subgraph path23 [Path]
     23["Path<br>[4528, 4700, 0]"]
     54["Segment<br>[4528, 4700, 0]"]
-    61[Solid2d]
+    58[Solid2d]
   end
   subgraph path24 [Path]
     24["Path<br>[4725, 4908, 0]"]
     55["Segment<br>[4725, 4908, 0]"]
-    68[Solid2d]
+    71[Solid2d]
   end
   subgraph path25 [Path]
     25["Path<br>[4933, 5107, 0]"]
     56["Segment<br>[4933, 5107, 0]"]
-    71[Solid2d]
+    68[Solid2d]
   end
   subgraph path26 [Path]
     26["Path<br>[5132, 5317, 0]"]
     57["Segment<br>[5132, 5317, 0]"]
-    74[Solid2d]
+    69[Solid2d]
   end
   1["Plane<br>[264, 281, 0]"]
   2["Plane<br>[1566, 1589, 0]"]
@@ -196,62 +196,62 @@ flowchart LR
   156["EdgeCut Fillet<br>[5380, 5662, 0]"]
   157["EdgeCut Fillet<br>[5380, 5662, 0]"]
   1 --- 8
-  2 --- 12
+  2 --- 9
   2 --- 14
-  3 --- 9
+  3 --- 12
-  3 --- 15
+  3 --- 16
-  4 --- 11
+  4 --- 10
-  4 --- 16
+  4 --- 13
-  5 --- 10
+  5 --- 11
-  5 --- 13
+  5 --- 15
   6 --- 17
   6 --- 18
   6 --- 19
   6 --- 20
   6 --- 21
-  113 x--> 7
+  109 x--> 7
   8 --- 27
   8 --- 28
   8 --- 29
   8 --- 30
   8 --- 31
-  8 --- 70
+  8 --- 67
   8 ---- 77
   9 --- 33
-  9 --- 62
+  9 --- 59
-  9 ---- 80
+  9 ---- 78
   10 --- 32
-  10 --- 67
+  10 --- 60
-  10 ---- 79
+  10 ---- 81
   11 --- 34
-  11 --- 72
+  11 --- 66
-  11 ---- 78
+  11 ---- 79
   12 --- 35
-  12 --- 73
+  12 --- 75
-  12 ---- 81
+  12 ---- 80
-  13 --- 38
+  13 --- 37
-  13 --- 59
+  13 --- 62
-  14 --- 39
+  14 --- 36
-  14 --- 63
+  14 --- 70
-  15 --- 37
+  15 --- 39
-  15 --- 64
+  15 --- 72
-  16 --- 36
+  16 --- 38
-  16 --- 66
+  16 --- 73
   17 --- 40
   17 --- 41
   17 --- 42
   17 --- 43
   17 --- 44
-  17 --- 75
+  17 --- 63
   17 ---- 82
   18 --- 45
-  18 --- 58
+  18 --- 74
   19 --- 46
   19 --- 76
   20 --- 47
-  20 --- 60
+  20 --- 64
   21 --- 48
-  21 --- 69
+  21 --- 61
   22 --- 49
   22 --- 50
   22 --- 51
@@ -259,191 +259,191 @@ flowchart LR
   22 --- 53
   22 --- 65
   22 ---- 83
-  113 --- 22
+  109 --- 22
   23 --- 54
-  23 --- 61
+  23 --- 58
-  113 --- 23
+  109 --- 23
   24 --- 55
-  24 --- 68
+  24 --- 71
-  113 --- 24
+  109 --- 24
   25 --- 56
-  25 --- 71
+  25 --- 68
-  113 --- 25
+  109 --- 25
   26 --- 57
-  26 --- 74
+  26 --- 69
-  113 --- 26
+  109 --- 26
-  27 --- 92
+  27 --- 88
-  27 x--> 102
+  27 x--> 101
-  27 --- 119
+  27 --- 115
-  27 --- 137
+  27 --- 133
-  28 --- 90
+  28 --- 86
-  28 x--> 102
+  28 x--> 101
-  28 --- 122
+  28 --- 118
-  28 --- 136
+  28 --- 132
-  29 --- 89
+  29 --- 85
-  29 x--> 102
+  29 x--> 101
-  29 --- 121
+  29 --- 117
-  29 --- 138
+  29 --- 134
-  30 --- 91
+  30 --- 87
-  30 x--> 102
+  30 x--> 101
-  30 --- 120
+  30 --- 116
-  30 --- 135
+  30 --- 131
-  32 --- 93
+  32 --- 99
-  32 x--> 103
+  32 x--> 106
-  32 --- 123
+  32 --- 129
-  32 --- 139
+  32 --- 145
-  33 --- 94
+  33 --- 84
-  33 x--> 104
+  33 x--> 100
-  33 --- 124
+  33 --- 114
-  33 --- 140
+  33 --- 130
-  34 --- 88
+  34 --- 97
-  34 x--> 101
+  34 x--> 104
-  34 --- 118
+  34 --- 127
-  34 --- 134
+  34 --- 143
-  35 --- 95
+  35 --- 98
   35 x--> 105
-  35 --- 125
+  35 --- 128
-  35 --- 141
+  35 --- 144
-  40 --- 98
+  40 --- 89
-  40 x--> 106
+  40 x--> 102
-  40 --- 129
+  40 --- 121
-  40 --- 144
+  40 --- 136
-  41 --- 96
+  41 --- 92
-  41 x--> 106
+  41 x--> 102
-  41 --- 127
+  41 --- 120
-  41 --- 143
+  41 --- 138
-  42 --- 99
+  42 --- 91
-  42 x--> 106
+  42 x--> 102
-  42 --- 126
+  42 --- 122
-  42 --- 145
+  42 --- 137
-  43 --- 97
+  43 --- 90
-  43 x--> 106
+  43 x--> 102
-  43 --- 128
+  43 --- 119
-  43 --- 142
+  43 --- 135
-  49 --- 87
+  49 --- 96
-  49 x--> 100
+  49 x--> 103
-  49 --- 114
+  49 --- 123
-  49 --- 130
+  49 --- 140
-  50 --- 86
+  50 --- 94
-  50 x--> 100
+  50 x--> 103
-  50 --- 117
+  50 --- 124
-  50 --- 133
+  50 --- 142
-  51 --- 84
+  51 --- 93
-  51 x--> 100
+  51 x--> 103
-  51 --- 116
+  51 --- 125
-  51 --- 132
+  51 --- 141
-  52 --- 85
+  52 --- 95
-  52 x--> 100
+  52 x--> 103
-  52 --- 115
+  52 --- 126
-  52 --- 131
+  52 --- 139
-  77 --- 89
+  77 --- 85
-  77 --- 90
+  77 --- 86
-  77 --- 91
+  77 --- 87
-  77 --- 92
+  77 --- 88
-  77 --- 102
+  77 --- 101
-  77 --- 109
+  77 --- 108
-  77 --- 119
+  77 --- 115
-  77 --- 120
+  77 --- 116
-  77 --- 121
+  77 --- 117
-  77 --- 122
+  77 --- 118
-  77 --- 135
+  77 --- 131
-  77 --- 136
+  77 --- 132
-  77 --- 137
+  77 --- 133
-  77 --- 138
+  77 --- 134
-  78 --- 88
+  78 --- 84
-  78 --- 101
+  78 --- 100
-  78 --- 108
+  78 --- 107
-  78 --- 118
+  78 --- 114
-  78 --- 134
+  78 --- 130
-  79 --- 93
+  79 --- 97
-  79 --- 103
+  79 --- 104
-  79 --- 110
+  79 --- 111
-  79 --- 123
+  79 --- 127
-  79 --- 139
+  79 --- 143
-  80 --- 94
+  80 --- 98
-  80 --- 104
+  80 --- 105
-  80 --- 111
+  80 --- 112
-  80 --- 124
+  80 --- 128
-  80 --- 140
+  80 --- 144
-  81 --- 95
+  81 --- 99
-  81 --- 105
+  81 --- 106
-  81 --- 112
+  81 --- 113
-  81 --- 125
+  81 --- 129
-  81 --- 141
+  81 --- 145
-  82 --- 96
+  82 --- 89
-  82 --- 97
+  82 --- 90
-  82 --- 98
+  82 --- 91
-  82 --- 99
+  82 --- 92
-  82 --- 106
+  82 --- 102
-  82 --- 113
+  82 --- 109
-  82 --- 126
+  82 --- 119
-  82 --- 127
+  82 --- 120
-  82 --- 128
+  82 --- 121
-  82 --- 129
+  82 --- 122
-  82 --- 142
+  82 --- 135
-  82 --- 143
+  82 --- 136
-  82 --- 144
+  82 --- 137
-  82 --- 145
+  82 --- 138
-  83 --- 84
+  83 --- 93
-  83 --- 85
+  83 --- 94
-  83 --- 86
+  83 --- 95
-  83 --- 87
+  83 --- 96
-  83 --- 100
+  83 --- 103
-  83 --- 107
+  83 --- 110
-  83 --- 114
+  83 --- 123
-  83 --- 115
+  83 --- 124
-  83 --- 116
+  83 --- 125
-  83 --- 117
+  83 --- 126
-  83 --- 130
+  83 --- 139
-  83 --- 131
+  83 --- 140
-  83 --- 132
+  83 --- 141
-  83 --- 133
+  83 --- 142
-  116 <--x 84
+  114 <--x 84
-  115 <--x 85
+  130 <--x 84
-  117 <--x 86
+  117 <--x 85
-  114 <--x 87
+  118 <--x 86
-  118 <--x 88
+  116 <--x 87
-  134 <--x 88
+  115 <--x 88
   121 <--x 89
-  122 <--x 90
+  119 <--x 90
-  120 <--x 91
+  122 <--x 91
-  119 <--x 92
+  120 <--x 92
-  123 <--x 93
+  125 <--x 93
-  139 <--x 93
   124 <--x 94
-  140 <--x 94
+  126 <--x 95
-  125 <--x 95
+  123 <--x 96
-  141 <--x 95
+  127 <--x 97
-  127 <--x 96
+  143 <--x 97
-  128 <--x 97
+  128 <--x 98
-  129 <--x 98
+  144 <--x 98
-  126 <--x 99
+  129 <--x 99
+  145 <--x 99
   114 <--x 107
-  115 <--x 107
+  115 <--x 108
-  116 <--x 107
+  116 <--x 108
-  117 <--x 107
+  117 <--x 108
   118 <--x 108
   119 <--x 109
   120 <--x 109
   121 <--x 109
   122 <--x 109
   123 <--x 110
-  124 <--x 111
+  124 <--x 110
-  125 <--x 112
+  125 <--x 110
-  126 <--x 113
+  126 <--x 110
-  127 <--x 113
+  127 <--x 111
-  128 <--x 113
+  128 <--x 112
   129 <--x 113
-  130 <--x 155
+  131 <--x 146
-  131 <--x 154
+  132 <--x 149
-  132 <--x 157
+  133 <--x 148
-  133 <--x 156
+  134 <--x 147
-  135 <--x 146
+  135 <--x 150
-  136 <--x 149
+  136 <--x 152
-  137 <--x 148
+  137 <--x 153
-  138 <--x 147
+  138 <--x 151
-  142 <--x 153
+  139 <--x 155
-  143 <--x 151
+  140 <--x 154
-  144 <--x 152
+  141 <--x 156
-  145 <--x 150
+  142 <--x 157
 ```

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

@@ -188,10 +188,8 @@ description: Variables in memory after executing enclosure.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -200,6 +198,8 @@ description: Variables in memory after executing enclosure.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -527,10 +527,8 @@ description: Variables in memory after executing enclosure.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -539,6 +537,8 @@ description: Variables in memory after executing enclosure.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -1069,10 +1069,8 @@ description: Variables in memory after executing enclosure.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XY",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -1081,6 +1079,8 @@ description: Variables in memory after executing enclosure.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XY",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -1580,10 +1580,8 @@ description: Variables in memory after executing enclosure.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -1592,6 +1590,8 @@ description: Variables in memory after executing enclosure.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -1779,10 +1779,8 @@ description: Variables in memory after executing enclosure.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -1791,6 +1789,8 @@ description: Variables in memory after executing enclosure.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -2181,10 +2181,8 @@ description: Variables in memory after executing enclosure.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -2193,6 +2191,8 @@ description: Variables in memory after executing enclosure.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,

rust/kcl-lib/tests/kcl_samples/exhaust-manifold/artifact_graph_flowchart.snap.md

@@ -3,74 +3,74 @@ flowchart LR
   subgraph path10 [Path]
     10["Path<br>[771, 806, 0]"]
     33["Segment<br>[814, 840, 0]"]
-    36["Segment<br>[848, 909, 0]"]
+    37["Segment<br>[848, 909, 0]"]
+    42["Segment<br>[917, 976, 0]"]
+    43["Segment<br>[984, 1044, 0]"]
+    47["Segment<br>[1052, 1111, 0]"]
+  end
+  subgraph path11 [Path]
+    11["Path<br>[771, 806, 0]"]
+    34["Segment<br>[814, 840, 0]"]
+    35["Segment<br>[848, 909, 0]"]
     41["Segment<br>[917, 976, 0]"]
     45["Segment<br>[984, 1044, 0]"]
     48["Segment<br>[1052, 1111, 0]"]
   end
-  subgraph path11 [Path]
-    11["Path<br>[771, 806, 0]"]
-    31["Segment<br>[814, 840, 0]"]
-    35["Segment<br>[848, 909, 0]"]
-    39["Segment<br>[917, 976, 0]"]
-    44["Segment<br>[984, 1044, 0]"]
-    47["Segment<br>[1052, 1111, 0]"]
-  end
   subgraph path12 [Path]
     12["Path<br>[771, 806, 0]"]
     32["Segment<br>[814, 840, 0]"]
-    38["Segment<br>[848, 909, 0]"]
+    36["Segment<br>[848, 909, 0]"]
-    42["Segment<br>[917, 976, 0]"]
-    43["Segment<br>[984, 1044, 0]"]
-    49["Segment<br>[1052, 1111, 0]"]
-  end
-  subgraph path13 [Path]
-    13["Path<br>[771, 806, 0]"]
-    34["Segment<br>[814, 840, 0]"]
-    37["Segment<br>[848, 909, 0]"]
     40["Segment<br>[917, 976, 0]"]
     46["Segment<br>[984, 1044, 0]"]
     50["Segment<br>[1052, 1111, 0]"]
   end
+  subgraph path13 [Path]
+    13["Path<br>[771, 806, 0]"]
+    31["Segment<br>[814, 840, 0]"]
+    38["Segment<br>[848, 909, 0]"]
+    39["Segment<br>[917, 976, 0]"]
+    44["Segment<br>[984, 1044, 0]"]
+    49["Segment<br>[1052, 1111, 0]"]
+  end
   subgraph path14 [Path]
     14["Path<br>[1213, 1275, 0]"]
-    53["Segment<br>[1213, 1275, 0]"]
+    54["Segment<br>[1213, 1275, 0]"]
-    85[Solid2d]
+    88[Solid2d]
   end
   subgraph path15 [Path]
     15["Path<br>[1213, 1275, 0]"]
-    52["Segment<br>[1213, 1275, 0]"]
+    51["Segment<br>[1213, 1275, 0]"]
     89[Solid2d]
   end
   subgraph path16 [Path]
     16["Path<br>[1213, 1275, 0]"]
-    54["Segment<br>[1213, 1275, 0]"]
+    53["Segment<br>[1213, 1275, 0]"]
-    95[Solid2d]
+    93[Solid2d]
   end
   subgraph path17 [Path]
     17["Path<br>[1213, 1275, 0]"]
-    51["Segment<br>[1213, 1275, 0]"]
+    52["Segment<br>[1213, 1275, 0]"]
-    98[Solid2d]
+    95[Solid2d]
   end
   subgraph path18 [Path]
     18["Path<br>[1301, 1379, 0]"]
     58["Segment<br>[1301, 1379, 0]"]
-    87[Solid2d]
+    84[Solid2d]
   end
   subgraph path19 [Path]
     19["Path<br>[1301, 1379, 0]"]
-    56["Segment<br>[1301, 1379, 0]"]
+    55["Segment<br>[1301, 1379, 0]"]
-    88[Solid2d]
+    91[Solid2d]
   end
   subgraph path20 [Path]
     20["Path<br>[1301, 1379, 0]"]
-    57["Segment<br>[1301, 1379, 0]"]
+    56["Segment<br>[1301, 1379, 0]"]
     92[Solid2d]
   end
   subgraph path21 [Path]
     21["Path<br>[1301, 1379, 0]"]
-    55["Segment<br>[1301, 1379, 0]"]
+    57["Segment<br>[1301, 1379, 0]"]
-    96[Solid2d]
+    100[Solid2d]
   end
   subgraph path22 [Path]
     22["Path<br>[1703, 1738, 0]"]
@@ -91,47 +91,47 @@ flowchart LR
     73["Segment<br>[2382, 2420, 0]"]
     74["Segment<br>[2426, 2491, 0]"]
     75["Segment<br>[2497, 2504, 0]"]
-    84[Solid2d]
+    96[Solid2d]
   end
   subgraph path23 [Path]
     23["Path<br>[2589, 2662, 0]"]
     76["Segment<br>[2589, 2662, 0]"]
-    91[Solid2d]
+    86[Solid2d]
   end
   subgraph path24 [Path]
     24["Path<br>[2687, 2760, 0]"]
     77["Segment<br>[2687, 2760, 0]"]
-    86[Solid2d]
+    98[Solid2d]
   end
   subgraph path25 [Path]
     25["Path<br>[2785, 2858, 0]"]
     78["Segment<br>[2785, 2858, 0]"]
-    94[Solid2d]
+    85[Solid2d]
   end
   subgraph path26 [Path]
     26["Path<br>[2883, 2956, 0]"]
     79["Segment<br>[2883, 2956, 0]"]
-    99[Solid2d]
+    94[Solid2d]
   end
   subgraph path27 [Path]
     27["Path<br>[3020, 3159, 0]"]
     80["Segment<br>[3020, 3159, 0]"]
-    100[Solid2d]
+    87[Solid2d]
   end
   subgraph path28 [Path]
     28["Path<br>[3184, 3321, 0]"]
     81["Segment<br>[3184, 3321, 0]"]
-    97[Solid2d]
+    99[Solid2d]
   end
   subgraph path29 [Path]
     29["Path<br>[3346, 3493, 0]"]
     82["Segment<br>[3346, 3493, 0]"]
-    93[Solid2d]
+    90[Solid2d]
   end
   subgraph path30 [Path]
     30["Path<br>[3518, 3664, 0]"]
     83["Segment<br>[3518, 3664, 0]"]
-    90[Solid2d]
+    97[Solid2d]
   end
   1["Plane<br>[738, 763, 0]"]
   2["Plane<br>[738, 763, 0]"]
@@ -225,14 +225,14 @@ flowchart LR
   2 --- 10
   3 --- 13
   4 --- 12
-  5 --- 14
+  5 --- 15
   5 --- 20
   6 --- 17
-  6 --- 18
+  6 --- 21
   7 --- 16
   7 --- 19
-  8 --- 15
+  8 --- 14
-  8 --- 21
+  8 --- 18
   9 --- 22
   9 --- 23
   9 --- 24
@@ -243,45 +243,45 @@ flowchart LR
   9 --- 29
   9 --- 30
   10 --- 33
-  10 --- 36
+  10 --- 37
-  10 --- 41
+  10 --- 42
-  10 --- 45
+  10 --- 43
-  10 --- 48
+  10 --- 47
-  11 --- 31
+  11 --- 34
   11 --- 35
-  11 --- 39
+  11 --- 41
-  11 --- 44
+  11 --- 45
-  11 --- 47
+  11 --- 48
   12 --- 32
-  12 --- 38
+  12 --- 36
-  12 --- 42
+  12 --- 40
-  12 --- 43
+  12 --- 46
-  12 --- 49
+  12 --- 50
-  13 --- 34
+  13 --- 31
-  13 --- 37
+  13 --- 38
-  13 --- 40
+  13 --- 39
-  13 --- 46
+  13 --- 44
-  13 --- 50
+  13 --- 49
-  14 --- 53
+  14 --- 54
-  14 --- 85
+  14 --- 88
-  14 ---- 101
+  14 ---- 104
-  15 --- 52
+  15 --- 51
   15 --- 89
-  15 ---- 104
+  15 ---- 101
-  16 --- 54
+  16 --- 53
-  16 --- 95
+  16 --- 93
   16 ---- 103
-  17 --- 51
+  17 --- 52
-  17 --- 98
+  17 --- 95
   17 ---- 102
   18 --- 58
-  18 --- 87
+  18 --- 84
-  19 --- 56
+  19 --- 55
-  19 --- 88
+  19 --- 91
-  20 --- 57
+  20 --- 56
   20 --- 92
-  21 --- 55
+  21 --- 57
-  21 --- 96
+  21 --- 100
   22 --- 59
   22 --- 60
   22 --- 61
@@ -299,104 +299,104 @@ flowchart LR
   22 --- 73
   22 --- 74
   22 --- 75
-  22 --- 84
+  22 --- 96
   22 ---- 105
   23 --- 76
-  23 --- 91
+  23 --- 86
   24 --- 77
-  24 --- 86
+  24 --- 98
   25 --- 78
-  25 --- 94
+  25 --- 85
   26 --- 79
-  26 --- 99
+  26 --- 94
   27 --- 80
-  27 --- 100
+  27 --- 87
   28 --- 81
-  28 --- 97
+  28 --- 99
   29 --- 82
-  29 --- 93
+  29 --- 90
   30 --- 83
-  30 --- 90
+  30 --- 97
-  51 --- 107
+  51 --- 106
-  51 x--> 127
+  51 x--> 126
-  51 --- 137
+  51 --- 136
-  51 --- 157
+  51 --- 156
-  52 --- 109
+  52 --- 107
-  52 x--> 129
+  52 x--> 127
-  52 --- 139
+  52 --- 137
-  52 --- 159
+  52 --- 157
-  53 --- 106
+  53 --- 108
-  53 x--> 126
+  53 x--> 128
-  53 --- 136
+  53 --- 138
-  53 --- 156
+  53 --- 158
-  54 --- 108
+  54 --- 125
-  54 x--> 128
+  54 x--> 130
-  54 --- 138
+  54 --- 155
-  54 --- 158
+  54 --- 175
-  59 --- 119
+  59 --- 123
-  59 x--> 130
+  59 x--> 129
-  59 --- 147
+  59 --- 143
-  59 --- 172
+  59 --- 173
-  60 --- 114
+  60 --- 109
-  60 x--> 130
+  60 x--> 129
-  60 --- 152
+  60 --- 140
-  60 --- 163
+  60 --- 169
-  61 --- 121
+  61 --- 117
-  61 x--> 130
+  61 x--> 129
-  61 --- 151
+  61 --- 146
-  61 --- 161
+  61 --- 162
-  62 --- 117
+  62 --- 124
-  62 x--> 130
+  62 x--> 129
-  62 --- 145
+  62 --- 148
-  62 --- 167
+  62 --- 170
-  63 --- 111
+  63 --- 118
-  63 x--> 130
+  63 x--> 129
   63 --- 144
-  63 --- 173
+  63 --- 167
-  64 --- 116
+  64 --- 113
-  64 x--> 130
+  64 x--> 129
-  64 --- 142
+  64 --- 147
-  64 --- 166
+  64 --- 168
-  65 --- 113
+  65 --- 119
-  65 x--> 130
+  65 x--> 129
-  65 --- 155
+  65 --- 154
-  65 --- 168
+  65 --- 164
-  66 --- 112
+  66 --- 116
-  66 x--> 130
+  66 x--> 129
-  66 --- 143
+  66 --- 152
-  66 --- 175
+  66 --- 166
-  67 --- 124
+  67 --- 110
-  67 x--> 130
+  67 x--> 129
-  67 --- 146
+  67 --- 145
-  67 --- 170
+  67 --- 172
-  68 --- 125
+  68 --- 115
-  68 x--> 130
+  68 x--> 129
-  68 --- 153
+  68 --- 142
-  68 --- 165
+  68 --- 159
-  69 --- 122
+  69 --- 112
-  69 x--> 130
+  69 x--> 129
-  69 --- 141
+  69 --- 149
-  69 --- 164
+  69 --- 174
-  70 --- 115
+  70 --- 111
-  70 x--> 130
+  70 x--> 129
-  70 --- 150
+  70 --- 141
-  70 --- 171
+  70 --- 165
-  71 --- 120
+  71 --- 121
-  71 x--> 130
+  71 x--> 129
-  71 --- 140
+  71 --- 151
-  71 --- 162
+  71 --- 171
-  72 --- 123
+  72 --- 122
-  72 x--> 130
+  72 x--> 129
-  72 --- 154
+  72 --- 153
-  72 --- 169
+  72 --- 163
-  73 --- 110
+  73 --- 120
-  73 x--> 130
+  73 x--> 129
-  73 --- 149
+  73 --- 139
-  73 --- 174
+  73 --- 160
-  74 --- 118
+  74 --- 114
-  74 x--> 130
+  74 x--> 129
-  74 --- 148
+  74 --- 150
-  74 --- 160
+  74 --- 161
   101 --- 106
   101 --- 126
   101 --- 131
@@ -412,11 +412,12 @@ flowchart LR
   103 --- 133
   103 --- 138
   103 --- 158
-  104 --- 109
+  104 --- 125
-  104 --- 129
+  104 --- 130
-  104 --- 134
+  104 --- 135
-  104 --- 139
+  104 --- 155
-  104 --- 159
+  104 --- 175
+  105 --- 109
   105 --- 110
   105 --- 111
   105 --- 112
@@ -432,9 +433,9 @@ flowchart LR
   105 --- 122
   105 --- 123
   105 --- 124
-  105 --- 125
+  105 --- 129
-  105 --- 130
+  105 --- 134
-  105 --- 135
+  105 --- 139
   105 --- 140
   105 --- 141
   105 --- 142
@@ -450,7 +451,7 @@ flowchart LR
   105 --- 152
   105 --- 153
   105 --- 154
-  105 --- 155
+  105 --- 159
   105 --- 160
   105 --- 161
   105 --- 162
@@ -466,77 +467,76 @@ flowchart LR
   105 --- 172
   105 --- 173
   105 --- 174
-  105 --- 175
   136 <--x 106
   156 <--x 106
   137 <--x 107
   157 <--x 107
   138 <--x 108
   158 <--x 108
-  139 <--x 109
+  140 <--x 109
-  159 <--x 109
+  169 <--x 109
-  149 <--x 110
+  173 <--x 109
-  169 <--x 110
+  145 <--x 110
-  174 <--x 110
+  166 <--x 110
-  144 <--x 111
+  172 <--x 110
-  167 <--x 111
+  141 <--x 111
-  143 <--x 112
+  149 <--x 112
-  168 <--x 112
+  159 <--x 112
-  175 <--x 112
+  147 <--x 113
-  155 <--x 113
+  150 <--x 114
-  168 <--x 113
+  160 <--x 114
-  152 <--x 114
+  161 <--x 114
-  163 <--x 114
+  142 <--x 115
-  172 <--x 114
+  159 <--x 115
-  150 <--x 115
+  172 <--x 115
-  142 <--x 116
+  152 <--x 116
-  145 <--x 117
+  164 <--x 116
-  161 <--x 117
+  166 <--x 116
-  167 <--x 117
+  146 <--x 117
-  148 <--x 118
+  162 <--x 117
-  160 <--x 118
+  169 <--x 117
-  174 <--x 118
+  144 <--x 118
-  147 <--x 119
+  170 <--x 118
-  160 <--x 119
+  154 <--x 119
-  172 <--x 119
+  164 <--x 119
-  140 <--x 120
+  139 <--x 120
-  162 <--x 120
+  160 <--x 120
+  163 <--x 120
   151 <--x 121
-  161 <--x 121
+  171 <--x 121
-  163 <--x 121
+  153 <--x 122
-  141 <--x 122
+  163 <--x 122
-  165 <--x 122
+  171 <--x 122
-  154 <--x 123
+  143 <--x 123
-  162 <--x 123
+  161 <--x 123
-  169 <--x 123
+  173 <--x 123
-  146 <--x 124
+  148 <--x 124
+  162 <--x 124
   170 <--x 124
-  175 <--x 124
+  155 <--x 125
-  153 <--x 125
+  175 <--x 125
-  165 <--x 125
-  170 <--x 125
   136 <--x 131
   137 <--x 132
   138 <--x 133
   139 <--x 134
-  140 <--x 135
+  140 <--x 134
-  141 <--x 135
+  141 <--x 134
-  142 <--x 135
+  142 <--x 134
-  143 <--x 135
+  143 <--x 134
-  144 <--x 135
+  144 <--x 134
-  145 <--x 135
+  145 <--x 134
-  146 <--x 135
+  146 <--x 134
-  147 <--x 135
+  147 <--x 134
-  148 <--x 135
+  148 <--x 134
-  149 <--x 135
+  149 <--x 134
-  150 <--x 135
+  150 <--x 134
-  151 <--x 135
+  151 <--x 134
-  152 <--x 135
+  152 <--x 134
-  153 <--x 135
+  153 <--x 134
-  154 <--x 135
+  154 <--x 134
   155 <--x 135
-  164 <--x 177
+  165 <--x 179
-  166 <--x 176
+  167 <--x 178
-  171 <--x 179
+  168 <--x 177
-  173 <--x 178
+  174 <--x 176
 ```

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

@@ -594,10 +594,8 @@ description: Variables in memory after executing exhaust-manifold.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -606,6 +604,8 @@ description: Variables in memory after executing exhaust-manifold.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

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

@@ -139,10 +139,8 @@ description: Variables in memory after executing flange.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XY",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -151,6 +149,8 @@ description: Variables in memory after executing flange.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XY",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -299,10 +299,8 @@ description: Variables in memory after executing flange.kcl
             }
           ],
           "on": {
-            "type": "plane",
-            "id": "[uuid]",
             "artifactId": "[uuid]",
-            "value": "XY",
+            "id": "[uuid]",
             "origin": {
               "x": 0.0,
               "y": 0.0,
@@ -311,6 +309,8 @@ description: Variables in memory after executing flange.kcl
                 "type": "Mm"
               }
             },
+            "type": "plane",
+            "value": "XY",
             "xAxis": {
               "x": 1.0,
               "y": 0.0,
@@ -386,10 +386,8 @@ description: Variables in memory after executing flange.kcl
             }
           ],
           "on": {
-            "type": "plane",
-            "id": "[uuid]",
             "artifactId": "[uuid]",
-            "value": "XY",
+            "id": "[uuid]",
             "origin": {
               "x": 0.0,
               "y": 0.0,
@@ -398,6 +396,8 @@ description: Variables in memory after executing flange.kcl
                 "type": "Mm"
               }
             },
+            "type": "plane",
+            "value": "XY",
             "xAxis": {
               "x": 1.0,
               "y": 0.0,
@@ -473,10 +473,8 @@ description: Variables in memory after executing flange.kcl
             }
           ],
           "on": {
-            "type": "plane",
-            "id": "[uuid]",
             "artifactId": "[uuid]",
-            "value": "XY",
+            "id": "[uuid]",
             "origin": {
               "x": 0.0,
               "y": 0.0,
@@ -485,6 +483,8 @@ description: Variables in memory after executing flange.kcl
                 "type": "Mm"
               }
             },
+            "type": "plane",
+            "value": "XY",
             "xAxis": {
               "x": 1.0,
               "y": 0.0,
@@ -560,10 +560,8 @@ description: Variables in memory after executing flange.kcl
             }
           ],
           "on": {
-            "type": "plane",
-            "id": "[uuid]",
             "artifactId": "[uuid]",
-            "value": "XY",
+            "id": "[uuid]",
             "origin": {
               "x": 0.0,
               "y": 0.0,
@@ -572,6 +570,8 @@ description: Variables in memory after executing flange.kcl
                 "type": "Mm"
               }
             },
+            "type": "plane",
+            "value": "XY",
             "xAxis": {
               "x": 1.0,
               "y": 0.0,
@@ -662,10 +662,8 @@ description: Variables in memory after executing flange.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -674,6 +672,8 @@ description: Variables in memory after executing flange.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -950,10 +950,8 @@ description: Variables in memory after executing flange.kcl
                       }
                     ],
                     "on": {
-                      "type": "plane",
-                      "id": "[uuid]",
                       "artifactId": "[uuid]",
-                      "value": "XY",
+                      "id": "[uuid]",
                       "origin": {
                         "x": 0.0,
                         "y": 0.0,
@@ -962,6 +960,8 @@ description: Variables in memory after executing flange.kcl
                           "type": "Mm"
                         }
                       },
+                      "type": "plane",
+                      "value": "XY",
                       "xAxis": {
                         "x": 1.0,
                         "y": 0.0,
@@ -1194,10 +1194,8 @@ description: Variables in memory after executing flange.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XY",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -1206,6 +1204,8 @@ description: Variables in memory after executing flange.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XY",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,

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

@@ -10,7 +10,7 @@ flowchart LR
     18["Segment<br>[1563, 1608, 0]"]
     19["Segment<br>[1616, 1665, 0]"]
     20["Segment<br>[1673, 1692, 0]"]
-    43[Solid2d]
+    42[Solid2d]
   end
   subgraph path7 [Path]
     7["Path<br>[2383, 2437, 0]"]
@@ -18,12 +18,12 @@ flowchart LR
     22["Segment<br>[2502, 2552, 0]"]
     23["Segment<br>[2558, 2612, 0]"]
     24["Segment<br>[2618, 2638, 0]"]
-    42[Solid2d]
+    38[Solid2d]
   end
   subgraph path8 [Path]
     8["Path<br>[2662, 2825, 0]"]
     25["Segment<br>[2662, 2825, 0]"]
-    39[Solid2d]
+    40[Solid2d]
   end
   subgraph path9 [Path]
     9["Path<br>[3207, 3262, 0]"]
@@ -31,19 +31,19 @@ flowchart LR
     27["Segment<br>[3328, 3378, 0]"]
     28["Segment<br>[3384, 3437, 0]"]
     29["Segment<br>[3443, 3463, 0]"]
-    38[Solid2d]
+    39[Solid2d]
   end
   subgraph path10 [Path]
     10["Path<br>[3487, 3653, 0]"]
     30["Segment<br>[3487, 3653, 0]"]
-    40[Solid2d]
+    43[Solid2d]
   end
   subgraph path11 [Path]
     11["Path<br>[4233, 4274, 0]"]
     31["Segment<br>[4280, 4300, 0]"]
     32["Segment<br>[4306, 4329, 0]"]
     33["Segment<br>[4335, 4342, 0]"]
-    44[Solid2d]
+    41[Solid2d]
   end
   subgraph path12 [Path]
     12["Path<br>[4457, 4497, 0]"]
@@ -51,7 +51,7 @@ flowchart LR
     35["Segment<br>[4529, 4550, 0]"]
     36["Segment<br>[4556, 4577, 0]"]
     37["Segment<br>[4583, 4590, 0]"]
-    41[Solid2d]
+    44[Solid2d]
   end
   1["Plane<br>[1199, 1226, 0]"]
   2["Plane<br>[2354, 2377, 0]"]
@@ -165,296 +165,296 @@ flowchart LR
   6 --- 18
   6 --- 19
   6 --- 20
-  6 --- 43
+  6 --- 42
   6 ---- 45
   7 --- 21
   7 --- 22
   7 --- 23
   7 --- 24
-  7 --- 42
+  7 --- 38
   7 ---- 46
   8 --- 25
-  8 --- 39
+  8 --- 40
   9 --- 26
   9 --- 27
   9 --- 28
   9 --- 29
-  9 --- 38
+  9 --- 39
   9 ---- 47
   10 --- 30
-  10 --- 40
+  10 --- 43
   11 --- 31
   11 --- 32
   11 --- 33
-  11 --- 44
+  11 --- 41
   11 ---- 48
   12 --- 34
   12 --- 35
   12 --- 36
   12 --- 37
-  12 --- 41
+  12 --- 44
   12 ---- 49
-  13 --- 69
+  13 --- 53
-  13 x--> 77
+  13 x--> 73
-  13 --- 99
+  13 --- 88
-  13 --- 128
+  13 --- 107
-  14 --- 68
+  14 --- 54
-  14 x--> 77
+  14 x--> 73
-  14 --- 103
+  14 --- 86
-  14 --- 123
+  14 --- 111
-  15 --- 67
+  15 --- 52
-  15 x--> 77
+  15 x--> 73
-  15 --- 98
+  15 --- 84
-  15 --- 127
+  15 --- 106
-  16 --- 70
+  16 --- 51
-  16 x--> 77
+  16 x--> 73
-  16 --- 101
+  16 --- 85
-  16 --- 124
+  16 --- 109
-  17 --- 72
+  17 --- 55
-  17 x--> 77
+  17 x--> 73
-  17 --- 104
+  17 --- 87
-  17 --- 122
+  17 --- 112
-  18 --- 71
+  18 --- 57
-  18 x--> 77
+  18 x--> 73
-  18 --- 100
+  18 --- 90
-  18 --- 126
+  18 --- 108
-  19 --- 65
+  19 --- 56
-  19 x--> 77
+  19 x--> 73
-  19 --- 105
+  19 --- 89
-  19 --- 121
+  19 --- 113
-  20 --- 66
+  20 --- 50
-  20 x--> 77
+  20 x--> 73
-  20 --- 102
+  20 --- 83
-  20 --- 125
+  20 --- 110
-  21 --- 53
+  21 --- 59
-  21 x--> 78
+  21 x--> 79
-  21 --- 86
+  21 --- 93
-  21 --- 107
+  21 --- 115
-  22 --- 50
+  22 --- 60
-  22 x--> 78
+  22 x--> 79
-  22 --- 84
+  22 --- 94
-  22 --- 108
+  22 --- 116
-  23 --- 51
+  23 --- 61
-  23 x--> 78
+  23 x--> 79
-  23 --- 83
+  23 --- 91
-  23 --- 109
+  23 --- 117
-  24 --- 52
+  24 --- 58
-  24 x--> 78
+  24 x--> 79
-  24 --- 85
+  24 --- 92
-  24 --- 106
+  24 --- 114
   26 --- 62
-  26 x--> 81
+  26 x--> 80
-  26 --- 96
+  26 --- 97
-  26 --- 120
+  26 --- 121
-  27 --- 63
+  27 --- 65
-  27 x--> 81
+  27 x--> 80
-  27 --- 97
+  27 --- 96
-  27 --- 117
+  27 --- 119
-  28 --- 61
+  28 --- 64
-  28 x--> 81
+  28 x--> 80
-  28 --- 95
+  28 --- 98
-  28 --- 119
+  28 --- 120
-  29 --- 64
+  29 --- 63
-  29 x--> 81
+  29 x--> 80
-  29 --- 94
+  29 --- 95
   29 --- 118
-  31 --- 58
+  31 --- 66
-  31 x--> 75
+  31 x--> 76
-  31 --- 93
+  31 --- 100
-  31 --- 116
+  31 --- 123
-  32 --- 60
+  32 --- 68
-  32 x--> 75
+  32 x--> 76
-  32 --- 91
+  32 --- 99
-  32 --- 115
+  32 --- 122
-  33 --- 59
+  33 --- 67
-  33 x--> 75
+  33 x--> 76
-  33 --- 92
+  33 --- 101
-  33 --- 114
+  33 --- 124
-  34 --- 56
+  34 --- 72
-  34 x--> 74
+  34 x--> 77
-  34 --- 87
+  34 --- 104
-  34 --- 111
+  34 --- 126
-  35 --- 55
+  35 --- 70
-  35 x--> 74
+  35 x--> 77
-  35 --- 90
+  35 --- 102
-  35 --- 113
+  35 --- 127
-  36 --- 54
+  36 --- 71
-  36 x--> 74
+  36 x--> 77
-  36 --- 88
+  36 --- 105
-  36 --- 110
+  36 --- 128
-  37 --- 57
+  37 --- 69
-  37 x--> 74
+  37 x--> 77
-  37 --- 89
+  37 --- 103
-  37 --- 112
+  37 --- 125
-  45 --- 65
+  45 --- 50
-  45 --- 66
+  45 --- 51
-  45 --- 67
+  45 --- 52
-  45 --- 68
+  45 --- 53
-  45 --- 69
+  45 --- 54
-  45 --- 70
+  45 --- 55
-  45 --- 71
+  45 --- 56
-  45 --- 72
+  45 --- 57
-  45 --- 77
+  45 --- 73
-  45 --- 82
+  45 --- 78
-  45 --- 98
+  45 --- 83
-  45 --- 99
+  45 --- 84
-  45 --- 100
+  45 --- 85
-  45 --- 101
+  45 --- 86
-  45 --- 102
+  45 --- 87
-  45 --- 103
+  45 --- 88
-  45 --- 104
+  45 --- 89
-  45 --- 105
+  45 --- 90
-  45 --- 121
+  45 --- 106
-  45 --- 122
+  45 --- 107
-  45 --- 123
+  45 --- 108
-  45 --- 124
+  45 --- 109
-  45 --- 125
+  45 --- 110
-  45 --- 126
+  45 --- 111
-  45 --- 127
+  45 --- 112
-  45 --- 128
+  45 --- 113
-  46 --- 50
+  46 --- 58
-  46 --- 51
+  46 --- 59
-  46 --- 52
+  46 --- 60
-  46 --- 53
+  46 --- 61
-  46 --- 73
+  46 --- 74
-  46 --- 78
+  46 --- 79
-  46 --- 83
+  46 --- 91
-  46 --- 84
+  46 --- 92
-  46 --- 85
+  46 --- 93
-  46 --- 86
+  46 --- 94
-  46 --- 106
+  46 --- 114
-  46 --- 107
+  46 --- 115
-  46 --- 108
+  46 --- 116
-  46 --- 109
+  46 --- 117
-  47 --- 61
   47 --- 62
   47 --- 63
   47 --- 64
-  47 --- 76
+  47 --- 65
-  47 --- 81
+  47 --- 75
-  47 --- 94
+  47 --- 80
   47 --- 95
   47 --- 96
   47 --- 97
-  47 --- 117
+  47 --- 98
   47 --- 118
   47 --- 119
   47 --- 120
-  48 --- 58
+  47 --- 121
-  48 --- 59
+  48 --- 66
-  48 --- 60
+  48 --- 67
-  48 --- 75
+  48 --- 68
-  48 --- 80
+  48 --- 76
-  48 --- 91
+  48 --- 81
-  48 --- 92
+  48 --- 99
-  48 --- 93
+  48 --- 100
-  48 --- 114
+  48 --- 101
-  48 --- 115
+  48 --- 122
-  48 --- 116
+  48 --- 123
-  49 --- 54
+  48 --- 124
-  49 --- 55
+  49 --- 69
-  49 --- 56
+  49 --- 70
-  49 --- 57
+  49 --- 71
-  49 --- 74
+  49 --- 72
-  49 --- 79
+  49 --- 77
-  49 --- 87
+  49 --- 82
-  49 --- 88
+  49 --- 102
-  49 --- 89
+  49 --- 103
-  49 --- 90
+  49 --- 104
-  49 --- 110
+  49 --- 105
-  49 --- 111
+  49 --- 125
-  49 --- 112
+  49 --- 126
-  49 --- 113
+  49 --- 127
-  84 <--x 50
+  49 --- 128
-  83 <--x 51
+  83 <--x 50
+  110 <--x 50
+  113 <--x 50
+  85 <--x 51
+  106 <--x 51
   109 <--x 51
-  85 <--x 52
+  84 <--x 52
   106 <--x 52
-  109 <--x 52
+  111 <--x 52
-  86 <--x 53
+  88 <--x 53
-  106 <--x 53
+  107 <--x 53
-  88 <--x 54
+  110 <--x 53
-  110 <--x 54
+  86 <--x 54
-  113 <--x 54
+  107 <--x 54
-  90 <--x 55
+  111 <--x 54
-  111 <--x 55
+  87 <--x 55
-  113 <--x 55
+  109 <--x 55
-  87 <--x 56
+  112 <--x 55
-  111 <--x 56
+  89 <--x 56
-  112 <--x 56
+  108 <--x 56
-  89 <--x 57
+  113 <--x 56
-  110 <--x 57
+  90 <--x 57
+  108 <--x 57
   112 <--x 57
-  93 <--x 58
+  92 <--x 58
   114 <--x 58
-  116 <--x 58
+  117 <--x 58
-  92 <--x 59
+  93 <--x 59
   114 <--x 59
-  115 <--x 59
+  94 <--x 60
-  91 <--x 60
+  91 <--x 61
-  115 <--x 60
+  117 <--x 61
-  116 <--x 60
+  97 <--x 62
-  95 <--x 61
-  119 <--x 61
-  96 <--x 62
   118 <--x 62
-  97 <--x 63
+  95 <--x 63
-  94 <--x 64
+  118 <--x 63
-  118 <--x 64
+  120 <--x 63
-  119 <--x 64
+  98 <--x 64
-  105 <--x 65
+  120 <--x 64
-  121 <--x 65
+  96 <--x 65
-  126 <--x 65
+  100 <--x 66
-  102 <--x 66
+  123 <--x 66
-  121 <--x 66
+  124 <--x 66
-  125 <--x 66
+  101 <--x 67
-  98 <--x 67
+  122 <--x 67
-  123 <--x 67
+  124 <--x 67
-  127 <--x 67
+  99 <--x 68
-  103 <--x 68
+  122 <--x 68
   123 <--x 68
-  128 <--x 68
+  103 <--x 69
-  99 <--x 69
   125 <--x 69
   128 <--x 69
-  101 <--x 70
+  102 <--x 70
-  124 <--x 70
+  126 <--x 70
   127 <--x 70
-  100 <--x 71
+  105 <--x 71
-  122 <--x 71
+  127 <--x 71
-  126 <--x 71
+  128 <--x 71
   104 <--x 72
-  122 <--x 72
+  125 <--x 72
-  124 <--x 72
+  126 <--x 72
-  83 <--x 73
+  91 <--x 74
-  84 <--x 73
+  92 <--x 74
-  85 <--x 73
+  93 <--x 74
-  86 <--x 73
+  94 <--x 74
-  94 <--x 76
+  95 <--x 75
-  95 <--x 76
+  96 <--x 75
-  96 <--x 76
+  97 <--x 75
-  97 <--x 76
+  98 <--x 75
-  87 <--x 79
+  83 <--x 78
-  88 <--x 79
+  84 <--x 78
-  89 <--x 79
+  85 <--x 78
-  90 <--x 79
+  86 <--x 78
-  91 <--x 80
+  87 <--x 78
-  92 <--x 80
+  88 <--x 78
-  93 <--x 80
+  89 <--x 78
-  98 <--x 82
+  90 <--x 78
-  99 <--x 82
+  99 <--x 81
-  100 <--x 82
+  100 <--x 81
-  101 <--x 82
+  101 <--x 81
   102 <--x 82
   103 <--x 82
   104 <--x 82
   105 <--x 82
-  107 <--x 134
+  107 <--x 132
-  108 <--x 133
+  108 <--x 130
-  117 <--x 136
+  111 <--x 129
-  120 <--x 135
+  112 <--x 131
-  122 <--x 129
+  115 <--x 133
-  123 <--x 131
+  116 <--x 134
-  126 <--x 132
+  119 <--x 136
-  128 <--x 130
+  121 <--x 135
 ```

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

@@ -321,10 +321,8 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 44.0,
@@ -333,6 +331,8 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -883,10 +883,8 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "Custom",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 44.0,
@@ -895,6 +893,8 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "Custom",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -1224,10 +1224,8 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": -52.0,
             "y": 0.0,
@@ -1236,6 +1234,8 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 0.0,
             "y": 1.0,
@@ -1378,10 +1378,8 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": -52.0,
             "y": 0.0,
@@ -1390,6 +1388,8 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 0.0,
             "y": 1.0,
@@ -2010,10 +2010,8 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "Custom",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -2022,6 +2020,8 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "Custom",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -2294,10 +2294,8 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "Custom",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -2306,6 +2304,8 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "Custom",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -2583,10 +2583,8 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "Custom",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -2595,6 +2593,8 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "Custom",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -2867,10 +2867,8 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "Custom",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -2879,6 +2877,8 @@ description: Variables in memory after executing focusrite-scarlett-mounting-bra
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "Custom",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,

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

@@ -2,38 +2,38 @@
 flowchart LR
   subgraph path6 [Path]
     6["Path<br>[1017, 1061, 0]"]
-    15["Segment<br>[1069, 1109, 0]"]
+    16["Segment<br>[1069, 1109, 0]"]
     17["Segment<br>[1117, 1163, 0]"]
-    23["Segment<br>[1171, 1212, 0]"]
+    22["Segment<br>[1171, 1212, 0]"]
     25["Segment<br>[1220, 1285, 0]"]
     29["Segment<br>[1293, 1300, 0]"]
-    55[Solid2d]
+    56[Solid2d]
   end
   subgraph path7 [Path]
     7["Path<br>[1017, 1061, 0]"]
-    16["Segment<br>[1069, 1109, 0]"]
+    15["Segment<br>[1069, 1109, 0]"]
     19["Segment<br>[1117, 1163, 0]"]
-    21["Segment<br>[1171, 1212, 0]"]
+    24["Segment<br>[1171, 1212, 0]"]
-    28["Segment<br>[1220, 1285, 0]"]
+    26["Segment<br>[1220, 1285, 0]"]
-    32["Segment<br>[1293, 1300, 0]"]
+    30["Segment<br>[1293, 1300, 0]"]
-    56[Solid2d]
+    58[Solid2d]
   end
   subgraph path8 [Path]
     8["Path<br>[1017, 1061, 0]"]
     13["Segment<br>[1069, 1109, 0]"]
     20["Segment<br>[1117, 1163, 0]"]
-    22["Segment<br>[1171, 1212, 0]"]
+    21["Segment<br>[1171, 1212, 0]"]
-    26["Segment<br>[1220, 1285, 0]"]
+    27["Segment<br>[1220, 1285, 0]"]
-    31["Segment<br>[1293, 1300, 0]"]
+    32["Segment<br>[1293, 1300, 0]"]
     59[Solid2d]
   end
   subgraph path9 [Path]
     9["Path<br>[1017, 1061, 0]"]
     14["Segment<br>[1069, 1109, 0]"]
     18["Segment<br>[1117, 1163, 0]"]
-    24["Segment<br>[1171, 1212, 0]"]
+    23["Segment<br>[1171, 1212, 0]"]
-    27["Segment<br>[1220, 1285, 0]"]
+    28["Segment<br>[1220, 1285, 0]"]
-    30["Segment<br>[1293, 1300, 0]"]
+    31["Segment<br>[1293, 1300, 0]"]
     60[Solid2d]
   end
   subgraph path10 [Path]
@@ -54,7 +54,7 @@ flowchart LR
     42["Segment<br>[3032, 3068, 0]"]
     43["Segment<br>[3074, 3098, 0]"]
     44["Segment<br>[3104, 3111, 0]"]
-    58[Solid2d]
+    54[Solid2d]
   end
   subgraph path12 [Path]
     12["Path<br>[3706, 3756, 0]"]
@@ -67,7 +67,7 @@ flowchart LR
     51["Segment<br>[4150, 4224, 0]"]
     52["Segment<br>[4230, 4298, 0]"]
     53["Segment<br>[4304, 4311, 0]"]
-    54[Solid2d]
+    55[Solid2d]
   end
   1["Plane<br>[1393, 1410, 0]"]
   2["Plane<br>[2657, 2699, 0]"]
@@ -167,32 +167,32 @@ flowchart LR
   2 <--x 4
   2 --- 11
   3 --- 12
-  81 x--> 5
+  79 x--> 5
-  6 --- 15
+  6 --- 16
   6 --- 17
-  6 --- 23
+  6 --- 22
   6 --- 25
   6 --- 29
-  6 --- 55
+  6 --- 56
-  7 --- 16
+  7 --- 15
   7 --- 19
-  7 --- 21
+  7 --- 24
-  7 --- 28
+  7 --- 26
-  7 --- 32
+  7 --- 30
-  7 --- 56
+  7 --- 58
   7 ---- 64
-  81 --- 7
+  79 --- 7
   8 --- 13
   8 --- 20
-  8 --- 22
+  8 --- 21
-  8 --- 26
+  8 --- 27
-  8 --- 31
+  8 --- 32
   8 --- 59
   9 --- 14
   9 --- 18
-  9 --- 24
+  9 --- 23
-  9 --- 27
+  9 --- 28
-  9 --- 30
+  9 --- 31
   9 --- 60
   10 --- 33
   10 --- 34
@@ -208,7 +208,7 @@ flowchart LR
   11 --- 42
   11 --- 43
   11 --- 44
-  11 --- 58
+  11 --- 54
   11 ---- 62
   12 --- 45
   12 --- 46
@@ -219,274 +219,274 @@ flowchart LR
   12 --- 51
   12 --- 52
   12 --- 53
-  12 --- 54
+  12 --- 55
   12 ---- 63
-  16 --- 73
+  15 x--> 79
-  16 x--> 81
+  15 --- 87
-  16 --- 101
+  15 --- 117
-  16 --- 124
+  15 --- 139
-  19 --- 71
+  19 x--> 79
-  19 x--> 81
+  19 --- 85
-  19 --- 103
+  19 --- 116
-  19 --- 127
+  19 --- 140
-  21 --- 70
+  24 x--> 79
-  21 x--> 81
+  24 --- 88
-  21 --- 102
+  24 --- 115
-  21 --- 125
+  24 --- 141
-  28 --- 72
+  26 x--> 79
-  28 x--> 81
+  26 --- 86
-  28 --- 100
+  26 --- 118
-  28 --- 126
+  26 --- 142
-  33 --- 69
+  33 --- 84
-  33 x--> 89
+  33 x--> 91
-  33 --- 97
+  33 --- 112
-  33 --- 120
+  33 --- 135
-  34 --- 67
+  34 --- 82
-  34 x--> 89
+  34 x--> 91
-  34 --- 96
+  34 --- 111
-  34 --- 122
+  34 --- 137
-  35 --- 66
+  35 --- 81
-  35 x--> 89
+  35 x--> 91
-  35 --- 99
+  35 --- 114
-  35 --- 121
+  35 --- 136
-  36 --- 68
+  36 --- 83
-  36 x--> 89
+  36 x--> 91
-  36 --- 98
+  36 --- 113
-  36 --- 123
+  36 --- 138
-  37 --- 65
+  37 --- 80
-  37 x--> 89
+  37 x--> 91
-  37 --- 95
+  37 --- 110
-  37 --- 119
+  37 --- 134
-  38 --- 85
+  38 --- 70
-  38 x--> 91
+  38 x--> 89
-  38 --- 117
+  38 --- 101
-  38 --- 137
+  38 --- 124
-  39 --- 88
+  39 --- 67
-  39 x--> 91
+  39 x--> 89
-  39 --- 114
+  39 --- 98
-  39 --- 136
+  39 --- 121
-  40 --- 87
+  40 --- 71
-  40 x--> 91
+  40 x--> 89
-  40 --- 115
+  40 --- 95
-  40 --- 139
+  40 --- 122
-  41 --- 82
+  41 --- 69
-  41 x--> 91
+  41 x--> 89
-  41 --- 113
+  41 --- 99
-  41 --- 140
+  41 --- 120
-  42 --- 86
+  42 --- 65
-  42 x--> 91
+  42 x--> 89
-  42 --- 116
+  42 --- 100
-  42 --- 141
+  42 --- 123
-  43 --- 84
+  43 --- 68
-  43 x--> 91
+  43 x--> 89
-  43 --- 112
+  43 --- 96
-  43 --- 142
+  43 --- 119
-  44 --- 83
+  44 --- 66
-  44 x--> 91
+  44 x--> 89
-  44 --- 118
+  44 --- 97
-  44 --- 138
+  44 --- 125
-  45 --- 78
+  45 --- 76
   45 x--> 93
   45 --- 109
-  45 --- 131
+  45 --- 133
-  46 --- 77
+  46 --- 74
   46 x--> 93
   46 --- 104
-  46 --- 130
+  46 --- 128
   47 --- 75
   47 x--> 93
-  47 --- 111
+  47 --- 102
-  47 --- 132
+  47 --- 129
-  48 --- 79
+  48 --- 73
   48 x--> 93
-  48 --- 110
+  48 --- 106
-  48 --- 134
+  48 --- 132
-  49 --- 74
+  49 --- 72
   49 x--> 93
-  49 --- 105
+  49 --- 103
-  49 --- 128
+  49 --- 126
-  50 --- 80
+  50 --- 77
   50 x--> 93
-  50 --- 108
+  50 --- 105
-  50 --- 133
+  50 --- 130
-  51 --- 81
+  51 --- 79
   51 x--> 93
-  51 --- 106
+  51 --- 107
-  51 --- 129
+  51 --- 127
-  52 --- 76
+  52 --- 78
   52 x--> 93
-  52 --- 107
+  52 --- 108
-  52 --- 135
+  52 --- 131
-  61 --- 65
+  61 --- 80
-  61 --- 66
+  61 --- 81
-  61 --- 67
+  61 --- 82
-  61 --- 68
+  61 --- 83
-  61 --- 69
+  61 --- 84
-  61 --- 89
+  61 --- 91
-  61 --- 92
+  61 --- 94
-  61 --- 95
+  61 --- 110
-  61 --- 96
+  61 --- 111
-  61 --- 97
+  61 --- 112
-  61 --- 98
+  61 --- 113
-  61 --- 99
+  61 --- 114
-  61 --- 119
+  61 --- 134
-  61 --- 120
+  61 --- 135
-  61 --- 121
+  61 --- 136
-  61 --- 122
+  61 --- 137
-  61 --- 123
+  61 --- 138
-  62 --- 82
+  62 --- 65
-  62 --- 83
+  62 --- 66
-  62 --- 84
+  62 --- 67
-  62 --- 85
+  62 --- 68
-  62 --- 86
+  62 --- 69
-  62 --- 87
+  62 --- 70
-  62 --- 88
+  62 --- 71
-  62 --- 91
+  62 --- 89
-  62 --- 94
+  62 --- 92
-  62 --- 112
+  62 --- 95
-  62 --- 113
+  62 --- 96
-  62 --- 114
+  62 --- 97
-  62 --- 115
+  62 --- 98
-  62 --- 116
+  62 --- 99
-  62 --- 117
+  62 --- 100
-  62 --- 118
+  62 --- 101
-  62 --- 136
+  62 --- 119
-  62 --- 137
+  62 --- 120
-  62 --- 138
+  62 --- 121
-  62 --- 139
+  62 --- 122
-  62 --- 140
+  62 --- 123
-  62 --- 141
+  62 --- 124
-  62 --- 142
+  62 --- 125
+  63 --- 72
+  63 --- 73
   63 --- 74
   63 --- 75
   63 --- 76
   63 --- 77
   63 --- 78
   63 --- 79
-  63 --- 80
-  63 --- 81
   63 --- 90
   63 --- 93
+  63 --- 102
+  63 --- 103
   63 --- 104
   63 --- 105
   63 --- 106
   63 --- 107
   63 --- 108
   63 --- 109
-  63 --- 110
+  63 --- 126
-  63 --- 111
+  63 --- 127
   63 --- 128
   63 --- 129
   63 --- 130
   63 --- 131
   63 --- 132
   63 --- 133
-  63 --- 134
+  64 --- 85
-  63 --- 135
+  64 --- 86
-  64 --- 70
+  64 --- 87
-  64 --- 71
+  64 --- 88
-  64 --- 72
+  64 --- 115
-  64 --- 73
+  64 --- 116
-  64 --- 100
+  64 --- 117
-  64 --- 101
+  64 --- 118
-  64 --- 102
+  64 --- 139
-  64 --- 103
+  64 --- 140
-  64 --- 124
+  64 --- 141
-  64 --- 125
+  64 --- 142
-  64 --- 126
+  100 <--x 65
-  64 --- 127
-  95 <--x 65
-  119 <--x 65
   123 <--x 65
-  99 <--x 66
+  97 <--x 66
-  121 <--x 66
+  119 <--x 66
-  96 <--x 67
+  125 <--x 66
-  120 <--x 67
+  98 <--x 67
-  98 <--x 68
+  121 <--x 67
-  121 <--x 68
+  96 <--x 68
+  119 <--x 68
   123 <--x 68
-  97 <--x 69
+  99 <--x 69
-  119 <--x 69
+  122 <--x 69
-  120 <--x 69
+  101 <--x 70
-  102 <--x 70
   125 <--x 70
-  127 <--x 70
+  95 <--x 71
-  103 <--x 71
+  121 <--x 71
-  124 <--x 71
+  122 <--x 71
-  127 <--x 71
+  103 <--x 72
-  100 <--x 72
-  125 <--x 72
   126 <--x 72
-  101 <--x 73
+  132 <--x 72
-  124 <--x 73
+  106 <--x 73
-  126 <--x 73
+  129 <--x 73
-  105 <--x 74
+  132 <--x 73
+  104 <--x 74
   128 <--x 74
-  134 <--x 74
+  133 <--x 74
-  100 <--x 75
-  101 <--x 75
   102 <--x 75
-  103 <--x 75
+  115 <--x 75
-  111 <--x 75
+  116 <--x 75
-  130 <--x 75
+  117 <--x 75
-  132 <--x 75
+  118 <--x 75
-  107 <--x 76
+  128 <--x 75
-  129 <--x 76
+  129 <--x 75
-  135 <--x 76
+  109 <--x 76
-  104 <--x 77
+  131 <--x 76
+  133 <--x 76
+  105 <--x 77
+  126 <--x 77
   130 <--x 77
-  131 <--x 77
+  108 <--x 78
-  109 <--x 78
+  127 <--x 78
   131 <--x 78
-  135 <--x 78
+  107 <--x 79
-  110 <--x 79
+  127 <--x 79
-  132 <--x 79
+  130 <--x 79
-  134 <--x 79
+  110 <--x 80
-  108 <--x 80
+  134 <--x 80
-  128 <--x 80
+  138 <--x 80
-  133 <--x 80
+  114 <--x 81
-  106 <--x 81
+  136 <--x 81
-  129 <--x 81
+  111 <--x 82
-  133 <--x 81
+  135 <--x 82
-  113 <--x 82
+  113 <--x 83
-  139 <--x 82
+  136 <--x 83
-  118 <--x 83
   138 <--x 83
-  142 <--x 83
   112 <--x 84
-  141 <--x 84
+  134 <--x 84
-  142 <--x 84
+  135 <--x 84
-  117 <--x 85
+  116 <--x 85
-  138 <--x 85
+  139 <--x 85
-  116 <--x 86
+  140 <--x 85
+  118 <--x 86
   141 <--x 86
-  115 <--x 87
+  142 <--x 86
-  136 <--x 87
+  117 <--x 87
   139 <--x 87
-  114 <--x 88
+  142 <--x 87
-  136 <--x 88
+  115 <--x 88
+  140 <--x 88
+  141 <--x 88
+  102 <--x 90
+  103 <--x 90
   104 <--x 90
   105 <--x 90
   106 <--x 90
   107 <--x 90
   108 <--x 90
   109 <--x 90
-  110 <--x 90
-  111 <--x 90
   95 <--x 92
   96 <--x 92
   97 <--x 92
   98 <--x 92
   99 <--x 92
+  100 <--x 92
+  101 <--x 92
+  110 <--x 94
+  111 <--x 94
   112 <--x 94
   113 <--x 94
   114 <--x 94
-  115 <--x 94
+  120 <--x 145
-  116 <--x 94
+  124 <--x 146
-  117 <--x 94
+  135 <--x 143
-  118 <--x 94
+  137 <--x 144
-  120 <--x 143
-  122 <--x 144
-  137 <--x 145
-  140 <--x 146
 ```

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

@@ -170,10 +170,8 @@ description: Variables in memory after executing food-service-spatula.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -182,6 +180,8 @@ description: Variables in memory after executing food-service-spatula.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -379,10 +379,8 @@ description: Variables in memory after executing food-service-spatula.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -391,6 +389,8 @@ description: Variables in memory after executing food-service-spatula.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -442,9 +442,8 @@ description: Variables in memory after executing food-service-spatula.kcl
   "flipperSketch": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "XY",
+      "id": "[uuid]",
       "origin": {
         "x": 0.0,
         "y": 0.0,
@@ -453,6 +452,7 @@ description: Variables in memory after executing food-service-spatula.kcl
           "type": "Mm"
         }
       },
+      "value": "XY",
       "xAxis": {
         "x": 1.0,
         "y": 0.0,
@@ -774,10 +774,8 @@ description: Variables in memory after executing food-service-spatula.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 208.593833,
             "y": 0.0,
@@ -786,6 +784,8 @@ description: Variables in memory after executing food-service-spatula.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 0.342019894888923,
             "y": -0.0,
@@ -1281,10 +1281,8 @@ description: Variables in memory after executing food-service-spatula.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "Custom",
+              "id": "[uuid]",
               "origin": {
                 "x": 208.593833,
                 "y": 0.0,
@@ -1293,6 +1291,8 @@ description: Variables in memory after executing food-service-spatula.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "Custom",
               "xAxis": {
                 "x": 0.342019894888923,
                 "y": -0.0,
@@ -1599,10 +1599,8 @@ description: Variables in memory after executing food-service-spatula.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "Custom",
+        "id": "[uuid]",
         "origin": {
           "x": 208.593833,
           "y": 0.0,
@@ -1611,6 +1609,8 @@ description: Variables in memory after executing food-service-spatula.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "Custom",
         "xAxis": {
           "x": 0.342019894888923,
           "y": -0.0,
@@ -1662,9 +1662,8 @@ description: Variables in memory after executing food-service-spatula.kcl
   "gripSketch": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "Custom",
+      "id": "[uuid]",
       "origin": {
         "x": 208.593833,
         "y": 0.0,
@@ -1673,6 +1672,7 @@ description: Variables in memory after executing food-service-spatula.kcl
           "type": "Mm"
         }
       },
+      "value": "Custom",
       "xAxis": {
         "x": 0.342019894888923,
         "y": -0.0,
@@ -1937,10 +1937,8 @@ description: Variables in memory after executing food-service-spatula.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 7.5,
@@ -1949,6 +1947,8 @@ description: Variables in memory after executing food-service-spatula.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -2348,10 +2348,8 @@ description: Variables in memory after executing food-service-spatula.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "Custom",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 7.5,
@@ -2360,6 +2358,8 @@ description: Variables in memory after executing food-service-spatula.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "Custom",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -2415,9 +2415,8 @@ description: Variables in memory after executing food-service-spatula.kcl
   "handleSketch": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "Custom",
+      "id": "[uuid]",
       "origin": {
         "x": 0.0,
         "y": 7.5,
@@ -2426,6 +2425,7 @@ description: Variables in memory after executing food-service-spatula.kcl
           "type": "Mm"
         }
       },
+      "value": "Custom",
       "xAxis": {
         "x": 1.0,
         "y": 0.0,
@@ -2759,10 +2759,8 @@ description: Variables in memory after executing food-service-spatula.kcl
             }
           ],
           "on": {
-            "type": "plane",
-            "id": "[uuid]",
             "artifactId": "[uuid]",
-            "value": "Custom",
+            "id": "[uuid]",
             "origin": {
               "x": 208.593833,
               "y": 0.0,
@@ -2771,6 +2769,8 @@ description: Variables in memory after executing food-service-spatula.kcl
                 "type": "Mm"
               }
             },
+            "type": "plane",
+            "value": "Custom",
             "xAxis": {
               "x": 0.342019894888923,
               "y": -0.0,
@@ -2947,10 +2947,8 @@ description: Variables in memory after executing food-service-spatula.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -2959,6 +2957,8 @@ description: Variables in memory after executing food-service-spatula.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -3114,10 +3114,8 @@ description: Variables in memory after executing food-service-spatula.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -3126,6 +3124,8 @@ description: Variables in memory after executing food-service-spatula.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -3281,10 +3281,8 @@ description: Variables in memory after executing food-service-spatula.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -3293,6 +3291,8 @@ description: Variables in memory after executing food-service-spatula.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -3450,10 +3450,8 @@ description: Variables in memory after executing food-service-spatula.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -3462,6 +3460,8 @@ description: Variables in memory after executing food-service-spatula.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,

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

@@ -110,10 +110,8 @@ description: Variables in memory after executing french-press.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -122,6 +120,8 @@ description: Variables in memory after executing french-press.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -356,10 +356,8 @@ description: Variables in memory after executing french-press.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "Custom",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -368,6 +366,8 @@ description: Variables in memory after executing french-press.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "Custom",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -635,10 +635,8 @@ description: Variables in memory after executing french-press.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "Custom",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -647,6 +645,8 @@ description: Variables in memory after executing french-press.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "Custom",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -914,10 +914,8 @@ description: Variables in memory after executing french-press.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "Custom",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -926,6 +924,8 @@ description: Variables in memory after executing french-press.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "Custom",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -1060,10 +1060,8 @@ description: Variables in memory after executing french-press.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -1072,6 +1070,8 @@ description: Variables in memory after executing french-press.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -1235,10 +1235,8 @@ description: Variables in memory after executing french-press.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "Custom",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -1247,6 +1245,8 @@ description: Variables in memory after executing french-press.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "Custom",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -1443,10 +1443,8 @@ description: Variables in memory after executing french-press.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "Custom",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -1455,6 +1453,8 @@ description: Variables in memory after executing french-press.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "Custom",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -1651,10 +1651,8 @@ description: Variables in memory after executing french-press.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "Custom",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -1663,6 +1661,8 @@ description: Variables in memory after executing french-press.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "Custom",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -1859,10 +1859,8 @@ description: Variables in memory after executing french-press.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "Custom",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -1871,6 +1869,8 @@ description: Variables in memory after executing french-press.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "Custom",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -2067,10 +2067,8 @@ description: Variables in memory after executing french-press.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "Custom",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -2079,6 +2077,8 @@ description: Variables in memory after executing french-press.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "Custom",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -2275,10 +2275,8 @@ description: Variables in memory after executing french-press.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "Custom",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -2287,6 +2285,8 @@ description: Variables in memory after executing french-press.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "Custom",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -2483,10 +2483,8 @@ description: Variables in memory after executing french-press.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "Custom",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -2495,6 +2493,8 @@ description: Variables in memory after executing french-press.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "Custom",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -2691,10 +2691,8 @@ description: Variables in memory after executing french-press.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "Custom",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -2703,6 +2701,8 @@ description: Variables in memory after executing french-press.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "Custom",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -2904,10 +2904,8 @@ description: Variables in memory after executing french-press.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "Custom",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -2916,6 +2914,8 @@ description: Variables in memory after executing french-press.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "Custom",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -3112,10 +3112,8 @@ description: Variables in memory after executing french-press.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "Custom",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -3124,6 +3122,8 @@ description: Variables in memory after executing french-press.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "Custom",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -3320,10 +3320,8 @@ description: Variables in memory after executing french-press.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "Custom",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -3332,6 +3330,8 @@ description: Variables in memory after executing french-press.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "Custom",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -3528,10 +3528,8 @@ description: Variables in memory after executing french-press.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "Custom",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -3540,6 +3538,8 @@ description: Variables in memory after executing french-press.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "Custom",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -3674,10 +3674,8 @@ description: Variables in memory after executing french-press.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -3686,6 +3684,8 @@ description: Variables in memory after executing french-press.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -4111,10 +4111,8 @@ description: Variables in memory after executing french-press.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": -8.254999999999999,
@@ -4123,6 +4121,8 @@ description: Variables in memory after executing french-press.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -4560,10 +4560,8 @@ description: Variables in memory after executing french-press.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -4572,6 +4570,8 @@ description: Variables in memory after executing french-press.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -5208,10 +5208,8 @@ description: Variables in memory after executing french-press.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "Custom",
+              "id": "[uuid]",
               "origin": {
                 "x": -0.26,
                 "y": 0.26,
@@ -5220,6 +5218,8 @@ description: Variables in memory after executing french-press.kcl
                   "type": "Inches"
                 }
               },
+              "type": "plane",
+              "value": "Custom",
               "xAxis": {
                 "x": 0.7071067811865475,
                 "y": 0.7071067811865475,
@@ -5869,10 +5869,8 @@ description: Variables in memory after executing french-press.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "Custom",
+              "id": "[uuid]",
               "origin": {
                 "x": -0.26,
                 "y": 0.26,
@@ -5881,6 +5879,8 @@ description: Variables in memory after executing french-press.kcl
                   "type": "Inches"
                 }
               },
+              "type": "plane",
+              "value": "Custom",
               "xAxis": {
                 "x": 0.7071067811865475,
                 "y": 0.7071067811865475,
@@ -6530,10 +6530,8 @@ description: Variables in memory after executing french-press.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "Custom",
+              "id": "[uuid]",
               "origin": {
                 "x": -0.26,
                 "y": 0.26,
@@ -6542,6 +6540,8 @@ description: Variables in memory after executing french-press.kcl
                   "type": "Inches"
                 }
               },
+              "type": "plane",
+              "value": "Custom",
               "xAxis": {
                 "x": 0.7071067811865475,
                 "y": 0.7071067811865475,
@@ -7191,10 +7191,8 @@ description: Variables in memory after executing french-press.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "Custom",
+              "id": "[uuid]",
               "origin": {
                 "x": -0.26,
                 "y": 0.26,
@@ -7203,6 +7201,8 @@ description: Variables in memory after executing french-press.kcl
                   "type": "Inches"
                 }
               },
+              "type": "plane",
+              "value": "Custom",
               "xAxis": {
                 "x": 0.7071067811865475,
                 "y": 0.7071067811865475,
@@ -7318,10 +7318,8 @@ description: Variables in memory after executing french-press.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "Custom",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -7330,6 +7328,8 @@ description: Variables in memory after executing french-press.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "Custom",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -7529,10 +7529,8 @@ description: Variables in memory after executing french-press.kcl
                   }
                 ],
                 "on": {
-                  "type": "plane",
-                  "id": "[uuid]",
                   "artifactId": "[uuid]",
-                  "value": "Custom",
+                  "id": "[uuid]",
                   "origin": {
                     "x": 0.0,
                     "y": 0.0,
@@ -7541,6 +7539,8 @@ description: Variables in memory after executing french-press.kcl
                       "type": "Mm"
                     }
                   },
+                  "type": "plane",
+                  "value": "Custom",
                   "xAxis": {
                     "x": 1.0,
                     "y": 0.0,
@@ -7773,10 +7773,8 @@ description: Variables in memory after executing french-press.kcl
                   }
                 ],
                 "on": {
-                  "type": "plane",
-                  "id": "[uuid]",
                   "artifactId": "[uuid]",
-                  "value": "Custom",
+                  "id": "[uuid]",
                   "origin": {
                     "x": 0.0,
                     "y": 0.0,
@@ -7785,6 +7783,8 @@ description: Variables in memory after executing french-press.kcl
                       "type": "Mm"
                     }
                   },
+                  "type": "plane",
+                  "value": "Custom",
                   "xAxis": {
                     "x": 1.0,
                     "y": 0.0,
@@ -8017,10 +8017,8 @@ description: Variables in memory after executing french-press.kcl
                   }
                 ],
                 "on": {
-                  "type": "plane",
-                  "id": "[uuid]",
                   "artifactId": "[uuid]",
-                  "value": "Custom",
+                  "id": "[uuid]",
                   "origin": {
                     "x": 0.0,
                     "y": 0.0,
@@ -8029,6 +8027,8 @@ description: Variables in memory after executing french-press.kcl
                       "type": "Mm"
                     }
                   },
+                  "type": "plane",
+                  "value": "Custom",
                   "xAxis": {
                     "x": 1.0,
                     "y": 0.0,
@@ -8310,10 +8310,8 @@ description: Variables in memory after executing french-press.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -8322,6 +8320,8 @@ description: Variables in memory after executing french-press.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -8598,10 +8598,8 @@ description: Variables in memory after executing french-press.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -8610,6 +8608,8 @@ description: Variables in memory after executing french-press.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -8693,10 +8693,8 @@ description: Variables in memory after executing french-press.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "Custom",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -8705,6 +8703,8 @@ description: Variables in memory after executing french-press.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "Custom",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -8847,10 +8847,8 @@ description: Variables in memory after executing french-press.kcl
                   }
                 ],
                 "on": {
-                  "type": "plane",
-                  "id": "[uuid]",
                   "artifactId": "[uuid]",
-                  "value": "Custom",
+                  "id": "[uuid]",
                   "origin": {
                     "x": 0.0,
                     "y": 0.0,
@@ -8859,6 +8857,8 @@ description: Variables in memory after executing french-press.kcl
                       "type": "Mm"
                     }
                   },
+                  "type": "plane",
+                  "value": "Custom",
                   "xAxis": {
                     "x": 1.0,
                     "y": 0.0,
@@ -9034,10 +9034,8 @@ description: Variables in memory after executing french-press.kcl
                   }
                 ],
                 "on": {
-                  "type": "plane",
-                  "id": "[uuid]",
                   "artifactId": "[uuid]",
-                  "value": "Custom",
+                  "id": "[uuid]",
                   "origin": {
                     "x": 0.0,
                     "y": 0.0,
@@ -9046,6 +9044,8 @@ description: Variables in memory after executing french-press.kcl
                       "type": "Mm"
                     }
                   },
+                  "type": "plane",
+                  "value": "Custom",
                   "xAxis": {
                     "x": 1.0,
                     "y": 0.0,
@@ -9221,10 +9221,8 @@ description: Variables in memory after executing french-press.kcl
                   }
                 ],
                 "on": {
-                  "type": "plane",
-                  "id": "[uuid]",
                   "artifactId": "[uuid]",
-                  "value": "Custom",
+                  "id": "[uuid]",
                   "origin": {
                     "x": 0.0,
                     "y": 0.0,
@@ -9233,6 +9231,8 @@ description: Variables in memory after executing french-press.kcl
                       "type": "Mm"
                     }
                   },
+                  "type": "plane",
+                  "value": "Custom",
                   "xAxis": {
                     "x": 1.0,
                     "y": 0.0,
@@ -9408,10 +9408,8 @@ description: Variables in memory after executing french-press.kcl
                   }
                 ],
                 "on": {
-                  "type": "plane",
-                  "id": "[uuid]",
                   "artifactId": "[uuid]",
-                  "value": "Custom",
+                  "id": "[uuid]",
                   "origin": {
                     "x": 0.0,
                     "y": 0.0,
@@ -9420,6 +9418,8 @@ description: Variables in memory after executing french-press.kcl
                       "type": "Mm"
                     }
                   },
+                  "type": "plane",
+                  "value": "Custom",
                   "xAxis": {
                     "x": 1.0,
                     "y": 0.0,
@@ -9595,10 +9595,8 @@ description: Variables in memory after executing french-press.kcl
                   }
                 ],
                 "on": {
-                  "type": "plane",
-                  "id": "[uuid]",
                   "artifactId": "[uuid]",
-                  "value": "Custom",
+                  "id": "[uuid]",
                   "origin": {
                     "x": 0.0,
                     "y": 0.0,
@@ -9607,6 +9605,8 @@ description: Variables in memory after executing french-press.kcl
                       "type": "Mm"
                     }
                   },
+                  "type": "plane",
+                  "value": "Custom",
                   "xAxis": {
                     "x": 1.0,
                     "y": 0.0,
@@ -9782,10 +9782,8 @@ description: Variables in memory after executing french-press.kcl
                   }
                 ],
                 "on": {
-                  "type": "plane",
-                  "id": "[uuid]",
                   "artifactId": "[uuid]",
-                  "value": "Custom",
+                  "id": "[uuid]",
                   "origin": {
                     "x": 0.0,
                     "y": 0.0,
@@ -9794,6 +9792,8 @@ description: Variables in memory after executing french-press.kcl
                       "type": "Mm"
                     }
                   },
+                  "type": "plane",
+                  "value": "Custom",
                   "xAxis": {
                     "x": 1.0,
                     "y": 0.0,
@@ -9969,10 +9969,8 @@ description: Variables in memory after executing french-press.kcl
                   }
                 ],
                 "on": {
-                  "type": "plane",
-                  "id": "[uuid]",
                   "artifactId": "[uuid]",
-                  "value": "Custom",
+                  "id": "[uuid]",
                   "origin": {
                     "x": 0.0,
                     "y": 0.0,
@@ -9981,6 +9979,8 @@ description: Variables in memory after executing french-press.kcl
                       "type": "Mm"
                     }
                   },
+                  "type": "plane",
+                  "value": "Custom",
                   "xAxis": {
                     "x": 1.0,
                     "y": 0.0,
@@ -10156,10 +10156,8 @@ description: Variables in memory after executing french-press.kcl
                   }
                 ],
                 "on": {
-                  "type": "plane",
-                  "id": "[uuid]",
                   "artifactId": "[uuid]",
-                  "value": "Custom",
+                  "id": "[uuid]",
                   "origin": {
                     "x": 0.0,
                     "y": 0.0,
@@ -10168,6 +10166,8 @@ description: Variables in memory after executing french-press.kcl
                       "type": "Mm"
                     }
                   },
+                  "type": "plane",
+                  "value": "Custom",
                   "xAxis": {
                     "x": 1.0,
                     "y": 0.0,
@@ -10348,10 +10348,8 @@ description: Variables in memory after executing french-press.kcl
                   }
                 ],
                 "on": {
-                  "type": "plane",
-                  "id": "[uuid]",
                   "artifactId": "[uuid]",
-                  "value": "Custom",
+                  "id": "[uuid]",
                   "origin": {
                     "x": 0.0,
                     "y": 0.0,
@@ -10360,6 +10358,8 @@ description: Variables in memory after executing french-press.kcl
                       "type": "Mm"
                     }
                   },
+                  "type": "plane",
+                  "value": "Custom",
                   "xAxis": {
                     "x": 1.0,
                     "y": 0.0,
@@ -10535,10 +10535,8 @@ description: Variables in memory after executing french-press.kcl
                   }
                 ],
                 "on": {
-                  "type": "plane",
-                  "id": "[uuid]",
                   "artifactId": "[uuid]",
-                  "value": "Custom",
+                  "id": "[uuid]",
                   "origin": {
                     "x": 0.0,
                     "y": 0.0,
@@ -10547,6 +10545,8 @@ description: Variables in memory after executing french-press.kcl
                       "type": "Mm"
                     }
                   },
+                  "type": "plane",
+                  "value": "Custom",
                   "xAxis": {
                     "x": 1.0,
                     "y": 0.0,
@@ -10722,10 +10722,8 @@ description: Variables in memory after executing french-press.kcl
                   }
                 ],
                 "on": {
-                  "type": "plane",
-                  "id": "[uuid]",
                   "artifactId": "[uuid]",
-                  "value": "Custom",
+                  "id": "[uuid]",
                   "origin": {
                     "x": 0.0,
                     "y": 0.0,
@@ -10734,6 +10732,8 @@ description: Variables in memory after executing french-press.kcl
                       "type": "Mm"
                     }
                   },
+                  "type": "plane",
+                  "value": "Custom",
                   "xAxis": {
                     "x": 1.0,
                     "y": 0.0,
@@ -10909,10 +10909,8 @@ description: Variables in memory after executing french-press.kcl
                   }
                 ],
                 "on": {
-                  "type": "plane",
-                  "id": "[uuid]",
                   "artifactId": "[uuid]",
-                  "value": "Custom",
+                  "id": "[uuid]",
                   "origin": {
                     "x": 0.0,
                     "y": 0.0,
@@ -10921,6 +10919,8 @@ description: Variables in memory after executing french-press.kcl
                       "type": "Mm"
                     }
                   },
+                  "type": "plane",
+                  "value": "Custom",
                   "xAxis": {
                     "x": 1.0,
                     "y": 0.0,
@@ -11034,10 +11034,8 @@ description: Variables in memory after executing french-press.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -11046,6 +11044,8 @@ description: Variables in memory after executing french-press.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -11303,10 +11303,8 @@ description: Variables in memory after executing french-press.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -11315,6 +11313,8 @@ description: Variables in memory after executing french-press.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -11650,10 +11650,8 @@ description: Variables in memory after executing french-press.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "Custom",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": -8.254999999999999,
@@ -11662,6 +11660,8 @@ description: Variables in memory after executing french-press.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "Custom",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,

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

@@ -998,10 +998,8 @@ description: Variables in memory after executing gear.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -1010,6 +1008,8 @@ description: Variables in memory after executing gear.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -2076,10 +2076,8 @@ description: Variables in memory after executing gear.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XY",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -2088,6 +2086,8 @@ description: Variables in memory after executing gear.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XY",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -3596,10 +3596,8 @@ description: Variables in memory after executing gear.kcl
       "id": "[uuid]",
       "paths": [],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -3608,6 +3606,8 @@ description: Variables in memory after executing gear.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -7557,10 +7557,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -7569,6 +7567,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -11514,10 +11514,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -11526,6 +11524,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -15471,10 +15471,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -15483,6 +15481,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -19428,10 +19428,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -19440,6 +19438,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -23385,10 +23385,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -23397,6 +23395,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -27342,10 +27342,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -27354,6 +27352,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -31299,10 +31299,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -31311,6 +31309,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -35256,10 +35256,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -35268,6 +35266,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -39213,10 +39213,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -39225,6 +39223,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -43170,10 +43170,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -43182,6 +43180,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -47127,10 +47127,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -47139,6 +47137,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -51084,10 +51084,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -51096,6 +51094,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -55041,10 +55041,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -55053,6 +55051,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -58998,10 +58998,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -59010,6 +59008,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -62955,10 +62955,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -62967,6 +62965,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -66912,10 +66912,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -66924,6 +66922,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -70869,10 +70869,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -70881,6 +70879,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -74826,10 +74826,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -74838,6 +74836,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -78783,10 +78783,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -78795,6 +78793,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -82740,10 +82740,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -82752,6 +82750,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -86697,10 +86697,8 @@ description: Variables in memory after executing gear.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XY",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -86709,6 +86707,8 @@ description: Variables in memory after executing gear.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XY",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,

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

@@ -5,81 +5,81 @@ flowchart LR
     18["Segment<br>[955, 977, 0]"]
     21["Segment<br>[985, 1029, 0]"]
     23["Segment<br>[1037, 1064, 0]"]
-    25["Segment<br>[1072, 1116, 0]"]
+    24["Segment<br>[1072, 1116, 0]"]
-    27["Segment<br>[1124, 1131, 0]"]
+    26["Segment<br>[1124, 1131, 0]"]
-    72[Solid2d]
+    74[Solid2d]
   end
   subgraph path12 [Path]
     12["Path<br>[922, 947, 0]"]
     19["Segment<br>[955, 977, 0]"]
     20["Segment<br>[985, 1029, 0]"]
     22["Segment<br>[1037, 1064, 0]"]
-    24["Segment<br>[1072, 1116, 0]"]
+    25["Segment<br>[1072, 1116, 0]"]
-    26["Segment<br>[1124, 1131, 0]"]
+    27["Segment<br>[1124, 1131, 0]"]
-    76[Solid2d]
+    77[Solid2d]
   end
   subgraph path13 [Path]
     13["Path<br>[2723, 2810, 0]"]
-    29["Segment<br>[2818, 2897, 0]"]
+    28["Segment<br>[2818, 2897, 0]"]
     30["Segment<br>[2905, 2970, 0]"]
-    33["Segment<br>[2978, 3060, 0]"]
+    32["Segment<br>[2978, 3060, 0]"]
-    35["Segment<br>[3068, 3114, 0]"]
+    34["Segment<br>[3068, 3114, 0]"]
     37["Segment<br>[3122, 3201, 0]"]
-    39["Segment<br>[3209, 3276, 0]"]
+    38["Segment<br>[3209, 3276, 0]"]
     40["Segment<br>[3284, 3363, 0]"]
-    43["Segment<br>[3371, 3417, 0]"]
+    42["Segment<br>[3371, 3417, 0]"]
     44["Segment<br>[3425, 3507, 0]"]
-    47["Segment<br>[3515, 3583, 0]"]
+    46["Segment<br>[3515, 3583, 0]"]
     49["Segment<br>[3591, 3670, 0]"]
     50["Segment<br>[3678, 3743, 0]"]
     52["Segment<br>[3751, 3833, 0]"]
     55["Segment<br>[3841, 3909, 0]"]
     56["Segment<br>[3917, 3999, 0]"]
-    58["Segment<br>[4007, 4056, 0]"]
+    59["Segment<br>[4007, 4056, 0]"]
     61["Segment<br>[4064, 4071, 0]"]
-    73[Solid2d]
+    71[Solid2d]
   end
   subgraph path14 [Path]
     14["Path<br>[2723, 2810, 0]"]
-    28["Segment<br>[2818, 2897, 0]"]
+    29["Segment<br>[2818, 2897, 0]"]
     31["Segment<br>[2905, 2970, 0]"]
-    32["Segment<br>[2978, 3060, 0]"]
+    33["Segment<br>[2978, 3060, 0]"]
-    34["Segment<br>[3068, 3114, 0]"]
+    35["Segment<br>[3068, 3114, 0]"]
     36["Segment<br>[3122, 3201, 0]"]
-    38["Segment<br>[3209, 3276, 0]"]
+    39["Segment<br>[3209, 3276, 0]"]
     41["Segment<br>[3284, 3363, 0]"]
-    42["Segment<br>[3371, 3417, 0]"]
+    43["Segment<br>[3371, 3417, 0]"]
     45["Segment<br>[3425, 3507, 0]"]
-    46["Segment<br>[3515, 3583, 0]"]
+    47["Segment<br>[3515, 3583, 0]"]
     48["Segment<br>[3591, 3670, 0]"]
     51["Segment<br>[3678, 3743, 0]"]
     53["Segment<br>[3751, 3833, 0]"]
     54["Segment<br>[3841, 3909, 0]"]
     57["Segment<br>[3917, 3999, 0]"]
-    59["Segment<br>[4007, 4056, 0]"]
+    58["Segment<br>[4007, 4056, 0]"]
     60["Segment<br>[4064, 4071, 0]"]
-    75[Solid2d]
+    72[Solid2d]
   end
   subgraph path15 [Path]
     15["Path<br>[4214, 4239, 0]"]
     62["Segment<br>[4247, 4288, 0]"]
-    65["Segment<br>[4296, 4337, 0]"]
+    64["Segment<br>[4296, 4337, 0]"]
-    66["Segment<br>[4345, 4398, 0]"]
+    67["Segment<br>[4345, 4398, 0]"]
     68["Segment<br>[4406, 4427, 0]"]
-    74[Solid2d]
+    73[Solid2d]
   end
   subgraph path16 [Path]
     16["Path<br>[4214, 4239, 0]"]
     63["Segment<br>[4247, 4288, 0]"]
-    64["Segment<br>[4296, 4337, 0]"]
+    65["Segment<br>[4296, 4337, 0]"]
-    67["Segment<br>[4345, 4398, 0]"]
+    66["Segment<br>[4345, 4398, 0]"]
     69["Segment<br>[4406, 4427, 0]"]
-    77[Solid2d]
+    76[Solid2d]
   end
   subgraph path17 [Path]
     17["Path<br>[4593, 4673, 0]"]
     70["Segment<br>[4593, 4673, 0]"]
-    71[Solid2d]
+    75[Solid2d]
   end
   1["Plane<br>[1217, 1255, 0]"]
   2["Plane<br>[1711, 1749, 0]"]
@@ -87,10 +87,10 @@ flowchart LR
   4["Plane<br>[4186, 4206, 0]"]
   5["Plane<br>[4570, 4587, 0]"]
   6["Plane<br>[5562, 5597, 0]"]
-  7["StartSketchOnPlane<br>[2695, 2715, 0]"]
+  7["StartSketchOnPlane<br>[894, 914, 0]"]
   8["StartSketchOnPlane<br>[894, 914, 0]"]
-  9["StartSketchOnPlane<br>[894, 914, 0]"]
+  9["StartSketchOnPlane<br>[4186, 4206, 0]"]
-  10["StartSketchOnPlane<br>[4186, 4206, 0]"]
+  10["StartSketchOnPlane<br>[2695, 2715, 0]"]
   78["Sweep Extrusion<br>[1204, 1298, 0]"]
   79["Sweep Revolve<br>[1698, 1780, 0]"]
   80["Sweep Extrusion<br>[5026, 5068, 0]"]
@@ -165,285 +165,285 @@ flowchart LR
   149["EdgeCut Fillet<br>[5795, 6139, 0]"]
   150["EdgeCut Fillet<br>[5795, 6139, 0]"]
   151["EdgeCut Fillet<br>[5795, 6139, 0]"]
-  1 <--x 9
+  1 <--x 8
-  1 --- 11
+  1 --- 12
-  2 <--x 8
+  2 <--x 7
-  2 --- 12
+  2 --- 11
-  3 --- 14
+  3 --- 13
-  4 --- 16
+  4 --- 15
   5 --- 17
-  6 <--x 7
+  6 <--x 9
   6 <--x 10
-  6 --- 13
+  6 --- 14
-  6 --- 15
+  6 --- 16
   11 --- 18
   11 --- 21
   11 --- 23
-  11 --- 25
+  11 --- 24
-  11 --- 27
+  11 --- 26
-  11 --- 72
+  11 --- 74
-  11 ---- 78
+  11 ---- 79
   12 --- 19
   12 --- 20
   12 --- 22
-  12 --- 24
+  12 --- 25
-  12 --- 26
+  12 --- 27
-  12 --- 76
+  12 --- 77
-  12 ---- 79
+  12 ---- 78
-  13 --- 29
+  13 --- 28
   13 --- 30
-  13 --- 33
+  13 --- 32
-  13 --- 35
+  13 --- 34
   13 --- 37
-  13 --- 39
+  13 --- 38
   13 --- 40
-  13 --- 43
+  13 --- 42
   13 --- 44
-  13 --- 47
+  13 --- 46
   13 --- 49
   13 --- 50
   13 --- 52
   13 --- 55
   13 --- 56
-  13 --- 58
+  13 --- 59
   13 --- 61
-  13 --- 73
+  13 --- 71
-  14 --- 28
+  14 --- 29
   14 --- 31
-  14 --- 32
+  14 --- 33
-  14 --- 34
+  14 --- 35
   14 --- 36
-  14 --- 38
+  14 --- 39
   14 --- 41
-  14 --- 42
+  14 --- 43
   14 --- 45
-  14 --- 46
+  14 --- 47
   14 --- 48
   14 --- 51
   14 --- 53
   14 --- 54
   14 --- 57
-  14 --- 59
+  14 --- 58
   14 --- 60
-  14 --- 75
+  14 --- 72
   15 --- 62
-  15 --- 65
+  15 --- 64
-  15 --- 66
+  15 --- 67
   15 --- 68
-  15 --- 74
+  15 --- 73
-  15 ---- 81
+  15 ---- 80
   16 --- 63
-  16 --- 64
+  16 --- 65
-  16 --- 67
+  16 --- 66
   16 --- 69
-  16 --- 77
+  16 --- 76
-  16 ---- 80
+  16 ---- 81
   17 --- 70
-  17 --- 71
+  17 --- 75
-  18 --- 87
+  18 --- 82
-  18 x--> 101
+  18 x--> 100
-  18 --- 116
+  18 --- 110
-  18 --- 133
+  18 --- 128
-  19 --- 93
+  19 --- 97
-  19 x--> 102
+  19 x--> 103
-  19 --- 119
+  19 --- 123
-  19 --- 139
+  19 --- 143
-  20 --- 91
+  20 --- 96
-  20 x--> 102
+  20 x--> 103
-  20 --- 120
+  20 --- 121
-  20 --- 135
+  20 --- 142
-  21 --- 86
+  21 --- 84
-  21 x--> 101
+  21 x--> 100
-  21 --- 115
+  21 --- 112
-  21 --- 131
+  21 --- 129
-  22 --- 92
+  22 --- 95
-  22 x--> 102
+  22 x--> 103
-  22 --- 117
+  22 --- 124
-  22 --- 138
+  22 --- 140
-  23 --- 88
+  23 --- 86
-  23 x--> 101
+  23 x--> 100
-  23 --- 113
+  23 --- 109
-  23 --- 130
+  23 --- 126
-  24 --- 94
+  24 --- 83
-  24 x--> 102
+  24 x--> 100
-  24 --- 121
+  24 --- 111
-  24 --- 136
+  24 --- 130
-  25 --- 90
+  25 --- 98
-  25 x--> 101
+  25 x--> 103
-  25 --- 114
+  25 --- 122
-  25 --- 132
+  25 --- 141
-  26 --- 95
+  26 --- 85
-  26 x--> 102
+  26 x--> 100
-  26 --- 118
+  26 --- 108
-  26 --- 137
+  26 --- 127
-  27 --- 89
+  27 --- 99
-  27 x--> 101
+  27 x--> 103
-  27 --- 112
+  27 --- 125
-  27 --- 134
+  27 --- 139
-  62 --- 84
+  62 --- 88
-  62 x--> 104
+  62 x--> 105
-  62 --- 110
+  62 --- 114
-  62 --- 128
+  62 --- 132
-  63 --- 99
+  63 --- 93
-  63 x--> 107
+  63 x--> 106
-  63 --- 125
+  63 --- 119
-  63 --- 141
+  63 --- 135
-  64 --- 97
+  64 --- 89
-  64 x--> 107
+  64 x--> 105
-  64 --- 122
+  64 --- 115
-  64 --- 142
+  64 --- 133
-  65 --- 85
+  65 --- 94
-  65 x--> 104
+  65 x--> 106
-  65 --- 109
+  65 --- 118
-  65 --- 127
+  65 --- 137
-  66 --- 82
+  66 --- 91
-  66 x--> 104
+  66 x--> 106
-  66 --- 108
+  66 --- 117
-  66 --- 126
+  66 --- 138
-  67 --- 96
+  67 --- 90
-  67 x--> 107
+  67 x--> 105
-  67 --- 124
+  67 --- 113
-  67 --- 143
+  67 --- 131
-  68 --- 83
+  68 --- 87
-  68 x--> 104
+  68 x--> 105
-  68 --- 111
+  68 --- 116
-  68 --- 129
+  68 --- 134
-  69 --- 98
+  69 --- 92
-  69 x--> 107
+  69 x--> 106
-  69 --- 123
+  69 --- 120
-  69 --- 140
+  69 --- 136
-  78 --- 86
+  78 --- 95
-  78 --- 87
+  78 --- 96
-  78 --- 88
+  78 --- 97
-  78 --- 89
+  78 --- 98
-  78 --- 90
+  78 --- 99
-  78 --- 101
+  78 --- 103
-  78 --- 105
+  78 --- 107
-  78 --- 112
+  78 --- 121
-  78 --- 113
+  78 --- 122
-  78 --- 114
+  78 --- 123
-  78 --- 115
+  78 --- 124
-  78 --- 116
+  78 --- 125
-  78 --- 130
+  78 --- 139
-  78 --- 131
+  78 --- 140
-  78 --- 132
+  78 --- 141
-  78 --- 133
+  78 --- 142
-  78 --- 134
+  78 --- 143
-  79 --- 91
+  79 --- 82
-  79 --- 92
+  79 --- 83
-  79 --- 93
+  79 --- 84
-  79 --- 94
+  79 --- 85
-  79 --- 95
+  79 --- 86
-  79 --- 102
+  79 --- 100
-  79 --- 106
+  79 --- 104
-  79 --- 117
+  79 --- 108
-  79 --- 118
+  79 --- 109
-  79 --- 119
+  79 --- 110
-  79 --- 120
+  79 --- 111
-  79 --- 121
+  79 --- 112
-  79 --- 135
+  79 --- 126
-  79 --- 136
+  79 --- 127
-  79 --- 137
+  79 --- 128
-  79 --- 138
+  79 --- 129
-  79 --- 139
+  79 --- 130
-  80 --- 96
+  80 --- 87
-  80 --- 97
+  80 --- 88
-  80 --- 98
+  80 --- 89
-  80 --- 99
+  80 --- 90
-  80 --- 103
+  80 --- 101
-  80 --- 107
+  80 --- 105
-  80 --- 122
+  80 --- 113
-  80 --- 123
+  80 --- 114
-  80 --- 124
+  80 --- 115
-  80 --- 125
+  80 --- 116
-  80 --- 140
+  80 --- 131
-  80 --- 141
+  80 --- 132
-  80 --- 142
+  80 --- 133
-  80 --- 143
+  80 --- 134
-  81 --- 82
+  81 --- 91
-  81 --- 83
+  81 --- 92
-  81 --- 84
+  81 --- 93
-  81 --- 85
+  81 --- 94
-  81 --- 100
+  81 --- 102
-  81 --- 104
+  81 --- 106
-  81 --- 108
+  81 --- 117
-  81 --- 109
+  81 --- 118
-  81 --- 110
+  81 --- 119
-  81 --- 111
+  81 --- 120
-  81 --- 126
+  81 --- 135
-  81 --- 127
+  81 --- 136
-  81 --- 128
+  81 --- 137
-  81 --- 129
+  81 --- 138
-  108 <--x 82
+  110 <--x 82
   127 <--x 82
+  128 <--x 82
   111 <--x 83
-  129 <--x 83
+  126 <--x 83
-  110 <--x 84
+  130 <--x 83
+  112 <--x 84
+  128 <--x 84
   129 <--x 84
-  109 <--x 85
+  108 <--x 85
   127 <--x 85
-  115 <--x 86
+  130 <--x 85
-  131 <--x 86
+  109 <--x 86
-  133 <--x 86
+  126 <--x 86
+  129 <--x 86
   116 <--x 87
-  133 <--x 87
   134 <--x 87
-  113 <--x 88
+  114 <--x 88
-  130 <--x 88
+  134 <--x 88
-  131 <--x 88
+  115 <--x 89
-  112 <--x 89
+  133 <--x 89
-  132 <--x 89
+  113 <--x 90
-  134 <--x 89
+  133 <--x 90
-  114 <--x 90
+  117 <--x 91
-  130 <--x 90
+  137 <--x 91
-  132 <--x 90
+  120 <--x 92
-  120 <--x 91
+  136 <--x 92
-  135 <--x 91
-  139 <--x 91
-  117 <--x 92
-  135 <--x 92
-  138 <--x 92
   119 <--x 93
-  137 <--x 93
+  136 <--x 93
-  139 <--x 93
+  118 <--x 94
-  121 <--x 94
+  137 <--x 94
-  136 <--x 94
+  124 <--x 95
-  138 <--x 94
+  140 <--x 95
-  118 <--x 95
+  142 <--x 95
-  136 <--x 95
+  121 <--x 96
-  137 <--x 95
-  124 <--x 96
   142 <--x 96
-  122 <--x 97
+  143 <--x 96
-  142 <--x 97
+  123 <--x 97
-  123 <--x 98
+  139 <--x 97
+  143 <--x 97
+  122 <--x 98
   140 <--x 98
+  141 <--x 98
   125 <--x 99
-  140 <--x 99
+  139 <--x 99
-  108 <--x 100
+  141 <--x 99
-  109 <--x 100
+  113 <--x 101
-  110 <--x 100
+  114 <--x 101
-  111 <--x 100
+  115 <--x 101
-  122 <--x 103
+  116 <--x 101
-  123 <--x 103
+  117 <--x 102
-  124 <--x 103
+  118 <--x 102
-  125 <--x 103
+  119 <--x 102
-  112 <--x 105
+  120 <--x 102
-  113 <--x 105
+  108 <--x 104
-  114 <--x 105
+  109 <--x 104
-  115 <--x 105
+  110 <--x 104
-  116 <--x 105
+  111 <--x 104
-  117 <--x 106
+  112 <--x 104
-  118 <--x 106
+  121 <--x 107
-  119 <--x 106
+  122 <--x 107
-  120 <--x 106
+  123 <--x 107
-  121 <--x 106
+  124 <--x 107
-  126 <--x 150
+  125 <--x 107
-  127 <--x 148
+  131 <--x 144
-  128 <--x 151
+  132 <--x 147
-  129 <--x 149
+  133 <--x 145
-  140 <--x 147
+  134 <--x 146
-  141 <--x 144
+  135 <--x 150
-  142 <--x 145
+  136 <--x 148
-  143 <--x 146
+  137 <--x 151
+  138 <--x 149
 ```

rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate/artifact_graph_flowchart.snap.md

@@ -5,8 +5,8 @@ flowchart LR
     7["Segment<br>[832, 854, 0]"]
     10["Segment<br>[862, 906, 0]"]
     12["Segment<br>[914, 941, 0]"]
-    14["Segment<br>[949, 993, 0]"]
+    13["Segment<br>[949, 993, 0]"]
-    16["Segment<br>[1001, 1008, 0]"]
+    15["Segment<br>[1001, 1008, 0]"]
     17[Solid2d]
   end
   subgraph path6 [Path]
@@ -14,8 +14,8 @@ flowchart LR
     8["Segment<br>[832, 854, 0]"]
     9["Segment<br>[862, 906, 0]"]
     11["Segment<br>[914, 941, 0]"]
-    13["Segment<br>[949, 993, 0]"]
+    14["Segment<br>[949, 993, 0]"]
-    15["Segment<br>[1001, 1008, 0]"]
+    16["Segment<br>[1001, 1008, 0]"]
     18[Solid2d]
   end
   1["Plane<br>[1094, 1132, 0]"]
@@ -59,126 +59,126 @@ flowchart LR
   53["SweepEdge Adjacent"]
   54["SweepEdge Adjacent"]
   1 <--x 4
-  1 --- 5
+  1 --- 6
   2 <--x 3
-  2 --- 6
+  2 --- 5
   5 --- 7
   5 --- 10
   5 --- 12
-  5 --- 14
+  5 --- 13
-  5 --- 16
+  5 --- 15
   5 --- 17
-  5 ---- 19
+  5 ---- 20
   6 --- 8
   6 --- 9
   6 --- 11
-  6 --- 13
+  6 --- 14
-  6 --- 15
+  6 --- 16
   6 --- 18
-  6 ---- 20
+  6 ---- 19
-  7 --- 22
+  7 --- 21
   7 x--> 31
-  7 --- 39
+  7 --- 37
-  7 --- 48
+  7 --- 47
   8 --- 28
   8 x--> 32
   8 --- 42
   8 --- 54
-  9 --- 26
+  9 --- 27
   9 x--> 32
-  9 --- 43
+  9 --- 40
-  9 --- 50
+  9 --- 53
-  10 --- 21
+  10 --- 23
   10 x--> 31
-  10 --- 38
+  10 --- 39
-  10 --- 46
+  10 --- 48
-  11 --- 27
+  11 --- 26
   11 x--> 32
-  11 --- 40
+  11 --- 43
-  11 --- 53
+  11 --- 51
-  12 --- 23
+  12 --- 25
   12 x--> 31
   12 --- 36
   12 --- 45
-  13 --- 29
+  13 --- 22
-  13 x--> 32
+  13 x--> 31
-  13 --- 44
+  13 --- 38
-  13 --- 51
+  13 --- 49
-  14 --- 25
+  14 --- 29
-  14 x--> 31
+  14 x--> 32
-  14 --- 37
+  14 --- 41
-  14 --- 47
+  14 --- 52
-  15 --- 30
+  15 --- 24
-  15 x--> 32
+  15 x--> 31
-  15 --- 41
+  15 --- 35
-  15 --- 52
+  15 --- 46
-  16 --- 24
+  16 --- 30
-  16 x--> 31
+  16 x--> 32
-  16 --- 35
+  16 --- 44
-  16 --- 49
+  16 --- 50
-  19 --- 21
+  19 --- 26
-  19 --- 22
+  19 --- 27
-  19 --- 23
+  19 --- 28
-  19 --- 24
+  19 --- 29
-  19 --- 25
+  19 --- 30
-  19 --- 31
+  19 --- 32
-  19 --- 33
+  19 --- 34
-  19 --- 35
+  19 --- 40
-  19 --- 36
+  19 --- 41
-  19 --- 37
+  19 --- 42
-  19 --- 38
+  19 --- 43
-  19 --- 39
+  19 --- 44
-  19 --- 45
+  19 --- 50
-  19 --- 46
+  19 --- 51
-  19 --- 47
+  19 --- 52
-  19 --- 48
+  19 --- 53
-  19 --- 49
+  19 --- 54
-  20 --- 26
+  20 --- 21
-  20 --- 27
+  20 --- 22
-  20 --- 28
+  20 --- 23
-  20 --- 29
+  20 --- 24
-  20 --- 30
+  20 --- 25
-  20 --- 32
+  20 --- 31
-  20 --- 34
+  20 --- 33
-  20 --- 40
+  20 --- 35
-  20 --- 41
+  20 --- 36
-  20 --- 42
+  20 --- 37
-  20 --- 43
+  20 --- 38
-  20 --- 44
+  20 --- 39
-  20 --- 50
+  20 --- 45
-  20 --- 51
+  20 --- 46
-  20 --- 52
+  20 --- 47
-  20 --- 53
+  20 --- 48
-  20 --- 54
+  20 --- 49
-  38 <--x 21
+  37 <--x 21
   46 <--x 21
-  48 <--x 21
+  47 <--x 21
-  39 <--x 22
+  38 <--x 22
-  48 <--x 22
+  45 <--x 22
   49 <--x 22
-  36 <--x 23
+  39 <--x 23
-  45 <--x 23
+  47 <--x 23
-  46 <--x 23
+  48 <--x 23
   35 <--x 24
-  47 <--x 24
+  46 <--x 24
   49 <--x 24
-  37 <--x 25
+  36 <--x 25
   45 <--x 25
-  47 <--x 25
+  48 <--x 25
   43 <--x 26
-  50 <--x 26
+  51 <--x 26
-  54 <--x 26
+  53 <--x 26
   40 <--x 27
-  50 <--x 27
   53 <--x 27
+  54 <--x 27
   42 <--x 28
-  52 <--x 28
+  50 <--x 28
   54 <--x 28
-  44 <--x 29
+  41 <--x 29
   51 <--x 29
-  53 <--x 29
+  52 <--x 29
-  41 <--x 30
+  44 <--x 30
-  51 <--x 30
+  50 <--x 30
   52 <--x 30
   35 <--x 33
   36 <--x 33

rust/kcl-lib/tests/kcl_samples/gridfinity-bins/artifact_graph_flowchart.snap.md

@@ -7,8 +7,8 @@ flowchart LR
     18["Segment<br>[1050, 1094, 0]"]
     20["Segment<br>[1102, 1129, 0]"]
     22["Segment<br>[1137, 1181, 0]"]
-    25["Segment<br>[1189, 1196, 0]"]
+    24["Segment<br>[1189, 1196, 0]"]
-    35[Solid2d]
+    38[Solid2d]
   end
   subgraph path10 [Path]
     10["Path<br>[928, 974, 0]"]
@@ -17,7 +17,7 @@ flowchart LR
     19["Segment<br>[1050, 1094, 0]"]
     21["Segment<br>[1102, 1129, 0]"]
     23["Segment<br>[1137, 1181, 0]"]
-    24["Segment<br>[1189, 1196, 0]"]
+    25["Segment<br>[1189, 1196, 0]"]
     39[Solid2d]
   end
   subgraph path11 [Path]
@@ -39,7 +39,7 @@ flowchart LR
     32["Segment<br>[4470, 4543, 0]"]
     33["Segment<br>[4549, 4602, 0]"]
     34["Segment<br>[4608, 4629, 0]"]
-    38[Solid2d]
+    35[Solid2d]
   end
   1["Plane<br>[1282, 1329, 0]"]
   2["Plane<br>[1861, 1908, 0]"]
@@ -131,28 +131,28 @@ flowchart LR
   119["EdgeCut Fillet<br>[4685, 4918, 0]"]
   120["EdgeCut Fillet<br>[4685, 4918, 0]"]
   121["EdgeCut Fillet<br>[4685, 4918, 0]"]
-  1 <--x 7
+  1 <--x 6
   1 --- 10
-  2 <--x 6
+  2 <--x 7
   2 --- 9
   3 --- 11
   4 <--x 5
   4 --- 13
-  68 x--> 8
+  67 x--> 8
   9 --- 14
   9 --- 17
   9 --- 18
   9 --- 20
   9 --- 22
-  9 --- 25
+  9 --- 24
-  9 --- 35
+  9 --- 38
   9 ---- 41
   10 --- 15
   10 --- 16
   10 --- 19
   10 --- 21
   10 --- 23
-  10 --- 24
+  10 --- 25
   10 --- 39
   10 ---- 40
   11 --- 26
@@ -163,215 +163,214 @@ flowchart LR
   11 ---- 42
   12 --- 30
   12 --- 36
-  12 ---- 45
+  12 ---- 44
-  68 --- 12
+  67 --- 12
   13 --- 31
   13 --- 32
   13 --- 33
   13 --- 34
-  13 --- 38
+  13 --- 35
   13 ---- 47
-  14 --- 57
+  14 --- 63
-  14 x--> 69
+  14 x--> 71
-  14 --- 89
+  14 --- 92
-  14 --- 108
+  14 --- 113
-  15 --- 49
+  15 --- 54
-  15 x--> 67
+  15 x--> 68
   15 --- 80
-  15 --- 96
+  15 --- 103
-  16 --- 48
+  16 --- 53
-  16 x--> 67
+  16 x--> 68
-  16 --- 78
+  16 --- 82
-  16 --- 98
+  16 --- 101
-  17 --- 58
+  17 --- 65
-  17 x--> 69
+  17 x--> 71
-  17 --- 86
+  17 --- 93
-  17 --- 106
+  17 --- 109
-  18 --- 60
+  18 --- 62
-  18 x--> 69
+  18 x--> 71
-  18 --- 88
+  18 --- 90
-  18 --- 107
+  18 --- 112
-  19 --- 50
+  19 --- 52
-  19 x--> 67
+  19 x--> 68
-  19 --- 76
+  19 --- 81
-  19 --- 95
+  19 --- 99
-  20 --- 61
+  20 --- 64
-  20 x--> 69
+  20 x--> 71
-  20 --- 85
+  20 --- 94
-  20 --- 104
+  20 --- 110
-  21 --- 52
+  21 --- 55
-  21 x--> 67
+  21 x--> 68
-  21 --- 77
+  21 --- 83
-  21 --- 97
+  21 --- 100
-  22 --- 59
+  22 --- 66
-  22 x--> 69
+  22 x--> 71
-  22 --- 87
+  22 --- 91
-  22 --- 105
+  22 --- 111
-  23 --- 51
+  23 --- 56
-  23 x--> 67
+  23 x--> 68
-  23 --- 79
+  23 --- 84
-  23 --- 99
+  23 --- 102
-  26 --- 54
+  26 --- 51
-  26 x--> 68
+  26 x--> 67
-  26 --- 82
+  26 --- 77
-  26 --- 102
+  26 --- 95
-  27 --- 55
+  27 --- 50
-  27 x--> 68
+  27 x--> 67
-  27 --- 84
+  27 --- 76
-  27 --- 100
+  27 --- 98
-  28 --- 53
+  28 --- 48
-  28 x--> 68
+  28 x--> 67
-  28 --- 81
+  28 --- 79
-  28 --- 101
+  28 --- 97
-  29 --- 56
+  29 --- 49
-  29 x--> 68
+  29 x--> 67
-  29 --- 83
+  29 --- 78
-  29 --- 103
+  29 --- 96
-  30 --- 66
+  30 --- 57
-  30 x--> 68
+  30 x--> 67
-  30 --- 94
+  30 --- 85
-  30 --- 113
+  30 --- 104
-  31 --- 63
+  31 --- 58
   31 x--> 70
-  31 --- 90
+  31 --- 89
-  31 --- 111
+  31 --- 108
-  32 --- 62
+  32 --- 61
   32 x--> 70
-  32 --- 93
+  32 --- 86
-  32 --- 110
+  32 --- 105
-  33 --- 65
+  33 --- 59
   33 x--> 70
-  33 --- 92
+  33 --- 88
-  33 --- 112
+  33 --- 106
-  34 --- 64
+  34 --- 60
   34 x--> 70
-  34 --- 91
+  34 --- 87
-  34 --- 109
+  34 --- 107
-  40 --- 48
-  40 --- 49
-  40 --- 50
-  40 --- 51
   40 --- 52
-  40 --- 67
+  40 --- 53
-  40 --- 72
+  40 --- 54
-  40 --- 76
+  40 --- 55
-  40 --- 77
+  40 --- 56
-  40 --- 78
+  40 --- 68
-  40 --- 79
+  40 --- 73
   40 --- 80
-  40 --- 95
+  40 --- 81
-  40 --- 96
+  40 --- 82
-  40 --- 97
+  40 --- 83
-  40 --- 98
+  40 --- 84
   40 --- 99
-  41 --- 57
+  40 --- 100
-  41 --- 58
+  40 --- 101
-  41 --- 59
+  40 --- 102
-  41 --- 60
+  40 --- 103
-  41 --- 61
+  41 --- 62
-  41 --- 69
+  41 --- 63
-  41 --- 74
+  41 --- 64
-  41 --- 85
+  41 --- 65
-  41 --- 86
+  41 --- 66
-  41 --- 87
+  41 --- 71
-  41 --- 88
+  41 --- 75
-  41 --- 89
+  41 --- 90
-  41 --- 104
+  41 --- 91
-  41 --- 105
+  41 --- 92
-  41 --- 106
+  41 --- 93
-  41 --- 107
+  41 --- 94
-  41 --- 108
+  41 --- 109
-  42 --- 53
+  41 --- 110
-  42 --- 54
+  41 --- 111
-  42 --- 55
+  41 --- 112
-  42 --- 56
+  41 --- 113
-  42 --- 68
+  42 --- 48
-  42 --- 73
+  42 --- 49
-  42 --- 81
+  42 --- 50
-  42 --- 82
+  42 --- 51
-  42 --- 83
+  42 --- 67
-  42 --- 84
+  42 --- 72
-  42 --- 100
+  42 --- 76
-  42 --- 101
+  42 --- 77
-  42 --- 102
+  42 --- 78
-  42 --- 103
+  42 --- 79
-  45 --- 66
+  42 --- 95
-  45 --- 71
+  42 --- 96
-  45 --- 94
+  42 --- 97
-  45 --- 113
+  42 --- 98
-  47 --- 62
+  44 --- 57
-  47 --- 63
+  44 --- 69
-  47 --- 64
+  44 --- 85
-  47 --- 65
+  44 --- 104
+  47 --- 58
+  47 --- 59
+  47 --- 60
+  47 --- 61
   47 --- 70
-  47 --- 75
+  47 --- 74
-  47 --- 90
+  47 --- 86
-  47 --- 91
+  47 --- 87
-  47 --- 92
+  47 --- 88
-  47 --- 93
+  47 --- 89
-  47 --- 109
+  47 --- 105
-  47 --- 110
+  47 --- 106
-  47 --- 111
+  47 --- 107
-  47 --- 112
+  47 --- 108
-  78 <--x 48
+  79 <--x 48
-  96 <--x 48
   98 <--x 48
-  80 <--x 49
+  78 <--x 49
   96 <--x 49
-  99 <--x 49
   76 <--x 50
-  95 <--x 50
   98 <--x 50
-  79 <--x 51
+  77 <--x 51
-  97 <--x 51
+  96 <--x 51
-  99 <--x 51
+  81 <--x 52
-  77 <--x 52
+  99 <--x 52
-  95 <--x 52
+  101 <--x 52
-  97 <--x 52
+  82 <--x 53
-  81 <--x 53
+  101 <--x 53
-  100 <--x 53
+  103 <--x 53
-  82 <--x 54
+  80 <--x 54
+  102 <--x 54
   103 <--x 54
-  84 <--x 55
+  83 <--x 55
+  99 <--x 55
   100 <--x 55
-  83 <--x 56
+  84 <--x 56
-  103 <--x 56
+  100 <--x 56
-  89 <--x 57
+  102 <--x 56
-  105 <--x 57
+  85 <--x 57
-  108 <--x 57
+  104 <--x 57
-  86 <--x 58
+  89 <--x 58
-  106 <--x 58
+  107 <--x 58
-  108 <--x 58
+  88 <--x 59
-  87 <--x 59
-  104 <--x 59
   105 <--x 59
-  88 <--x 60
+  87 <--x 60
-  106 <--x 60
   107 <--x 60
-  85 <--x 61
+  86 <--x 61
-  104 <--x 61
+  105 <--x 61
-  107 <--x 61
+  90 <--x 62
-  93 <--x 62
+  109 <--x 62
-  110 <--x 62
+  112 <--x 62
-  90 <--x 63
+  92 <--x 63
-  109 <--x 63
+  111 <--x 63
-  91 <--x 64
+  113 <--x 63
-  109 <--x 64
+  94 <--x 64
-  92 <--x 65
+  110 <--x 64
-  110 <--x 65
+  112 <--x 64
-  94 <--x 66
+  93 <--x 65
-  113 <--x 66
+  109 <--x 65
-  94 <--x 71
+  113 <--x 65
+  91 <--x 66
+  110 <--x 66
+  111 <--x 66
+  85 <--x 69
   76 <--x 72
   77 <--x 72
   78 <--x 72
   79 <--x 72
-  80 <--x 72
+  80 <--x 73
   81 <--x 73
   82 <--x 73
   83 <--x 73
   84 <--x 73
-  85 <--x 74
   86 <--x 74
   87 <--x 74
   88 <--x 74
@@ -380,12 +379,13 @@ flowchart LR
   91 <--x 75
   92 <--x 75
   93 <--x 75
-  100 <--x 116
+  94 <--x 75
-  101 <--x 117
+  95 <--x 114
-  102 <--x 114
+  96 <--x 117
-  103 <--x 115
+  97 <--x 115
-  109 <--x 120
+  98 <--x 116
-  110 <--x 121
+  105 <--x 118
-  111 <--x 119
+  106 <--x 121
-  112 <--x 118
+  107 <--x 120
+  108 <--x 119
 ```

rust/kcl-lib/tests/kcl_samples/i-beam/program_memory.snap

@@ -164,10 +164,8 @@ description: Variables in memory after executing i-beam.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -176,6 +174,8 @@ description: Variables in memory after executing i-beam.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": -1.0,
             "y": 0.0,

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

@@ -635,10 +635,8 @@ description: Variables in memory after executing keyboard.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "YZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -647,6 +645,8 @@ description: Variables in memory after executing keyboard.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "YZ",
               "xAxis": {
                 "x": 0.0,
                 "y": 1.0,
@@ -1053,10 +1053,8 @@ description: Variables in memory after executing keyboard.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "YZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1065,6 +1063,8 @@ description: Variables in memory after executing keyboard.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "YZ",
               "xAxis": {
                 "x": 0.0,
                 "y": 1.0,
@@ -1471,10 +1471,8 @@ description: Variables in memory after executing keyboard.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "YZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1483,6 +1481,8 @@ description: Variables in memory after executing keyboard.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "YZ",
               "xAxis": {
                 "x": 0.0,
                 "y": 1.0,
@@ -1889,10 +1889,8 @@ description: Variables in memory after executing keyboard.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "YZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -1901,6 +1899,8 @@ description: Variables in memory after executing keyboard.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "YZ",
               "xAxis": {
                 "x": 0.0,
                 "y": 1.0,
@@ -2354,10 +2354,8 @@ description: Variables in memory after executing keyboard.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "YZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -2366,6 +2364,8 @@ description: Variables in memory after executing keyboard.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "YZ",
           "xAxis": {
             "x": 0.0,
             "y": 1.0,
@@ -2713,10 +2713,8 @@ description: Variables in memory after executing keyboard.kcl
             }
           ],
           "on": {
-            "type": "plane",
-            "id": "[uuid]",
             "artifactId": "[uuid]",
-            "value": "YZ",
+            "id": "[uuid]",
             "origin": {
               "x": 0.0,
               "y": 0.0,
@@ -2725,6 +2723,8 @@ description: Variables in memory after executing keyboard.kcl
                 "type": "Mm"
               }
             },
+            "type": "plane",
+            "value": "YZ",
             "xAxis": {
               "x": 0.0,
               "y": 1.0,

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

@@ -384,10 +384,8 @@ description: Variables in memory after executing kitt.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -396,6 +394,8 @@ description: Variables in memory after executing kitt.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -808,10 +808,8 @@ description: Variables in memory after executing kitt.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -820,6 +818,8 @@ description: Variables in memory after executing kitt.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -1232,10 +1232,8 @@ description: Variables in memory after executing kitt.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -1244,6 +1242,8 @@ description: Variables in memory after executing kitt.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -1656,10 +1656,8 @@ description: Variables in memory after executing kitt.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -1668,6 +1666,8 @@ description: Variables in memory after executing kitt.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -2080,10 +2080,8 @@ description: Variables in memory after executing kitt.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -2092,6 +2090,8 @@ description: Variables in memory after executing kitt.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -2504,10 +2504,8 @@ description: Variables in memory after executing kitt.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -2516,6 +2514,8 @@ description: Variables in memory after executing kitt.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -2928,10 +2928,8 @@ description: Variables in memory after executing kitt.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -2940,6 +2938,8 @@ description: Variables in memory after executing kitt.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -3430,10 +3430,8 @@ description: Variables in memory after executing kitt.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -3442,6 +3440,8 @@ description: Variables in memory after executing kitt.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -3854,10 +3854,8 @@ description: Variables in memory after executing kitt.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -3866,6 +3864,8 @@ description: Variables in memory after executing kitt.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -4240,10 +4240,8 @@ description: Variables in memory after executing kitt.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -4252,6 +4250,8 @@ description: Variables in memory after executing kitt.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -4835,10 +4835,8 @@ description: Variables in memory after executing kitt.kcl
                       }
                     ],
                     "on": {
-                      "type": "plane",
-                      "id": "[uuid]",
                       "artifactId": "[uuid]",
-                      "value": "XZ",
+                      "id": "[uuid]",
                       "origin": {
                         "x": 0.0,
                         "y": 0.0,
@@ -4847,6 +4845,8 @@ description: Variables in memory after executing kitt.kcl
                           "type": "Mm"
                         }
                       },
+                      "type": "plane",
+                      "value": "XZ",
                       "xAxis": {
                         "x": 1.0,
                         "y": 0.0,
@@ -5450,10 +5450,8 @@ description: Variables in memory after executing kitt.kcl
                       }
                     ],
                     "on": {
-                      "type": "plane",
-                      "id": "[uuid]",
                       "artifactId": "[uuid]",
-                      "value": "XZ",
+                      "id": "[uuid]",
                       "origin": {
                         "x": 0.0,
                         "y": 0.0,
@@ -5462,6 +5460,8 @@ description: Variables in memory after executing kitt.kcl
                           "type": "Mm"
                         }
                       },
+                      "type": "plane",
+                      "value": "XZ",
                       "xAxis": {
                         "x": 1.0,
                         "y": 0.0,
@@ -6065,10 +6065,8 @@ description: Variables in memory after executing kitt.kcl
                       }
                     ],
                     "on": {
-                      "type": "plane",
-                      "id": "[uuid]",
                       "artifactId": "[uuid]",
-                      "value": "XZ",
+                      "id": "[uuid]",
                       "origin": {
                         "x": 0.0,
                         "y": 0.0,
@@ -6077,6 +6075,8 @@ description: Variables in memory after executing kitt.kcl
                           "type": "Mm"
                         }
                       },
+                      "type": "plane",
+                      "value": "XZ",
                       "xAxis": {
                         "x": 1.0,
                         "y": 0.0,
@@ -7047,10 +7047,8 @@ description: Variables in memory after executing kitt.kcl
                       }
                     ],
                     "on": {
-                      "type": "plane",
-                      "id": "[uuid]",
                       "artifactId": "[uuid]",
-                      "value": "XZ",
+                      "id": "[uuid]",
                       "origin": {
                         "x": 0.0,
                         "y": 0.0,
@@ -7059,6 +7057,8 @@ description: Variables in memory after executing kitt.kcl
                           "type": "Mm"
                         }
                       },
+                      "type": "plane",
+                      "value": "XZ",
                       "xAxis": {
                         "x": 1.0,
                         "y": 0.0,
@@ -7714,10 +7714,8 @@ description: Variables in memory after executing kitt.kcl
                       }
                     ],
                     "on": {
-                      "type": "plane",
-                      "id": "[uuid]",
                       "artifactId": "[uuid]",
-                      "value": "XZ",
+                      "id": "[uuid]",
                       "origin": {
                         "x": 0.0,
                         "y": 0.0,
@@ -7726,6 +7724,8 @@ description: Variables in memory after executing kitt.kcl
                           "type": "Mm"
                         }
                       },
+                      "type": "plane",
+                      "value": "XZ",
                       "xAxis": {
                         "x": 1.0,
                         "y": 0.0,
@@ -8329,10 +8329,8 @@ description: Variables in memory after executing kitt.kcl
                       }
                     ],
                     "on": {
-                      "type": "plane",
-                      "id": "[uuid]",
                       "artifactId": "[uuid]",
-                      "value": "XZ",
+                      "id": "[uuid]",
                       "origin": {
                         "x": 0.0,
                         "y": 0.0,
@@ -8341,6 +8339,8 @@ description: Variables in memory after executing kitt.kcl
                           "type": "Mm"
                         }
                       },
+                      "type": "plane",
+                      "value": "XZ",
                       "xAxis": {
                         "x": 1.0,
                         "y": 0.0,
@@ -8944,10 +8944,8 @@ description: Variables in memory after executing kitt.kcl
                       }
                     ],
                     "on": {
-                      "type": "plane",
-                      "id": "[uuid]",
                       "artifactId": "[uuid]",
-                      "value": "XZ",
+                      "id": "[uuid]",
                       "origin": {
                         "x": 0.0,
                         "y": 0.0,
@@ -8956,6 +8954,8 @@ description: Variables in memory after executing kitt.kcl
                           "type": "Mm"
                         }
                       },
+                      "type": "plane",
+                      "value": "XZ",
                       "xAxis": {
                         "x": 1.0,
                         "y": 0.0,
@@ -9469,10 +9469,8 @@ description: Variables in memory after executing kitt.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -9481,6 +9479,8 @@ description: Variables in memory after executing kitt.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -9958,10 +9958,8 @@ description: Variables in memory after executing kitt.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -9970,6 +9968,8 @@ description: Variables in memory after executing kitt.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -10900,10 +10900,8 @@ description: Variables in memory after executing kitt.kcl
                             }
                           ],
                           "on": {
-                            "type": "plane",
-                            "id": "[uuid]",
                             "artifactId": "[uuid]",
-                            "value": "XZ",
+                            "id": "[uuid]",
                             "origin": {
                               "x": 0.0,
                               "y": 0.0,
@@ -10912,6 +10910,8 @@ description: Variables in memory after executing kitt.kcl
                                 "type": "Mm"
                               }
                             },
+                            "type": "plane",
+                            "value": "XZ",
                             "xAxis": {
                               "x": 1.0,
                               "y": 0.0,
@@ -11914,10 +11914,8 @@ description: Variables in memory after executing kitt.kcl
                             }
                           ],
                           "on": {
-                            "type": "plane",
-                            "id": "[uuid]",
                             "artifactId": "[uuid]",
-                            "value": "XZ",
+                            "id": "[uuid]",
                             "origin": {
                               "x": 0.0,
                               "y": 0.0,
@@ -11926,6 +11924,8 @@ description: Variables in memory after executing kitt.kcl
                                 "type": "Mm"
                               }
                             },
+                            "type": "plane",
+                            "value": "XZ",
                             "xAxis": {
                               "x": 1.0,
                               "y": 0.0,
@@ -12928,10 +12928,8 @@ description: Variables in memory after executing kitt.kcl
                             }
                           ],
                           "on": {
-                            "type": "plane",
-                            "id": "[uuid]",
                             "artifactId": "[uuid]",
-                            "value": "XZ",
+                            "id": "[uuid]",
                             "origin": {
                               "x": 0.0,
                               "y": 0.0,
@@ -12940,6 +12938,8 @@ description: Variables in memory after executing kitt.kcl
                                 "type": "Mm"
                               }
                             },
+                            "type": "plane",
+                            "value": "XZ",
                             "xAxis": {
                               "x": 1.0,
                               "y": 0.0,
@@ -13245,10 +13245,8 @@ description: Variables in memory after executing kitt.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -13257,6 +13255,8 @@ description: Variables in memory after executing kitt.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -14157,10 +14157,8 @@ description: Variables in memory after executing kitt.kcl
                             }
                           ],
                           "on": {
-                            "type": "plane",
-                            "id": "[uuid]",
                             "artifactId": "[uuid]",
-                            "value": "XZ",
+                            "id": "[uuid]",
                             "origin": {
                               "x": 0.0,
                               "y": 0.0,
@@ -14169,6 +14167,8 @@ description: Variables in memory after executing kitt.kcl
                                 "type": "Mm"
                               }
                             },
+                            "type": "plane",
+                            "value": "XZ",
                             "xAxis": {
                               "x": 1.0,
                               "y": 0.0,
@@ -15171,10 +15171,8 @@ description: Variables in memory after executing kitt.kcl
                             }
                           ],
                           "on": {
-                            "type": "plane",
-                            "id": "[uuid]",
                             "artifactId": "[uuid]",
-                            "value": "XZ",
+                            "id": "[uuid]",
                             "origin": {
                               "x": 0.0,
                               "y": 0.0,
@@ -15183,6 +15181,8 @@ description: Variables in memory after executing kitt.kcl
                                 "type": "Mm"
                               }
                             },
+                            "type": "plane",
+                            "value": "XZ",
                             "xAxis": {
                               "x": 1.0,
                               "y": 0.0,
@@ -16211,10 +16211,8 @@ description: Variables in memory after executing kitt.kcl
                             }
                           ],
                           "on": {
-                            "type": "plane",
-                            "id": "[uuid]",
                             "artifactId": "[uuid]",
-                            "value": "XZ",
+                            "id": "[uuid]",
                             "origin": {
                               "x": 0.0,
                               "y": 0.0,
@@ -16223,6 +16221,8 @@ description: Variables in memory after executing kitt.kcl
                                 "type": "Mm"
                               }
                             },
+                            "type": "plane",
+                            "value": "XZ",
                             "xAxis": {
                               "x": 1.0,
                               "y": 0.0,
@@ -17225,10 +17225,8 @@ description: Variables in memory after executing kitt.kcl
                             }
                           ],
                           "on": {
-                            "type": "plane",
-                            "id": "[uuid]",
                             "artifactId": "[uuid]",
-                            "value": "XZ",
+                            "id": "[uuid]",
                             "origin": {
                               "x": 0.0,
                               "y": 0.0,
@@ -17237,6 +17235,8 @@ description: Variables in memory after executing kitt.kcl
                                 "type": "Mm"
                               }
                             },
+                            "type": "plane",
+                            "value": "XZ",
                             "xAxis": {
                               "x": 1.0,
                               "y": 0.0,
@@ -18447,10 +18447,8 @@ description: Variables in memory after executing kitt.kcl
                             }
                           ],
                           "on": {
-                            "type": "plane",
-                            "id": "[uuid]",
                             "artifactId": "[uuid]",
-                            "value": "XZ",
+                            "id": "[uuid]",
                             "origin": {
                               "x": 0.0,
                               "y": 0.0,
@@ -18459,6 +18457,8 @@ description: Variables in memory after executing kitt.kcl
                                 "type": "Mm"
                               }
                             },
+                            "type": "plane",
+                            "value": "XZ",
                             "xAxis": {
                               "x": 1.0,
                               "y": 0.0,
@@ -18956,10 +18956,8 @@ description: Variables in memory after executing kitt.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -18968,6 +18966,8 @@ description: Variables in memory after executing kitt.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -19898,10 +19898,8 @@ description: Variables in memory after executing kitt.kcl
                             }
                           ],
                           "on": {
-                            "type": "plane",
-                            "id": "[uuid]",
                             "artifactId": "[uuid]",
-                            "value": "XZ",
+                            "id": "[uuid]",
                             "origin": {
                               "x": 0.0,
                               "y": 0.0,
@@ -19910,6 +19908,8 @@ description: Variables in memory after executing kitt.kcl
                                 "type": "Mm"
                               }
                             },
+                            "type": "plane",
+                            "value": "XZ",
                             "xAxis": {
                               "x": 1.0,
                               "y": 0.0,
@@ -20215,10 +20215,8 @@ description: Variables in memory after executing kitt.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -20227,6 +20225,8 @@ description: Variables in memory after executing kitt.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -20787,10 +20787,8 @@ description: Variables in memory after executing kitt.kcl
                       }
                     ],
                     "on": {
-                      "type": "plane",
-                      "id": "[uuid]",
                       "artifactId": "[uuid]",
-                      "value": "XZ",
+                      "id": "[uuid]",
                       "origin": {
                         "x": 0.0,
                         "y": 0.0,
@@ -20799,6 +20797,8 @@ description: Variables in memory after executing kitt.kcl
                           "type": "Mm"
                         }
                       },
+                      "type": "plane",
+                      "value": "XZ",
                       "xAxis": {
                         "x": 1.0,
                         "y": 0.0,
@@ -21299,10 +21299,8 @@ description: Variables in memory after executing kitt.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -21311,6 +21309,8 @@ description: Variables in memory after executing kitt.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -21723,10 +21723,8 @@ description: Variables in memory after executing kitt.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -21735,6 +21733,8 @@ description: Variables in memory after executing kitt.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -22147,10 +22147,8 @@ description: Variables in memory after executing kitt.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -22159,6 +22157,8 @@ description: Variables in memory after executing kitt.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,

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

@@ -121,10 +121,8 @@ description: Variables in memory after executing lego.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -133,6 +131,8 @@ description: Variables in memory after executing lego.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -446,10 +446,8 @@ description: Variables in memory after executing lego.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XY",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -458,6 +456,8 @@ description: Variables in memory after executing lego.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XY",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -726,10 +726,8 @@ description: Variables in memory after executing lego.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XY",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -738,6 +736,8 @@ description: Variables in memory after executing lego.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XY",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -1006,10 +1006,8 @@ description: Variables in memory after executing lego.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XY",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -1018,6 +1016,8 @@ description: Variables in memory after executing lego.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XY",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -1286,10 +1286,8 @@ description: Variables in memory after executing lego.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XY",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -1298,6 +1296,8 @@ description: Variables in memory after executing lego.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XY",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -1566,10 +1566,8 @@ description: Variables in memory after executing lego.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XY",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -1578,6 +1576,8 @@ description: Variables in memory after executing lego.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XY",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -1846,10 +1846,8 @@ description: Variables in memory after executing lego.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XY",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -1858,6 +1856,8 @@ description: Variables in memory after executing lego.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XY",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -2226,10 +2226,8 @@ description: Variables in memory after executing lego.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XY",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -2238,6 +2236,8 @@ description: Variables in memory after executing lego.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XY",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -2684,10 +2684,8 @@ description: Variables in memory after executing lego.kcl
                           }
                         ],
                         "on": {
-                          "type": "plane",
-                          "id": "[uuid]",
                           "artifactId": "[uuid]",
-                          "value": "XY",
+                          "id": "[uuid]",
                           "origin": {
                             "x": 0.0,
                             "y": 0.0,
@@ -2696,6 +2694,8 @@ description: Variables in memory after executing lego.kcl
                               "type": "Mm"
                             }
                           },
+                          "type": "plane",
+                          "value": "XY",
                           "xAxis": {
                             "x": 1.0,
                             "y": 0.0,
@@ -3136,10 +3136,8 @@ description: Variables in memory after executing lego.kcl
                           }
                         ],
                         "on": {
-                          "type": "plane",
-                          "id": "[uuid]",
                           "artifactId": "[uuid]",
-                          "value": "XY",
+                          "id": "[uuid]",
                           "origin": {
                             "x": 0.0,
                             "y": 0.0,
@@ -3148,6 +3146,8 @@ description: Variables in memory after executing lego.kcl
                               "type": "Mm"
                             }
                           },
+                          "type": "plane",
+                          "value": "XY",
                           "xAxis": {
                             "x": 1.0,
                             "y": 0.0,

rust/kcl-lib/tests/kcl_samples/makeup-mirror/artifact_graph_flowchart.snap.md

@@ -2,53 +2,53 @@
 flowchart LR
   subgraph path19 [Path]
     19["Path<br>[583, 628, 0]"]
-    31["Segment<br>[583, 628, 0]"]
+    33["Segment<br>[583, 628, 0]"]
     46[Solid2d]
   end
   subgraph path20 [Path]
     20["Path<br>[583, 628, 0]"]
-    36["Segment<br>[583, 628, 0]"]
+    32["Segment<br>[583, 628, 0]"]
-    47[Solid2d]
+    48[Solid2d]
   end
   subgraph path21 [Path]
     21["Path<br>[583, 628, 0]"]
-    30["Segment<br>[583, 628, 0]"]
+    31["Segment<br>[583, 628, 0]"]
-    48[Solid2d]
+    49[Solid2d]
   end
   subgraph path22 [Path]
     22["Path<br>[583, 628, 0]"]
-    35["Segment<br>[583, 628, 0]"]
+    34["Segment<br>[583, 628, 0]"]
-    49[Solid2d]
+    50[Solid2d]
   end
   subgraph path23 [Path]
     23["Path<br>[583, 628, 0]"]
-    33["Segment<br>[583, 628, 0]"]
+    36["Segment<br>[583, 628, 0]"]
     51[Solid2d]
   end
   subgraph path24 [Path]
     24["Path<br>[583, 628, 0]"]
-    34["Segment<br>[583, 628, 0]"]
+    30["Segment<br>[583, 628, 0]"]
-    52[Solid2d]
+    53[Solid2d]
   end
   subgraph path25 [Path]
     25["Path<br>[583, 628, 0]"]
-    32["Segment<br>[583, 628, 0]"]
+    35["Segment<br>[583, 628, 0]"]
-    53[Solid2d]
+    54[Solid2d]
   end
   subgraph path26 [Path]
     26["Path<br>[1228, 1283, 0]"]
     38["Segment<br>[1228, 1283, 0]"]
-    45[Solid2d]
+    47[Solid2d]
   end
   subgraph path27 [Path]
     27["Path<br>[1228, 1283, 0]"]
     37["Segment<br>[1228, 1283, 0]"]
-    55[Solid2d]
+    52[Solid2d]
   end
   subgraph path28 [Path]
     28["Path<br>[1676, 1739, 0]"]
     39["Segment<br>[1676, 1739, 0]"]
-    50[Solid2d]
+    45[Solid2d]
   end
   subgraph path29 [Path]
     29["Path<br>[1785, 1844, 0]"]
@@ -57,7 +57,7 @@ flowchart LR
     42["Segment<br>[1992, 2016, 0]"]
     43["Segment<br>[2024, 2202, 0]"]
     44["Segment<br>[2210, 2217, 0]"]
-    54[Solid2d]
+    55[Solid2d]
   end
   1["Plane<br>[547, 574, 0]"]
   2["Plane<br>[547, 574, 0]"]
@@ -69,12 +69,12 @@ flowchart LR
   8["Plane<br>[1200, 1220, 0]"]
   9["Plane<br>[1200, 1220, 0]"]
   10["Plane<br>[1612, 1662, 0]"]
-  11["StartSketchOnPlane<br>[533, 575, 0]"]
+  11["StartSketchOnPlane<br>[1596, 1663, 0]"]
   12["StartSketchOnPlane<br>[533, 575, 0]"]
   13["StartSketchOnPlane<br>[533, 575, 0]"]
   14["StartSketchOnPlane<br>[533, 575, 0]"]
   15["StartSketchOnPlane<br>[533, 575, 0]"]
-  16["StartSketchOnPlane<br>[1596, 1663, 0]"]
+  16["StartSketchOnPlane<br>[533, 575, 0]"]
   17["StartSketchOnPlane<br>[533, 575, 0]"]
   18["StartSketchOnPlane<br>[533, 575, 0]"]
   56["Sweep Extrusion<br>[636, 665, 0]"]
@@ -152,226 +152,226 @@ flowchart LR
   128["SweepEdge Adjacent"]
   129["SweepEdge Adjacent"]
   130["SweepEdge Adjacent"]
-  1 <--x 12
+  1 <--x 17
-  1 --- 23
+  1 --- 20
-  2 <--x 15
+  2 <--x 14
-  2 --- 24
+  2 --- 22
   3 <--x 13
-  3 --- 21
+  3 --- 24
   4 <--x 18
-  4 --- 25
+  4 --- 21
-  5 <--x 14
+  5 <--x 15
-  5 --- 22
+  5 --- 23
-  6 <--x 11
+  6 <--x 12
-  6 --- 20
+  6 --- 19
-  7 <--x 17
+  7 <--x 16
-  7 --- 19
+  7 --- 25
   8 --- 26
   9 --- 27
-  10 <--x 16
+  10 <--x 11
   10 --- 28
   10 --- 29
-  19 --- 31
+  19 --- 33
   19 --- 46
-  19 ---- 61
+  19 ---- 56
-  20 --- 36
+  20 --- 32
-  20 --- 47
+  20 --- 48
-  20 ---- 56
+  20 ---- 60
-  21 --- 30
+  21 --- 31
-  21 --- 48
+  21 --- 49
-  21 ---- 59
+  21 ---- 62
-  22 --- 35
+  22 --- 34
-  22 --- 49
+  22 --- 50
-  22 ---- 62
+  22 ---- 59
-  23 --- 33
+  23 --- 36
   23 --- 51
-  23 ---- 58
+  23 ---- 61
-  24 --- 34
+  24 --- 30
-  24 --- 52
+  24 --- 53
-  24 ---- 57
+  24 ---- 58
-  25 --- 32
+  25 --- 35
-  25 --- 53
+  25 --- 54
-  25 ---- 60
+  25 ---- 57
   26 --- 38
-  26 --- 45
+  26 --- 47
-  26 ---- 63
+  26 ---- 64
   27 --- 37
-  27 --- 55
+  27 --- 52
-  27 ---- 64
+  27 ---- 63
   28 --- 39
-  28 --- 50
+  28 --- 45
   28 ---- 65
   29 --- 40
   29 --- 41
   29 --- 42
   29 --- 43
   29 --- 44
-  29 --- 54
+  29 --- 55
   29 ---- 66
-  30 --- 76
+  30 --- 69
-  30 x--> 87
+  30 x--> 83
-  30 --- 112
+  30 --- 105
-  30 --- 126
+  30 --- 119
-  31 --- 79
+  31 --- 80
-  31 x--> 90
+  31 x--> 91
-  31 --- 115
+  31 --- 116
-  31 --- 129
+  31 --- 130
-  32 --- 78
+  32 --- 71
-  32 x--> 89
+  32 x--> 85
-  32 --- 114
+  32 --- 107
-  32 --- 128
+  32 --- 121
-  33 --- 75
+  33 --- 67
-  33 x--> 86
+  33 x--> 81
-  33 --- 111
+  33 --- 103
-  33 --- 125
+  33 --- 117
-  34 --- 73
+  34 --- 70
   34 x--> 84
-  34 --- 109
+  34 --- 106
-  34 --- 123
+  34 --- 120
-  35 --- 80
+  35 --- 68
-  35 x--> 91
+  35 x--> 82
-  35 --- 116
+  35 --- 104
-  35 --- 130
+  35 --- 118
-  36 --- 67
+  36 --- 73
-  36 x--> 81
+  36 x--> 87
-  36 --- 103
+  36 --- 109
-  36 --- 117
+  36 --- 123
-  37 --- 77
+  37 --- 72
-  37 x--> 88
+  37 x--> 86
-  37 --- 113
+  37 --- 108
-  37 --- 127
+  37 --- 122
-  38 --- 74
+  38 --- 75
-  38 x--> 85
+  38 x--> 89
-  38 --- 110
+  38 --- 111
-  38 --- 124
+  38 --- 125
-  39 --- 68
+  39 --- 74
-  39 x--> 82
+  39 x--> 88
-  39 --- 104
+  39 --- 110
-  39 --- 118
+  39 --- 124
-  40 --- 70
+  40 --- 76
-  40 x--> 83
+  40 x--> 90
-  40 --- 107
+  40 --- 115
-  40 --- 119
+  40 --- 128
-  41 --- 72
+  41 --- 78
-  41 x--> 83
+  41 x--> 90
-  41 --- 108
+  41 --- 112
-  41 --- 121
+  41 --- 129
-  42 --- 71
+  42 --- 79
-  42 x--> 83
+  42 x--> 90
-  42 --- 106
+  42 --- 113
-  42 --- 122
+  42 --- 127
-  43 --- 69
+  43 --- 77
-  43 x--> 83
+  43 x--> 90
-  43 --- 105
+  43 --- 114
-  43 --- 120
+  43 --- 126
   56 --- 67
   56 --- 81
   56 --- 92
   56 --- 103
   56 --- 117
-  57 --- 73
+  57 --- 68
-  57 --- 84
+  57 --- 82
-  57 --- 95
+  57 --- 93
-  57 --- 109
+  57 --- 104
-  57 --- 123
+  57 --- 118
-  58 --- 75
+  58 --- 69
-  58 --- 86
+  58 --- 83
-  58 --- 97
+  58 --- 94
-  58 --- 111
+  58 --- 105
-  58 --- 125
+  58 --- 119
-  59 --- 76
+  59 --- 70
-  59 --- 87
+  59 --- 84
-  59 --- 98
+  59 --- 95
-  59 --- 112
+  59 --- 106
-  59 --- 126
+  59 --- 120
-  60 --- 78
+  60 --- 71
-  60 --- 89
+  60 --- 85
-  60 --- 100
+  60 --- 96
-  60 --- 114
+  60 --- 107
-  60 --- 128
+  60 --- 121
-  61 --- 79
+  61 --- 73
-  61 --- 90
+  61 --- 87
-  61 --- 101
+  61 --- 98
-  61 --- 115
+  61 --- 109
-  61 --- 129
+  61 --- 123
   62 --- 80
   62 --- 91
   62 --- 102
   62 --- 116
   62 --- 130
-  63 --- 74
+  63 --- 72
-  63 --- 85
+  63 --- 86
-  63 --- 96
+  63 --- 97
-  63 --- 110
+  63 --- 108
-  63 --- 124
+  63 --- 122
-  64 --- 77
+  64 --- 75
-  64 --- 88
+  64 --- 89
-  64 --- 99
+  64 --- 100
-  64 --- 113
+  64 --- 111
-  64 --- 127
+  64 --- 125
-  65 --- 68
+  65 --- 74
-  65 --- 82
+  65 --- 88
-  65 --- 93
+  65 --- 99
-  65 --- 104
+  65 --- 110
-  65 --- 118
+  65 --- 124
-  66 --- 69
+  66 --- 76
-  66 --- 70
+  66 --- 77
-  66 --- 71
+  66 --- 78
-  66 --- 72
+  66 --- 79
-  66 --- 83
+  66 --- 90
-  66 --- 94
+  66 --- 101
-  66 --- 105
+  66 --- 112
-  66 --- 106
+  66 --- 113
-  66 --- 107
+  66 --- 114
-  66 --- 108
+  66 --- 115
-  66 --- 119
+  66 --- 126
-  66 --- 120
+  66 --- 127
-  66 --- 121
+  66 --- 128
-  66 --- 122
+  66 --- 129
   103 <--x 67
   117 <--x 67
   104 <--x 68
   118 <--x 68
   105 <--x 69
-  120 <--x 69
+  119 <--x 69
-  122 <--x 69
+  106 <--x 70
-  107 <--x 70
-  119 <--x 70
   120 <--x 70
-  106 <--x 71
+  107 <--x 71
   121 <--x 71
-  122 <--x 71
   108 <--x 72
-  119 <--x 72
+  122 <--x 72
-  121 <--x 72
   109 <--x 73
   123 <--x 73
   110 <--x 74
   124 <--x 74
   111 <--x 75
   125 <--x 75
-  112 <--x 76
+  115 <--x 76
   126 <--x 76
-  113 <--x 77
+  128 <--x 76
+  114 <--x 77
+  126 <--x 77
   127 <--x 77
-  114 <--x 78
+  112 <--x 78
   128 <--x 78
-  115 <--x 79
+  129 <--x 78
+  113 <--x 79
+  127 <--x 79
   129 <--x 79
   116 <--x 80
   130 <--x 80
   103 <--x 92
   104 <--x 93
   105 <--x 94
-  106 <--x 94
+  106 <--x 95
-  107 <--x 94
+  107 <--x 96
-  108 <--x 94
+  108 <--x 97
-  109 <--x 95
+  109 <--x 98
-  110 <--x 96
+  110 <--x 99
-  111 <--x 97
+  111 <--x 100
-  112 <--x 98
+  112 <--x 101
-  113 <--x 99
+  113 <--x 101
-  114 <--x 100
+  114 <--x 101
   115 <--x 101
   116 <--x 102
 ```

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

@@ -104,10 +104,8 @@ description: Variables in memory after executing makeup-mirror.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "YZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -116,6 +114,8 @@ description: Variables in memory after executing makeup-mirror.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "YZ",
           "xAxis": {
             "x": 0.0,
             "y": 1.0,
@@ -212,10 +212,8 @@ description: Variables in memory after executing makeup-mirror.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -224,6 +222,8 @@ description: Variables in memory after executing makeup-mirror.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -362,10 +362,8 @@ description: Variables in memory after executing makeup-mirror.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -374,6 +372,8 @@ description: Variables in memory after executing makeup-mirror.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -470,10 +470,8 @@ description: Variables in memory after executing makeup-mirror.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -482,6 +480,8 @@ description: Variables in memory after executing makeup-mirror.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -578,10 +578,8 @@ description: Variables in memory after executing makeup-mirror.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -590,6 +588,8 @@ description: Variables in memory after executing makeup-mirror.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -686,10 +686,8 @@ description: Variables in memory after executing makeup-mirror.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -698,6 +696,8 @@ description: Variables in memory after executing makeup-mirror.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -794,10 +794,8 @@ description: Variables in memory after executing makeup-mirror.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -806,6 +804,8 @@ description: Variables in memory after executing makeup-mirror.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -902,10 +902,8 @@ description: Variables in memory after executing makeup-mirror.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -914,6 +912,8 @@ description: Variables in memory after executing makeup-mirror.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -1010,10 +1010,8 @@ description: Variables in memory after executing makeup-mirror.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -1022,6 +1020,8 @@ description: Variables in memory after executing makeup-mirror.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -1131,10 +1131,8 @@ description: Variables in memory after executing makeup-mirror.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": -165.0,
@@ -1143,6 +1141,8 @@ description: Variables in memory after executing makeup-mirror.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

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

@@ -241,10 +241,8 @@ description: Variables in memory after executing mounting-plate.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -253,6 +251,8 @@ description: Variables in memory after executing mounting-plate.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -545,10 +545,8 @@ description: Variables in memory after executing mounting-plate.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -557,6 +555,8 @@ description: Variables in memory after executing mounting-plate.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,

rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/program_memory.snap

@@ -134,10 +134,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -146,6 +144,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -381,10 +381,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XY",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -393,6 +391,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XY",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -661,10 +661,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XY",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -673,6 +671,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XY",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -941,10 +941,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XY",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -953,6 +951,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XY",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -1221,10 +1221,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XY",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -1233,6 +1231,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XY",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -1529,10 +1529,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XY",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -1541,6 +1539,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XY",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -1812,10 +1812,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XY",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -1824,6 +1822,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XY",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -2092,10 +2092,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XY",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -2104,6 +2102,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XY",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -2372,10 +2372,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XY",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -2384,6 +2382,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XY",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -2652,10 +2652,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XY",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -2664,6 +2662,8 @@ description: Variables in memory after executing parametric-bearing-pillow-block
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XY",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,

rust/kcl-lib/tests/kcl_samples/pipe-with-bend/program_memory.snap

@@ -75,10 +75,8 @@ description: Variables in memory after executing pipe-with-bend.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -87,6 +85,8 @@ description: Variables in memory after executing pipe-with-bend.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -175,10 +175,8 @@ description: Variables in memory after executing pipe-with-bend.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -187,6 +185,8 @@ description: Variables in memory after executing pipe-with-bend.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -275,10 +275,8 @@ description: Variables in memory after executing pipe-with-bend.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -287,6 +285,8 @@ description: Variables in memory after executing pipe-with-bend.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -370,10 +370,8 @@ description: Variables in memory after executing pipe-with-bend.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -382,6 +380,8 @@ description: Variables in memory after executing pipe-with-bend.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -427,9 +427,8 @@ description: Variables in memory after executing pipe-with-bend.kcl
   "sketch000": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "XZ",
+      "id": "[uuid]",
       "origin": {
         "x": 0.0,
         "y": 0.0,
@@ -438,6 +437,7 @@ description: Variables in memory after executing pipe-with-bend.kcl
           "type": "Mm"
         }
       },
+      "value": "XZ",
       "xAxis": {
         "x": 1.0,
         "y": 0.0,

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

@@ -113,10 +113,8 @@ description: Variables in memory after executing pipe.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -125,6 +123,8 @@ description: Variables in memory after executing pipe.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -257,10 +257,8 @@ description: Variables in memory after executing pipe.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -269,6 +267,8 @@ description: Variables in memory after executing pipe.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

rust/kcl-lib/tests/kcl_samples/poopy-shoe/program_memory.snap

@@ -843,10 +843,8 @@ description: Variables in memory after executing poopy-shoe.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "YZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -855,6 +853,8 @@ description: Variables in memory after executing poopy-shoe.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "YZ",
           "xAxis": {
             "x": 0.0,
             "y": -1.0,
@@ -1192,10 +1192,8 @@ description: Variables in memory after executing poopy-shoe.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "YZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -1204,6 +1202,8 @@ description: Variables in memory after executing poopy-shoe.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "YZ",
         "xAxis": {
           "x": 0.0,
           "y": -1.0,
@@ -1616,10 +1616,8 @@ description: Variables in memory after executing poopy-shoe.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "YZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -1628,6 +1626,8 @@ description: Variables in memory after executing poopy-shoe.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "YZ",
           "xAxis": {
             "x": 0.0,
             "y": -1.0,
@@ -1781,10 +1781,8 @@ description: Variables in memory after executing poopy-shoe.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": -1.4375,
@@ -1793,6 +1791,8 @@ description: Variables in memory after executing poopy-shoe.kcl
               "type": "Inches"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -2573,10 +2573,8 @@ description: Variables in memory after executing poopy-shoe.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "YZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -2585,6 +2583,8 @@ description: Variables in memory after executing poopy-shoe.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "YZ",
                 "xAxis": {
                   "x": 0.0,
                   "y": -1.0,
@@ -2875,10 +2875,8 @@ description: Variables in memory after executing poopy-shoe.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": -3.875,
             "y": 0.0,
@@ -2887,6 +2885,8 @@ description: Variables in memory after executing poopy-shoe.kcl
               "type": "Inches"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 0.0,
             "y": 1.0,
@@ -3271,10 +3271,8 @@ description: Variables in memory after executing poopy-shoe.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "Custom",
+                "id": "[uuid]",
                 "origin": {
                   "x": -3.875,
                   "y": 0.0,
@@ -3283,6 +3281,8 @@ description: Variables in memory after executing poopy-shoe.kcl
                     "type": "Inches"
                   }
                 },
+                "type": "plane",
+                "value": "Custom",
                 "xAxis": {
                   "x": 0.0,
                   "y": 1.0,
@@ -4241,10 +4241,8 @@ description: Variables in memory after executing poopy-shoe.kcl
                       }
                     ],
                     "on": {
-                      "type": "plane",
-                      "id": "[uuid]",
                       "artifactId": "[uuid]",
-                      "value": "YZ",
+                      "id": "[uuid]",
                       "origin": {
                         "x": 0.0,
                         "y": 0.0,
@@ -4253,6 +4251,8 @@ description: Variables in memory after executing poopy-shoe.kcl
                           "type": "Mm"
                         }
                       },
+                      "type": "plane",
+                      "value": "YZ",
                       "xAxis": {
                         "x": 0.0,
                         "y": -1.0,
@@ -4505,10 +4505,8 @@ description: Variables in memory after executing poopy-shoe.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "Custom",
+          "id": "[uuid]",
           "origin": {
             "x": -3.875,
             "y": 0.0,
@@ -4517,6 +4515,8 @@ description: Variables in memory after executing poopy-shoe.kcl
               "type": "Inches"
             }
           },
+          "type": "plane",
+          "value": "Custom",
           "xAxis": {
             "x": 0.0,
             "y": -1.0,

rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/program_memory.snap

@@ -703,10 +703,8 @@ description: Variables in memory after executing router-template-cross-bar.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -715,6 +713,8 @@ description: Variables in memory after executing router-template-cross-bar.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -1676,10 +1676,8 @@ description: Variables in memory after executing router-template-cross-bar.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -1688,6 +1686,8 @@ description: Variables in memory after executing router-template-cross-bar.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -2699,10 +2699,8 @@ description: Variables in memory after executing router-template-cross-bar.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -2711,6 +2709,8 @@ description: Variables in memory after executing router-template-cross-bar.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -3913,10 +3913,8 @@ description: Variables in memory after executing router-template-cross-bar.kcl
                       }
                     ],
                     "on": {
-                      "type": "plane",
-                      "id": "[uuid]",
                       "artifactId": "[uuid]",
-                      "value": "XZ",
+                      "id": "[uuid]",
                       "origin": {
                         "x": 0.0,
                         "y": 0.0,
@@ -3925,6 +3923,8 @@ description: Variables in memory after executing router-template-cross-bar.kcl
                           "type": "Mm"
                         }
                       },
+                      "type": "plane",
+                      "value": "XZ",
                       "xAxis": {
                         "x": 1.0,
                         "y": 0.0,
@@ -4730,10 +4730,8 @@ description: Variables in memory after executing router-template-cross-bar.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -4742,6 +4740,8 @@ description: Variables in memory after executing router-template-cross-bar.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -5643,10 +5643,8 @@ description: Variables in memory after executing router-template-cross-bar.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -5655,6 +5653,8 @@ description: Variables in memory after executing router-template-cross-bar.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -6606,10 +6606,8 @@ description: Variables in memory after executing router-template-cross-bar.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -6618,6 +6616,8 @@ description: Variables in memory after executing router-template-cross-bar.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -7760,10 +7760,8 @@ description: Variables in memory after executing router-template-cross-bar.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XZ",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -7772,6 +7770,8 @@ description: Variables in memory after executing router-template-cross-bar.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XZ",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,

rust/kcl-lib/tests/kcl_samples/router-template-slate/program_memory.snap

@@ -420,10 +420,8 @@ description: Variables in memory after executing router-template-slate.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -432,6 +430,8 @@ description: Variables in memory after executing router-template-slate.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -1099,10 +1099,8 @@ description: Variables in memory after executing router-template-slate.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -1111,6 +1109,8 @@ description: Variables in memory after executing router-template-slate.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -1804,10 +1804,8 @@ description: Variables in memory after executing router-template-slate.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -1816,6 +1814,8 @@ description: Variables in memory after executing router-template-slate.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -2337,10 +2337,8 @@ description: Variables in memory after executing router-template-slate.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -2349,6 +2347,8 @@ description: Variables in memory after executing router-template-slate.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -2956,10 +2956,8 @@ description: Variables in memory after executing router-template-slate.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -2968,6 +2966,8 @@ description: Variables in memory after executing router-template-slate.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,
@@ -3613,10 +3613,8 @@ description: Variables in memory after executing router-template-slate.kcl
               }
             ],
             "on": {
-              "type": "plane",
-              "id": "[uuid]",
               "artifactId": "[uuid]",
-              "value": "XZ",
+              "id": "[uuid]",
               "origin": {
                 "x": 0.0,
                 "y": 0.0,
@@ -3625,6 +3623,8 @@ description: Variables in memory after executing router-template-slate.kcl
                   "type": "Mm"
                 }
               },
+              "type": "plane",
+              "value": "XZ",
               "xAxis": {
                 "x": 1.0,
                 "y": 0.0,

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

@@ -731,10 +731,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -743,6 +741,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -1676,10 +1676,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -1688,6 +1686,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -2764,10 +2764,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XZ",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -2776,6 +2774,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XZ",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -3745,10 +3745,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XZ",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -3757,6 +3755,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XZ",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -4783,10 +4783,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XZ",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -4795,6 +4793,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XZ",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -5764,10 +5764,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XZ",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -5776,6 +5774,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XZ",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -6798,10 +6798,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XZ",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -6810,6 +6808,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XZ",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -7779,10 +7779,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XZ",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -7791,6 +7789,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XZ",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -8760,10 +8760,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XZ",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -8772,6 +8770,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XZ",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,
@@ -9741,10 +9741,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                     }
                   ],
                   "on": {
-                    "type": "plane",
-                    "id": "[uuid]",
                     "artifactId": "[uuid]",
-                    "value": "XZ",
+                    "id": "[uuid]",
                     "origin": {
                       "x": 0.0,
                       "y": 0.0,
@@ -9753,6 +9751,8 @@ description: Variables in memory after executing sheet-metal-bracket.kcl
                         "type": "Mm"
                       }
                     },
+                    "type": "plane",
+                    "value": "XZ",
                     "xAxis": {
                       "x": 1.0,
                       "y": 0.0,

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

@@ -137,10 +137,8 @@ description: Variables in memory after executing socket-head-cap-screw.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -149,6 +147,8 @@ description: Variables in memory after executing socket-head-cap-screw.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,
@@ -376,10 +376,8 @@ description: Variables in memory after executing socket-head-cap-screw.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -388,6 +386,8 @@ description: Variables in memory after executing socket-head-cap-screw.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -798,10 +798,8 @@ description: Variables in memory after executing socket-head-cap-screw.kcl
                 }
               ],
               "on": {
-                "type": "plane",
-                "id": "[uuid]",
                 "artifactId": "[uuid]",
-                "value": "XZ",
+                "id": "[uuid]",
                 "origin": {
                   "x": 0.0,
                   "y": 0.0,
@@ -810,6 +808,8 @@ description: Variables in memory after executing socket-head-cap-screw.kcl
                     "type": "Mm"
                   }
                 },
+                "type": "plane",
+                "value": "XZ",
                 "xAxis": {
                   "x": 1.0,
                   "y": 0.0,

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

@@ -35,7 +35,7 @@ flowchart LR
     56["Segment<br>[2384, 2417, 9]"]
     57["Segment<br>[2423, 2455, 9]"]
     58["Segment<br>[2461, 2468, 9]"]
-    146[Solid2d]
+    147[Solid2d]
   end
   subgraph path22 [Path]
     22["Path<br>[478, 532, 10]"]
@@ -52,7 +52,7 @@ flowchart LR
     65["Segment<br>[1080, 1122, 10]"]
     66["Segment<br>[1128, 1170, 10]"]
     67["Segment<br>[1176, 1183, 10]"]
-    148[Solid2d]
+    149[Solid2d]
   end
   subgraph path24 [Path]
     24["Path<br>[1441, 1598, 10]"]
@@ -64,7 +64,7 @@ flowchart LR
     73["Segment<br>[2184, 2345, 10]"]
     74["Segment<br>[2351, 2427, 10]"]
     75["Segment<br>[2433, 2440, 10]"]
-    143[Solid2d]
+    144[Solid2d]
   end
   subgraph path25 [Path]
     25["Path<br>[123, 210, 11]"]
@@ -84,7 +84,7 @@ flowchart LR
     89["Segment<br>[837, 867, 11]"]
     90["Segment<br>[875, 943, 11]"]
     91["Segment<br>[951, 958, 11]"]
-    141[Solid2d]
+    142[Solid2d]
   end
   subgraph path26 [Path]
     26["Path<br>[1092, 1190, 11]"]
@@ -92,7 +92,7 @@ flowchart LR
     94["Segment<br>[1284, 1331, 11]"]
     96["Segment<br>[1339, 1419, 11]"]
     99["Segment<br>[1427, 1434, 11]"]
-    149[Solid2d]
+    150[Solid2d]
   end
   subgraph path27 [Path]
     27["Path<br>[1092, 1190, 11]"]
@@ -108,7 +108,7 @@ flowchart LR
     103["Segment<br>[1722, 1770, 11]"]
     105["Segment<br>[1778, 1858, 11]"]
     107["Segment<br>[1866, 1873, 11]"]
-    145[Solid2d]
+    146[Solid2d]
   end
   subgraph path29 [Path]
     29["Path<br>[1531, 1628, 11]"]
@@ -124,11 +124,11 @@ flowchart LR
     109["Segment<br>[400, 435, 12]"]
     110["Segment<br>[441, 475, 12]"]
     111["Segment<br>[481, 488, 12]"]
-    140[Solid2d]
+    141[Solid2d]
   end
   subgraph path31 [Path]
     31["Path<br>[624, 750, 12]"]
-    150[Solid2d]
+    140[Solid2d]
   end
   subgraph path32 [Path]
     32["Path<br>[261, 354, 13]"]
@@ -161,7 +161,7 @@ flowchart LR
     128["Segment<br>[497, 556, 15]"]
     130["Segment<br>[564, 607, 15]"]
     133["Segment<br>[615, 622, 15]"]
-    142[Solid2d]
+    143[Solid2d]
   end
   subgraph path36 [Path]
     36["Path<br>[398, 423, 15]"]
@@ -169,7 +169,7 @@ flowchart LR
     126["Segment<br>[497, 556, 15]"]
     129["Segment<br>[564, 607, 15]"]
     135["Segment<br>[615, 622, 15]"]
-    144[Solid2d]
+    145[Solid2d]
   end
   subgraph path37 [Path]
     37["Path<br>[398, 423, 15]"]
@@ -177,7 +177,7 @@ flowchart LR
     125["Segment<br>[497, 556, 15]"]
     132["Segment<br>[564, 607, 15]"]
     136["Segment<br>[615, 622, 15]"]
-    147[Solid2d]
+    148[Solid2d]
   end
   1["Plane<br>[368, 385, 9]"]
   2["Plane<br>[455, 472, 10]"]
@@ -455,7 +455,7 @@ flowchart LR
   21 --- 56
   21 --- 57
   21 --- 58
-  21 --- 146
+  21 --- 147
   21 ---- 160
   233 --- 21
   22 --- 59
@@ -468,7 +468,7 @@ flowchart LR
   23 --- 65
   23 --- 66
   23 --- 67
-  23 --- 148
+  23 --- 149
   24 --- 68
   24 --- 69
   24 --- 70
@@ -477,7 +477,7 @@ flowchart LR
   24 --- 73
   24 --- 74
   24 --- 75
-  24 --- 143
+  24 --- 144
   24 ---- 161
   25 --- 76
   25 --- 77
@@ -495,12 +495,12 @@ flowchart LR
   25 --- 89
   25 --- 90
   25 --- 91
-  25 --- 141
+  25 --- 142
   26 --- 93
   26 --- 94
   26 --- 96
   26 --- 99
-  26 --- 149
+  26 --- 150
   27 --- 92
   27 --- 95
   27 --- 97
@@ -510,7 +510,7 @@ flowchart LR
   28 --- 103
   28 --- 105
   28 --- 107
-  28 --- 145
+  28 --- 146
   29 --- 101
   29 --- 102
   29 --- 104
@@ -520,14 +520,14 @@ flowchart LR
   30 --- 109
   30 --- 110
   30 --- 111
-  30 --- 140
+  30 --- 141
   30 ---- 162
-  31 --- 150
+  31 --- 140
   31 x---> 162
-  31 x--> 261
+  31 x--> 265
-  31 x--> 262
+  31 x--> 266
-  31 x--> 263
+  31 x--> 267
-  31 x--> 264
+  31 x--> 268
   32 --- 112
   32 --- 113
   32 --- 114
@@ -551,19 +551,19 @@ flowchart LR
   35 --- 128
   35 --- 130
   35 --- 133
-  35 --- 142
+  35 --- 143
   35 ---- 166
   36 --- 124
   36 --- 126
   36 --- 129
   36 --- 135
-  36 --- 144
+  36 --- 145
   36 ---- 165
   37 --- 122
   37 --- 125
   37 --- 132
   37 --- 136
-  37 --- 147
+  37 --- 148
   37 ---- 168
   38 --- 181
   38 x--> 229
@@ -678,22 +678,22 @@ flowchart LR
   75 x--> 243
   75 --- 284
   75 --- 334
-  108 --- 185
+  108 --- 189
-  108 x--> 230
+  108 x--> 231
-  108 --- 264
+  108 --- 266
-  108 --- 313
+  108 --- 320
-  109 --- 186
+  109 --- 190
-  109 x--> 230
+  109 x--> 231
-  109 --- 261
+  109 --- 265
-  109 --- 315
+  109 --- 317
-  110 --- 187
+  110 --- 191
-  110 x--> 230
+  110 x--> 231
-  110 --- 263
+  110 --- 267
-  110 --- 314
+  110 --- 319
-  111 --- 188
+  111 --- 192
-  111 x--> 230
+  111 x--> 231
-  111 --- 262
+  111 --- 268
-  111 --- 316
+  111 --- 318
   112 --- 196
   112 x--> 232
   112 --- 271
@@ -725,10 +725,10 @@ flowchart LR
   164 <--x 120
   120 --- 225
   120 --- 349
-  121 --- 189
+  121 --- 185
-  121 x--> 231
+  121 x--> 230
-  121 --- 267
+  121 --- 263
-  121 --- 319
+  121 --- 315
   122 --- 218
   122 x--> 236
   122 --- 296
@@ -749,10 +749,10 @@ flowchart LR
   126 x--> 226
   126 --- 248
   126 --- 299
-  127 --- 191
+  127 --- 187
-  127 x--> 231
+  127 x--> 230
-  127 --- 265
+  127 --- 261
-  127 --- 318
+  127 --- 314
   128 --- 180
   128 x--> 228
   128 --- 255
@@ -765,10 +765,10 @@ flowchart LR
   130 x--> 228
   130 --- 253
   130 --- 307
-  131 --- 192
+  131 --- 188
-  131 x--> 231
+  131 x--> 230
-  131 --- 268
+  131 --- 264
-  131 --- 320
+  131 --- 316
   132 --- 219
   132 x--> 236
   132 --- 295
@@ -777,10 +777,10 @@ flowchart LR
   133 x--> 228
   133 --- 254
   133 --- 308
-  134 --- 190
+  134 --- 186
-  134 x--> 231
+  134 x--> 230
-  134 --- 266
+  134 --- 262
-  134 --- 317
+  134 --- 313
   135 --- 171
   135 x--> 226
   135 --- 247
@@ -880,20 +880,20 @@ flowchart LR
   161 --- 338
   161 --- 339
   161 --- 340
-  162 --- 185
+  162 --- 189
-  162 --- 186
+  162 --- 190
-  162 --- 187
+  162 --- 191
-  162 --- 188
+  162 --- 192
-  162 --- 230
+  162 --- 231
-  162 --- 240
+  162 --- 241
-  162 --- 261
+  162 --- 265
-  162 --- 262
+  162 --- 266
-  162 --- 263
+  162 --- 267
-  162 --- 264
+  162 --- 268
-  162 --- 313
+  162 --- 317
-  162 --- 314
+  162 --- 318
-  162 --- 315
+  162 --- 319
-  162 --- 316
+  162 --- 320
   163 --- 193
   163 --- 194
   163 --- 195
@@ -946,20 +946,20 @@ flowchart LR
   166 --- 306
   166 --- 307
   166 --- 308
-  167 --- 189
+  167 --- 185
-  167 --- 190
+  167 --- 186
-  167 --- 191
+  167 --- 187
-  167 --- 192
+  167 --- 188
-  167 --- 231
+  167 --- 230
-  167 --- 241
+  167 --- 240
-  167 --- 265
+  167 --- 261
-  167 --- 266
+  167 --- 262
-  167 --- 267
+  167 --- 263
-  167 --- 268
+  167 --- 264
-  167 --- 317
+  167 --- 313
-  167 --- 318
+  167 --- 314
-  167 --- 319
+  167 --- 315
-  167 --- 320
+  167 --- 316
   168 --- 217
   168 --- 218
   168 --- 219
@@ -1006,25 +1006,25 @@ flowchart LR
   258 <--x 182
   259 <--x 183
   257 <--x 184
-  264 <--x 185
+  263 <--x 185
   313 <--x 185
-  315 <--x 185
+  262 <--x 186
-  261 <--x 186
+  313 <--x 186
-  314 <--x 186
+  316 <--x 186
-  315 <--x 186
+  261 <--x 187
-  263 <--x 187
+  264 <--x 188
-  314 <--x 187
-  316 <--x 187
-  262 <--x 188
-  313 <--x 188
   316 <--x 188
-  267 <--x 189
+  266 <--x 189
   317 <--x 189
-  266 <--x 190
+  320 <--x 189
+  265 <--x 190
   317 <--x 190
-  320 <--x 190
+  319 <--x 190
-  265 <--x 191
+  267 <--x 191
+  318 <--x 191
+  319 <--x 191
   268 <--x 192
+  318 <--x 192
   320 <--x 192
   269 <--x 193
   272 <--x 194
@@ -1168,8 +1168,8 @@ flowchart LR
   310 <--x 356
   311 <--x 357
   312 <--x 354
-  318 <--x 369
+  314 <--x 369
-  319 <--x 367
+  315 <--x 367
   321 <--x 361
   322 <--x 359
   323 <--x 358

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

@@ -114,10 +114,8 @@ description: Variables in memory after executing washer.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -126,6 +124,8 @@ description: Variables in memory after executing washer.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -209,10 +209,8 @@ description: Variables in memory after executing washer.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -221,6 +219,8 @@ description: Variables in memory after executing washer.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,

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

@@ -7342,10 +7342,8 @@ description: Variables in memory after executing kittycad_svg.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -7354,6 +7352,8 @@ description: Variables in memory after executing kittycad_svg.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,

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

@@ -1271,10 +1271,8 @@ description: Variables in memory after executing loop_tag.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -1283,6 +1281,8 @@ description: Variables in memory after executing loop_tag.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -3233,10 +3233,8 @@ description: Variables in memory after executing loop_tag.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XY",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -3245,6 +3243,8 @@ description: Variables in memory after executing loop_tag.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XY",
           "xAxis": {
             "x": 1.0,
             "y": 0.0,
@@ -4534,10 +4534,8 @@ description: Variables in memory after executing loop_tag.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -4546,6 +4544,8 @@ description: Variables in memory after executing loop_tag.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -4614,10 +4614,8 @@ description: Variables in memory after executing loop_tag.kcl
       "id": "[uuid]",
       "paths": [],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -4626,6 +4624,8 @@ description: Variables in memory after executing loop_tag.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,

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

@@ -95,10 +95,8 @@ description: Variables in memory after executing neg_xz_plane.kcl
           }
         ],
         "on": {
-          "type": "plane",
-          "id": "[uuid]",
           "artifactId": "[uuid]",
-          "value": "XZ",
+          "id": "[uuid]",
           "origin": {
             "x": 0.0,
             "y": 0.0,
@@ -107,6 +105,8 @@ description: Variables in memory after executing neg_xz_plane.kcl
               "type": "Mm"
             }
           },
+          "type": "plane",
+          "value": "XZ",
           "xAxis": {
             "x": -1.0,
             "y": 0.0,

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

@@ -49,10 +49,8 @@ description: Variables in memory after executing out_of_band_sketches.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -61,6 +59,8 @@ description: Variables in memory after executing out_of_band_sketches.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -187,10 +187,8 @@ description: Variables in memory after executing out_of_band_sketches.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XZ",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -199,6 +197,8 @@ description: Variables in memory after executing out_of_band_sketches.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XZ",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -287,10 +287,8 @@ description: Variables in memory after executing out_of_band_sketches.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -299,6 +297,8 @@ description: Variables in memory after executing out_of_band_sketches.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -425,10 +425,8 @@ description: Variables in memory after executing out_of_band_sketches.kcl
         }
       ],
       "on": {
-        "type": "plane",
-        "id": "[uuid]",
         "artifactId": "[uuid]",
-        "value": "XY",
+        "id": "[uuid]",
         "origin": {
           "x": 0.0,
           "y": 0.0,
@@ -437,6 +435,8 @@ description: Variables in memory after executing out_of_band_sketches.kcl
             "type": "Mm"
           }
         },
+        "type": "plane",
+        "value": "XY",
         "xAxis": {
           "x": 1.0,
           "y": 0.0,
@@ -482,9 +482,8 @@ description: Variables in memory after executing out_of_band_sketches.kcl
   "sketch001": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "XZ",
+      "id": "[uuid]",
       "origin": {
         "x": 0.0,
         "y": 0.0,
@@ -493,6 +492,7 @@ description: Variables in memory after executing out_of_band_sketches.kcl
           "type": "Mm"
         }
       },
+      "value": "XZ",
       "xAxis": {
         "x": 1.0,
         "y": 0.0,
@@ -514,9 +514,8 @@ description: Variables in memory after executing out_of_band_sketches.kcl
   "sketch002": {
     "type": "Plane",
     "value": {
-      "id": "[uuid]",
       "artifactId": "[uuid]",
-      "value": "XY",
+      "id": "[uuid]",
       "origin": {
         "x": 0.0,
         "y": 0.0,
@@ -525,6 +524,7 @@ description: Variables in memory after executing out_of_band_sketches.kcl
           "type": "Mm"
         }
       },
+      "value": "XY",
       "xAxis": {
         "x": 1.0,
         "y": 0.0,