@tscircuit/schematic-trace-solver 0.0.114 → 0.0.116

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

@@ -123,16 +123,16 @@ export class SchematicTraceSingleLineSolver2 extends BaseSolver {
     })
     this.textObstacles = new Set(this.obstacles.filter(isTextBoxObstacle))
     const endpointChipIds = new Set(this.pins.map((pin) => pin.chipId))
+    // Same-chip routes also need these obstacles so they can escape around
+    // attached text after a narrow chip-to-text channel is closed.
     this.endpointTextObstacles = new Set(
-      endpointChipIds.size > 1
-        ? this.obstacles
-            .filter(isTextBoxObstacle)
-            .filter(
-              (obstacle) =>
-                obstacle.textBox.chipId !== undefined &&
-                endpointChipIds.has(obstacle.textBox.chipId),
-            )
-        : [],
+      this.obstacles
+        .filter(isTextBoxObstacle)
+        .filter(
+          (obstacle) =>
+            obstacle.textBox.chipId !== undefined &&
+            endpointChipIds.has(obstacle.textBox.chipId),
+        ),
     )
 
     const [pin1, pin2] = this.pins

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

@@ -1,20 +1,21 @@
+import { boundsDistance, type Bounds } from "@tscircuit/math-utils"
 import { getInputChipBounds } from "lib/solvers/GuidelinesSolver/getInputChipBounds"
 import type { InputChip, InputProblem } from "lib/types/InputProblem"
 import { getTextBoxBounds, type RectPadding } from "lib/utils/textBoxBounds"
 
-export type RectBounds = {
-  minX: number
-  minY: number
-  maxX: number
-  maxY: number
-}
+// Component text is normally placed 0.04 units from its chip. A trace
+// centerline can fit mathematically, but its rendered stroke cannot usefully
+// occupy that channel.
+const MIN_ROUTABLE_OBSTACLE_GAP = 0.05
+
+export type { Bounds as RectBounds } from "@tscircuit/math-utils"
 
-export type ChipObstacleRect = RectBounds & {
+export type ChipObstacleRect = Bounds & {
   kind: "chip"
   chipId: string
 }
 
-export type TextBoxObstacleRect = RectBounds & {
+export type TextBoxObstacleRect = Bounds & {
   kind: "text_box"
   textBox: NonNullable<InputProblem["textBoxes"]>[number]
 }
@@ -36,7 +37,22 @@ export const getObstacleRects = (
 ): ObstacleRect[] => {
   const chipRects = problem.chips.map(chipToRect)
   const textBoxRects = (problem.textBoxes ?? []).map((textBox) => {
-    const b = getTextBoxBounds(textBox, opts.textBoxPadding)
+    const textBounds = getTextBoxBounds(textBox, opts.textBoxPadding)
+    const attachedChipBounds = chipRects.find(
+      (chip) => chip.chipId === textBox.chipId,
+    )
+    const gap = attachedChipBounds
+      ? boundsDistance(textBounds, attachedChipBounds)
+      : Number.POSITIVE_INFINITY
+    const b =
+      attachedChipBounds && gap > 0 && gap < MIN_ROUTABLE_OBSTACLE_GAP
+        ? {
+            minX: Math.min(textBounds.minX, attachedChipBounds.maxX),
+            maxX: Math.max(textBounds.maxX, attachedChipBounds.minX),
+            minY: Math.min(textBounds.minY, attachedChipBounds.maxY),
+            maxY: Math.max(textBounds.maxY, attachedChipBounds.minY),
+          }
+        : textBounds
     return {
       kind: "text_box" as const,
       textBox,

package/lib/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver.ts

@@ -28,6 +28,7 @@ import { TraceAnchoredNetLabelOverlapSolver } from "../TraceAnchoredNetLabelOver
 import { NetLabelTraceCollisionSolver } from "../NetLabelTraceCollisionSolver/NetLabelTraceCollisionSolver"
 import { NetLabelNetLabelCollisionSolver } from "../NetLabelNetLabelCollisionSolver/NetLabelNetLabelCollisionSolver"
 import { UnroutedTraceRecoverySolver } from "../UnroutedTraceRecoverySolver/UnroutedTraceRecoverySolver"
+import { SameNetJunctionAlignmentSolver } from "../SameNetJunctionAlignmentSolver/SameNetJunctionAlignmentSolver"
 
 type PipelineStep<T extends new (...args: any[]) => BaseSolver> = {
   solverName: string
@@ -86,6 +87,7 @@ export class SchematicTracePipelineSolver extends BaseSolver {
   netLabelTraceCollisionSolver?: NetLabelTraceCollisionSolver
   traceCleanupSolver2?: TraceCleanupSolver
   netLabelNetLabelCollisionSolver?: NetLabelNetLabelCollisionSolver
+  sameNetJunctionAlignmentSolver?: SameNetJunctionAlignmentSolver
 
   startTimeOfPhase: Record<string, number>
   endTimeOfPhase: Record<string, number>
@@ -402,6 +404,21 @@ export class SchematicTracePipelineSolver extends BaseSolver {
         },
       ],
     ),
+    definePipelineStep(
+      "sameNetJunctionAlignmentSolver",
+      SameNetJunctionAlignmentSolver,
+      (instance) => {
+        const collisionOutput =
+          instance.netLabelNetLabelCollisionSolver!.getOutput()
+        return [
+          {
+            inputProblem: instance.inputProblem,
+            traces: instance.netLabelNetLabelCollisionSolver!.traces,
+            netLabelPlacements: collisionOutput.netLabelPlacements,
+          },
+        ]
+      },
+    ),
   ]
 
   constructor(inputProblem: InputProblem, opts?: Options) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/schematic-trace-solver",
   "main": "dist/index.js",
-  "version": "0.0.114",
+  "version": "0.0.116",
   "type": "module",
   "scripts": {
     "start": "cosmos",
@@ -13,7 +13,7 @@
   "devDependencies": {
     "@biomejs/biome": "^2.2.2",
     "@react-hook/resize-observer": "^2.0.2",
-    "@tscircuit/math-utils": "^0.0.19",
+    "@tscircuit/math-utils": "^0.0.36",
     "@types/bun": "^1.2.21",
     "bun-match-svg": "^0.0.13",
     "calculate-elbow": "^0.0.12",

package/site/bug-reports/bug-report-20260730T061837Z.page.tsx

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