@tscircuit/schematic-trace-solver 0.0.191 → 0.0.192

package/dist/index.js

@@ -13613,8 +13613,10 @@ var getPathFromSharedPin = ({
   sharedPinId
 }) => {
   const tracePath = simplifyPath(trace.tracePath);
-  if (trace.pins[0]?.pinId === sharedPinId) return tracePath;
-  return tracePath.reverse();
+  const sharedPin = trace.pins.find((pin) => pin.pinId === sharedPinId);
+  if (!sharedPin) return null;
+  const pathFromSharedPin = trace.pins[0]?.pinId === sharedPinId ? tracePath : tracePath.reverse();
+  return pointsEqual2(pathFromSharedPin[0], sharedPin) ? pathFromSharedPin : null;
 };
 var traceCanLoseSharedPrefix = ({
   trace,
@@ -13655,9 +13657,10 @@ var collapseRedundantSharedEndpointStubs = ({
 }) => {
   const outputTraces = [...traces];
   for (let firstIndex = 0; firstIndex < outputTraces.length; firstIndex++) {
-    const firstTrace = outputTraces[firstIndex];
-    if (netLabelConnectorTraceIds.has(firstTrace.mspPairId)) continue;
+    if (netLabelConnectorTraceIds.has(outputTraces[firstIndex].mspPairId))
+      continue;
     for (let secondIndex = firstIndex + 1; secondIndex < outputTraces.length; secondIndex++) {
+      const firstTrace = outputTraces[firstIndex];
       const secondTrace = outputTraces[secondIndex];
       if (netLabelConnectorTraceIds.has(secondTrace.mspPairId) || firstTrace.globalConnNetId !== secondTrace.globalConnNetId) {
         continue;
@@ -13675,6 +13678,7 @@ var collapseRedundantSharedEndpointStubs = ({
         trace: secondTrace,
         sharedPinId: sharedPin.pinId
       });
+      if (!firstPath || !secondPath) continue;
       if (firstPath.length < 2 || secondPath.length < 2) continue;
       const departureAxis = getSegmentAxis3(firstPath[0], firstPath[1]);
       const secondDepartureAxis = getSegmentAxis3(secondPath[0], secondPath[1]);
@@ -13721,7 +13725,7 @@ var collapseRedundantSharedEndpointStubs = ({
         });
         if (!collapsedTrace2) continue;
         outputTraces[traceIndexToCollapse2] = collapsedTrace2;
-        break;
+        continue;
       }
       if (firstPath.length < 3 || secondPath.length < 3) continue;
       if (!pointsEqual2(firstPath[1], secondPath[1])) continue;
@@ -13785,7 +13789,6 @@ var collapseRedundantSharedEndpointStubs = ({
       });
       if (!collapsedTrace) continue;
       outputTraces[traceIndexToCollapse] = collapsedTrace;
-      break;
     }
   }
   return outputTraces;

package/lib/solvers/SameNetJunctionAlignmentSolver/collapseRedundantSharedEndpointStubs.ts

@@ -25,8 +25,13 @@ const getPathFromSharedPin = ({
   sharedPinId: PinId
 }) => {
   const tracePath = simplifyPath(trace.tracePath)
-  if (trace.pins[0]?.pinId === sharedPinId) return tracePath
-  return tracePath.reverse()
+  const sharedPin = trace.pins.find((pin) => pin.pinId === sharedPinId)
+  if (!sharedPin) return null
+  const pathFromSharedPin =
+    trace.pins[0]?.pinId === sharedPinId ? tracePath : tracePath.reverse()
+  return pointsEqual(pathFromSharedPin[0]!, sharedPin)
+    ? pathFromSharedPin
+    : null
 }
 
 const traceCanLoseSharedPrefix = ({
@@ -87,13 +92,14 @@ export const collapseRedundantSharedEndpointStubs = ({
   const outputTraces = [...traces]
 
   for (let firstIndex = 0; firstIndex < outputTraces.length; firstIndex++) {
-    const firstTrace = outputTraces[firstIndex]!
-    if (netLabelConnectorTraceIds.has(firstTrace.mspPairId)) continue
+    if (netLabelConnectorTraceIds.has(outputTraces[firstIndex]!.mspPairId))
+      continue
     for (
       let secondIndex = firstIndex + 1;
       secondIndex < outputTraces.length;
       secondIndex++
     ) {
+      const firstTrace = outputTraces[firstIndex]!
       const secondTrace = outputTraces[secondIndex]!
       if (
         netLabelConnectorTraceIds.has(secondTrace.mspPairId) ||
@@ -114,6 +120,7 @@ export const collapseRedundantSharedEndpointStubs = ({
         trace: secondTrace,
         sharedPinId: sharedPin.pinId,
       })
+      if (!firstPath || !secondPath) continue
       if (firstPath.length < 2 || secondPath.length < 2) continue
 
       const departureAxis = getSegmentAxis(firstPath[0]!, firstPath[1]!)
@@ -174,7 +181,7 @@ export const collapseRedundantSharedEndpointStubs = ({
         })
         if (!collapsedTrace) continue
         outputTraces[traceIndexToCollapse] = collapsedTrace
-        break
+        continue
       }
       if (firstPath.length < 3 || secondPath.length < 3) continue
       if (!pointsEqual(firstPath[1]!, secondPath[1]!)) continue
@@ -259,7 +266,6 @@ export const collapseRedundantSharedEndpointStubs = ({
       })
       if (!collapsedTrace) continue
       outputTraces[traceIndexToCollapse] = collapsedTrace
-      break
     }
   }
 

package/package.json

@@ -5,7 +5,7 @@
     "url": "https://github.com/tscircuit/schematic-trace-solver.git"
   },
   "main": "dist/index.js",
-  "version": "0.0.191",
+  "version": "0.0.192",
   "type": "module",
   "scripts": {
     "start": "cosmos",