@tscircuit/schematic-trace-solver 0.0.67 → 0.0.68

package/dist/index.js

@@ -4550,6 +4550,7 @@ var visualizeCollision = (collisionInfo) => {
 // lib/solvers/TraceCleanupSolver/sub-solver/UntangleTraceSubsolver.ts
 var UntangleTraceSubsolver = class extends BaseSolver {
   input;
+  chipObstacleSpatialIndex;
   lShapesToProcess = [];
   visualizationMode = "l_shapes";
   currentLShape = null;
@@ -4570,6 +4571,10 @@ var UntangleTraceSubsolver = class extends BaseSolver {
     super();
     this.input = solverInput;
     this.visualizationMode = "l_shapes";
+    this.chipObstacleSpatialIndex = this.input.inputProblem._chipObstacleSpatialIndex ?? new ChipObstacleSpatialIndex(this.input.inputProblem.chips);
+    if (!this.input.inputProblem._chipObstacleSpatialIndex) {
+      this.input.inputProblem._chipObstacleSpatialIndex = this.chipObstacleSpatialIndex;
+    }
     for (const trace of this.input.allTraces) {
       const lShapes = findAllLShapedTurns(trace.tracePath);
       this.lShapesToProcess.push(
@@ -4696,6 +4701,12 @@ var UntangleTraceSubsolver = class extends BaseSolver {
       this.input.allTraces,
       this.currentLShape.traceId
     );
+    if (!collisionResult?.isColliding && this._doesCandidateCrossChip(currentCandidate)) {
+      this.lastCollision = null;
+      this.collidingCandidate = currentCandidate;
+      this.currentCandidateIndex++;
+      return;
+    }
     if (!collisionResult?.isColliding) {
       this.bestRouteFound = currentCandidate;
       this.lastCollision = null;
@@ -4706,6 +4717,21 @@ var UntangleTraceSubsolver = class extends BaseSolver {
       this.currentCandidateIndex++;
     }
   }
+  /**
+   * Returns true if any segment of the candidate reroute passes through a
+   * schematic component (chip) body.
+   */
+  _doesCandidateCrossChip(candidate) {
+    for (let i = 0; i < candidate.length - 1; i++) {
+      if (this.chipObstacleSpatialIndex.doesOrthogonalLineIntersectChip([
+        candidate[i],
+        candidate[i + 1]
+      ])) {
+        return true;
+      }
+    }
+    return false;
+  }
   _applyBestRoute(bestRoute) {
     this.bestRoute = bestRoute;
     this.collidingCandidate = null;

package/lib/solvers/TraceCleanupSolver/sub-solver/UntangleTraceSubsolver.ts

@@ -2,6 +2,7 @@ import { BaseSolver } from "../../BaseSolver/BaseSolver"
 import type { InputProblem } from "../../../types/InputProblem"
 import type { SolvedTracePath } from "../../SchematicTraceLinesSolver/SchematicTraceLinesSolver"
 import type { NetLabelPlacement } from "../../NetLabelPlacementSolver/NetLabelPlacementSolver"
+import { ChipObstacleSpatialIndex } from "lib/data-structures/ChipObstacleSpatialIndex"
 
 import { findAllLShapedTurns, type LShape } from "./findAllLShapedTurns"
 import { getTraceObstacles } from "./getTraceObstacles"
@@ -57,6 +58,7 @@ type VisualizationMode =
  */
 export class UntangleTraceSubsolver extends BaseSolver {
   private input: UntangleTraceSubsolverInput
+  private chipObstacleSpatialIndex: ChipObstacleSpatialIndex
   private lShapesToProcess: LShape[] = []
   private visualizationMode: VisualizationMode = "l_shapes"
 
@@ -86,6 +88,14 @@ export class UntangleTraceSubsolver extends BaseSolver {
     this.input = solverInput
     this.visualizationMode = "l_shapes"
 
+    this.chipObstacleSpatialIndex =
+      this.input.inputProblem._chipObstacleSpatialIndex ??
+      new ChipObstacleSpatialIndex(this.input.inputProblem.chips)
+    if (!this.input.inputProblem._chipObstacleSpatialIndex) {
+      this.input.inputProblem._chipObstacleSpatialIndex =
+        this.chipObstacleSpatialIndex
+    }
+
     for (const trace of this.input.allTraces) {
       const lShapes = findAllLShapedTurns(trace.tracePath)
       this.lShapesToProcess.push(
@@ -232,6 +242,20 @@ export class UntangleTraceSubsolver extends BaseSolver {
       this.currentLShape!.traceId,
     )
 
+    // Untangling must never move a trace through a component body. The candidate
+    // only covers the rerouted corner (not the pin-terminal segments), so reject
+    // any candidate that crosses a chip; the original (component-clear) path is
+    // kept instead, so this stage only ever improves or leaves the trace valid.
+    if (
+      !collisionResult?.isColliding &&
+      this._doesCandidateCrossChip(currentCandidate)
+    ) {
+      this.lastCollision = null
+      this.collidingCandidate = currentCandidate
+      this.currentCandidateIndex++
+      return
+    }
+
     if (!collisionResult?.isColliding) {
       this.bestRouteFound = currentCandidate
       this.lastCollision = null
@@ -243,6 +267,24 @@ export class UntangleTraceSubsolver extends BaseSolver {
     }
   }
 
+  /**
+   * Returns true if any segment of the candidate reroute passes through a
+   * schematic component (chip) body.
+   */
+  private _doesCandidateCrossChip(candidate: Point[]): boolean {
+    for (let i = 0; i < candidate.length - 1; i++) {
+      if (
+        this.chipObstacleSpatialIndex.doesOrthogonalLineIntersectChip([
+          candidate[i]!,
+          candidate[i + 1]!,
+        ])
+      ) {
+        return true
+      }
+    }
+    return false
+  }
+
   private _applyBestRoute(bestRoute: Point[]) {
     this.bestRoute = bestRoute
     this.collidingCandidate = null

package/package.json

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

package/tests/repros/__snapshots__/repro130-bq27441-fuel-gauge-trace-through-c1.snap.svg

@@ -138,7 +138,7 @@ orientation: x+" data-x="-4.7" data-y="-0.3999999999999999" cx="202.273458966275
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
-orientation: x-" data-x="-3" data-y="-0.3999999999999999" cx="258.57241411784" cy="290.1946708021127" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
+orientation: x-" data-x="-3" data-y="-2.75" cx="258.57241411784" cy="368.01969704104056" r="3" fill="hsl(40, 100%, 50%, 0.9)" />
   </g>
   <g>
     <circle data-type="point" data-label="anchorPoint
@@ -318,7 +318,7 @@ orientation: x-" data-x="6" data-y="4.3" cx="556.6257060967127" cy="134.54461832
     <polyline data-points="4.950000000000001,-4.8 5.150000000000001,-4.8 5.150000000000001,-0.42499999999999993 2.6999999999999997,-0.42499999999999993" data-type="line" data-label="" points="521.8528220325109,435.9096135473393 528.4762285209304,435.9096135473393 528.4762285209304,291.0225966131651 447.3394990377927,291.0225966131651" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
-    <polyline data-points="-2.7,1.0999999999999996 -4.9,1.0999999999999996 -4.9,-2.2 -4.7,-2.2 -4.7,-2" data-type="line" data-label="" points="268.50752385046906,240.51912213896725 195.65005247785575,240.51912213896725 195.65005247785575,349.8053291978872 202.27345896627517,349.8053291978872 202.27345896627517,343.1819227094678" fill="none" stroke="purple" stroke-width="1" />
+    <polyline data-points="-2.7,1.0999999999999996 -3.7,1.0999999999999996 -3.7,-2.2 -4.7,-2.2 -4.7,-2" data-type="line" data-label="" points="268.50752385046906,240.51912213896725 235.39049140837213,240.51912213896725 235.39049140837213,349.8053291978872 202.27345896627517,349.8053291978872 202.27345896627517,343.1819227094678" fill="none" stroke="purple" stroke-width="1" />
   </g>
   <g>
     <polyline data-points="0,-1.3499999999999999 0,-1.5499999999999998 -2.8,-1.5499999999999998 -2.8,1.1 -2.6999999999999997,1.1" data-type="line" data-label="" points="357.9235114441309,321.6558516221048 357.9235114441309,328.2792581105242 265.1958206062594,328.2792581105242 265.1958206062594,240.51912213896725 268.5075238504691,240.51912213896725" fill="none" stroke="purple" stroke-width="1" />
@@ -374,7 +374,7 @@ globalConnNetId: connectivity_net6" data-x="-4.4750000000000005" data-y="-0.3999
   </g>
   <g>
     <rect data-type="rect" data-label="netId: PACKP
-globalConnNetId: connectivity_net7" data-x="-3.36" data-y="-0.3999999999999999" x="234.7281507595302" y="286.882967557903" width="23.84426335830983" height="6.623406488419391" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.030195942276785723" />
+globalConnNetId: connectivity_net7" data-x="-3.36" data-y="-2.75" x="234.7281507595302" y="364.70799379683086" width="23.84426335830983" height="6.623406488419391" fill="hsl(40, 100%, 50%, 0.35)" stroke="black" stroke-width="0.030195942276785723" />
   </g>
   <g>
     <rect data-type="rect" data-label="netId: PACKP

package/tests/repros/repro130-bq27441-fuel-gauge-trace-through-c1.test.ts

@@ -36,7 +36,7 @@ const pathIntersectsRect = (path: Array<{ x: number; y: number }>, rect: any) =>
     return segmentIntersectsRect(path[index - 1], point, rect)
   })
 
-test("repro130 bq27441 fuel gauge trace crosses C1 obstacle", () => {
+test("repro130 bq27441 fuel gauge trace does not cross C1 obstacle", () => {
   const solver = new SchematicTracePipelineSolver(inputProblem as any)
   solver.solve()
 
@@ -54,7 +54,7 @@ test("repro130 bq27441 fuel gauge trace crosses C1 obstacle", () => {
   expect(c1).toBeDefined()
   expect(traceThroughC1).toBeDefined()
   expect(pathIntersectsRect(traceThroughC1!.tracePath, getChipRect(c1))).toBe(
-    true,
+    false,
   )
   expect(solver).toMatchSolverSnapshot(import.meta.path)
 })