@tscircuit/schematic-trace-solver 0.0.41 → 0.0.42

package/tests/assets/TraceLabelOverlapAvoidanceSolver.test.input.json

@@ -0,0 +1,424 @@
+{
+  "netLabelPlacements": [
+    {
+      "globalConnNetId": "connectivity_net0",
+      "dcConnNetId": "connectivity_net0",
+      "netId": ".V1 > .pin1 to .L1 > .pin1",
+      "mspConnectionPairIds": ["V1.1-L1.1"],
+      "pinIds": ["V1.1", "L1.1"],
+      "orientation": "x+",
+      "anchorPoint": {
+        "x": -5.005,
+        "y": 2.7600000000000002
+      },
+      "width": 0.45,
+      "height": 0.2,
+      "center": {
+        "x": -4.78,
+        "y": 2.7600000000000002
+      }
+    },
+    {
+      "globalConnNetId": "connectivity_net3",
+      "dcConnNetId": "connectivity_net3",
+      "netId": "GND",
+      "mspConnectionPairIds": ["C1.2-M1.2"],
+      "pinIds": ["C1.2", "M1.2"],
+      "orientation": "y-",
+      "anchorPoint": {
+        "x": 3,
+        "y": -0.78
+      },
+      "width": 0.2,
+      "height": 0.3,
+      "center": {
+        "x": 3,
+        "y": -0.93
+      }
+    },
+    {
+      "globalConnNetId": "connectivity_net3",
+      "netId": "GND",
+      "mspConnectionPairIds": [],
+      "pinIds": ["R1.2"],
+      "orientation": "y-",
+      "anchorPoint": {
+        "x": 6,
+        "y": -0.55
+      },
+      "width": 0.2,
+      "height": 0.3,
+      "center": {
+        "x": 6,
+        "y": -0.7010000000000001
+      }
+    },
+    {
+      "globalConnNetId": "connectivity_net3",
+      "dcConnNetId": "connectivity_net3",
+      "netId": "GND",
+      "mspConnectionPairIds": ["V1.2-V2.2"],
+      "pinIds": ["V1.2", "V2.2"],
+      "orientation": "y-",
+      "anchorPoint": {
+        "x": -4.995,
+        "y": -0.6458008
+      },
+      "width": 0.2,
+      "height": 0.3,
+      "center": {
+        "x": -4.995,
+        "y": -0.7958008
+      }
+    },
+    {
+      "globalConnNetId": "connectivity_net1",
+      "dcConnNetId": "connectivity_net1",
+      "netId": ".L1 > .pin2 to .M1 > .drain",
+      "mspConnectionPairIds": ["L1.2-D1.1"],
+      "pinIds": ["L1.2", "D1.1"],
+      "orientation": "y+",
+      "anchorPoint": {
+        "x": 0.78,
+        "y": 2.97
+      },
+      "width": 0.2,
+      "height": 0.45,
+      "center": {
+        "x": 0.78,
+        "y": 3.1950000000000003
+      }
+    },
+    {
+      "globalConnNetId": "connectivity_net1",
+      "netId": ".L1 > .pin2 to .M1 > .drain",
+      "mspConnectionPairIds": [],
+      "pinIds": ["M1.1"],
+      "orientation": "y+",
+      "anchorPoint": {
+        "x": 0.3,
+        "y": 0.58
+      },
+      "width": 0.2,
+      "height": 0.45,
+      "center": {
+        "x": 0.3,
+        "y": 0.8059999999999999
+      }
+    },
+    {
+      "globalConnNetId": "connectivity_net2",
+      "dcConnNetId": "connectivity_net2",
+      "netId": ".D1 > .cathode to .R1 > .pin1",
+      "mspConnectionPairIds": ["D1.2-C1.1"],
+      "pinIds": ["D1.2", "C1.1"],
+      "orientation": "y+",
+      "anchorPoint": {
+        "x": 3.7199999999999998,
+        "y": 3
+      },
+      "width": 0.2,
+      "height": 0.45,
+      "center": {
+        "x": 3.7199999999999998,
+        "y": 3.225
+      }
+    },
+    {
+      "globalConnNetId": "connectivity_net2",
+      "netId": ".D1 > .cathode to .R1 > .pin1",
+      "mspConnectionPairIds": [],
+      "pinIds": ["R1.1"],
+      "orientation": "y+",
+      "anchorPoint": {
+        "x": 6,
+        "y": 0.55
+      },
+      "width": 0.2,
+      "height": 0.45,
+      "center": {
+        "x": 6,
+        "y": 0.776
+      }
+    },
+    {
+      "globalConnNetId": "connectivity_net4",
+      "dcConnNetId": "connectivity_net4",
+      "netId": ".M1 > .gate to .V2 > .pin1",
+      "mspConnectionPairIds": ["M1.3-V2.1"],
+      "pinIds": ["M1.3", "V2.1"],
+      "orientation": "y+",
+      "anchorPoint": {
+        "x": -1.08373445,
+        "y": -0.09999999999999987
+      },
+      "width": 0.2,
+      "height": 0.45,
+      "center": {
+        "x": -1.08373445,
+        "y": 0.12500000000000014
+      }
+    }
+  ],
+  "traces": [
+    {
+      "mspPairId": "L1.2-D1.1",
+      "dcConnNetId": "connectivity_net1",
+      "globalConnNetId": "connectivity_net1",
+      "userNetId": ".L1 > .pin2 to .M1 > .drain",
+      "pins": [
+        {
+          "pinId": "L1.2",
+          "x": 0.58,
+          "y": 2.97,
+          "_facingDirection": "x+",
+          "chipId": "schematic_component_1"
+        },
+        {
+          "pinId": "D1.1",
+          "x": 2.48,
+          "y": 3,
+          "chipId": "schematic_component_2",
+          "_facingDirection": "x-"
+        }
+      ],
+      "tracePath": [
+        {
+          "x": 0.58,
+          "y": 2.97
+        },
+        {
+          "x": 0.78,
+          "y": 2.97
+        },
+        {
+          "x": 1.53,
+          "y": 2.97
+        },
+        {
+          "x": 1.53,
+          "y": 3
+        },
+        {
+          "x": 2.28,
+          "y": 3
+        },
+        {
+          "x": 2.48,
+          "y": 3
+        }
+      ],
+      "mspConnectionPairIds": ["L1.2-D1.1"],
+      "pinIds": ["L1.2", "D1.1"]
+    },
+    {
+      "mspPairId": "V1.1-L1.1",
+      "dcConnNetId": "connectivity_net0",
+      "globalConnNetId": "connectivity_net0",
+      "pins": [
+        {
+          "pinId": "V1.1",
+          "x": -5.005,
+          "y": 2.54,
+          "chipId": "schematic_component_0",
+          "_facingDirection": "y+"
+        },
+        {
+          "pinId": "L1.1",
+          "x": -0.58,
+          "y": 2.98,
+          "_facingDirection": "x-",
+          "chipId": "schematic_component_1"
+        }
+      ],
+      "tracePath": [
+        {
+          "x": -5.005,
+          "y": 2.54
+        },
+        {
+          "x": -5.005,
+          "y": 2.9800000000000004
+        },
+        {
+          "x": -0.5800000000000001,
+          "y": 2.9800000000000004
+        }
+      ],
+      "mspConnectionPairIds": ["V1.1-L1.1"],
+      "pinIds": ["V1.1", "L1.1"]
+    },
+    {
+      "mspPairId": "D1.2-C1.1",
+      "dcConnNetId": "connectivity_net2",
+      "globalConnNetId": "connectivity_net2",
+      "pins": [
+        {
+          "pinId": "D1.2",
+          "x": 3.52,
+          "y": 3,
+          "chipId": "schematic_component_2",
+          "_facingDirection": "x+"
+        },
+        {
+          "pinId": "C1.1",
+          "x": 3,
+          "y": 0.49500000000000005,
+          "_facingDirection": "y+",
+          "chipId": "schematic_component_3"
+        }
+      ],
+      "tracePath": [
+        {
+          "x": 3.52,
+          "y": 3
+        },
+        {
+          "x": 3.7199999999999998,
+          "y": 3
+        },
+        {
+          "x": 3.7199999999999998,
+          "y": 1.7474999999999996
+        },
+        {
+          "x": 3,
+          "y": 1.7474999999999996
+        },
+        {
+          "x": 3,
+          "y": 0.49500000000000005
+        }
+      ],
+      "mspConnectionPairIds": ["D1.2-C1.1"],
+      "pinIds": ["D1.2", "C1.1"]
+    },
+    {
+      "mspPairId": "C1.2-M1.2",
+      "dcConnNetId": "connectivity_net3",
+      "globalConnNetId": "connectivity_net3",
+      "pins": [
+        {
+          "pinId": "C1.2",
+          "x": 3,
+          "y": -0.49500000000000005,
+          "_facingDirection": "y-",
+          "chipId": "schematic_component_3"
+        },
+        {
+          "pinId": "M1.2",
+          "x": 0.31,
+          "y": -0.58,
+          "_facingDirection": "y-",
+          "chipId": "schematic_component_6"
+        }
+      ],
+      "tracePath": [
+        {
+          "x": 3,
+          "y": -0.4950000000000001
+        },
+        {
+          "x": 3,
+          "y": -0.78
+        },
+        {
+          "x": 0.31,
+          "y": -0.78
+        },
+        {
+          "x": 0.31,
+          "y": -0.58
+        }
+      ],
+      "mspConnectionPairIds": ["C1.2-M1.2"],
+      "pinIds": ["C1.2", "M1.2"]
+    },
+    {
+      "mspPairId": "V1.2-V2.2",
+      "dcConnNetId": "connectivity_net3",
+      "globalConnNetId": "connectivity_net3",
+      "pins": [
+        {
+          "pinId": "V1.2",
+          "x": -4.995,
+          "y": 1.46,
+          "chipId": "schematic_component_0",
+          "_facingDirection": "y-"
+        },
+        {
+          "pinId": "V2.2",
+          "x": -3.0000622,
+          "y": -0.4458008,
+          "chipId": "schematic_component_5",
+          "_facingDirection": "y-"
+        }
+      ],
+      "tracePath": [
+        {
+          "x": -4.995,
+          "y": 1.46
+        },
+        {
+          "x": -4.995,
+          "y": -0.6458008
+        },
+        {
+          "x": -3.0000622,
+          "y": -0.6458008
+        },
+        {
+          "x": -3.0000622,
+          "y": -0.4458007999999998
+        }
+      ],
+      "mspConnectionPairIds": ["V1.2-V2.2"],
+      "pinIds": ["V1.2", "V2.2"]
+    },
+    {
+      "mspPairId": "M1.3-V2.1",
+      "dcConnNetId": "connectivity_net4",
+      "globalConnNetId": "connectivity_net4",
+      "pins": [
+        {
+          "pinId": "M1.3",
+          "x": -0.445,
+          "y": -0.1,
+          "_facingDirection": "x-",
+          "chipId": "schematic_component_6"
+        },
+        {
+          "pinId": "V2.1",
+          "x": -2.9999378,
+          "y": 0.4458008,
+          "chipId": "schematic_component_5",
+          "_facingDirection": "y+"
+        }
+      ],
+      "tracePath": [
+        {
+          "x": -0.44499999999999984,
+          "y": -0.09999999999999987
+        },
+        {
+          "x": -1.7224689,
+          "y": -0.09999999999999987
+        },
+        {
+          "x": -1.7224689,
+          "y": 0.6458008000000002
+        },
+        {
+          "x": -2.9999378,
+          "y": 0.6458008000000002
+        },
+        {
+          "x": -2.9999378,
+          "y": 0.4458008
+        }
+      ],
+      "mspConnectionPairIds": ["M1.3-V2.1"],
+      "pinIds": ["M1.3", "V2.1"]
+    }
+  ]
+}

