Update kcl-samples simulation test output

public/kcl-samples/pipe-flange-assembly/1120t74-pipe.kcl

@@ -7,17 +7,13 @@
 // Import parameters
 import pipeInnerDiameter, pipeOuterDiameter, pipeLength from "parameters.kcl"
 
-// Create a function to make the pipe. Export
-export fn pipe() {
 // Create the pipe base
 pipeBase = startSketchOn(XZ)
   |> circle(%, center = [0, 0], radius = pipeOuterDiameter / 2)
   |> extrude(%, length = pipeLength)
 
 // Extrude a hole through the length of the pipe
-  pipe = startSketchOn(pipeBase, face = END)
+startSketchOn(pipeBase, face = END)
   |> circle(center = [0, 0], radius = pipeInnerDiameter / 2)
   |> extrude(%, length = -pipeLength)
   |> appearance(color = "#a24ed0")
-  return pipe
-}

public/kcl-samples/pipe-flange-assembly/68095k348-flange.kcl

@@ -7,8 +7,6 @@
 // Import parameters
 import pipeDiameter, mountingHoleDiameter, mountingHolePlacementDiameter, flangeDiameter, flangeTotalThickness, flangeBackHeight, flangeFrontHeight, flangeBaseThickness, flangeBackDiameter, flangeFrontDiameter from "parameters.kcl"
 
