@tscircuit/schematic-trace-solver 0.0.200 → 0.0.201

package/dist/index.js

@@ -15159,6 +15159,38 @@ var placeGroundRailLabelsAtOuterEnd = ({
   return output;
 };
 
+// lib/solvers/SameNetJunctionAlignmentSolver/shortenSameSideRailToLabelAnchor.ts
+var MAX_LOCAL_RAIL_SHIFT = 0.5;
+var MIN_ESCAPE_LENGTH = 1;
+var shortenSameSideRailToLabelAnchor = ({
+  traces,
+  netLabelPlacements
+}) => traces.map((trace) => {
+  const path = trace.tracePath;
+  const firstPin = path[0];
+  const secondPin = path.at(-1);
+  if (!firstPin || !secondPin || !nearlyEqual(firstPin.x, secondPin.x)) {
+    return trace;
+  }
+  const railIndex = path.findIndex(
+    (point, index) => index > 0 && index < path.length - 2 && isHorizontal2(path[index - 1], point) && isVertical2(point, path[index + 1]) && isHorizontal2(path[index + 1], path[index + 2])
+  );
+  if (railIndex < 0) return trace;
+  const firstRail = path[railIndex];
+  const secondRail = path[railIndex + 1];
+  const escapeLength = Math.abs(firstRail.x - firstPin.x);
+  const label = netLabelPlacements.find(
+    ({ anchorPoint, orientation, mspConnectionPairIds }) => mspConnectionPairIds.includes(trace.mspPairId) && (orientation === "y-" && anchorPoint.y < Math.min(firstPin.y, secondPin.y) || orientation === "y+" && anchorPoint.y > Math.max(firstPin.y, secondPin.y)) && anchorPoint.x >= Math.min(firstPin.x, firstRail.x) && anchorPoint.x <= Math.max(firstPin.x, firstRail.x) && Math.abs(anchorPoint.x - firstPin.x) < escapeLength && Math.abs(anchorPoint.x - firstRail.x) <= MAX_LOCAL_RAIL_SHIFT && escapeLength >= MIN_ESCAPE_LENGTH
+  );
+  if (!label) return trace;
+  return {
+    ...trace,
+    tracePath: path.map(
+      (point, index) => index === railIndex || index === railIndex + 1 ? { ...point, x: label.anchorPoint.x } : point
+    )
+  };
+});
+
 // lib/solvers/SameNetJunctionAlignmentSolver/SameNetJunctionAlignmentSolver.ts
 var SameNetJunctionAlignmentSolver = class extends BaseSolver {
   input;
@@ -15172,10 +15204,13 @@ var SameNetJunctionAlignmentSolver = class extends BaseSolver {
   }
   _step() {
     const alignment = alignSameNetJunctions(this.input);
-    this.outputTraces = alignment.traces;
+    this.outputTraces = shortenSameSideRailToLabelAnchor({
+      traces: alignment.traces,
+      netLabelPlacements: alignment.netLabelPlacements
+    });
     this.outputNetLabelPlacements = placeGroundRailLabelsAtOuterEnd({
       inputProblem: this.input.inputProblem,
-      traces: alignment.traces,
+      traces: this.outputTraces,
       netLabelPlacements: alignment.netLabelPlacements
     });
     this.stats.alignedJunctionCount = alignment.alignedJunctionCount;

package/lib/solvers/SameNetJunctionAlignmentSolver/SameNetJunctionAlignmentSolver.ts

@@ -8,6 +8,7 @@ import type { InputProblem } from "lib/types/InputProblem"
 import { getColorFromString } from "lib/utils/getColorFromString"
 import { alignSameNetJunctions } from "./alignSameNetJunctions"
 import { placeGroundRailLabelsAtOuterEnd } from "./placeGroundRailLabelsAtOuterEnd"
+import { shortenSameSideRailToLabelAnchor } from "./shortenSameSideRailToLabelAnchor"
 
 interface SameNetJunctionAlignmentSolverInput {
   inputProblem: InputProblem
@@ -31,10 +32,13 @@ export class SameNetJunctionAlignmentSolver extends BaseSolver {
 
   override _step() {
     const alignment = alignSameNetJunctions(this.input)
-    this.outputTraces = alignment.traces
+    this.outputTraces = shortenSameSideRailToLabelAnchor({
+      traces: alignment.traces,
+      netLabelPlacements: alignment.netLabelPlacements,
+    })
     this.outputNetLabelPlacements = placeGroundRailLabelsAtOuterEnd({
       inputProblem: this.input.inputProblem,
-      traces: alignment.traces,
+      traces: this.outputTraces,
       netLabelPlacements: alignment.netLabelPlacements,
     })
     this.stats.alignedJunctionCount = alignment.alignedJunctionCount

package/lib/solvers/SameNetJunctionAlignmentSolver/shortenSameSideRailToLabelAnchor.ts

@@ -0,0 +1,62 @@
+import type { NetLabelPlacement } from "lib/solvers/NetLabelPlacementSolver/NetLabelPlacementSolver"
+import type { SolvedTracePath } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceLinesSolver"
+import {
+  isHorizontal,
+  isVertical,
+  nearlyEqual,
+} from "lib/solvers/TraceCleanupSolver/sameNetRailAlignment/geometry"
+
+const MAX_LOCAL_RAIL_SHIFT = 0.5
+const MIN_ESCAPE_LENGTH = 1
+
+export const shortenSameSideRailToLabelAnchor = ({
+  traces,
+  netLabelPlacements,
+}: {
+  traces: SolvedTracePath[]
+  netLabelPlacements: NetLabelPlacement[]
+}) =>
+  traces.map((trace) => {
+    const path = trace.tracePath
+    const firstPin = path[0]
+    const secondPin = path.at(-1)
+    if (!firstPin || !secondPin || !nearlyEqual(firstPin.x, secondPin.x)) {
+      return trace
+    }
+
+    const railIndex = path.findIndex(
+      (point, index) =>
+        index > 0 &&
+        index < path.length - 2 &&
+        isHorizontal(path[index - 1]!, point) &&
+        isVertical(point, path[index + 1]!) &&
+        isHorizontal(path[index + 1]!, path[index + 2]!),
+    )
+    if (railIndex < 0) return trace
+    const firstRail = path[railIndex]!
+    const secondRail = path[railIndex + 1]!
+    const escapeLength = Math.abs(firstRail.x - firstPin.x)
+    const label = netLabelPlacements.find(
+      ({ anchorPoint, orientation, mspConnectionPairIds }) =>
+        mspConnectionPairIds.includes(trace.mspPairId) &&
+        ((orientation === "y-" &&
+          anchorPoint.y < Math.min(firstPin.y, secondPin.y)) ||
+          (orientation === "y+" &&
+            anchorPoint.y > Math.max(firstPin.y, secondPin.y))) &&
+        anchorPoint.x >= Math.min(firstPin.x, firstRail.x) &&
+        anchorPoint.x <= Math.max(firstPin.x, firstRail.x) &&
+        Math.abs(anchorPoint.x - firstPin.x) < escapeLength &&
+        Math.abs(anchorPoint.x - firstRail.x) <= MAX_LOCAL_RAIL_SHIFT &&
+        escapeLength >= MIN_ESCAPE_LENGTH,
+    )
+    if (!label) return trace
+
+    return {
+      ...trace,
+      tracePath: path.map((point, index) =>
+        index === railIndex || index === railIndex + 1
+          ? { ...point, x: label.anchorPoint.x }
+          : point,
+      ),
+    }
+  })

package/package.json

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