@tscircuit/schematic-trace-solver 0.0.162 → 0.0.164

package/dist/index.d.ts

@@ -825,7 +825,7 @@ type CandidateLabel = {
     height: number;
 };
 type CandidateStatus$2 = "valid" | "chip-collision" | "text-collision" | "trace-collision" | "trace-clearance-violation" | "netlabel-collision";
-type CandidatePhase = "rotate" | "trace-anchor" | "outward-trace-anchor" | "shift" | "lateral-shift";
+type CandidatePhase = "rotate" | "trace-anchor" | "connected-rail-shift" | "outward-trace-anchor" | "shift" | "lateral-shift";
 type EvaluatedCandidate = CandidateLabel & {
     status: CandidateStatus$2;
     selected: boolean;
@@ -902,6 +902,7 @@ declare class AvailableNetOrientationSolver extends BaseSolver {
     private getNetLabelHeight;
     private getCandidateStatus;
     private isAcceptableTraceAnchorChipCollision;
+    private staysOutsideConnectedPinRow;
     private getBoundsStatus;
     private isTraceTooCloseToLabel;
     private getLabelTraceClearanceBounds;

package/dist/index.js

@@ -1507,13 +1507,17 @@ var SchematicTraceSingleLineSolver2 = class extends BaseSolver {
       excludeRectsForSegment: (segIndex2) => {
         const lastSegIndex2 = path.length - 2;
         const excludedRects = /* @__PURE__ */ new Set();
-        if (segIndex2 === 0 || segIndex2 === lastSegIndex2) {
+        const segmentStart = path[segIndex2];
+        const segmentEnd = path[segIndex2 + 1];
+        const oppositeTerminalPin = segIndex2 === 0 ? PB : segIndex2 === lastSegIndex2 ? PA : null;
+        if (oppositeTerminalPin) {
           for (const textObstacle of this.textObstacles) {
-            excludedRects.add(textObstacle);
+            const textBounds = getTextBoxBounds(textObstacle.textBox);
+            if (textObstacle.textBox.chipId !== oppositeTerminalPin.chipId || !segmentIntersectsRect(segmentStart, segmentEnd, textBounds)) {
+              excludedRects.add(textObstacle);
+            }
           }
         }
-        const segmentStart = path[segIndex2];
-        const segmentEnd = path[segIndex2 + 1];
         const endpointEpsilon = 1e-9;
         const segmentTouchesPin = (pin) => [segmentStart, segmentEnd].some(
           (point) => Math.abs(point.x - pin.x) <= endpointEpsilon && Math.abs(point.y - pin.y) <= endpointEpsilon
@@ -8831,6 +8835,7 @@ function getPaddedBounds(bounds, padding) {
 
 // lib/solvers/AvailableNetOrientationSolver/AvailableNetOrientationSolver.ts
 var LABEL_TRACE_CLEARANCE2 = 0.1;
+var CONNECTED_PIN_ROW_OVERLAP_TOLERANCE = 0.1;
 var AvailableNetOrientationSolver = class extends BaseSolver {
   inputProblem;
   traces;
@@ -9852,7 +9857,7 @@ var AvailableNetOrientationSolver = class extends BaseSolver {
       label
     });
     if (boundsStatus !== "valid") {
-      if (phase !== "trace-anchor" || boundsStatus !== "chip-collision" || !this.isAcceptableTraceAnchorChipCollision(candidate, label, bounds)) {
+      if (phase !== "trace-anchor" && phase !== "connected-rail-shift" || boundsStatus !== "chip-collision" || !this.isAcceptableTraceAnchorChipCollision(candidate, label, bounds) || phase === "connected-rail-shift" && !this.staysOutsideConnectedPinRow({ candidate, label, bounds })) {
         return boundsStatus;
       }
       const nonChipBoundsStatus = this.getBoundsStatus({
@@ -9906,6 +9911,15 @@ var AvailableNetOrientationSolver = class extends BaseSolver {
       return anchorPoint.y < chipBounds.minY - EPS12 || anchorPoint.y > chipBounds.maxY + EPS12;
     });
   }
+  staysOutsideConnectedPinRow(params) {
+    const { candidate, label, bounds } = params;
+    const pin = this.pinMap[label.pinIds[0]];
+    if (!pin || !isYOrientation(candidate.orientation)) return false;
+    if (candidate.anchorPoint.x < pin.x) {
+      return bounds.maxX <= pin.x + CONNECTED_PIN_ROW_OVERLAP_TOLERANCE + EPS12;
+    }
+    return bounds.minX >= pin.x - CONNECTED_PIN_ROW_OVERLAP_TOLERANCE - EPS12;
+  }
   getBoundsStatus(candidateBoundsCheck) {
     const { bounds, labelIndex, label, ignoreChipCollisions } = candidateBoundsCheck;
     if (!ignoreChipCollisions) {
@@ -10060,8 +10074,9 @@ var AvailableNetOrientationSolver = class extends BaseSolver {
         orientation,
         direction,
         baseAnchor: connectorSource,
-        maxSearchDistance: this.maxSearchDistance,
+        maxSearchDistance: this.getSearchDistanceLimit(label, orientation),
         outwardDistance: 0,
+        phase: "connected-rail-shift",
         stopOnTraceCollision: false,
         connectorSource,
         startDistance: 0

package/lib/solvers/AvailableNetOrientationSolver/AvailableNetOrientationSolver.ts

@@ -51,6 +51,7 @@ import { visualizeAvailableNetOrientationSolver } from "./visualize"
 import { AvailableNetOrientationObstacleIndex } from "./AvailableNetOrientationObstacleIndex"
 
 const LABEL_TRACE_CLEARANCE = 0.1
+const CONNECTED_PIN_ROW_OVERLAP_TOLERANCE = 0.1
 
 export class AvailableNetOrientationSolver extends BaseSolver {
   inputProblem: InputProblem
@@ -1443,9 +1444,11 @@ export class AvailableNetOrientationSolver extends BaseSolver {
     })
     if (boundsStatus !== "valid") {
       if (
-        phase !== "trace-anchor" ||
+        (phase !== "trace-anchor" && phase !== "connected-rail-shift") ||
         boundsStatus !== "chip-collision" ||
-        !this.isAcceptableTraceAnchorChipCollision(candidate, label, bounds)
+        !this.isAcceptableTraceAnchorChipCollision(candidate, label, bounds) ||
+        (phase === "connected-rail-shift" &&
+          !this.staysOutsideConnectedPinRow({ candidate, label, bounds }))
       ) {
         return boundsStatus
       }
@@ -1525,6 +1528,20 @@ export class AvailableNetOrientationSolver extends BaseSolver {
     })
   }
 
+  private staysOutsideConnectedPinRow(params: {
+    candidate: CandidateLabel
+    label: NetLabelPlacement
+    bounds: Bounds
+  }) {
+    const { candidate, label, bounds } = params
+    const pin = this.pinMap[label.pinIds[0]!]
+    if (!pin || !isYOrientation(candidate.orientation)) return false
+    if (candidate.anchorPoint.x < pin.x) {
+      return bounds.maxX <= pin.x + CONNECTED_PIN_ROW_OVERLAP_TOLERANCE + EPS
+    }
+    return bounds.minX >= pin.x - CONNECTED_PIN_ROW_OVERLAP_TOLERANCE - EPS
+  }
+
   private getBoundsStatus(candidateBoundsCheck: {
     bounds: Bounds
     labelIndex: number
@@ -1756,8 +1773,9 @@ export class AvailableNetOrientationSolver extends BaseSolver {
         orientation,
         direction,
         baseAnchor: connectorSource,
-        maxSearchDistance: this.maxSearchDistance,
+        maxSearchDistance: this.getSearchDistanceLimit(label, orientation),
         outwardDistance: 0,
+        phase: "connected-rail-shift",
         stopOnTraceCollision: false,
         connectorSource,
         startDistance: 0,

package/lib/solvers/AvailableNetOrientationSolver/types.ts

@@ -39,6 +39,7 @@ export type CandidateStatus =
 export type CandidatePhase =
   | "rotate"
   | "trace-anchor"
+  | "connected-rail-shift"
   | "outward-trace-anchor"
   | "shift"
   | "lateral-shift"

package/lib/solvers/SchematicTraceLinesSolver/SchematicTraceSingleLineSolver2/SchematicTraceSingleLineSolver2.ts

@@ -325,15 +325,26 @@ export class SchematicTraceSingleLineSolver2 extends BaseSolver {
       excludeRectsForSegment: (segIndex) => {
         const lastSegIndex = path.length - 2
         const excludedRects = new Set<ObstacleRect>()
+        const segmentStart = path[segIndex]!
+        const segmentEnd = path[segIndex + 1]!
 
-        if (segIndex === 0 || segIndex === lastSegIndex) {
+        const oppositeTerminalPin =
+          segIndex === 0 ? PB : segIndex === lastSegIndex ? PA : null
+        if (oppositeTerminalPin) {
           for (const textObstacle of this.textObstacles) {
-            excludedRects.add(textObstacle)
+            // Preserve the existing terminal-segment clearance exception, but
+            // do not let a segment that wraps around the opposite endpoint cut
+            // through that component's actual text.
+            const textBounds = getTextBoxBounds(textObstacle.textBox)
+            if (
+              textObstacle.textBox.chipId !== oppositeTerminalPin.chipId ||
+              !segmentIntersectsRect(segmentStart, segmentEnd, textBounds)
+            ) {
+              excludedRects.add(textObstacle)
+            }
           }
         }
 
-        const segmentStart = path[segIndex]!
-        const segmentEnd = path[segIndex + 1]!
         const endpointEpsilon = 1e-9
         const segmentTouchesPin = (pin: MspConnectionPair["pins"][number]) =>
           [segmentStart, segmentEnd].some(

package/package.json

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