@tscircuit/schematic-trace-solver 0.0.11 → 0.0.12

package/dist/index.js

@@ -5264,11 +5264,13 @@ var ConnectivityMap = class {
 var getConnectivityMapsFromInputProblem = (inputProblem) => {
   const directConnMap = new ConnectivityMap({});
   for (const directConn of inputProblem.directConnections) {
-    directConnMap.addConnections([directConn.pinIds]);
+    directConnMap.addConnections([
+      directConn.netId ? [directConn.netId, ...directConn.pinIds] : directConn.pinIds
+    ]);
   }
   const netConnMap = new ConnectivityMap(directConnMap.netMap);
   for (const netConn of inputProblem.netConnections) {
-    netConnMap.addConnections([netConn.pinIds]);
+    netConnMap.addConnections([[netConn.netId, ...netConn.pinIds]]);
   }
   return { directConnMap, netConnMap };
 };
@@ -5512,7 +5514,7 @@ var MspConnectionPairSolver = class extends BaseSolver {
       return;
     }
     const msp = getOrthogonalMinimumSpanningTree(
-      directlyConnectedPins.map((p) => this.pinMap[p]),
+      directlyConnectedPins.map((p) => this.pinMap[p]).filter(Boolean),
       { maxDistance: this.maxMspPairDistance }
     );
     for (const [pin1, pin2] of msp) {

package/lib/solvers/MspConnectionPairSolver/MspConnectionPairSolver.ts

@@ -113,7 +113,7 @@ export class MspConnectionPairSolver extends BaseSolver {
     // There are more than 3 pins, so we need to run MSP to find the best pairs
 
     const msp = getOrthogonalMinimumSpanningTree(
-      directlyConnectedPins.map((p) => this.pinMap[p]!),
+      directlyConnectedPins.map((p) => this.pinMap[p]!).filter(Boolean),
       { maxDistance: this.maxMspPairDistance },
     )
 

package/lib/solvers/MspConnectionPairSolver/getConnectivityMapFromInputProblem.ts

@@ -7,13 +7,17 @@ export const getConnectivityMapsFromInputProblem = (
   const directConnMap = new ConnectivityMap({})
 
   for (const directConn of inputProblem.directConnections) {
-    directConnMap.addConnections([directConn.pinIds])
+    directConnMap.addConnections([
+      directConn.netId
+        ? [directConn.netId, ...directConn.pinIds]
+        : directConn.pinIds,
+    ])
   }
 
   const netConnMap = new ConnectivityMap(directConnMap.netMap)
 
   for (const netConn of inputProblem.netConnections) {
-    netConnMap.addConnections([netConn.pinIds])
+    netConnMap.addConnections([[netConn.netId, ...netConn.pinIds]])
   }
 
   return { directConnMap, netConnMap }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/schematic-trace-solver",
   "main": "dist/index.js",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "type": "module",
   "scripts": {
     "start": "cosmos",

package/tests/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver_repro01.test.ts

@@ -0,0 +1,111 @@
+import type { InputProblem } from "lib/types/InputProblem"
+import { test, expect } from "bun:test"
+import { SchematicTracePipelineSolver } from "lib/index"
+
+const inputProblem: InputProblem = {
+  chips: [
+    {
+      chipId: "U1",
+      center: { x: 0, y: 0 },
+      width: 1.6,
+      height: 0.6,
+      pins: [
+        {
+          pinId: "U1.1",
+          x: -0.8,
+          y: 0.2,
+        },
+        {
+          pinId: "U1.2",
+          x: -0.8,
+          y: 0,
+        },
+        {
+          pinId: "U1.3",
+          x: -0.8,
+          y: -0.2,
+        },
+        {
+          pinId: "U1.4",
+          x: 0.8,
+          y: -0.2,
+        },
+        {
+          pinId: "U1.5",
+          x: 0.8,
+          y: 0,
+        },
+        {
+          pinId: "U1.6",
+          x: 0.8,
+          y: 0.2,
+        },
+      ],
+    },
+    {
+      chipId: "C1",
+      center: { x: -2, y: 0 },
+      width: 0.5,
+      height: 1,
+      pins: [
+        {
+          pinId: "C1.1",
+          x: -2,
+          y: 0.5,
+        },
+        {
+          pinId: "C1.2",
+          x: -2,
+          y: -0.5,
+        },
+      ],
+    },
+    {
+      chipId: "C2",
+      center: { x: -4, y: 0 },
+      width: 0.5,
+      height: 1,
+      pins: [
+        {
+          pinId: "C2.1",
+          x: -4,
+          y: 0.5,
+        },
+        {
+          pinId: "C2.2",
+          x: -4,
+          y: -0.5,
+        },
+      ],
+    },
+  ],
+  directConnections: [
+    {
+      pinIds: ["U1.1", "C1.1"],
+      netId: "VCC",
+    },
+    {
+      pinIds: ["U1.2", "C2.1"],
+      netId: "EN",
+    },
+  ],
+  netConnections: [
+    {
+      pinIds: ["U1.3", "C2.2", "C1.2"],
+      netId: "GND",
+    },
+  ],
+  availableNetLabelOrientations: {
+    VCC: ["y+"],
+    EN: ["x+", "x-"],
+    GND: ["y-"],
+  },
+  maxMspPairDistance: 2,
+}
+
+test("SchematicTracePipelineSolver_repro01", () => {
+  const solver = new SchematicTracePipelineSolver(inputProblem)
+  solver.solve()
+
+  // console.log(solver.schematicTraceLinesSolver!.solvedTracePaths)
+})