package/tests/examples/__snapshots__/example25.snap.svg

@@ -64,7 +64,7 @@ x+" data-x="0.6" data-y="-2.8" cx="363.855421686747" cy="416.14457831325296" r="
     <circle data-type="point" data-label="" data-x="-1.2" data-y="-0.30000000000000004" cx="242.40963855421688" cy="247.46987951807228" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
-    <circle data-type="point" data-label="" data-x="-0.8749999999999999" data-y="0.30000000000000004" cx="264.33734939759034" cy="206.9879518072289" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.5999999999999999" data-y="0.30000000000000004" cx="215.42168674698797" cy="206.9879518072289" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="" data-x="-0.4" data-y="-0.5" cx="296.3855421686747" cy="260.96385542168673" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
@@ -82,7 +82,7 @@ x+" data-x="0.6" data-y="-2.8" cx="363.855421686747" cy="416.14457831325296" r="
     <polyline data-points="-1.7999999999999998,-0.30000000000000004 -0.6,-0.30000000000000004 -0.6,0.05099999999999996 0.6,0.05099999999999996 0.6,-0.2 1.9,-0.2" data-type="line" data-label="" points="201.92771084337352,247.46987951807228 282.89156626506025,247.46987951807228 282.89156626506025,223.78795180722892 363.855421686747,223.78795180722892 363.855421686747,240.72289156626505 451.566265060241,240.72289156626505" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-1.7999999999999998,0.30000000000000004 0.050000000000000044,0.30000000000000004 0.050000000000000044,0.2 1.9,0.2" data-type="line" data-label="" points="201.92771084337352,206.9879518072289 326.7469879518072,206.9879518072289 326.7469879518072,213.73493975903614 451.566265060241,213.73493975903614" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1.7999999999999998,0.30000000000000004 -1.5999999999999999,0.30000000000000004 0.050000000000000044,0.30000000000000004 0.050000000000000044,0.2 1.7,0.2 1.9,0.2" data-type="line" data-label="" points="201.92771084337352,206.9879518072289 215.42168674698797,206.9879518072289 326.7469879518072,206.9879518072289 326.7469879518072,213.73493975903614 438.0722891566265,213.73493975903614 451.566265060241,213.73493975903614" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
     <rect data-type="rect" data-label="schematic_component_0" data-x="-3" data-y="0" x="40" y="193.49397590361446" width="161.92771084337352" height="67.46987951807228" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01482142857142857" />