-// Create a function to create the flange. We must create a function since we are using multiple flanges.
-export fn flange() {
 // Sketch the mounting hole pattern
 mountingHoles = startSketchOn(XY)
   |> circle(%, center = [0, mountingHolePlacementDiameter / 2], radius = mountingHoleDiameter / 2)
@@ -35,10 +33,7 @@ export fn flange() {
   |> extrude(%, length = flangeFrontHeight)
 
 // Create the circular cut in the center for the pipe
-  pipeCut = startSketchOn(flangeFront, face = END)
+startSketchOn(flangeFront, face = END)
   |> circle(%, center = [0, 0], radius = pipeDiameter / 2)
   |> extrude(%, length = -flangeTotalThickness)
   |> appearance(%, color = "#bab0b0")
-
-  return pipeCut
-}

public/kcl-samples/pipe-flange-assembly/91251a404-bolt.kcl

@@ -7,8 +7,6 @@
 // Import parameters
 import boltDiameter, boltLength, boltHeadLength, boltHeadDiameter, boltHexDrive, boltHexFlatLength, boltThreadLength from "parameters.kcl"
 
-// Create a function to make a the bolt
-export fn bolt() {
 // Create the head of the cap screw
 boltHead = startSketchOn(XZ)
   |> circle(center = [0, 0], radius = boltHeadDiameter / 2, tag = $topEdge)
@@ -30,10 +28,7 @@ export fn bolt() {
   |> extrude(length = -boltHeadLength * 0.75)
 
 // create the body of the bolt
-  boltBody = startSketchOn(boltHead, face = END)
+startSketchOn(boltHead, face = END)
   |> circle(center = [0, 0], radius = boltDiameter / 2, tag = $filletEdge)
   |> extrude(length = boltLength)
   |> appearance(color = "#4dd043", metalness = 90, roughness = 90)
-
-  return boltBody
-}

public/kcl-samples/pipe-flange-assembly/95479a127-hex-nut.kcl

@@ -7,8 +7,6 @@
 // Import parameters
 import hexNutDiameter, hexNutFlatToFlat, hexNutThickness, hexNutFlatLength from "parameters.kcl"
 
-// Create a function to make the hex nut. Must be a function since multiple hex nuts are used
-export fn hexNut() {
 // Create the base of the hex nut
 hexNutBase = startSketchOn(XY)
   |> startProfile(at = [
@@ -24,10 +22,7 @@ export fn hexNut() {
   |> extrude(length = hexNutThickness)
 
 // Create the hole in the center of the hex nut
-  hexNut = startSketchOn(hexNutBase, face = END)
+startSketchOn(hexNutBase, face = END)
   |> circle(center = [0, 0], radius = hexNutDiameter / 2)
   |> extrude(%, length = -hexNutThickness)
   |> appearance(%, color = "#4edfd5")
-
-  return hexNut
-}

public/kcl-samples/pipe-flange-assembly/98017a257-washer.kcl

@@ -7,8 +7,6 @@
 // Import parameters
 import washerInnerDia, washerOuterDia, washerThickness from "parameters.kcl"
 
-// Create a function to make the washer. Must be a function since multiple washers are used.
-export fn washer() {
 // Create the base of the washer
 washerBase = startSketchOn(XY)
   |> circle(center = [0, 0], radius = washerOuterDia / 2)
@@ -19,6 +17,3 @@ export fn washer() {
   |> circle(center = [0, 0], radius = washerInnerDia / 2)
   |> extrude(%, length = -washerThickness)
   |> appearance(%, color = "#ee4f4f")
-
-  return washer
-}

public/kcl-samples/pipe-flange-assembly/main.kcl

@@ -9,16 +9,19 @@ import * from "parameters.kcl"
 
 // Import parts
 import "9472k188-gasket.kcl" as gasket
-import flange from "68095k348-flange.kcl"
+import "68095k348-flange.kcl" as flange
-import washer from "98017a257-washer.kcl"
+import "98017a257-washer.kcl" as washer
-import bolt from "91251a404-bolt.kcl"
+import "91251a404-bolt.kcl" as bolt
-import hexNut from "95479a127-hex-nut.kcl"
+import "95479a127-hex-nut.kcl" as hexNut
-import pipe from "1120t74-pipe.kcl"
+import "1120t74-pipe.kcl" as pipe
 
-// Place flanges
+// Place flange clone
-flange()
+rotate(
-flange()
+       clone(flange),
-  |> rotate(axis = [0, 1, 0], angle = 180)
+       roll = 180,
+       pitch = 0,
+       yaw = 0,
+     )
   |> translate(x = 0, y = 0, z = flangeBackHeight * 2 + gasketThickness)
 
 // Place gasket between the flanges
@@ -26,7 +29,7 @@ gasket
   |> translate(x = 0, y = 0, z = -flangeBackHeight - gasketThickness)
 
 // Place eight washers (four front, four back)
-washer()
+washer
   |> translate(x = mountingHolePlacementDiameter / 2, y = 0, z = flangeBaseThickness)
   |> patternCircular3d(
        %,
@@ -44,7 +47,8 @@ washer()
      )
 
 // Place four bolts
-bolt()
+
+bolt
   |> translate(x = mountingHolePlacementDiameter / 2, y = 0, z = flangeBaseThickness + washerThickness)
   |> rotate(roll = 90, pitch = 0, yaw = 0)
   |> patternCircular3d(
@@ -57,7 +61,7 @@ bolt()
      )
 
 // Place four hex nuts
-hexNut()
+hexNut
   |> translate(x = mountingHolePlacementDiameter / 2, y = 0, z = -(flangeBackHeight * 2 + gasketThickness + flangeBaseThickness + washerThickness + hexNutThickness))
   |> patternCircular3d(
        %,
@@ -69,9 +73,8 @@ hexNut()
      )
 
 // Place both pieces of pipe
-pipe()
+rotate(
-  |> rotate(
+       pipe,
-       %,
        roll = -90,
        pitch = 0,
        yaw = 0,
@@ -83,16 +86,13 @@ pipe()
        z = flangeBaseThickness + flangeFrontHeight - 0.5,
        global = true,
      )
-
+rotate(
-pipe()
+       clone(pipe),
-  |> rotate(
+       roll = 180,
-       %,
-       roll = 90,
        pitch = 0,
        yaw = 0,
      )
   |> translate(
-       %,
        x = 0,
        y = 0,
        z = -(flangeBackHeight * 2 + gasketThickness + flangeBaseThickness + flangeFrontHeight - 0.5),

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

@@ -652,19 +652,19 @@ flowchart LR
   84 --- 144
   84 --- 237
   86 --- 168
-  86 x--> 188
+  86 x--> 189
   86 --- 212
   86 --- 256
   88 --- 169
-  88 x--> 188
+  88 x--> 189
   88 --- 213
   88 --- 257
   90 --- 167
-  90 x--> 188
+  90 x--> 189
   90 --- 214
   90 --- 258
   92 --- 170
-  92 x--> 188
+  92 x--> 189
   92 --- 215
   92 --- 259
   119 --- 133
@@ -946,10 +946,10 @@ flowchart LR
   218 <--x 186
   219 <--x 186
   194 <--x 187
-  212 <--x 189
+  212 <--x 188
-  213 <--x 189
+  213 <--x 188
-  214 <--x 189
+  214 <--x 188
-  215 <--x 189
+  215 <--x 188
   220 <--x 268
   223 <--x 267
 ```

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

@@ -87,20 +87,20 @@ flowchart LR
   27 --- 4
   8 --- 20
   8 x--> 25
-  8 --- 29
+  8 --- 30
-  8 --- 35
+  8 --- 36
   9 --- 21
   9 x--> 25
   9 --- 33
   9 --- 39
   10 --- 22
   10 x--> 25
-  10 --- 30
+  10 --- 31
-  10 --- 36
+  10 --- 37
   11 --- 23
   11 x--> 25
-  11 --- 31
+  11 --- 29
-  11 --- 37
+  11 --- 35
   12 --- 24
   12 x--> 25
   12 --- 32
@@ -132,18 +132,18 @@ flowchart LR
   18 --- 34
   19 --- 28
   19 --- 34
-  20 --- 29
+  20 --- 30
-  20 --- 35
+  20 --- 36
-  36 <--x 20
+  37 <--x 20
   21 --- 33
   35 <--x 21
   21 --- 39
-  22 --- 30
+  22 --- 31
-  22 --- 36
+  22 --- 37
-  37 <--x 22
+  38 <--x 22
-  23 --- 31
+  23 --- 29
-  23 --- 37
+  23 --- 35
-  38 <--x 23
+  36 <--x 23
   24 --- 32
   24 --- 38
   39 <--x 24

rust/kcl-lib/tests/kcl_samples/cold-plate/artifact_graph_flowchart.snap.md

@@ -366,114 +366,114 @@ flowchart LR
   11 ---- 74
   26 --- 75
   26 x--> 108
-  26 --- 130
+  26 --- 114
-  26 --- 162
+  26 --- 146
   27 --- 76
   27 x--> 108
-  27 --- 116
+  27 --- 139
-  27 --- 148
+  27 --- 171
   28 --- 77
   28 x--> 108
-  28 --- 139
+  28 --- 135
-  28 --- 171
+  28 --- 167
   29 --- 78
   29 x--> 108
-  29 --- 135
+  29 --- 133
-  29 --- 167
+  29 --- 165
   30 --- 79
   30 x--> 108
-  30 --- 128
+  30 --- 121
-  30 --- 160
+  30 --- 153
   31 --- 80
   31 x--> 108
-  31 --- 123
+  31 --- 115
-  31 --- 155
+  31 --- 147
   32 --- 81
   32 x--> 108
-  32 --- 127
+  32 --- 129
-  32 --- 159
+  32 --- 161
   33 --- 82
   33 x--> 108
-  33 --- 132
+  33 --- 131
-  33 --- 164
+  33 --- 163
   34 --- 83
   34 x--> 108
-  34 --- 133
+  34 --- 138
-  34 --- 165
+  34 --- 170
   35 --- 84
   35 x--> 108
-  35 --- 121
+  35 --- 119
-  35 --- 153
+  35 --- 151
   36 --- 85
   36 x--> 108
-  36 --- 137
+  36 --- 125
-  36 --- 169
+  36 --- 157
   37 --- 86
   37 x--> 108
-  37 --- 115
+  37 --- 117
-  37 --- 147
+  37 --- 149
   38 --- 87
   38 x--> 108
-  38 --- 120
+  38 --- 122
-  38 --- 152
+  38 --- 154
   39 --- 88
   39 x--> 108
-  39 --- 124
+  39 --- 113
-  39 --- 156
+  39 --- 145
   40 --- 89
   40 x--> 108
-  40 --- 134
+  40 --- 124
-  40 --- 166
+  40 --- 156
   41 --- 90
   41 x--> 108
-  41 --- 136
+  41 --- 134
-  41 --- 168
+  41 --- 166
   42 --- 91
   42 x--> 108
-  42 --- 122
+  42 --- 132
-  42 --- 154
+  42 --- 164
   43 --- 92
   43 x--> 108
-  43 --- 114
+  43 --- 120
-  43 --- 146
+  43 --- 152
   44 --- 93
   44 x--> 108
-  44 --- 113
+  44 --- 118
-  44 --- 145
+  44 --- 150
   45 --- 94
   45 x--> 108
-  45 --- 131
+  45 --- 137
-  45 --- 163
+  45 --- 169
   46 --- 95
   46 x--> 108
-  46 --- 117
+  46 --- 130
-  46 --- 149
+  46 --- 162
   47 --- 96
   47 x--> 108
-  47 --- 125
+  47 --- 126
-  47 --- 157
+  47 --- 158
   48 --- 97
   48 x--> 108
-  48 --- 119
+  48 --- 128
-  48 --- 151
+  48 --- 160
   49 --- 98
   49 x--> 108
-  49 --- 126
+  49 --- 127
-  49 --- 158
+  49 --- 159
   50 --- 99
   50 x--> 108
-  50 --- 118
+  50 --- 136
-  50 --- 150
+  50 --- 168
   51 --- 100
   51 x--> 108
-  51 --- 129
+  51 --- 116
-  51 --- 161
+  51 --- 148
   52 --- 101
   52 x--> 108
-  52 --- 138
+  52 --- 123
-  52 --- 170
+  52 --- 155
   61 --- 102
-  61 x--> 110
+  61 x--> 109
   61 --- 140
   61 --- 172
   63 --- 103
@@ -594,87 +594,87 @@ flowchart LR
   74 --- 174
   74 --- 175
   74 --- 176
-  75 --- 130
+  75 --- 114
-  75 --- 162
+  75 --- 146
-  163 <--x 75
+  147 <--x 75
-  76 --- 116
+  76 --- 139
-  76 --- 148
+  145 <--x 76
-  149 <--x 76
+  76 --- 171
-  77 --- 139
+  77 --- 135
-  145 <--x 77
+  77 --- 167
-  77 --- 171
+  168 <--x 77
-  78 --- 135
+  78 --- 133
-  78 --- 167
+  78 --- 165
-  168 <--x 78
+  166 <--x 78
-  79 --- 128
+  79 --- 121
-  79 --- 160
+  79 --- 153
-  161 <--x 79
+  154 <--x 79
-  80 --- 123
+  80 --- 115
-  80 --- 155
+  80 --- 147
-  156 <--x 80
+  148 <--x 80
-  81 --- 127
+  81 --- 129
-  81 --- 159
+  81 --- 161
-  160 <--x 81
+  162 <--x 81
-  82 --- 132
+  82 --- 131
-  82 --- 164
+  82 --- 163
-  165 <--x 82
+  164 <--x 82
-  83 --- 133
+  83 --- 138
-  83 --- 165
+  83 --- 170
-  166 <--x 83
+  171 <--x 83
-  84 --- 121
+  84 --- 119
-  84 --- 153
+  84 --- 151
-  154 <--x 84
+  152 <--x 84
-  85 --- 137
+  85 --- 125
-  85 --- 169
+  85 --- 157
-  170 <--x 85
+  158 <--x 85
-  86 --- 115
+  86 --- 117
-  86 --- 147
+  86 --- 149
-  148 <--x 86
+  150 <--x 86
-  87 --- 120
+  87 --- 122
-  87 --- 152
+  87 --- 154
-  153 <--x 87
+  155 <--x 87
-  88 --- 124
+  88 --- 113
-  88 --- 156
+  88 --- 145
-  157 <--x 88
+  146 <--x 88
-  89 --- 134
+  89 --- 124
-  89 --- 166
+  89 --- 156
-  167 <--x 89
+  157 <--x 89
-  90 --- 136
+  90 --- 134
-  90 --- 168
+  90 --- 166
-  169 <--x 90
+  167 <--x 90
-  91 --- 122
+  91 --- 132
-  91 --- 154
+  91 --- 164
-  155 <--x 91
+  165 <--x 91
-  92 --- 114
+  92 --- 120
-  92 --- 146
+  92 --- 152
-  147 <--x 92
+  153 <--x 92
-  93 --- 113
+  93 --- 118
-  93 --- 145
+  93 --- 150
-  146 <--x 93
+  151 <--x 93
-  94 --- 131
+  94 --- 137
-  94 --- 163
+  94 --- 169
-  164 <--x 94
+  170 <--x 94
-  95 --- 117
+  95 --- 130
-  95 --- 149
+  95 --- 162
-  150 <--x 95
+  163 <--x 95
-  96 --- 125
+  96 --- 126
-  96 --- 157
+  96 --- 158
-  158 <--x 96
+  159 <--x 96
-  97 --- 119
+  97 --- 128
-  97 --- 151
+  97 --- 160
-  152 <--x 97
+  161 <--x 97
-  98 --- 126
+  98 --- 127
-  98 --- 158
+  98 --- 159
-  159 <--x 98
+  160 <--x 98
-  99 --- 118
+  99 --- 136
-  99 --- 150
+  99 --- 168
-  151 <--x 99
+  169 <--x 99
-  100 --- 129
+  100 --- 116
-  100 --- 161
+  100 --- 148
-  162 <--x 100
+  149 <--x 100
-  101 --- 138
+  101 --- 123
-  101 --- 170
+  101 --- 155
-  171 <--x 101
+  156 <--x 101
   102 --- 140
   102 --- 172
   103 --- 144
@@ -689,7 +689,7 @@ flowchart LR
   106 --- 141
   106 --- 173
   174 <--x 106
-  140 <--x 109
+  140 <--x 110
   141 <--x 111
   142 <--x 111
   143 <--x 111

rust/kcl-lib/tests/kcl_samples/helium-tank/artifact_graph_flowchart.snap.md

@@ -582,48 +582,48 @@ flowchart LR
   46 --- 226
   72 --- 112
   72 x--> 151
-  72 --- 167
+  72 --- 163
-  72 --- 201
+  72 --- 197
   73 --- 113
   73 x--> 151
-  73 --- 169
+  73 --- 164
-  73 --- 203
+  73 --- 198
   74 --- 114
   74 x--> 151
   74 --- 168
   74 --- 202
   75 --- 115
   75 x--> 151
-  75 --- 166
+  75 --- 165
-  75 --- 200
+  75 --- 199
   76 --- 116
   76 x--> 151
-  76 --- 165
+  76 --- 162
-  76 --- 199
+  76 --- 196
   77 --- 117
   77 x--> 151
   77 --- 161
   77 --- 195
   78 --- 118
   78 x--> 151
-  78 --- 162
+  78 --- 167
-  78 --- 196
+  78 --- 201
   79 --- 119
   79 x--> 151
-  79 --- 163
+  79 --- 170
-  79 --- 197
+  79 --- 204
   80 --- 120
   80 x--> 151
-  80 --- 170
+  80 --- 160
-  80 --- 204
+  80 --- 194
   81 --- 121
   81 x--> 151
-  81 --- 160
+  81 --- 169
-  81 --- 194
+  81 --- 203
   82 --- 122
   82 x--> 151
-  82 --- 164
+  82 --- 166
-  82 --- 198
+  82 --- 200
   84 --- 123
   84 x--> 145
   84 --- 171
@@ -756,39 +756,39 @@ flowchart LR
   109 --- 107
   111 --- 159
   111 --- 193
-  112 --- 167
+  112 --- 163
-  112 --- 201
+  112 --- 197
-  202 <--x 112
+  198 <--x 112
-  113 --- 169
+  113 --- 164
-  113 --- 203
+  113 --- 198
-  204 <--x 113
+  199 <--x 113
   114 --- 168
   114 --- 202
   203 <--x 114
-  115 --- 166
+  115 --- 165
-  115 --- 200
+  115 --- 199
-  201 <--x 115
+  200 <--x 115
-  116 --- 165
+  116 --- 162
-  116 --- 199
+  116 --- 196
-  200 <--x 116
+  197 <--x 116
   117 --- 161
   117 --- 195
   196 <--x 117
-  118 --- 162
+  118 --- 167
-  118 --- 196
+  118 --- 201
-  197 <--x 118
+  202 <--x 118
-  119 --- 163
+  119 --- 170
-  119 --- 197
+  194 <--x 119
-  198 <--x 119
+  119 --- 204
-  120 --- 170
+  120 --- 160
-  194 <--x 120
+  120 --- 194
-  120 --- 204
+  195 <--x 120
-  121 --- 160
+  121 --- 169
-  121 --- 194
+  121 --- 203
-  195 <--x 121
+  204 <--x 121
-  122 --- 164
+  122 --- 166
-  122 --- 198
+  122 --- 200
-  199 <--x 122
+  201 <--x 122
   123 --- 171
   123 --- 205
   124 --- 186

rust/kcl-lib/tests/kcl_samples/i-beam/artifact_graph_flowchart.snap.md

@@ -177,72 +177,72 @@ flowchart LR
   2 ---- 34
   17 --- 35
   17 x--> 52
-  17 --- 58
+  17 --- 67
-  17 --- 75
+  17 --- 84
   18 --- 36
   18 x--> 52
-  18 --- 66
+  18 --- 65
-  18 --- 83
+  18 --- 82
   19 --- 37
   19 x--> 52
-  19 --- 60
+  19 --- 55
-  19 --- 77
+  19 --- 72
   20 --- 38
   20 x--> 52
   20 --- 61
   20 --- 78
   21 --- 39
   21 x--> 52
-  21 --- 67
+  21 --- 69
-  21 --- 84
+  21 --- 86
   22 --- 40
   22 x--> 52
   22 --- 63
   22 --- 80
   23 --- 41
   23 x--> 52
-  23 --- 56
+  23 --- 60
-  23 --- 73
+  23 --- 77
   24 --- 42
   24 x--> 52
   24 --- 54
   24 --- 71
   25 --- 43
   25 x--> 52
-  25 --- 70
+  25 --- 66
-  25 --- 87
+  25 --- 83
   26 --- 44
   26 x--> 52
-  26 --- 68
+  26 --- 57
-  26 --- 85
+  26 --- 74
   27 --- 45
   27 x--> 52
-  27 --- 65
+  27 --- 64
-  27 --- 82
+  27 --- 81
   28 --- 46
   28 x--> 52
-  28 --- 62
+  28 --- 58
-  28 --- 79
+  28 --- 75
   29 --- 47
   29 x--> 52
-  29 --- 57
+  29 --- 59
-  29 --- 74
+  29 --- 76
   30 --- 48
   30 x--> 52
-  30 --- 55
+  30 --- 56
-  30 --- 72
+  30 --- 73
   31 --- 49
   31 x--> 52
-  31 --- 64
+  31 --- 62
-  31 --- 81
+  31 --- 79
   32 --- 50
   32 x--> 52
-  32 --- 69
+  32 --- 70
-  32 --- 86
+  32 --- 87
   33 --- 51
   33 x--> 52
-  33 --- 59
+  33 --- 68
-  33 --- 76
+  33 --- 85
   34 --- 35
   34 --- 36
   34 --- 37
@@ -296,57 +296,57 @@ flowchart LR
   34 --- 85
   34 --- 86
   34 --- 87
-  35 --- 58
+  35 --- 67
-  74 <--x 35
+  83 <--x 35
-  35 --- 75
+  35 --- 84
-  36 --- 66
+  36 --- 65
-  82 <--x 36
+  81 <--x 36
-  36 --- 83
+  36 --- 82
-  37 --- 60
+  37 --- 55
-  76 <--x 37
+  71 <--x 37
-  37 --- 77
+  37 --- 72
   38 --- 61
   77 <--x 38
   38 --- 78
-  39 --- 67
+  39 --- 69
-  83 <--x 39
+  85 <--x 39
-  39 --- 84
+  39 --- 86
   40 --- 63
   79 <--x 40
   40 --- 80
-  41 --- 56
+  41 --- 60
-  72 <--x 41
+  76 <--x 41
-  41 --- 73
+  41 --- 77
   42 --- 54
   42 --- 71
   87 <--x 42
-  43 --- 70
+  43 --- 66
-  86 <--x 43
+  82 <--x 43
-  43 --- 87
+  43 --- 83
-  44 --- 68
+  44 --- 57
-  84 <--x 44
+  73 <--x 44
-  44 --- 85
+  44 --- 74
-  45 --- 65
+  45 --- 64
-  81 <--x 45
+  80 <--x 45
-  45 --- 82
+  45 --- 81
-  46 --- 62
+  46 --- 58
-  78 <--x 46
+  74 <--x 46
-  46 --- 79
+  46 --- 75
-  47 --- 57
+  47 --- 59
-  73 <--x 47
+  75 <--x 47
-  47 --- 74
+  47 --- 76
-  48 --- 55
+  48 --- 56
-  71 <--x 48
+  72 <--x 48
-  48 --- 72
+  48 --- 73
-  49 --- 64
+  49 --- 62
-  80 <--x 49
+  78 <--x 49
-  49 --- 81
+  49 --- 79
-  50 --- 69
+  50 --- 70
-  85 <--x 50
+  86 <--x 50
-  50 --- 86
+  50 --- 87
-  51 --- 59
+  51 --- 68
-  75 <--x 51
+  84 <--x 51
-  51 --- 76
+  51 --- 85
   54 <--x 53
   55 <--x 53
   56 <--x 53

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

@@ -59,23 +59,14 @@ description: Result of parsing pipe-flange-assembly.kcl
           "filename": "68095k348-flange.kcl"
         },
         "selector": {
-          "type": "List",
+          "type": "None",
-          "items": [
+          "alias": {
-            {
-              "alias": null,
-              "commentStart": 0,
-              "end": 0,
-              "name": {
             "commentStart": 0,
             "end": 0,
             "name": "flange",
             "start": 0,
             "type": "Identifier"
-              },
-              "start": 0,
-              "type": "ImportItem"
           }
-          ]
         },
         "start": 0,
         "type": "ImportStatement",
@@ -89,23 +80,14 @@ description: Result of parsing pipe-flange-assembly.kcl
           "filename": "98017a257-washer.kcl"
         },
         "selector": {
-          "type": "List",
+          "type": "None",
-          "items": [
+          "alias": {
-            {
-              "alias": null,
-              "commentStart": 0,
-              "end": 0,
-              "name": {
             "commentStart": 0,
             "end": 0,
             "name": "washer",
             "start": 0,
             "type": "Identifier"
-              },
-              "start": 0,
-              "type": "ImportItem"
           }
-          ]
         },
         "start": 0,
         "type": "ImportStatement",
@@ -119,23 +101,14 @@ description: Result of parsing pipe-flange-assembly.kcl
           "filename": "91251a404-bolt.kcl"
         },
         "selector": {
-          "type": "List",
+          "type": "None",
-          "items": [
+          "alias": {
-            {
-              "alias": null,
-              "commentStart": 0,
-              "end": 0,
-              "name": {
             "commentStart": 0,
             "end": 0,
             "name": "bolt",
             "start": 0,
             "type": "Identifier"
-              },
-              "start": 0,
-              "type": "ImportItem"
           }
-          ]
         },
         "start": 0,
         "type": "ImportStatement",
@@ -149,23 +122,14 @@ description: Result of parsing pipe-flange-assembly.kcl
           "filename": "95479a127-hex-nut.kcl"
         },
         "selector": {
-          "type": "List",
+          "type": "None",
-          "items": [
+          "alias": {
-            {
-              "alias": null,
-              "commentStart": 0,
-              "end": 0,
-              "name": {
             "commentStart": 0,
             "end": 0,
             "name": "hexNut",
             "start": 0,
             "type": "Identifier"
-              },
-              "start": 0,
-              "type": "ImportItem"
           }
-          ]
         },
         "start": 0,
         "type": "ImportStatement",
@@ -179,91 +143,24 @@ description: Result of parsing pipe-flange-assembly.kcl
           "filename": "1120t74-pipe.kcl"
         },
         "selector": {
-          "type": "List",
+          "type": "None",
-          "items": [
+          "alias": {
-            {
-              "alias": null,
-              "commentStart": 0,
-              "end": 0,
-              "name": {
             "commentStart": 0,
             "end": 0,
             "name": "pipe",
             "start": 0,
             "type": "Identifier"
-              },
-              "start": 0,
-              "type": "ImportItem"
           }
-          ]
         },
         "start": 0,
         "type": "ImportStatement",
         "type": "ImportStatement"
       },
-      {
-        "commentStart": 0,
-        "end": 0,
-        "expression": {
-          "callee": {
-            "abs_path": false,
-            "commentStart": 0,
-            "end": 0,
-            "name": {
-              "commentStart": 0,
-              "end": 0,
-              "name": "flange",
-              "start": 0,
-              "type": "Identifier"
-            },
-            "path": [],
-            "start": 0,
-            "type": "Name"
-          },
-          "commentStart": 0,
-          "end": 0,
-          "start": 0,
-          "type": "CallExpressionKw",
-          "type": "CallExpressionKw",
-          "unlabeled": null
-        },
-        "preComments": [
-          "",
-          "",
-          "// Place flanges"
-        ],
-        "start": 0,
-        "type": "ExpressionStatement",
-        "type": "ExpressionStatement"
-      },
       {
         "commentStart": 0,
         "end": 0,
         "expression": {
           "body": [
-            {
-              "callee": {
-                "abs_path": false,
-                "commentStart": 0,
-                "end": 0,
-                "name": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": "flange",
-                  "start": 0,
-                  "type": "Identifier"
-                },
-                "path": [],
-                "start": 0,
-                "type": "Name"
-              },
-              "commentStart": 0,
-              "end": 0,
-              "start": 0,
-              "type": "CallExpressionKw",
-              "type": "CallExpressionKw",
-              "unlabeled": null
-            },
             {
               "arguments": [
                 {
@@ -271,62 +168,7 @@ description: Result of parsing pipe-flange-assembly.kcl
                   "label": {
                     "commentStart": 0,
                     "end": 0,
-                    "name": "axis",
+                    "name": "roll",
-                    "start": 0,
-                    "type": "Identifier"
-                  },
-                  "arg": {
-                    "commentStart": 0,
-                    "elements": [
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "raw": "0",
-                        "start": 0,
-                        "type": "Literal",
-                        "type": "Literal",
-                        "value": {
-                          "value": 0.0,
-                          "suffix": "None"
-                        }
-                      },
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "raw": "1",
-                        "start": 0,
-                        "type": "Literal",
-                        "type": "Literal",
-                        "value": {
-                          "value": 1.0,
-                          "suffix": "None"
-                        }
-                      },
-                      {
-                        "commentStart": 0,
-                        "end": 0,
-                        "raw": "0",
-                        "start": 0,
-                        "type": "Literal",
-                        "type": "Literal",
-                        "value": {
-                          "value": 0.0,
-                          "suffix": "None"
-                        }
-                      }
-                    ],
-                    "end": 0,
-                    "start": 0,
-                    "type": "ArrayExpression",
-                    "type": "ArrayExpression"
-                  }
-                },
-                {
-                  "type": "LabeledArg",
-                  "label": {
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": "angle",
                     "start": 0,
                     "type": "Identifier"
                   },
@@ -342,6 +184,50 @@ description: Result of parsing pipe-flange-assembly.kcl
                       "suffix": "None"
                     }
                   }
+                },
+                {
+                  "type": "LabeledArg",
+                  "label": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "pitch",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "arg": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "raw": "0",
+                    "start": 0,
+                    "type": "Literal",
+                    "type": "Literal",
+                    "value": {
+                      "value": 0.0,
+                      "suffix": "None"
+                    }
+                  }
+                },
+                {
+                  "type": "LabeledArg",
+                  "label": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "yaw",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "arg": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "raw": "0",
+                    "start": 0,
+                    "type": "Literal",
+                    "type": "Literal",
+                    "value": {
+                      "value": 0.0,
+                      "suffix": "None"
+                    }
+                  }
                 }
               ],
               "callee": {
@@ -364,7 +250,44 @@ description: Result of parsing pipe-flange-assembly.kcl
               "start": 0,
               "type": "CallExpressionKw",
               "type": "CallExpressionKw",
-              "unlabeled": null
+              "unlabeled": {
+                "callee": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "clone",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name"
+                },
+                "commentStart": 0,
+                "end": 0,
+                "start": 0,
+                "type": "CallExpressionKw",
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "flange",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
+              }
             },
             {
               "arguments": [
@@ -510,7 +433,7 @@ description: Result of parsing pipe-flange-assembly.kcl
           "end": 0,
           "nonCodeMeta": {
             "nonCodeNodes": {
-              "2": [
+              "1": [
                 {
                   "commentStart": 0,
                   "end": 0,
@@ -530,6 +453,11 @@ description: Result of parsing pipe-flange-assembly.kcl
           "type": "PipeExpression",
           "type": "PipeExpression"
         },
+        "preComments": [
+          "",
+          "",
+          "// Place flange clone"
+        ],
         "start": 0,
         "type": "ExpressionStatement",
         "type": "ExpressionStatement"
@@ -717,7 +645,6 @@ description: Result of parsing pipe-flange-assembly.kcl
         "expression": {
           "body": [
             {
-              "callee": {
               "abs_path": false,
               "commentStart": 0,
               "end": 0,
@@ -730,15 +657,9 @@ description: Result of parsing pipe-flange-assembly.kcl
               },
               "path": [],
               "start": 0,
+              "type": "Name",
               "type": "Name"
             },
-              "commentStart": 0,
-              "end": 0,
-              "start": 0,
-              "type": "CallExpressionKw",
-              "type": "CallExpressionKw",
-              "unlabeled": null
-            },
             {
               "arguments": [
                 {
@@ -1351,7 +1272,6 @@ description: Result of parsing pipe-flange-assembly.kcl
         "expression": {
           "body": [
             {
-              "callee": {
               "abs_path": false,
               "commentStart": 0,
               "end": 0,
@@ -1364,15 +1284,9 @@ description: Result of parsing pipe-flange-assembly.kcl
               },
               "path": [],
               "start": 0,
+              "type": "Name",
               "type": "Name"
             },
-              "commentStart": 0,
-              "end": 0,
-              "start": 0,
-              "type": "CallExpressionKw",
-              "type": "CallExpressionKw",
-              "unlabeled": null
-            },
             {
               "arguments": [
                 {
@@ -1846,7 +1760,6 @@ description: Result of parsing pipe-flange-assembly.kcl
         "expression": {
           "body": [
             {
-              "callee": {
               "abs_path": false,
               "commentStart": 0,
               "end": 0,
@@ -1859,15 +1772,9 @@ description: Result of parsing pipe-flange-assembly.kcl
               },
               "path": [],
               "start": 0,
+              "type": "Name",
               "type": "Name"
             },
-              "commentStart": 0,
-              "end": 0,
-              "start": 0,
-              "type": "CallExpressionKw",
-              "type": "CallExpressionKw",
-              "unlabeled": null
-            },
             {
               "arguments": [
                 {
@@ -2349,29 +2256,6 @@ description: Result of parsing pipe-flange-assembly.kcl
         "end": 0,
         "expression": {
           "body": [
-            {
-              "callee": {
-                "abs_path": false,
-                "commentStart": 0,
-                "end": 0,
-                "name": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": "pipe",
-                  "start": 0,
-                  "type": "Identifier"
-                },
-                "path": [],
-                "start": 0,
-                "type": "Name"
-              },
-              "commentStart": 0,
-              "end": 0,
-              "start": 0,
-              "type": "CallExpressionKw",
-              "type": "CallExpressionKw",
-              "unlabeled": null
-            },
             {
               "arguments": [
                 {
@@ -2470,11 +2354,20 @@ description: Result of parsing pipe-flange-assembly.kcl
               "type": "CallExpressionKw",
               "type": "CallExpressionKw",
               "unlabeled": {
+                "abs_path": false,
                 "commentStart": 0,
                 "end": 0,
+                "name": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": "pipe",
                   "start": 0,
-                "type": "PipeSubstitution",
+                  "type": "Identifier"
-                "type": "PipeSubstitution"
+                },
+                "path": [],
+                "start": 0,
+                "type": "Name",
+                "type": "Name"
               }
             },
             {
@@ -2657,29 +2550,6 @@ description: Result of parsing pipe-flange-assembly.kcl
         "end": 0,
         "expression": {
           "body": [
-            {
-              "callee": {
-                "abs_path": false,
-                "commentStart": 0,
-                "end": 0,
-                "name": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": "pipe",
-                  "start": 0,
-                  "type": "Identifier"
-                },
-                "path": [],
-                "start": 0,
-                "type": "Name"
-              },
-              "commentStart": 0,
-              "end": 0,
-              "start": 0,
-              "type": "CallExpressionKw",
-              "type": "CallExpressionKw",
-              "unlabeled": null
-            },
             {
               "arguments": [
                 {
@@ -2694,12 +2564,12 @@ description: Result of parsing pipe-flange-assembly.kcl
                   "arg": {
                     "commentStart": 0,
                     "end": 0,
-                    "raw": "90",
+                    "raw": "180",
                     "start": 0,
                     "type": "Literal",
                     "type": "Literal",
                     "value": {
-                      "value": 90.0,
+                      "value": 180.0,
                       "suffix": "None"
                     }
                   }
@@ -2770,11 +2640,42 @@ description: Result of parsing pipe-flange-assembly.kcl
               "type": "CallExpressionKw",
               "type": "CallExpressionKw",
               "unlabeled": {
+                "callee": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "clone",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name"
+                },
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "PipeSubstitution",
+                "type": "CallExpressionKw",
-                "type": "PipeSubstitution"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "pipe",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               }
             },
             {
@@ -3009,13 +2910,7 @@ description: Result of parsing pipe-flange-assembly.kcl
               "start": 0,
               "type": "CallExpressionKw",
               "type": "CallExpressionKw",
-              "unlabeled": {
+              "unlabeled": null
-                "commentStart": 0,
-                "end": 0,
-                "start": 0,
-                "type": "PipeSubstitution",
-                "type": "PipeSubstitution"
-              }
             }
           ],
           "commentStart": 0,
@@ -3111,7 +3006,7 @@ description: Result of parsing pipe-flange-assembly.kcl
     ],
     "nonCodeMeta": {
       "nonCodeNodes": {
-        "13": [
+        "9": [
           {
             "commentStart": 0,
             "end": 0,

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

@@ -3,13 +3,29 @@ source: kcl-lib/src/simulation_tests.rs
 description: Variables in memory after executing pipe-flange-assembly.kcl
 ---
 {
+  "__mod_bolt": {
+    "type": "Module",
+    "value": 5
+  },
+  "__mod_flange": {
+    "type": "Module",
+    "value": 3
+  },
   "__mod_gasket": {
     "type": "Module",
     "value": 2
   },
-  "bolt": {
+  "__mod_hexNut": {
-    "type": "Function",
+    "type": "Module",
-    "value": null
+    "value": 6
+  },
+  "__mod_pipe": {
+    "type": "Module",
+    "value": 7
+  },
+  "__mod_washer": {
+    "type": "Module",
+    "value": 4
   },
   "boltDiameter": {
     "type": "Number",
@@ -107,10 +123,6 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
     "type": "TagIdentifier",
     "value": "filletEdge"
   },
-  "flange": {
-    "type": "Function",
-    "value": null
-  },
   "flangeBackDiameter": {
     "type": "Number",
     "value": 3.62,
@@ -241,10 +253,6 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
       }
     }
   },
-  "hexNut": {
-    "type": "Function",
-    "value": null
-  },
   "hexNutDiameter": {
     "type": "Number",
     "value": 0.625,
@@ -323,10 +331,6 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
       }
     }
   },
-  "pipe": {
-    "type": "Function",
-    "value": null
-  },
   "pipeDiameter": {
     "type": "Number",
     "value": 2.44,
@@ -379,10 +383,6 @@ description: Variables in memory after executing pipe-flange-assembly.kcl
       }
     }
   },
-  "washer": {
-    "type": "Function",
-    "value": null
-  },
   "washerInnerDia": {
     "type": "Number",
     "value": 0.64,

rust/kcl-lib/tests/kcl_samples/shepherds-hook-bolt/artifact_graph_flowchart.snap.md

@@ -112,8 +112,8 @@ flowchart LR
   8 --- 20
   8 ---- 25
   12 <--x 32
-  12 --- 33
+  12 <--x 33
-  12 <--x 34
+  12 --- 34
   13 --- 31
   13 x--> 35
   13 --- 39

rust/kcl-lib/tests/kcl_samples/utility-sink/artifact_graph_flowchart.snap.md

@@ -889,7 +889,7 @@ flowchart LR
   99 --- 265
   99 --- 314
   106 --- 181
-  106 x--> 213
+  106 x--> 212
   106 --- 260
   106 --- 309
   126 --- 194
@@ -1227,7 +1227,7 @@ flowchart LR
   251 <--x 209
   252 <--x 209
   253 <--x 209
-  260 <--x 212
+  260 <--x 213
   261 <--x 214
   262 <--x 214
   263 <--x 214