@tscircuit/schematic-trace-solver 0.0.191 → 0.0.193

package/dist/index.js

@@ -13084,11 +13084,19 @@ var getPinConnectionCandidates = ({
   const outerBounds = getOuterBounds(obstacles);
   const horizontalChannels = [
     outerBounds.minY - ROUTE_CLEARANCE,
-    outerBounds.maxY + ROUTE_CLEARANCE
+    outerBounds.maxY + ROUTE_CLEARANCE,
+    ...obstacles.flatMap((obstacle) => [
+      obstacle.minY - ROUTE_CLEARANCE,
+      obstacle.maxY + ROUTE_CLEARANCE
+    ])
   ];
   const verticalChannels = [
     outerBounds.minX - ROUTE_CLEARANCE,
-    outerBounds.maxX + ROUTE_CLEARANCE
+    outerBounds.maxX + ROUTE_CLEARANCE,
+    ...obstacles.flatMap((obstacle) => [
+      obstacle.minX - ROUTE_CLEARANCE,
+      obstacle.maxX + ROUTE_CLEARANCE
+    ])
   ];
   const candidates = [
     calculateElbow3(
@@ -13097,7 +13105,7 @@ var getPinConnectionCandidates = ({
       { overshoot: ROUTE_CLEARANCE }
     )
   ];
-  for (const channelY of horizontalChannels) {
+  for (const channelY of new Set(horizontalChannels)) {
     candidates.push(
       removeConsecutiveDuplicatePoints([
         firstPin,
@@ -13109,7 +13117,7 @@ var getPinConnectionCandidates = ({
       ])
     );
   }
-  for (const channelX of verticalChannels) {
+  for (const channelX of new Set(verticalChannels)) {
     candidates.push(
       removeConsecutiveDuplicatePoints([
         firstPin,
@@ -13613,8 +13621,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 +13665,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 +13686,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 +13733,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 +13797,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/lib/solvers/UnroutedTraceRecoverySolver/UnroutedTraceRecoverySolver.ts

@@ -107,10 +107,18 @@ const getPinConnectionCandidates = ({
   const horizontalChannels = [
     outerBounds.minY - ROUTE_CLEARANCE,
     outerBounds.maxY + ROUTE_CLEARANCE,
+    ...obstacles.flatMap((obstacle) => [
+      obstacle.minY - ROUTE_CLEARANCE,
+      obstacle.maxY + ROUTE_CLEARANCE,
+    ]),
   ]
   const verticalChannels = [
     outerBounds.minX - ROUTE_CLEARANCE,
     outerBounds.maxX + ROUTE_CLEARANCE,
+    ...obstacles.flatMap((obstacle) => [
+      obstacle.minX - ROUTE_CLEARANCE,
+      obstacle.maxX + ROUTE_CLEARANCE,
+    ]),
   ]
   // Recovery uses actual text bounds, so try local elbows before the perimeter.
   const candidates: Point[][] = [
@@ -121,7 +129,7 @@ const getPinConnectionCandidates = ({
     ),
   ]
 
-  for (const channelY of horizontalChannels) {
+  for (const channelY of new Set(horizontalChannels)) {
     candidates.push(
       removeConsecutiveDuplicatePoints([
         firstPin,
@@ -134,7 +142,7 @@ const getPinConnectionCandidates = ({
     )
   }
 
-  for (const channelX of verticalChannels) {
+  for (const channelX of new Set(verticalChannels)) {
     candidates.push(
       removeConsecutiveDuplicatePoints([
         firstPin,

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.193",
   "type": "module",
   "scripts": {
     "start": "cosmos",

package/site/SchematicTracePipelineSolver/repro173-boost-drv8711-ground-label-overlap.page.tsx

@@ -0,0 +1,7 @@
+import type { InputProblem } from "lib/types/InputProblem"
+import { PipelineDebugger } from "site/components/PipelineDebugger"
+import inputProblem from "../../tests/repros/assets/repro173-boost-drv8711-ground-label-overlap.input.json"
+
+export default () => (
+  <PipelineDebugger inputProblem={inputProblem as unknown as InputProblem} />
+)