@@ -97,7 +97,7 @@ x+" data-x="0.6" data-y="-2.8" cx="363.855421686747" cy="416.14457831325296" r="
     <rect data-type="rect" data-label="" data-x="-1.2" data-y="-0.07500000000000004" x="235.66265060240963" y="217.10843373493975" width="13.493975903614484" height="30.361445783132524" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01482142857142857" />
   </g>
   <g>
-    <rect data-type="rect" data-label="" data-x="-0.8749999999999999" data-y="0.525" x="257.5903614457832" y="176.6265060240964" width="13.493975903614398" height="30.361445783132524" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01482142857142857" />
+    <rect data-type="rect" data-label="" data-x="-1.5999999999999999" data-y="0.525" x="208.67469879518075" y="176.6265060240964" width="13.493975903614455" height="30.361445783132524" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01482142857142857" />
   </g>
   <g>
     <rect data-type="rect" data-label="" data-x="-0.4" data-y="-0.274" x="289.6385542168675" y="230.53493975903615" width="13.493975903614455" height="30.361445783132524" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01482142857142857" />

package/tests/examples/__snapshots__/example26.snap.svg

@@ -53,7 +53,7 @@ y-" data-x="-0.4" data-y="0.5" cx="296.3855421686747" cy="311.566265060241" r="3
 y-" data-x="0.4" data-y="0.5" cx="350.3614457831325" cy="311.566265060241" r="3" fill="hsl(203, 100%, 50%, 0.8)" />
   </g>
   <g>
