@tscircuit/schematic-trace-solver 0.0.188 → 0.0.189

package/dist/index.d.ts

@@ -1148,6 +1148,8 @@ interface NetLabelNetLabelCollisionSolverParams {
     useRenderedLabelBounds?: boolean;
     /** Already placed labels that are obstacles, but must not be moved. */
     fixedNetLabelPlacements?: NetLabelPlacement[];
+    /** Existing connector identities from AvailableNetOrientationSolver. */
+    netLabelConnectorTraceIds?: ReadonlySet<MspConnectionPairId>;
     inputProblem: InputProblem;
     traces: SolvedTracePath[];
     netLabelPlacements: NetLabelPlacement[];

package/dist/index.js

@@ -7005,13 +7005,15 @@ var generatePerpendicularTraceDetours = ({
         bounds2[highBound] + clearance
       ])
     ].filter((coordinate) => coordinate !== void 0);
+    const remainingPath = path.slice(index + 2);
+    if (remainingPath.length === 0) remainingPath.push(end);
     return [...new Set(detourCoordinates)].map(
       (detour) => simplifyPath([
         ...path.slice(0, index + 1),
         { ...start, [movingAxis]: gate },
         { ...start, [movingAxis]: gate, [detourAxis]: detour },
         { ...end, [detourAxis]: detour },
-        ...path.slice(index + 2)
+        ...remainingPath
       ])
     );
   };
