getCommonEdge as default way of filleting (#6043)

* Common edge faces into artifact graph * clean up * kingdom of tags * add tests * hook up tags with edge treatments * update unit tests * update e2e * clean up * more fix up after main merge * fmt * revolve fix * fix new circular dependency * fix revolve * remove numbers from circ deps, makes diffs bad * sim test updates * try and get tests working * update * Fix tsc error --------- Co-authored-by: max-mrgrsk <156543465+max-mrgrsk@users.noreply.github.com> Co-authored-by: max <margorskyi@gmail.com> Co-authored-by: Jonathan Tran <jonnytran@gmail.com>
2025-04-26 14:00:28 +10:00
parent 50f8131d83
commit 8de648f0db
224 changed files with 157661 additions and 42680 deletions
--- a/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate/artifact_commands.snap
+++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate/artifact_commands.snap
@ -262,20 +262,27 @@ description: Artifact commands gridfinity-baseplate.kcl
    "cmdId": "[uuid]",
    "range": [],
    "command": {
-      "type": "solid3d_get_opposite_edge",
+      "type": "solid3d_get_all_edge_faces",
      "object_id": "[uuid]",
-      "edge_id": "[uuid]",
-      "face_id": "[uuid]"
+      "edge_id": "[uuid]"
    }
  },
  {
    "cmdId": "[uuid]",
    "range": [],
    "command": {
-      "type": "solid3d_get_next_adjacent_edge",
+      "type": "solid3d_get_all_edge_faces",
      "object_id": "[uuid]",
-      "edge_id": "[uuid]",
-      "face_id": "[uuid]"
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
    }
  },
  {
@ -302,20 +309,27 @@ description: Artifact commands gridfinity-baseplate.kcl
    "cmdId": "[uuid]",
    "range": [],
    "command": {
-      "type": "solid3d_get_opposite_edge",
+      "type": "solid3d_get_all_edge_faces",
      "object_id": "[uuid]",
-      "edge_id": "[uuid]",
-      "face_id": "[uuid]"
+      "edge_id": "[uuid]"
    }
  },
  {
    "cmdId": "[uuid]",
    "range": [],
    "command": {
-      "type": "solid3d_get_next_adjacent_edge",
+      "type": "solid3d_get_all_edge_faces",
      "object_id": "[uuid]",
-      "edge_id": "[uuid]",
-      "face_id": "[uuid]"
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
    }
  },
  {
@ -338,6 +352,127 @@ description: Artifact commands gridfinity-baseplate.kcl
      "face_id": "[uuid]"
    }
  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_opposite_edge",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]",
+      "face_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_next_adjacent_edge",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]",
+      "face_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_opposite_edge",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]",
+      "face_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_next_adjacent_edge",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]",
+      "face_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
  {
    "cmdId": "[uuid]",
    "range": [],
@ -583,20 +718,27 @@ description: Artifact commands gridfinity-baseplate.kcl
    "cmdId": "[uuid]",
    "range": [],
    "command": {
-      "type": "solid3d_get_opposite_edge",
+      "type": "solid3d_get_all_edge_faces",
      "object_id": "[uuid]",
-      "edge_id": "[uuid]",
-      "face_id": "[uuid]"
+      "edge_id": "[uuid]"
    }
  },
  {
    "cmdId": "[uuid]",
    "range": [],
    "command": {
-      "type": "solid3d_get_next_adjacent_edge",
+      "type": "solid3d_get_all_edge_faces",
      "object_id": "[uuid]",
-      "edge_id": "[uuid]",
-      "face_id": "[uuid]"
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
    }
  },
  {
@ -623,20 +765,27 @@ description: Artifact commands gridfinity-baseplate.kcl
    "cmdId": "[uuid]",
    "range": [],
    "command": {
-      "type": "solid3d_get_opposite_edge",
+      "type": "solid3d_get_all_edge_faces",
      "object_id": "[uuid]",
-      "edge_id": "[uuid]",
-      "face_id": "[uuid]"
+      "edge_id": "[uuid]"
    }
  },
  {
    "cmdId": "[uuid]",
    "range": [],
    "command": {
-      "type": "solid3d_get_next_adjacent_edge",
+      "type": "solid3d_get_all_edge_faces",
      "object_id": "[uuid]",
-      "edge_id": "[uuid]",
-      "face_id": "[uuid]"
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
    }
  },
  {
@ -659,6 +808,127 @@ description: Artifact commands gridfinity-baseplate.kcl
      "face_id": "[uuid]"
    }
  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_opposite_edge",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]",