-    <circle data-type="point" data-label="" data-x="-0.8749999999999999" data-y="-0.30000000000000004" cx="264.33734939759034" cy="365.5421686746988" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+    <circle data-type="point" data-label="" data-x="-1.5999999999999999" data-y="-0.30000000000000004" cx="215.42168674698797" cy="365.5421686746988" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="" data-x="1.25" data-y="0.2" cx="407.71084337349396" cy="331.8072289156627" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
@@ -71,7 +71,7 @@ y-" data-x="0.4" data-y="0.5" cx="350.3614457831325" cy="311.566265060241" r="3"
     <polyline data-points="1.9,0.2 -1.7999999999999998,0.09999999999999998" data-type="line" data-label="" points="451.566265060241,331.8072289156627 201.92771084337352,338.5542168674699" fill="none" stroke="hsl(210, 100%, 50%, 0.8)" stroke-width="1" stroke-dasharray="4 2" />
   </g>
   <g>
-    <polyline data-points="-1.7999999999999998,-0.30000000000000004 0.050000000000000044,-0.30000000000000004 0.050000000000000044,-0.2 1.9,-0.2" data-type="line" data-label="" points="201.92771084337352,365.5421686746988 326.7469879518072,365.5421686746988 326.7469879518072,358.7951807228916 451.566265060241,358.7951807228916" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-1.7999999999999998,-0.30000000000000004 -1.5999999999999999,-0.30000000000000004 0.050000000000000044,-0.30000000000000004 0.050000000000000044,-0.2 1.7,-0.2 1.9,-0.2" data-type="line" data-label="" points="201.92771084337352,365.5421686746988 215.42168674698797,365.5421686746988 326.7469879518072,365.5421686746988 326.7469879518072,358.7951807228916 438.0722891566265,358.7951807228916 451.566265060241,358.7951807228916" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
     <polyline data-points="1.9,0.2 0.6,0.2 0.6,-0.05099999999999996 -0.6,-0.05099999999999996 -0.6,0.09999999999999998 -1.7999999999999998,0.09999999999999998" data-type="line" data-label="" points="451.566265060241,331.8072289156627 363.855421686747,331.8072289156627 363.855421686747,348.7421686746988 282.89156626506025,348.7421686746988 282.89156626506025,338.5542168674699 201.92771084337352,338.5542168674699" fill="none" stroke="purple" stroke-width="1" />
