@tscircuit/schematic-trace-solver 0.0.121 → 0.0.123

package/dist/index.d.ts

@@ -828,11 +828,11 @@ type TraceCornerCandidate = {
     traceId: string;
     distance: number;
     /**
-     * True when the corner lines up with one of the trace's pins along the
-     * label's stub axis (same x for a vertical rail label), so the label reads as
-     * a clean stub off that pin rather than floating over a mid-trace bend.
+     * True when the corner is on a vertical rail that connects directly to one
+     * of the trace's endpoint pins, rather than on an arbitrary middle bend.
      */
     pinAligned: boolean;
+    reroutedTracePath?: Point[];
 };
 type CornerCandidateStatus = "valid" | "chip-collision" | "text-collision" | "trace-collision" | "netlabel-collision";
 type EvaluatedCornerCandidate = TraceCornerCandidate & {
@@ -859,6 +859,7 @@ declare class RailNetLabelCornerPlacementSolver extends BaseSolver {
     getConstructorParams(): ConstructorParameters<typeof RailNetLabelCornerPlacementSolver>[0];
     _step(): void;
     getOutput(): {
+        traces: SolvedTracePath[];
         netLabelPlacements: NetLabelPlacement[];
     };
     private getProcessableLabelIndices;
@@ -873,6 +874,12 @@ declare class RailNetLabelCornerPlacementSolver extends BaseSolver {
     private intersectsAnyChip;
     private intersectsAnyOtherNetLabel;
     private getCornerCandidatesForLabel;
+    private isConfiguredRailLabel;
+    private pointsEqual;
+    private getVerticalSegmentPointIndices;
+    private isPinAlignedCorner;
+    private getClearanceShiftedCornerCandidates;
+    private isReroutedTraceClear;
     private getTraceLinesForLabel;
     private isTraceForLabel;
     visualize(): GraphicsObject;

package/dist/index.js

@@ -9052,6 +9052,7 @@ var RailNetLabelCornerPlacementSolver = class extends BaseSolver {
   }
   getOutput() {
     return {
+      traces: this.traces,
       netLabelPlacements: this.outputNetLabelPlacements
     };
   }
@@ -9104,15 +9105,25 @@ var RailNetLabelCornerPlacementSolver = class extends BaseSolver {
       center,
       width: label.width,
       height: label.height,
-      status: this.getCandidateStatus(bounds, labelIndex),
+      status: this.getCandidateStatus(bounds, labelIndex, candidate),
       selected: false
     };
   }
-  getCandidateStatus(bounds, labelIndex) {
+  getCandidateStatus(bounds, labelIndex, candidate) {
     if (this.intersectsAnyChip(bounds)) return "chip-collision";
     if (rectIntersectsAnyTextBox(bounds, this.inputProblem))
       return "text-collision";
-    if (traceCrossesBoundsInterior(bounds, this.traceMap)) {
+    const candidateTraceMap = candidate.reroutedTracePath ? {
+      ...this.traceMap,
+      [candidate.traceId]: {
+        ...this.traceMap[candidate.traceId],
+        tracePath: candidate.reroutedTracePath
+      }
+    } : this.traceMap;
+    if (traceCrossesBoundsInterior(bounds, candidateTraceMap)) {
+      return "trace-collision";
+    }
+    if (candidate.reroutedTracePath && !this.isReroutedTraceClear(candidate, labelIndex)) {
       return "trace-collision";
     }
     if (this.intersectsAnyOtherNetLabel(bounds, labelIndex)) {
@@ -9121,6 +9132,23 @@ var RailNetLabelCornerPlacementSolver = class extends BaseSolver {
     return "valid";
   }
   applyCandidate(labelIndex, label, candidate) {
+    if (candidate.reroutedTracePath) {
+      const originalTrace = this.traceMap[candidate.traceId];
+      const reroutedTrace = {
+        ...originalTrace,
+        tracePath: candidate.reroutedTracePath
+      };
+      this.traces = this.traces.map(
+        (trace) => trace.mspPairId === candidate.traceId ? reroutedTrace : trace
+      );
+      this.traceMap[candidate.traceId] = reroutedTrace;
+      this.outputNetLabelPlacements = moveAttachedLabelsToReroutedTrace({
+        trace: originalTrace,
+        originalTracePath: originalTrace.tracePath,
+        reroutedTracePath: candidate.reroutedTracePath,
+        netLabelPlacements: this.outputNetLabelPlacements
+      });
+    }
     this.outputNetLabelPlacements[labelIndex] = {
       ...label,
       anchorPoint: candidate.anchorPoint,
@@ -9146,30 +9174,152 @@ var RailNetLabelCornerPlacementSolver = class extends BaseSolver {
     });
   }
   getCornerCandidatesForLabel(label) {
-    const isVertical5 = label.orientation === "y+" || label.orientation === "y-";
-    const candidates = [];
-    const seenCornerKeys = /* @__PURE__ */ new Set();
-    for (const trace of this.getTraceLinesForLabel(label)) {
+    const anchorAlignedCandidates = [];
+    const railAlignedCandidates = [];
+    const labelTraces = this.getTraceLinesForLabel(label);
+    const allowRailAlignedFallback = this.isConfiguredRailLabel(label) && !labelTraces.some(
+      (trace) => getTraceCorners(trace.tracePath).some(
+        (corner) => this.pointsEqual(corner, label.anchorPoint)
+      )
+    );
+    for (const trace of labelTraces) {
       const path = trace.tracePath;
       const pins = [path[0], path[path.length - 1]];
       for (const anchorPoint of getTraceCorners(path)) {
-        const key = `${anchorPoint.x}:${anchorPoint.y}`;
-        if (seenCornerKeys.has(key)) continue;
-        seenCornerKeys.add(key);
-        const pinAligned = pins.some((pin) => {
-          if (isVertical5) return Math.abs(pin.x - anchorPoint.x) < EPS6;
-          return Math.abs(pin.y - anchorPoint.y) < EPS6;
-        });
+        const cornerIndex = path.indexOf(anchorPoint);
+        const anchorAlignedToPin = pins.some(
+          (pin) => Math.abs(pin.x - anchorPoint.x) <= EPS6
+        );
+        const pinAligned = anchorAlignedToPin || allowRailAlignedFallback && this.isPinAlignedCorner(path, cornerIndex);
         if (!pinAligned) continue;
-        candidates.push({
+        const candidates = anchorAlignedToPin ? anchorAlignedCandidates : railAlignedCandidates;
+        candidates.push(
+          {
+            anchorPoint,
+            traceId: trace.mspPairId,
+            distance: getDistance(anchorPoint, label.anchorPoint),
+            pinAligned
+          },
+          ...this.getClearanceShiftedCornerCandidates({
+            label,
+            trace,
+            cornerIndex,
+            pinAligned
+          })
+        );
+      }
+    }
+    return [
+      ...anchorAlignedCandidates.sort((a, b) => a.distance - b.distance),
+      ...railAlignedCandidates.sort((a, b) => a.distance - b.distance)
+    ];
+  }
+  isConfiguredRailLabel(label) {
+    if (!label.netId) return false;
+    return this.inputProblem.availableNetLabelOrientations[label.netId]?.some(
+      (orientation) => orientation === "y+" || orientation === "y-"
+    );
+  }
+  pointsEqual(a, b) {
+    return Math.abs(a.x - b.x) <= EPS6 && Math.abs(a.y - b.y) <= EPS6;
+  }
+  getVerticalSegmentPointIndices(path, cornerIndex) {
+    const corner = path[cornerIndex];
+    const previousIsVertical = Math.abs(path[cornerIndex - 1].x - corner.x) <= EPS6;
+    const nextIsVertical = Math.abs(path[cornerIndex + 1].x - corner.x) <= EPS6;
+    if (previousIsVertical === nextIsVertical) return null;
+    const indices = previousIsVertical ? [cornerIndex - 1, cornerIndex] : [cornerIndex, cornerIndex + 1];
+    return indices;
+  }
+  isPinAlignedCorner(path, cornerIndex) {
+    const verticalPointIndices = this.getVerticalSegmentPointIndices(
+      path,
+      cornerIndex
+    );
+    if (!verticalPointIndices) return false;
+    const [startIndex, endIndex] = verticalPointIndices;
+    return startIndex <= 1 || endIndex >= path.length - 2;
+  }
+  getClearanceShiftedCornerCandidates({
+    label,
+    trace,
+    cornerIndex,
+    pinAligned
+  }) {
+    if (label.orientation !== "y+" && label.orientation !== "y-") return [];
+    const path = trace.tracePath;
+    const corner = path[cornerIndex];
+    const verticalPointIndices = this.getVerticalSegmentPointIndices(
+      path,
+      cornerIndex
+    );
+    if (!verticalPointIndices || verticalPointIndices.includes(0) || verticalPointIndices.includes(path.length - 1)) {
+      return [];
+    }
+    const center = getCenterFromAnchor(
+      corner,
+      label.orientation,
+      label.width,
+      label.height
+    );
+    const labelBounds = getRectBounds(center, label.width, label.height);
+    const collidingChipBounds = this.inputProblem.chips.map((chip) => getRectBounds(chip.center, chip.width, chip.height)).filter((chipBounds) => rectsOverlap(labelBounds, chipBounds));
+    const shiftedCoordinates = /* @__PURE__ */ new Set();
+    for (const chipBounds of collidingChipBounds) {
+      shiftedCoordinates.add(chipBounds.minX - label.width / 2);
+      shiftedCoordinates.add(chipBounds.maxX + label.width / 2);
+    }
+    return [...shiftedCoordinates].flatMap((x) => {
+      if (Math.abs(x - corner.x) <= EPS6) return [];
+      const reroutedTracePath = simplifyPath(
+        path.map(
+          (point, pointIndex) => verticalPointIndices.includes(pointIndex) ? { ...point, x } : point
+        )
+      );
+      const anchorPoint = { x, y: corner.y };
+      const remainsCorner = getTraceCorners(reroutedTracePath).some(
+        (point) => this.pointsEqual(point, anchorPoint)
+      );
+      if (!remainsCorner) return [];
+      return [
+        {
           anchorPoint,
           traceId: trace.mspPairId,
           distance: getDistance(anchorPoint, label.anchorPoint),
-          pinAligned
-        });
-      }
+          pinAligned,
+          reroutedTracePath
+        }
+      ];
+    });
+  }
+  isReroutedTraceClear(candidate, labelIndex) {
+    const reroutedTracePath = candidate.reroutedTracePath;
+    if (isPathCollidingWithObstacles(
+      reroutedTracePath,
+      getObstacleRects(this.inputProblem)
+    )) {
+      return false;
+    }
+    const candidateTrace = this.traceMap[candidate.traceId];
+    const otherNetTraces = this.traces.filter(
+      (trace) => trace.mspPairId !== candidate.traceId && trace.globalConnNetId !== candidateTrace.globalConnNetId
+    );
+    if (doesPathOverlapTraceStrokes(reroutedTracePath, otherNetTraces)) {
+      return false;
     }
-    return candidates.sort((a, b) => a.distance - b.distance);
+    const reroutedTraceMap = {
+      [candidate.traceId]: {
+        ...candidateTrace,
+        tracePath: reroutedTracePath
+      }
+    };
+    return this.outputNetLabelPlacements.every((label, index) => {
+      if (index === labelIndex) return true;
+      return !traceCrossesBoundsInterior(
+        getRectBounds(label.center, label.width, label.height),
+        reroutedTraceMap
+      );
+    });
   }
   getTraceLinesForLabel(label) {
     return this.traces.filter(
@@ -11031,6 +11181,7 @@ var UnroutedTraceRecoverySolver = class extends BaseSolver {
 };
 
 // lib/solvers/SameNetJunctionAlignmentSolver/pathIntersectsAnyNetLabel.ts
+var NET_LABEL_INTERIOR_INSET = 1e-6;
 var pathIntersectsAnyNetLabel = ({
   path,
   netLabelPlacements
@@ -11045,9 +11196,30 @@ var pathIntersectsAnyNetLabel = ({
   }
   return false;
 };
+var pathEntersAnyNetLabel = ({
+  path,
+  netLabelPlacements
+}) => {
+  for (const label of netLabelPlacements) {
+    const labelBounds = getRectBounds(label.center, label.width, label.height);
+    const labelInteriorBounds = {
+      minX: labelBounds.minX + NET_LABEL_INTERIOR_INSET,
+      minY: labelBounds.minY + NET_LABEL_INTERIOR_INSET,
+      maxX: labelBounds.maxX - NET_LABEL_INTERIOR_INSET,
+      maxY: labelBounds.maxY - NET_LABEL_INTERIOR_INSET
+    };
+    for (let index = 0; index < path.length - 1; index++) {
+      if (segmentIntersectsRect2(path[index], path[index + 1], labelInteriorBounds)) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
 
 // lib/solvers/SameNetJunctionAlignmentSolver/alignSameNetJunctions.ts
 var MAX_ALIGNED_LOAD_PIN_OFFSET = 0.2;
+var MAX_SAME_NET_LABEL_BOUNDARY_RAIL_OFFSET = 0.2;
 var getSharedPin = ({
   donorTrace,
   branchTrace
@@ -11124,6 +11296,7 @@ var getAlignedBranchPath = ({
 };
 var candidateIsClear = ({
   candidateTrace,
+  originalTrace,
   traces,
   inputProblem,
   netLabelPlacements
@@ -11138,10 +11311,34 @@ var candidateIsClear = ({
   if (doesPathCoincideWithTraces(candidateTrace.tracePath, otherNetTraces)) {
     return false;
   }
-  return !pathIntersectsAnyNetLabel({
+  const otherNetLabelPlacements = netLabelPlacements.filter(
+    (label) => label.globalConnNetId !== candidateTrace.globalConnNetId
+  );
+  if (pathIntersectsAnyNetLabel({
+    path: candidateTrace.tracePath,
+    netLabelPlacements: otherNetLabelPlacements
+  })) {
+    return false;
+  }
+  const sameNetLabelPlacements = netLabelPlacements.filter(
+    (label) => label.globalConnNetId === candidateTrace.globalConnNetId
+  );
+  if (!pathIntersectsAnyNetLabel({
     path: candidateTrace.tracePath,
-    netLabelPlacements
-  });
+    netLabelPlacements: sameNetLabelPlacements
+  })) {
+    return true;
+  }
+  if (pathEntersAnyNetLabel({
+    path: candidateTrace.tracePath,
+    netLabelPlacements: sameNetLabelPlacements
+  })) {
+    return false;
+  }
+  const originalRail = getLongestHorizontalSegment(originalTrace);
+  const candidateRail = getLongestHorizontalSegment(candidateTrace);
+  if (!originalRail || !candidateRail) return false;
+  return Math.abs(originalRail.start.y - candidateRail.start.y) <= MAX_SAME_NET_LABEL_BOUNDARY_RAIL_OFFSET;
 };
 var alignSameNetJunctions = ({
   inputProblem,
@@ -11174,6 +11371,7 @@ var alignSameNetJunctions = ({
       }
       if (!candidateIsClear({
         candidateTrace,
+        originalTrace: branchTrace,
         traces: outputTraces,
         inputProblem,
         netLabelPlacements
@@ -11484,9 +11682,7 @@ var SchematicTracePipelineSolver = class extends BaseSolver {
       (instance) => [
         {
           inputProblem: instance.inputProblem,
-          traces: Object.values(
-            instance.postLabelTraceOverlapShiftSolver.correctedTraceMap
-          ),
+          traces: instance.railNetLabelCornerPlacementSolver.getOutput().traces,
           netLabelPlacements: instance.railNetLabelCornerPlacementSolver.outputNetLabelPlacements
         }
       ]
@@ -11497,9 +11693,7 @@ var SchematicTracePipelineSolver = class extends BaseSolver {
       (instance) => [
         {
           inputProblem: instance.inputProblem,
-          traces: Object.values(
-            instance.postLabelTraceOverlapShiftSolver.correctedTraceMap
-          ),
+          traces: instance.railNetLabelCornerPlacementSolver.getOutput().traces,
           netLabelPlacements: instance.traceAnchoredNetLabelOverlapSolver.outputNetLabelPlacements
         }
       ]
@@ -11529,12 +11723,34 @@ var SchematicTracePipelineSolver = class extends BaseSolver {
       "netLabelTraceCollisionSolver",
       NetLabelTraceCollisionSolver,
       (instance) => {
-        const previousCollisionOutput = instance.preAlignmentNetLabelTraceCollisionSolver.getOutput();
+        const previousOutput = instance.preAlignmentNetLabelTraceCollisionSolver.getOutput();
+        const alignmentOutput = instance.traceCleanupSolver2.getOutput();
+        const previousTraceMap = new Map(
+          previousOutput.traces.map((trace) => [trace.mspPairId, trace])
+        );
+        let netLabelPlacements = previousOutput.netLabelPlacements;
+        for (const trace of alignmentOutput.traces) {
+          const previousTrace = previousTraceMap.get(trace.mspPairId);
+          if (!previousTrace || previousTrace.tracePath === trace.tracePath) {
+            continue;
+          }
+          const currentLabels = netLabelPlacements;
+          const movedLabels = moveAttachedLabelsToReroutedTrace({
+            trace: previousTrace,
+            originalTracePath: previousTrace.tracePath,
+            reroutedTracePath: trace.tracePath,
+            netLabelPlacements: currentLabels
+          });
+          netLabelPlacements = movedLabels.map((movedLabel, labelIndex) => {
+            const label = currentLabels[labelIndex];
+            return label.orientation === "y+" || label.orientation === "y-" ? movedLabel : label;
+          });
+        }
         return [
           {
             inputProblem: instance.inputProblem,
-            traces: instance.traceCleanupSolver2.getOutput().traces,
-            netLabelPlacements: previousCollisionOutput.netLabelPlacements
+            traces: alignmentOutput.traces,
+            netLabelPlacements
           }
         ];
       }