+      "face_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_next_adjacent_edge",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]",
+      "face_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_opposite_edge",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]",
+      "face_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_next_adjacent_edge",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]",
+      "face_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
+  {
+    "cmdId": "[uuid]",
+    "range": [],
+    "command": {
+      "type": "solid3d_get_all_edge_faces",
+      "object_id": "[uuid]",
+      "edge_id": "[uuid]"
+    }
+  },
  {
    "cmdId": "[uuid]",
    "range": [],
--- a/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate/artifact_graph_flowchart.snap.md
+++ b/rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate/artifact_graph_flowchart.snap.md
@ -9,14 +9,14 @@ flowchart LR
    7["Segment<br>[1001, 1008, 0]"]
    8[Solid2d]
  end
-  subgraph path28 [Path]
-    28["Path<br>[799, 824, 0]"]
-    29["Segment<br>[832, 854, 0]"]
-    30["Segment<br>[862, 906, 0]"]
-    31["Segment<br>[914, 941, 0]"]
-    32["Segment<br>[949, 993, 0]"]
-    33["Segment<br>[1001, 1008, 0]"]
-    34[Solid2d]
+  subgraph path22 [Path]
+    22["Path<br>[799, 824, 0]"]
+    23["Segment<br>[832, 854, 0]"]
+    24["Segment<br>[862, 906, 0]"]
+    25["Segment<br>[914, 941, 0]"]
+    26["Segment<br>[949, 993, 0]"]
+    27["Segment<br>[1001, 1008, 0]"]
+    28[Solid2d]
  end
  1["Plane<br>[1094, 1132, 0]"]
  9["Sweep Extrusion<br>[1081, 1175, 0]"]
@ -28,36 +28,24 @@ flowchart LR
  15["Cap Start"]
  16["Cap End"]
  17["SweepEdge Opposite"]
-  18["SweepEdge Adjacent"]
+  18["SweepEdge Opposite"]
  19["SweepEdge Opposite"]
-  20["SweepEdge Adjacent"]
-  21["SweepEdge Opposite"]
-  22["SweepEdge Adjacent"]
-  23["SweepEdge Opposite"]
-  24["SweepEdge Adjacent"]
-  25["SweepEdge Opposite"]
-  26["SweepEdge Adjacent"]
-  27["Plane<br>[1588, 1626, 0]"]
-  35["Sweep Revolve<br>[1575, 1657, 0]"]
-  36[Wall]
-  37[Wall]
-  38[Wall]
-  39[Wall]
-  40[Wall]
-  41["Cap Start"]
-  42["Cap End"]
-  43["SweepEdge Opposite"]
-  44["SweepEdge Adjacent"]
-  45["SweepEdge Opposite"]
-  46["SweepEdge Adjacent"]
-  47["SweepEdge Opposite"]
-  48["SweepEdge Adjacent"]
-  49["SweepEdge Opposite"]
-  50["SweepEdge Adjacent"]
-  51["SweepEdge Opposite"]
-  52["SweepEdge Adjacent"]
-  53["StartSketchOnPlane<br>[771, 791, 0]"]
-  54["StartSketchOnPlane<br>[771, 791, 0]"]
+  20["SweepEdge Opposite"]
+  21["Plane<br>[1588, 1626, 0]"]
+  29["Sweep Revolve<br>[1575, 1657, 0]"]
+  30[Wall]
+  31[Wall]
+  32[Wall]
+  33[Wall]
+  34[Wall]
+  35["Cap Start"]
+  36["Cap End"]
+  37["SweepEdge Opposite"]
+  38["SweepEdge Opposite"]
+  39["SweepEdge Opposite"]
+  40["SweepEdge Opposite"]
+  41["StartSketchOnPlane<br>[771, 791, 0]"]
+  42["StartSketchOnPlane<br>[771, 791, 0]"]
  1 --- 2
  2 --- 3
  2 --- 4
@ -67,20 +55,19 @@ flowchart LR
  2 ---- 9
  2 --- 8
  3 --- 14
-  3 --- 25
-  3 --- 26
+  3 --- 20
+  3 x--> 15
  4 --- 13
-  4 --- 23
-  4 --- 24
+  4 --- 19
+  4 x--> 15
  5 --- 12
-  5 --- 21
-  5 --- 22
+  5 --- 18
+  5 x--> 15
  6 --- 11
-  6 --- 19
-  6 --- 20
+  6 --- 17
+  6 x--> 15
  7 --- 10
-  7 --- 17
-  7 --- 18
+  7 x--> 15
  9 --- 10
  9 --- 11
  9 --- 12
@ -92,52 +79,55 @@ flowchart LR
  9 --- 18
  9 --- 19
  9 --- 20
-  9 --- 21
-  9 --- 22
-  9 --- 23
-  9 --- 24
-  9 --- 25
-  9 --- 26
-  27 --- 28
-  28 --- 29
-  28 --- 30
-  28 --- 31
-  28 --- 32
-  28 --- 33
-  28 ---- 35
-  28 --- 34
+  17 <--x 11
+  17 <--x 16
+  18 <--x 12
+  18 <--x 16
+  19 <--x 13
+  19 <--x 16
+  20 <--x 14
+  20 <--x 16
+  21 --- 22
+  22 --- 23
+  22 --- 24
+  22 --- 25
+  22 --- 26
+  22 --- 27
+  22 ---- 29
+  22 --- 28
+  23 --- 30
+  23 x--> 35
+  24 --- 31
+  24 --- 37
+  24 x--> 35
+  25 --- 32
+  25 --- 38
+  25 x--> 35
+  26 --- 33
+  26 --- 39
+  26 x--> 35
+  27 --- 34
+  27 --- 40
+  27 x--> 35
+  29 --- 30
+  29 --- 31
+  29 --- 32
+  29 --- 33
+  29 --- 34
+  29 --- 35
  29 --- 36
-  29 --- 43
-  29 --- 44
-  30 --- 37
-  30 --- 45
-  30 --- 46
-  31 --- 38
-  31 --- 47
-  31 --- 48
-  32 --- 39
-  32 --- 49
-  32 --- 50
-  33 --- 40
-  33 --- 51
-  33 --- 52
-  35 --- 36
-  35 --- 37
-  35 --- 38
-  35 --- 39
-  35 --- 40
-  35 --- 41
-  35 --- 42
-  35 --- 43
-  35 --- 44
-  35 --- 45
-  35 --- 46
-  35 --- 47
-  35 --- 48
-  35 --- 49
-  35 --- 50
-  35 --- 51
-  35 --- 52
-  1 <--x 53
-  27 <--x 54
+  29 --- 37
+  29 --- 38
+  29 --- 39
+  29 --- 40
+  37 <--x 31
+  37 <--x 36
+  38 <--x 32
+  38 <--x 36
+  39 <--x 33
+  39 <--x 36
+  40 <--x 34
+  40 <--x 36
+  1 <--x 41
+  21 <--x 42
 ```