@@ -86,7 +86,7 @@ y-" data-x="0.4" data-y="0.5" cx="350.3614457831325" cy="311.566265060241" r="3"
     <rect data-type="rect" data-label="schematic_component_2" data-x="0" data-y="1" x="289.6385542168675" y="244.0963855421687" width="67.46987951807228" height="67.4698795180723" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.01482142857142857" />
   </g>
   <g>
-    <rect data-type="rect" data-label="" data-x="-0.8749999999999999" data-y="-0.525" x="257.5903614457832" y="365.5421686746988" width="13.493975903614398" height="30.361445783132524" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01482142857142857" />
+    <rect data-type="rect" data-label="" data-x="-1.5999999999999999" data-y="-0.525" x="208.67469879518075" y="365.5421686746988" width="13.493975903614455" height="30.361445783132524" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01482142857142857" />
   </g>
   <g>
     <rect data-type="rect" data-label="" data-x="1.25" data-y="0.42500000000000004" x="400.96385542168673" y="301.44578313253015" width="13.493975903614455" height="30.361445783132524" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.01482142857142857" />

package/tests/solvers/TraceLabelOverlapAvoidanceSolver/TraceLabelOverlapAvoidanceSolver.test.ts

@@ -0,0 +1,18 @@
+import { expect } from "bun:test"
+import { test } from "bun:test"
+import { TraceLabelOverlapAvoidanceSolver } from "lib/solvers/TraceLabelOverlapAvoidanceSolver/TraceLabelOverlapAvoidanceSolver"
+import inputProblem from "tests/assets/example25.json"
+import "tests/fixtures/matcher"
+import testInput from "tests/assets/TraceLabelOverlapAvoidanceSolver.test.input.json"
+
+test("TraceLabelOverlapAvoidanceSolver snapshot", () => {
+  const solver = new TraceLabelOverlapAvoidanceSolver({
+    inputProblem: inputProblem as any,
+    netLabelPlacements: testInput.netLabelPlacements as any,
+    traces: testInput.traces as any,
+  })
+
+  solver.solve()
+
+  expect(solver).toMatchSolverSnapshot(import.meta.path)
+})