@tscircuit/schematic-trace-solver 0.0.103 → 0.0.105

package/dist/index.js

@@ -1051,6 +1051,23 @@ var getObstacleRects = (problem, opts = {}) => {
 };
 
 // lib/solvers/SchematicTraceLinesSolver/SchematicTraceSingleLineSolver2/SchematicTraceSingleLineSolver2.ts
+var calculateElbowForPins = ({
+  pin1,
+  pin2,
+  overshoot
+}) => calculateElbow2(
+  {
+    x: pin1.x,
+    y: pin1.y,
+    facingDirection: pin1._facingDirection
+  },
+  {
+    x: pin2.x,
+    y: pin2.y,
+    facingDirection: pin2._facingDirection
+  },
+  { overshoot }
+);
 var SchematicTraceSingleLineSolver2 = class extends BaseSolver {
   pins;
   connectionPair;
@@ -1090,19 +1107,25 @@ var SchematicTraceSingleLineSolver2 = class extends BaseSolver {
     );
     const [pin1, pin2] = this.pins;
     const directShortPath = calculateDirectShortPath(pin1, pin2);
-    this.baseElbow = directShortPath ?? calculateElbow2(
-      {
-        x: pin1.x,
-        y: pin1.y,
-        facingDirection: pin1._facingDirection
-      },
-      {
-        x: pin2.x,
-        y: pin2.y,
-        facingDirection: pin2._facingDirection
-      },
-      { overshoot: 0.2 }
-    );
+    const defaultElbow = calculateElbowForPins({
+      pin1,
+      pin2,
+      overshoot: 0.2
+    });
+    const routingDistance = Math.abs(pin1.x - pin2.x) + Math.abs(pin1.y - pin2.y);
+    const adaptiveElbow = calculateElbowForPins({
+      pin1,
+      pin2,
+      overshoot: Math.min(0.2, Math.max(0.02, routingDistance / 4))
+    });
+    const shouldUseAdaptiveElbow = findFirstCollision(defaultElbow, this.obstacles) !== null && findFirstCollision(adaptiveElbow, this.obstacles) === null;
+    this.baseElbow = defaultElbow;
+    if (shouldUseAdaptiveElbow) {
+      this.baseElbow = adaptiveElbow;
+    }
+    if (directShortPath) {
+      this.baseElbow = directShortPath;
+    }
     this.solvedTracePath = directShortPath;
     this.aabb = aabbFromPoints(
       { x: pin1.x, y: pin1.y },
@@ -4767,7 +4790,7 @@ var minimizeTurnsWithFilteredLabels = ({
     throw new Error(`Target trace ${targetMspConnectionPairId} not found`);
   }
   const obstacleTraces = traces.filter(
-    (t) => t.mspPairId !== targetMspConnectionPairId
+    (t) => t.mspPairId !== targetMspConnectionPairId && t.globalConnNetId !== targetTrace.globalConnNetId
   );
   const TRACE_WIDTH = 0.01;
   const traceObstacles = obstacleTraces.flatMap(

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

@@ -28,6 +28,29 @@ import { getObstacleRects, type ObstacleRect } from "./rect"
 
 type PathKey = string
 
+const calculateElbowForPins = ({
+  pin1,
+  pin2,
+  overshoot,
+}: {
+  pin1: MspConnectionPair["pins"][number]
+  pin2: MspConnectionPair["pins"][number]
+  overshoot: number
+}) =>
+  calculateElbow(
+    {
+      x: pin1.x,
+      y: pin1.y,
+      facingDirection: pin1._facingDirection!,
+    },
+    {
+      x: pin2.x,
+      y: pin2.y,
+      facingDirection: pin2._facingDirection!,
+    },
+    { overshoot },
+  )
+
 export class SchematicTraceSingleLineSolver2 extends BaseSolver {
   pins: MspConnectionPair["pins"]
   connectionPair?: MspConnectionPair
@@ -89,23 +112,30 @@ export class SchematicTraceSingleLineSolver2 extends BaseSolver {
 
     const [pin1, pin2] = this.pins
     const directShortPath = calculateDirectShortPath(pin1, pin2)
+    const defaultElbow = calculateElbowForPins({
+      pin1,
+      pin2,
+      overshoot: 0.2,
+    })
+    const routingDistance =
+      Math.abs(pin1.x - pin2.x) + Math.abs(pin1.y - pin2.y)
+    const adaptiveElbow = calculateElbowForPins({
+      pin1,
+      pin2,
+      overshoot: Math.min(0.2, Math.max(0.02, routingDistance / 4)),
+    })
+    const shouldUseAdaptiveElbow =
+      findFirstCollision(defaultElbow, this.obstacles) !== null &&
+      findFirstCollision(adaptiveElbow, this.obstacles) === null
 
     // Build initial elbow path
-    this.baseElbow =
-      directShortPath ??
-      calculateElbow(
-        {
-          x: pin1.x,
-          y: pin1.y,
-          facingDirection: pin1._facingDirection!,
-        },
-        {
-          x: pin2.x,
-          y: pin2.y,
-          facingDirection: pin2._facingDirection!,
-        },
-        { overshoot: 0.2 },
-      )
+    this.baseElbow = defaultElbow
+    if (shouldUseAdaptiveElbow) {
+      this.baseElbow = adaptiveElbow
+    }
+    if (directShortPath) {
+      this.baseElbow = directShortPath
+    }
     this.solvedTracePath = directShortPath
 
     // Bounds defined by PA and PB

package/lib/solvers/TraceCleanupSolver/minimizeTurnsWithFilteredLabels.ts

@@ -5,8 +5,8 @@ import { getObstacleRects } from "lib/solvers/SchematicTraceLinesSolver/Schemati
 import type { NetLabelPlacement } from "../NetLabelPlacementSolver/NetLabelPlacementSolver"
 
 /**
- * Minimizes the turns of a target trace while considering other traces and labels as obstacles.
- * This function first identifies the target trace and separates it from other traces, which are then treated as obstacles.
+ * Minimizes the turns of a target trace while considering different-net traces and labels as obstacles.
+ * This function first identifies the target trace and separates traces from other nets, which are then treated as obstacles.
  * It also filters out labels that belong to the target trace's net, so they don't act as obstacles.
  * The function then combines static obstacles (from the input problem) with the other traces and filtered labels to create a comprehensive set of obstacles.
  * Finally, it uses a turn minimization algorithm to find a new path for the target trace that avoids these combined obstacles.
@@ -33,8 +33,12 @@ export const minimizeTurnsWithFilteredLabels = ({
     throw new Error(`Target trace ${targetMspConnectionPairId} not found`)
   }
 
+  // Same-net traces are valid connection targets: letting the candidate path
+  // coincide with them removes unnecessary detours and forms clean junctions.
   const obstacleTraces = traces.filter(
-    (t) => t.mspPairId !== targetMspConnectionPairId,
+    (t) =>
+      t.mspPairId !== targetMspConnectionPairId &&
+      t.globalConnNetId !== targetTrace.globalConnNetId,
   )
 
   const TRACE_WIDTH = 0.01

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/schematic-trace-solver",
   "main": "dist/index.js",
-  "version": "0.0.103",
+  "version": "0.0.105",
   "type": "module",
   "scripts": {
     "start": "cosmos",

package/site/bug-reports/bug-report-20260721T221026Z.page.tsx

@@ -0,0 +1,4 @@
+import { PipelineDebugger } from "site/components/PipelineDebugger"
+import inputProblem from "../../tests/bug-reports/bug-report-20260721T221026Z/bug-report-20260721T221026Z.json"
+
+export default () => <PipelineDebugger inputProblem={inputProblem as any} />

package/tests/bug-reports/bug-report-20260708T053736Z/__snapshots__/bug-report-20260708T053736Z.snap.svg

@@ -1,12 +1,8 @@
-<svg width="640" height="640" viewBox="0 0 640 640" xmlns="http://www.w3.org/2000/svg"><rect width="100%" height="100%" fill="white"/><g><polyline data-points="0.5279125,3.0973754500000004 0.7,3" data-type="line" data-label="" points="363.46296663543797,319.86511717601365 416.18376153125485,349.6970987396827" fill="none" stroke="hsl(72, 100%, 50%, 0.8)" stroke-width="1px"/></g><g><rect data-type="rect" data-label="schematic_component_0" data-x="1" data-y="3" x="416.18376153125485" y="245.5345636073937" width="183.81623846874515" height="208.32507026457802" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.0032641294642857146"/></g><g><rect data-type="rect" data-label="schematic_component_1" data-x="0" data-y="3.1" x="40" y="186.14036612802857" width="323.46296663543797" height="265.8413857337265" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.0032641294642857146"/></g><g><rect data-type="rect" data-label="netId: .L1 &gt; .pin2 to .R1 &gt; .pin1
-globalConnNetId: connectivity_net0" data-x="0.7539125" data-y="3.0973754500000004" x="363.7693270328858" y="289.2290774312228" width="137.86217885155884" height="61.272079489581756" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.0032641294642857146"/></g><g><rect data-type="rect" data-label="netId: .L1 &gt; .pin2 to .R1 &gt; .pin1
-globalConnNetId: connectivity_net0" data-x="0.474" data-y="3" x="278.01522228224815" y="319.0610589948918" width="137.86217885155884" height="61.272079489581756" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.0032641294642857146"/></g><g><circle data-type="point" data-label="R1.1
+<svg width="640" height="640" viewBox="0 0 640 640" xmlns="http://www.w3.org/2000/svg"><rect width="100%" height="100%" fill="white"/><g><polyline data-points="0.5279125,3.0973754500000004 0.7,3" data-type="line" data-label="" points="363.46296663543797,319.86511717601365 416.18376153125485,349.6970987396827" fill="none" stroke="hsl(72, 100%, 50%, 0.8)" stroke-width="1px"/></g><g><polyline data-points="0.5279125,3.0973754500000004 0.61395625,3.0973754500000004 0.61395625,3 0.7,3" data-type="line" data-label="" points="363.46296663543797,319.86511717601365 389.8233640833464,319.86511717601365 389.8233640833464,349.6970987396827 416.18376153125485,349.6970987396827" fill="none" stroke="purple" stroke-width="1px"/></g><g><rect data-type="rect" data-label="schematic_component_0" data-x="1" data-y="3" x="416.18376153125485" y="245.5345636073937" width="183.81623846874515" height="208.32507026457802" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.0032641294642857146"/></g><g><rect data-type="rect" data-label="schematic_component_1" data-x="0" data-y="3.1" x="40" y="186.14036612802857" width="323.46296663543797" height="265.8413857337265" fill="hsl(24, 100%, 50%, 0.8)" stroke="black" stroke-width="0.0032641294642857146"/></g><g><circle data-type="point" data-label="R1.1
 x-" data-x="0.7" data-y="3" cx="416.18376153125485" cy="349.6970987396827" r="3" fill="hsl(226, 100%, 50%, 0.8)"/></g><g><circle data-type="point" data-label="R1.2
 x+" data-x="1.3" data-y="3" cx="600" cy="349.6970987396827" r="3" fill="hsl(227, 100%, 50%, 0.8)"/></g><g><circle data-type="point" data-label="L1.1
 x-" data-x="-0.5279125" data-y="3.10262455" cx="40.00000000000003" cy="318.25700081377" r="3" fill="hsl(40, 100%, 50%, 0.8)"/></g><g><circle data-type="point" data-label="L1.2
-x+" data-x="0.5279125" data-y="3.0973754500000004" cx="363.46296663543797" cy="319.86511717601365" r="3" fill="hsl(41, 100%, 50%, 0.8)"/></g><g><circle data-type="point" data-label="anchorPoint
-orientation: x+" data-x="0.5279125" data-y="3.0973754500000004" cx="363.46296663543797" cy="319.86511717601365" r="3" fill="hsl(40, 100%, 50%, 0.9)"/></g><g><circle data-type="point" data-label="anchorPoint
-orientation: x-" data-x="0.7" data-y="3" cx="416.18376153125485" cy="349.6970987396827" r="3" fill="hsl(40, 100%, 50%, 0.9)"/></g><g id="crosshair" style="display: none"><line id="crosshair-h" y1="0" y2="640" stroke="#666" stroke-width="0.5"/><line id="crosshair-v" x1="0" x2="640" stroke="#666" stroke-width="0.5"/><text id="coordinates" font-family="monospace" font-size="12" fill="#666"></text></g><script><![CDATA[
+x+" data-x="0.5279125" data-y="3.0973754500000004" cx="363.46296663543797" cy="319.86511717601365" r="3" fill="hsl(41, 100%, 50%, 0.8)"/></g><g id="crosshair" style="display: none"><line id="crosshair-h" y1="0" y2="640" stroke="#666" stroke-width="0.5"/><line id="crosshair-v" x1="0" x2="640" stroke="#666" stroke-width="0.5"/><text id="coordinates" font-family="monospace" font-size="12" fill="#666"></text></g><script><![CDATA[
               document.currentScript.parentElement.addEventListener('mousemove', (e) => {
                 const svg = e.currentTarget;
                 const rect = svg.getBoundingClientRect();