@tscircuit/schematic-trace-solver 0.0.33 → 0.0.34

package/dist/index.js

@@ -1927,6 +1927,12 @@ var NetLabelPlacementSolver = class extends BaseSolver {
     const { netConnMap } = getConnectivityMapsFromInputProblem(
       this.inputProblem
     );
+    const pinIdToPinMap = /* @__PURE__ */ new Map();
+    for (const chip of this.inputProblem.chips) {
+      for (const pin of chip.pins) {
+        pinIdToPinMap.set(pin.pinId, pin);
+      }
+    }
     const userNetIdByPinId = {};
     for (const dc of this.inputProblem.directConnections) {
       if (dc.netId) {
@@ -1941,10 +1947,21 @@ var NetLabelPlacementSolver = class extends BaseSolver {
       }
     }
     const groups = [];
-    for (const globalConnNetId of Object.keys(netConnMap.netMap)) {
-      const pinsInNet = netConnMap.getIdsConnectedToNet(
+    const allPinIds = this.inputProblem.chips.flatMap(
+      (c) => c.pins.map((p) => p.pinId)
+    );
+    const allGlobalConnNetIds = /* @__PURE__ */ new Set();
+    for (const pinId of allPinIds) {
+      const netId = netConnMap.getNetConnectedToId(pinId);
+      if (netId) {
+        allGlobalConnNetIds.add(netId);
+      }
+    }
+    for (const globalConnNetId of allGlobalConnNetIds) {
+      const allIdsInNet = netConnMap.getIdsConnectedToNet(
         globalConnNetId
       );
+      const pinsInNet = allIdsInNet.filter((id) => pinIdToPinMap.has(id));
       const adj = {};
       for (const pid of pinsInNet) adj[pid] = /* @__PURE__ */ new Set();
       for (const t of byGlobal[globalConnNetId] ?? []) {
@@ -2008,12 +2025,13 @@ var NetLabelPlacementSolver = class extends BaseSolver {
               )
             )
           );
-          groups.push({
+          const group = {
             globalConnNetId,
             netId: userNetId,
             overlappingTraces: rep,
             mspConnectionPairIds
-          });
+          };
+          groups.push(group);
         } else {
           for (const p of component) {
             const userNetId = userNetIdByPinId[p];

package/lib/solvers/NetLabelPlacementSolver/NetLabelPlacementSolver.ts

@@ -107,6 +107,13 @@ export class NetLabelPlacementSolver extends BaseSolver {
       this.inputProblem,
     )
 
+    const pinIdToPinMap = new Map<string, unknown>()
+    for (const chip of this.inputProblem.chips) {
+      for (const pin of chip.pins) {
+        pinIdToPinMap.set(pin.pinId, pin)
+      }
+    }
+
     // Map pins to user-provided netIds (if any)
     const userNetIdByPinId: Record<string, string | undefined> = {}
     for (const dc of this.inputProblem.directConnections) {
@@ -124,11 +131,24 @@ export class NetLabelPlacementSolver extends BaseSolver {
 
     const groups: Array<OverlappingSameNetTraceGroup> = []
 
+    const allPinIds = this.inputProblem.chips.flatMap((c) =>
+      c.pins.map((p) => p.pinId),
+    )
+
+    const allGlobalConnNetIds = new Set<string>()
+    for (const pinId of allPinIds) {
+      const netId = netConnMap.getNetConnectedToId(pinId)
+      if (netId) {
+        allGlobalConnNetIds.add(netId)
+      }
+    }
+
     // Consider every global connectivity net id
-    for (const globalConnNetId of Object.keys((netConnMap as any).netMap)) {
-      const pinsInNet = netConnMap.getIdsConnectedToNet(
+    for (const globalConnNetId of allGlobalConnNetIds) {
+      const allIdsInNet = netConnMap.getIdsConnectedToNet(
         globalConnNetId,
       ) as string[]
+      const pinsInNet = allIdsInNet.filter((id) => pinIdToPinMap.has(id))
 
       // Build adjacency from solved traces (edges)
       const adj: Record<string, Set<string>> = {}
@@ -205,12 +225,13 @@ export class NetLabelPlacementSolver extends BaseSolver {
             ),
           )
 
-          groups.push({
+          const group = {
             globalConnNetId,
             netId: userNetId,
             overlappingTraces: rep,
             mspConnectionPairIds,
-          })
+          }
+          groups.push(group)
         } else {
           // No traces in this component: place label at each pin that has a user net id
           for (const p of component) {

package/package.json

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