@tscircuit/schematic-trace-solver 0.0.34 → 0.0.36

package/dist/index.d.ts

@@ -79,6 +79,7 @@ interface InputDirectConnection {
 interface InputNetConnection {
     netId: string;
     pinIds: Array<PinId>;
+    netLabelWidth?: number;
 }
 interface InputProblem {
     chips: Array<InputChip>;
@@ -279,6 +280,7 @@ declare class SingleNetLabelPlacementSolver extends BaseSolver {
     overlappingSameNetTraceGroup: OverlappingSameNetTraceGroup;
     availableOrientations: Array<FacingDirection>;
     chipObstacleSpatialIndex: ChipObstacleSpatialIndex;
+    netLabelWidth?: number;
     netLabelPlacement: NetLabelPlacement | null;
     testedCandidates: Array<{
         center: {
@@ -306,6 +308,7 @@ declare class SingleNetLabelPlacementSolver extends BaseSolver {
         inputTraceMap: Record<MspConnectionPairId, SolvedTracePath>;
         overlappingSameNetTraceGroup: OverlappingSameNetTraceGroup;
         availableOrientations: FacingDirection[];
+        netLabelWidth?: number;
     });
     getConstructorParams(): ConstructorParameters<typeof SingleNetLabelPlacementSolver>[0];
     _step(): void;

package/dist/index.js

@@ -842,6 +842,20 @@ var SchematicTraceSingleLineSolver2 = class extends BaseSolver {
       chipAlpha: 0.1,
       connectionAlpha: 0.1
     });
+    g.lines.push({
+      points: this.baseElbow,
+      strokeColor: "red",
+      strokeDash: "4 4"
+    });
+    const [pin1, pin2] = this.pins;
+    g.lines.push({
+      points: [
+        { x: pin1.x, y: pin1.y },
+        { x: pin2.x, y: pin2.y }
+      ],
+      strokeColor: "blue",
+      strokeDash: "5 5"
+    });
     for (const { path, collisionChipIds: collisionRectIds } of this.queue) {
       g.lines.push({ points: path, strokeColor: "teal", strokeDash: "2 2" });
     }
@@ -1357,15 +1371,18 @@ var ChipObstacleSpatialIndex = class {
 // lib/solvers/NetLabelPlacementSolver/SingleNetLabelPlacementSolver/geometry.ts
 var NET_LABEL_HORIZONTAL_WIDTH = 0.45;
 var NET_LABEL_HORIZONTAL_HEIGHT = 0.2;
-function getDimsForOrientation(orientation) {
+function getDimsForOrientation(params) {
+  const { orientation, netLabelWidth } = params;
+  const horizWidth = typeof netLabelWidth === "number" ? netLabelWidth : NET_LABEL_HORIZONTAL_WIDTH;
   if (orientation === "y+" || orientation === "y-") {
     return {
+      // Rotated, so width/height swap
       width: NET_LABEL_HORIZONTAL_HEIGHT,
-      height: NET_LABEL_HORIZONTAL_WIDTH
+      height: horizWidth
     };
   }
   return {
-    width: NET_LABEL_HORIZONTAL_WIDTH,
+    width: horizWidth,
     height: NET_LABEL_HORIZONTAL_HEIGHT
   };
 }
@@ -1494,7 +1511,8 @@ function solveNetLabelPlacementForPortOnlyPin(params) {
     inputTraceMap,
     chipObstacleSpatialIndex,
     overlappingSameNetTraceGroup,
-    availableOrientations
+    availableOrientations,
+    netLabelWidth
   } = params;
   const pinId = overlappingSameNetTraceGroup.portOnlyPinId;
   if (!pinId) {
@@ -1526,7 +1544,10 @@ function solveNetLabelPlacementForPortOnlyPin(params) {
   const outwardOf = (o) => o === "x+" ? { x: 1, y: 0 } : o === "x-" ? { x: -1, y: 0 } : o === "y+" ? { x: 0, y: 1 } : { x: 0, y: -1 };
   const testedCandidates = [];
   for (const orientation of orientations) {
-    const { width: width2, height: height2 } = getDimsForOrientation(orientation);
+    const { width: width2, height: height2 } = getDimsForOrientation({
+      orientation,
+      netLabelWidth
+    });
     const baseCenter2 = getCenterFromAnchor(anchor, orientation, width2, height2);
     const outward2 = outwardOf(orientation);
     const offset2 = 1e-3;
@@ -1593,7 +1614,10 @@ function solveNetLabelPlacementForPortOnlyPin(params) {
     return { placement, testedCandidates };
   }
   const fallbackOrientation = pinFacingDirection;
-  const { width, height } = getDimsForOrientation(fallbackOrientation);
+  const { width, height } = getDimsForOrientation({
+    orientation: fallbackOrientation,
+    netLabelWidth
+  });
   const baseCenter = getCenterFromAnchor(
     anchor,
     fallbackOrientation,
@@ -1685,6 +1709,8 @@ var SingleNetLabelPlacementSolver = class extends BaseSolver {
   overlappingSameNetTraceGroup;
   availableOrientations;
   chipObstacleSpatialIndex;
+  // Optional override for the width of the net label (per netId)
+  netLabelWidth;
   netLabelPlacement = null;
   testedCandidates = [];
   constructor(params) {
@@ -1693,6 +1719,7 @@ var SingleNetLabelPlacementSolver = class extends BaseSolver {
     this.inputTraceMap = params.inputTraceMap;
     this.overlappingSameNetTraceGroup = params.overlappingSameNetTraceGroup;
     this.availableOrientations = params.availableOrientations;
+    this.netLabelWidth = params.netLabelWidth;
     this.chipObstacleSpatialIndex = params.inputProblem._chipObstacleSpatialIndex ?? new ChipObstacleSpatialIndex(params.inputProblem.chips);
   }
   getConstructorParams() {
@@ -1700,7 +1727,8 @@ var SingleNetLabelPlacementSolver = class extends BaseSolver {
       inputProblem: this.inputProblem,
       inputTraceMap: this.inputTraceMap,
       overlappingSameNetTraceGroup: this.overlappingSameNetTraceGroup,
-      availableOrientations: this.availableOrientations
+      availableOrientations: this.availableOrientations,
+      netLabelWidth: this.netLabelWidth
     };
   }
   _step() {
@@ -1714,7 +1742,8 @@ var SingleNetLabelPlacementSolver = class extends BaseSolver {
         inputTraceMap: this.inputTraceMap,
         chipObstacleSpatialIndex: this.chipObstacleSpatialIndex,
         overlappingSameNetTraceGroup: this.overlappingSameNetTraceGroup,
-        availableOrientations: this.availableOrientations
+        availableOrientations: this.availableOrientations,
+        netLabelWidth: this.netLabelWidth
       });
       this.testedCandidates.push(...res.testedCandidates);
       if (res.placement) {
@@ -1782,7 +1811,10 @@ var SingleNetLabelPlacementSolver = class extends BaseSolver {
         const anchors = anchorsForSegment(a, b);
         for (const anchor of anchors) {
           for (const orientation of candidateOrients) {
-            const { width, height } = getDimsForOrientation(orientation);
+            const { width, height } = getDimsForOrientation({
+              orientation,
+              netLabelWidth: this.netLabelWidth
+            });
             const center = getCenterFromAnchor(
               anchor,
               orientation,
@@ -2061,11 +2093,15 @@ var NetLabelPlacementSolver = class extends BaseSolver {
       const isAlreadyFull = currOrients.length === 4 && fullOrients.every((o) => currOrients.includes(o));
       if (!this.triedAnyOrientationFallbackForCurrentGroup && !isAlreadyFull && this.currentGroup) {
         this.triedAnyOrientationFallbackForCurrentGroup = true;
+        const netLabelWidth2 = this.currentGroup.netId ? this.inputProblem.netConnections.find(
+          (nc) => nc.netId === this.currentGroup.netId
+        )?.netLabelWidth : void 0;
         this.activeSubSolver = new SingleNetLabelPlacementSolver({
           inputProblem: this.inputProblem,
           inputTraceMap: this.inputTraceMap,
           overlappingSameNetTraceGroup: this.currentGroup,
-          availableOrientations: fullOrients
+          availableOrientations: fullOrients,
+          netLabelWidth: netLabelWidth2
         });
         return;
       }
@@ -2085,11 +2121,15 @@ var NetLabelPlacementSolver = class extends BaseSolver {
     const netId = nextOverlappingSameNetTraceGroup.netId ?? nextOverlappingSameNetTraceGroup.globalConnNetId;
     this.currentGroup = nextOverlappingSameNetTraceGroup;
     this.triedAnyOrientationFallbackForCurrentGroup = false;
+    const netLabelWidth = this.currentGroup.netId ? this.inputProblem.netConnections.find(
+      (nc) => nc.netId === this.currentGroup.netId
+    )?.netLabelWidth : void 0;
     this.activeSubSolver = new SingleNetLabelPlacementSolver({
       inputProblem: this.inputProblem,
       inputTraceMap: this.inputTraceMap,
       overlappingSameNetTraceGroup: nextOverlappingSameNetTraceGroup,
-      availableOrientations: this.inputProblem.availableNetLabelOrientations[netId] ?? ["x+", "x-", "y+", "y-"]
+      availableOrientations: this.inputProblem.availableNetLabelOrientations[netId] ?? ["x+", "x-", "y+", "y-"],
+      netLabelWidth
     });
   }
   visualize() {

package/lib/solvers/NetLabelPlacementSolver/NetLabelPlacementSolver.ts

@@ -273,11 +273,17 @@ export class NetLabelPlacementSolver extends BaseSolver {
         this.currentGroup
       ) {
         this.triedAnyOrientationFallbackForCurrentGroup = true
+        const netLabelWidth = this.currentGroup.netId
+          ? this.inputProblem.netConnections.find(
+              (nc) => nc.netId === this.currentGroup!.netId,
+            )?.netLabelWidth
+          : undefined
         this.activeSubSolver = new SingleNetLabelPlacementSolver({
           inputProblem: this.inputProblem,
           inputTraceMap: this.inputTraceMap,
           overlappingSameNetTraceGroup: this.currentGroup,
           availableOrientations: fullOrients,
+          netLabelWidth,
         })
         return
       }
@@ -307,6 +313,12 @@ export class NetLabelPlacementSolver extends BaseSolver {
     this.currentGroup = nextOverlappingSameNetTraceGroup
     this.triedAnyOrientationFallbackForCurrentGroup = false
 
+    const netLabelWidth = this.currentGroup.netId
+      ? this.inputProblem.netConnections.find(
+          (nc) => nc.netId === this.currentGroup!.netId,
+        )?.netLabelWidth
+      : undefined
+
     this.activeSubSolver = new SingleNetLabelPlacementSolver({
       inputProblem: this.inputProblem,
       inputTraceMap: this.inputTraceMap,
@@ -314,6 +326,7 @@ export class NetLabelPlacementSolver extends BaseSolver {
       availableOrientations: this.inputProblem.availableNetLabelOrientations[
         netId
       ] ?? ["x+", "x-", "y+", "y-"],
+      netLabelWidth,
     })
   }
 

package/lib/solvers/NetLabelPlacementSolver/SingleNetLabelPlacementSolver/SingleNetLabelPlacementSolver.ts

@@ -58,6 +58,9 @@ export class SingleNetLabelPlacementSolver extends BaseSolver {
 
   chipObstacleSpatialIndex: ChipObstacleSpatialIndex
 
+  // Optional override for the width of the net label (per netId)
+  netLabelWidth?: number
+
   netLabelPlacement: NetLabelPlacement | null = null
   testedCandidates: Array<{
     center: { x: number; y: number }
@@ -75,12 +78,14 @@ export class SingleNetLabelPlacementSolver extends BaseSolver {
     inputTraceMap: Record<MspConnectionPairId, SolvedTracePath>
     overlappingSameNetTraceGroup: OverlappingSameNetTraceGroup
     availableOrientations: FacingDirection[]
+    netLabelWidth?: number
   }) {
     super()
     this.inputProblem = params.inputProblem
     this.inputTraceMap = params.inputTraceMap
     this.overlappingSameNetTraceGroup = params.overlappingSameNetTraceGroup
     this.availableOrientations = params.availableOrientations
+    this.netLabelWidth = params.netLabelWidth
 
     this.chipObstacleSpatialIndex =
       params.inputProblem._chipObstacleSpatialIndex ??
@@ -95,6 +100,7 @@ export class SingleNetLabelPlacementSolver extends BaseSolver {
       inputTraceMap: this.inputTraceMap,
       overlappingSameNetTraceGroup: this.overlappingSameNetTraceGroup,
       availableOrientations: this.availableOrientations,
+      netLabelWidth: this.netLabelWidth,
     }
   }
 
@@ -112,6 +118,7 @@ export class SingleNetLabelPlacementSolver extends BaseSolver {
         chipObstacleSpatialIndex: this.chipObstacleSpatialIndex,
         overlappingSameNetTraceGroup: this.overlappingSameNetTraceGroup,
         availableOrientations: this.availableOrientations,
+        netLabelWidth: this.netLabelWidth,
       })
       this.testedCandidates.push(...res.testedCandidates)
       if (res.placement) {
@@ -220,7 +227,10 @@ export class SingleNetLabelPlacementSolver extends BaseSolver {
         const anchors = anchorsForSegment(a, b)
         for (const anchor of anchors) {
           for (const orientation of candidateOrients) {
-            const { width, height } = getDimsForOrientation(orientation)
+            const { width, height } = getDimsForOrientation({
+              orientation,
+              netLabelWidth: this.netLabelWidth,
+            })
             const center = getCenterFromAnchor(
               anchor,
               orientation,

package/lib/solvers/NetLabelPlacementSolver/SingleNetLabelPlacementSolver/geometry.ts

@@ -3,15 +3,25 @@ import type { FacingDirection } from "lib/utils/dir"
 export const NET_LABEL_HORIZONTAL_WIDTH = 0.45
 export const NET_LABEL_HORIZONTAL_HEIGHT = 0.2
 
-export function getDimsForOrientation(orientation: FacingDirection) {
+export function getDimsForOrientation(params: {
+  orientation: FacingDirection
+  netLabelWidth?: number
+}) {
+  const { orientation, netLabelWidth } = params
+  const horizWidth =
+    typeof netLabelWidth === "number"
+      ? netLabelWidth
+      : NET_LABEL_HORIZONTAL_WIDTH
+
   if (orientation === "y+" || orientation === "y-") {
     return {
+      // Rotated, so width/height swap
       width: NET_LABEL_HORIZONTAL_HEIGHT,
-      height: NET_LABEL_HORIZONTAL_WIDTH,
+      height: horizWidth,
     }
   }
   return {
-    width: NET_LABEL_HORIZONTAL_WIDTH,
+    width: horizWidth,
     height: NET_LABEL_HORIZONTAL_HEIGHT,
   }
 }

package/lib/solvers/NetLabelPlacementSolver/SingleNetLabelPlacementSolver/solvePortOnlyPin.ts

@@ -21,6 +21,7 @@ export function solveNetLabelPlacementForPortOnlyPin(params: {
   chipObstacleSpatialIndex: ChipObstacleSpatialIndex
   overlappingSameNetTraceGroup: OverlappingSameNetTraceGroup
   availableOrientations: FacingDirection[]
+  netLabelWidth?: number
 }): {
   placement: NetLabelPlacement | null
   testedCandidates: Array<{
@@ -41,6 +42,7 @@ export function solveNetLabelPlacementForPortOnlyPin(params: {
     chipObstacleSpatialIndex,
     overlappingSameNetTraceGroup,
     availableOrientations,
+    netLabelWidth,
   } = params
 
   const pinId = overlappingSameNetTraceGroup.portOnlyPinId
@@ -98,7 +100,10 @@ export function solveNetLabelPlacementForPortOnlyPin(params: {
   }> = []
 
   for (const orientation of orientations) {
-    const { width, height } = getDimsForOrientation(orientation)
+    const { width, height } = getDimsForOrientation({
+      orientation,
+      netLabelWidth,
+    })
     // Place label fully outside the chip: shift center slightly outward
     const baseCenter = getCenterFromAnchor(anchor, orientation, width, height)
     const outward = outwardOf(orientation)
@@ -176,7 +181,10 @@ export function solveNetLabelPlacementForPortOnlyPin(params: {
 
   // If no valid placements found, return placement using pin's facing direction
   const fallbackOrientation = pinFacingDirection
-  const { width, height } = getDimsForOrientation(fallbackOrientation)
+  const { width, height } = getDimsForOrientation({
+    orientation: fallbackOrientation,
+    netLabelWidth,
+  })
   const baseCenter = getCenterFromAnchor(
     anchor,
     fallbackOrientation,

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

@@ -222,6 +222,25 @@ export class SchematicTraceSingleLineSolver2 extends BaseSolver {
       connectionAlpha: 0.1,
     })
 
+    // Draw the base elbow
+
+    g.lines!.push({
+      points: this.baseElbow,
+      strokeColor: "red",
+      strokeDash: "4 4",
+    })
+
+    // Draw the MSP pair connection with a dashed line
+    const [pin1, pin2] = this.pins
+    g.lines!.push({
+      points: [
+        { x: pin1.x, y: pin1.y },
+        { x: pin2.x, y: pin2.y },
+      ],
+      strokeColor: "blue",
+      strokeDash: "5 5",
+    })
+
     // Draw all the new candidates
     for (const { path, collisionChipIds: collisionRectIds } of this.queue) {
       g.lines!.push({ points: path, strokeColor: "teal", strokeDash: "2 2" })

package/lib/types/InputProblem.ts

@@ -27,6 +27,7 @@ export interface InputDirectConnection {
 export interface InputNetConnection {
   netId: string
   pinIds: Array<PinId>
+  netLabelWidth?: number
 }
 
 export interface InputProblem {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/schematic-trace-solver",
   "main": "dist/index.js",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "type": "module",
   "scripts": {
     "start": "cosmos",
@@ -15,7 +15,7 @@
     "@tscircuit/math-utils": "^0.0.19",
     "@types/bun": "^1.2.21",
     "bun-match-svg": "^0.0.13",
-    "calculate-elbow": "^0.0.11",
+    "calculate-elbow": "^0.0.12",
     "connectivity-map": "^1.0.0",
     "flatbush": "^4.5.0",
     "graphics-debug": "^0.0.62",