@@ -12403,6 +12405,17 @@ globalConnNetId: ${label.globalConnNetId}`
 // lib/solvers/InlineNetLabelSolver/getAnchoredNetLabelRenderedBounds.ts
 var getAnchoredNetLabelRenderedBounds = (placement) => {
   if (placement.orientation !== "x-" && placement.orientation !== "x+") {
+    if (placement.netLabelText && placement.width > placement.height) {
+      const width2 = placement.height;
+      const height2 = placement.width;
+      const center2 = getCenterFromAnchor(
+        placement.anchorPoint,
+        placement.orientation,
+        width2,
+        height2
+      );
+      return getRectBounds(center2, width2, height2);
+    }
     return getRectBounds(placement.center, placement.width, placement.height);
   }
   const width = Math.max(placement.width, placement.height);
@@ -12565,8 +12578,10 @@ var NetLabelNetLabelCollisionSolver = class extends BaseSolver {
         status: null
       };
     };
-    const isPortOnly = label.mspConnectionPairIds.length === 0;
-    if (isPortOnly) {
+    const isAnchoredOnConnector = this.traces.some(
+      (trace) => this.params.netLabelConnectorTraceIds?.has(trace.mspPairId) && trace.globalConnNetId === label.globalConnNetId && tracePathContainsPoint(trace.tracePath, label.anchorPoint)
+    );
+    if (label.mspConnectionPairIds.length === 0 || isAnchoredOnConnector) {
       const allOrientations = ["x+", "x-", "y+", "y-"];
       const orderedOrientations = [
         label.orientation,
@@ -13659,8 +13674,10 @@ var getHorizontalPinApproachPoint = ({
   return approachesFromFacingSide ? approachPoint : null;
 };
 var getAttachedLabelIndexes = (trace, netLabelPlacements) => netLabelPlacements.flatMap((label, index) => {
-  const labelOwnsTrace = label.mspConnectionPairIds.includes(trace.mspPairId) || label.mspConnectionPairIds.length === 0 && label.globalConnNetId === trace.globalConnNetId;
-  return labelOwnsTrace && tracePathContainsPoint(trace.tracePath, label.anchorPoint) ? [index] : [];
+  if (isLabelAttachedToTrace(label, trace) && tracePathContainsPoint(trace.tracePath, label.anchorPoint)) {
+    return [index];
+  }
+  return [];
 });
 var moveAttachedLabels = ({
   trace,
@@ -17098,6 +17115,7 @@ var InlineNetLabelSolver = class _InlineNetLabelSolver extends BaseSolver {
         traces: [...outputTraces, ...terminalTraces],
         netLabelPlacements: retainedNetLabelPlacements,
         fixedNetLabelPlacements: fixedLabels,
+        netLabelConnectorTraceIds: this.netLabelConnectorTraceIds,
         useRenderedLabelBounds: activeInlinePlacements.length > 0
       });
       if (activeInlinePlacements.length > 0) labelCollisionSolver.solve();

package/lib/solvers/InlineNetLabelSolver/InlineNetLabelSolver.ts

@@ -1193,6 +1193,7 @@ export class InlineNetLabelSolver extends BaseSolver {
         traces: [...outputTraces, ...terminalTraces],
         netLabelPlacements: retainedNetLabelPlacements,
         fixedNetLabelPlacements: fixedLabels,
+        netLabelConnectorTraceIds: this.netLabelConnectorTraceIds,
         useRenderedLabelBounds: activeInlinePlacements.length > 0,
       })
       if (activeInlinePlacements.length > 0) labelCollisionSolver.solve()

package/lib/solvers/InlineNetLabelSolver/getAnchoredNetLabelRenderedBounds.ts

@@ -19,6 +19,19 @@ export const getAnchoredNetLabelRenderedBounds = (
   placement: NetLabelPlacement,
 ): Bounds => {
   if (placement.orientation !== "x-" && placement.orientation !== "x+") {
+    // Named vertical tags render their long text extent along y. Width-only
+    // placeholders retain the supplied envelope instead.
+    if (placement.netLabelText && placement.width > placement.height) {
+      const width = placement.height
+      const height = placement.width
+      const center = getCenterFromAnchor(
+        placement.anchorPoint,
+        placement.orientation,
+        width,
+        height,
+      )
+      return getRectBounds(center, width, height)
+    }
     return getRectBounds(placement.center, placement.width, placement.height)
   }
 

package/lib/solvers/NetLabelNetLabelCollisionSolver/NetLabelNetLabelCollisionSolver.ts

@@ -2,6 +2,7 @@ import { getAnchoredNetLabelRenderedBounds } from "../InlineNetLabelSolver/getAn
 import type { GraphicsObject } from "graphics-debug"
 import { BaseSolver } from "lib/solvers/BaseSolver/BaseSolver"
 import type { NetLabelPlacement } from "lib/solvers/NetLabelPlacementSolver/NetLabelPlacementSolver"
+import { tracePathContainsPoint } from "lib/solvers/RailNetLabelCornerPlacementSolver/geometry"
 import type { SolvedTracePath } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceLinesSolver"
 import type { MspConnectionPairId } from "lib/solvers/MspConnectionPairSolver/MspConnectionPairSolver"
 import type { InputProblem } from "lib/types/InputProblem"
@@ -96,6 +97,8 @@ export interface NetLabelNetLabelCollisionSolverParams {
   useRenderedLabelBounds?: boolean
   /** Already placed labels that are obstacles, but must not be moved. */
   fixedNetLabelPlacements?: NetLabelPlacement[]
+  /** Existing connector identities from AvailableNetOrientationSolver. */
+  netLabelConnectorTraceIds?: ReadonlySet<MspConnectionPairId>
   inputProblem: InputProblem
   traces: SolvedTracePath[]
   netLabelPlacements: NetLabelPlacement[]
@@ -245,9 +248,15 @@ export class NetLabelNetLabelCollisionSolver extends BaseSolver {
       }
     }
 
-    const isPortOnly = label.mspConnectionPairIds.length === 0
+    // A label on an extended connector must keep that attachment point.
+    const isAnchoredOnConnector = this.traces.some(
+      (trace) =>
+        this.params.netLabelConnectorTraceIds?.has(trace.mspPairId) &&
+        trace.globalConnNetId === label.globalConnNetId &&
+        tracePathContainsPoint(trace.tracePath, label.anchorPoint),
+    )
 
-    if (isPortOnly) {
+    if (label.mspConnectionPairIds.length === 0 || isAnchoredOnConnector) {
       const allOrientations: FacingDirection[] = ["x+", "x-", "y+", "y-"]
       const orderedOrientations = [
         label.orientation,

package/lib/solvers/SameNetJunctionAlignmentSolver/alignSameNetJunctions.ts

@@ -8,6 +8,7 @@ import type { SolvedTracePath } from "lib/solvers/SchematicTraceLinesSolver/Sche
 import { isPathCollidingWithObstacles } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceSingleLineSolver2/collisions"
 import { getObstacleRects } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceSingleLineSolver2/rect"
 import { getMovedAnchorPointForReroute } from "lib/solvers/Example28Solver/getMovedAnchorPointForReroute"
+import { isLabelAttachedToTrace } from "lib/solvers/Example28Solver/isLabelAttachedToTrace"
 import { moveAttachedLabelsToReroutedTrace } from "lib/solvers/Example28Solver/labelMovement"
 import {
   rectsOverlap,
@@ -182,14 +183,13 @@ const getAttachedLabelIndexes = (
   netLabelPlacements: NetLabelPlacement[],
 ) =>
   netLabelPlacements.flatMap((label, index) => {
-    const labelOwnsTrace =
-      label.mspConnectionPairIds.includes(trace.mspPairId) ||
-      (label.mspConnectionPairIds.length === 0 &&
-        label.globalConnNetId === trace.globalConnNetId)
-    return labelOwnsTrace &&
+    if (
+      isLabelAttachedToTrace(label, trace) &&
       tracePathContainsPoint(trace.tracePath, label.anchorPoint)
-      ? [index]
-      : []
+    ) {
+      return [index]
+    }
+    return []
   })
 
 const moveAttachedLabels = ({

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

@@ -232,13 +232,17 @@ export const generatePerpendicularTraceDetours = ({
       ]),
     ].filter((coordinate): coordinate is number => coordinate !== undefined)
 
+    const remainingPath = path.slice(index + 2)
+    // A terminal segment has no following leg to reconnect the detour.
+    if (remainingPath.length === 0) remainingPath.push(end)
+
     return [...new Set(detourCoordinates)].map((detour) =>
       simplifyPath([
         ...path.slice(0, index + 1),
         { ...start, [movingAxis]: gate },
         { ...start, [movingAxis]: gate, [detourAxis]: detour },
         { ...end, [detourAxis]: detour },
-        ...path.slice(index + 2),
+        ...remainingPath,
       ]),
     )
   }

package/package.json

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

package/site/SchematicTracePipelineSolver/repro-robot-controller-imu-tof.page.tsx

@@ -0,0 +1,7 @@
+import { PipelineDebugger } from "site/components/PipelineDebugger"
+import type { InputProblem } from "lib/types/InputProblem"
+import inputProblem from "../../tests/repros/assets/repro-robot-controller-imu-tof.input.json"
+
+export default () => (
+  <PipelineDebugger inputProblem={inputProblem as InputProblem} />
+)