From 14ce66bcc10464ca7321aa380e6377891a39262f Mon Sep 17 00:00:00 2001
From: Jonathan Tran <jonnytran@gmail.com>
Date: Wed, 30 Apr 2025 00:34:35 -0400
Subject: [PATCH] Fix to have stable sorting for end cap artifacts (#6589)

* Fix to have stable sorting for end cap artifacts

* Update output
---
 rust/kcl-lib/src/execution/artifact.rs        |  10 +-
 .../artifact_graph_flowchart.snap.md          |  24 +-
 .../artifact_graph_flowchart.snap.md          |  40 +-
 .../artifact_graph_flowchart.snap.md          |  52 +-
 .../artifact_graph_flowchart.snap.md          |  44 +-
 .../artifact_graph_flowchart.snap.md          |  40 +-
 .../artifact_graph_flowchart.snap.md          | 120 +--
 .../artifact_graph_flowchart.snap.md          |  16 +-
 .../bench/artifact_graph_flowchart.snap.md    | 564 +++++------
 .../artifact_graph_flowchart.snap.md          | 222 ++---
 .../artifact_graph_flowchart.snap.md          |  80 +-
 .../artifact_graph_flowchart.snap.md          | 240 ++---
 .../artifact_graph_flowchart.snap.md          | 228 ++---
 .../artifact_graph_flowchart.snap.md          |  80 +-
 .../artifact_graph_flowchart.snap.md          |  76 +-
 .../flange/artifact_graph_flowchart.snap.md   |  26 +-
 .../artifact_graph_flowchart.snap.md          |  56 +-
 .../artifact_graph_flowchart.snap.md          | 124 +--
 .../artifact_graph_flowchart.snap.md          |  76 +-
 .../artifact_graph_flowchart.snap.md          |  44 +-
 .../artifact_graph_flowchart.snap.md          | 224 ++---
 .../artifact_graph_flowchart.snap.md          |  98 +-
 .../keyboard/artifact_graph_flowchart.snap.md | 918 +++++++++---------
 .../kitt/artifact_graph_flowchart.snap.md     | 700 ++++++-------
 .../lego/artifact_graph_flowchart.snap.md     |  62 +-
 .../artifact_graph_flowchart.snap.md          |  92 +-
 .../artifact_graph_flowchart.snap.md          | 284 +++---
 .../artifact_graph_flowchart.snap.md          |  22 +-
 .../artifact_graph_flowchart.snap.md          | 206 ++--
 .../artifact_graph_flowchart.snap.md          | 200 ++--
 .../artifact_graph_flowchart.snap.md          |  64 +-
 .../artifact_graph_flowchart.snap.md          |  96 +-
 .../artifact_graph_flowchart.snap.md          |  44 +-
 .../artifact_graph_flowchart.snap.md          | 212 ++--
 .../artifact_graph_flowchart.snap.md          |  40 +-
 .../artifact_graph_flowchart.snap.md          |  76 +-
 .../artifact_graph_flowchart.snap.md          |  16 +-
 .../artifact_graph_flowchart.snap.md          | 112 +--
 .../artifact_graph_flowchart.snap.md          |  44 +-
 .../artifact_graph_flowchart.snap.md          |  44 +-
 .../artifact_graph_flowchart.snap.md          |  40 +-
 .../artifact_graph_flowchart.snap.md          |  40 +-
 .../artifact_graph_flowchart.snap.md          |  24 +-
 .../artifact_graph_flowchart.snap.md          |  32 +-
 .../artifact_graph_flowchart.snap.md          |  44 +-
 .../artifact_graph_flowchart.snap.md          |  44 +-
 .../artifact_graph_flowchart.snap.md          |  44 +-
 .../artifact_graph_flowchart.snap.md          |  28 +-
 .../artifact_graph_flowchart.snap.md          |  40 +-
 .../artifact_graph_flowchart.snap.md          |  44 +-
 .../artifact_graph_flowchart.snap.md          |  40 +-
 src/lang/executor.test.ts                     |   3 +-
 52 files changed, 3074 insertions(+), 3065 deletions(-)

diff --git a/rust/kcl-lib/src/execution/artifact.rs b/rust/kcl-lib/src/execution/artifact.rs
index 2a33447fb..1bfa8f2d6 100644
--- a/rust/kcl-lib/src/execution/artifact.rs
+++ b/rust/kcl-lib/src/execution/artifact.rs
@@ -265,7 +265,7 @@ pub struct Wall {
     /// This is for the sketch-on-face plane, not for the wall itself.  Traverse
     /// to the extrude and/or segment to get the wall's code_ref.
     pub face_code_ref: CodeRef,
-    /// The command ID that got the data for this wall.
+    /// The command ID that got the data for this wall. Used for stable sorting.
     pub cmd_id: uuid::Uuid,
 }
 
@@ -283,6 +283,8 @@ pub struct Cap {
     /// This is for the sketch-on-face plane, not for the cap itself.  Traverse
     /// to the extrude and/or segment to get the cap's code_ref.
     pub face_code_ref: CodeRef,
+    /// The command ID that got the data for this cap. Used for stable sorting.
+    pub cmd_id: uuid::Uuid,
 }
 
 #[derive(Debug, Clone, Copy, Serialize, PartialEq, Ord, PartialOrd, Eq, ts_rs::TS)]
@@ -490,6 +492,9 @@ impl PartialOrd for Artifact {
                 if a.sub_type != b.sub_type {
                     return Some(a.sub_type.cmp(&b.sub_type));
                 }
+                if a.cmd_id != b.cmd_id {
+                    return Some(a.cmd_id.cmp(&b.cmd_id));
+                }
                 if a.sweep_id != b.sweep_id {
                     return Some(a.sweep_id.cmp(&b.sweep_id));
                 }
@@ -874,6 +879,7 @@ fn artifacts_to_update(
                         sweep_id: cap.sweep_id,
                         path_ids: cap.path_ids.clone(),
                         face_code_ref: cap.face_code_ref.clone(),
+                        cmd_id: artifact_command.cmd_id,
                     })]);
                 }
                 Some(_) | None => {
@@ -935,6 +941,7 @@ fn artifacts_to_update(
                     sweep_id: cap.sweep_id,
                     path_ids: vec![id],
                     face_code_ref: cap.face_code_ref.clone(),
+                    cmd_id: artifact_command.cmd_id,
                 }));
             }
             return Ok(return_arr);
@@ -1141,6 +1148,7 @@ fn artifacts_to_update(
                             range: sketch_on_face_source_range,
                             path_to_node: Vec::new(),
                         },
+                        cmd_id: artifact_command.cmd_id,
                     }));
                     let Some(Artifact::Sweep(sweep)) = artifacts.get(&path_sweep_id) else {
                         continue;
diff --git a/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/artifact_graph_flowchart.snap.md
index 74f48112f..a73618118 100644
--- a/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/artifact_graph_flowchart.snap.md
@@ -164,7 +164,7 @@ flowchart LR
   29 --- 40
   29 --- 41
   29 --- 45
-  29 --- 48
+  29 --- 49
   29 --- 56
   29 --- 57
   29 --- 58
@@ -184,7 +184,7 @@ flowchart LR
   31 --- 42
   31 --- 43
   31 --- 44
-  31 --- 49
+  31 --- 46
   31 --- 59
   31 --- 60
   31 --- 61
@@ -194,7 +194,7 @@ flowchart LR
   32 --- 33
   32 --- 34
   32 --- 35
-  32 --- 46
+  32 --- 48
   32 --- 50
   32 --- 51
   32 --- 52
@@ -237,16 +237,16 @@ flowchart LR
   60 <--x 44
   72 <--x 44
   73 <--x 44
-  50 <--x 46
-  51 <--x 46
-  52 <--x 46
+  59 <--x 46
+  60 <--x 46
+  61 <--x 46
   53 <--x 47
   54 <--x 47
   55 <--x 47
-  56 <--x 48
-  57 <--x 48
-  58 <--x 48
-  59 <--x 49
-  60 <--x 49
-  61 <--x 49
+  50 <--x 48
+  51 <--x 48
+  52 <--x 48
+  56 <--x 49
+  57 <--x 49
+  58 <--x 49
 ```
diff --git a/rust/kcl-lib/tests/assembly_mixed_units_cubes/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/assembly_mixed_units_cubes/artifact_graph_flowchart.snap.md
index 6d657e0b1..6459343f9 100644
--- a/rust/kcl-lib/tests/assembly_mixed_units_cubes/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/assembly_mixed_units_cubes/artifact_graph_flowchart.snap.md
@@ -67,43 +67,43 @@ flowchart LR
   4 --- 16
   4 ---- 18
   5 --- 24
-  5 x--> 28
+  5 x--> 27
   5 --- 37
   5 --- 46
   6 --- 25
-  6 x--> 28
+  6 x--> 27
   6 --- 35
   6 --- 45
   7 --- 26
-  7 x--> 28
+  7 x--> 27
   7 --- 36
   7 --- 44
   8 --- 23
-  8 x--> 28
+  8 x--> 27
   8 --- 38
   8 --- 43
   10 --- 19
-  10 x--> 27
+  10 x--> 28
   10 --- 31
   10 --- 39
   11 --- 22
-  11 x--> 27
+  11 x--> 28
   11 --- 34
   11 --- 41
   12 --- 21
-  12 x--> 27
+  12 x--> 28
   12 --- 32
   12 --- 42
   13 --- 20
-  13 x--> 27
+  13 x--> 28
   13 --- 33
   13 --- 40
   17 --- 23
   17 --- 24
   17 --- 25
   17 --- 26
-  17 --- 28
-  17 --- 30
+  17 --- 27
+  17 --- 29
   17 --- 35
   17 --- 36
   17 --- 37
@@ -116,8 +116,8 @@ flowchart LR
   18 --- 20
   18 --- 21
   18 --- 22
-  18 --- 27
-  18 --- 29
+  18 --- 28
+  18 --- 30
   18 --- 31
   18 --- 32
   18 --- 33
@@ -150,12 +150,12 @@ flowchart LR
   36 <--x 26
   44 <--x 26
   45 <--x 26
-  31 <--x 29
-  32 <--x 29
-  33 <--x 29
-  34 <--x 29
-  35 <--x 30
-  36 <--x 30
-  37 <--x 30
-  38 <--x 30
+  35 <--x 29
+  36 <--x 29
+  37 <--x 29
+  38 <--x 29
+  31 <--x 30
+  32 <--x 30
+  33 <--x 30
+  34 <--x 30
 ```
diff --git a/rust/kcl-lib/tests/crazy_multi_profile/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/crazy_multi_profile/artifact_graph_flowchart.snap.md
index a395dac63..8b53325cf 100644
--- a/rust/kcl-lib/tests/crazy_multi_profile/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/crazy_multi_profile/artifact_graph_flowchart.snap.md
@@ -196,15 +196,15 @@ flowchart LR
   14 --- 58
   14 ---- 63
   15 --- 69
-  15 x--> 79
+  15 x--> 81
   15 --- 89
   15 --- 103
   16 --- 70
-  16 x--> 79
+  16 x--> 81
   16 --- 91
   16 --- 104
   17 --- 68
-  17 x--> 79
+  17 x--> 81
   17 --- 90
   17 --- 102
   31 --- 65
@@ -220,38 +220,38 @@ flowchart LR
   33 --- 87
   33 --- 101
   37 --- 72
-  37 x--> 80
+  37 x--> 79
   37 --- 94
   37 --- 106
   38 --- 73
-  38 x--> 80
+  38 x--> 79
   38 --- 93
   38 --- 107
   39 --- 71
-  39 x--> 80
+  39 x--> 79
   39 --- 92
   39 --- 105
   46 --- 75
-  46 x--> 81
+  46 x--> 80
   46 --- 95
   46 --- 108
   47 --- 76
-  47 x--> 81
+  47 x--> 80
   47 --- 97
   47 --- 109
   48 --- 74
-  48 x--> 81
+  48 x--> 80
   48 --- 98
   48 --- 111
   49 --- 77
-  49 x--> 81
+  49 x--> 80
   49 --- 96
   49 --- 110
   60 --- 68
   60 --- 69
   60 --- 70
-  60 --- 79
-  60 --- 83
+  60 --- 81
+  60 --- 85
   60 --- 89
   60 --- 90
   60 --- 91
@@ -273,8 +273,8 @@ flowchart LR
   63 --- 75
   63 --- 76
   63 --- 77
-  63 --- 81
-  63 --- 85
+  63 --- 80
+  63 --- 84
   63 --- 95
   63 --- 96
   63 --- 97
@@ -286,8 +286,8 @@ flowchart LR
   64 --- 71
   64 --- 72
   64 --- 73
-  64 --- 80
-  64 --- 84
+  64 --- 79
+  64 --- 83
   64 --- 92
   64 --- 93
   64 --- 94
@@ -336,14 +336,14 @@ flowchart LR
   86 <--x 82
   87 <--x 82
   88 <--x 82
-  89 <--x 83
-  90 <--x 83
-  91 <--x 83
-  92 <--x 84
-  93 <--x 84
-  94 <--x 84
-  95 <--x 85
-  96 <--x 85
-  97 <--x 85
-  98 <--x 85
+  92 <--x 83
+  93 <--x 83
+  94 <--x 83
+  95 <--x 84
+  96 <--x 84
+  97 <--x 84
+  98 <--x 84
+  89 <--x 85
+  90 <--x 85
+  91 <--x 85
 ```
diff --git a/rust/kcl-lib/tests/fillet-and-shell/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/fillet-and-shell/artifact_graph_flowchart.snap.md
index ca3c34d6c..dbd48ca92 100644
--- a/rust/kcl-lib/tests/fillet-and-shell/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/fillet-and-shell/artifact_graph_flowchart.snap.md
@@ -163,27 +163,27 @@ flowchart LR
   20 --- 33
   20 --- 43
   25 --- 55
-  25 x--> 63
+  25 x--> 64
   25 --- 74
   25 --- 82
   26 --- 56
-  26 x--> 63
+  26 x--> 64
   26 --- 76
   26 --- 83
   27 --- 58
-  27 x--> 63
+  27 x--> 64
   27 --- 73
   27 --- 84
   28 --- 57
-  28 x--> 63
+  28 x--> 64
   28 --- 75
   28 --- 81
   29 --- 59
-  29 x--> 64
+  29 x--> 61
   29 --- 77
   29 --- 85
   30 --- 53
-  30 x--> 61
+  30 x--> 62
   30 --- 71
   30 --- 79
   31 --- 52
@@ -191,15 +191,15 @@ flowchart LR
   31 --- 70
   31 --- 78
   32 --- 54
-  32 x--> 62
+  32 x--> 63
   32 --- 72
   32 --- 80
   47 --- 55
   47 --- 56
   47 --- 57
   47 --- 58
-  47 --- 63
-  47 --- 68
+  47 --- 64
+  47 --- 69
   47 --- 73
   47 --- 74
   47 --- 75
@@ -214,18 +214,18 @@ flowchart LR
   48 --- 70
   48 --- 78
   49 --- 53
-  49 --- 61
-  49 --- 66
+  49 --- 62
+  49 --- 67
   49 --- 71
   49 --- 79
   50 --- 54
-  50 --- 62
-  50 --- 67
+  50 --- 63
+  50 --- 68
   50 --- 72
   50 --- 80
   51 --- 59
-  51 --- 64
-  51 --- 69
+  51 --- 61
+  51 --- 66
   51 --- 77
   51 --- 85
   70 <--x 52
@@ -241,13 +241,13 @@ flowchart LR
   77 <--x 59
   85 <--x 59
   70 <--x 65
-  71 <--x 66
-  72 <--x 67
-  73 <--x 68
-  74 <--x 68
-  75 <--x 68
-  76 <--x 68
-  77 <--x 69
+  77 <--x 66
+  71 <--x 67
+  72 <--x 68
+  73 <--x 69
+  74 <--x 69
+  75 <--x 69
+  76 <--x 69
   81 <--x 89
   82 <--x 88
   83 <--x 87
diff --git a/rust/kcl-lib/tests/intersect_cubes/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/intersect_cubes/artifact_graph_flowchart.snap.md
index e25def809..236ebe28b 100644
--- a/rust/kcl-lib/tests/intersect_cubes/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/intersect_cubes/artifact_graph_flowchart.snap.md
@@ -66,43 +66,43 @@ flowchart LR
   4 ---- 15
   4 <--x 17
   5 --- 24
-  5 x--> 27
+  5 x--> 26
   5 --- 35
   5 --- 42
   6 --- 21
-  6 x--> 26
+  6 x--> 27
   6 --- 31
   6 --- 38
   7 --- 19
-  7 x--> 26
+  7 x--> 27
   7 --- 30
   7 --- 41
   8 --- 25
-  8 x--> 27
+  8 x--> 26
   8 --- 34
   8 --- 44
   9 --- 18
-  9 x--> 26
+  9 x--> 27
   9 --- 33
   9 --- 40
   10 --- 23
-  10 x--> 27
+  10 x--> 26
   10 --- 37
   10 --- 43
   11 --- 22
-  11 x--> 27
+  11 x--> 26
   11 --- 36
   11 --- 45
   12 --- 20
-  12 x--> 26
+  12 x--> 27
   12 --- 32
   12 --- 39
   15 --- 18
   15 --- 19
   15 --- 20
   15 --- 21
-  15 --- 26
-  15 --- 28
+  15 --- 27
+  15 --- 29
   15 --- 30
   15 --- 31
   15 --- 32
@@ -115,8 +115,8 @@ flowchart LR
   16 --- 23
   16 --- 24
   16 --- 25
-  16 --- 27
-  16 --- 29
+  16 --- 26
+  16 --- 28
   16 --- 34
   16 --- 35
   16 --- 36
@@ -149,12 +149,12 @@ flowchart LR
   34 <--x 25
   42 <--x 25
   44 <--x 25
-  30 <--x 28
-  31 <--x 28
-  32 <--x 28
-  33 <--x 28
-  34 <--x 29
-  35 <--x 29
-  36 <--x 29
-  37 <--x 29
+  34 <--x 28
+  35 <--x 28
+  36 <--x 28
+  37 <--x 28
+  30 <--x 29
+  31 <--x 29
+  32 <--x 29
+  33 <--x 29
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/axial-fan/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/axial-fan/artifact_graph_flowchart.snap.md
index 0716aedc9..ea90e5349 100644
--- a/rust/kcl-lib/tests/kcl_samples/axial-fan/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/axial-fan/artifact_graph_flowchart.snap.md
@@ -363,7 +363,7 @@ flowchart LR
   14 --- 49
   14 --- 99
   14 ---- 123
-  187 --- 14
+  188 --- 14
   15 --- 50
   15 --- 51
   15 --- 52
@@ -373,11 +373,11 @@ flowchart LR
   15 --- 56
   15 --- 57
   15 ---- 124
-  187 --- 15
+  188 --- 15
   16 --- 58
   16 --- 107
   16 ---- 125
-  184 --- 16
+  187 --- 16
   17 --- 59
   17 --- 60
   17 --- 61
@@ -385,30 +385,30 @@ flowchart LR
   17 --- 63
   17 --- 105
   17 ---- 126
-  184 --- 17
+  187 --- 17
   18 --- 64
   18 --- 103
-  184 --- 18
+  187 --- 18
   19 --- 65
   19 --- 106
-  184 --- 19
+  187 --- 19
   20 --- 66
   20 --- 102
-  184 --- 20
+  187 --- 20
   21 --- 67
   21 --- 116
-  184 --- 21
+  187 --- 21
   22 --- 68
   22 --- 115
-  184 --- 22
+  187 --- 22
   23 --- 69
   23 --- 117
   23 ---- 127
-  187 --- 23
+  188 --- 23
   24 --- 70
   24 --- 110
   24 ---- 128
-  182 --- 24
+  189 --- 24
   25 --- 71
   25 --- 111
   25 ---- 129
@@ -468,71 +468,71 @@ flowchart LR
   34 --- 207
   34 --- 254
   41 --- 170
-  41 x--> 187
+  41 x--> 188
   41 --- 219
   41 --- 267
   42 --- 176
-  42 x--> 187
+  42 x--> 188
   42 --- 217
   42 --- 262
   43 --- 177
-  43 x--> 187
+  43 x--> 188
   43 --- 222
   43 --- 263
   44 --- 174
-  44 x--> 187
+  44 x--> 188
   44 --- 221
   44 --- 260
   45 --- 172
-  45 x--> 187
+  45 x--> 188
   45 --- 218
   45 --- 264
   46 --- 175
-  46 x--> 187
+  46 x--> 188
   46 --- 220
   46 --- 261
   47 --- 173
-  47 x--> 187
+  47 x--> 188
   47 --- 215
   47 --- 266
   48 --- 171
-  48 x--> 187
+  48 x--> 188
   48 --- 216
   48 --- 265
   50 --- 153
-  50 x--> 187
+  50 x--> 188
   50 --- 194
   50 --- 242
   51 --- 149
-  51 x--> 187
+  51 x--> 188
   51 --- 196
   51 --- 246
   52 --- 152
-  52 x--> 187
+  52 x--> 188
   52 --- 197
   52 --- 244
   53 --- 154
-  53 x--> 187
+  53 x--> 188
   53 --- 199
   53 --- 241
   54 --- 150
-  54 x--> 187
+  54 x--> 188
   54 --- 200
   54 --- 240
   55 --- 156
-  55 x--> 187
+  55 x--> 188
   55 --- 198
   55 --- 239
   56 --- 151
-  56 x--> 187
+  56 x--> 188
   56 --- 195
   56 --- 245
   57 --- 155
-  57 x--> 187
+  57 x--> 188
   57 --- 201
   57 --- 243
   58 --- 133
-  58 x--> 184
+  58 x--> 187
   58 --- 190
   58 --- 223
   59 --- 161
@@ -552,11 +552,11 @@ flowchart LR
   62 --- 206
   62 --- 250
   69 --- 135
-  69 x--> 187
+  69 x--> 188
   69 --- 192
   69 --- 225
   70 --- 134
-  70 x--> 182
+  70 x--> 189
   70 --- 191
   70 --- 224
   71 --- 157
@@ -605,19 +605,19 @@ flowchart LR
   84 --- 147
   84 --- 233
   87 --- 169
-  87 x--> 188
+  87 x--> 184
   87 --- 212
   87 --- 257
   89 --- 168
-  89 x--> 188
+  89 x--> 184
   89 --- 214
   89 --- 258
   90 --- 167
-  90 x--> 188
+  90 x--> 184
   90 --- 211
   90 --- 256
   92 --- 166
-  92 x--> 188
+  92 x--> 184
   92 --- 213
   92 --- 259
   119 --- 162
@@ -625,7 +625,7 @@ flowchart LR
   119 --- 164
   119 --- 165
   119 --- 181
-  119 --- 187
+  119 --- 188
   119 --- 207
   119 --- 208
   119 --- 209
@@ -666,7 +666,7 @@ flowchart LR
   124 --- 154
   124 --- 155
   124 --- 156
-  124 --- 184
+  124 --- 187
   124 --- 194
   124 --- 195
   124 --- 196
@@ -701,7 +701,7 @@ flowchart LR
   126 --- 250
   126 --- 251
   127 --- 135
-  127 --- 182
+  127 --- 189
   127 --- 192
   127 --- 225
   128 --- 134
@@ -714,7 +714,7 @@ flowchart LR
   129 --- 247
   130 --- 148
   130 --- 178
-  130 --- 183
+  130 --- 182
   130 --- 193
   130 --- 238
   131 --- 136
@@ -745,8 +745,8 @@ flowchart LR
   132 --- 167
   132 --- 168
   132 --- 169
-  132 --- 188
-  132 --- 189
+  132 --- 183
+  132 --- 184
   132 --- 211
   132 --- 212
   132 --- 213
@@ -864,30 +864,30 @@ flowchart LR
   220 <--x 181
   221 <--x 181
   222 <--x 181
-  192 <--x 182
-  193 <--x 183
-  194 <--x 184
-  195 <--x 184
-  196 <--x 184
-  197 <--x 184
-  198 <--x 184
-  199 <--x 184
-  200 <--x 184
-  201 <--x 184
+  193 <--x 182
+  211 <--x 183
+  212 <--x 183
+  213 <--x 183
+  214 <--x 183
   203 <--x 186
   204 <--x 186
   205 <--x 186
   206 <--x 186
-  190 <--x 187
-  191 <--x 187
-  207 <--x 187
-  208 <--x 187
-  209 <--x 187
-  210 <--x 187
-  211 <--x 189
-  212 <--x 189
-  213 <--x 189
-  214 <--x 189
+  194 <--x 187
+  195 <--x 187
+  196 <--x 187
+  197 <--x 187
+  198 <--x 187
+  199 <--x 187
+  200 <--x 187
+  201 <--x 187
+  190 <--x 188
+  191 <--x 188
+  207 <--x 188
+  208 <--x 188
+  209 <--x 188
+  210 <--x 188
+  192 <--x 189
   202 <--x 276
   248 <--x 271
   249 <--x 272
diff --git a/rust/kcl-lib/tests/kcl_samples/ball-bearing/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/ball-bearing/artifact_graph_flowchart.snap.md
index 921ac6e5d..44cf148cb 100644
--- a/rust/kcl-lib/tests/kcl_samples/ball-bearing/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/ball-bearing/artifact_graph_flowchart.snap.md
@@ -110,7 +110,7 @@ flowchart LR
   14 --- 25
   14 --- 29
   15 --- 46
-  15 x--> 49
+  15 x--> 47
   15 --- 55
   15 --- 63
   34 <--x 17
@@ -132,7 +132,7 @@ flowchart LR
   22 --- 40
   22 --- 59
   23 --- 38
-  23 x--> 47
+  23 x--> 49
   23 --- 53
   23 --- 56
   24 --- 39
@@ -140,8 +140,8 @@ flowchart LR
   24 --- 54
   24 --- 57
   33 --- 46
-  33 --- 49
-  33 --- 52
+  33 --- 47
+  33 --- 50
   33 --- 55
   33 --- 63
   34 --- 44
@@ -156,8 +156,8 @@ flowchart LR
   35 --- 60
   35 --- 61
   36 --- 38
-  36 --- 47
-  36 --- 50
+  36 --- 49
+  36 --- 52
   36 --- 53
   36 --- 56
   37 --- 39
@@ -181,7 +181,7 @@ flowchart LR
   62 <--x 45
   55 <--x 46
   63 <--x 46
-  53 <--x 50
+  55 <--x 50
   54 <--x 51
-  55 <--x 52
+  53 <--x 52
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/bench/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/bench/artifact_graph_flowchart.snap.md
index 265d5934b..4ee7e0899 100644
--- a/rust/kcl-lib/tests/kcl_samples/bench/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/bench/artifact_graph_flowchart.snap.md
@@ -993,11 +993,11 @@ flowchart LR
   39 --- 216
   39 ---- 238
   40 --- 255
-  40 x--> 411
+  40 x--> 420
   40 --- 452
   40 --- 600
   41 --- 352
-  41 x--> 417
+  41 x--> 410
   41 --- 535
   41 --- 690
   42 --- 343
@@ -1005,19 +1005,19 @@ flowchart LR
   42 --- 513
   42 --- 678
   43 --- 320
-  43 x--> 403
+  43 x--> 402
   43 --- 487
   43 --- 663
   44 --- 381
-  44 x--> 418
+  44 x--> 415
   44 --- 550
   44 --- 722
   45 --- 291
-  45 x--> 400
+  45 x--> 405
   45 --- 458
   45 --- 617
   46 --- 278
-  46 x--> 400
+  46 x--> 405
   46 --- 471
   46 --- 626
   47 --- 329
@@ -1025,23 +1025,23 @@ flowchart LR
   47 --- 519
   47 --- 665
   48 --- 348
-  48 x--> 417
+  48 x--> 410
   48 --- 527
   48 --- 692
   49 --- 371
-  49 x--> 418
+  49 x--> 415
   49 --- 564
   49 --- 718
   50 --- 314
-  50 x--> 403
+  50 x--> 402
   50 --- 496
   50 --- 658
   51 --- 265
-  51 x--> 411
+  51 x--> 420
   51 --- 436
   51 --- 602
   52 --- 275
-  52 x--> 400
+  52 x--> 405
   52 --- 454
   52 --- 612
   53 --- 331
@@ -1049,19 +1049,19 @@ flowchart LR
   53 --- 526
   53 --- 677
   54 --- 313
-  54 x--> 403
+  54 x--> 402
   54 --- 498
   54 --- 652
   55 --- 353
-  55 x--> 417
+  55 x--> 410
   55 --- 536
   55 --- 687
   56 --- 270
-  56 x--> 411
+  56 x--> 420
   56 --- 446
   56 --- 593
   57 --- 383
-  57 x--> 418
+  57 x--> 415
   57 --- 558
   57 --- 706
   58 --- 327
@@ -1069,39 +1069,39 @@ flowchart LR
   58 --- 507
   58 --- 684
   59 --- 259
-  59 x--> 411
+  59 x--> 420
   59 --- 438
   59 --- 596
   60 --- 354
-  60 x--> 417
+  60 x--> 410
   60 --- 540
   60 --- 694
   61 --- 316
-  61 x--> 403
+  61 x--> 402
   61 --- 492
   61 --- 662
   62 --- 380
-  62 x--> 418
+  62 x--> 415
   62 --- 547
   62 --- 708
   63 --- 289
-  63 x--> 400
+  63 x--> 405
   63 --- 457
   63 --- 619
   64 --- 346
-  64 x--> 417
+  64 x--> 410
   64 --- 530
   64 --- 686
   65 --- 311
-  65 x--> 403
+  65 x--> 402
   65 --- 501
   65 --- 646
   66 --- 281
-  66 x--> 400
+  66 x--> 405
   66 --- 462
   66 --- 620
   67 --- 263
-  67 x--> 411
+  67 x--> 420
   67 --- 440
   67 --- 595
   68 --- 335
@@ -1109,19 +1109,19 @@ flowchart LR
   68 --- 517
   68 --- 679
   69 --- 379
-  69 x--> 418
+  69 x--> 415
   69 --- 551
   69 --- 716
   70 --- 366
-  70 x--> 418
+  70 x--> 415
   70 --- 566
   70 --- 713
   71 --- 310
-  71 x--> 403
+  71 x--> 402
   71 --- 497
   71 --- 661
   72 --- 283
-  72 x--> 400
+  72 x--> 405
   72 --- 468
   72 --- 614
   73 --- 342
@@ -1129,15 +1129,15 @@ flowchart LR
   73 --- 522
   73 --- 668
   74 --- 266
-  74 x--> 411
+  74 x--> 420
   74 --- 435
   74 --- 599
   75 --- 363
-  75 x--> 417
+  75 x--> 410
   75 --- 532
   75 --- 703
   76 --- 345
-  76 x--> 417
+  76 x--> 410
   76 --- 541
   76 --- 688
   77 --- 330
@@ -1145,23 +1145,23 @@ flowchart LR
   77 --- 523
   77 --- 671
   78 --- 280
-  78 x--> 400
+  78 x--> 405
   78 --- 464
   78 --- 615
   79 --- 374
-  79 x--> 418
+  79 x--> 415
   79 --- 559
   79 --- 717
   80 --- 319
-  80 x--> 403
+  80 x--> 402
   80 --- 495
   80 --- 659
   81 --- 269
-  81 x--> 411
+  81 x--> 420
   81 --- 443
   81 --- 609
   82 --- 256
-  82 x--> 411
+  82 x--> 420
   82 --- 448
   82 --- 601
   83 --- 336
@@ -1169,31 +1169,31 @@ flowchart LR
   83 --- 520
   83 --- 683
   84 --- 376
-  84 x--> 418
+  84 x--> 415
   84 --- 563
   84 --- 724
   85 --- 357
-  85 x--> 417
+  85 x--> 410
   85 --- 531
   85 --- 702
   86 --- 286
-  86 x--> 400
+  86 x--> 405
   86 --- 467
   86 --- 618
   87 --- 323
-  87 x--> 403
+  87 x--> 402
   87 --- 500
   87 --- 660
   88 --- 365
-  88 x--> 418
+  88 x--> 415
   88 --- 554
   88 --- 711
   89 --- 276
-  89 x--> 400
+  89 x--> 405
   89 --- 461
   89 --- 623
   90 --- 258
-  90 x--> 411
+  90 x--> 420
   90 --- 449
   90 --- 610
   91 --- 341
@@ -1201,15 +1201,15 @@ flowchart LR
   91 --- 518
   91 --- 675
   92 --- 322
-  92 x--> 403
+  92 x--> 402
   92 --- 493
   92 --- 645
   93 --- 364
-  93 x--> 417
+  93 x--> 410
   93 --- 533
   93 --- 699
   94 --- 308
-  94 x--> 403
+  94 x--> 402
   94 --- 502
   94 --- 664
   95 --- 333
@@ -1217,19 +1217,19 @@ flowchart LR
   95 --- 515
   95 --- 670
   96 --- 282
-  96 x--> 400
+  96 x--> 405
   96 --- 469
   96 --- 628
   97 --- 358
-  97 x--> 417
+  97 x--> 410
   97 --- 529
   97 --- 700
   98 --- 378
-  98 x--> 418
+  98 x--> 415
   98 --- 553
   98 --- 715
   99 --- 268
-  99 x--> 411
+  99 x--> 420
   99 --- 450
   99 --- 598
   100 --- 326
@@ -1237,31 +1237,31 @@ flowchart LR
   100 --- 521
   100 --- 674
   101 --- 309
-  101 x--> 403
+  101 x--> 402
   101 --- 494
   101 --- 649
   102 --- 279
-  102 x--> 400
+  102 x--> 405
   102 --- 465
   102 --- 613
   103 --- 351
-  103 x--> 417
+  103 x--> 410
   103 --- 534
   103 --- 704
   104 --- 373
-  104 x--> 418
+  104 x--> 415
   104 --- 560
   104 --- 709
   105 --- 271
-  105 x--> 411
+  105 x--> 420
   105 --- 453
   105 --- 604
   106 --- 273
-  106 x--> 400
+  106 x--> 405
   106 --- 470
   106 --- 631
   107 --- 368
-  107 x--> 418
+  107 x--> 415
   107 --- 555
   107 --- 714
   108 --- 332
@@ -1269,23 +1269,23 @@ flowchart LR
   108 --- 514
   108 --- 682
   109 --- 260
-  109 x--> 411
+  109 x--> 420
   109 --- 447
   109 --- 605
   110 --- 359
-  110 x--> 417
+  110 x--> 410
   110 --- 545
   110 --- 701
   111 --- 324
-  111 x--> 403
+  111 x--> 402
   111 --- 491
   111 --- 653
   112 --- 372
-  112 x--> 418
+  112 x--> 415
   112 --- 552
   112 --- 720
   113 --- 261
-  113 x--> 411
+  113 x--> 420
   113 --- 444
   113 --- 597
   114 --- 334
@@ -1293,23 +1293,23 @@ flowchart LR
   114 --- 524
   114 --- 680
   115 --- 356
-  115 x--> 417
+  115 x--> 410
   115 --- 538
   115 --- 693
   116 --- 288
-  116 x--> 400
+  116 x--> 405
   116 --- 466
   116 --- 627
   117 --- 317
-  117 x--> 403
+  117 x--> 402
   117 --- 505
   117 --- 650
   118 --- 274
-  118 x--> 400
+  118 x--> 405
   118 --- 456
   118 --- 625
   119 --- 254
-  119 x--> 411
+  119 x--> 420
   119 --- 437
   119 --- 603
   120 --- 328
@@ -1317,23 +1317,23 @@ flowchart LR
   120 --- 510
   120 --- 676
   121 --- 347
-  121 x--> 417
+  121 x--> 410
   121 --- 528
   121 --- 695
   122 --- 370
-  122 x--> 418
+  122 x--> 415
   122 --- 549
   122 --- 707
   123 --- 312
-  123 x--> 403
+  123 x--> 402
   123 --- 489
   123 --- 647
   124 --- 252
-  124 x--> 411
+  124 x--> 420
   124 --- 441
   124 --- 592
   125 --- 306
-  125 x--> 403
+  125 x--> 402
   125 --- 504
   125 --- 655
   126 --- 337
@@ -1341,35 +1341,35 @@ flowchart LR
   126 --- 512
   126 --- 681
   127 --- 355
-  127 x--> 417
+  127 x--> 410
   127 --- 542
   127 --- 698
   128 --- 290
-  128 x--> 400
+  128 x--> 405
   128 --- 455
   128 --- 624
   129 --- 384
-  129 x--> 418
+  129 x--> 415
   129 --- 548
   129 --- 710
   130 --- 272
-  130 x--> 400
+  130 x--> 405
   130 --- 472
   130 --- 622
   131 --- 350
-  131 x--> 417
+  131 x--> 410
   131 --- 537
   131 --- 685
   132 --- 262
-  132 x--> 411
+  132 x--> 420
   132 --- 442
   132 --- 607
   133 --- 377
-  133 x--> 418
+  133 x--> 415
   133 --- 562
   133 --- 705
   134 --- 318
-  134 x--> 403
+  134 x--> 402
   134 --- 490
   134 --- 651
   135 --- 344
@@ -1377,15 +1377,15 @@ flowchart LR
   135 --- 508
   135 --- 672
   136 --- 307
-  136 x--> 403
+  136 x--> 402
   136 --- 503
   136 --- 657
   137 --- 277
-  137 x--> 400
+  137 x--> 405
   137 --- 463
   137 --- 629
   138 --- 349
-  138 x--> 417
+  138 x--> 410
   138 --- 539
   138 --- 696
   139 --- 340
@@ -1393,11 +1393,11 @@ flowchart LR
   139 --- 511
   139 --- 669
   140 --- 267
-  140 x--> 411
+  140 x--> 420
   140 --- 434
   140 --- 608
   141 --- 382
-  141 x--> 418
+  141 x--> 415
   141 --- 565
   141 --- 723
   142 --- 325
@@ -1405,35 +1405,35 @@ flowchart LR
   142 --- 516
   142 --- 673
   143 --- 257
-  143 x--> 411
+  143 x--> 420
   143 --- 451
   143 --- 606
   144 --- 375
-  144 x--> 418
+  144 x--> 415
   144 --- 561
   144 --- 719
   145 --- 287
-  145 x--> 400
+  145 x--> 405
   145 --- 460
   145 --- 621
   146 --- 361
-  146 x--> 417
+  146 x--> 410
   146 --- 543
   146 --- 689
   147 --- 321
-  147 x--> 403
+  147 x--> 402
   147 --- 499
   147 --- 656
   148 --- 305
-  148 x--> 403
+  148 x--> 402
   148 --- 506
   148 --- 648
   149 --- 367
-  149 x--> 418
+  149 x--> 415
   149 --- 556
   149 --- 712
   150 --- 264
-  150 x--> 411
+  150 x--> 420
   150 --- 439
   150 --- 611
   151 --- 339
@@ -1441,23 +1441,23 @@ flowchart LR
   151 --- 525
   151 --- 666
   152 --- 285
-  152 x--> 400
+  152 x--> 405
   152 --- 473
   152 --- 630
   153 --- 362
-  153 x--> 417
+  153 x--> 410
   153 --- 544
   153 --- 697
   154 --- 253
-  154 x--> 411
+  154 x--> 420
   154 --- 445
   154 --- 594
   155 --- 369
-  155 x--> 418
+  155 x--> 415
   155 --- 557
   155 --- 721
   156 --- 315
-  156 x--> 403
+  156 x--> 402
   156 --- 488
   156 --- 654
   157 --- 338
@@ -1465,111 +1465,111 @@ flowchart LR
   157 --- 509
   157 --- 667
   158 --- 284
-  158 x--> 400
+  158 x--> 405
   158 --- 459
   158 --- 616
   159 --- 360
-  159 x--> 417
+  159 x--> 410
   159 --- 546
   159 --- 691
   166 --- 391
-  166 x--> 408
+  166 x--> 399
   166 --- 577
   166 --- 734
   167 --- 392
-  167 x--> 408
+  167 x--> 399
   167 --- 573
   167 --- 731
   168 --- 393
-  168 x--> 408
+  168 x--> 399
   168 --- 574
   168 --- 736
   170 --- 246
-  170 x--> 398
+  170 x--> 400
   170 --- 428
   170 --- 588
   171 --- 247
-  171 x--> 398
+  171 x--> 400
   171 --- 430
   171 --- 591
   172 --- 248
-  172 x--> 398
+  172 x--> 400
   172 --- 433
   172 --- 586
   173 --- 394
-  173 x--> 408
+  173 x--> 399
   173 --- 576
   173 --- 732
   175 --- 395
-  175 x--> 408
+  175 x--> 399
   175 --- 575
   175 --- 735
   176 --- 249
-  176 x--> 398
+  176 x--> 400
   176 --- 429
   176 --- 587
   177 --- 396
-  177 x--> 408
+  177 x--> 399
   177 --- 578
   177 --- 733
   178 --- 250
-  178 x--> 398
+  178 x--> 400
   178 --- 431
   178 --- 590
   179 --- 251
-  179 x--> 398
+  179 x--> 400
   179 --- 432
   179 --- 589
   180 --- 387
-  180 x--> 407
+  180 x--> 406
   180 --- 570
   180 --- 725
   181 --- 385
-  181 x--> 407
+  181 x--> 406
   181 --- 571
   181 --- 727
   182 --- 388
-  182 x--> 407
+  182 x--> 406
   182 --- 569
   182 --- 730
   183 --- 389
-  183 x--> 407
+  183 x--> 406
   183 --- 568
   183 --- 729
   184 --- 390
-  184 x--> 407
+  184 x--> 406
   184 --- 572
   184 --- 728
   185 --- 386
-  185 x--> 407
+  185 x--> 406
   185 --- 567
   185 --- 726
   187 --- 296
-  187 x--> 401
+  187 x--> 407
   187 --- 478
   187 --- 636
   188 --- 292
-  188 x--> 401
+  188 x--> 407
   188 --- 479
   188 --- 633
   189 --- 294
-  189 x--> 401
+  189 x--> 407
   189 --- 477
   189 --- 634
   190 --- 297
-  190 x--> 401
+  190 x--> 407
   190 --- 475
   190 --- 637
   191 --- 295
-  191 x--> 401
+  191 x--> 407
   191 --- 474
   191 --- 632
   192 --- 293
-  192 x--> 401
+  192 x--> 407
   192 --- 476
   192 --- 635
   198 --- 299
-  198 x--> 402
+  198 x--> 401
   198 --- 481
   198 --- 641
   199 --- 245
@@ -1581,7 +1581,7 @@ flowchart LR
   200 --- 427
   200 --- 583
   201 --- 304
-  201 x--> 402
+  201 x--> 401
   201 --- 484
   201 --- 642
   202 --- 242
@@ -1589,7 +1589,7 @@ flowchart LR
   202 --- 425
   202 --- 584
   203 --- 301
-  203 x--> 402
+  203 x--> 401
   203 --- 486
   203 --- 639
   204 --- 239
@@ -1597,7 +1597,7 @@ flowchart LR
   204 --- 426
   204 --- 580
   205 --- 302
-  205 x--> 402
+  205 x--> 401
   205 --- 483
   205 --- 638
   206 --- 241
@@ -1605,11 +1605,11 @@ flowchart LR
   206 --- 423
   206 --- 582
   207 --- 303
-  207 x--> 402
+  207 x--> 401
   207 --- 485
   207 --- 644
   208 --- 300
-  208 x--> 402
+  208 x--> 401
   208 --- 480
   208 --- 643
   209 --- 243
@@ -1617,7 +1617,7 @@ flowchart LR
   209 --- 424
   209 --- 581
   210 --- 298
-  210 x--> 402
+  210 x--> 401
   210 --- 482
   210 --- 640
   211 --- 240
@@ -1644,8 +1644,8 @@ flowchart LR
   224 --- 289
   224 --- 290
   224 --- 291
-  224 --- 400
-  224 --- 412
+  224 --- 405
+  224 --- 417
   224 --- 454
   224 --- 455
   224 --- 456
@@ -1706,8 +1706,8 @@ flowchart LR
   225 --- 322
   225 --- 323
   225 --- 324
-  225 --- 403
-  225 --- 415
+  225 --- 402
+  225 --- 414
   225 --- 487
   225 --- 488
   225 --- 489
@@ -1830,8 +1830,8 @@ flowchart LR
   227 --- 269
   227 --- 270
   227 --- 271
-  227 --- 399
-  227 --- 411
+  227 --- 408
+  227 --- 420
   227 --- 434
   227 --- 435
   227 --- 436
@@ -1892,8 +1892,8 @@ flowchart LR
   228 --- 362
   228 --- 363
   228 --- 364
-  228 --- 405
-  228 --- 417
+  228 --- 398
+  228 --- 410
   228 --- 527
   228 --- 528
   228 --- 529
@@ -1954,8 +1954,8 @@ flowchart LR
   229 --- 382
   229 --- 383
   229 --- 384
-  229 --- 406
-  229 --- 418
+  229 --- 403
+  229 --- 415
   229 --- 547
   229 --- 548
   229 --- 549
@@ -2002,8 +2002,8 @@ flowchart LR
   230 --- 249
   230 --- 250
   230 --- 251
-  230 --- 398
-  230 --- 410
+  230 --- 400
+  230 --- 412
   230 --- 428
   230 --- 429
   230 --- 430
@@ -2022,8 +2022,8 @@ flowchart LR
   231 --- 394
   231 --- 395
   231 --- 396
-  231 --- 408
-  231 --- 420
+  231 --- 399
+  231 --- 411
   231 --- 573
   231 --- 574
   231 --- 575
@@ -2042,8 +2042,8 @@ flowchart LR
   233 --- 388
   233 --- 389
   233 --- 390
-  233 --- 407
-  233 --- 419
+  233 --- 406
+  233 --- 418
   233 --- 567
   233 --- 568
   233 --- 569
@@ -2062,8 +2062,8 @@ flowchart LR
   236 --- 295
   236 --- 296
   236 --- 297
-  236 --- 401
-  236 --- 413
+  236 --- 407
+  236 --- 419
   236 --- 474
   236 --- 475
   236 --- 476
@@ -2106,8 +2106,8 @@ flowchart LR
   238 --- 302
   238 --- 303
   238 --- 304
-  238 --- 402
-  238 --- 414
+  238 --- 401
+  238 --- 413
   238 --- 480
   238 --- 481
   238 --- 482
@@ -2596,66 +2596,66 @@ flowchart LR
   578 <--x 396
   732 <--x 396
   733 <--x 396
-  434 <--x 399
-  435 <--x 399
-  436 <--x 399
-  437 <--x 399
-  438 <--x 399
-  439 <--x 399
-  440 <--x 399
-  441 <--x 399
-  442 <--x 399
-  443 <--x 399
-  444 <--x 399
-  445 <--x 399
-  446 <--x 399
-  447 <--x 399
-  448 <--x 399
-  449 <--x 399
-  450 <--x 399
-  451 <--x 399
-  452 <--x 399
-  453 <--x 399
-  527 <--x 405
-  528 <--x 405
-  529 <--x 405
-  530 <--x 405
-  531 <--x 405
-  532 <--x 405
-  533 <--x 405
-  534 <--x 405
-  535 <--x 405
-  536 <--x 405
-  537 <--x 405
-  538 <--x 405
-  539 <--x 405
-  540 <--x 405
-  541 <--x 405
-  542 <--x 405
-  543 <--x 405
-  544 <--x 405
-  545 <--x 405
-  546 <--x 405
-  547 <--x 406
-  548 <--x 406
-  549 <--x 406
-  550 <--x 406
-  551 <--x 406
-  552 <--x 406
-  553 <--x 406
-  554 <--x 406
-  555 <--x 406
-  556 <--x 406
-  557 <--x 406
-  558 <--x 406
-  559 <--x 406
-  560 <--x 406
-  561 <--x 406
-  562 <--x 406
-  563 <--x 406
-  564 <--x 406
-  565 <--x 406
-  566 <--x 406
+  527 <--x 398
+  528 <--x 398
+  529 <--x 398
+  530 <--x 398
+  531 <--x 398
+  532 <--x 398
+  533 <--x 398
+  534 <--x 398
+  535 <--x 398
+  536 <--x 398
+  537 <--x 398
+  538 <--x 398
+  539 <--x 398
+  540 <--x 398
+  541 <--x 398
+  542 <--x 398
+  543 <--x 398
+  544 <--x 398
+  545 <--x 398
+  546 <--x 398
+  547 <--x 403
+  548 <--x 403
+  549 <--x 403
+  550 <--x 403
+  551 <--x 403
+  552 <--x 403
+  553 <--x 403
+  554 <--x 403
+  555 <--x 403
+  556 <--x 403
+  557 <--x 403
+  558 <--x 403
+  559 <--x 403
+  560 <--x 403
+  561 <--x 403
+  562 <--x 403
+  563 <--x 403
+  564 <--x 403
+  565 <--x 403
+  566 <--x 403
+  434 <--x 408
+  435 <--x 408
+  436 <--x 408
+  437 <--x 408
+  438 <--x 408
+  439 <--x 408
+  440 <--x 408
+  441 <--x 408
+  442 <--x 408
+  443 <--x 408
+  444 <--x 408
+  445 <--x 408
+  446 <--x 408
+  447 <--x 408
+  448 <--x 408
+  449 <--x 408
+  450 <--x 408
+  451 <--x 408
+  452 <--x 408
+  453 <--x 408
   421 <--x 409
   422 <--x 409
   423 <--x 409
@@ -2663,65 +2663,45 @@ flowchart LR
   425 <--x 409
   426 <--x 409
   427 <--x 409
-  428 <--x 410
-  429 <--x 410
-  430 <--x 410
-  431 <--x 410
-  432 <--x 410
-  433 <--x 410
-  454 <--x 412
-  455 <--x 412
-  456 <--x 412
-  457 <--x 412
-  458 <--x 412
-  459 <--x 412
-  460 <--x 412
-  461 <--x 412
-  462 <--x 412
-  463 <--x 412
-  464 <--x 412
-  465 <--x 412
-  466 <--x 412
-  467 <--x 412
-  468 <--x 412
-  469 <--x 412
-  470 <--x 412
-  471 <--x 412
-  472 <--x 412
-  473 <--x 412
-  474 <--x 413
-  475 <--x 413
-  476 <--x 413
-  477 <--x 413
-  478 <--x 413
-  479 <--x 413
-  480 <--x 414
-  481 <--x 414
-  482 <--x 414
-  483 <--x 414
-  484 <--x 414
-  485 <--x 414
-  486 <--x 414
-  487 <--x 415
-  488 <--x 415
-  489 <--x 415
-  490 <--x 415
-  491 <--x 415
-  492 <--x 415
-  493 <--x 415
-  494 <--x 415
-  495 <--x 415
-  496 <--x 415
-  497 <--x 415
-  498 <--x 415
-  499 <--x 415
-  500 <--x 415
-  501 <--x 415
-  502 <--x 415
-  503 <--x 415
-  504 <--x 415
-  505 <--x 415
-  506 <--x 415
+  573 <--x 411
+  574 <--x 411
+  575 <--x 411
+  576 <--x 411
+  577 <--x 411
+  578 <--x 411
+  428 <--x 412
+  429 <--x 412
+  430 <--x 412
+  431 <--x 412
+  432 <--x 412
+  433 <--x 412
+  480 <--x 413
+  481 <--x 413
+  482 <--x 413
+  483 <--x 413
+  484 <--x 413
+  485 <--x 413
+  486 <--x 413
+  487 <--x 414
+  488 <--x 414
+  489 <--x 414
+  490 <--x 414
+  491 <--x 414
+  492 <--x 414
+  493 <--x 414
+  494 <--x 414
+  495 <--x 414
+  496 <--x 414
+  497 <--x 414
+  498 <--x 414
+  499 <--x 414
+  500 <--x 414
+  501 <--x 414
+  502 <--x 414
+  503 <--x 414
+  504 <--x 414
+  505 <--x 414
+  506 <--x 414
   507 <--x 416
   508 <--x 416
   509 <--x 416
@@ -2742,16 +2722,36 @@ flowchart LR
   524 <--x 416
   525 <--x 416
   526 <--x 416
-  567 <--x 419
-  568 <--x 419
-  569 <--x 419
-  570 <--x 419
-  571 <--x 419
-  572 <--x 419
-  573 <--x 420
-  574 <--x 420
-  575 <--x 420
-  576 <--x 420
-  577 <--x 420
-  578 <--x 420
+  454 <--x 417
+  455 <--x 417
+  456 <--x 417
+  457 <--x 417
+  458 <--x 417
+  459 <--x 417
+  460 <--x 417
+  461 <--x 417
+  462 <--x 417
+  463 <--x 417
+  464 <--x 417
+  465 <--x 417
+  466 <--x 417
+  467 <--x 417
+  468 <--x 417
+  469 <--x 417
+  470 <--x 417
+  471 <--x 417
+  472 <--x 417
+  473 <--x 417
+  567 <--x 418
+  568 <--x 418
+  569 <--x 418
+  570 <--x 418
+  571 <--x 418
+  572 <--x 418
+  474 <--x 419
+  475 <--x 419
+  476 <--x 419
+  477 <--x 419
+  478 <--x 419
+  479 <--x 419
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/artifact_graph_flowchart.snap.md
index bdb062ee1..7bfdcf81c 100644
--- a/rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/artifact_graph_flowchart.snap.md
@@ -548,18 +548,18 @@ flowchart LR
   13 --- 36
   13 --- 148
   13 ---- 165
-  334 --- 13
+  339 --- 13
   14 --- 37
   14 --- 157
-  334 --- 14
+  339 --- 14
   15 --- 38
   15 --- 153
   15 ---- 167
-  338 --- 15
+  337 --- 15
   16 --- 39
   16 --- 145
   16 ---- 171
-  334 --- 16
+  339 --- 16
   17 --- 40
   17 --- 41
   17 --- 42
@@ -620,27 +620,27 @@ flowchart LR
   23 --- 85
   23 --- 142
   23 ---- 182
-  337 --- 23
+  341 --- 23
   24 --- 86
   24 --- 147
   24 ---- 184
-  336 --- 24
+  338 --- 24
   25 --- 87
   25 --- 155
   25 ---- 188
-  326 --- 25
+  331 --- 25
   26 --- 88
   26 --- 159
   26 ---- 189
-  339 --- 26
+  334 --- 26
   27 --- 89
   27 --- 152
   27 ---- 191
-  341 --- 27
+  335 --- 27
   28 --- 90
   28 --- 156
   28 ---- 196
-  326 --- 28
+  331 --- 28
   29 --- 91
   29 --- 92
   29 --- 93
@@ -648,7 +648,7 @@ flowchart LR
   29 --- 95
   29 --- 151
   29 ---- 212
-  326 --- 29
+  331 --- 29
   30 --- 96
   30 --- 97
   30 --- 98
@@ -656,7 +656,7 @@ flowchart LR
   30 --- 100
   30 --- 163
   30 ---- 219
-  341 --- 30
+  335 --- 30
   31 --- 101
   31 --- 102
   31 --- 103
@@ -704,7 +704,7 @@ flowchart LR
   33 --- 141
   33 ---- 223
   34 --- 230
-  34 x--> 324
+  34 x--> 329
   34 --- 348
   34 --- 392
   36 --- 254
@@ -712,11 +712,11 @@ flowchart LR
   36 --- 358
   36 --- 415
   38 --- 250
-  38 x--> 338
+  38 x--> 337
   38 --- 354
   38 --- 411
   39 --- 224
-  39 x--> 334
+  39 x--> 339
   39 --- 342
   39 --- 386
   176 <--x 40
@@ -748,7 +748,7 @@ flowchart LR
   50 --- 346
   50 --- 390
   51 --- 231
-  51 x--> 325
+  51 x--> 330
   51 --- 350
   51 --- 394
   52 --- 229
@@ -756,7 +756,7 @@ flowchart LR
   52 --- 347
   52 --- 391
   53 --- 233
-  53 x--> 325
+  53 x--> 330
   53 --- 349
   53 --- 396
   54 --- 226
@@ -764,7 +764,7 @@ flowchart LR
   54 --- 345
   54 --- 388
   55 --- 232
-  55 x--> 325
+  55 x--> 330
   55 --- 351
   55 --- 393
   56 --- 227
@@ -772,7 +772,7 @@ flowchart LR
   56 --- 344
   56 --- 389
   57 --- 234
-  57 x--> 325
+  57 x--> 330
   57 --- 352
   57 --- 395
   180 <--x 60
@@ -848,131 +848,131 @@ flowchart LR
   83 --- 279
   83 --- 451
   84 --- 253
-  84 x--> 326
+  84 x--> 331
   84 --- 357
   84 --- 414
   85 --- 251
-  85 x--> 337
+  85 x--> 341
   85 --- 355
   85 --- 412
   86 --- 252
-  86 x--> 336
+  86 x--> 338
   86 --- 356
   86 --- 413
   87 --- 255
-  87 x--> 326
+  87 x--> 331
   87 --- 359
   87 --- 416
   88 --- 305
-  88 x--> 329
+  88 x--> 326
   88 --- 377
   88 --- 466
   89 --- 249
-  89 x--> 341
+  89 x--> 335
   89 --- 353
   89 --- 410
   90 --- 225
-  90 x--> 326
+  90 x--> 331
   90 --- 343
   90 --- 387
   91 --- 311
-  91 x--> 326
+  91 x--> 331
   91 --- 384
   91 --- 474
   92 --- 313
-  92 x--> 326
+  92 x--> 331
   92 --- 382
   92 --- 471
   93 --- 310
-  93 x--> 326
+  93 x--> 331
   93 --- 383
   93 --- 472
   94 --- 312
-  94 x--> 326
+  94 x--> 331
   94 --- 385
   94 --- 473
   96 --- 308
-  96 x--> 341
+  96 x--> 335
   96 --- 380
   96 --- 467
   97 --- 309
-  97 x--> 341
+  97 x--> 335
   97 --- 381
   97 --- 468
   98 --- 306
-  98 x--> 341
+  98 x--> 335
   98 --- 378
   98 --- 469
   99 --- 307
-  99 x--> 341
+  99 x--> 335
   99 --- 379
   99 --- 470
   101 --- 270
-  101 x--> 328
+  101 x--> 323
   101 --- 364
   101 --- 426
   102 --- 265
-  102 x--> 328
+  102 x--> 323
   102 --- 373
   102 --- 427
   103 --- 267
-  103 x--> 328
+  103 x--> 323
   103 --- 366
   103 --- 433
   104 --- 264
-  104 x--> 328
+  104 x--> 323
   104 --- 361
   104 --- 435
   105 --- 268
-  105 x--> 328
+  105 x--> 323
   105 --- 360
   105 --- 424
   106 --- 273
-  106 x--> 328
+  106 x--> 323
   106 --- 363
   106 --- 425
   107 --- 260
-  107 x--> 328
+  107 x--> 323
   107 --- 372
   107 --- 421
   108 --- 275
-  108 x--> 328
+  108 x--> 323
   108 --- 369
   108 --- 428
   109 --- 266
-  109 x--> 328
+  109 x--> 323
   109 --- 375
   109 --- 422
   110 --- 261
-  110 x--> 328
+  110 x--> 323
   110 --- 368
   110 --- 429
   111 --- 263
-  111 x--> 328
+  111 x--> 323
   111 --- 365
   111 --- 432
   112 --- 276
-  112 x--> 328
+  112 x--> 323
   112 --- 374
   112 --- 423
   113 --- 274
-  113 x--> 328
+  113 x--> 323
   113 --- 367
   113 --- 431
   114 --- 269
-  114 x--> 328
+  114 x--> 323
   114 --- 371
   114 --- 434
   115 --- 271
-  115 x--> 328
+  115 x--> 323
   115 --- 376
   115 --- 430
   116 --- 262
-  116 x--> 328
+  116 x--> 323
   116 --- 362
   116 --- 436
   117 --- 272
-  117 x--> 328
+  117 x--> 323
   117 --- 370
   117 --- 437
   222 <--x 118
@@ -1045,13 +1045,13 @@ flowchart LR
   140 --- 246
   140 --- 404
   164 --- 230
-  164 --- 324
-  164 --- 334
+  164 --- 329
+  164 --- 339
   164 --- 348
   164 --- 392
   165 --- 254
   165 --- 327
-  165 --- 338
+  165 --- 337
   165 --- 358
   165 --- 415
   167 --- 250
@@ -1080,7 +1080,7 @@ flowchart LR
   178 --- 227
   178 --- 228
   178 --- 229
-  178 --- 323
+  178 --- 325
   178 --- 333
   178 --- 344
   178 --- 345
@@ -1094,8 +1094,8 @@ flowchart LR
   179 --- 232
   179 --- 233
   179 --- 234
-  179 --- 325
-  179 --- 335
+  179 --- 330
+  179 --- 340
   179 --- 349
   179 --- 350
   179 --- 351
@@ -1153,38 +1153,38 @@ flowchart LR
   180 --- 460
   180 --- 461
   181 --- 253
-  181 --- 326
-  181 --- 337
+  181 --- 331
+  181 --- 341
   181 --- 357
   181 --- 414
   182 --- 251
-  182 --- 336
+  182 --- 338
   182 --- 355
   182 --- 412
   184 --- 252
   184 --- 356
   184 --- 413
   188 --- 255
-  188 --- 339
+  188 --- 334
   188 --- 359
   188 --- 416
   189 --- 305
-  189 --- 329
-  189 --- 341
+  189 --- 326
+  189 --- 335
   189 --- 377
   189 --- 466
   191 --- 249
   191 --- 353
   191 --- 410
   196 --- 225
-  196 --- 332
+  196 --- 336
   196 --- 343
   196 --- 387
   212 --- 310
   212 --- 311
   212 --- 312
   212 --- 313
-  212 --- 331
+  212 --- 324
   212 --- 382
   212 --- 383
   212 --- 384
@@ -1197,7 +1197,7 @@ flowchart LR
   219 --- 307
   219 --- 308
   219 --- 309
-  219 --- 330
+  219 --- 328
   219 --- 378
   219 --- 379
   219 --- 380
@@ -1223,8 +1223,8 @@ flowchart LR
   221 --- 274
   221 --- 275
   221 --- 276
-  221 --- 328
-  221 --- 340
+  221 --- 323
+  221 --- 332
   221 --- 360
   221 --- 361
   221 --- 362
@@ -1533,48 +1533,48 @@ flowchart LR
   482 <--x 321
   479 <--x 322
   483 <--x 322
-  344 <--x 323
-  345 <--x 323
-  346 <--x 323
-  347 <--x 323
-  342 <--x 324
-  356 <--x 326
+  382 <--x 324
+  383 <--x 324
+  384 <--x 324
+  385 <--x 324
+  344 <--x 325
+  345 <--x 325
+  346 <--x 325
+  347 <--x 325
+  353 <--x 326
   354 <--x 327
-  353 <--x 329
-  378 <--x 330
-  379 <--x 330
-  380 <--x 330
-  381 <--x 330
-  382 <--x 331
-  383 <--x 331
-  384 <--x 331
-  385 <--x 331
-  343 <--x 332
-  348 <--x 334
-  349 <--x 335
-  350 <--x 335
-  351 <--x 335
-  352 <--x 335
-  355 <--x 336
-  357 <--x 337
-  358 <--x 338
-  359 <--x 339
-  360 <--x 340
-  361 <--x 340
-  362 <--x 340
-  363 <--x 340
-  364 <--x 340
-  365 <--x 340
-  366 <--x 340
-  367 <--x 340
-  368 <--x 340
-  369 <--x 340
-  370 <--x 340
-  371 <--x 340
-  372 <--x 340
-  373 <--x 340
-  374 <--x 340
-  375 <--x 340
-  376 <--x 340
-  377 <--x 341
+  378 <--x 328
+  379 <--x 328
+  380 <--x 328
+  381 <--x 328
+  342 <--x 329
+  356 <--x 331
+  360 <--x 332
+  361 <--x 332
+  362 <--x 332
+  363 <--x 332
+  364 <--x 332
+  365 <--x 332
+  366 <--x 332
+  367 <--x 332
+  368 <--x 332
+  369 <--x 332
+  370 <--x 332
+  371 <--x 332
+  372 <--x 332
+  373 <--x 332
+  374 <--x 332
+  375 <--x 332
+  376 <--x 332
+  359 <--x 334
+  377 <--x 335
+  343 <--x 336
+  358 <--x 337
+  355 <--x 338
+  348 <--x 339
+  349 <--x 340
+  350 <--x 340
+  351 <--x 340
+  352 <--x 340
+  357 <--x 341
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/color-cube/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/color-cube/artifact_graph_flowchart.snap.md
index 7cc11596a..5ca55bf67 100644
--- a/rust/kcl-lib/tests/kcl_samples/color-cube/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/color-cube/artifact_graph_flowchart.snap.md
@@ -203,15 +203,15 @@ flowchart LR
   13 --- 103
   13 --- 129
   14 --- 65
-  14 x--> 81
+  14 x--> 80
   14 --- 101
   14 --- 124
   15 --- 61
-  15 x--> 80
+  15 x--> 81
   15 --- 98
   15 --- 122
   16 --- 57
-  16 x--> 79
+  16 x--> 84
   16 --- 92
   16 --- 118
   17 --- 73
@@ -219,11 +219,11 @@ flowchart LR
   17 --- 107
   17 --- 131
   18 --- 78
-  18 x--> 84
+  18 x--> 79
   18 --- 111
   18 --- 135
   19 --- 59
-  19 x--> 80
+  19 x--> 81
   19 --- 96
   19 --- 121
   20 --- 71
@@ -231,7 +231,7 @@ flowchart LR
   20 --- 109
   20 --- 133
   21 --- 56
-  21 x--> 79
+  21 x--> 84
   21 --- 91
   21 --- 115
   22 --- 70
@@ -239,19 +239,19 @@ flowchart LR
   22 --- 104
   22 --- 130
   23 --- 77
-  23 x--> 84
+  23 x--> 79
   23 --- 113
   23 --- 137
   24 --- 66
-  24 x--> 81
+  24 x--> 80
   24 --- 99
   24 --- 125
   25 --- 55
-  25 x--> 79
+  25 x--> 84
   25 --- 94
   25 --- 117
   26 --- 75
-  26 x--> 84
+  26 x--> 79
   26 --- 114
   26 --- 138
   27 --- 68
@@ -259,7 +259,7 @@ flowchart LR
   27 --- 106
   27 --- 127
   28 --- 63
-  28 x--> 81
+  28 x--> 80
   28 --- 100
   28 --- 123
   29 --- 72
@@ -267,11 +267,11 @@ flowchart LR
   29 --- 108
   29 --- 132
   30 --- 62
-  30 x--> 80
+  30 x--> 81
   30 --- 95
   30 --- 120
   31 --- 60
-  31 x--> 80
+  31 x--> 81
   31 --- 97
   31 --- 119
   32 --- 69
@@ -279,15 +279,15 @@ flowchart LR
   32 --- 105
   32 --- 128
   33 --- 76
-  33 x--> 84
+  33 x--> 79
   33 --- 112
   33 --- 136
   34 --- 64
-  34 x--> 81
+  34 x--> 80
   34 --- 102
   34 --- 126
   35 --- 58
-  35 x--> 79
+  35 x--> 84
   35 --- 93
   35 --- 116
   36 --- 74
@@ -298,8 +298,8 @@ flowchart LR
   49 --- 56
   49 --- 57
   49 --- 58
-  49 --- 79
-  49 --- 85
+  49 --- 84
+  49 --- 90
   49 --- 91
   49 --- 92
   49 --- 93
@@ -312,8 +312,8 @@ flowchart LR
   50 --- 60
   50 --- 61
   50 --- 62
-  50 --- 80
-  50 --- 86
+  50 --- 81
+  50 --- 87
   50 --- 95
   50 --- 96
   50 --- 97
@@ -326,8 +326,8 @@ flowchart LR
   51 --- 64
   51 --- 65
   51 --- 66
-  51 --- 81
-  51 --- 87
+  51 --- 80
+  51 --- 86
   51 --- 99
   51 --- 100
   51 --- 101
@@ -368,8 +368,8 @@ flowchart LR
   54 --- 76
   54 --- 77
   54 --- 78
-  54 --- 84
-  54 --- 90
+  54 --- 79
+  54 --- 85
   54 --- 111
   54 --- 112
   54 --- 113
@@ -450,18 +450,18 @@ flowchart LR
   111 <--x 78
   135 <--x 78
   136 <--x 78
-  91 <--x 85
-  92 <--x 85
-  93 <--x 85
-  94 <--x 85
-  95 <--x 86
-  96 <--x 86
-  97 <--x 86
-  98 <--x 86
-  99 <--x 87
-  100 <--x 87
-  101 <--x 87
-  102 <--x 87
+  111 <--x 85
+  112 <--x 85
+  113 <--x 85
+  114 <--x 85
+  99 <--x 86
+  100 <--x 86
+  101 <--x 86
+  102 <--x 86
+  95 <--x 87
+  96 <--x 87
+  97 <--x 87
+  98 <--x 87
   103 <--x 88
   104 <--x 88
   105 <--x 88
@@ -470,8 +470,8 @@ flowchart LR
   108 <--x 89
   109 <--x 89
   110 <--x 89
-  111 <--x 90
-  112 <--x 90
-  113 <--x 90
-  114 <--x 90
+  91 <--x 90
+  92 <--x 90
+  93 <--x 90
+  94 <--x 90
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/dodecahedron/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/dodecahedron/artifact_graph_flowchart.snap.md
index 169edf71e..b9cd50cee 100644
--- a/rust/kcl-lib/tests/kcl_samples/dodecahedron/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/dodecahedron/artifact_graph_flowchart.snap.md
@@ -396,203 +396,203 @@ flowchart LR
   24 ---- 85
   24 <--x 97
   25 --- 120
-  25 x--> 159
+  25 x--> 158
   25 --- 193
   25 --- 242
   26 --- 148
-  26 x--> 166
+  26 x--> 163
   26 --- 223
   26 --- 269
   27 --- 138
-  27 x--> 163
+  27 x--> 165
   27 --- 210
   27 --- 258
   28 --- 145
-  28 x--> 165
+  28 x--> 156
   28 --- 218
   28 --- 267
   29 --- 153
-  29 x--> 167
+  29 x--> 162
   29 --- 227
   29 --- 275
   30 --- 133
-  30 x--> 162
+  30 x--> 157
   30 --- 204
   30 --- 254
   31 --- 130
-  31 x--> 161
+  31 x--> 167
   31 --- 200
   31 --- 250
   32 --- 141
-  32 x--> 164
+  32 x--> 160
   32 --- 215
   32 --- 261
   33 --- 111
-  33 x--> 156
+  33 x--> 164
   33 --- 181
   33 --- 229
   34 --- 119
-  34 x--> 158
+  34 x--> 166
   34 --- 189
   34 --- 236
   35 --- 127
-  35 x--> 160
+  35 x--> 161
   35 --- 196
   35 --- 247
   36 --- 115
-  36 x--> 157
+  36 x--> 159
   36 --- 185
   36 --- 234
   37 --- 112
-  37 x--> 157
+  37 x--> 159
   37 --- 187
   37 --- 233
   38 --- 128
-  38 x--> 161
+  38 x--> 167
   38 --- 203
   38 --- 248
   39 --- 132
-  39 x--> 162
+  39 x--> 157
   39 --- 205
   39 --- 255
   40 --- 152
-  40 x--> 167
+  40 x--> 162
   40 --- 224
   40 --- 273
   41 --- 124
-  41 x--> 160
+  41 x--> 161
   41 --- 198
   41 --- 246
   42 --- 117
-  42 x--> 158
+  42 x--> 166
   42 --- 188
   42 --- 239
   43 --- 110
-  43 x--> 156
+  43 x--> 164
   43 --- 183
   43 --- 228
   44 --- 151
-  44 x--> 166
+  44 x--> 163
   44 --- 221
   44 --- 268
   45 --- 139
-  45 x--> 163
+  45 x--> 165
   45 --- 209
   45 --- 256
   46 --- 122
-  46 x--> 159
+  46 x--> 158
   46 --- 192
   46 --- 240
   47 --- 147
-  47 x--> 165
+  47 x--> 156
   47 --- 217
   47 --- 265
   48 --- 143
-  48 x--> 164
+  48 x--> 160
   48 --- 214
   48 --- 260
   49 --- 113
-  49 x--> 157
+  49 x--> 159
   49 --- 184
   49 --- 232
   50 --- 136
-  50 x--> 163
+  50 x--> 165
   50 --- 211
   50 --- 257
   51 --- 140
-  51 x--> 164
+  51 x--> 160
   51 --- 213
   51 --- 262
   52 --- 150
-  52 x--> 166
+  52 x--> 163
   52 --- 222
   52 --- 270
   53 --- 109
-  53 x--> 156
+  53 x--> 164
   53 --- 180
   53 --- 231
   54 --- 121
-  54 x--> 159
+  54 x--> 158
   54 --- 195
   54 --- 241
   55 --- 116
-  55 x--> 158
+  55 x--> 166
   55 --- 191
   55 --- 238
   56 --- 154
-  56 x--> 167
+  56 x--> 162
   56 --- 225
   56 --- 272
   57 --- 126
-  57 x--> 160
+  57 x--> 161
   57 --- 199
   57 --- 245
   58 --- 146
-  58 x--> 165
+  58 x--> 156
   58 --- 219
   58 --- 266
   59 --- 131
-  59 x--> 161
+  59 x--> 167
   59 --- 201
   59 --- 251
   60 --- 134
-  60 x--> 162
+  60 x--> 157
   60 --- 206
   60 --- 252
   61 --- 108
-  61 x--> 156
+  61 x--> 164
   61 --- 182
   61 --- 230
   62 --- 114
-  62 x--> 157
+  62 x--> 159
   62 --- 186
   62 --- 235
   63 --- 149
-  63 x--> 166
+  63 x--> 163
   63 --- 220
   63 --- 271
   64 --- 144
-  64 x--> 165
+  64 x--> 156
   64 --- 216
   64 --- 264
   65 --- 137
-  65 x--> 163
+  65 x--> 165
   65 --- 208
   65 --- 259
   66 --- 125
-  66 x--> 160
+  66 x--> 161
   66 --- 197
   66 --- 244
   67 --- 129
-  67 x--> 161
+  67 x--> 167
   67 --- 202
   67 --- 249
   68 --- 118
-  68 x--> 158
+  68 x--> 166
   68 --- 190
   68 --- 237
   69 --- 155
-  69 x--> 167
+  69 x--> 162
   69 --- 226
   69 --- 274
   70 --- 135
-  70 x--> 162
+  70 x--> 157
   70 --- 207
   70 --- 253
   71 --- 142
-  71 x--> 164
+  71 x--> 160
   71 --- 212
   71 --- 263
   72 --- 123
-  72 x--> 159
+  72 x--> 158
   72 --- 194
   72 --- 243
   85 --- 108
   85 --- 109
   85 --- 110
   85 --- 111
-  85 --- 156
-  85 --- 168
+  85 --- 164
+  85 --- 176
   85 --- 180
   85 --- 181
   85 --- 182
@@ -605,8 +605,8 @@ flowchart LR
   86 --- 113
   86 --- 114
   86 --- 115
-  86 --- 157
-  86 --- 169
+  86 --- 159
+  86 --- 171
   86 --- 184
   86 --- 185
   86 --- 186
@@ -619,8 +619,8 @@ flowchart LR
   87 --- 117
   87 --- 118
   87 --- 119
-  87 --- 158
-  87 --- 170
+  87 --- 166
+  87 --- 178
   87 --- 188
   87 --- 189
   87 --- 190
@@ -633,8 +633,8 @@ flowchart LR
   88 --- 121
   88 --- 122
   88 --- 123
-  88 --- 159
-  88 --- 171
+  88 --- 158
+  88 --- 170
   88 --- 192
   88 --- 193
   88 --- 194
@@ -647,8 +647,8 @@ flowchart LR
   89 --- 125
   89 --- 126
   89 --- 127
-  89 --- 160
-  89 --- 172
+  89 --- 161
+  89 --- 173
   89 --- 196
   89 --- 197
   89 --- 198
@@ -661,8 +661,8 @@ flowchart LR
   90 --- 129
   90 --- 130
   90 --- 131
-  90 --- 161
-  90 --- 173
+  90 --- 167
+  90 --- 179
   90 --- 200
   90 --- 201
   90 --- 202
@@ -675,8 +675,8 @@ flowchart LR
   91 --- 133
   91 --- 134
   91 --- 135
-  91 --- 162
-  91 --- 174
+  91 --- 157
+  91 --- 169
   91 --- 204
   91 --- 205
   91 --- 206
@@ -689,8 +689,8 @@ flowchart LR
   92 --- 137
   92 --- 138
   92 --- 139
-  92 --- 163
-  92 --- 175
+  92 --- 165
+  92 --- 177
   92 --- 208
   92 --- 209
   92 --- 210
@@ -703,8 +703,8 @@ flowchart LR
   93 --- 141
   93 --- 142
   93 --- 143
-  93 --- 164
-  93 --- 176
+  93 --- 160
+  93 --- 172
   93 --- 212
   93 --- 213
   93 --- 214
@@ -717,8 +717,8 @@ flowchart LR
   94 --- 145
   94 --- 146
   94 --- 147
-  94 --- 165
-  94 --- 177
+  94 --- 156
+  94 --- 168
   94 --- 216
   94 --- 217
   94 --- 218
@@ -731,8 +731,8 @@ flowchart LR
   95 --- 149
   95 --- 150
   95 --- 151
-  95 --- 166
-  95 --- 178
+  95 --- 163
+  95 --- 175
   95 --- 220
   95 --- 221
   95 --- 222
@@ -745,8 +745,8 @@ flowchart LR
   96 --- 153
   96 --- 154
   96 --- 155
-  96 --- 167
-  96 --- 179
+  96 --- 162
+  96 --- 174
   96 --- 224
   96 --- 225
   96 --- 226
@@ -909,52 +909,52 @@ flowchart LR
   226 <--x 155
   272 <--x 155
   274 <--x 155
-  180 <--x 168
-  181 <--x 168
-  182 <--x 168
-  183 <--x 168
-  184 <--x 169
-  185 <--x 169
-  186 <--x 169
-  187 <--x 169
-  188 <--x 170
-  189 <--x 170
-  190 <--x 170
-  191 <--x 170
-  192 <--x 171
-  193 <--x 171
-  194 <--x 171
-  195 <--x 171
-  196 <--x 172
-  197 <--x 172
-  198 <--x 172
-  199 <--x 172
-  200 <--x 173
-  201 <--x 173
-  202 <--x 173
-  203 <--x 173
-  204 <--x 174
-  205 <--x 174
-  206 <--x 174
-  207 <--x 174
-  208 <--x 175
-  209 <--x 175
-  210 <--x 175
-  211 <--x 175
-  212 <--x 176
-  213 <--x 176
-  214 <--x 176
-  215 <--x 176
-  216 <--x 177
-  217 <--x 177
-  218 <--x 177
-  219 <--x 177
-  220 <--x 178
-  221 <--x 178
-  222 <--x 178
-  223 <--x 178
-  224 <--x 179
-  225 <--x 179
-  226 <--x 179
-  227 <--x 179
+  216 <--x 168
+  217 <--x 168
+  218 <--x 168
+  219 <--x 168
+  204 <--x 169
+  205 <--x 169
+  206 <--x 169
+  207 <--x 169
+  192 <--x 170
+  193 <--x 170
+  194 <--x 170
+  195 <--x 170
+  184 <--x 171
+  185 <--x 171
+  186 <--x 171
+  187 <--x 171
+  212 <--x 172
+  213 <--x 172
+  214 <--x 172
+  215 <--x 172
+  196 <--x 173
+  197 <--x 173
+  198 <--x 173
+  199 <--x 173
+  224 <--x 174
+  225 <--x 174
+  226 <--x 174
+  227 <--x 174
+  220 <--x 175
+  221 <--x 175
+  222 <--x 175
+  223 <--x 175
+  180 <--x 176
+  181 <--x 176
+  182 <--x 176
+  183 <--x 176
+  208 <--x 177
+  209 <--x 177
+  210 <--x 177
+  211 <--x 177
+  188 <--x 178
+  189 <--x 178
+  190 <--x 178
+  191 <--x 178
+  200 <--x 179
+  201 <--x 179
+  202 <--x 179
+  203 <--x 179
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/artifact_graph_flowchart.snap.md
index e265ec929..8ec06511c 100644
--- a/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/dual-basin-utility-sink/artifact_graph_flowchart.snap.md
@@ -342,8 +342,8 @@ flowchart LR
   7 <--x 11
   7 --- 28
   8 --- 29
-  209 x--> 15
-  199 x--> 16
+  201 x--> 15
+  189 x--> 16
   17 --- 30
   17 --- 31
   17 --- 32
@@ -400,7 +400,7 @@ flowchart LR
   24 --- 69
   24 --- 97
   24 ---- 131
-  199 --- 24
+  189 --- 24
   25 --- 70
   25 --- 71
   25 --- 72
@@ -408,7 +408,7 @@ flowchart LR
   25 --- 74
   25 --- 99
   25 ---- 133
-  209 --- 25
+  201 --- 25
   26 --- 75
   26 --- 76
   26 --- 77
@@ -432,191 +432,191 @@ flowchart LR
   29 --- 102
   29 ---- 142
   30 --- 154
-  30 x--> 190
+  30 x--> 188
   30 --- 219
   30 --- 265
   31 --- 152
-  31 x--> 190
+  31 x--> 188
   31 --- 218
   31 --- 263
   32 --- 151
-  32 x--> 190
+  32 x--> 188
   32 --- 220
   32 --- 266
   33 --- 153
-  33 x--> 190
+  33 x--> 188
   33 --- 221
   33 --- 264
   35 --- 171
-  35 x--> 195
+  35 x--> 194
   35 --- 238
   35 --- 283
   36 --- 168
-  36 x--> 195
+  36 x--> 194
   36 --- 237
   36 --- 281
   37 --- 170
-  37 x--> 195
+  37 x--> 194
   37 --- 236
   37 --- 282
   38 --- 169
-  38 x--> 195
+  38 x--> 194
   38 --- 235
   38 --- 280
   40 --- 148
-  40 x--> 189
+  40 x--> 196
   40 --- 216
   40 --- 260
   41 --- 150
-  41 x--> 189
+  41 x--> 196
   41 --- 217
   41 --- 259
   42 --- 147
-  42 x--> 189
+  42 x--> 196
   42 --- 214
   42 --- 262
   43 --- 149
-  43 x--> 189
+  43 x--> 196
   43 --- 215
   43 --- 261
   45 --- 161
-  45 x--> 194
+  45 x--> 190
   45 --- 229
   45 --- 272
   46 --- 162
-  46 x--> 194
+  46 x--> 190
   46 --- 227
   46 --- 274
   47 --- 163
-  47 x--> 194
+  47 x--> 190
   47 --- 228
   47 --- 273
   48 --- 160
-  48 x--> 194
+  48 x--> 190
   48 --- 230
   48 --- 275
   50 --- 183
-  50 x--> 208
+  50 x--> 207
   50 --- 249
   50 --- 294
   51 --- 182
-  51 x--> 208
+  51 x--> 207
   51 --- 250
   51 --- 295
   52 --- 180
-  52 x--> 208
+  52 x--> 207
   52 --- 247
   52 --- 293
   53 --- 181
-  53 x--> 208
+  53 x--> 207
   53 --- 248
   53 --- 292
   55 --- 143
-  55 x--> 200
+  55 x--> 203
   55 --- 211
   55 --- 255
   56 --- 144
-  56 x--> 200
+  56 x--> 203
   56 --- 213
   56 --- 257
   57 --- 145
-  57 x--> 200
+  57 x--> 203
   57 --- 212
   57 --- 258
   58 --- 146
-  58 x--> 200
+  58 x--> 203
   58 --- 210
   58 --- 256
   60 --- 187
-  60 x--> 209
+  60 x--> 201
   60 --- 252
   60 --- 296
   61 --- 185
-  61 x--> 209
+  61 x--> 201
   61 --- 251
   61 --- 298
   62 --- 186
-  62 x--> 209
+  62 x--> 201
   62 --- 253
   62 --- 297
   63 --- 184
-  63 x--> 209
+  63 x--> 201
   63 --- 254
   63 --- 299
   65 --- 164
-  65 x--> 199
+  65 x--> 189
   65 --- 234
   65 --- 278
   66 --- 167
-  66 x--> 199
+  66 x--> 189
   66 --- 232
   66 --- 276
   67 --- 166
-  67 x--> 199
+  67 x--> 189
   67 --- 231
   67 --- 277
   68 --- 165
-  68 x--> 199
+  68 x--> 189
   68 --- 233
   68 --- 279
   70 --- 175
-  70 x--> 209
+  70 x--> 201
   70 --- 240
   70 --- 287
   71 --- 172
-  71 x--> 209
+  71 x--> 201
   71 --- 239
   71 --- 284
   72 --- 173
-  72 x--> 209
+  72 x--> 201
   72 --- 241
   72 --- 285
   73 --- 174
-  73 x--> 209
+  73 x--> 201
   73 --- 242
   73 --- 286
   75 --- 158
-  75 x--> 191
+  75 x--> 199
   75 --- 222
   75 --- 269
   76 --- 156
-  76 x--> 191
+  76 x--> 199
   76 --- 225
   76 --- 268
   77 --- 157
-  77 x--> 191
+  77 x--> 199
   77 --- 223
   77 --- 270
   78 --- 155
-  78 x--> 191
+  78 x--> 199
   78 --- 224
   78 --- 267
   80 --- 179
-  80 x--> 197
+  80 x--> 198
   80 --- 245
   80 --- 288
   81 --- 178
-  81 x--> 197
+  81 x--> 198
   81 --- 244
   81 --- 291
   82 --- 177
-  82 x--> 197
+  82 x--> 198
   82 --- 243
   82 --- 290
   83 --- 176
-  83 x--> 197
+  83 x--> 198
   83 --- 246
   83 --- 289
   90 --- 159
-  90 x--> 192
+  90 x--> 193
   90 --- 226
   90 --- 271
   104 --- 151
   104 --- 152
   104 --- 153
   104 --- 154
-  104 --- 190
-  104 --- 202
+  104 --- 188
+  104 --- 200
   104 --- 218
   104 --- 219
   104 --- 220
@@ -629,8 +629,8 @@ flowchart LR
   114 --- 169
   114 --- 170
   114 --- 171
-  114 --- 195
-  114 --- 206
+  114 --- 194
+  114 --- 205
   114 --- 235
   114 --- 236
   114 --- 237
@@ -643,8 +643,8 @@ flowchart LR
   117 --- 148
   117 --- 149
   117 --- 150
-  117 --- 189
-  117 --- 201
+  117 --- 196
+  117 --- 206
   117 --- 214
   117 --- 215
   117 --- 216
@@ -657,8 +657,8 @@ flowchart LR
   122 --- 161
   122 --- 162
   122 --- 163
-  122 --- 194
-  122 --- 204
+  122 --- 190
+  122 --- 202
   122 --- 227
   122 --- 228
   122 --- 229
@@ -671,8 +671,8 @@ flowchart LR
   126 --- 181
   126 --- 182
   126 --- 183
-  126 --- 198
-  126 --- 208
+  126 --- 197
+  126 --- 207
   126 --- 247
   126 --- 248
   126 --- 249
@@ -685,8 +685,8 @@ flowchart LR
   127 --- 144
   127 --- 145
   127 --- 146
-  127 --- 188
-  127 --- 200
+  127 --- 191
+  127 --- 203
   127 --- 210
   127 --- 211
   127 --- 212
@@ -699,8 +699,8 @@ flowchart LR
   129 --- 185
   129 --- 186
   129 --- 187
-  129 --- 199
-  129 --- 209
+  129 --- 189
+  129 --- 201
   129 --- 251
   129 --- 252
   129 --- 253
@@ -713,7 +713,7 @@ flowchart LR
   131 --- 165
   131 --- 166
   131 --- 167
-  131 --- 205
+  131 --- 204
   131 --- 231
   131 --- 232
   131 --- 233
@@ -726,7 +726,7 @@ flowchart LR
   133 --- 173
   133 --- 174
   133 --- 175
-  133 --- 196
+  133 --- 195
   133 --- 239
   133 --- 240
   133 --- 241
@@ -739,8 +739,8 @@ flowchart LR
   136 --- 156
   136 --- 157
   136 --- 158
-  136 --- 191
-  136 --- 203
+  136 --- 199
+  136 --- 209
   136 --- 222
   136 --- 223
   136 --- 224
@@ -753,8 +753,8 @@ flowchart LR
   141 --- 177
   141 --- 178
   141 --- 179
-  141 --- 197
-  141 --- 207
+  141 --- 198
+  141 --- 208
   141 --- 243
   141 --- 244
   141 --- 245
@@ -902,49 +902,49 @@ flowchart LR
   252 <--x 187
   296 <--x 187
   299 <--x 187
-  210 <--x 188
-  211 <--x 188
-  212 <--x 188
-  213 <--x 188
-  226 <--x 193
-  239 <--x 196
-  240 <--x 196
-  241 <--x 196
-  242 <--x 196
-  247 <--x 198
-  248 <--x 198
-  249 <--x 198
-  250 <--x 198
-  251 <--x 199
-  252 <--x 199
-  253 <--x 199
-  254 <--x 199
-  214 <--x 201
-  215 <--x 201
-  216 <--x 201
-  217 <--x 201
-  218 <--x 202
-  219 <--x 202
-  220 <--x 202
-  221 <--x 202
-  222 <--x 203
-  223 <--x 203
-  224 <--x 203
-  225 <--x 203
-  227 <--x 204
-  228 <--x 204
-  229 <--x 204
-  230 <--x 204
-  231 <--x 205
-  232 <--x 205
-  233 <--x 205
-  234 <--x 205
-  235 <--x 206
-  236 <--x 206
-  237 <--x 206
-  238 <--x 206
-  243 <--x 207
-  244 <--x 207
-  245 <--x 207
-  246 <--x 207
+  251 <--x 189
+  252 <--x 189
+  253 <--x 189
+  254 <--x 189
+  210 <--x 191
+  211 <--x 191
+  212 <--x 191
+  213 <--x 191
+  226 <--x 192
+  239 <--x 195
+  240 <--x 195
+  241 <--x 195
+  242 <--x 195
+  247 <--x 197
+  248 <--x 197
+  249 <--x 197
+  250 <--x 197
+  218 <--x 200
+  219 <--x 200
+  220 <--x 200
+  221 <--x 200
+  227 <--x 202
+  228 <--x 202
+  229 <--x 202
+  230 <--x 202
+  231 <--x 204
+  232 <--x 204
+  233 <--x 204
+  234 <--x 204
+  235 <--x 205
+  236 <--x 205
+  237 <--x 205
+  238 <--x 205
+  214 <--x 206
+  215 <--x 206
+  216 <--x 206
+  217 <--x 206
+  243 <--x 208
+  244 <--x 208
+  245 <--x 208
+  246 <--x 208
+  222 <--x 209
+  223 <--x 209
+  224 <--x 209
+  225 <--x 209
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/enclosure/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/enclosure/artifact_graph_flowchart.snap.md
index 3c34817ac..cb12580a7 100644
--- a/rust/kcl-lib/tests/kcl_samples/enclosure/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/enclosure/artifact_graph_flowchart.snap.md
@@ -209,7 +209,7 @@ flowchart LR
   6 --- 19
   6 --- 20
   6 --- 21
-  109 x--> 7
+  113 x--> 7
   8 --- 27
   8 --- 28
   8 --- 29
@@ -259,37 +259,37 @@ flowchart LR
   22 --- 53
   22 --- 65
   22 ---- 83
-  109 --- 22
+  113 --- 22
   23 --- 54
   23 --- 58
-  109 --- 23
+  113 --- 23
   24 --- 55
   24 --- 71
-  109 --- 24
+  113 --- 24
   25 --- 56
   25 --- 68
-  109 --- 25
+  113 --- 25
   26 --- 57
   26 --- 69
-  109 --- 26
+  113 --- 26
   27 --- 88
-  27 x--> 101
+  27 x--> 103
   27 --- 115
   27 --- 133
   28 --- 86
-  28 x--> 101
+  28 x--> 103
   28 --- 118
   28 --- 132
   29 --- 85
-  29 x--> 101
+  29 x--> 103
   29 --- 117
   29 --- 134
   30 --- 87
-  30 x--> 101
+  30 x--> 103
   30 --- 116
   30 --- 131
   32 --- 99
-  32 x--> 106
+  32 x--> 102
   32 --- 129
   32 --- 145
   33 --- 84
@@ -305,43 +305,43 @@ flowchart LR
   35 --- 128
   35 --- 144
   40 --- 89
-  40 x--> 102
+  40 x--> 106
   40 --- 121
   40 --- 136
   41 --- 92
-  41 x--> 102
+  41 x--> 106
   41 --- 120
   41 --- 138
   42 --- 91
-  42 x--> 102
+  42 x--> 106
   42 --- 122
   42 --- 137
   43 --- 90
-  43 x--> 102
+  43 x--> 106
   43 --- 119
   43 --- 135
   49 --- 96
-  49 x--> 103
+  49 x--> 101
   49 --- 123
   49 --- 140
   50 --- 94
-  50 x--> 103
+  50 x--> 101
   50 --- 124
   50 --- 142
   51 --- 93
-  51 x--> 103
+  51 x--> 101
   51 --- 125
   51 --- 141
   52 --- 95
-  52 x--> 103
+  52 x--> 101
   52 --- 126
   52 --- 139
   77 --- 85
   77 --- 86
   77 --- 87
   77 --- 88
-  77 --- 101
-  77 --- 108
+  77 --- 103
+  77 --- 110
   77 --- 115
   77 --- 116
   77 --- 117
@@ -366,16 +366,16 @@ flowchart LR
   80 --- 128
   80 --- 144
   81 --- 99
-  81 --- 106
-  81 --- 113
+  81 --- 102
+  81 --- 109
   81 --- 129
   81 --- 145
   82 --- 89
   82 --- 90
   82 --- 91
   82 --- 92
-  82 --- 102
-  82 --- 109
+  82 --- 106
+  82 --- 113
   82 --- 119
   82 --- 120
   82 --- 121
@@ -388,8 +388,8 @@ flowchart LR
   83 --- 94
   83 --- 95
   83 --- 96
-  83 --- 103
-  83 --- 110
+  83 --- 101
+  83 --- 108
   83 --- 123
   83 --- 124
   83 --- 125
@@ -419,21 +419,21 @@ flowchart LR
   129 <--x 99
   145 <--x 99
   114 <--x 107
-  115 <--x 108
-  116 <--x 108
-  117 <--x 108
-  118 <--x 108
-  119 <--x 109
-  120 <--x 109
-  121 <--x 109
-  122 <--x 109
-  123 <--x 110
-  124 <--x 110
-  125 <--x 110
-  126 <--x 110
+  123 <--x 108
+  124 <--x 108
+  125 <--x 108
+  126 <--x 108
+  129 <--x 109
+  115 <--x 110
+  116 <--x 110
+  117 <--x 110
+  118 <--x 110
   127 <--x 111
   128 <--x 112
-  129 <--x 113
+  119 <--x 113
+  120 <--x 113
+  121 <--x 113
+  122 <--x 113
   131 <--x 146
   132 <--x 149
   133 <--x 148
diff --git a/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/artifact_graph_flowchart.snap.md
index 55c275b75..3b34e15c3 100644
--- a/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/exhaust-manifold/artifact_graph_flowchart.snap.md
@@ -330,71 +330,71 @@ flowchart LR
   53 --- 138
   53 --- 158
   54 --- 125
-  54 x--> 130
+  54 x--> 129
   54 --- 155
   54 --- 175
   59 --- 123
-  59 x--> 129
+  59 x--> 130
   59 --- 143
   59 --- 173
   60 --- 109
-  60 x--> 129
+  60 x--> 130
   60 --- 140
   60 --- 169
   61 --- 117
-  61 x--> 129
+  61 x--> 130
   61 --- 146
   61 --- 162
   62 --- 124
-  62 x--> 129
+  62 x--> 130
   62 --- 148
   62 --- 170
   63 --- 118
-  63 x--> 129
+  63 x--> 130
   63 --- 144
   63 --- 167
   64 --- 113
-  64 x--> 129
+  64 x--> 130
   64 --- 147
   64 --- 168
   65 --- 119
-  65 x--> 129
+  65 x--> 130
   65 --- 154
   65 --- 164
   66 --- 116
-  66 x--> 129
+  66 x--> 130
   66 --- 152
   66 --- 166
   67 --- 110
-  67 x--> 129
+  67 x--> 130
   67 --- 145
   67 --- 172
   68 --- 115
-  68 x--> 129
+  68 x--> 130
   68 --- 142
   68 --- 159
   69 --- 112
-  69 x--> 129
+  69 x--> 130
   69 --- 149
   69 --- 174
   70 --- 111
-  70 x--> 129
+  70 x--> 130
   70 --- 141
   70 --- 165
   71 --- 121
-  71 x--> 129
+  71 x--> 130
   71 --- 151
   71 --- 171
   72 --- 122
-  72 x--> 129
+  72 x--> 130
   72 --- 153
   72 --- 163
   73 --- 120
-  73 x--> 129
+  73 x--> 130
   73 --- 139
   73 --- 160
   74 --- 114
-  74 x--> 129
+  74 x--> 130
   74 --- 150
   74 --- 161
   101 --- 106
@@ -413,8 +413,8 @@ flowchart LR
   103 --- 138
   103 --- 158
   104 --- 125
-  104 --- 130
-  104 --- 135
+  104 --- 129
+  104 --- 134
   104 --- 155
   104 --- 175
   105 --- 109
@@ -433,8 +433,8 @@ flowchart LR
   105 --- 122
   105 --- 123
   105 --- 124
-  105 --- 129
-  105 --- 134
+  105 --- 130
+  105 --- 135
   105 --- 139
   105 --- 140
   105 --- 141
@@ -518,23 +518,23 @@ flowchart LR
   136 <--x 131
   137 <--x 132
   138 <--x 133
-  139 <--x 134
-  140 <--x 134
-  141 <--x 134
-  142 <--x 134
-  143 <--x 134
-  144 <--x 134
-  145 <--x 134
-  146 <--x 134
-  147 <--x 134
-  148 <--x 134
-  149 <--x 134
-  150 <--x 134
-  151 <--x 134
-  152 <--x 134
-  153 <--x 134
-  154 <--x 134
-  155 <--x 135
+  155 <--x 134
+  139 <--x 135
+  140 <--x 135
+  141 <--x 135
+  142 <--x 135
+  143 <--x 135
+  144 <--x 135
+  145 <--x 135
+  146 <--x 135
+  147 <--x 135
+  148 <--x 135
+  149 <--x 135
+  150 <--x 135
+  151 <--x 135
+  152 <--x 135
+  153 <--x 135
+  154 <--x 135
   165 <--x 179
   167 <--x 178
   168 <--x 177
diff --git a/rust/kcl-lib/tests/kcl_samples/flange/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/flange/artifact_graph_flowchart.snap.md
index 10c776f1e..2a4d5f008 100644
--- a/rust/kcl-lib/tests/kcl_samples/flange/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/flange/artifact_graph_flowchart.snap.md
@@ -52,8 +52,8 @@ flowchart LR
   40["SweepEdge Adjacent"]
   1 --- 6
   2 --- 7
-  32 x--> 3
-  30 x--> 4
+  30 x--> 3
+  31 x--> 4
   29 x--> 5
   6 --- 11
   6 --- 20
@@ -63,7 +63,7 @@ flowchart LR
   8 --- 13
   8 --- 19
   8 ---- 22
-  30 --- 8
+  31 --- 8
   9 --- 14
   9 --- 17
   9 ---- 23
@@ -71,13 +71,13 @@ flowchart LR
   10 --- 15
   10 --- 16
   10 ---- 24
-  32 --- 10
+  30 --- 10
   12 --- 26
   12 x--> 29
   12 --- 34
   12 --- 38
   13 --- 28
-  13 x--> 30
+  13 x--> 31
   13 --- 36
   13 --- 40
   14 --- 27
@@ -85,20 +85,20 @@ flowchart LR
   14 --- 35
   14 --- 39
   15 --- 25
-  15 x--> 32
+  15 x--> 30
   15 --- 33
   15 --- 37
   21 --- 26
   21 --- 29
-  21 --- 30
+  21 --- 31
   21 --- 34
   21 --- 38
   22 --- 28
-  22 --- 32
+  22 --- 30
   22 --- 36
   22 --- 40
   23 --- 27
-  23 --- 31
+  23 --- 32
   23 --- 35
   23 --- 39
   24 --- 25
@@ -112,8 +112,8 @@ flowchart LR
   39 <--x 27
   36 <--x 28
   40 <--x 28
-  34 <--x 30
-  33 <--x 31
-  35 <--x 31
-  36 <--x 32
+  36 <--x 30
+  34 <--x 31
+  33 <--x 32
+  35 <--x 32
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/artifact_graph_flowchart.snap.md
index d0a93e850..220914521 100644
--- a/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/artifact_graph_flowchart.snap.md
@@ -227,47 +227,47 @@ flowchart LR
   20 --- 83
   20 --- 110
   21 --- 59
-  21 x--> 79
+  21 x--> 81
   21 --- 93
   21 --- 115
   22 --- 60
-  22 x--> 79
+  22 x--> 81
   22 --- 94
   22 --- 116
   23 --- 61
-  23 x--> 79
+  23 x--> 81
   23 --- 91
   23 --- 117
   24 --- 58
-  24 x--> 79
+  24 x--> 81
   24 --- 92
   24 --- 114
   26 --- 62
-  26 x--> 80
+  26 x--> 79
   26 --- 97
   26 --- 121
   27 --- 65
-  27 x--> 80
+  27 x--> 79
   27 --- 96
   27 --- 119
   28 --- 64
-  28 x--> 80
+  28 x--> 79
   28 --- 98
   28 --- 120
   29 --- 63
-  29 x--> 80
+  29 x--> 79
   29 --- 95
   29 --- 118
   31 --- 66
-  31 x--> 76
+  31 x--> 75
   31 --- 100
   31 --- 123
   32 --- 68
-  32 x--> 76
+  32 x--> 75
   32 --- 99
   32 --- 122
   33 --- 67
-  33 x--> 76
+  33 x--> 75
   33 --- 101
   33 --- 124
   34 --- 72
@@ -316,8 +316,8 @@ flowchart LR
   46 --- 59
   46 --- 60
   46 --- 61
-  46 --- 74
-  46 --- 79
+  46 --- 76
+  46 --- 81
   46 --- 91
   46 --- 92
   46 --- 93
@@ -330,8 +330,8 @@ flowchart LR
   47 --- 63
   47 --- 64
   47 --- 65
-  47 --- 75
-  47 --- 80
+  47 --- 74
+  47 --- 79
   47 --- 95
   47 --- 96
   47 --- 97
@@ -343,8 +343,8 @@ flowchart LR
   48 --- 66
   48 --- 67
   48 --- 68
-  48 --- 76
-  48 --- 81
+  48 --- 75
+  48 --- 80
   48 --- 99
   48 --- 100
   48 --- 101
@@ -426,14 +426,14 @@ flowchart LR
   104 <--x 72
   125 <--x 72
   126 <--x 72
-  91 <--x 74
-  92 <--x 74
-  93 <--x 74
-  94 <--x 74
-  95 <--x 75
-  96 <--x 75
-  97 <--x 75
-  98 <--x 75
+  95 <--x 74
+  96 <--x 74
+  97 <--x 74
+  98 <--x 74
+  91 <--x 76
+  92 <--x 76
+  93 <--x 76
+  94 <--x 76
   83 <--x 78
   84 <--x 78
   85 <--x 78
@@ -442,9 +442,9 @@ flowchart LR
   88 <--x 78
   89 <--x 78
   90 <--x 78
-  99 <--x 81
-  100 <--x 81
-  101 <--x 81
+  99 <--x 80
+  100 <--x 80
+  101 <--x 80
   102 <--x 82
   103 <--x 82
   104 <--x 82
diff --git a/rust/kcl-lib/tests/kcl_samples/french-press/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/french-press/artifact_graph_flowchart.snap.md
index f0adff4aa..cd6fc0ead 100644
--- a/rust/kcl-lib/tests/kcl_samples/french-press/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/french-press/artifact_graph_flowchart.snap.md
@@ -337,9 +337,9 @@ flowchart LR
   8 --- 27
   9 <--x 10
   9 --- 28
-  201 x--> 13
-  200 x--> 14
-  200 x--> 15
+  200 x--> 13
+  203 x--> 14
+  203 x--> 15
   16 --- 29
   16 --- 30
   16 --- 31
@@ -375,7 +375,7 @@ flowchart LR
   19 --- 55
   19 --- 97
   19 ---- 114
-  201 --- 19
+  200 --- 19
   20 --- 56
   20 --- 57
   20 --- 58
@@ -403,11 +403,11 @@ flowchart LR
   24 --- 73
   24 --- 101
   24 ---- 125
-  200 --- 24
+  203 --- 24
   25 --- 74
   25 --- 98
   25 ---- 127
-  200 --- 25
+  203 --- 25
   26 --- 75
   26 --- 100
   26 ---- 131
@@ -449,83 +449,83 @@ flowchart LR
   32 --- 139
   32 --- 244
   34 --- 189
-  34 x--> 198
+  34 x--> 194
   34 --- 228
   34 --- 291
   35 --- 185
-  35 x--> 198
+  35 x--> 194
   35 --- 227
   35 --- 295
   36 --- 182
-  36 x--> 198
+  36 x--> 194
   36 --- 233
   36 --- 286
   37 --- 186
-  37 x--> 198
+  37 x--> 194
   37 --- 226
   37 --- 292
   38 --- 190
-  38 x--> 198
+  38 x--> 194
   38 --- 235
   38 --- 293
   39 --- 193
-  39 x--> 198
+  39 x--> 194
   39 --- 236
   39 --- 294
   40 --- 180
-  40 x--> 198
+  40 x--> 194
   40 --- 231
   40 --- 298
   41 --- 191
-  41 x--> 198
+  41 x--> 194
   41 --- 234
   41 --- 285
   42 --- 184
-  42 x--> 198
+  42 x--> 194
   42 --- 225
   42 --- 297
   43 --- 183
-  43 x--> 198
+  43 x--> 194
   43 --- 230
   43 --- 288
   44 --- 192
-  44 x--> 198
+  44 x--> 194
   44 --- 232
   44 --- 290
   45 --- 188
-  45 x--> 198
+  45 x--> 194
   45 --- 229
   45 --- 287
   46 --- 178
-  46 x--> 198
+  46 x--> 194
   46 --- 239
   46 --- 284
   47 --- 181
-  47 x--> 198
+  47 x--> 194
   47 --- 224
   47 --- 289
   48 --- 187
-  48 x--> 198
+  48 x--> 194
   48 --- 238
   48 --- 283
   49 --- 179
-  49 x--> 198
+  49 x--> 194
   49 --- 237
   49 --- 296
   51 --- 141
-  51 x--> 196
+  51 x--> 195
   51 --- 207
   51 --- 246
   52 --- 154
-  52 x--> 201
+  52 x--> 200
   52 --- 220
   52 --- 260
   53 --- 155
-  53 x--> 201
+  53 x--> 200
   53 --- 221
   53 --- 259
   54 --- 156
-  54 x--> 201
+  54 x--> 200
   54 --- 222
   54 --- 261
   116 <--x 56
@@ -568,19 +568,19 @@ flowchart LR
   69 --- 168
   69 --- 270
   71 --- 136
-  71 x--> 195
+  71 x--> 198
   71 --- 206
   71 --- 242
   73 --- 170
-  73 x--> 200
+  73 x--> 203
   73 --- 223
   73 --- 275
   74 --- 134
-  74 x--> 200
+  74 x--> 203
   74 --- 204
   74 --- 240
   75 --- 135
-  75 x--> 194
+  75 x--> 196
   75 --- 205
   75 --- 241
   132 <--x 76
@@ -675,8 +675,8 @@ flowchart LR
   111 --- 191
   111 --- 192
   111 --- 193
-  111 --- 198
-  111 --- 203
+  111 --- 194
+  111 --- 199
   111 --- 224
   111 --- 225
   111 --- 226
@@ -710,8 +710,8 @@ flowchart LR
   111 --- 297
   111 --- 298
   112 --- 141
-  112 --- 196
-  112 --- 201
+  112 --- 195
+  112 --- 200
   112 --- 207
   112 --- 246
   114 --- 154
@@ -750,8 +750,8 @@ flowchart LR
   117 --- 273
   117 --- 274
   118 --- 136
-  118 --- 195
-  118 --- 200
+  118 --- 198
+  118 --- 203
   118 --- 206
   118 --- 242
   125 --- 170
@@ -761,8 +761,8 @@ flowchart LR
   127 --- 204
   127 --- 240
   131 --- 135
-  131 --- 194
-  131 --- 199
+  131 --- 196
+  131 --- 201
   131 --- 205
   131 --- 241
   132 --- 171
@@ -966,11 +966,9 @@ flowchart LR
   236 <--x 193
   294 <--x 193
   298 <--x 193
-  204 <--x 195
-  223 <--x 195
-  220 <--x 196
-  221 <--x 196
-  222 <--x 196
+  220 <--x 195
+  221 <--x 195
+  222 <--x 195
   208 <--x 197
   209 <--x 197
   210 <--x 197
@@ -983,23 +981,25 @@ flowchart LR
   217 <--x 197
   218 <--x 197
   219 <--x 197
-  205 <--x 199
-  206 <--x 200
-  207 <--x 201
-  224 <--x 203
-  225 <--x 203
-  226 <--x 203
-  227 <--x 203
-  228 <--x 203
-  229 <--x 203
-  230 <--x 203
-  231 <--x 203
-  232 <--x 203
-  233 <--x 203
-  234 <--x 203
-  235 <--x 203
-  236 <--x 203
-  237 <--x 203
-  238 <--x 203
-  239 <--x 203
+  204 <--x 198
+  223 <--x 198
+  224 <--x 199
+  225 <--x 199
+  226 <--x 199
+  227 <--x 199
+  228 <--x 199
+  229 <--x 199
+  230 <--x 199
+  231 <--x 199
+  232 <--x 199
+  233 <--x 199
+  234 <--x 199
+  235 <--x 199
+  236 <--x 199
+  237 <--x 199
+  238 <--x 199
+  239 <--x 199
+  207 <--x 200
+  205 <--x 201
+  206 <--x 203
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/gear-rack/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/gear-rack/artifact_graph_flowchart.snap.md
index 11a90fbc8..bbc83b83c 100644
--- a/rust/kcl-lib/tests/kcl_samples/gear-rack/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/gear-rack/artifact_graph_flowchart.snap.md
@@ -145,51 +145,51 @@ flowchart LR
   8 --- 30
   8 ---- 36
   9 --- 40
-  9 x--> 57
+  9 x--> 60
   9 --- 66
   9 --- 85
   10 --- 38
-  10 x--> 57
+  10 x--> 60
   10 --- 65
   10 --- 88
   11 --- 37
-  11 x--> 57
+  11 x--> 60
   11 --- 68
   11 --- 87
   12 --- 39
-  12 x--> 57
+  12 x--> 60
   12 --- 67
   12 --- 86
   13 --- 53
-  13 x--> 60
+  13 x--> 59
   13 --- 80
   13 --- 102
   14 --- 54
-  14 x--> 60
+  14 x--> 59
   14 --- 79
   14 --- 99
   15 --- 51
-  15 x--> 60
+  15 x--> 59
   15 --- 84
   15 --- 98
   16 --- 50
-  16 x--> 60
+  16 x--> 59
   16 --- 77
   16 --- 101
   17 --- 52
-  17 x--> 60
+  17 x--> 59
   17 --- 82
   17 --- 97
   18 --- 55
-  18 x--> 60
+  18 x--> 59
   18 --- 81
   18 --- 103
   19 --- 56
-  19 x--> 60
+  19 x--> 59
   19 --- 83
   19 --- 104
   20 --- 49
-  20 x--> 60
+  20 x--> 59
   20 --- 78
   20 --- 100
   21 --- 43
@@ -209,27 +209,27 @@ flowchart LR
   24 --- 70
   24 --- 92
   25 --- 46
-  25 x--> 59
+  25 x--> 57
   25 --- 76
   25 --- 93
   26 --- 47
-  26 x--> 59
+  26 x--> 57
   26 --- 74
   26 --- 96
   27 --- 45
-  27 x--> 59
+  27 x--> 57
   27 --- 73
   27 --- 94
   28 --- 48
-  28 x--> 59
+  28 x--> 57
   28 --- 75
   28 --- 95
   33 --- 37
   33 --- 38
   33 --- 39
   33 --- 40
-  33 --- 57
-  33 --- 61
+  33 --- 60
+  33 --- 64
   33 --- 65
   33 --- 66
   33 --- 67
@@ -246,8 +246,8 @@ flowchart LR
   34 --- 54
   34 --- 55
   34 --- 56
-  34 --- 60
-  34 --- 64
+  34 --- 59
+  34 --- 63
   34 --- 77
   34 --- 78
   34 --- 79
@@ -282,8 +282,8 @@ flowchart LR
   36 --- 46
   36 --- 47
   36 --- 48
-  36 --- 59
-  36 --- 63
+  36 --- 57
+  36 --- 61
   36 --- 73
   36 --- 74
   36 --- 75
@@ -352,24 +352,24 @@ flowchart LR
   83 <--x 56
   103 <--x 56
   104 <--x 56
-  65 <--x 61
-  66 <--x 61
-  67 <--x 61
-  68 <--x 61
+  73 <--x 61
+  74 <--x 61
+  75 <--x 61
+  76 <--x 61
   69 <--x 62
   70 <--x 62
   71 <--x 62
   72 <--x 62
-  73 <--x 63
-  74 <--x 63
-  75 <--x 63
-  76 <--x 63
-  77 <--x 64
-  78 <--x 64
-  79 <--x 64
-  80 <--x 64
-  81 <--x 64
-  82 <--x 64
-  83 <--x 64
-  84 <--x 64
+  77 <--x 63
+  78 <--x 63
+  79 <--x 63
+  80 <--x 63
+  81 <--x 63
+  82 <--x 63
+  83 <--x 63
+  84 <--x 63
+  65 <--x 64
+  66 <--x 64
+  67 <--x 64
+  68 <--x 64
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/artifact_graph_flowchart.snap.md
index 91ee52b82..967a84bfe 100644
--- a/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/artifact_graph_flowchart.snap.md
@@ -241,7 +241,7 @@ flowchart LR
   17 --- 70
   17 --- 75
   18 --- 82
-  18 x--> 100
+  18 x--> 102
   18 --- 110
   18 --- 128
   19 --- 97
@@ -253,7 +253,7 @@ flowchart LR
   20 --- 121
   20 --- 142
   21 --- 84
-  21 x--> 100
+  21 x--> 102
   21 --- 112
   21 --- 129
   22 --- 95
@@ -261,11 +261,11 @@ flowchart LR
   22 --- 124
   22 --- 140
   23 --- 86
-  23 x--> 100
+  23 x--> 102
   23 --- 109
   23 --- 126
   24 --- 83
-  24 x--> 100
+  24 x--> 102
   24 --- 111
   24 --- 130
   25 --- 98
@@ -273,7 +273,7 @@ flowchart LR
   25 --- 122
   25 --- 141
   26 --- 85
-  26 x--> 100
+  26 x--> 102
   26 --- 108
   26 --- 127
   27 --- 99
@@ -285,7 +285,7 @@ flowchart LR
   62 --- 114
   62 --- 132
   63 --- 93
-  63 x--> 106
+  63 x--> 104
   63 --- 119
   63 --- 135
   64 --- 89
@@ -293,11 +293,11 @@ flowchart LR
   64 --- 115
   64 --- 133
   65 --- 94
-  65 x--> 106
+  65 x--> 104
   65 --- 118
   65 --- 137
   66 --- 91
-  66 x--> 106
+  66 x--> 104
   66 --- 117
   66 --- 138
   67 --- 90
@@ -309,7 +309,7 @@ flowchart LR
   68 --- 116
   68 --- 134
   69 --- 92
-  69 x--> 106
+  69 x--> 104
   69 --- 120
   69 --- 136
   78 --- 95
@@ -334,8 +334,8 @@ flowchart LR
   79 --- 84
   79 --- 85
   79 --- 86
-  79 --- 100
-  79 --- 104
+  79 --- 102
+  79 --- 106
   79 --- 108
   79 --- 109
   79 --- 110
@@ -364,8 +364,8 @@ flowchart LR
   81 --- 92
   81 --- 93
   81 --- 94
-  81 --- 102
-  81 --- 106
+  81 --- 100
+  81 --- 104
   81 --- 117
   81 --- 118
   81 --- 119
@@ -420,19 +420,19 @@ flowchart LR
   125 <--x 99
   139 <--x 99
   141 <--x 99
+  117 <--x 100
+  118 <--x 100
+  119 <--x 100
+  120 <--x 100
   113 <--x 101
   114 <--x 101
   115 <--x 101
   116 <--x 101
-  117 <--x 102
-  118 <--x 102
-  119 <--x 102
-  120 <--x 102
-  108 <--x 104
-  109 <--x 104
-  110 <--x 104
-  111 <--x 104
-  112 <--x 104
+  108 <--x 106
+  109 <--x 106
+  110 <--x 106
+  111 <--x 106
+  112 <--x 106
   121 <--x 107
   122 <--x 107
   123 <--x 107
diff --git a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/artifact_graph_flowchart.snap.md
index 6c1750046..bae105a17 100644
--- a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/artifact_graph_flowchart.snap.md
@@ -302,7 +302,7 @@ flowchart LR
   6 --- 18
   7 --- 21
   8 --- 19
-  149 x--> 12
+  154 x--> 12
   13 --- 22
   13 --- 25
   13 --- 26
@@ -328,7 +328,7 @@ flowchart LR
   16 --- 38
   16 --- 76
   16 ---- 88
-  149 --- 16
+  154 --- 16
   17 --- 39
   17 --- 40
   17 --- 41
@@ -376,87 +376,87 @@ flowchart LR
   21 --- 83
   21 ---- 93
   22 --- 135
-  22 x--> 154
+  22 x--> 149
   22 --- 204
   22 --- 257
   23 --- 118
-  23 x--> 150
+  23 x--> 151
   23 --- 184
   23 --- 239
   24 --- 117
-  24 x--> 150
+  24 x--> 151
   24 --- 186
   24 --- 237
   25 --- 137
-  25 x--> 154
+  25 x--> 149
   25 --- 205
   25 --- 253
   26 --- 134
-  26 x--> 154
+  26 x--> 149
   26 --- 202
   26 --- 256
   27 --- 116
-  27 x--> 150
+  27 x--> 151
   27 --- 185
   27 --- 235
   28 --- 136
-  28 x--> 154
+  28 x--> 149
   28 --- 206
   28 --- 254
   29 --- 119
-  29 x--> 150
+  29 x--> 151
   29 --- 187
   29 --- 236
   30 --- 138
-  30 x--> 154
+  30 x--> 149
   30 --- 203
   30 --- 255
   31 --- 120
-  31 x--> 150
+  31 x--> 151
   31 --- 188
   31 --- 238
   34 --- 115
-  34 x--> 149
+  34 x--> 154
   34 --- 181
   34 --- 231
   35 --- 114
-  35 x--> 149
+  35 x--> 154
   35 --- 180
   35 --- 234
   36 --- 112
-  36 x--> 149
+  36 x--> 154
   36 --- 183
   36 --- 233
   37 --- 113
-  37 x--> 149
+  37 x--> 154
   37 --- 182
   37 --- 232
   38 --- 121
-  38 x--> 149
+  38 x--> 154
   38 --- 189
   38 --- 240
   39 --- 130
-  39 x--> 153
+  39 x--> 148
   39 --- 201
   39 --- 252
   40 --- 133
-  40 x--> 153
+  40 x--> 148
   40 --- 198
   40 --- 249
   41 --- 131
-  41 x--> 153
+  41 x--> 148
   41 --- 200
   41 --- 250
   42 --- 132
-  42 x--> 153
+  42 x--> 148
   42 --- 199
   42 --- 251
   43 --- 98
-  43 x--> 147
+  43 x--> 153
   43 --- 169
   43 --- 217
   44 --- 105
-  44 x--> 148
+  44 x--> 147
   44 --- 174
   44 --- 226
   45 --- 128
@@ -464,15 +464,15 @@ flowchart LR
   45 --- 192
   45 --- 242
   46 --- 146
-  46 x--> 155
+  46 x--> 150
   46 --- 208
   46 --- 264
   47 --- 96
-  47 x--> 147
+  47 x--> 153
   47 --- 168
   47 --- 215
   48 --- 106
-  48 x--> 148
+  48 x--> 147
   48 --- 176
   48 --- 227
   49 --- 123
@@ -480,15 +480,15 @@ flowchart LR
   49 --- 197
   49 --- 241
   50 --- 141
-  50 x--> 155
+  50 x--> 150
   50 --- 210
   50 --- 265
   51 --- 97
-  51 x--> 147
+  51 x--> 153
   51 --- 171
   51 --- 218
   52 --- 104
-  52 x--> 148
+  52 x--> 147
   52 --- 178
   52 --- 223
   53 --- 126
@@ -496,11 +496,11 @@ flowchart LR
   53 --- 196
   53 --- 248
   54 --- 143
-  54 x--> 155
+  54 x--> 150
   54 --- 214
   54 --- 261
   55 --- 139
-  55 x--> 155
+  55 x--> 150
   55 --- 211
   55 --- 263
   56 --- 125
@@ -508,15 +508,15 @@ flowchart LR
   56 --- 194
   56 --- 247
   57 --- 103
-  57 x--> 147
+  57 x--> 153
   57 --- 164
   57 --- 216
   58 --- 111
-  58 x--> 148
+  58 x--> 147
   58 --- 173
   58 --- 230
   59 --- 100
-  59 x--> 147
+  59 x--> 153
   59 --- 167
   59 --- 219
   60 --- 124
@@ -524,19 +524,19 @@ flowchart LR
   60 --- 193
   60 --- 246
   61 --- 109
-  61 x--> 148
+  61 x--> 147
   61 --- 175
   61 --- 228
   62 --- 142
-  62 x--> 155
+  62 x--> 150
   62 --- 207
   62 --- 259
   63 --- 101
-  63 x--> 147
+  63 x--> 153
   63 --- 165
   63 --- 220
   64 --- 108
-  64 x--> 148
+  64 x--> 147
   64 --- 172
   64 --- 224
   65 --- 127
@@ -544,11 +544,11 @@ flowchart LR
   65 --- 195
   65 --- 243
   66 --- 145
-  66 x--> 155
+  66 x--> 150
   66 --- 213
   66 --- 260
   67 --- 99
-  67 x--> 147
+  67 x--> 153
   67 --- 166
   67 --- 222
   68 --- 122
@@ -556,23 +556,23 @@ flowchart LR
   68 --- 191
   68 --- 245
   69 --- 107
-  69 x--> 148
+  69 x--> 147
   69 --- 179
   69 --- 225
   70 --- 144
-  70 x--> 155
+  70 x--> 150
   70 --- 209
   70 --- 262
   71 --- 140
-  71 x--> 155
+  71 x--> 150
   71 --- 212
   71 --- 258
   72 --- 102
-  72 x--> 147
+  72 x--> 153
   72 --- 170
   72 --- 221
   73 --- 110
-  73 x--> 148
+  73 x--> 147
   73 --- 177
   73 --- 229
   74 --- 129
@@ -584,8 +584,8 @@ flowchart LR
   84 --- 118
   84 --- 119
   84 --- 120
-  84 --- 150
-  84 --- 159
+  84 --- 151
+  84 --- 160
   84 --- 184
   84 --- 185
   84 --- 186
@@ -601,8 +601,8 @@ flowchart LR
   85 --- 136
   85 --- 137
   85 --- 138
-  85 --- 154
-  85 --- 162
+  85 --- 149
+  85 --- 158
   85 --- 202
   85 --- 203
   85 --- 204
@@ -617,8 +617,8 @@ flowchart LR
   86 --- 113
   86 --- 114
   86 --- 115
-  86 --- 149
-  86 --- 158
+  86 --- 154
+  86 --- 163
   86 --- 180
   86 --- 181
   86 --- 182
@@ -628,15 +628,15 @@ flowchart LR
   86 --- 233
   86 --- 234
   88 --- 121
-  88 --- 151
+  88 --- 155
   88 --- 189
   88 --- 240
   91 --- 130
   91 --- 131
   91 --- 132
   91 --- 133
-  91 --- 153
-  91 --- 161
+  91 --- 148
+  91 --- 157
   91 --- 198
   91 --- 199
   91 --- 200
@@ -654,7 +654,7 @@ flowchart LR
   92 --- 128
   92 --- 129
   92 --- 152
-  92 --- 160
+  92 --- 161
   92 --- 190
   92 --- 191
   92 --- 192
@@ -679,8 +679,8 @@ flowchart LR
   93 --- 144
   93 --- 145
   93 --- 146
-  93 --- 155
-  93 --- 163
+  93 --- 150
+  93 --- 159
   93 --- 207
   93 --- 208
   93 --- 209
@@ -705,8 +705,8 @@ flowchart LR
   94 --- 109
   94 --- 110
   94 --- 111
-  94 --- 148
-  94 --- 157
+  94 --- 147
+  94 --- 156
   94 --- 172
   94 --- 173
   94 --- 174
@@ -731,8 +731,8 @@ flowchart LR
   95 --- 101
   95 --- 102
   95 --- 103
-  95 --- 147
-  95 --- 156
+  95 --- 153
+  95 --- 162
   95 --- 164
   95 --- 165
   95 --- 166
@@ -893,57 +893,57 @@ flowchart LR
   208 <--x 146
   258 <--x 146
   264 <--x 146
-  189 <--x 151
-  164 <--x 156
-  165 <--x 156
-  166 <--x 156
-  167 <--x 156
-  168 <--x 156
-  169 <--x 156
-  170 <--x 156
-  171 <--x 156
-  172 <--x 157
-  173 <--x 157
-  174 <--x 157
-  175 <--x 157
-  176 <--x 157
-  177 <--x 157
-  178 <--x 157
-  179 <--x 157
-  180 <--x 158
-  181 <--x 158
-  182 <--x 158
-  183 <--x 158
-  184 <--x 159
-  185 <--x 159
-  186 <--x 159
-  187 <--x 159
-  188 <--x 159
-  190 <--x 160
-  191 <--x 160
-  192 <--x 160
-  193 <--x 160
-  194 <--x 160
-  195 <--x 160
-  196 <--x 160
-  197 <--x 160
-  198 <--x 161
-  199 <--x 161
-  200 <--x 161
-  201 <--x 161
-  202 <--x 162
-  203 <--x 162
-  204 <--x 162
-  205 <--x 162
-  206 <--x 162
-  207 <--x 163
-  208 <--x 163
-  209 <--x 163
-  210 <--x 163
-  211 <--x 163
-  212 <--x 163
-  213 <--x 163
-  214 <--x 163
+  189 <--x 155
+  172 <--x 156
+  173 <--x 156
+  174 <--x 156
+  175 <--x 156
+  176 <--x 156
+  177 <--x 156
+  178 <--x 156
+  179 <--x 156
+  198 <--x 157
+  199 <--x 157
+  200 <--x 157
+  201 <--x 157
+  202 <--x 158
+  203 <--x 158
+  204 <--x 158
+  205 <--x 158
+  206 <--x 158
+  207 <--x 159
+  208 <--x 159
+  209 <--x 159
+  210 <--x 159
+  211 <--x 159
+  212 <--x 159
+  213 <--x 159
+  214 <--x 159
+  184 <--x 160
+  185 <--x 160
+  186 <--x 160
+  187 <--x 160
+  188 <--x 160
+  190 <--x 161
+  191 <--x 161
+  192 <--x 161
+  193 <--x 161
+  194 <--x 161
+  195 <--x 161
+  196 <--x 161
+  197 <--x 161
+  164 <--x 162
+  165 <--x 162
+  166 <--x 162
+  167 <--x 162
+  168 <--x 162
+  169 <--x 162
+  170 <--x 162
+  171 <--x 162
+  180 <--x 163
+  181 <--x 163
+  182 <--x 163
+  183 <--x 163
   231 <--x 266
   232 <--x 269
   233 <--x 267
diff --git a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/artifact_graph_flowchart.snap.md
index 6244a91e9..592595582 100644
--- a/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-bins/artifact_graph_flowchart.snap.md
@@ -138,7 +138,7 @@ flowchart LR
   3 --- 11
   4 <--x 5
   4 --- 13
-  67 x--> 8
+  70 x--> 8
   9 --- 14
   9 --- 17
   9 --- 18
@@ -164,7 +164,7 @@ flowchart LR
   12 --- 30
   12 --- 36
   12 ---- 44
-  67 --- 12
+  70 --- 12
   13 --- 31
   13 --- 32
   13 --- 33
@@ -172,79 +172,79 @@ flowchart LR
   13 --- 35
   13 ---- 47
   14 --- 63
-  14 x--> 71
+  14 x--> 68
   14 --- 92
   14 --- 113
   15 --- 54
-  15 x--> 68
+  15 x--> 69
   15 --- 80
   15 --- 103
   16 --- 53
-  16 x--> 68
+  16 x--> 69
   16 --- 82
   16 --- 101
   17 --- 65
-  17 x--> 71
+  17 x--> 68
   17 --- 93
   17 --- 109
   18 --- 62
-  18 x--> 71
+  18 x--> 68
   18 --- 90
   18 --- 112
   19 --- 52
-  19 x--> 68
+  19 x--> 69
   19 --- 81
   19 --- 99
   20 --- 64
-  20 x--> 71
+  20 x--> 68
   20 --- 94
   20 --- 110
   21 --- 55
-  21 x--> 68
+  21 x--> 69
   21 --- 83
   21 --- 100
   22 --- 66
-  22 x--> 71
+  22 x--> 68
   22 --- 91
   22 --- 111
   23 --- 56
-  23 x--> 68
+  23 x--> 69
   23 --- 84
   23 --- 102
   26 --- 51
-  26 x--> 67
+  26 x--> 70
   26 --- 77
   26 --- 95
   27 --- 50
-  27 x--> 67
+  27 x--> 70
   27 --- 76
   27 --- 98
   28 --- 48
-  28 x--> 67
+  28 x--> 70
   28 --- 79
   28 --- 97
   29 --- 49
-  29 x--> 67
+  29 x--> 70
   29 --- 78
   29 --- 96
   30 --- 57
-  30 x--> 67
+  30 x--> 70
   30 --- 85
   30 --- 104
   31 --- 58
-  31 x--> 70
+  31 x--> 67
   31 --- 89
   31 --- 108
   32 --- 61
-  32 x--> 70
+  32 x--> 67
   32 --- 86
   32 --- 105
   33 --- 59
-  33 x--> 70
+  33 x--> 67
   33 --- 88
   33 --- 106
   34 --- 60
-  34 x--> 70
+  34 x--> 67
   34 --- 87
   34 --- 107
   40 --- 52
@@ -252,8 +252,8 @@ flowchart LR
   40 --- 54
   40 --- 55
   40 --- 56
-  40 --- 68
-  40 --- 73
+  40 --- 69
+  40 --- 74
   40 --- 80
   40 --- 81
   40 --- 82
@@ -269,8 +269,8 @@ flowchart LR
   41 --- 64
   41 --- 65
   41 --- 66
-  41 --- 71
-  41 --- 75
+  41 --- 68
+  41 --- 73
   41 --- 90
   41 --- 91
   41 --- 92
@@ -285,8 +285,8 @@ flowchart LR
   42 --- 49
   42 --- 50
   42 --- 51
-  42 --- 67
-  42 --- 72
+  42 --- 70
+  42 --- 75
   42 --- 76
   42 --- 77
   42 --- 78
@@ -296,15 +296,15 @@ flowchart LR
   42 --- 97
   42 --- 98
   44 --- 57
-  44 --- 69
+  44 --- 71
   44 --- 85
   44 --- 104
   47 --- 58
   47 --- 59
   47 --- 60
   47 --- 61
-  47 --- 70
-  47 --- 74
+  47 --- 67
+  47 --- 72
   47 --- 86
   47 --- 87
   47 --- 88
@@ -361,25 +361,25 @@ flowchart LR
   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 73
-  81 <--x 73
-  82 <--x 73
-  83 <--x 73
-  84 <--x 73
-  86 <--x 74
-  87 <--x 74
-  88 <--x 74
-  89 <--x 74
-  90 <--x 75
-  91 <--x 75
-  92 <--x 75
-  93 <--x 75
-  94 <--x 75
+  85 <--x 71
+  86 <--x 72
+  87 <--x 72
+  88 <--x 72
+  89 <--x 72
+  90 <--x 73
+  91 <--x 73
+  92 <--x 73
+  93 <--x 73
+  94 <--x 73
+  80 <--x 74
+  81 <--x 74
+  82 <--x 74
+  83 <--x 74
+  84 <--x 74
+  76 <--x 75
+  77 <--x 75
+  78 <--x 75
+  79 <--x 75
   95 <--x 114
   96 <--x 117
   97 <--x 115
diff --git a/rust/kcl-lib/tests/kcl_samples/keyboard/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/keyboard/artifact_graph_flowchart.snap.md
index bf3fed1c5..e4cc35d8b 100644
--- a/rust/kcl-lib/tests/kcl_samples/keyboard/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/keyboard/artifact_graph_flowchart.snap.md
@@ -1424,21 +1424,21 @@ flowchart LR
   59 --- 309
   59 ---- 350
   60 --- 387
-  60 x--> 564
+  60 x--> 561
   60 --- 652
   60 --- 859
   60 --- 1037
   61 --- 386
-  61 x--> 564
+  61 x--> 561
   61 --- 654
   61 --- 861
   62 --- 385
-  62 x--> 564
+  62 x--> 561
   62 --- 653
   62 --- 860
   62 --- 1035
   63 --- 388
-  63 x--> 564
+  63 x--> 561
   63 --- 651
   63 --- 862
   65 x--> 388
@@ -1458,67 +1458,67 @@ flowchart LR
   68 --- 675
   68 --- 883
   69 --- 360
-  69 x--> 561
+  69 x--> 571
   69 --- 627
   69 --- 834
   70 --- 455
-  70 x--> 574
+  70 x--> 577
   70 --- 726
   70 --- 933
   71 --- 418
-  71 x--> 569
+  71 x--> 576
   71 --- 689
   71 --- 893
   72 --- 402
-  72 x--> 567
+  72 x--> 575
   72 --- 672
   72 --- 877
   73 --- 376
-  73 x--> 563
+  73 x--> 586
   73 --- 644
   73 --- 856
   74 --- 435
-  74 x--> 571
+  74 x--> 579
   74 --- 704
   74 --- 912
   75 --- 448
-  75 x--> 573
+  75 x--> 582
   75 --- 717
   75 --- 924
   76 --- 395
-  76 x--> 566
+  76 x--> 580
   76 --- 664
   76 --- 874
   77 --- 537
-  77 x--> 584
+  77 x--> 562
   77 --- 808
   77 --- 1017
   78 --- 428
-  78 x--> 570
+  78 x--> 583
   78 --- 699
   78 --- 903
   79 --- 494
-  79 x--> 579
+  79 x--> 581
   79 --- 760
   79 --- 965
   80 --- 467
-  80 x--> 575
+  80 x--> 572
   80 --- 729
   80 --- 938
   81 --- 374
-  81 x--> 562
+  81 x--> 578
   81 --- 636
   81 --- 847
   82 --- 486
-  82 x--> 578
+  82 x--> 563
   82 --- 751
   82 --- 964
   83 --- 510
-  83 x--> 581
+  83 x--> 567
   83 --- 776
   83 --- 978
   84 --- 356
-  84 x--> 560
+  84 x--> 573
   84 --- 619
   84 --- 830
   85 --- 550
@@ -1526,99 +1526,99 @@ flowchart LR
   85 --- 810
   85 --- 1025
   86 --- 557
-  86 x--> 586
+  86 x--> 560
   86 --- 819
   86 --- 1030
   87 --- 482
-  87 x--> 577
+  87 x--> 565
   87 --- 746
   87 --- 953
   88 --- 417
-  88 x--> 568
+  88 x--> 564
   88 --- 681
   88 --- 889
   89 --- 535
-  89 x--> 583
+  89 x--> 569
   89 --- 801
   89 --- 1004
   90 --- 475
-  90 x--> 577
+  90 x--> 565
   90 --- 744
   90 --- 950
   91 --- 491
-  91 x--> 579
+  91 x--> 581
   91 --- 758
   91 --- 968
   92 --- 411
-  92 x--> 568
+  92 x--> 564
   92 --- 683
   92 --- 890
   93 --- 426
-  93 x--> 570
+  93 x--> 583
   93 --- 693
   93 --- 907
   94 --- 464
-  94 x--> 575
+  94 x--> 572
   94 --- 736
   94 --- 943
   95 --- 397
-  95 x--> 566
+  95 x--> 580
   95 --- 665
   95 --- 868
   96 --- 539
-  96 x--> 584
+  96 x--> 562
   96 --- 804
   96 --- 1016
   97 --- 375
-  97 x--> 562
+  97 x--> 578
   97 --- 640
   97 --- 842
   98 --- 457
-  98 x--> 574
+  98 x--> 577
   98 --- 721
   98 --- 936
   99 --- 488
-  99 x--> 578
+  99 x--> 563
   99 --- 756
   99 --- 961
   100 --- 437
-  100 x--> 571
+  100 x--> 579
   100 --- 708
   100 --- 910
   101 --- 364
-  101 x--> 561
+  101 x--> 571
   101 --- 633
   101 --- 840
   102 --- 382
-  102 x--> 563
+  102 x--> 586
   102 --- 648
   102 --- 850
   103 --- 451
-  103 x--> 573
+  103 x--> 582
   103 --- 718
   103 --- 923
   104 --- 511
-  104 x--> 581
+  104 x--> 567
   104 --- 771
   104 --- 979
   105 --- 407
-  105 x--> 567
+  105 x--> 575
   105 --- 669
   105 --- 882
   106 --- 558
-  106 x--> 586
+  106 x--> 560
   106 --- 822
   106 --- 1026
   107 --- 425
-  107 x--> 569
+  107 x--> 576
   107 --- 686
   107 --- 898
   108 --- 358
-  108 x--> 560
+  108 x--> 573
   108 --- 622
   108 --- 832
   109 --- 534
-  109 x--> 583
+  109 x--> 569
   109 --- 794
   109 --- 1007
   110 --- 551
@@ -1626,11 +1626,11 @@ flowchart LR
   110 --- 812
   110 --- 1023
   111 --- 410
-  111 x--> 568
+  111 x--> 564
   111 --- 682
   111 --- 885
   112 --- 484
-  112 x--> 578
+  112 x--> 563
   112 --- 754
   112 --- 958
   113 --- 545
@@ -1638,115 +1638,115 @@ flowchart LR
   113 --- 816
   113 --- 1018
   114 --- 403
-  114 x--> 567
+  114 x--> 575
   114 --- 673
   114 --- 875
   115 --- 553
-  115 x--> 586
+  115 x--> 560
   115 --- 821
   115 --- 1027
   116 --- 352
-  116 x--> 560
+  116 x--> 573
   116 --- 620
   116 --- 826
   117 --- 477
-  117 x--> 577
+  117 x--> 565
   117 --- 745
   117 --- 955
   118 --- 530
-  118 x--> 583
+  118 x--> 569
   118 --- 796
   118 --- 1006
   119 --- 373
-  119 x--> 562
+  119 x--> 578
   119 --- 641
   119 --- 843
   120 --- 540
-  120 x--> 584
+  120 x--> 562
   120 --- 805
   120 --- 1010
   121 --- 507
-  121 x--> 581
+  121 x--> 567
   121 --- 777
   121 --- 981
   122 --- 497
-  122 x--> 579
+  122 x--> 581
   122 --- 759
   122 --- 970
   123 --- 400
-  123 x--> 566
+  123 x--> 580
   123 --- 666
   123 --- 873
   124 --- 380
-  124 x--> 563
+  124 x--> 586
   124 --- 643
   124 --- 855
   125 --- 430
-  125 x--> 570
+  125 x--> 583
   125 --- 694
   125 --- 900
   126 --- 469
-  126 x--> 575
+  126 x--> 572
   126 --- 732
   126 --- 937
   127 --- 450
-  127 x--> 573
+  127 x--> 582
   127 --- 713
   127 --- 928
   128 --- 363
-  128 x--> 561
+  128 x--> 571
   128 --- 628
   128 --- 836
   129 --- 423
-  129 x--> 569
+  129 x--> 576
   129 --- 684
   129 --- 896
   130 --- 460
-  130 x--> 574
+  130 x--> 577
   130 --- 728
   130 --- 934
   131 --- 440
-  131 x--> 571
+  131 x--> 579
   131 --- 701
   131 --- 914
   132 --- 483
-  132 x--> 578
+  132 x--> 563
   132 --- 753
   132 --- 957
   133 --- 504
-  133 x--> 581
+  133 x--> 567
   133 --- 770
   133 --- 983
   134 --- 369
-  134 x--> 562
+  134 x--> 578
   134 --- 637
   134 --- 844
   135 --- 447
-  135 x--> 573
+  135 x--> 582
   135 --- 714
   135 --- 926
   136 --- 377
-  136 x--> 563
+  136 x--> 586
   136 --- 645
   136 --- 852
   137 --- 552
-  137 x--> 586
+  137 x--> 560
   137 --- 818
   137 --- 1033
   138 --- 536
-  138 x--> 584
+  138 x--> 562
   138 --- 809
   138 --- 1012
   139 --- 353
-  139 x--> 560
+  139 x--> 573
   139 --- 618
   139 --- 829
   140 --- 361
-  140 x--> 561
+  140 x--> 571
   140 --- 630
   140 --- 835
   141 --- 399
-  141 x--> 566
+  141 x--> 580
   141 --- 659
   141 --- 871
   142 --- 548
@@ -1754,87 +1754,87 @@ flowchart LR
   142 --- 817
   142 --- 1020
   143 --- 429
-  143 x--> 570
+  143 x--> 583
   143 --- 695
   143 --- 901
   144 --- 459
-  144 x--> 574
+  144 x--> 577
   144 --- 723
   144 --- 932
   145 --- 422
-  145 x--> 569
+  145 x--> 576
   145 --- 688
   145 --- 892
   146 --- 470
-  146 x--> 575
+  146 x--> 572
   146 --- 730
   146 --- 942
   147 --- 498
-  147 x--> 579
+  147 x--> 581
   147 --- 757
   147 --- 972
   148 --- 439
-  148 x--> 571
+  148 x--> 579
   148 --- 707
   148 --- 911
   149 --- 480
-  149 x--> 577
+  149 x--> 565
   149 --- 747
   149 --- 954
   150 --- 416
-  150 x--> 568
+  150 x--> 564
   150 --- 678
   150 --- 891
   151 --- 533
-  151 x--> 583
+  151 x--> 569
   151 --- 798
   151 --- 1003
   152 --- 408
-  152 x--> 567
+  152 x--> 575
   152 --- 667
   152 --- 876
   153 --- 401
-  153 x--> 567
+  153 x--> 575
   153 --- 670
   153 --- 878
   154 --- 419
-  154 x--> 569
+  154 x--> 576
   154 --- 691
   154 --- 897
   155 --- 476
-  155 x--> 577
+  155 x--> 565
   155 --- 742
   155 --- 952
   156 --- 485
-  156 x--> 578
+  156 x--> 563
   156 --- 749
   156 --- 960
   157 --- 456
-  157 x--> 574
+  157 x--> 577
   157 --- 727
   157 --- 929
   158 --- 371
-  158 x--> 562
+  158 x--> 578
   158 --- 639
   158 --- 848
   159 --- 529
-  159 x--> 583
+  159 x--> 569
   159 --- 795
   159 --- 1002
   160 --- 398
-  160 x--> 566
+  160 x--> 580
   160 --- 663
   160 --- 872
   161 --- 465
-  161 x--> 575
+  161 x--> 572
   161 --- 734
   161 --- 941
   162 --- 495
-  162 x--> 579
+  162 x--> 581
   162 --- 762
   162 --- 969
   163 --- 555
-  163 x--> 586
+  163 x--> 560
   163 --- 823
   163 --- 1031
   164 --- 549
@@ -1842,39 +1842,39 @@ flowchart LR
   164 --- 814
   164 --- 1024
   165 --- 542
-  165 x--> 584
+  165 x--> 562
   165 --- 806
   165 --- 1014
   166 --- 365
-  166 x--> 561
+  166 x--> 571
   166 --- 631
   166 --- 838
   167 --- 509
-  167 x--> 581
+  167 x--> 567
   167 --- 772
   167 --- 980
   168 --- 381
-  168 x--> 563
+  168 x--> 586
   168 --- 642
   168 --- 853
   169 --- 433
-  169 x--> 570
+  169 x--> 583
   169 --- 696
   169 --- 904
   170 --- 414
-  170 x--> 568
+  170 x--> 564
   170 --- 679
   170 --- 887
   171 --- 357
-  171 x--> 560
+  171 x--> 573
   171 --- 625
   171 --- 831
   172 --- 454
-  172 x--> 573
+  172 x--> 582
   172 --- 720
   172 --- 921
   173 --- 442
-  173 x--> 571
+  173 x--> 579
   173 --- 705
   173 --- 916
   174 --- 544
@@ -1882,87 +1882,87 @@ flowchart LR
   174 --- 813
   174 --- 1022
   175 --- 404
-  175 x--> 567
+  175 x--> 575
   175 --- 674
   175 --- 881
   176 --- 396
-  176 x--> 566
+  176 x--> 580
   176 --- 661
   176 --- 869
   177 --- 372
-  177 x--> 562
+  177 x--> 578
   177 --- 634
   177 --- 845
   178 --- 554
-  178 x--> 586
+  178 x--> 560
   178 --- 820
   178 --- 1032
   179 --- 466
-  179 x--> 575
+  179 x--> 572
   179 --- 735
   179 --- 940
   180 --- 378
-  180 x--> 563
+  180 x--> 586
   180 --- 646
   180 --- 857
   181 --- 496
-  181 x--> 579
+  181 x--> 581
   181 --- 763
   181 --- 966
   182 --- 541
-  182 x--> 584
+  182 x--> 562
   182 --- 803
   182 --- 1015
   183 --- 508
-  183 x--> 581
+  183 x--> 567
   183 --- 774
   183 --- 985
   184 --- 438
-  184 x--> 571
+  184 x--> 579
   184 --- 702
   184 --- 915
   185 --- 431
-  185 x--> 570
+  185 x--> 583
   185 --- 692
   185 --- 905
   186 --- 532
-  186 x--> 583
+  186 x--> 569
   186 --- 799
   186 --- 1005
   187 --- 478
-  187 x--> 577
+  187 x--> 565
   187 --- 743
   187 --- 949
   188 --- 424
-  188 x--> 569
+  188 x--> 576
   188 --- 687
   188 --- 894
   189 --- 367
-  189 x--> 561
+  189 x--> 571
   189 --- 626
   189 --- 839
   190 --- 490
-  190 x--> 578
+  190 x--> 563
   190 --- 750
   190 --- 962
   191 --- 415
-  191 x--> 568
+  191 x--> 564
   191 --- 680
   191 --- 888
   192 --- 461
-  192 x--> 574
+  192 x--> 577
   192 --- 725
   192 --- 931
   193 --- 453
-  193 x--> 573
+  193 x--> 582
   193 --- 715
   193 --- 925
   194 --- 359
-  194 x--> 560
+  194 x--> 573
   194 --- 624
   194 --- 833
   195 --- 368
-  195 x--> 562
+  195 x--> 578
   195 --- 638
   195 --- 846
   196 --- 546
@@ -1970,99 +1970,99 @@ flowchart LR
   196 --- 811
   196 --- 1019
   197 --- 394
-  197 x--> 566
+  197 x--> 580
   197 --- 662
   197 --- 870
   198 --- 463
-  198 x--> 575
+  198 x--> 572
   198 --- 731
   198 --- 939
   199 --- 449
-  199 x--> 573
+  199 x--> 582
   199 --- 716
   199 --- 927
   200 --- 506
-  200 x--> 581
+  200 x--> 567
   200 --- 775
   200 --- 984
   201 --- 493
-  201 x--> 579
+  201 x--> 581
   201 --- 761
   201 --- 967
   202 --- 427
-  202 x--> 570
+  202 x--> 583
   202 --- 698
   202 --- 906
   203 --- 362
-  203 x--> 561
+  203 x--> 571
   203 --- 629
   203 --- 837
   204 --- 354
-  204 x--> 560
+  204 x--> 573
   204 --- 623
   204 --- 828
   205 --- 436
-  205 x--> 571
+  205 x--> 579
   205 --- 706
   205 --- 913
   206 --- 458
-  206 x--> 574
+  206 x--> 577
   206 --- 724
   206 --- 935
   207 --- 412
-  207 x--> 568
+  207 x--> 564
   207 --- 677
   207 --- 886
   208 --- 421
-  208 x--> 569
+  208 x--> 576
   208 --- 690
   208 --- 899
   209 --- 531
-  209 x--> 583
+  209 x--> 569
   209 --- 800
   209 --- 1009
   210 --- 489
-  210 x--> 578
+  210 x--> 563
   210 --- 755
   210 --- 959
   211 --- 406
-  211 x--> 567
+  211 x--> 575
   211 --- 671
   211 --- 879
   212 --- 479
-  212 x--> 577
+  212 x--> 565
   212 --- 748
   212 --- 956
   213 --- 383
-  213 x--> 563
+  213 x--> 586
   213 --- 649
   213 --- 854
   214 --- 543
-  214 x--> 584
+  214 x--> 562
   214 --- 807
   214 --- 1011
   215 --- 559
-  215 x--> 586
+  215 x--> 560
   215 --- 824
   215 --- 1029
   216 --- 370
-  216 x--> 562
+  216 x--> 578
   216 --- 635
   216 --- 849
   217 --- 528
-  217 x--> 583
+  217 x--> 569
   217 --- 797
   217 --- 1008
   218 --- 393
-  218 x--> 566
+  218 x--> 580
   218 --- 660
   218 --- 867
   219 --- 505
-  219 x--> 581
+  219 x--> 567
   219 --- 773
   219 --- 982
   220 --- 492
-  220 x--> 579
+  220 x--> 581
   220 --- 764
   220 --- 971
   221 --- 547
@@ -2070,199 +2070,199 @@ flowchart LR
   221 --- 815
   221 --- 1021
   222 --- 538
-  222 x--> 584
+  222 x--> 562
   222 --- 802
   222 --- 1013
   223 --- 355
-  223 x--> 560
+  223 x--> 573
   223 --- 621
   223 --- 827
   224 --- 468
-  224 x--> 575
+  224 x--> 572
   224 --- 733
   224 --- 944
   225 --- 379
-  225 x--> 563
+  225 x--> 586
   225 --- 647
   225 --- 851
   226 --- 420
-  226 x--> 569
+  226 x--> 576
   226 --- 685
   226 --- 895
   227 --- 487
-  227 x--> 578
+  227 x--> 563
   227 --- 752
   227 --- 963
   228 --- 556
-  228 x--> 586
+  228 x--> 560
   228 --- 825
   228 --- 1028
   229 --- 413
-  229 x--> 568
+  229 x--> 564
   229 --- 676
   229 --- 884
   230 --- 366
-  230 x--> 561
+  230 x--> 571
   230 --- 632
   230 --- 841
   231 --- 432
-  231 x--> 570
+  231 x--> 583
   231 --- 697
   231 --- 902
   232 --- 405
-  232 x--> 567
+  232 x--> 575
   232 --- 668
   232 --- 880
   233 --- 481
-  233 x--> 577
+  233 x--> 565
   233 --- 741
   233 --- 951
   234 --- 462
-  234 x--> 574
+  234 x--> 577
   234 --- 722
   234 --- 930
   235 --- 452
-  235 x--> 573
+  235 x--> 582
   235 --- 719
   235 --- 922
   236 --- 441
-  236 x--> 571
+  236 x--> 579
   236 --- 703
   236 --- 909
   258 --- 524
-  258 x--> 613
+  258 x--> 603
   258 --- 791
   258 --- 992
   259 --- 512
-  259 x--> 613
+  259 x--> 603
   259 --- 787
   259 --- 999
   260 --- 517
-  260 x--> 613
+  260 x--> 603
   260 --- 793
   260 --- 1001
   261 --- 525
-  261 x--> 613
+  261 x--> 603
   261 --- 790
   261 --- 996
   262 --- 520
-  262 x--> 613
+  262 x--> 603
   262 --- 781
   262 --- 997
   263 --- 516
-  263 x--> 613
+  263 x--> 603
   263 --- 789
   263 --- 994
   264 --- 521
-  264 x--> 613
+  264 x--> 603
   264 --- 788
   264 --- 995
   265 --- 519
-  265 x--> 613
+  265 x--> 603
   265 --- 786
   265 --- 986
   266 --- 522
-  266 x--> 613
+  266 x--> 603
   266 --- 778
   266 --- 993
   267 --- 527
-  267 x--> 613
+  267 x--> 603
   267 --- 783
   267 --- 1000
   268 --- 514
-  268 x--> 613
+  268 x--> 603
   268 --- 779
   268 --- 988
   269 --- 526
-  269 x--> 613
+  269 x--> 603
   269 --- 785
   269 --- 987
   270 --- 518
-  270 x--> 613
+  270 x--> 603
   270 --- 784
   270 --- 991
   271 --- 515
-  271 x--> 613
+  271 x--> 603
   271 --- 780
   271 --- 990
   272 --- 513
-  272 x--> 613
+  272 x--> 603
   272 --- 782
   272 --- 998
   273 --- 523
-  273 x--> 613
+  273 x--> 603
   273 --- 792
   273 --- 989
   274 --- 500
-  274 x--> 610
+  274 x--> 614
   274 --- 768
   274 --- 973
   275 --- 391
-  275 x--> 593
+  275 x--> 594
   275 --- 655
   275 --- 866
   276 --- 499
-  276 x--> 610
+  276 x--> 614
   276 --- 766
   276 --- 976
   277 --- 392
-  277 x--> 593
+  277 x--> 594
   277 --- 657
   277 --- 864
   278 --- 389
-  278 x--> 593
+  278 x--> 594
   278 --- 658
   278 --- 865
   279 --- 501
-  279 x--> 610
+  279 x--> 614
   279 --- 765
   279 --- 975
   280 --- 390
-  280 x--> 593
+  280 x--> 594
   280 --- 656
   280 --- 863
   281 --- 502
-  281 x--> 610
+  281 x--> 614
   281 --- 767
   281 --- 974
   282 --- 471
-  282 x--> 606
+  282 x--> 597
   282 --- 737
   282 --- 947
   283 --- 443
-  283 x--> 602
+  283 x--> 599
   283 --- 712
   283 --- 918
   284 --- 444
-  284 x--> 602
+  284 x--> 599
   284 --- 709
   284 --- 917
   285 --- 474
-  285 x--> 606
+  285 x--> 597
   285 --- 738
   285 --- 946
   286 --- 446
-  286 x--> 602
+  286 x--> 599
   286 --- 710
   286 --- 919
   287 --- 473
-  287 x--> 606
+  287 x--> 597
   287 --- 739
   287 --- 945
   288 --- 445
-  288 x--> 602
+  288 x--> 599
   288 --- 711
   288 --- 920
   289 --- 472
-  289 x--> 606
+  289 x--> 597
   289 --- 740
   289 --- 948
   321 --- 385
   321 --- 386
   321 --- 387
   321 --- 388
-  321 --- 564
-  321 --- 592
+  321 --- 561
+  321 --- 589
   321 --- 651
   321 --- 652
   321 --- 653
@@ -2272,19 +2272,19 @@ flowchart LR
   321 --- 861
   321 --- 862
   322 --- 384
-  322 --- 591
+  322 --- 595
   322 --- 650
   322 --- 858
   323 --- 409
-  323 --- 596
+  323 --- 588
   323 --- 675
   323 --- 883
   324 --- 434
-  324 --- 600
+  324 --- 617
   324 --- 700
   324 --- 908
   325 --- 503
-  325 --- 611
+  325 --- 612
   325 --- 769
   325 --- 977
   326 --- 352
@@ -2295,8 +2295,8 @@ flowchart LR
   326 --- 357
   326 --- 358
   326 --- 359
-  326 --- 560
-  326 --- 587
+  326 --- 573
+  326 --- 602
   326 --- 618
   326 --- 619
   326 --- 620
@@ -2321,8 +2321,8 @@ flowchart LR
   327 --- 365
   327 --- 366
   327 --- 367
-  327 --- 561
-  327 --- 588
+  327 --- 571
+  327 --- 600
   327 --- 626
   327 --- 627
   327 --- 628
@@ -2347,8 +2347,8 @@ flowchart LR
   328 --- 373
   328 --- 374
   328 --- 375
-  328 --- 562
-  328 --- 589
+  328 --- 578
+  328 --- 607
   328 --- 634
   328 --- 635
   328 --- 636
@@ -2373,8 +2373,8 @@ flowchart LR
   329 --- 381
   329 --- 382
   329 --- 383
-  329 --- 563
-  329 --- 590
+  329 --- 586
+  329 --- 616
   329 --- 642
   329 --- 643
   329 --- 644
@@ -2399,8 +2399,8 @@ flowchart LR
   330 --- 398
   330 --- 399
   330 --- 400
-  330 --- 566
-  330 --- 594
+  330 --- 580
+  330 --- 609
   330 --- 659
   330 --- 660
   330 --- 661
@@ -2425,8 +2425,8 @@ flowchart LR
   331 --- 406
   331 --- 407
   331 --- 408
-  331 --- 567
-  331 --- 595
+  331 --- 575
+  331 --- 604
   331 --- 667
   331 --- 668
   331 --- 669
@@ -2451,8 +2451,8 @@ flowchart LR
   332 --- 415
   332 --- 416
   332 --- 417
-  332 --- 568
-  332 --- 597
+  332 --- 564
+  332 --- 592
   332 --- 676
   332 --- 677
   332 --- 678
@@ -2477,8 +2477,8 @@ flowchart LR
   333 --- 423
   333 --- 424
   333 --- 425
-  333 --- 569
-  333 --- 598
+  333 --- 576
+  333 --- 605
   333 --- 684
   333 --- 685
   333 --- 686
@@ -2503,8 +2503,8 @@ flowchart LR
   334 --- 431
   334 --- 432
   334 --- 433
-  334 --- 570
-  334 --- 599
+  334 --- 583
+  334 --- 613
   334 --- 692
   334 --- 693
   334 --- 694
@@ -2529,8 +2529,8 @@ flowchart LR
   335 --- 440
   335 --- 441
   335 --- 442
-  335 --- 571
-  335 --- 601
+  335 --- 579
+  335 --- 608
   335 --- 701
   335 --- 702
   335 --- 703
@@ -2555,8 +2555,8 @@ flowchart LR
   336 --- 452
   336 --- 453
   336 --- 454
-  336 --- 573
-  336 --- 603
+  336 --- 582
+  336 --- 611
   336 --- 713
   336 --- 714
   336 --- 715
@@ -2581,8 +2581,8 @@ flowchart LR
   337 --- 460
   337 --- 461
   337 --- 462
-  337 --- 574
-  337 --- 604
+  337 --- 577
+  337 --- 606
   337 --- 721
   337 --- 722
   337 --- 723
@@ -2607,8 +2607,8 @@ flowchart LR
   338 --- 468
   338 --- 469
   338 --- 470
-  338 --- 575
-  338 --- 605
+  338 --- 572
+  338 --- 601
   338 --- 729
   338 --- 730
   338 --- 731
@@ -2633,8 +2633,8 @@ flowchart LR
   339 --- 480
   339 --- 481
   339 --- 482
-  339 --- 577
-  339 --- 607
+  339 --- 565
+  339 --- 593
   339 --- 741
   339 --- 742
   339 --- 743
@@ -2659,8 +2659,8 @@ flowchart LR
   340 --- 488
   340 --- 489
   340 --- 490
-  340 --- 578
-  340 --- 608
+  340 --- 563
+  340 --- 591
   340 --- 749
   340 --- 750
   340 --- 751
@@ -2685,8 +2685,8 @@ flowchart LR
   341 --- 496
   341 --- 497
   341 --- 498
-  341 --- 579
-  341 --- 609
+  341 --- 581
+  341 --- 610
   341 --- 757
   341 --- 758
   341 --- 759
@@ -2711,8 +2711,8 @@ flowchart LR
   342 --- 509
   342 --- 510
   342 --- 511
-  342 --- 581
-  342 --- 612
+  342 --- 567
+  342 --- 596
   342 --- 770
   342 --- 771
   342 --- 772
@@ -2737,8 +2737,8 @@ flowchart LR
   343 --- 533
   343 --- 534
   343 --- 535
-  343 --- 583
-  343 --- 614
+  343 --- 569
+  343 --- 598
   343 --- 794
   343 --- 795
   343 --- 796
@@ -2763,8 +2763,8 @@ flowchart LR
   344 --- 541
   344 --- 542
   344 --- 543
-  344 --- 584
-  344 --- 615
+  344 --- 562
+  344 --- 590
   344 --- 802
   344 --- 803
   344 --- 804
@@ -2790,7 +2790,7 @@ flowchart LR
   345 --- 550
   345 --- 551
   345 --- 585
-  345 --- 616
+  345 --- 615
   345 --- 810
   345 --- 811
   345 --- 812
@@ -2815,8 +2815,8 @@ flowchart LR
   346 --- 557
   346 --- 558
   346 --- 559
-  346 --- 586
-  346 --- 617
+  346 --- 560
+  346 --- 587
   346 --- 818
   346 --- 819
   346 --- 820
@@ -2849,8 +2849,8 @@ flowchart LR
   347 --- 525
   347 --- 526
   347 --- 527
-  347 --- 582
-  347 --- 613
+  347 --- 574
+  347 --- 603
   347 --- 778
   347 --- 779
   347 --- 780
@@ -2887,8 +2887,8 @@ flowchart LR
   348 --- 390
   348 --- 391
   348 --- 392
-  348 --- 565
-  348 --- 593
+  348 --- 566
+  348 --- 594
   348 --- 655
   348 --- 656
   348 --- 657
@@ -2901,8 +2901,8 @@ flowchart LR
   349 --- 500
   349 --- 501
   349 --- 502
-  349 --- 580
-  349 --- 610
+  349 --- 584
+  349 --- 614
   349 --- 765
   349 --- 766
   349 --- 767
@@ -2915,8 +2915,8 @@ flowchart LR
   350 --- 444
   350 --- 445
   350 --- 446
-  350 --- 572
-  350 --- 602
+  350 --- 570
+  350 --- 599
   350 --- 709
   350 --- 710
   350 --- 711
@@ -2929,8 +2929,8 @@ flowchart LR
   351 --- 472
   351 --- 473
   351 --- 474
-  351 --- 576
-  351 --- 606
+  351 --- 568
+  351 --- 597
   351 --- 737
   351 --- 738
   351 --- 739
@@ -3557,212 +3557,212 @@ flowchart LR
   824 <--x 559
   1029 <--x 559
   1032 <--x 559
-  655 <--x 565
-  656 <--x 565
-  657 <--x 565
-  658 <--x 565
-  709 <--x 572
-  710 <--x 572
-  711 <--x 572
-  712 <--x 572
-  737 <--x 576
-  738 <--x 576
-  739 <--x 576
-  740 <--x 576
-  765 <--x 580
-  766 <--x 580
-  767 <--x 580
-  768 <--x 580
-  778 <--x 582
-  779 <--x 582
-  780 <--x 582
-  781 <--x 582
-  782 <--x 582
-  783 <--x 582
-  784 <--x 582
-  785 <--x 582
-  786 <--x 582
-  787 <--x 582
-  788 <--x 582
-  789 <--x 582
-  790 <--x 582
-  791 <--x 582
-  792 <--x 582
-  793 <--x 582
-  618 <--x 587
-  619 <--x 587
-  620 <--x 587
-  621 <--x 587
-  622 <--x 587
-  623 <--x 587
-  624 <--x 587
-  625 <--x 587
-  626 <--x 588
-  627 <--x 588
-  628 <--x 588
-  629 <--x 588
-  630 <--x 588
-  631 <--x 588
-  632 <--x 588
-  633 <--x 588
-  634 <--x 589
-  635 <--x 589
-  636 <--x 589
-  637 <--x 589
-  638 <--x 589
-  639 <--x 589
-  640 <--x 589
-  641 <--x 589
-  642 <--x 590
-  643 <--x 590
-  644 <--x 590
-  645 <--x 590
-  646 <--x 590
-  647 <--x 590
-  648 <--x 590
-  649 <--x 590
-  650 <--x 591
-  651 <--x 592
-  654 <--x 592
-  659 <--x 594
-  660 <--x 594
-  661 <--x 594
-  662 <--x 594
-  663 <--x 594
-  664 <--x 594
-  665 <--x 594
-  666 <--x 594
-  667 <--x 595
-  668 <--x 595
-  669 <--x 595
-  670 <--x 595
-  671 <--x 595
-  672 <--x 595
-  673 <--x 595
-  674 <--x 595
-  675 <--x 596
-  676 <--x 597
-  677 <--x 597
-  678 <--x 597
-  679 <--x 597
-  680 <--x 597
-  681 <--x 597
-  682 <--x 597
-  683 <--x 597
-  684 <--x 598
-  685 <--x 598
-  686 <--x 598
-  687 <--x 598
-  688 <--x 598
-  689 <--x 598
-  690 <--x 598
-  691 <--x 598
-  692 <--x 599
-  693 <--x 599
-  694 <--x 599
-  695 <--x 599
-  696 <--x 599
-  697 <--x 599
-  698 <--x 599
-  699 <--x 599
-  700 <--x 600
-  701 <--x 601
-  702 <--x 601
-  703 <--x 601
-  704 <--x 601
-  705 <--x 601
-  706 <--x 601
-  707 <--x 601
-  708 <--x 601
-  713 <--x 603
-  714 <--x 603
-  715 <--x 603
-  716 <--x 603
-  717 <--x 603
-  718 <--x 603
-  719 <--x 603
-  720 <--x 603
-  721 <--x 604
-  722 <--x 604
-  723 <--x 604
-  724 <--x 604
-  725 <--x 604
-  726 <--x 604
-  727 <--x 604
-  728 <--x 604
-  729 <--x 605
-  730 <--x 605
-  731 <--x 605
-  732 <--x 605
-  733 <--x 605
-  734 <--x 605
-  735 <--x 605
-  736 <--x 605
-  741 <--x 607
-  742 <--x 607
-  743 <--x 607
-  744 <--x 607
-  745 <--x 607
-  746 <--x 607
-  747 <--x 607
-  748 <--x 607
-  749 <--x 608
-  750 <--x 608
-  751 <--x 608
-  752 <--x 608
-  753 <--x 608
-  754 <--x 608
-  755 <--x 608
-  756 <--x 608
-  757 <--x 609
-  758 <--x 609
-  759 <--x 609
-  760 <--x 609
-  761 <--x 609
-  762 <--x 609
-  763 <--x 609
-  764 <--x 609
-  769 <--x 611
-  770 <--x 612
-  771 <--x 612
-  772 <--x 612
-  773 <--x 612
-  774 <--x 612
-  775 <--x 612
-  776 <--x 612
-  777 <--x 612
-  794 <--x 614
-  795 <--x 614
-  796 <--x 614
-  797 <--x 614
-  798 <--x 614
-  799 <--x 614
-  800 <--x 614
-  801 <--x 614
-  802 <--x 615
-  803 <--x 615
-  804 <--x 615
-  805 <--x 615
-  806 <--x 615
-  807 <--x 615
-  808 <--x 615
-  809 <--x 615
-  810 <--x 616
-  811 <--x 616
-  812 <--x 616
-  813 <--x 616
-  814 <--x 616
-  815 <--x 616
-  816 <--x 616
-  817 <--x 616
-  818 <--x 617
-  819 <--x 617
-  820 <--x 617
-  821 <--x 617
-  822 <--x 617
-  823 <--x 617
-  824 <--x 617
-  825 <--x 617
+  655 <--x 566
+  656 <--x 566
+  657 <--x 566
+  658 <--x 566
+  737 <--x 568
+  738 <--x 568
+  739 <--x 568
+  740 <--x 568
+  709 <--x 570
+  710 <--x 570
+  711 <--x 570
+  712 <--x 570
+  778 <--x 574
+  779 <--x 574
+  780 <--x 574
+  781 <--x 574
+  782 <--x 574
+  783 <--x 574
+  784 <--x 574
+  785 <--x 574
+  786 <--x 574
+  787 <--x 574
+  788 <--x 574
+  789 <--x 574
+  790 <--x 574
+  791 <--x 574
+  792 <--x 574
+  793 <--x 574
+  765 <--x 584
+  766 <--x 584
+  767 <--x 584
+  768 <--x 584
+  818 <--x 587
+  819 <--x 587
+  820 <--x 587
+  821 <--x 587
+  822 <--x 587
+  823 <--x 587
+  824 <--x 587
+  825 <--x 587
+  675 <--x 588
+  651 <--x 589
+  654 <--x 589
+  802 <--x 590
+  803 <--x 590
+  804 <--x 590
+  805 <--x 590
+  806 <--x 590
+  807 <--x 590
+  808 <--x 590
+  809 <--x 590
+  749 <--x 591
+  750 <--x 591
+  751 <--x 591
+  752 <--x 591
+  753 <--x 591
+  754 <--x 591
+  755 <--x 591
+  756 <--x 591
+  676 <--x 592
+  677 <--x 592
+  678 <--x 592
+  679 <--x 592
+  680 <--x 592
+  681 <--x 592
+  682 <--x 592
+  683 <--x 592
+  741 <--x 593
+  742 <--x 593
+  743 <--x 593
+  744 <--x 593
+  745 <--x 593
+  746 <--x 593
+  747 <--x 593
+  748 <--x 593
+  650 <--x 595
+  770 <--x 596
+  771 <--x 596
+  772 <--x 596
+  773 <--x 596
+  774 <--x 596
+  775 <--x 596
+  776 <--x 596
+  777 <--x 596
+  794 <--x 598
+  795 <--x 598
+  796 <--x 598
+  797 <--x 598
+  798 <--x 598
+  799 <--x 598
+  800 <--x 598
+  801 <--x 598
+  626 <--x 600
+  627 <--x 600
+  628 <--x 600
+  629 <--x 600
+  630 <--x 600
+  631 <--x 600
+  632 <--x 600
+  633 <--x 600
+  729 <--x 601
+  730 <--x 601
+  731 <--x 601
+  732 <--x 601
+  733 <--x 601
+  734 <--x 601
+  735 <--x 601
+  736 <--x 601
+  618 <--x 602
+  619 <--x 602
+  620 <--x 602
+  621 <--x 602
+  622 <--x 602
+  623 <--x 602
+  624 <--x 602
+  625 <--x 602
+  667 <--x 604
+  668 <--x 604
+  669 <--x 604
+  670 <--x 604
+  671 <--x 604
+  672 <--x 604
+  673 <--x 604
+  674 <--x 604
+  684 <--x 605
+  685 <--x 605
+  686 <--x 605
+  687 <--x 605
+  688 <--x 605
+  689 <--x 605
+  690 <--x 605
+  691 <--x 605
+  721 <--x 606
+  722 <--x 606
+  723 <--x 606
+  724 <--x 606
+  725 <--x 606
+  726 <--x 606
+  727 <--x 606
+  728 <--x 606
+  634 <--x 607
+  635 <--x 607
+  636 <--x 607
+  637 <--x 607
+  638 <--x 607
+  639 <--x 607
+  640 <--x 607
+  641 <--x 607
+  701 <--x 608
+  702 <--x 608
+  703 <--x 608
+  704 <--x 608
+  705 <--x 608
+  706 <--x 608
+  707 <--x 608
+  708 <--x 608
+  659 <--x 609
+  660 <--x 609
+  661 <--x 609
+  662 <--x 609
+  663 <--x 609
+  664 <--x 609
+  665 <--x 609
+  666 <--x 609
+  757 <--x 610
+  758 <--x 610
+  759 <--x 610
+  760 <--x 610
+  761 <--x 610
+  762 <--x 610
+  763 <--x 610
+  764 <--x 610
+  713 <--x 611
+  714 <--x 611
+  715 <--x 611
+  716 <--x 611
+  717 <--x 611
+  718 <--x 611
+  719 <--x 611
+  720 <--x 611
+  769 <--x 612
+  692 <--x 613
+  693 <--x 613
+  694 <--x 613
+  695 <--x 613
+  696 <--x 613
+  697 <--x 613
+  698 <--x 613
+  699 <--x 613
+  810 <--x 615
+  811 <--x 615
+  812 <--x 615
+  813 <--x 615
+  814 <--x 615
+  815 <--x 615
+  816 <--x 615
+  817 <--x 615
+  642 <--x 616
+  643 <--x 616
+  644 <--x 616
+  645 <--x 616
+  646 <--x 616
+  647 <--x 616
+  648 <--x 616
+  649 <--x 616
+  700 <--x 617
   652 <--x 1034
   653 <--x 1036
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/kitt/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/kitt/artifact_graph_flowchart.snap.md
index 5ac02450f..cf1e35820 100644
--- a/rust/kcl-lib/tests/kcl_samples/kitt/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/kitt/artifact_graph_flowchart.snap.md
@@ -1103,45 +1103,45 @@ flowchart LR
   2 --- 86
   3 --- 85
   438 x--> 4
-  635 x--> 5
+  626 x--> 5
   438 x--> 6
-  616 x--> 7
+  618 x--> 7
   438 x--> 8
-  635 x--> 9
+  626 x--> 9
   438 x--> 10
-  614 x--> 11
+  615 x--> 11
   439 x--> 12
   438 x--> 13
   438 x--> 14
-  616 x--> 15
+  618 x--> 15
   438 x--> 16
   601 x--> 17
   601 x--> 18
-  635 x--> 19
+  626 x--> 19
   601 x--> 20
-  612 x--> 21
+  616 x--> 21
   601 x--> 22
-  626 x--> 23
-  621 x--> 24
-  635 x--> 25
+  614 x--> 23
+  633 x--> 24
+  626 x--> 25
   438 x--> 26
-  637 x--> 27
+  623 x--> 27
   601 x--> 28
   439 x--> 29
   601 x--> 30
-  622 x--> 31
-  630 x--> 32
+  620 x--> 31
+  632 x--> 32
   438 x--> 33
-  635 x--> 34
+  626 x--> 34
   601 x--> 35
-  632 x--> 36
-  635 x--> 37
-  619 x--> 38
-  616 x--> 39
+  613 x--> 36
+  626 x--> 37
+  636 x--> 38
+  618 x--> 39
   601 x--> 40
   601 x--> 41
   438 x--> 42
-  635 x--> 43
+  626 x--> 43
   44 --- 93
   44 --- 153
   44 --- 187
@@ -1149,7 +1149,7 @@ flowchart LR
   44 --- 248
   44 --- 319
   44 ---- 367
-  635 --- 44
+  626 --- 44
   45 --- 91
   45 --- 161
   45 --- 188
@@ -1157,7 +1157,7 @@ flowchart LR
   45 --- 244
   45 --- 320
   45 ---- 364
-  614 --- 45
+  615 --- 45
   46 --- 110
   46 --- 159
   46 --- 164
@@ -1165,7 +1165,7 @@ flowchart LR
   46 --- 265
   46 --- 321
   46 ---- 379
-  612 --- 46
+  616 --- 46
   47 --- 106
   47 --- 158
   47 --- 170
@@ -1189,7 +1189,7 @@ flowchart LR
   49 --- 272
   49 --- 324
   49 ---- 371
-  616 --- 49
+  618 --- 49
   50 --- 89
   50 --- 145
   50 --- 178
@@ -1197,7 +1197,7 @@ flowchart LR
   50 --- 271
   50 --- 325
   50 ---- 374
-  635 --- 50
+  626 --- 50
   51 --- 96
   51 --- 160
   51 --- 180
@@ -1221,7 +1221,7 @@ flowchart LR
   53 --- 262
   53 --- 328
   53 ---- 387
-  619 --- 53
+  636 --- 53
   54 --- 119
   54 --- 157
   54 --- 177
@@ -1261,7 +1261,7 @@ flowchart LR
   58 --- 267
   58 --- 333
   58 ---- 361
-  621 --- 58
+  633 --- 58
   59 --- 109
   59 --- 132
   59 --- 163
@@ -1269,7 +1269,7 @@ flowchart LR
   59 --- 259
   59 --- 334
   59 ---- 395
-  616 --- 59
+  618 --- 59
   60 --- 94
   60 --- 162
   60 --- 174
@@ -1285,7 +1285,7 @@ flowchart LR
   61 --- 250
   61 --- 336
   61 ---- 390
-  635 --- 61
+  626 --- 61
   62 --- 88
   62 --- 143
   62 --- 186
@@ -1293,7 +1293,7 @@ flowchart LR
   62 --- 257
   62 --- 337
   62 ---- 363
-  635 --- 62
+  626 --- 62
   63 --- 112
   63 --- 151
   63 --- 183
@@ -1301,7 +1301,7 @@ flowchart LR
   63 --- 240
   63 --- 339
   63 ---- 368
-  635 --- 63
+  626 --- 63
   64 --- 115
   64 --- 146
   64 --- 167
@@ -1309,7 +1309,7 @@ flowchart LR
   64 --- 255
   64 --- 340
   64 ---- 396
-  622 --- 64
+  620 --- 64
   65 --- 124
   65 --- 147
   65 --- 182
@@ -1317,7 +1317,7 @@ flowchart LR
   65 --- 273
   65 --- 341
   65 ---- 388
-  632 --- 65
+  613 --- 65
   66 --- 87
   66 --- 138
   66 --- 175
@@ -1333,7 +1333,7 @@ flowchart LR
   67 --- 260
   67 --- 344
   67 ---- 366
-  626 --- 67
+  614 --- 67
   68 --- 97
   68 --- 142
   68 --- 193
@@ -1349,7 +1349,7 @@ flowchart LR
   69 --- 252
   69 --- 346
   69 ---- 381
-  635 --- 69
+  626 --- 69
   70 --- 123
   70 --- 156
   70 --- 199
@@ -1365,7 +1365,7 @@ flowchart LR
   71 --- 270
   71 --- 349
   71 ---- 397
-  616 --- 71
+  618 --- 71
   72 --- 108
   72 --- 133
   72 --- 192
@@ -1397,7 +1397,7 @@ flowchart LR
   75 --- 258
   75 --- 354
   75 ---- 372
-  635 --- 75
+  626 --- 75
   76 --- 118
   76 --- 130
   76 --- 185
@@ -1437,7 +1437,7 @@ flowchart LR
   80 --- 241
   80 --- 359
   80 ---- 385
-  630 --- 80
+  632 --- 80
   81 --- 105
   81 --- 148
   81 --- 166
@@ -1468,7 +1468,7 @@ flowchart LR
   83 --- 294
   83 --- 318
   83 ---- 400
-  637 --- 83
+  623 --- 83
   84 --- 295
   84 --- 296
   84 --- 297
@@ -1504,11 +1504,11 @@ flowchart LR
   87 --- 750
   87 --- 939
   88 --- 412
-  88 x--> 635
+  88 x--> 626
   88 --- 646
   88 --- 836
   89 --- 477
-  89 x--> 635
+  89 x--> 626
   89 --- 711
   89 --- 900
   90 --- 568
@@ -1516,15 +1516,15 @@ flowchart LR
   90 --- 804
   90 --- 992
   91 --- 416
-  91 x--> 614
+  91 x--> 615
   91 --- 653
   91 --- 840
   92 --- 453
-  92 x--> 635
+  92 x--> 626
   92 --- 686
   92 --- 874
   93 --- 428
-  93 x--> 635
+  93 x--> 626
   93 --- 663
   93 --- 852
   94 --- 524
@@ -1532,7 +1532,7 @@ flowchart LR
   94 --- 761
   94 --- 946
   95 --- 521
-  95 x--> 630
+  95 x--> 632
   95 --- 754
   95 --- 943
   96 --- 500
@@ -1544,7 +1544,7 @@ flowchart LR
   97 --- 770
   97 --- 960
   98 --- 542
-  98 x--> 635
+  98 x--> 626
   98 --- 777
   98 --- 962
   99 x--> 438
@@ -1560,11 +1560,11 @@ flowchart LR
   101 --- 714
   101 --- 904
   102 --- 448
-  102 x--> 616
+  102 x--> 618
   102 --- 683
   102 --- 870
   103 --- 426
-  103 x--> 626
+  103 x--> 614
   103 --- 659
   103 --- 849
   104 x--> 438
@@ -1588,11 +1588,11 @@ flowchart LR
   108 --- 779
   108 --- 968
   109 --- 578
-  109 x--> 616
+  109 x--> 618
   109 --- 811
   109 --- 1001
   110 --- 497
-  110 x--> 612
+  110 x--> 616
   110 --- 730
   110 --- 919
   111 --- 572
@@ -1600,7 +1600,7 @@ flowchart LR
   111 --- 809
   111 --- 995
   112 --- 434
-  112 x--> 635
+  112 x--> 626
   112 --- 667
   112 --- 854
   113 --- 509
@@ -1612,11 +1612,11 @@ flowchart LR
   114 --- 655
   114 --- 844
   115 --- 582
-  115 x--> 622
+  115 x--> 620
   115 --- 817
   115 --- 1004
   116 --- 529
-  116 x--> 619
+  116 x--> 636
   116 --- 764
   116 --- 952
   117 x--> 438
@@ -1632,15 +1632,15 @@ flowchart LR
   119 --- 725
   119 --- 913
   120 --- 587
-  120 x--> 616
+  120 x--> 618
   120 --- 820
   120 --- 1008
   121 --- 507
-  121 x--> 635
+  121 x--> 626
   121 --- 739
   121 --- 926
   122 --- 406
-  122 x--> 621
+  122 x--> 633
   122 --- 641
   122 --- 826
   123 x--> 439
@@ -1648,7 +1648,7 @@ flowchart LR
   123 --- 785
   123 --- 970
   124 --- 535
-  124 x--> 632
+  124 x--> 613
   124 --- 769
   124 --- 956
   125 x--> 438
@@ -1664,11 +1664,11 @@ flowchart LR
   127 --- 726
   127 --- 914
   128 --- 404
-  128 x--> 621
+  128 x--> 633
   128 --- 639
   128 --- 829
   129 --- 504
-  129 x--> 635
+  129 x--> 626
   129 --- 741
   129 --- 929
   130 --- 441
@@ -1680,7 +1680,7 @@ flowchart LR
   131 --- 654
   131 --- 845
   132 --- 577
-  132 x--> 616
+  132 x--> 618
   132 --- 810
   132 --- 998
   133 x--> 438
@@ -1688,19 +1688,19 @@ flowchart LR
   133 --- 780
   133 --- 967
   134 --- 520
-  134 x--> 630
+  134 x--> 632
   134 --- 755
   134 --- 942
   135 --- 452
-  135 x--> 635
+  135 x--> 626
   135 --- 689
   135 --- 875
   136 --- 424
-  136 x--> 626
+  136 x--> 614
   136 --- 661
   136 --- 847
   137 --- 541
-  137 x--> 635
+  137 x--> 626
   137 --- 775
   137 --- 964
   138 x--> 438
@@ -1724,23 +1724,23 @@ flowchart LR
   142 --- 771
   142 --- 961
   143 --- 413
-  143 x--> 635
+  143 x--> 626
   143 --- 648
   143 --- 835
   144 --- 585
-  144 x--> 616
+  144 x--> 618
   144 --- 819
   144 --- 1006
   145 --- 479
-  145 x--> 635
+  145 x--> 626
   145 --- 710
   145 --- 901
   146 --- 581
-  146 x--> 622
+  146 x--> 620
   146 --- 814
   146 --- 1005
   147 --- 534
-  147 x--> 632
+  147 x--> 613
   147 --- 766
   147 --- 954
   148 x--> 438
@@ -1752,11 +1752,11 @@ flowchart LR
   149 --- 806
   149 --- 994
   150 --- 450
-  150 x--> 616
+  150 x--> 618
   150 --- 684
   150 --- 873
   151 --- 435
-  151 x--> 635
+  151 x--> 626
   151 --- 668
   151 --- 857
   152 --- 510
@@ -1764,7 +1764,7 @@ flowchart LR
   152 --- 742
   152 --- 932
   153 --- 431
-  153 x--> 635
+  153 x--> 626
   153 --- 662
   153 --- 850
   154 --- 571
@@ -1772,7 +1772,7 @@ flowchart LR
   154 --- 805
   154 --- 993
   155 --- 530
-  155 x--> 619
+  155 x--> 636
   155 --- 765
   155 --- 951
   156 x--> 439
@@ -1788,7 +1788,7 @@ flowchart LR
   158 --- 747
   158 --- 935
   159 --- 499
-  159 x--> 612
+  159 x--> 616
   159 --- 733
   159 --- 918
   160 --- 503
@@ -1796,7 +1796,7 @@ flowchart LR
   160 --- 734
   160 --- 924
   161 --- 419
-  161 x--> 614
+  161 x--> 615
   161 --- 650
   161 --- 841
   162 --- 527
@@ -1804,11 +1804,11 @@ flowchart LR
   162 --- 760
   162 --- 948
   163 --- 576
-  163 x--> 616
+  163 x--> 618
   163 --- 812
   163 --- 999
   164 --- 496
-  164 x--> 612
+  164 x--> 616
   164 --- 732
   164 --- 920
   165 x--> 439
@@ -1820,11 +1820,11 @@ flowchart LR
   166 --- 697
   166 --- 884
   167 --- 580
-  167 x--> 622
+  167 x--> 620
   167 --- 815
   167 --- 1003
   168 --- 454
-  168 x--> 635
+  168 x--> 626
   168 --- 688
   168 --- 876
   169 --- 569
@@ -1844,7 +1844,7 @@ flowchart LR
   172 --- 718
   172 --- 907
   173 --- 584
-  173 x--> 616
+  173 x--> 618
   173 --- 818
   173 --- 1007
   174 --- 526
@@ -1856,7 +1856,7 @@ flowchart LR
   175 --- 753
   175 --- 940
   176 --- 427
-  176 x--> 626
+  176 x--> 614
   176 --- 658
   176 --- 846
   177 x--> 438
@@ -1864,11 +1864,11 @@ flowchart LR
   177 --- 722
   177 --- 911
   178 --- 478
-  178 x--> 635
+  178 x--> 626
   178 --- 713
   178 --- 898
   179 --- 506
-  179 x--> 635
+  179 x--> 626
   179 --- 738
   179 --- 928
   180 --- 502
@@ -1876,15 +1876,15 @@ flowchart LR
   180 --- 736
   180 --- 923
   181 --- 522
-  181 x--> 630
+  181 x--> 632
   181 --- 756
   181 --- 945
   182 --- 532
-  182 x--> 632
+  182 x--> 613
   182 --- 768
   182 --- 957
   183 --- 433
-  183 x--> 635
+  183 x--> 626
   183 --- 669
   183 --- 855
   184 x--> 438
@@ -1896,19 +1896,19 @@ flowchart LR
   185 --- 675
   185 --- 863
   186 --- 415
-  186 x--> 635
+  186 x--> 626
   186 --- 647
   186 --- 834
   187 --- 430
-  187 x--> 635
+  187 x--> 626
   187 --- 665
   187 --- 853
   188 --- 418
-  188 x--> 614
+  188 x--> 615
   188 --- 652
   188 --- 839
   189 --- 543
-  189 x--> 635
+  189 x--> 626
   189 --- 776
   189 --- 965
   190 x--> 438
@@ -1928,7 +1928,7 @@ flowchart LR
   193 --- 772
   193 --- 958
   194 --- 531
-  194 x--> 619
+  194 x--> 636
   194 --- 762
   194 --- 950
   195 --- 411
@@ -1936,11 +1936,11 @@ flowchart LR
   195 --- 642
   195 --- 830
   196 --- 451
-  196 x--> 616
+  196 x--> 618
   196 --- 685
   196 --- 872
   197 --- 407
-  197 x--> 621
+  197 x--> 633
   197 --- 638
   197 --- 828
   198 --- 483
@@ -1956,7 +1956,7 @@ flowchart LR
   200 --- 808
   200 --- 997
   201 --- 476
-  201 x--> 635
+  201 x--> 626
   201 --- 712
   201 --- 899
   202 --- 440
@@ -1976,7 +1976,7 @@ flowchart LR
   205 --- 645
   205 --- 831
   206 --- 405
-  206 x--> 621
+  206 x--> 633
   206 --- 640
   206 --- 827
   207 x--> 438
@@ -1984,7 +1984,7 @@ flowchart LR
   207 --- 781
   207 --- 969
   208 --- 540
-  208 x--> 635
+  208 x--> 626
   208 --- 774
   208 --- 963
   209 x--> 438
@@ -1996,7 +1996,7 @@ flowchart LR
   210 --- 783
   210 --- 972
   211 --- 455
-  211 x--> 635
+  211 x--> 626
   211 --- 687
   211 --- 877
   212 x--> 439
@@ -2008,7 +2008,7 @@ flowchart LR
   213 --- 802
   213 --- 991
   214 --- 505
-  214 x--> 635
+  214 x--> 626
   214 --- 740
   214 --- 927
   215 --- 525
@@ -2016,15 +2016,15 @@ flowchart LR
   215 --- 758
   215 --- 947
   216 --- 432
-  216 x--> 635
+  216 x--> 626
   216 --- 666
   216 --- 856
   217 --- 425
-  217 x--> 626
+  217 x--> 614
   217 --- 660
   217 --- 848
   218 --- 528
-  218 x--> 619
+  218 x--> 636
   218 --- 763
   218 --- 953
   219 x--> 438
@@ -2048,27 +2048,27 @@ flowchart LR
   223 --- 746
   223 --- 934
   224 --- 586
-  224 x--> 616
+  224 x--> 618
   224 --- 821
   224 --- 1009
   225 --- 449
-  225 x--> 616
+  225 x--> 618
   225 --- 682
   225 --- 871
   226 --- 414
-  226 x--> 635
+  226 x--> 626
   226 --- 649
   226 --- 837
   227 --- 533
-  227 x--> 632
+  227 x--> 613
   227 --- 767
   227 --- 955
   228 --- 429
-  228 x--> 635
+  228 x--> 626
   228 --- 664
   228 --- 851
   229 --- 417
-  229 x--> 614
+  229 x--> 615
   229 --- 651
   229 --- 838
   230 x--> 438
@@ -2080,11 +2080,11 @@ flowchart LR
   231 --- 678
   231 --- 866
   232 --- 498
-  232 x--> 612
+  232 x--> 616
   232 --- 731
   232 --- 921
   233 --- 579
-  233 x--> 616
+  233 x--> 618
   233 --- 813
   233 --- 1000
   234 --- 482
@@ -2092,7 +2092,7 @@ flowchart LR
   234 --- 716
   234 --- 903
   235 --- 523
-  235 x--> 630
+  235 x--> 632
   235 --- 757
   235 --- 944
   236 --- 574
@@ -2104,71 +2104,71 @@ flowchart LR
   237 --- 657
   237 --- 842
   238 --- 583
-  238 x--> 622
+  238 x--> 620
   238 --- 816
   238 --- 1002
   277 --- 437
-  277 x--> 596
+  277 x--> 597
   277 --- 671
   277 --- 858
   278 --- 439
-  278 x--> 596
+  278 x--> 597
   278 --- 672
   278 --- 860
   279 --- 438
-  279 x--> 596
+  279 x--> 597
   279 --- 673
   279 --- 859
   280 --- 436
-  280 x--> 596
+  280 x--> 597
   280 --- 670
   280 --- 861
   282 --- 473
-  282 x--> 637
+  282 x--> 623
   282 --- 705
   282 --- 889
   283 --- 474
-  283 x--> 637
+  283 x--> 623
   283 --- 707
   283 --- 897
   284 --- 475
-  284 x--> 637
+  284 x--> 623
   284 --- 701
   284 --- 894
   285 --- 464
-  285 x--> 637
+  285 x--> 623
   285 --- 706
   285 --- 887
   286 --- 465
-  286 x--> 637
+  286 x--> 623
   286 --- 699
   286 --- 888
   287 --- 466
-  287 x--> 637
+  287 x--> 623
   287 --- 702
   287 --- 895
   288 --- 471
-  288 x--> 637
+  288 x--> 623
   288 --- 703
   288 --- 893
   289 --- 470
-  289 x--> 637
+  289 x--> 623
   289 --- 704
   289 --- 886
   290 --- 469
-  290 x--> 637
+  290 x--> 623
   290 --- 709
   290 --- 896
   291 --- 472
-  291 x--> 637
+  291 x--> 623
   291 --- 698
   291 --- 891
   292 --- 468
-  292 x--> 637
+  292 x--> 623
   292 --- 708
   292 --- 890
   293 --- 467
-  293 x--> 637
+  293 x--> 623
   293 --- 700
   293 --- 892
   295 --- 556
@@ -2220,42 +2220,42 @@ flowchart LR
   306 --- 794
   306 --- 985
   308 --- 564
-  308 x--> 610
+  308 x--> 594
   308 --- 801
   308 --- 989
   309 --- 459
-  309 x--> 599
+  309 x--> 611
   309 --- 690
   309 --- 881
   310 --- 458
-  310 x--> 599
+  310 x--> 611
   310 --- 691
   310 --- 879
   311 --- 566
-  311 x--> 610
+  311 x--> 594
   311 --- 798
   311 --- 988
   312 --- 457
-  312 x--> 599
+  312 x--> 611
   312 --- 693
   312 --- 878
   313 --- 567
-  313 x--> 610
+  313 x--> 594
   313 --- 799
   313 --- 987
   314 --- 565
-  314 x--> 610
+  314 x--> 594
   314 --- 800
   314 --- 986
   315 --- 456
-  315 x--> 599
+  315 x--> 611
   315 --- 692
   315 --- 880
   361 --- 404
   361 --- 405
   361 --- 406
   361 --- 407
-  361 --- 612
+  361 --- 616
   361 --- 638
   361 --- 639
   361 --- 640
@@ -2268,7 +2268,7 @@ flowchart LR
   362 --- 409
   362 --- 410
   362 --- 411
-  362 --- 592
+  362 --- 604
   362 --- 642
   362 --- 643
   362 --- 644
@@ -2281,7 +2281,7 @@ flowchart LR
   363 --- 413
   363 --- 414
   363 --- 415
-  363 --- 593
+  363 --- 603
   363 --- 646
   363 --- 647
   363 --- 648
@@ -2294,7 +2294,7 @@ flowchart LR
   364 --- 417
   364 --- 418
   364 --- 419
-  364 --- 613
+  364 --- 622
   364 --- 650
   364 --- 651
   364 --- 652
@@ -2307,7 +2307,7 @@ flowchart LR
   365 --- 421
   365 --- 422
   365 --- 423
-  365 --- 594
+  365 --- 593
   365 --- 654
   365 --- 655
   365 --- 656
@@ -2320,7 +2320,7 @@ flowchart LR
   366 --- 425
   366 --- 426
   366 --- 427
-  366 --- 614
+  366 --- 615
   366 --- 658
   366 --- 659
   366 --- 660
@@ -2333,7 +2333,7 @@ flowchart LR
   367 --- 429
   367 --- 430
   367 --- 431
-  367 --- 615
+  367 --- 630
   367 --- 662
   367 --- 663
   367 --- 664
@@ -2346,7 +2346,7 @@ flowchart LR
   368 --- 433
   368 --- 434
   368 --- 435
-  368 --- 595
+  368 --- 600
   368 --- 666
   368 --- 667
   368 --- 668
@@ -2359,7 +2359,7 @@ flowchart LR
   369 --- 441
   369 --- 442
   369 --- 443
-  369 --- 617
+  369 --- 612
   369 --- 674
   369 --- 675
   369 --- 676
@@ -2372,7 +2372,7 @@ flowchart LR
   370 --- 445
   370 --- 446
   370 --- 447
-  370 --- 597
+  370 --- 610
   370 --- 678
   370 --- 679
   370 --- 680
@@ -2385,7 +2385,7 @@ flowchart LR
   371 --- 449
   371 --- 450
   371 --- 451
-  371 --- 618
+  371 --- 627
   371 --- 682
   371 --- 683
   371 --- 684
@@ -2411,7 +2411,7 @@ flowchart LR
   373 --- 461
   373 --- 462
   373 --- 463
-  373 --- 600
+  373 --- 607
   373 --- 694
   373 --- 695
   373 --- 696
@@ -2424,7 +2424,7 @@ flowchart LR
   374 --- 477
   374 --- 478
   374 --- 479
-  374 --- 602
+  374 --- 605
   374 --- 710
   374 --- 711
   374 --- 712
@@ -2437,7 +2437,7 @@ flowchart LR
   375 --- 481
   375 --- 482
   375 --- 483
-  375 --- 620
+  375 --- 634
   375 --- 714
   375 --- 715
   375 --- 716
@@ -2450,7 +2450,7 @@ flowchart LR
   376 --- 485
   376 --- 486
   376 --- 487
-  376 --- 603
+  376 --- 609
   376 --- 718
   376 --- 719
   376 --- 720
@@ -2463,7 +2463,7 @@ flowchart LR
   377 --- 489
   377 --- 490
   377 --- 491
-  377 --- 604
+  377 --- 595
   377 --- 722
   377 --- 723
   377 --- 724
@@ -2476,7 +2476,7 @@ flowchart LR
   378 --- 493
   378 --- 494
   378 --- 495
-  378 --- 621
+  378 --- 633
   378 --- 726
   378 --- 727
   378 --- 728
@@ -2489,7 +2489,7 @@ flowchart LR
   379 --- 497
   379 --- 498
   379 --- 499
-  379 --- 622
+  379 --- 620
   379 --- 730
   379 --- 731
   379 --- 732
@@ -2502,7 +2502,7 @@ flowchart LR
   380 --- 501
   380 --- 502
   380 --- 503
-  380 --- 623
+  380 --- 621
   380 --- 734
   380 --- 735
   380 --- 736
@@ -2515,7 +2515,7 @@ flowchart LR
   381 --- 505
   381 --- 506
   381 --- 507
-  381 --- 605
+  381 --- 596
   381 --- 738
   381 --- 739
   381 --- 740
@@ -2528,7 +2528,7 @@ flowchart LR
   382 --- 509
   382 --- 510
   382 --- 511
-  382 --- 624
+  382 --- 628
   382 --- 742
   382 --- 743
   382 --- 744
@@ -2541,7 +2541,7 @@ flowchart LR
   383 --- 513
   383 --- 514
   383 --- 515
-  383 --- 625
+  383 --- 629
   383 --- 746
   383 --- 747
   383 --- 748
@@ -2554,7 +2554,7 @@ flowchart LR
   384 --- 517
   384 --- 518
   384 --- 519
-  384 --- 606
+  384 --- 599
   384 --- 750
   384 --- 751
   384 --- 752
@@ -2567,7 +2567,7 @@ flowchart LR
   385 --- 521
   385 --- 522
   385 --- 523
-  385 --- 626
+  385 --- 614
   385 --- 754
   385 --- 755
   385 --- 756
@@ -2580,7 +2580,7 @@ flowchart LR
   386 --- 525
   386 --- 526
   386 --- 527
-  386 --- 627
+  386 --- 635
   386 --- 758
   386 --- 759
   386 --- 760
@@ -2593,7 +2593,7 @@ flowchart LR
   387 --- 529
   387 --- 530
   387 --- 531
-  387 --- 628
+  387 --- 625
   387 --- 762
   387 --- 763
   387 --- 764
@@ -2606,7 +2606,7 @@ flowchart LR
   388 --- 533
   388 --- 534
   388 --- 535
-  388 --- 629
+  388 --- 624
   388 --- 766
   388 --- 767
   388 --- 768
@@ -2619,7 +2619,7 @@ flowchart LR
   389 --- 537
   389 --- 538
   389 --- 539
-  389 --- 607
+  389 --- 608
   389 --- 770
   389 --- 771
   389 --- 772
@@ -2632,7 +2632,7 @@ flowchart LR
   390 --- 541
   390 --- 542
   390 --- 543
-  390 --- 608
+  390 --- 606
   390 --- 774
   390 --- 775
   390 --- 776
@@ -2645,7 +2645,7 @@ flowchart LR
   391 --- 545
   391 --- 546
   391 --- 547
-  391 --- 609
+  391 --- 602
   391 --- 778
   391 --- 779
   391 --- 780
@@ -2658,7 +2658,7 @@ flowchart LR
   392 --- 549
   392 --- 550
   392 --- 551
-  392 --- 630
+  392 --- 632
   392 --- 782
   392 --- 783
   392 --- 784
@@ -2671,7 +2671,7 @@ flowchart LR
   393 --- 569
   393 --- 570
   393 --- 571
-  393 --- 633
+  393 --- 619
   393 --- 802
   393 --- 803
   393 --- 804
@@ -2684,7 +2684,7 @@ flowchart LR
   394 --- 573
   394 --- 574
   394 --- 575
-  394 --- 634
+  394 --- 617
   394 --- 806
   394 --- 807
   394 --- 808
@@ -2697,7 +2697,7 @@ flowchart LR
   395 --- 577
   395 --- 578
   395 --- 579
-  395 --- 635
+  395 --- 626
   395 --- 810
   395 --- 811
   395 --- 812
@@ -2710,7 +2710,7 @@ flowchart LR
   396 --- 581
   396 --- 582
   396 --- 583
-  396 --- 636
+  396 --- 631
   396 --- 814
   396 --- 815
   396 --- 816
@@ -2723,7 +2723,7 @@ flowchart LR
   397 --- 585
   397 --- 586
   397 --- 587
-  397 --- 637
+  397 --- 623
   397 --- 818
   397 --- 819
   397 --- 820
@@ -2736,7 +2736,7 @@ flowchart LR
   398 --- 589
   398 --- 590
   398 --- 591
-  398 --- 611
+  398 --- 592
   398 --- 822
   398 --- 823
   398 --- 824
@@ -2749,8 +2749,8 @@ flowchart LR
   399 --- 437
   399 --- 438
   399 --- 439
-  399 --- 596
-  399 --- 616
+  399 --- 597
+  399 --- 618
   399 --- 670
   399 --- 671
   399 --- 672
@@ -2808,7 +2808,7 @@ flowchart LR
   401 --- 561
   401 --- 562
   401 --- 563
-  401 --- 631
+  401 --- 637
   401 --- 786
   401 --- 787
   401 --- 788
@@ -2837,8 +2837,8 @@ flowchart LR
   402 --- 457
   402 --- 458
   402 --- 459
-  402 --- 599
-  402 --- 619
+  402 --- 611
+  402 --- 636
   402 --- 690
   402 --- 691
   402 --- 692
@@ -2851,8 +2851,8 @@ flowchart LR
   403 --- 565
   403 --- 566
   403 --- 567
-  403 --- 610
-  403 --- 632
+  403 --- 594
+  403 --- 613
   403 --- 798
   403 --- 799
   403 --- 800
@@ -3425,34 +3425,34 @@ flowchart LR
   824 <--x 591
   1010 <--x 591
   1012 <--x 591
-  642 <--x 592
-  643 <--x 592
-  644 <--x 592
-  645 <--x 592
-  646 <--x 593
-  647 <--x 593
-  648 <--x 593
-  649 <--x 593
-  654 <--x 594
-  655 <--x 594
-  656 <--x 594
-  657 <--x 594
-  666 <--x 595
-  667 <--x 595
-  668 <--x 595
-  669 <--x 595
-  678 <--x 597
-  679 <--x 597
-  680 <--x 597
-  681 <--x 597
+  822 <--x 592
+  823 <--x 592
+  824 <--x 592
+  825 <--x 592
+  654 <--x 593
+  655 <--x 593
+  656 <--x 593
+  657 <--x 593
+  722 <--x 595
+  723 <--x 595
+  724 <--x 595
+  725 <--x 595
+  738 <--x 596
+  739 <--x 596
+  740 <--x 596
+  741 <--x 596
   686 <--x 598
   687 <--x 598
   688 <--x 598
   689 <--x 598
-  694 <--x 600
-  695 <--x 600
-  696 <--x 600
-  697 <--x 600
+  750 <--x 599
+  751 <--x 599
+  752 <--x 599
+  753 <--x 599
+  666 <--x 600
+  667 <--x 600
+  668 <--x 600
+  669 <--x 600
   698 <--x 601
   699 <--x 601
   700 <--x 601
@@ -3465,152 +3465,152 @@ flowchart LR
   707 <--x 601
   708 <--x 601
   709 <--x 601
-  710 <--x 602
-  711 <--x 602
-  712 <--x 602
-  713 <--x 602
-  718 <--x 603
-  719 <--x 603
-  720 <--x 603
-  721 <--x 603
-  722 <--x 604
-  723 <--x 604
-  724 <--x 604
-  725 <--x 604
-  738 <--x 605
-  739 <--x 605
-  740 <--x 605
-  741 <--x 605
-  750 <--x 606
-  751 <--x 606
-  752 <--x 606
-  753 <--x 606
-  770 <--x 607
-  771 <--x 607
-  772 <--x 607
-  773 <--x 607
-  774 <--x 608
-  775 <--x 608
-  776 <--x 608
-  777 <--x 608
-  778 <--x 609
-  779 <--x 609
-  780 <--x 609
-  781 <--x 609
-  822 <--x 611
-  823 <--x 611
-  824 <--x 611
-  825 <--x 611
-  638 <--x 612
-  639 <--x 612
-  640 <--x 612
-  641 <--x 612
-  650 <--x 613
-  651 <--x 613
-  652 <--x 613
-  653 <--x 613
-  658 <--x 614
-  659 <--x 614
-  660 <--x 614
-  661 <--x 614
-  662 <--x 615
-  663 <--x 615
-  664 <--x 615
-  665 <--x 615
-  670 <--x 616
-  671 <--x 616
-  672 <--x 616
-  673 <--x 616
-  674 <--x 617
-  675 <--x 617
-  676 <--x 617
-  677 <--x 617
-  682 <--x 618
-  683 <--x 618
-  684 <--x 618
-  685 <--x 618
-  690 <--x 619
-  691 <--x 619
-  692 <--x 619
-  693 <--x 619
-  714 <--x 620
-  715 <--x 620
-  716 <--x 620
-  717 <--x 620
-  726 <--x 621
-  727 <--x 621
-  728 <--x 621
-  729 <--x 621
-  730 <--x 622
-  731 <--x 622
-  732 <--x 622
-  733 <--x 622
-  734 <--x 623
-  735 <--x 623
-  736 <--x 623
-  737 <--x 623
-  742 <--x 624
-  743 <--x 624
-  744 <--x 624
-  745 <--x 624
-  746 <--x 625
-  747 <--x 625
-  748 <--x 625
-  749 <--x 625
-  754 <--x 626
-  755 <--x 626
-  756 <--x 626
-  757 <--x 626
-  758 <--x 627
-  759 <--x 627
-  760 <--x 627
-  761 <--x 627
-  762 <--x 628
-  763 <--x 628
-  764 <--x 628
-  765 <--x 628
-  766 <--x 629
-  767 <--x 629
-  768 <--x 629
-  769 <--x 629
-  782 <--x 630
-  783 <--x 630
-  784 <--x 630
-  785 <--x 630
-  786 <--x 631
-  787 <--x 631
-  788 <--x 631
-  789 <--x 631
-  790 <--x 631
-  791 <--x 631
-  792 <--x 631
-  793 <--x 631
-  794 <--x 631
-  795 <--x 631
-  796 <--x 631
-  797 <--x 631
-  798 <--x 632
-  799 <--x 632
-  800 <--x 632
-  801 <--x 632
-  802 <--x 633
-  803 <--x 633
-  804 <--x 633
-  805 <--x 633
-  806 <--x 634
-  807 <--x 634
-  808 <--x 634
-  809 <--x 634
-  810 <--x 635
-  811 <--x 635
-  812 <--x 635
-  813 <--x 635
-  814 <--x 636
-  815 <--x 636
-  816 <--x 636
-  817 <--x 636
-  818 <--x 637
-  819 <--x 637
-  820 <--x 637
-  821 <--x 637
+  778 <--x 602
+  779 <--x 602
+  780 <--x 602
+  781 <--x 602
+  646 <--x 603
+  647 <--x 603
+  648 <--x 603
+  649 <--x 603
+  642 <--x 604
+  643 <--x 604
+  644 <--x 604
+  645 <--x 604
+  710 <--x 605
+  711 <--x 605
+  712 <--x 605
+  713 <--x 605
+  774 <--x 606
+  775 <--x 606
+  776 <--x 606
+  777 <--x 606
+  694 <--x 607
+  695 <--x 607
+  696 <--x 607
+  697 <--x 607
+  770 <--x 608
+  771 <--x 608
+  772 <--x 608
+  773 <--x 608
+  718 <--x 609
+  719 <--x 609
+  720 <--x 609
+  721 <--x 609
+  678 <--x 610
+  679 <--x 610
+  680 <--x 610
+  681 <--x 610
+  674 <--x 612
+  675 <--x 612
+  676 <--x 612
+  677 <--x 612
+  798 <--x 613
+  799 <--x 613
+  800 <--x 613
+  801 <--x 613
+  754 <--x 614
+  755 <--x 614
+  756 <--x 614
+  757 <--x 614
+  658 <--x 615
+  659 <--x 615
+  660 <--x 615
+  661 <--x 615
+  638 <--x 616
+  639 <--x 616
+  640 <--x 616
+  641 <--x 616
+  806 <--x 617
+  807 <--x 617
+  808 <--x 617
+  809 <--x 617
+  670 <--x 618
+  671 <--x 618
+  672 <--x 618
+  673 <--x 618
+  802 <--x 619
+  803 <--x 619
+  804 <--x 619
+  805 <--x 619
+  730 <--x 620
+  731 <--x 620
+  732 <--x 620
+  733 <--x 620
+  734 <--x 621
+  735 <--x 621
+  736 <--x 621
+  737 <--x 621
+  650 <--x 622
+  651 <--x 622
+  652 <--x 622
+  653 <--x 622
+  818 <--x 623
+  819 <--x 623
+  820 <--x 623
+  821 <--x 623
+  766 <--x 624
+  767 <--x 624
+  768 <--x 624
+  769 <--x 624
+  762 <--x 625
+  763 <--x 625
+  764 <--x 625
+  765 <--x 625
+  810 <--x 626
+  811 <--x 626
+  812 <--x 626
+  813 <--x 626
+  682 <--x 627
+  683 <--x 627
+  684 <--x 627
+  685 <--x 627
+  742 <--x 628
+  743 <--x 628
+  744 <--x 628
+  745 <--x 628
+  746 <--x 629
+  747 <--x 629
+  748 <--x 629
+  749 <--x 629
+  662 <--x 630
+  663 <--x 630
+  664 <--x 630
+  665 <--x 630
+  814 <--x 631
+  815 <--x 631
+  816 <--x 631
+  817 <--x 631
+  782 <--x 632
+  783 <--x 632
+  784 <--x 632
+  785 <--x 632
+  726 <--x 633
+  727 <--x 633
+  728 <--x 633
+  729 <--x 633
+  714 <--x 634
+  715 <--x 634
+  716 <--x 634
+  717 <--x 634
+  758 <--x 635
+  759 <--x 635
+  760 <--x 635
+  761 <--x 635
+  690 <--x 636
+  691 <--x 636
+  692 <--x 636
+  693 <--x 636
+  786 <--x 637
+  787 <--x 637
+  788 <--x 637
+  789 <--x 637
+  790 <--x 637
+  791 <--x 637
+  792 <--x 637
+  793 <--x 637
+  794 <--x 637
+  795 <--x 637
+  796 <--x 637
+  797 <--x 637
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/lego/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/lego/artifact_graph_flowchart.snap.md
index e33cbd57c..c942e3f52 100644
--- a/rust/kcl-lib/tests/kcl_samples/lego/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/lego/artifact_graph_flowchart.snap.md
@@ -76,9 +76,9 @@ flowchart LR
   66["SweepEdge Adjacent"]
   67["SweepEdge Adjacent"]
   1 --- 5
-  45 x--> 2
-  44 x--> 3
-  43 x--> 4
+  47 x--> 2
+  43 x--> 3
+  44 x--> 4
   5 --- 9
   5 --- 10
   5 --- 11
@@ -91,61 +91,61 @@ flowchart LR
   6 --- 16
   6 --- 19
   6 ---- 24
-  43 --- 6
+  44 --- 6
   7 --- 17
   7 --- 21
   7 ---- 30
-  45 --- 7
+  47 --- 7
   8 --- 18
   8 --- 22
   8 ---- 31
-  44 --- 8
+  43 --- 8
   9 --- 36
-  9 x--> 43
+  9 x--> 44
   9 --- 49
   9 --- 58
   10 --- 34
-  10 x--> 43
+  10 x--> 44
   10 --- 48
   10 --- 61
   11 --- 33
-  11 x--> 43
+  11 x--> 44
   11 --- 51
   11 --- 60
   12 --- 35
-  12 x--> 43
+  12 x--> 44
   12 --- 50
   12 --- 59
   13 --- 39
-  13 x--> 43
+  13 x--> 44
   13 --- 53
   13 --- 62
   14 --- 40
-  14 x--> 43
+  14 x--> 44
   14 --- 52
   14 --- 64
   15 --- 38
-  15 x--> 43
+  15 x--> 44
   15 --- 55
   15 --- 63
   16 --- 37
-  16 x--> 43
+  16 x--> 44
   16 --- 54
   16 --- 65
   17 --- 42
-  17 x--> 45
+  17 x--> 47
   17 --- 57
   17 --- 67
   18 --- 41
-  18 x--> 44
+  18 x--> 43
   18 --- 56
   18 --- 66
   23 --- 33
   23 --- 34
   23 --- 35
   23 --- 36
-  23 --- 43
-  23 --- 45
+  23 --- 44
+  23 --- 47
   23 --- 48
   23 --- 49
   23 --- 50
@@ -158,7 +158,7 @@ flowchart LR
   24 --- 38
   24 --- 39
   24 --- 40
-  24 --- 44
+  24 --- 43
   24 --- 52
   24 --- 53
   24 --- 54
@@ -168,11 +168,11 @@ flowchart LR
   24 --- 64
   24 --- 65
   30 --- 42
-  30 --- 47
+  30 --- 46
   30 --- 57
   30 --- 67
   31 --- 41
-  31 --- 46
+  31 --- 45
   31 --- 56
   31 --- 66
   51 <--x 33
@@ -203,14 +203,14 @@ flowchart LR
   66 <--x 41
   57 <--x 42
   67 <--x 42
-  52 <--x 44
-  53 <--x 44
-  54 <--x 44
-  55 <--x 44
-  48 <--x 45
-  49 <--x 45
-  50 <--x 45
-  51 <--x 45
-  56 <--x 46
-  57 <--x 47
+  52 <--x 43
+  53 <--x 43
+  54 <--x 43
+  55 <--x 43
+  56 <--x 45
+  57 <--x 46
+  48 <--x 47
+  49 <--x 47
+  50 <--x 47
+  51 <--x 47
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/makeup-mirror/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/makeup-mirror/artifact_graph_flowchart.snap.md
index 812c25183..47ebd30d2 100644
--- a/rust/kcl-lib/tests/kcl_samples/makeup-mirror/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/makeup-mirror/artifact_graph_flowchart.snap.md
@@ -209,31 +209,31 @@ flowchart LR
   29 --- 55
   29 ---- 66
   30 --- 69
-  30 x--> 83
+  30 x--> 91
   30 --- 105
   30 --- 119
   31 --- 80
-  31 x--> 91
+  31 x--> 87
   31 --- 116
   31 --- 130
   32 --- 71
-  32 x--> 85
+  32 x--> 83
   32 --- 107
   32 --- 121
   33 --- 67
-  33 x--> 81
+  33 x--> 82
   33 --- 103
   33 --- 117
   34 --- 70
-  34 x--> 84
+  34 x--> 89
   34 --- 106
   34 --- 120
   35 --- 68
-  35 x--> 82
+  35 x--> 90
   35 --- 104
   35 --- 118
   36 --- 73
-  36 x--> 87
+  36 x--> 85
   36 --- 109
   36 --- 123
   37 --- 72
@@ -241,62 +241,62 @@ flowchart LR
   37 --- 108
   37 --- 122
   38 --- 75
-  38 x--> 89
+  38 x--> 81
   38 --- 111
   38 --- 125
   39 --- 74
-  39 x--> 88
+  39 x--> 84
   39 --- 110
   39 --- 124
   40 --- 76
-  40 x--> 90
+  40 x--> 88
   40 --- 115
   40 --- 128
   41 --- 78
-  41 x--> 90
+  41 x--> 88
   41 --- 112
   41 --- 129
   42 --- 79
-  42 x--> 90
+  42 x--> 88
   42 --- 113
   42 --- 127
   43 --- 77
-  43 x--> 90
+  43 x--> 88
   43 --- 114
   43 --- 126
   56 --- 67
-  56 --- 81
-  56 --- 92
+  56 --- 82
+  56 --- 93
   56 --- 103
   56 --- 117
   57 --- 68
-  57 --- 82
-  57 --- 93
+  57 --- 90
+  57 --- 101
   57 --- 104
   57 --- 118
   58 --- 69
-  58 --- 83
-  58 --- 94
+  58 --- 91
+  58 --- 102
   58 --- 105
   58 --- 119
   59 --- 70
-  59 --- 84
-  59 --- 95
+  59 --- 89
+  59 --- 100
   59 --- 106
   59 --- 120
   60 --- 71
-  60 --- 85
-  60 --- 96
+  60 --- 83
+  60 --- 94
   60 --- 107
   60 --- 121
   61 --- 73
-  61 --- 87
-  61 --- 98
+  61 --- 85
+  61 --- 96
   61 --- 109
   61 --- 123
   62 --- 80
-  62 --- 91
-  62 --- 102
+  62 --- 87
+  62 --- 98
   62 --- 116
   62 --- 130
   63 --- 72
@@ -305,21 +305,21 @@ flowchart LR
   63 --- 108
   63 --- 122
   64 --- 75
-  64 --- 89
-  64 --- 100
+  64 --- 81
+  64 --- 92
   64 --- 111
   64 --- 125
   65 --- 74
-  65 --- 88
-  65 --- 99
+  65 --- 84
+  65 --- 95
   65 --- 110
   65 --- 124
   66 --- 76
   66 --- 77
   66 --- 78
   66 --- 79
-  66 --- 90
-  66 --- 101
+  66 --- 88
+  66 --- 99
   66 --- 112
   66 --- 113
   66 --- 114
@@ -360,18 +360,18 @@ flowchart LR
   129 <--x 79
   116 <--x 80
   130 <--x 80
-  103 <--x 92
-  104 <--x 93
-  105 <--x 94
-  106 <--x 95
-  107 <--x 96
+  111 <--x 92
+  103 <--x 93
+  107 <--x 94
+  110 <--x 95
+  109 <--x 96
   108 <--x 97
-  109 <--x 98
-  110 <--x 99
-  111 <--x 100
-  112 <--x 101
-  113 <--x 101
-  114 <--x 101
-  115 <--x 101
-  116 <--x 102
+  116 <--x 98
+  112 <--x 99
+  113 <--x 99
+  114 <--x 99
+  115 <--x 99
+  106 <--x 100
+  104 <--x 101
+  105 <--x 102
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/multi-axis-robot/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/multi-axis-robot/artifact_graph_flowchart.snap.md
index e978e78b0..dd5813901 100644
--- a/rust/kcl-lib/tests/kcl_samples/multi-axis-robot/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/multi-axis-robot/artifact_graph_flowchart.snap.md
@@ -420,19 +420,19 @@ flowchart LR
   8 --- 37
   8 --- 102
   8 ---- 113
-  238 --- 8
+  232 --- 8
   9 --- 38
   9 --- 94
   9 ---- 114
-  239 --- 9
+  223 --- 9
   10 --- 39
   10 --- 89
   10 ---- 118
-  238 --- 10
+  232 --- 10
   11 --- 40
   11 --- 88
   11 ---- 122
-  238 --- 11
+  232 --- 11
   12 --- 41
   12 --- 110
   12 ---- 123
@@ -446,15 +446,15 @@ flowchart LR
   14 --- 47
   14 --- 90
   14 ---- 125
-  244 --- 14
+  241 --- 14
   15 --- 48
   15 --- 101
   15 ---- 126
-  227 --- 15
+  225 --- 15
   16 --- 49
   16 --- 95
   16 ---- 130
-  227 --- 16
+  225 --- 16
   17 --- 50
   17 --- 96
   17 ---- 131
@@ -468,23 +468,23 @@ flowchart LR
   19 --- 56
   19 --- 103
   19 ---- 133
-  220 --- 19
+  222 --- 19
   20 --- 57
   20 --- 100
   20 ---- 134
-  220 --- 20
+  222 --- 20
   21 --- 58
   21 --- 93
   21 ---- 142
-  237 --- 21
+  228 --- 21
   22 --- 59
   22 --- 106
   22 ---- 145
-  233 --- 22
+  244 --- 22
   23 --- 60
   23 --- 91
   23 ---- 147
-  243 --- 23
+  245 --- 23
   24 --- 61
   24 --- 62
   24 --- 63
@@ -495,23 +495,23 @@ flowchart LR
   25 --- 66
   25 --- 104
   25 ---- 149
-  234 --- 25
+  242 --- 25
   26 --- 67
   26 --- 108
   26 ---- 155
-  229 --- 26
+  239 --- 26
   27 --- 68
   27 --- 98
   27 ---- 158
-  216 --- 27
+  221 --- 27
   28 --- 69
   28 --- 105
   28 ---- 159
-  234 --- 28
+  242 --- 28
   29 --- 70
   29 --- 99
   29 ---- 160
-  212 --- 29
+  217 --- 29
   30 --- 71
   30 --- 72
   30 --- 73
@@ -522,7 +522,7 @@ flowchart LR
   30 --- 78
   30 --- 109
   30 ---- 161
-  217 --- 30
+  212 --- 30
   31 --- 79
   31 --- 80
   31 --- 81
@@ -533,209 +533,209 @@ flowchart LR
   31 --- 86
   31 --- 92
   31 ---- 162
-  217 --- 31
+  212 --- 31
   32 --- 195
-  32 x--> 219
+  32 x--> 214
   32 --- 280
   32 --- 328
   33 --- 196
-  33 x--> 219
+  33 x--> 214
   33 --- 278
   33 --- 326
   34 --- 197
-  34 x--> 219
+  34 x--> 214
   34 --- 277
   34 --- 327
   35 --- 194
-  35 x--> 219
+  35 x--> 214
   35 --- 279
   35 --- 329
   37 --- 198
-  37 x--> 238
+  37 x--> 232
   37 --- 281
   37 --- 330
   38 --- 165
-  38 x--> 239
+  38 x--> 223
   38 --- 248
   38 --- 297
   39 --- 168
-  39 x--> 238
+  39 x--> 232
   39 --- 251
   39 --- 300
   40 --- 210
-  40 x--> 238
+  40 x--> 232
   40 --- 293
   40 --- 342
   41 --- 171
-  41 x--> 214
+  41 x--> 216
   41 --- 254
   41 --- 303
   42 --- 209
-  42 x--> 221
+  42 x--> 220
   42 --- 292
   42 --- 339
   43 --- 208
-  43 x--> 221
+  43 x--> 220
   43 --- 291
   43 --- 340
   44 --- 207
-  44 x--> 221
+  44 x--> 220
   44 --- 290
   44 --- 338
   45 --- 206
-  45 x--> 221
+  45 x--> 220
   45 --- 289
   45 --- 341
   47 --- 167
-  47 x--> 244
+  47 x--> 241
   47 --- 250
   47 --- 299
   48 --- 163
-  48 x--> 227
+  48 x--> 225
   48 --- 246
   48 --- 295
   49 --- 169
-  49 x--> 227
+  49 x--> 225
   49 --- 252
   49 --- 301
   50 --- 211
-  50 x--> 245
+  50 x--> 234
   50 --- 294
   50 --- 343
   51 --- 203
-  51 x--> 243
+  51 x--> 245
   51 --- 287
   51 --- 335
   52 --- 202
-  52 x--> 243
+  52 x--> 245
   52 --- 285
   52 --- 337
   53 --- 204
-  53 x--> 243
+  53 x--> 245
   53 --- 288
   53 --- 336
   54 --- 205
-  54 x--> 243
+  54 x--> 245
   54 --- 286
   54 --- 334
   56 --- 193
-  56 x--> 220
+  56 x--> 222
   56 --- 276
   56 --- 325
   57 --- 180
-  57 x--> 220
+  57 x--> 222
   57 --- 263
   57 --- 312
   58 --- 201
-  58 x--> 237
+  58 x--> 228
   58 --- 284
   58 --- 333
   59 --- 179
-  59 x--> 233
+  59 x--> 244
   59 --- 262
   59 --- 311
   60 --- 199
-  60 x--> 243
+  60 x--> 245
   60 --- 282
   60 --- 331
   61 --- 182
-  61 x--> 216
+  61 x--> 221
   61 --- 267
   61 --- 314
   62 --- 183
-  62 x--> 216
+  62 x--> 221
   62 --- 265
   62 --- 316
   63 --- 184
-  63 x--> 216
+  63 x--> 221
   63 --- 266
   63 --- 315
   64 --- 181
-  64 x--> 216
+  64 x--> 221
   64 --- 264
   64 --- 313
   66 --- 170
-  66 x--> 234
+  66 x--> 242
   66 --- 253
   66 --- 302
   67 --- 200
-  67 x--> 229
+  67 x--> 239
   67 --- 283
   67 --- 332
   68 --- 166
-  68 x--> 226
+  68 x--> 231
   68 --- 249
   68 --- 298
   69 --- 164
-  69 x--> 224
+  69 x--> 236
   69 --- 247
   69 --- 296
   70 --- 185
-  70 x--> 235
+  70 x--> 227
   70 --- 268
   70 --- 317
   71 --- 187
-  71 x--> 236
+  71 x--> 238
   71 --- 275
   71 --- 323
   72 --- 192
-  72 x--> 236
+  72 x--> 238
   72 --- 270
   72 --- 322
   73 --- 186
-  73 x--> 236
+  73 x--> 238
   73 --- 273
   73 --- 321
   74 --- 188
-  74 x--> 236
+  74 x--> 238
   74 --- 269
   74 --- 318
   75 --- 189
-  75 x--> 236
+  75 x--> 238
   75 --- 271
   75 --- 320
   76 --- 191
-  76 x--> 236
+  76 x--> 238
   76 --- 274
   76 --- 324
   77 --- 190
-  77 x--> 236
+  77 x--> 238
   77 --- 272
   77 --- 319
   79 --- 174
-  79 x--> 231
+  79 x--> 237
   79 --- 258
   79 --- 308
   80 --- 176
-  80 x--> 231
+  80 x--> 237
   80 --- 261
   80 --- 306
   81 --- 172
-  81 x--> 231
+  81 x--> 237
   81 --- 255
   81 --- 307
   82 --- 175
-  82 x--> 231
+  82 x--> 237
   82 --- 256
   82 --- 304
   83 --- 173
-  83 x--> 231
+  83 x--> 237
   83 --- 257
   83 --- 310
   84 --- 177
-  84 x--> 231
+  84 x--> 237
   84 --- 260
   84 --- 305
   85 --- 178
-  85 x--> 231
+  85 x--> 237
   85 --- 259
   85 --- 309
   112 --- 194
   112 --- 195
   112 --- 196
   112 --- 197
-  112 --- 219
-  112 --- 238
+  112 --- 214
+  112 --- 232
   112 --- 277
   112 --- 278
   112 --- 279
@@ -745,11 +745,11 @@ flowchart LR
   112 --- 328
   112 --- 329
   113 --- 198
-  113 --- 239
+  113 --- 223
   113 --- 281
   113 --- 330
   114 --- 165
-  114 --- 225
+  114 --- 229
   114 --- 248
   114 --- 297
   118 --- 168
@@ -759,16 +759,16 @@ flowchart LR
   122 --- 293
   122 --- 342
   123 --- 171
-  123 --- 214
-  123 --- 230
+  123 --- 216
+  123 --- 235
   123 --- 254
   123 --- 303
   124 --- 206
   124 --- 207
   124 --- 208
   124 --- 209
-  124 --- 221
-  124 --- 244
+  124 --- 220
+  124 --- 241
   124 --- 289
   124 --- 290
   124 --- 291
@@ -778,28 +778,28 @@ flowchart LR
   124 --- 340
   124 --- 341
   125 --- 167
-  125 --- 227
+  125 --- 225
   125 --- 250
   125 --- 299
   126 --- 163
-  126 --- 223
+  126 --- 243
   126 --- 246
   126 --- 295
   130 --- 169
-  130 --- 228
+  130 --- 233
   130 --- 252
   130 --- 301
   131 --- 211
-  131 --- 222
-  131 --- 245
+  131 --- 215
+  131 --- 234
   131 --- 294
   131 --- 343
   132 --- 202
   132 --- 203
   132 --- 204
   132 --- 205
-  132 --- 220
-  132 --- 243
+  132 --- 222
+  132 --- 245
   132 --- 285
   132 --- 286
   132 --- 287
@@ -809,31 +809,31 @@ flowchart LR
   132 --- 336
   132 --- 337
   133 --- 193
-  133 --- 237
+  133 --- 228
   133 --- 276
   133 --- 325
   134 --- 180
-  134 --- 233
+  134 --- 244
   134 --- 263
   134 --- 312
   142 --- 201
-  142 --- 242
+  142 --- 226
   142 --- 284
   142 --- 333
   145 --- 179
-  145 --- 232
+  145 --- 230
   145 --- 262
   145 --- 311
   147 --- 199
-  147 --- 240
+  147 --- 224
   147 --- 282
   147 --- 331
   148 --- 181
   148 --- 182
   148 --- 183
   148 --- 184
-  148 --- 216
-  148 --- 234
+  148 --- 221
+  148 --- 242
   148 --- 264
   148 --- 265
   148 --- 266
@@ -843,26 +843,26 @@ flowchart LR
   148 --- 315
   148 --- 316
   149 --- 170
-  149 --- 229
+  149 --- 239
   149 --- 253
   149 --- 302
   155 --- 200
-  155 --- 241
+  155 --- 240
   155 --- 283
   155 --- 332
   158 --- 166
   158 --- 213
-  158 --- 226
+  158 --- 231
   158 --- 249
   158 --- 298
   159 --- 164
-  159 --- 212
-  159 --- 224
+  159 --- 217
+  159 --- 236
   159 --- 247
   159 --- 296
   160 --- 185
-  160 --- 217
-  160 --- 235
+  160 --- 212
+  160 --- 227
   160 --- 268
   160 --- 317
   161 --- 186
@@ -872,8 +872,8 @@ flowchart LR
   161 --- 190
   161 --- 191
   161 --- 192
-  161 --- 218
-  161 --- 236
+  161 --- 219
+  161 --- 238
   161 --- 269
   161 --- 270
   161 --- 271
@@ -895,8 +895,8 @@ flowchart LR
   162 --- 176
   162 --- 177
   162 --- 178
-  162 --- 215
-  162 --- 231
+  162 --- 218
+  162 --- 237
   162 --- 255
   162 --- 256
   162 --- 257
@@ -1024,48 +1024,48 @@ flowchart LR
   342 <--x 210
   294 <--x 211
   343 <--x 211
-  247 <--x 212
+  268 <--x 212
   249 <--x 213
-  255 <--x 215
-  256 <--x 215
-  257 <--x 215
-  258 <--x 215
-  259 <--x 215
-  260 <--x 215
-  261 <--x 215
-  268 <--x 217
-  269 <--x 218
-  270 <--x 218
-  271 <--x 218
-  272 <--x 218
-  273 <--x 218
-  274 <--x 218
-  275 <--x 218
-  251 <--x 219
-  293 <--x 219
-  285 <--x 220
-  286 <--x 220
-  287 <--x 220
-  288 <--x 220
-  294 <--x 222
-  246 <--x 223
-  248 <--x 225
-  262 <--x 232
-  264 <--x 234
-  265 <--x 234
-  266 <--x 234
-  267 <--x 234
-  277 <--x 238
-  278 <--x 238
-  279 <--x 238
-  280 <--x 238
-  282 <--x 240
-  283 <--x 241
-  284 <--x 242
-  289 <--x 244
-  290 <--x 244
-  291 <--x 244
-  292 <--x 244
+  251 <--x 214
+  293 <--x 214
+  294 <--x 215
+  247 <--x 217
+  255 <--x 218
+  256 <--x 218
+  257 <--x 218
+  258 <--x 218
+  259 <--x 218
+  260 <--x 218
+  261 <--x 218
+  269 <--x 219
+  270 <--x 219
+  271 <--x 219
+  272 <--x 219
+  273 <--x 219
+  274 <--x 219
+  275 <--x 219
+  285 <--x 222
+  286 <--x 222
+  287 <--x 222
+  288 <--x 222
+  282 <--x 224
+  284 <--x 226
+  248 <--x 229
+  262 <--x 230
+  277 <--x 232
+  278 <--x 232
+  279 <--x 232
+  280 <--x 232
+  283 <--x 240
+  289 <--x 241
+  290 <--x 241
+  291 <--x 241
+  292 <--x 241
+  264 <--x 242
+  265 <--x 242
+  266 <--x 242
+  267 <--x 242
+  246 <--x 243
   250 <--x 350
   252 <--x 351
   253 <--x 354
diff --git a/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/artifact_graph_flowchart.snap.md
index 71b21d328..b76c9006d 100644
--- a/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/parametric-bearing-pillow-block/artifact_graph_flowchart.snap.md
@@ -63,7 +63,7 @@ flowchart LR
   53["SweepEdge Adjacent"]
   1 --- 5
   39 x--> 2
-  37 x--> 3
+  38 x--> 3
   39 x--> 4
   5 --- 9
   5 --- 10
@@ -78,25 +78,25 @@ flowchart LR
   7 --- 14
   7 --- 17
   7 ---- 26
-  37 --- 7
+  38 --- 7
   8 --- 15
   8 --- 16
   8 ---- 29
   39 --- 8
   9 --- 34
-  9 x--> 37
+  9 x--> 38
   9 --- 42
   9 --- 48
   10 --- 32
-  10 x--> 37
+  10 x--> 38
   10 --- 41
   10 --- 51
   11 --- 31
-  11 x--> 37
+  11 x--> 38
   11 --- 44
   11 --- 50
   12 --- 33
-  12 x--> 37
+  12 x--> 38
   12 --- 43
   12 --- 49
   13 --- 35
@@ -104,7 +104,7 @@ flowchart LR
   13 --- 45
   13 --- 52
   14 --- 30
-  14 x--> 37
+  14 x--> 38
   14 --- 40
   14 --- 47
   15 --- 36
@@ -115,7 +115,7 @@ flowchart LR
   20 --- 32
   20 --- 33
   20 --- 34
-  20 --- 37
+  20 --- 38
   20 --- 39
   20 --- 41
   20 --- 42
@@ -126,7 +126,7 @@ flowchart LR
   20 --- 50
   20 --- 51
   23 --- 35
-  23 --- 38
+  23 --- 37
   23 --- 45
   23 --- 52
   26 --- 30
@@ -153,8 +153,8 @@ flowchart LR
   52 <--x 35
   46 <--x 36
   53 <--x 36
-  46 <--x 37
-  45 <--x 38
+  45 <--x 37
+  46 <--x 38
   41 <--x 39
   42 <--x 39
   43 <--x 39
diff --git a/rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/artifact_graph_flowchart.snap.md
index ba706f8ce..cdc7ed250 100644
--- a/rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/artifact_graph_flowchart.snap.md
@@ -295,17 +295,17 @@ flowchart LR
   8 --- 40
   9 --- 42
   10 --- 43
-  175 x--> 11
-  165 x--> 12
-  170 x--> 13
-  168 x--> 14
-  169 x--> 15
-  162 x--> 16
-  156 x--> 17
-  167 x--> 18
-  164 x--> 19
-  155 x--> 20
-  166 x--> 21
+  166 x--> 11
+  169 x--> 12
+  168 x--> 13
+  165 x--> 14
+  174 x--> 15
+  156 x--> 16
+  161 x--> 17
+  172 x--> 18
+  173 x--> 19
+  159 x--> 20
+  170 x--> 21
   171 x--> 22
   23 --- 46
   23 --- 93
@@ -313,7 +313,7 @@ flowchart LR
   24 --- 47
   24 --- 84
   24 ---- 103
-  174 --- 24
+  164 --- 24
   25 --- 48
   25 --- 88
   26 --- 49
@@ -327,34 +327,34 @@ flowchart LR
   29 --- 53
   29 --- 86
   29 ---- 107
-  155 --- 29
+  159 --- 29
   30 --- 52
   30 --- 99
   30 ---- 106
-  162 --- 30
+  156 --- 30
   31 --- 54
   31 --- 82
   31 ---- 109
-  166 --- 31
+  170 --- 31
   32 --- 55
   32 --- 95
   32 ---- 108
-  175 --- 32
+  166 --- 32
   33 --- 56
   33 --- 81
   33 ---- 110
-  169 --- 33
+  174 --- 33
   34 --- 57
   34 --- 98
   34 ---- 111
-  165 --- 34
+  169 --- 34
   35 --- 58
   35 --- 94
   35 ---- 112
   36 --- 59
   36 --- 101
   36 ---- 113
-  164 --- 36
+  173 --- 36
   37 --- 60
   37 --- 92
   37 ---- 114
@@ -366,11 +366,11 @@ flowchart LR
   38 --- 66
   38 --- 83
   38 ---- 115
-  156 --- 38
+  161 --- 38
   39 --- 67
   39 --- 96
   39 ---- 116
-  167 --- 39
+  172 --- 39
   40 --- 68
   40 --- 69
   40 --- 70
@@ -382,7 +382,7 @@ flowchart LR
   41 --- 74
   41 --- 97
   41 ---- 118
-  170 --- 41
+  168 --- 41
   42 --- 75
   42 --- 80
   42 ---- 120
@@ -392,126 +392,126 @@ flowchart LR
   44 --- 78
   44 --- 79
   44 ---- 121
-  168 --- 44
+  165 --- 44
   45 --- 77
   45 --- 89
   45 ---- 122
   171 --- 45
   46 --- 152
-  46 x--> 161
+  46 x--> 154
   46 --- 205
   46 --- 236
   47 --- 145
-  47 x--> 174
+  47 x--> 164
   47 --- 198
   47 --- 229
   50 --- 153
-  50 x--> 162
+  50 x--> 156
   50 --- 206
   50 --- 237
   51 --- 127
-  51 x--> 155
+  51 x--> 159
   51 --- 180
   51 --- 211
   52 --- 143
-  52 x--> 162
+  52 x--> 156
   52 --- 196
   52 --- 227
   53 --- 144
-  53 x--> 155
+  53 x--> 159
   53 --- 197
   53 --- 228
   54 --- 134
-  54 x--> 166
+  54 x--> 170
   54 --- 187
   54 --- 218
   55 --- 125
-  55 x--> 175
+  55 x--> 166
   55 --- 178
   55 --- 209
   56 --- 126
-  56 x--> 169
+  56 x--> 174
   56 --- 179
   56 --- 210
   57 --- 142
-  57 x--> 165
+  57 x--> 169
   57 --- 195
   57 --- 226
   58 --- 124
-  58 x--> 154
+  58 x--> 162
   58 --- 177
   58 --- 208
   59 --- 129
-  59 x--> 164
+  59 x--> 173
   59 --- 182
   59 --- 213
   60 --- 128
-  60 x--> 167
+  60 x--> 172
   60 --- 181
   60 --- 212
   60 --- 239
   61 --- 147
-  61 x--> 156
+  61 x--> 161
   61 --- 201
   61 --- 235
   62 --- 151
-  62 x--> 156
+  62 x--> 161
   62 --- 202
   62 --- 232
   63 --- 150
-  63 x--> 156
+  63 x--> 161
   63 --- 200
   63 --- 234
   64 --- 149
-  64 x--> 156
+  64 x--> 161
   64 --- 204
   64 --- 233
   65 --- 146
-  65 x--> 156
+  65 x--> 161
   65 --- 199
   65 --- 231
   66 --- 148
-  66 x--> 156
+  66 x--> 161
   66 --- 203
   66 --- 230
   67 --- 123
-  67 x--> 167
+  67 x--> 172
   67 --- 176
   67 --- 207
   68 --- 135
-  68 x--> 158
+  68 x--> 157
   68 --- 189
   68 --- 223
   69 --- 138
-  69 x--> 158
+  69 x--> 157
   69 --- 188
   69 --- 221
   70 --- 139
-  70 x--> 158
+  70 x--> 157
   70 --- 193
   70 --- 222
   71 --- 137
-  71 x--> 158
+  71 x--> 157
   71 --- 190
   71 --- 224
   72 --- 136
-  72 x--> 158
+  72 x--> 157
   72 --- 192
   72 --- 220
   73 --- 140
-  73 x--> 158
+  73 x--> 157
   73 --- 191
   73 --- 219
   74 --- 132
-  74 x--> 170
+  74 x--> 168
   74 --- 185
   74 --- 216
   75 --- 141
-  75 x--> 159
+  75 x--> 160
   75 --- 194
   75 --- 225
   76 --- 131
-  76 x--> 157
+  76 x--> 155
   76 --- 184
   76 --- 215
   77 --- 133
@@ -519,41 +519,41 @@ flowchart LR
   77 --- 186
   77 --- 217
   78 --- 130
-  78 x--> 168
+  78 x--> 165
   78 --- 183
   78 --- 214
   102 --- 152
-  102 --- 161
-  102 --- 174
+  102 --- 154
+  102 --- 164
   102 --- 205
   102 --- 236
   103 --- 145
   103 --- 198
   103 --- 229
   104 --- 127
-  104 --- 155
-  104 --- 166
+  104 --- 159
+  104 --- 170
   104 --- 180
   104 --- 211
   105 --- 153
-  105 --- 162
-  105 --- 175
+  105 --- 156
+  105 --- 166
   105 --- 206
   105 --- 237
   106 --- 143
-  106 --- 172
+  106 --- 163
   106 --- 196
   106 --- 227
   107 --- 144
-  107 --- 173
+  107 --- 167
   107 --- 197
   107 --- 228
   108 --- 125
-  108 --- 165
+  108 --- 169
   108 --- 178
   108 --- 209
   109 --- 134
-  109 --- 169
+  109 --- 174
   109 --- 187
   109 --- 218
   110 --- 126
@@ -563,16 +563,16 @@ flowchart LR
   111 --- 195
   111 --- 226
   112 --- 124
-  112 --- 154
-  112 --- 164
+  112 --- 162
+  112 --- 173
   112 --- 177
   112 --- 208
   113 --- 129
   113 --- 182
   113 --- 213
   114 --- 128
-  114 --- 156
-  114 --- 167
+  114 --- 161
+  114 --- 172
   114 --- 181
   114 --- 212
   115 --- 146
@@ -581,7 +581,7 @@ flowchart LR
   115 --- 149
   115 --- 150
   115 --- 151
-  115 --- 160
+  115 --- 158
   115 --- 199
   115 --- 200
   115 --- 201
@@ -595,7 +595,7 @@ flowchart LR
   115 --- 234
   115 --- 235
   116 --- 123
-  116 --- 163
+  116 --- 175
   116 --- 176
   116 --- 207
   117 --- 135
@@ -604,8 +604,8 @@ flowchart LR
   117 --- 138
   117 --- 139
   117 --- 140
-  117 --- 158
-  117 --- 170
+  117 --- 157
+  117 --- 168
   117 --- 188
   117 --- 189
   117 --- 190
@@ -622,12 +622,12 @@ flowchart LR
   118 --- 185
   118 --- 216
   119 --- 131
-  119 --- 157
-  119 --- 168
+  119 --- 155
+  119 --- 165
   119 --- 184
   119 --- 215
   120 --- 141
-  120 --- 159
+  120 --- 160
   120 --- 171
   120 --- 194
   120 --- 225
@@ -710,35 +710,35 @@ flowchart LR
   236 <--x 152
   206 <--x 153
   237 <--x 153
-  182 <--x 154
-  183 <--x 157
-  185 <--x 158
-  186 <--x 159
-  199 <--x 160
-  200 <--x 160
-  201 <--x 160
-  202 <--x 160
-  203 <--x 160
-  204 <--x 160
-  198 <--x 161
-  176 <--x 163
-  177 <--x 164
-  178 <--x 165
-  180 <--x 166
-  184 <--x 168
-  187 <--x 169
-  188 <--x 170
-  189 <--x 170
-  190 <--x 170
-  191 <--x 170
-  192 <--x 170
-  193 <--x 170
+  198 <--x 154
+  183 <--x 155
+  185 <--x 157
+  199 <--x 158
+  200 <--x 158
+  201 <--x 158
+  202 <--x 158
+  203 <--x 158
+  204 <--x 158
+  186 <--x 160
+  182 <--x 162
+  195 <--x 163
+  196 <--x 163
+  205 <--x 164
+  184 <--x 165
+  206 <--x 166
+  179 <--x 167
+  197 <--x 167
+  188 <--x 168
+  189 <--x 168
+  190 <--x 168
+  191 <--x 168
+  192 <--x 168
+  193 <--x 168
+  178 <--x 169
+  180 <--x 170
   194 <--x 171
-  195 <--x 172
-  196 <--x 172
-  179 <--x 173
-  197 <--x 173
-  205 <--x 174
-  206 <--x 175
+  177 <--x 173
+  187 <--x 174
+  176 <--x 175
   181 <--x 238
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/poopy-shoe/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/poopy-shoe/artifact_graph_flowchart.snap.md
index 72c750b54..5df7d7a6c 100644
--- a/rust/kcl-lib/tests/kcl_samples/poopy-shoe/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/poopy-shoe/artifact_graph_flowchart.snap.md
@@ -305,7 +305,7 @@ flowchart LR
   4 --- 13
   5 --- 16
   160 x--> 6
-  164 x--> 7
+  159 x--> 7
   97 x--> 8
   9 --- 17
   9 --- 18
@@ -378,7 +378,7 @@ flowchart LR
   15 --- 71
   15 --- 77
   15 ---- 90
-  164 --- 15
+  159 --- 15
   16 --- 72
   16 --- 73
   16 --- 74
@@ -386,107 +386,107 @@ flowchart LR
   16 --- 83
   16 ---- 91
   17 --- 104
-  17 x--> 152
+  17 x--> 154
   17 --- 183
   17 --- 234
   18 --- 103
-  18 x--> 152
+  18 x--> 154
   18 --- 176
   18 --- 238
   19 --- 105
-  19 x--> 152
+  19 x--> 154
   19 --- 182
   19 --- 233
   20 --- 101
-  20 x--> 152
+  20 x--> 154
   20 --- 177
   20 --- 235
   21 --- 100
-  21 x--> 152
+  21 x--> 154
   21 --- 175
   21 --- 241
   22 --- 107
-  22 x--> 152
+  22 x--> 154
   22 --- 181
   22 --- 240
   23 --- 109
-  23 x--> 152
+  23 x--> 154
   23 --- 173
   23 --- 237
   24 --- 108
-  24 x--> 152
+  24 x--> 154
   24 --- 180
   24 --- 243
   25 --- 98
-  25 x--> 152
+  25 x--> 154
   25 --- 178
   25 --- 242
   26 --- 99
-  26 x--> 152
+  26 x--> 154
   26 --- 179
   26 --- 231
   27 --- 110
-  27 x--> 152
+  27 x--> 154
   27 --- 172
   27 --- 239
   28 --- 106
-  28 x--> 152
+  28 x--> 154
   28 --- 184
   28 --- 232
   29 --- 102
-  29 x--> 152
+  29 x--> 154
   29 --- 174
   29 --- 236
   30 --- 118
-  30 x--> 153
+  30 x--> 152
   30 --- 195
   30 --- 254
   31 --- 117
-  31 x--> 153
+  31 x--> 152
   31 --- 192
   31 --- 253
   32 --- 113
-  32 x--> 153
+  32 x--> 152
   32 --- 196
   32 --- 246
   33 --- 114
-  33 x--> 153
+  33 x--> 152
   33 --- 186
   33 --- 250
   34 --- 112
-  34 x--> 153
+  34 x--> 152
   34 --- 190
   34 --- 247
   35 --- 122
-  35 x--> 153
+  35 x--> 152
   35 --- 191
   35 --- 248
   36 --- 115
-  36 x--> 153
+  36 x--> 152
   36 --- 197
   36 --- 244
   37 --- 121
-  37 x--> 153
+  37 x--> 152
   37 --- 188
   37 --- 256
   38 --- 123
-  38 x--> 153
+  38 x--> 152
   38 --- 187
   38 --- 249
   39 --- 119
-  39 x--> 153
+  39 x--> 152
   39 --- 189
   39 --- 255
   40 --- 111
-  40 x--> 153
+  40 x--> 152
   40 --- 185
   40 --- 251
   41 --- 116
-  41 x--> 153
+  41 x--> 152
   41 --- 193
   41 --- 245
   42 --- 120
-  42 x--> 153
+  42 x--> 152
   42 --- 194
   42 --- 252
   43 --- 148
@@ -502,123 +502,123 @@ flowchart LR
   45 --- 224
   45 --- 283
   46 --- 141
-  46 x--> 157
+  46 x--> 151
   46 --- 215
   46 --- 273
   47 --- 137
-  47 x--> 157
+  47 x--> 151
   47 --- 214
   47 --- 275
   48 --- 145
-  48 x--> 157
+  48 x--> 151
   48 --- 212
   48 --- 271
   49 --- 142
-  49 x--> 157
+  49 x--> 151
   49 --- 221
   49 --- 274
   50 --- 143
-  50 x--> 157
+  50 x--> 151
   50 --- 213
   50 --- 280
   51 --- 138
-  51 x--> 157
+  51 x--> 151
   51 --- 216
   51 --- 278
   52 --- 147
-  52 x--> 157
+  52 x--> 151
   52 --- 219
   52 --- 272
   53 --- 144
-  53 x--> 157
+  53 x--> 151
   53 --- 211
   53 --- 270
   54 --- 139
-  54 x--> 157
+  54 x--> 151
   54 --- 218
   54 --- 276
   55 --- 136
-  55 x--> 157
+  55 x--> 151
   55 --- 210
   55 --- 269
   56 --- 146
-  56 x--> 157
+  56 x--> 151
   56 --- 220
   56 --- 277
   57 --- 140
-  57 x--> 157
+  57 x--> 151
   57 --- 217
   57 --- 279
   58 --- 94
-  58 x--> 151
+  58 x--> 153
   58 --- 168
   58 --- 227
   59 --- 95
-  59 x--> 151
+  59 x--> 153
   59 --- 171
   59 --- 229
   60 --- 93
-  60 x--> 151
+  60 x--> 153
   60 --- 170
   60 --- 230
   61 --- 92
-  61 x--> 151
+  61 x--> 153
   61 --- 169
   61 --- 228
   62 --- 97
-  62 x--> 151
+  62 x--> 153
   62 --- 166
   62 --- 225
   63 --- 96
-  63 x--> 151
+  63 x--> 153
   63 --- 167
   63 --- 226
   64 --- 127
-  64 x--> 154
+  64 x--> 156
   64 --- 200
   64 --- 258
   65 --- 124
-  65 x--> 154
+  65 x--> 156
   65 --- 201
   65 --- 257
   66 --- 126
-  66 x--> 154
+  66 x--> 156
   66 --- 199
   66 --- 260
   67 --- 125
-  67 x--> 154
+  67 x--> 156
   67 --- 198
   67 --- 259
   68 --- 134
-  68 x--> 156
+  68 x--> 155
   68 --- 208
   68 --- 266
   69 --- 135
-  69 x--> 156
+  69 x--> 155
   69 --- 206
   69 --- 265
   70 --- 133
-  70 x--> 156
+  70 x--> 155
   70 --- 207
   70 --- 267
   71 --- 132
-  71 x--> 156
+  71 x--> 155
   71 --- 209
   71 --- 268
   72 --- 130
-  72 x--> 162
+  72 x--> 164
   72 --- 205
   72 --- 261
   73 --- 128
-  73 x--> 162
+  73 x--> 164
   73 --- 203
   73 --- 263
   74 --- 131
-  74 x--> 162
+  74 x--> 164
   74 --- 202
   74 --- 264
   75 --- 129
-  75 x--> 162
+  75 x--> 164
   75 --- 204
   75 --- 262
   84 --- 98
@@ -634,7 +634,7 @@ flowchart LR
   84 --- 108
   84 --- 109
   84 --- 110
-  84 --- 152
+  84 --- 154
   84 --- 172
   84 --- 173
   84 --- 174
@@ -674,7 +674,7 @@ flowchart LR
   85 --- 121
   85 --- 122
   85 --- 123
-  85 --- 153
+  85 --- 152
   85 --- 160
   85 --- 185
   85 --- 186
@@ -725,8 +725,8 @@ flowchart LR
   87 --- 145
   87 --- 146
   87 --- 147
-  87 --- 157
-  87 --- 164
+  87 --- 151
+  87 --- 159
   87 --- 210
   87 --- 211
   87 --- 212
@@ -757,8 +757,8 @@ flowchart LR
   88 --- 95
   88 --- 96
   88 --- 97
-  88 --- 151
-  88 --- 159
+  88 --- 153
+  88 --- 161
   88 --- 166
   88 --- 167
   88 --- 168
@@ -775,8 +775,8 @@ flowchart LR
   89 --- 125
   89 --- 126
   89 --- 127
-  89 --- 154
-  89 --- 161
+  89 --- 156
+  89 --- 163
   89 --- 198
   89 --- 199
   89 --- 200
@@ -789,8 +789,8 @@ flowchart LR
   90 --- 133
   90 --- 134
   90 --- 135
-  90 --- 156
-  90 --- 163
+  90 --- 155
+  90 --- 162
   90 --- 206
   90 --- 207
   90 --- 208
@@ -803,8 +803,8 @@ flowchart LR
   91 --- 129
   91 --- 130
   91 --- 131
-  91 --- 155
-  91 --- 162
+  91 --- 157
+  91 --- 164
   91 --- 202
   91 --- 203
   91 --- 204
@@ -990,16 +990,22 @@ flowchart LR
   222 <--x 150
   281 <--x 150
   282 <--x 150
-  202 <--x 155
-  203 <--x 155
-  204 <--x 155
-  205 <--x 155
-  166 <--x 159
-  167 <--x 159
-  168 <--x 159
-  169 <--x 159
-  170 <--x 159
-  171 <--x 159
+  202 <--x 157
+  203 <--x 157
+  204 <--x 157
+  205 <--x 157
+  210 <--x 159
+  211 <--x 159
+  212 <--x 159
+  213 <--x 159
+  214 <--x 159
+  215 <--x 159
+  216 <--x 159
+  217 <--x 159
+  218 <--x 159
+  219 <--x 159
+  220 <--x 159
+  221 <--x 159
   185 <--x 160
   186 <--x 160
   187 <--x 160
@@ -1013,26 +1019,20 @@ flowchart LR
   195 <--x 160
   196 <--x 160
   197 <--x 160
-  198 <--x 161
-  199 <--x 161
-  200 <--x 161
-  201 <--x 161
-  206 <--x 163
-  207 <--x 163
-  208 <--x 163
-  209 <--x 163
-  210 <--x 164
-  211 <--x 164
-  212 <--x 164
-  213 <--x 164
-  214 <--x 164
-  215 <--x 164
-  216 <--x 164
-  217 <--x 164
-  218 <--x 164
-  219 <--x 164
-  220 <--x 164
-  221 <--x 164
+  166 <--x 161
+  167 <--x 161
+  168 <--x 161
+  169 <--x 161
+  170 <--x 161
+  171 <--x 161
+  206 <--x 162
+  207 <--x 162
+  208 <--x 162
+  209 <--x 162
+  198 <--x 163
+  199 <--x 163
+  200 <--x 163
+  201 <--x 163
   222 <--x 165
   223 <--x 165
   224 <--x 165
diff --git a/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/artifact_graph_flowchart.snap.md
index 22de0fdaa..5f9db48b4 100644
--- a/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/router-template-cross-bar/artifact_graph_flowchart.snap.md
@@ -164,7 +164,7 @@ flowchart LR
   1 --- 5
   85 x--> 2
   85 x--> 3
-  90 x--> 4
+  88 x--> 4
   5 --- 9
   5 --- 10
   5 --- 11
@@ -211,7 +211,7 @@ flowchart LR
   8 --- 44
   8 --- 48
   8 ---- 52
-  90 --- 8
+  88 --- 8
   9 --- 71
   9 x--> 85
   9 --- 96
@@ -289,51 +289,51 @@ flowchart LR
   28 --- 114
   28 --- 130
   30 --- 78
-  30 x--> 86
+  30 x--> 84
   30 --- 118
   30 --- 146
   31 --- 77
-  31 x--> 86
+  31 x--> 84
   31 --- 116
   31 --- 149
   32 --- 79
-  32 x--> 86
+  32 x--> 84
   32 --- 115
   32 --- 147
   33 --- 76
-  33 x--> 86
+  33 x--> 84
   33 --- 117
   33 --- 148
   35 --- 83
-  35 x--> 87
+  35 x--> 86
   35 --- 121
   35 --- 153
   36 --- 80
-  36 x--> 87
+  36 x--> 86
   36 --- 122
   36 --- 151
   37 --- 81
-  37 x--> 87
+  37 x--> 86
   37 --- 119
   37 --- 150
   38 --- 82
-  38 x--> 87
+  38 x--> 86
   38 --- 120
   38 --- 152
   40 --- 54
-  40 x--> 84
+  40 x--> 87
   40 --- 92
   40 --- 123
   41 --- 53
-  41 x--> 84
+  41 x--> 87
   41 --- 95
   41 --- 125
   42 --- 56
-  42 x--> 84
+  42 x--> 87
   42 --- 93
   42 --- 126
   43 --- 55
-  43 x--> 84
+  43 x--> 87
   43 --- 94
   43 --- 124
   49 --- 57
@@ -399,8 +399,8 @@ flowchart LR
   50 --- 77
   50 --- 78
   50 --- 79
-  50 --- 86
-  50 --- 90
+  50 --- 84
+  50 --- 88
   50 --- 115
   50 --- 116
   50 --- 117
@@ -413,8 +413,8 @@ flowchart LR
   51 --- 81
   51 --- 82
   51 --- 83
-  51 --- 87
-  51 --- 91
+  51 --- 86
+  51 --- 90
   51 --- 119
   51 --- 120
   51 --- 121
@@ -427,8 +427,8 @@ flowchart LR
   52 --- 54
   52 --- 55
   52 --- 56
-  52 --- 84
-  52 --- 88
+  52 --- 87
+  52 --- 91
   52 --- 92
   52 --- 93
   52 --- 94
@@ -530,10 +530,10 @@ flowchart LR
   121 <--x 83
   151 <--x 83
   153 <--x 83
-  92 <--x 88
-  93 <--x 88
-  94 <--x 88
-  95 <--x 88
+  115 <--x 88
+  116 <--x 88
+  117 <--x 88
+  118 <--x 88
   96 <--x 89
   97 <--x 89
   98 <--x 89
@@ -553,12 +553,12 @@ flowchart LR
   112 <--x 89
   113 <--x 89
   114 <--x 89
-  115 <--x 90
-  116 <--x 90
-  117 <--x 90
-  118 <--x 90
-  119 <--x 91
-  120 <--x 91
-  121 <--x 91
-  122 <--x 91
+  119 <--x 90
+  120 <--x 90
+  121 <--x 90
+  122 <--x 90
+  92 <--x 91
+  93 <--x 91
+  94 <--x 91
+  95 <--x 91
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/router-template-slate/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/router-template-slate/artifact_graph_flowchart.snap.md
index 2830b4175..46be27452 100644
--- a/rust/kcl-lib/tests/kcl_samples/router-template-slate/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/router-template-slate/artifact_graph_flowchart.snap.md
@@ -104,8 +104,8 @@ flowchart LR
   96["SweepEdge Adjacent"]
   97["SweepEdge Adjacent"]
   1 --- 4
-  55 x--> 2
-  55 x--> 3
+  57 x--> 2
+  57 x--> 3
   4 --- 7
   4 --- 8
   4 --- 9
@@ -128,7 +128,7 @@ flowchart LR
   5 --- 24
   5 --- 30
   5 ---- 34
-  55 --- 5
+  57 --- 5
   6 --- 25
   6 --- 26
   6 --- 27
@@ -136,81 +136,81 @@ flowchart LR
   6 --- 29
   6 --- 32
   6 ---- 35
-  55 --- 6
+  57 --- 6
   7 --- 43
-  7 x--> 55
+  7 x--> 57
   7 --- 67
   7 --- 84
   8 --- 40
-  8 x--> 55
+  8 x--> 57
   8 --- 61
   8 --- 80
   9 --- 39
-  9 x--> 55
+  9 x--> 57
   9 --- 70
   9 --- 86
   10 --- 41
-  10 x--> 55
+  10 x--> 57
   10 --- 71
   10 --- 83
   11 --- 38
-  11 x--> 55
+  11 x--> 57
   11 --- 65
   11 --- 85
   13 --- 42
-  13 x--> 55
+  13 x--> 57
   13 --- 68
   13 --- 82
   14 --- 45
-  14 x--> 55
+  14 x--> 57
   14 --- 69
   14 --- 89
   15 --- 44
-  15 x--> 55
+  15 x--> 57
   15 --- 64
   15 --- 88
   16 --- 36
-  16 x--> 55
+  16 x--> 57
   16 --- 62
   16 --- 87
   17 --- 37
-  17 x--> 55
+  17 x--> 57
   17 --- 66
   17 --- 81
   18 --- 46
-  18 x--> 55
+  18 x--> 57
   18 --- 63
   18 x--> 84
   20 --- 49
-  20 x--> 56
+  20 x--> 55
   20 --- 73
   20 --- 92
   21 --- 50
-  21 x--> 56
+  21 x--> 55
   21 --- 74
   21 --- 90
   22 --- 48
-  22 x--> 56
+  22 x--> 55
   22 --- 72
   22 --- 91
   23 --- 47
-  23 x--> 56
+  23 x--> 55
   23 --- 75
   23 --- 93
   25 --- 52
-  25 x--> 57
+  25 x--> 56
   25 --- 79
   25 --- 97
   26 --- 51
-  26 x--> 57
+  26 x--> 56
   26 --- 77
   26 --- 96
   27 --- 53
-  27 x--> 57
+  27 x--> 56
   27 --- 78
   27 --- 94
   28 --- 54
-  28 x--> 57
+  28 x--> 56
   28 --- 76
   28 --- 95
   33 --- 36
@@ -224,8 +224,8 @@ flowchart LR
   33 --- 44
   33 --- 45
   33 --- 46
-  33 --- 55
-  33 --- 58
+  33 --- 57
+  33 --- 60
   33 --- 61
   33 --- 62
   33 --- 63
@@ -251,8 +251,8 @@ flowchart LR
   34 --- 48
   34 --- 49
   34 --- 50
-  34 --- 56
-  34 --- 59
+  34 --- 55
+  34 --- 58
   34 --- 72
   34 --- 73
   34 --- 74
@@ -265,8 +265,8 @@ flowchart LR
   35 --- 52
   35 --- 53
   35 --- 54
-  35 --- 57
-  35 --- 60
+  35 --- 56
+  35 --- 59
   35 --- 76
   35 --- 77
   35 --- 78
@@ -330,23 +330,23 @@ flowchart LR
   76 <--x 54
   95 <--x 54
   97 <--x 54
-  61 <--x 58
-  62 <--x 58
-  63 <--x 58
-  64 <--x 58
-  65 <--x 58
-  66 <--x 58
-  67 <--x 58
-  68 <--x 58
-  69 <--x 58
-  70 <--x 58
-  71 <--x 58
-  72 <--x 59
-  73 <--x 59
-  74 <--x 59
-  75 <--x 59
-  76 <--x 60
-  77 <--x 60
-  78 <--x 60
-  79 <--x 60
+  72 <--x 58
+  73 <--x 58
+  74 <--x 58
+  75 <--x 58
+  76 <--x 59
+  77 <--x 59
+  78 <--x 59
+  79 <--x 59
+  61 <--x 60
+  62 <--x 60
+  63 <--x 60
+  64 <--x 60
+  65 <--x 60
+  66 <--x 60
+  67 <--x 60
+  68 <--x 60
+  69 <--x 60
+  70 <--x 60
+  71 <--x 60
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/artifact_graph_flowchart.snap.md
index df09cda9a..a284434b5 100644
--- a/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/artifact_graph_flowchart.snap.md
@@ -58,8 +58,8 @@ flowchart LR
   50["EdgeCut Fillet<br>[786, 852, 0]"]
   51["EdgeCut Fillet<br>[1559, 1618, 0]"]
   1 --- 4
-  30 x--> 2
-  32 x--> 3
+  29 x--> 2
+  31 x--> 3
   4 --- 7
   4 --- 16
   4 ---- 18
@@ -71,47 +71,47 @@ flowchart LR
   5 --- 13
   5 --- 15
   5 ---- 19
-  30 --- 5
+  29 --- 5
   6 --- 14
   6 --- 17
   6 ---- 20
-  32 --- 6
+  31 --- 6
   7 --- 28
-  7 x--> 32
+  7 x--> 31
   7 --- 40
   7 --- 48
   7 --- 50
   8 --- 26
-  8 x--> 30
+  8 x--> 29
   8 --- 36
   8 --- 43
   9 --- 27
-  9 x--> 30
+  9 x--> 29
   9 --- 34
   9 --- 45
   10 --- 24
-  10 x--> 30
+  10 x--> 29
   10 --- 38
   10 --- 47
   11 --- 25
-  11 x--> 30
+  11 x--> 29
   11 --- 39
   11 --- 42
   12 --- 23
-  12 x--> 30
+  12 x--> 29
   12 --- 37
   12 --- 46
   13 --- 22
-  13 x--> 30
+  13 x--> 29
   13 --- 35
   13 --- 44
   14 --- 21
-  14 x--> 32
+  14 x--> 31
   14 --- 33
   14 --- 41
   18 --- 28
-  18 --- 30
-  18 --- 32
+  18 --- 29
+  18 --- 31
   18 --- 40
   18 --- 48
   19 --- 22
@@ -120,7 +120,7 @@ flowchart LR
   19 --- 25
   19 --- 26
   19 --- 27
-  19 --- 29
+  19 --- 30
   19 --- 34
   19 --- 35
   19 --- 36
@@ -134,7 +134,7 @@ flowchart LR
   19 --- 46
   19 --- 47
   20 --- 21
-  20 --- 31
+  20 --- 32
   20 --- 33
   20 --- 41
   41 <--x 21
@@ -157,12 +157,12 @@ flowchart LR
   43 <--x 27
   45 <--x 27
   48 <--x 28
-  34 <--x 29
-  35 <--x 29
-  36 <--x 29
-  37 <--x 29
-  38 <--x 29
-  39 <--x 29
+  34 <--x 30
+  35 <--x 30
+  36 <--x 30
+  37 <--x 30
+  38 <--x 30
+  39 <--x 30
   33 <--x 51
   40 <--x 49
 ```
diff --git a/rust/kcl-lib/tests/kcl_samples/walkie-talkie/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/kcl_samples/walkie-talkie/artifact_graph_flowchart.snap.md
index cef9c60d0..c6682a10d 100644
--- a/rust/kcl-lib/tests/kcl_samples/walkie-talkie/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/walkie-talkie/artifact_graph_flowchart.snap.md
@@ -442,7 +442,7 @@ flowchart LR
   19 --- 49
   19 --- 137
   19 ---- 158
-  239 --- 19
+  240 --- 19
   20 --- 50
   20 --- 51
   20 --- 52
@@ -450,14 +450,14 @@ flowchart LR
   20 --- 54
   20 --- 156
   20 ---- 159
-  233 --- 20
+  230 --- 20
   21 --- 55
   21 --- 56
   21 --- 57
   21 --- 58
   21 --- 147
   21 ---- 160
-  233 --- 21
+  230 --- 21
   22 --- 59
   22 --- 60
   22 --- 61
@@ -566,148 +566,148 @@ flowchart LR
   37 --- 148
   37 ---- 168
   38 --- 181
-  38 x--> 229
+  38 x--> 232
   38 --- 260
   38 --- 309
   39 --- 184
-  39 x--> 229
+  39 x--> 232
   39 --- 257
   39 --- 312
   40 --- 183
-  40 x--> 229
+  40 x--> 232
   40 --- 259
   40 --- 311
   41 --- 182
-  41 x--> 229
+  41 x--> 232
   41 --- 258
   41 x--> 309
   41 --- 310
   42 --- 204
-  42 x--> 239
+  42 x--> 240
   42 --- 278
   42 --- 332
   43 --- 201
-  43 x--> 239
+  43 x--> 240
   43 --- 273
   43 --- 331
   44 --- 199
-  44 x--> 239
+  44 x--> 240
   44 --- 279
   44 --- 330
   45 --- 197
-  45 x--> 239
+  45 x--> 240
   45 --- 274
   45 --- 328
   46 --- 202
-  46 x--> 239
+  46 x--> 240
   46 --- 280
   46 --- 327
   47 --- 203
-  47 x--> 239
+  47 x--> 240
   47 --- 275
   47 --- 325
   48 --- 198
-  48 x--> 239
+  48 x--> 240
   48 --- 276
   48 --- 329
   49 --- 200
-  49 x--> 239
+  49 x--> 240
   49 --- 277
   49 --- 326
   50 --- 216
-  50 x--> 233
+  50 x--> 230
   50 --- 292
   50 --- 341
   51 --- 215
-  51 x--> 233
+  51 x--> 230
   51 --- 290
   51 --- 343
   52 --- 214
-  52 x--> 233
+  52 x--> 230
   52 --- 291
   52 --- 344
   53 --- 213
-  53 x--> 233
+  53 x--> 230
   53 --- 289
   53 --- 342
   55 --- 175
-  55 x--> 233
+  55 x--> 230
   55 --- 250
   55 --- 301
   56 --- 173
-  56 x--> 233
+  56 x--> 230
   56 --- 251
   56 --- 302
   57 --- 174
-  57 x--> 233
+  57 x--> 230
   57 --- 249
   57 --- 304
   58 --- 176
-  58 x--> 233
+  58 x--> 230
   58 --- 252
   58 --- 303
   68 --- 212
-  68 x--> 243
+  68 x--> 237
   68 --- 282
   68 --- 338
   69 --- 207
-  69 x--> 243
+  69 x--> 237
   69 --- 285
   69 --- 339
   70 --- 206
-  70 x--> 243
+  70 x--> 237
   70 --- 286
   70 --- 337
   71 --- 205
-  71 x--> 243
+  71 x--> 237
   71 --- 281
   71 --- 340
   72 --- 208
-  72 x--> 243
+  72 x--> 237
   72 --- 283
   72 --- 335
   73 --- 211
-  73 x--> 243
+  73 x--> 237
   73 --- 288
   73 --- 333
   74 --- 210
-  74 x--> 243
+  74 x--> 237
   74 --- 287
   74 --- 336
   75 --- 209
-  75 x--> 243
+  75 x--> 237
   75 --- 284
   75 --- 334
   108 --- 189
-  108 x--> 231
+  108 x--> 233
   108 --- 266
   108 --- 320
   109 --- 190
-  109 x--> 231
+  109 x--> 233
   109 --- 265
   109 --- 317
   110 --- 191
-  110 x--> 231
+  110 x--> 233
   110 --- 267
   110 --- 319
   111 --- 192
-  111 x--> 231
+  111 x--> 233
   111 --- 268
   111 --- 318
   112 --- 196
-  112 x--> 232
+  112 x--> 231
   112 --- 271
   112 --- 322
   113 --- 194
-  113 x--> 232
+  113 x--> 231
   113 --- 272
   113 --- 321
   114 --- 195
-  114 x--> 232
+  114 x--> 231
   114 --- 270
   114 --- 324
   115 --- 193
-  115 x--> 232
+  115 x--> 231
   115 --- 269
   115 --- 323
   164 <--x 116
@@ -726,7 +726,7 @@ flowchart LR
   120 --- 225
   120 --- 349
   121 --- 185
-  121 x--> 230
+  121 x--> 229
   121 --- 263
   121 --- 315
   122 --- 218
@@ -734,11 +734,11 @@ flowchart LR
   122 --- 296
   122 --- 345
   123 --- 178
-  123 x--> 228
+  123 x--> 235
   123 --- 256
   123 --- 305
   124 --- 172
-  124 x--> 226
+  124 x--> 234
   124 --- 246
   124 --- 297
   125 --- 217
@@ -746,27 +746,27 @@ flowchart LR
   125 --- 294
   125 --- 348
   126 --- 170
-  126 x--> 226
+  126 x--> 234
   126 --- 248
   126 --- 299
   127 --- 187
-  127 x--> 230
+  127 x--> 229
   127 --- 261
   127 --- 314
   128 --- 180
-  128 x--> 228
+  128 x--> 235
   128 --- 255
   128 --- 306
   129 --- 169
-  129 x--> 226
+  129 x--> 234
   129 --- 245
   129 --- 298
   130 --- 179
-  130 x--> 228
+  130 x--> 235
   130 --- 253
   130 --- 307
   131 --- 188
-  131 x--> 230
+  131 x--> 229
   131 --- 264
   131 --- 316
   132 --- 219
@@ -774,15 +774,15 @@ flowchart LR
   132 --- 295
   132 --- 346
   133 --- 177
-  133 x--> 228
+  133 x--> 235
   133 --- 254
   133 --- 308
   134 --- 186
-  134 x--> 230
+  134 x--> 229
   134 --- 262
   134 --- 313
   135 --- 171
-  135 x--> 226
+  135 x--> 234
   135 --- 247
   135 --- 300
   136 --- 220
@@ -793,8 +793,8 @@ flowchart LR
   157 --- 182
   157 --- 183
   157 --- 184
-  157 --- 229
-  157 --- 239
+  157 --- 232
+  157 --- 240
   157 --- 257
   157 --- 258
   157 --- 259
@@ -811,7 +811,7 @@ flowchart LR
   158 --- 202
   158 --- 203
   158 --- 204
-  158 --- 233
+  158 --- 230
   158 --- 273
   158 --- 274
   158 --- 275
@@ -832,7 +832,7 @@ flowchart LR
   159 --- 214
   159 --- 215
   159 --- 216
-  159 --- 235
+  159 --- 226
   159 --- 289
   159 --- 290
   159 --- 291
@@ -862,8 +862,8 @@ flowchart LR
   161 --- 210
   161 --- 211
   161 --- 212
-  161 --- 234
-  161 --- 243
+  161 --- 228
+  161 --- 237
   161 --- 281
   161 --- 282
   161 --- 283
@@ -884,7 +884,7 @@ flowchart LR
   162 --- 190
   162 --- 191
   162 --- 192
-  162 --- 231
+  162 --- 233
   162 --- 241
   162 --- 265
   162 --- 266
@@ -898,8 +898,8 @@ flowchart LR
   163 --- 194
   163 --- 195
   163 --- 196
-  163 --- 232
-  163 --- 242
+  163 --- 231
+  163 --- 239
   163 --- 269
   163 --- 270
   163 --- 271
@@ -922,8 +922,8 @@ flowchart LR
   165 --- 170
   165 --- 171
   165 --- 172
-  165 --- 226
-  165 --- 237
+  165 --- 234
+  165 --- 242
   165 --- 245
   165 --- 246
   165 --- 247
@@ -936,8 +936,8 @@ flowchart LR
   166 --- 178
   166 --- 179
   166 --- 180
-  166 --- 228
-  166 --- 238
+  166 --- 235
+  166 --- 243
   166 --- 253
   166 --- 254
   166 --- 255
@@ -950,8 +950,8 @@ flowchart LR
   167 --- 186
   167 --- 187
   167 --- 188
-  167 --- 230
-  167 --- 240
+  167 --- 229
+  167 --- 238
   167 --- 261
   167 --- 262
   167 --- 263
@@ -1108,54 +1108,54 @@ flowchart LR
   353 <--x 224
   349 <--x 225
   350 <--x 225
+  289 <--x 226
+  290 <--x 226
+  291 <--x 226
+  292 <--x 226
   249 <--x 227
   250 <--x 227
   251 <--x 227
   252 <--x 227
-  273 <--x 233
-  274 <--x 233
-  275 <--x 233
-  276 <--x 233
-  277 <--x 233
-  278 <--x 233
-  279 <--x 233
-  280 <--x 233
-  281 <--x 234
-  282 <--x 234
-  283 <--x 234
-  284 <--x 234
-  285 <--x 234
-  286 <--x 234
-  287 <--x 234
-  288 <--x 234
-  289 <--x 235
-  290 <--x 235
-  291 <--x 235
-  292 <--x 235
-  245 <--x 237
-  246 <--x 237
-  247 <--x 237
-  248 <--x 237
-  253 <--x 238
-  254 <--x 238
-  255 <--x 238
-  256 <--x 238
-  257 <--x 239
-  258 <--x 239
-  259 <--x 239
-  260 <--x 239
-  261 <--x 240
-  262 <--x 240
-  263 <--x 240
-  264 <--x 240
+  281 <--x 228
+  282 <--x 228
+  283 <--x 228
+  284 <--x 228
+  285 <--x 228
+  286 <--x 228
+  287 <--x 228
+  288 <--x 228
+  273 <--x 230
+  274 <--x 230
+  275 <--x 230
+  276 <--x 230
+  277 <--x 230
+  278 <--x 230
+  279 <--x 230
+  280 <--x 230
+  261 <--x 238
+  262 <--x 238
+  263 <--x 238
+  264 <--x 238
+  269 <--x 239
+  270 <--x 239
+  271 <--x 239
+  272 <--x 239
+  257 <--x 240
+  258 <--x 240
+  259 <--x 240
+  260 <--x 240
   265 <--x 241
   266 <--x 241
   267 <--x 241
   268 <--x 241
-  269 <--x 242
-  270 <--x 242
-  271 <--x 242
-  272 <--x 242
+  245 <--x 242
+  246 <--x 242
+  247 <--x 242
+  248 <--x 242
+  253 <--x 243
+  254 <--x 243
+  255 <--x 243
+  256 <--x 243
   293 <--x 244
   294 <--x 244
   295 <--x 244
diff --git a/rust/kcl-lib/tests/out_of_band_sketches/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/out_of_band_sketches/artifact_graph_flowchart.snap.md
index ec8b2b406..0e1559d36 100644
--- a/rust/kcl-lib/tests/out_of_band_sketches/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/out_of_band_sketches/artifact_graph_flowchart.snap.md
@@ -63,43 +63,43 @@ flowchart LR
   4 --- 13
   4 ---- 16
   5 --- 20
-  5 x--> 25
+  5 x--> 26
   5 --- 31
   5 --- 40
   6 --- 19
-  6 x--> 25
+  6 x--> 26
   6 --- 29
   6 --- 39
   7 --- 23
-  7 x--> 26
+  7 x--> 25
   7 --- 35
   7 --- 44
   8 --- 22
-  8 x--> 26
+  8 x--> 25
   8 --- 36
   8 --- 42
   9 --- 17
-  9 x--> 25
+  9 x--> 26
   9 --- 32
   9 --- 37
   10 --- 18
-  10 x--> 25
+  10 x--> 26
   10 --- 30
   10 --- 38
   11 --- 24
-  11 x--> 26
+  11 x--> 25
   11 --- 33
   11 --- 43
   12 --- 21
-  12 x--> 26
+  12 x--> 25
   12 --- 34
   12 --- 41
   15 --- 17
   15 --- 18
   15 --- 19
   15 --- 20
-  15 --- 25
-  15 --- 27
+  15 --- 26
+  15 --- 28
   15 --- 29
   15 --- 30
   15 --- 31
@@ -112,8 +112,8 @@ flowchart LR
   16 --- 22
   16 --- 23
   16 --- 24
-  16 --- 26
-  16 --- 28
+  16 --- 25
+  16 --- 27
   16 --- 33
   16 --- 34
   16 --- 35
@@ -146,12 +146,12 @@ flowchart LR
   33 <--x 24
   42 <--x 24
   43 <--x 24
-  29 <--x 27
-  30 <--x 27
-  31 <--x 27
-  32 <--x 27
-  33 <--x 28
-  34 <--x 28
-  35 <--x 28
-  36 <--x 28
+  33 <--x 27
+  34 <--x 27
+  35 <--x 27
+  36 <--x 27
+  29 <--x 28
+  30 <--x 28
+  31 <--x 28
+  32 <--x 28
 ```
diff --git a/rust/kcl-lib/tests/pattern_into_union/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/pattern_into_union/artifact_graph_flowchart.snap.md
index 5179562ab..78f368317 100644
--- a/rust/kcl-lib/tests/pattern_into_union/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/pattern_into_union/artifact_graph_flowchart.snap.md
@@ -116,67 +116,67 @@ flowchart LR
   6 --- 23
   6 ---- 28
   7 --- 43
-  7 x--> 50
+  7 x--> 49
   7 --- 64
   7 --- 75
   8 --- 40
-  8 x--> 50
+  8 x--> 49
   8 --- 60
   8 --- 78
   9 --- 39
-  9 x--> 50
+  9 x--> 49
   9 --- 63
   9 --- 76
   10 --- 41
-  10 x--> 50
+  10 x--> 49
   10 --- 59
   10 --- 80
   11 --- 38
-  11 x--> 50
+  11 x--> 49
   11 --- 61
   11 --- 81
   12 --- 37
-  12 x--> 50
+  12 x--> 49
   12 --- 66
   12 --- 82
   13 --- 42
-  13 x--> 50
+  13 x--> 49
   13 --- 65
   13 --- 77
   14 --- 44
-  14 x--> 50
+  14 x--> 49
   14 --- 62
   14 --- 79
   15 --- 35
-  15 x--> 49
+  15 x--> 48
   15 --- 55
   15 --- 73
   16 --- 34
-  16 x--> 49
+  16 x--> 48
   16 --- 58
   16 --- 72
   17 --- 36
-  17 x--> 49
+  17 x--> 48
   17 --- 56
   17 --- 71
   18 --- 33
-  18 x--> 49
+  18 x--> 48
   18 --- 57
   18 --- 74
   19 --- 31
-  19 x--> 48
+  19 x--> 50
   19 --- 53
   19 --- 69
   20 --- 32
-  20 x--> 48
+  20 x--> 50
   20 --- 52
   20 --- 68
   21 --- 30
-  21 x--> 48
+  21 x--> 50
   21 --- 51
   21 --- 70
   22 --- 29
-  22 x--> 48
+  22 x--> 50
   22 --- 54
   22 --- 67
   26 --- 37
@@ -187,8 +187,8 @@ flowchart LR
   26 --- 42
   26 --- 43
   26 --- 44
-  26 --- 47
-  26 --- 50
+  26 --- 46
+  26 --- 49
   26 --- 59
   26 --- 60
   26 --- 61
@@ -209,8 +209,8 @@ flowchart LR
   27 --- 34
   27 --- 35
   27 --- 36
-  27 --- 46
-  27 --- 49
+  27 --- 45
+  27 --- 48
   27 --- 55
   27 --- 56
   27 --- 57
@@ -223,8 +223,8 @@ flowchart LR
   28 --- 30
   28 --- 31
   28 --- 32
-  28 --- 45
-  28 --- 48
+  28 --- 47
+  28 --- 50
   28 --- 51
   28 --- 52
   28 --- 53
@@ -277,22 +277,22 @@ flowchart LR
   62 <--x 44
   77 <--x 44
   79 <--x 44
-  51 <--x 45
-  52 <--x 45
-  53 <--x 45
-  54 <--x 45
-  55 <--x 46
-  56 <--x 46
-  57 <--x 46
-  58 <--x 46
-  59 <--x 47
-  60 <--x 47
-  61 <--x 47
-  62 <--x 47
-  63 <--x 47
-  64 <--x 47
-  65 <--x 47
-  66 <--x 47
+  55 <--x 45
+  56 <--x 45
+  57 <--x 45
+  58 <--x 45
+  59 <--x 46
+  60 <--x 46
+  61 <--x 46
+  62 <--x 46
+  63 <--x 46
+  64 <--x 46
+  65 <--x 46
+  66 <--x 46
+  51 <--x 47
+  52 <--x 47
+  53 <--x 47
+  54 <--x 47
   68 <--x 84
   72 <--x 83
 ```
diff --git a/rust/kcl-lib/tests/pattern_linear_in_module/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/pattern_linear_in_module/artifact_graph_flowchart.snap.md
index 0a9da25d3..054f316c6 100644
--- a/rust/kcl-lib/tests/pattern_linear_in_module/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/pattern_linear_in_module/artifact_graph_flowchart.snap.md
@@ -45,27 +45,27 @@ flowchart LR
   4 --- 8
   4 ---- 13
   5 --- 24
-  5 x--> 26
+  5 x--> 25
   5 --- 30
   5 --- 32
   6 --- 23
-  6 x--> 25
+  6 x--> 26
   6 --- 29
   6 --- 31
   13 --- 23
-  13 --- 25
-  13 --- 27
+  13 --- 26
+  13 --- 28
   13 --- 29
   13 --- 31
   20 --- 24
-  20 --- 26
-  20 --- 28
+  20 --- 25
+  20 --- 27
   20 --- 30
   20 --- 32
   29 <--x 23
   31 <--x 23
   30 <--x 24
   32 <--x 24
-  29 <--x 27
-  30 <--x 28
+  30 <--x 27
+  29 <--x 28
 ```
diff --git a/rust/kcl-lib/tests/poop_chute/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/poop_chute/artifact_graph_flowchart.snap.md
index 8a27c2797..ab3c8207e 100644
--- a/rust/kcl-lib/tests/poop_chute/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/poop_chute/artifact_graph_flowchart.snap.md
@@ -153,107 +153,107 @@ flowchart LR
   4 --- 31
   4 ---- 34
   5 --- 41
-  5 x--> 61
+  5 x--> 62
   5 --- 76
   5 --- 94
   6 --- 40
-  6 x--> 61
+  6 x--> 62
   6 --- 69
   6 --- 98
   7 --- 42
-  7 x--> 61
+  7 x--> 62
   7 --- 75
   7 --- 93
   8 --- 38
-  8 x--> 61
+  8 x--> 62
   8 --- 70
   8 --- 95
   9 --- 37
-  9 x--> 61
+  9 x--> 62
   9 --- 68
   9 --- 101
   10 --- 44
-  10 x--> 61
+  10 x--> 62
   10 --- 74
   10 --- 100
   11 --- 46
-  11 x--> 61
+  11 x--> 62
   11 --- 66
   11 --- 97
   12 --- 45
-  12 x--> 61
+  12 x--> 62
   12 --- 73
   12 --- 103
   13 --- 35
-  13 x--> 61
+  13 x--> 62
   13 --- 71
   13 --- 102
   14 --- 36
-  14 x--> 61
+  14 x--> 62
   14 --- 72
   14 --- 91
   15 --- 47
-  15 x--> 61
+  15 x--> 62
   15 --- 65
   15 --- 99
   16 --- 43
-  16 x--> 61
+  16 x--> 62
   16 --- 77
   16 --- 92
   17 --- 39
-  17 x--> 61
+  17 x--> 62
   17 --- 67
   17 --- 96
   18 --- 55
-  18 x--> 62
+  18 x--> 61
   18 --- 88
   18 --- 114
   19 --- 54
-  19 x--> 62
+  19 x--> 61
   19 --- 85
   19 --- 113
   20 --- 50
-  20 x--> 62
+  20 x--> 61
   20 --- 89
   20 --- 106
   21 --- 51
-  21 x--> 62
+  21 x--> 61
   21 --- 79
   21 --- 110
   22 --- 49
-  22 x--> 62
+  22 x--> 61
   22 --- 83
   22 --- 107
   23 --- 59
-  23 x--> 62
+  23 x--> 61
   23 --- 84
   23 --- 108
   24 --- 52
-  24 x--> 62
+  24 x--> 61
   24 --- 90
   24 --- 104
   25 --- 58
-  25 x--> 62
+  25 x--> 61
   25 --- 81
   25 --- 116
   26 --- 60
-  26 x--> 62
+  26 x--> 61
   26 --- 80
   26 --- 109
   27 --- 56
-  27 x--> 62
+  27 x--> 61
   27 --- 82
   27 --- 115
   28 --- 48
-  28 x--> 62
+  28 x--> 61
   28 --- 78
   28 --- 111
   29 --- 53
-  29 x--> 62
+  29 x--> 61
   29 --- 86
   29 --- 105
   30 --- 57
-  30 x--> 62
+  30 x--> 61
   30 --- 87
   30 --- 112
   33 --- 35
@@ -269,8 +269,8 @@ flowchart LR
   33 --- 45
   33 --- 46
   33 --- 47
-  33 --- 61
-  33 --- 63
+  33 --- 62
+  33 --- 64
   33 --- 65
   33 --- 66
   33 --- 67
@@ -310,8 +310,8 @@ flowchart LR
   34 --- 58
   34 --- 59
   34 --- 60
-  34 --- 62
-  34 --- 64
+  34 --- 61
+  34 --- 63
   34 --- 78
   34 --- 79
   34 --- 80
@@ -416,30 +416,30 @@ flowchart LR
   80 <--x 60
   109 <--x 60
   116 <--x 60
-  65 <--x 63
-  66 <--x 63
-  67 <--x 63
-  68 <--x 63
-  69 <--x 63
-  70 <--x 63
-  71 <--x 63
-  72 <--x 63
-  73 <--x 63
-  74 <--x 63
-  75 <--x 63
-  76 <--x 63
-  77 <--x 63
-  78 <--x 64
-  79 <--x 64
-  80 <--x 64
-  81 <--x 64
-  82 <--x 64
-  83 <--x 64
-  84 <--x 64
-  85 <--x 64
-  86 <--x 64
-  87 <--x 64
-  88 <--x 64
-  89 <--x 64
-  90 <--x 64
+  78 <--x 63
+  79 <--x 63
+  80 <--x 63
+  81 <--x 63
+  82 <--x 63
+  83 <--x 63
+  84 <--x 63
+  85 <--x 63
+  86 <--x 63
+  87 <--x 63
+  88 <--x 63
+  89 <--x 63
+  90 <--x 63
+  65 <--x 64
+  66 <--x 64
+  67 <--x 64
+  68 <--x 64
+  69 <--x 64
+  70 <--x 64
+  71 <--x 64
+  72 <--x 64
+  73 <--x 64
+  74 <--x 64
+  75 <--x 64
+  76 <--x 64
+  77 <--x 64
 ```
diff --git a/rust/kcl-lib/tests/rotate_after_fillet/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/rotate_after_fillet/artifact_graph_flowchart.snap.md
index e0e3f552a..32d10ab96 100644
--- a/rust/kcl-lib/tests/rotate_after_fillet/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/rotate_after_fillet/artifact_graph_flowchart.snap.md
@@ -58,8 +58,8 @@ flowchart LR
   50["EdgeCut Fillet<br>[462, 528, 0]"]
   51["EdgeCut Fillet<br>[1387, 1446, 0]"]
   1 --- 4
-  30 x--> 2
-  32 x--> 3
+  29 x--> 2
+  31 x--> 3
   4 --- 7
   4 --- 16
   4 ---- 18
@@ -71,47 +71,47 @@ flowchart LR
   5 --- 13
   5 --- 15
   5 ---- 19
-  30 --- 5
+  29 --- 5
   6 --- 14
   6 --- 17
   6 ---- 20
-  32 --- 6
+  31 --- 6
   7 --- 28
-  7 x--> 32
+  7 x--> 31
   7 --- 40
   7 --- 48
   7 --- 50
   8 --- 26
-  8 x--> 30
+  8 x--> 29
   8 --- 36
   8 --- 43
   9 --- 27
-  9 x--> 30
+  9 x--> 29
   9 --- 34
   9 --- 45
   10 --- 24
-  10 x--> 30
+  10 x--> 29
   10 --- 38
   10 --- 47
   11 --- 25
-  11 x--> 30
+  11 x--> 29
   11 --- 39
   11 --- 42
   12 --- 23
-  12 x--> 30
+  12 x--> 29
   12 --- 37
   12 --- 46
   13 --- 22
-  13 x--> 30
+  13 x--> 29
   13 --- 35
   13 --- 44
   14 --- 21
-  14 x--> 32
+  14 x--> 31
   14 --- 33
   14 --- 41
   18 --- 28
-  18 --- 30
-  18 --- 32
+  18 --- 29
+  18 --- 31
   18 --- 40
   18 --- 48
   19 --- 22
@@ -120,7 +120,7 @@ flowchart LR
   19 --- 25
   19 --- 26
   19 --- 27
-  19 --- 29
+  19 --- 30
   19 --- 34
   19 --- 35
   19 --- 36
@@ -134,7 +134,7 @@ flowchart LR
   19 --- 46
   19 --- 47
   20 --- 21
-  20 --- 31
+  20 --- 32
   20 --- 33
   20 --- 41
   41 <--x 21
@@ -157,12 +157,12 @@ flowchart LR
   43 <--x 27
   45 <--x 27
   48 <--x 28
-  34 <--x 29
-  35 <--x 29
-  36 <--x 29
-  37 <--x 29
-  38 <--x 29
-  39 <--x 29
+  34 <--x 30
+  35 <--x 30
+  36 <--x 30
+  37 <--x 30
+  38 <--x 30
+  39 <--x 30
   33 <--x 51
   40 <--x 49
 ```
diff --git a/rust/kcl-lib/tests/scale_after_fillet/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/scale_after_fillet/artifact_graph_flowchart.snap.md
index e0e3f552a..32d10ab96 100644
--- a/rust/kcl-lib/tests/scale_after_fillet/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/scale_after_fillet/artifact_graph_flowchart.snap.md
@@ -58,8 +58,8 @@ flowchart LR
   50["EdgeCut Fillet<br>[462, 528, 0]"]
   51["EdgeCut Fillet<br>[1387, 1446, 0]"]
   1 --- 4
-  30 x--> 2
-  32 x--> 3
+  29 x--> 2
+  31 x--> 3
   4 --- 7
   4 --- 16
   4 ---- 18
@@ -71,47 +71,47 @@ flowchart LR
   5 --- 13
   5 --- 15
   5 ---- 19
-  30 --- 5
+  29 --- 5
   6 --- 14
   6 --- 17
   6 ---- 20
-  32 --- 6
+  31 --- 6
   7 --- 28
-  7 x--> 32
+  7 x--> 31
   7 --- 40
   7 --- 48
   7 --- 50
   8 --- 26
-  8 x--> 30
+  8 x--> 29
   8 --- 36
   8 --- 43
   9 --- 27
-  9 x--> 30
+  9 x--> 29
   9 --- 34
   9 --- 45
   10 --- 24
-  10 x--> 30
+  10 x--> 29
   10 --- 38
   10 --- 47
   11 --- 25
-  11 x--> 30
+  11 x--> 29
   11 --- 39
   11 --- 42
   12 --- 23
-  12 x--> 30
+  12 x--> 29
   12 --- 37
   12 --- 46
   13 --- 22
-  13 x--> 30
+  13 x--> 29
   13 --- 35
   13 --- 44
   14 --- 21
-  14 x--> 32
+  14 x--> 31
   14 --- 33
   14 --- 41
   18 --- 28
-  18 --- 30
-  18 --- 32
+  18 --- 29
+  18 --- 31
   18 --- 40
   18 --- 48
   19 --- 22
@@ -120,7 +120,7 @@ flowchart LR
   19 --- 25
   19 --- 26
   19 --- 27
-  19 --- 29
+  19 --- 30
   19 --- 34
   19 --- 35
   19 --- 36
@@ -134,7 +134,7 @@ flowchart LR
   19 --- 46
   19 --- 47
   20 --- 21
-  20 --- 31
+  20 --- 32
   20 --- 33
   20 --- 41
   41 <--x 21
@@ -157,12 +157,12 @@ flowchart LR
   43 <--x 27
   45 <--x 27
   48 <--x 28
-  34 <--x 29
-  35 <--x 29
-  36 <--x 29
-  37 <--x 29
-  38 <--x 29
-  39 <--x 29
+  34 <--x 30
+  35 <--x 30
+  36 <--x 30
+  37 <--x 30
+  38 <--x 30
+  39 <--x 30
   33 <--x 51
   40 <--x 49
 ```
diff --git a/rust/kcl-lib/tests/sketch_in_object/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/sketch_in_object/artifact_graph_flowchart.snap.md
index 6f8093170..d604d7759 100644
--- a/rust/kcl-lib/tests/sketch_in_object/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/sketch_in_object/artifact_graph_flowchart.snap.md
@@ -63,43 +63,43 @@ flowchart LR
   4 --- 13
   4 ---- 16
   5 --- 20
-  5 x--> 27
+  5 x--> 28
   5 --- 31
   5 --- 38
   6 --- 18
-  6 x--> 27
+  6 x--> 28
   6 --- 32
   6 --- 39
   7 --- 17
-  7 x--> 27
+  7 x--> 28
   7 --- 29
   7 --- 40
   8 --- 19
-  8 x--> 27
+  8 x--> 28
   8 --- 30
   8 --- 37
   9 --- 23
-  9 x--> 26
+  9 x--> 25
   9 --- 35
   9 --- 44
   10 --- 24
-  10 x--> 26
+  10 x--> 25
   10 --- 36
   10 --- 42
   11 --- 22
-  11 x--> 26
+  11 x--> 25
   11 --- 33
   11 --- 43
   12 --- 21
-  12 x--> 26
+  12 x--> 25
   12 --- 34
   12 --- 41
   15 --- 17
   15 --- 18
   15 --- 19
   15 --- 20
-  15 --- 25
-  15 --- 27
+  15 --- 26
+  15 --- 28
   15 --- 29
   15 --- 30
   15 --- 31
@@ -112,8 +112,8 @@ flowchart LR
   16 --- 22
   16 --- 23
   16 --- 24
-  16 --- 26
-  16 --- 28
+  16 --- 25
+  16 --- 27
   16 --- 33
   16 --- 34
   16 --- 35
@@ -146,12 +146,12 @@ flowchart LR
   36 <--x 24
   42 <--x 24
   44 <--x 24
-  29 <--x 25
-  30 <--x 25
-  31 <--x 25
-  32 <--x 25
-  33 <--x 28
-  34 <--x 28
-  35 <--x 28
-  36 <--x 28
+  29 <--x 26
+  30 <--x 26
+  31 <--x 26
+  32 <--x 26
+  33 <--x 27
+  34 <--x 27
+  35 <--x 27
+  36 <--x 27
 ```
diff --git a/rust/kcl-lib/tests/sketch_on_face/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/sketch_on_face/artifact_graph_flowchart.snap.md
index 1f60ad30c..cfcff7abc 100644
--- a/rust/kcl-lib/tests/sketch_on_face/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/sketch_on_face/artifact_graph_flowchart.snap.md
@@ -64,43 +64,43 @@ flowchart LR
   4 ---- 16
   20 --- 4
   5 --- 20
-  5 x--> 25
+  5 x--> 26
   5 --- 31
   5 --- 38
   6 --- 18
-  6 x--> 25
+  6 x--> 26
   6 --- 32
   6 --- 39
   7 --- 17
-  7 x--> 25
+  7 x--> 26
   7 --- 29
   7 --- 40
   8 --- 19
-  8 x--> 25
+  8 x--> 26
   8 --- 30
   8 --- 37
   9 --- 23
-  9 x--> 26
+  9 x--> 25
   9 --- 35
   9 --- 44
   10 --- 24
-  10 x--> 26
+  10 x--> 25
   10 --- 36
   10 --- 42
   11 --- 22
-  11 x--> 26
+  11 x--> 25
   11 --- 33
   11 --- 43
   12 --- 21
-  12 x--> 26
+  12 x--> 25
   12 --- 34
   12 --- 41
   15 --- 17
   15 --- 18
   15 --- 19
   15 --- 20
-  15 --- 25
-  15 --- 27
+  15 --- 26
+  15 --- 28
   15 --- 29
   15 --- 30
   15 --- 31
@@ -113,8 +113,8 @@ flowchart LR
   16 --- 22
   16 --- 23
   16 --- 24
-  16 --- 26
-  16 --- 28
+  16 --- 25
+  16 --- 27
   16 --- 33
   16 --- 34
   16 --- 35
@@ -147,12 +147,12 @@ flowchart LR
   36 <--x 24
   42 <--x 24
   44 <--x 24
-  29 <--x 27
-  30 <--x 27
-  31 <--x 27
-  32 <--x 27
-  33 <--x 28
-  34 <--x 28
-  35 <--x 28
-  36 <--x 28
+  33 <--x 27
+  34 <--x 27
+  35 <--x 27
+  36 <--x 27
+  29 <--x 28
+  30 <--x 28
+  31 <--x 28
+  32 <--x 28
 ```
diff --git a/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/artifact_graph_flowchart.snap.md
index 481ef21a1..0d5ea71aa 100644
--- a/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/artifact_graph_flowchart.snap.md
@@ -123,7 +123,7 @@ flowchart LR
   18 --- 28
   18 --- 29
   18 --- 30
-  18 --- 32
+  18 --- 31
   18 --- 37
   18 --- 38
   18 --- 39
@@ -140,7 +140,7 @@ flowchart LR
   19 --- 21
   19 --- 22
   19 --- 23
-  19 --- 31
+  19 --- 32
   19 --- 33
   19 --- 34
   19 --- 35
@@ -175,16 +175,16 @@ flowchart LR
   48 <--x 28
   38 <--x 29
   52 <--x 29
-  33 <--x 31
-  34 <--x 31
-  35 <--x 31
-  36 <--x 31
-  37 <--x 32
-  38 <--x 32
-  39 <--x 32
-  40 <--x 32
-  41 <--x 32
-  42 <--x 32
+  37 <--x 31
+  38 <--x 31
+  39 <--x 31
+  40 <--x 31
+  41 <--x 31
+  42 <--x 31
+  33 <--x 32
+  34 <--x 32
+  35 <--x 32
+  36 <--x 32
   47 <--x 53
   49 <--x 54
 ```
diff --git a/rust/kcl-lib/tests/sketch_on_face_circle_tagged/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/sketch_on_face_circle_tagged/artifact_graph_flowchart.snap.md
index 5ebad8bb6..4f02393c9 100644
--- a/rust/kcl-lib/tests/sketch_on_face_circle_tagged/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/sketch_on_face_circle_tagged/artifact_graph_flowchart.snap.md
@@ -37,7 +37,7 @@ flowchart LR
   31["SweepEdge Adjacent"]
   32["SweepEdge Adjacent"]
   1 --- 3
-  21 x--> 2
+  22 x--> 2
   3 --- 5
   3 --- 6
   3 --- 7
@@ -47,33 +47,33 @@ flowchart LR
   4 --- 9
   4 --- 10
   4 ---- 13
-  21 --- 4
+  22 --- 4
   5 --- 17
-  5 x--> 19
+  5 x--> 20
   5 --- 25
   5 --- 29
   6 --- 15
-  6 x--> 19
+  6 x--> 20
   6 --- 26
   6 --- 30
   7 --- 14
-  7 x--> 19
+  7 x--> 20
   7 --- 23
   7 --- 31
   8 --- 16
-  8 x--> 19
+  8 x--> 20
   8 --- 24
   8 --- 28
   9 --- 18
-  9 x--> 20
+  9 x--> 19
   9 --- 27
   9 --- 32
   12 --- 14
   12 --- 15
   12 --- 16
   12 --- 17
-  12 --- 19
-  12 --- 21
+  12 --- 20
+  12 --- 22
   12 --- 23
   12 --- 24
   12 --- 25
@@ -83,8 +83,8 @@ flowchart LR
   12 --- 30
   12 --- 31
   13 --- 18
-  13 --- 20
-  13 --- 22
+  13 --- 19
+  13 --- 21
   13 --- 27
   13 --- 32
   23 <--x 14
@@ -101,9 +101,9 @@ flowchart LR
   29 <--x 17
   27 <--x 18
   32 <--x 18
-  23 <--x 21
-  24 <--x 21
-  25 <--x 21
-  26 <--x 21
-  27 <--x 22
+  27 <--x 21
+  23 <--x 22
+  24 <--x 22
+  25 <--x 22
+  26 <--x 22
 ```
diff --git a/rust/kcl-lib/tests/sketch_on_face_end/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/sketch_on_face_end/artifact_graph_flowchart.snap.md
index 92c92b6d1..b6d8131c3 100644
--- a/rust/kcl-lib/tests/sketch_on_face_end/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/sketch_on_face_end/artifact_graph_flowchart.snap.md
@@ -49,7 +49,7 @@ flowchart LR
   43["SweepEdge Adjacent"]
   44["SweepEdge Adjacent"]
   1 --- 3
-  27 x--> 2
+  28 x--> 2
   3 --- 5
   3 --- 6
   3 --- 7
@@ -62,45 +62,45 @@ flowchart LR
   4 --- 12
   4 --- 13
   4 ---- 16
-  27 --- 4
+  28 --- 4
   5 --- 20
-  5 x--> 25
+  5 x--> 26
   5 --- 31
   5 --- 38
   6 --- 18
-  6 x--> 25
+  6 x--> 26
   6 --- 32
   6 --- 39
   7 --- 17
-  7 x--> 25
+  7 x--> 26
   7 --- 29
   7 --- 40
   8 --- 19
-  8 x--> 25
+  8 x--> 26
   8 --- 30
   8 --- 37
   9 --- 23
-  9 x--> 26
+  9 x--> 25
   9 --- 35
   9 --- 44
   10 --- 24
-  10 x--> 26
+  10 x--> 25
   10 --- 36
   10 --- 42
   11 --- 22
-  11 x--> 26
+  11 x--> 25
   11 --- 33
   11 --- 43
   12 --- 21
-  12 x--> 26
+  12 x--> 25
   12 --- 34
   12 --- 41
   15 --- 17
   15 --- 18
   15 --- 19
   15 --- 20
-  15 --- 25
-  15 --- 27
+  15 --- 26
+  15 --- 28
   15 --- 29
   15 --- 30
   15 --- 31
@@ -113,8 +113,8 @@ flowchart LR
   16 --- 22
   16 --- 23
   16 --- 24
-  16 --- 26
-  16 --- 28
+  16 --- 25
+  16 --- 27
   16 --- 33
   16 --- 34
   16 --- 35
@@ -147,12 +147,12 @@ flowchart LR
   36 <--x 24
   42 <--x 24
   44 <--x 24
-  29 <--x 27
-  30 <--x 27
-  31 <--x 27
-  32 <--x 27
-  33 <--x 28
-  34 <--x 28
-  35 <--x 28
-  36 <--x 28
+  33 <--x 27
+  34 <--x 27
+  35 <--x 27
+  36 <--x 27
+  29 <--x 28
+  30 <--x 28
+  31 <--x 28
+  32 <--x 28
 ```
diff --git a/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/artifact_graph_flowchart.snap.md
index 6d6fd8cf7..ac3ca4736 100644
--- a/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/artifact_graph_flowchart.snap.md
@@ -49,7 +49,7 @@ flowchart LR
   43["SweepEdge Adjacent"]
   44["SweepEdge Adjacent"]
   1 --- 3
-  27 x--> 2
+  28 x--> 2
   3 --- 5
   3 --- 6
   3 --- 7
@@ -62,45 +62,45 @@ flowchart LR
   4 --- 12
   4 --- 13
   4 ---- 16
-  27 --- 4
+  28 --- 4
   5 --- 20
-  5 x--> 25
+  5 x--> 26
   5 --- 31
   5 --- 38
   6 --- 18
-  6 x--> 25
+  6 x--> 26
   6 --- 32
   6 --- 39
   7 --- 17
-  7 x--> 25
+  7 x--> 26
   7 --- 29
   7 --- 40
   8 --- 19
-  8 x--> 25
+  8 x--> 26
   8 --- 30
   8 --- 37
   9 --- 23
-  9 x--> 28
+  9 x--> 27
   9 --- 35
   9 --- 44
   10 --- 24
-  10 x--> 28
+  10 x--> 27
   10 --- 36
   10 --- 42
   11 --- 22
-  11 x--> 28
+  11 x--> 27
   11 --- 33
   11 --- 43
   12 --- 21
-  12 x--> 28
+  12 x--> 27
   12 --- 34
   12 --- 41
   15 --- 17
   15 --- 18
   15 --- 19
   15 --- 20
-  15 --- 25
-  15 --- 27
+  15 --- 26
+  15 --- 28
   15 --- 29
   15 --- 30
   15 --- 31
@@ -113,8 +113,8 @@ flowchart LR
   16 --- 22
   16 --- 23
   16 --- 24
-  16 --- 26
-  16 --- 28
+  16 --- 25
+  16 --- 27
   16 --- 33
   16 --- 34
   16 --- 35
@@ -147,12 +147,12 @@ flowchart LR
   36 <--x 24
   42 <--x 24
   44 <--x 24
-  33 <--x 26
-  34 <--x 26
-  35 <--x 26
-  36 <--x 26
-  29 <--x 27
-  30 <--x 27
-  31 <--x 27
-  32 <--x 27
+  33 <--x 25
+  34 <--x 25
+  35 <--x 25
+  36 <--x 25
+  29 <--x 28
+  30 <--x 28
+  31 <--x 28
+  32 <--x 28
 ```
diff --git a/rust/kcl-lib/tests/sketch_on_face_start/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/sketch_on_face_start/artifact_graph_flowchart.snap.md
index 2f5d51a9f..7ffc24767 100644
--- a/rust/kcl-lib/tests/sketch_on_face_start/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/sketch_on_face_start/artifact_graph_flowchart.snap.md
@@ -49,7 +49,7 @@ flowchart LR
   43["SweepEdge Adjacent"]
   44["SweepEdge Adjacent"]
   1 --- 3
-  25 x--> 2
+  26 x--> 2
   3 --- 5
   3 --- 6
   3 --- 7
@@ -62,45 +62,45 @@ flowchart LR
   4 --- 12
   4 --- 13
   4 ---- 16
-  25 --- 4
+  26 --- 4
   5 --- 20
-  5 x--> 25
+  5 x--> 26
   5 --- 31
   5 --- 38
   6 --- 18
-  6 x--> 25
+  6 x--> 26
   6 --- 32
   6 --- 39
   7 --- 17
-  7 x--> 25
+  7 x--> 26
   7 --- 29
   7 --- 40
   8 --- 19
-  8 x--> 25
+  8 x--> 26
   8 --- 30
   8 --- 37
   9 --- 23
-  9 x--> 26
+  9 x--> 25
   9 --- 35
   9 --- 44
   10 --- 24
-  10 x--> 26
+  10 x--> 25
   10 --- 36
   10 --- 42
   11 --- 22
-  11 x--> 26
+  11 x--> 25
   11 --- 33
   11 --- 43
   12 --- 21
-  12 x--> 26
+  12 x--> 25
   12 --- 34
   12 --- 41
   15 --- 17
   15 --- 18
   15 --- 19
   15 --- 20
-  15 --- 25
-  15 --- 27
+  15 --- 26
+  15 --- 28
   15 --- 29
   15 --- 30
   15 --- 31
@@ -113,8 +113,8 @@ flowchart LR
   16 --- 22
   16 --- 23
   16 --- 24
-  16 --- 26
-  16 --- 28
+  16 --- 25
+  16 --- 27
   16 --- 33
   16 --- 34
   16 --- 35
@@ -147,12 +147,12 @@ flowchart LR
   36 <--x 24
   42 <--x 24
   44 <--x 24
-  29 <--x 27
-  30 <--x 27
-  31 <--x 27
-  32 <--x 27
-  33 <--x 28
-  34 <--x 28
-  35 <--x 28
-  36 <--x 28
+  33 <--x 27
+  34 <--x 27
+  35 <--x 27
+  36 <--x 27
+  29 <--x 28
+  30 <--x 28
+  31 <--x 28
+  32 <--x 28
 ```
diff --git a/rust/kcl-lib/tests/subtract_cylinder_from_cube/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/subtract_cylinder_from_cube/artifact_graph_flowchart.snap.md
index 58ea6bec1..cab8089a9 100644
--- a/rust/kcl-lib/tests/subtract_cylinder_from_cube/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/subtract_cylinder_from_cube/artifact_graph_flowchart.snap.md
@@ -51,31 +51,31 @@ flowchart LR
   4 ---- 13
   4 <--x 14
   5 --- 18
-  5 x--> 20
+  5 x--> 21
   5 --- 25
   5 --- 29
   6 --- 16
-  6 x--> 20
+  6 x--> 21
   6 --- 24
   6 --- 32
   7 --- 15
-  7 x--> 20
+  7 x--> 21
   7 --- 27
   7 --- 31
   8 --- 17
-  8 x--> 20
+  8 x--> 21
   8 --- 26
   8 --- 30
   9 --- 19
-  9 x--> 21
+  9 x--> 20
   9 --- 28
   9 --- 33
   12 --- 15
   12 --- 16
   12 --- 17
   12 --- 18
-  12 --- 20
-  12 --- 22
+  12 --- 21
+  12 --- 23
   12 --- 24
   12 --- 25
   12 --- 26
@@ -85,8 +85,8 @@ flowchart LR
   12 --- 31
   12 --- 32
   13 --- 19
-  13 --- 21
-  13 --- 23
+  13 --- 20
+  13 --- 22
   13 --- 28
   13 --- 33
   27 <--x 15
@@ -103,9 +103,9 @@ flowchart LR
   30 <--x 18
   28 <--x 19
   33 <--x 19
-  24 <--x 22
-  25 <--x 22
-  26 <--x 22
-  27 <--x 22
-  28 <--x 23
+  28 <--x 22
+  24 <--x 23
+  25 <--x 23
+  26 <--x 23
+  27 <--x 23
 ```
diff --git a/rust/kcl-lib/tests/subtract_doesnt_need_brackets/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/subtract_doesnt_need_brackets/artifact_graph_flowchart.snap.md
index 7f86710c1..890fd1a3d 100644
--- a/rust/kcl-lib/tests/subtract_doesnt_need_brackets/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/subtract_doesnt_need_brackets/artifact_graph_flowchart.snap.md
@@ -66,43 +66,43 @@ flowchart LR
   4 ---- 15
   4 <--x 17
   5 --- 24
-  5 x--> 27
+  5 x--> 26
   5 --- 35
   5 --- 42
   6 --- 21
-  6 x--> 26
+  6 x--> 27
   6 --- 31
   6 --- 38
   7 --- 19
-  7 x--> 26
+  7 x--> 27
   7 --- 30
   7 --- 41
   8 --- 25
-  8 x--> 27
+  8 x--> 26
   8 --- 34
   8 --- 44
   9 --- 18
-  9 x--> 26
+  9 x--> 27
   9 --- 33
   9 --- 40
   10 --- 23
-  10 x--> 27
+  10 x--> 26
   10 --- 37
   10 --- 43
   11 --- 22
-  11 x--> 27
+  11 x--> 26
   11 --- 36
   11 --- 45
   12 --- 20
-  12 x--> 26
+  12 x--> 27
   12 --- 32
   12 --- 39
   15 --- 18
   15 --- 19
   15 --- 20
   15 --- 21
-  15 --- 26
-  15 --- 28
+  15 --- 27
+  15 --- 29
   15 --- 30
   15 --- 31
   15 --- 32
@@ -115,8 +115,8 @@ flowchart LR
   16 --- 23
   16 --- 24
   16 --- 25
-  16 --- 27
-  16 --- 29
+  16 --- 26
+  16 --- 28
   16 --- 34
   16 --- 35
   16 --- 36
@@ -149,12 +149,12 @@ flowchart LR
   34 <--x 25
   42 <--x 25
   44 <--x 25
-  30 <--x 28
-  31 <--x 28
-  32 <--x 28
-  33 <--x 28
-  34 <--x 29
-  35 <--x 29
-  36 <--x 29
-  37 <--x 29
+  34 <--x 28
+  35 <--x 28
+  36 <--x 28
+  37 <--x 28
+  30 <--x 29
+  31 <--x 29
+  32 <--x 29
+  33 <--x 29
 ```
diff --git a/rust/kcl-lib/tests/translate_after_fillet/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/translate_after_fillet/artifact_graph_flowchart.snap.md
index e0e3f552a..32d10ab96 100644
--- a/rust/kcl-lib/tests/translate_after_fillet/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/translate_after_fillet/artifact_graph_flowchart.snap.md
@@ -58,8 +58,8 @@ flowchart LR
   50["EdgeCut Fillet<br>[462, 528, 0]"]
   51["EdgeCut Fillet<br>[1387, 1446, 0]"]
   1 --- 4
-  30 x--> 2
-  32 x--> 3
+  29 x--> 2
+  31 x--> 3
   4 --- 7
   4 --- 16
   4 ---- 18
@@ -71,47 +71,47 @@ flowchart LR
   5 --- 13
   5 --- 15
   5 ---- 19
-  30 --- 5
+  29 --- 5
   6 --- 14
   6 --- 17
   6 ---- 20
-  32 --- 6
+  31 --- 6
   7 --- 28
-  7 x--> 32
+  7 x--> 31
   7 --- 40
   7 --- 48
   7 --- 50
   8 --- 26
-  8 x--> 30
+  8 x--> 29
   8 --- 36
   8 --- 43
   9 --- 27
-  9 x--> 30
+  9 x--> 29
   9 --- 34
   9 --- 45
   10 --- 24
-  10 x--> 30
+  10 x--> 29
   10 --- 38
   10 --- 47
   11 --- 25
-  11 x--> 30
+  11 x--> 29
   11 --- 39
   11 --- 42
   12 --- 23
-  12 x--> 30
+  12 x--> 29
   12 --- 37
   12 --- 46
   13 --- 22
-  13 x--> 30
+  13 x--> 29
   13 --- 35
   13 --- 44
   14 --- 21
-  14 x--> 32
+  14 x--> 31
   14 --- 33
   14 --- 41
   18 --- 28
-  18 --- 30
-  18 --- 32
+  18 --- 29
+  18 --- 31
   18 --- 40
   18 --- 48
   19 --- 22
@@ -120,7 +120,7 @@ flowchart LR
   19 --- 25
   19 --- 26
   19 --- 27
-  19 --- 29
+  19 --- 30
   19 --- 34
   19 --- 35
   19 --- 36
@@ -134,7 +134,7 @@ flowchart LR
   19 --- 46
   19 --- 47
   20 --- 21
-  20 --- 31
+  20 --- 32
   20 --- 33
   20 --- 41
   41 <--x 21
@@ -157,12 +157,12 @@ flowchart LR
   43 <--x 27
   45 <--x 27
   48 <--x 28
-  34 <--x 29
-  35 <--x 29
-  36 <--x 29
-  37 <--x 29
-  38 <--x 29
-  39 <--x 29
+  34 <--x 30
+  35 <--x 30
+  36 <--x 30
+  37 <--x 30
+  38 <--x 30
+  39 <--x 30
   33 <--x 51
   40 <--x 49
 ```
diff --git a/rust/kcl-lib/tests/union_cubes/artifact_graph_flowchart.snap.md b/rust/kcl-lib/tests/union_cubes/artifact_graph_flowchart.snap.md
index 8e43a409d..72922f5d5 100644
--- a/rust/kcl-lib/tests/union_cubes/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/union_cubes/artifact_graph_flowchart.snap.md
@@ -66,43 +66,43 @@ flowchart LR
   4 ---- 15
   4 <--x 17
   5 --- 24
-  5 x--> 27
+  5 x--> 26
   5 --- 35
   5 --- 42
   6 --- 21
-  6 x--> 26
+  6 x--> 27
   6 --- 31
   6 --- 38
   7 --- 19
-  7 x--> 26
+  7 x--> 27
   7 --- 30
   7 --- 41
   8 --- 25
-  8 x--> 27
+  8 x--> 26
   8 --- 34
   8 --- 44
   9 --- 18
-  9 x--> 26
+  9 x--> 27
   9 --- 33
   9 --- 40
   10 --- 23
-  10 x--> 27
+  10 x--> 26
   10 --- 37
   10 --- 43
   11 --- 22
-  11 x--> 27
+  11 x--> 26
   11 --- 36
   11 --- 45
   12 --- 20
-  12 x--> 26
+  12 x--> 27
   12 --- 32
   12 --- 39
   15 --- 18
   15 --- 19
   15 --- 20
   15 --- 21
-  15 --- 26
-  15 --- 28
+  15 --- 27
+  15 --- 29
   15 --- 30
   15 --- 31
   15 --- 32
@@ -115,8 +115,8 @@ flowchart LR
   16 --- 23
   16 --- 24
   16 --- 25
-  16 --- 27
-  16 --- 29
+  16 --- 26
+  16 --- 28
   16 --- 34
   16 --- 35
   16 --- 36
@@ -149,12 +149,12 @@ flowchart LR
   34 <--x 25
   42 <--x 25
   44 <--x 25
-  30 <--x 28
-  31 <--x 28
-  32 <--x 28
-  33 <--x 28
-  34 <--x 29
-  35 <--x 29
-  36 <--x 29
-  37 <--x 29
+  34 <--x 28
+  35 <--x 28
+  36 <--x 28
+  37 <--x 28
+  30 <--x 29
+  31 <--x 29
+  32 <--x 29
+  33 <--x 29
 ```
diff --git a/src/lang/executor.test.ts b/src/lang/executor.test.ts
index 119dc9016..4827edc44 100644
--- a/src/lang/executor.test.ts
+++ b/src/lang/executor.test.ts
@@ -433,7 +433,8 @@ describe('testing math operators', () => {
     expect((removedUnaryExpMemSketch as Sketch).paths?.[1]?.to).toEqual([6, 8])
   })
   it('with nested callExpression and binaryExpression', async () => {
-    const code = 'myVar = 2 + math::min([100, -1 + legLen(hypotenuse = 5, leg = 3)])'
+    const code =
+      'myVar = 2 + math::min([100, -1 + legLen(hypotenuse = 5, leg = 3)])'
     const mem = await exe(code)
     expect(mem['myVar']?.value).toBe(5)
   })