@tscircuit/schematic-trace-solver 0.0.13 → 0.0.15

package/dist/index.d.ts

@@ -180,6 +180,8 @@ declare class SchematicTraceSingleLineSolver extends BaseSolver {
 
 interface SolvedTracePath extends MspConnectionPair {
     tracePath: Point[];
+    mspConnectionPairIds: MspConnectionPairId[];
+    pinIds: PinId[];
 }
 declare class SchematicTraceLinesSolver extends BaseSolver {
     inputProblem: InputProblem;
@@ -345,6 +347,19 @@ type OverlappingSameNetTraceGroup = {
 interface NetLabelPlacement {
     globalConnNetId: string;
     dcConnNetId?: string;
+    /**
+     * Optional user-provided net identifier (if present in the input problem).
+     */
+    netId?: string;
+    /**
+     * MSP pair ids that the label is associated with. Port-only labels use [].
+     */
+    mspConnectionPairIds: MspConnectionPairId[];
+    /**
+     * Pin ids relevant to this label. For a host trace, the two pins of that pair;
+     * for a port-only label, the single port pin id.
+     */
+    pinIds: PinId[];
     orientation: FacingDirection;
     /**
      * The anchor point is the point on the trace where the net label connects

package/dist/index.js

@@ -6853,7 +6853,12 @@ var SchematicTraceLinesSolver = class extends BaseSolver {
     if (this.activeSubSolver?.solved) {
       this.solvedTracePaths.push({
         ...this.currentConnectionPair,
-        tracePath: this.activeSubSolver.solvedTracePath
+        tracePath: this.activeSubSolver.solvedTracePath,
+        mspConnectionPairIds: [this.currentConnectionPair.mspPairId],
+        pinIds: [
+          this.currentConnectionPair.pins[0].pinId,
+          this.currentConnectionPair.pins[1].pinId
+        ]
       });
       this.activeSubSolver = null;
       this.currentConnectionPair = null;
@@ -7426,6 +7431,9 @@ function solveNetLabelPlacementForPortOnlyPin(params) {
     const placement = {
       globalConnNetId: overlappingSameNetTraceGroup.globalConnNetId,
       dcConnNetId: void 0,
+      netId: overlappingSameNetTraceGroup.netId,
+      mspConnectionPairIds: [],
+      pinIds: [pinId],
       orientation,
       anchorPoint: anchor,
       width,
@@ -7659,7 +7667,9 @@ var SingleNetLabelPlacementSolver = class extends BaseSolver {
                   height,
                   center,
                   hostSegIndex: si,
-                  dcConnNetId: curr.dcConnNetId
+                  dcConnNetId: curr.dcConnNetId,
+                  mspPairId: curr.mspPairId,
+                  pinIds: [curr.pins[0].pinId, curr.pins[1].pinId]
                 };
               }
               continue;
@@ -7667,6 +7677,9 @@ var SingleNetLabelPlacementSolver = class extends BaseSolver {
             this.netLabelPlacement = {
               globalConnNetId: this.overlappingSameNetTraceGroup.globalConnNetId,
               dcConnNetId: curr.dcConnNetId,
+              netId: this.overlappingSameNetTraceGroup.netId,
+              mspConnectionPairIds: [curr.mspPairId],
+              pinIds: [curr.pins[0].pinId, curr.pins[1].pinId],
               orientation,
               anchorPoint: anchor,
               width,
@@ -7683,6 +7696,9 @@ var SingleNetLabelPlacementSolver = class extends BaseSolver {
       this.netLabelPlacement = {
         globalConnNetId: this.overlappingSameNetTraceGroup.globalConnNetId,
         dcConnNetId: bestCandidate.dcConnNetId,
+        netId: this.overlappingSameNetTraceGroup.netId,
+        mspConnectionPairIds: [bestCandidate.mspPairId],
+        pinIds: bestCandidate.pinIds,
         orientation: bestCandidate.orientation,
         anchorPoint: bestCandidate.anchor,
         width: bestCandidate.width,

package/lib/solvers/NetLabelPlacementSolver/NetLabelPlacementSolver.ts

@@ -1,5 +1,5 @@
 import { BaseSolver } from "lib/solvers/BaseSolver/BaseSolver"
-import type { InputProblem } from "lib/types/InputProblem"
+import type { InputProblem, PinId } from "lib/types/InputProblem"
 import type { SolvedTracePath } from "../SchematicTraceLinesSolver/SchematicTraceLinesSolver"
 import type { MspConnectionPairId } from "../MspConnectionPairSolver/MspConnectionPairSolver"
 import { SingleNetLabelPlacementSolver } from "./SingleNetLabelPlacementSolver/SingleNetLabelPlacementSolver"
@@ -24,6 +24,19 @@ export type OverlappingSameNetTraceGroup = {
 export interface NetLabelPlacement {
   globalConnNetId: string
   dcConnNetId?: string
+  /**
+   * Optional user-provided net identifier (if present in the input problem).
+   */
+  netId?: string
+  /**
+   * MSP pair ids that the label is associated with. Port-only labels use [].
+   */
+  mspConnectionPairIds: MspConnectionPairId[]
+  /**
+   * Pin ids relevant to this label. For a host trace, the two pins of that pair;
+   * for a port-only label, the single port pin id.
+   */
+  pinIds: PinId[]
   orientation: FacingDirection
 
   /**

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

@@ -3,7 +3,7 @@ import type {
   NetLabelPlacement,
   OverlappingSameNetTraceGroup,
 } from "../NetLabelPlacementSolver"
-import type { InputProblem } from "lib/types/InputProblem"
+import type { InputProblem, PinId } from "lib/types/InputProblem"
 import type { SolvedTracePath } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceLinesSolver"
 import type { MspConnectionPairId } from "lib/solvers/MspConnectionPairSolver/MspConnectionPairSolver"
 import type { FacingDirection } from "lib/utils/dir"
@@ -172,6 +172,8 @@ export class SingleNetLabelPlacementSolver extends BaseSolver {
       center: { x: number; y: number }
       hostSegIndex: number
       dcConnNetId: string
+      mspPairId: MspConnectionPairId
+      pinIds: PinId[]
     } | null = null
     let bestScore = -Infinity
 
@@ -285,6 +287,8 @@ export class SingleNetLabelPlacementSolver extends BaseSolver {
                   center,
                   hostSegIndex: si,
                   dcConnNetId: curr.dcConnNetId,
+                  mspPairId: curr.mspPairId,
+                  pinIds: [curr.pins[0].pinId, curr.pins[1].pinId],
                 }
               }
               // Continue traversing to prioritize the furthest valid point
@@ -295,6 +299,9 @@ export class SingleNetLabelPlacementSolver extends BaseSolver {
               globalConnNetId:
                 this.overlappingSameNetTraceGroup.globalConnNetId,
               dcConnNetId: curr.dcConnNetId,
+              netId: this.overlappingSameNetTraceGroup.netId,
+              mspConnectionPairIds: [curr.mspPairId],
+              pinIds: [curr.pins[0].pinId, curr.pins[1].pinId],
               orientation,
               anchorPoint: anchor,
               width,
@@ -312,6 +319,9 @@ export class SingleNetLabelPlacementSolver extends BaseSolver {
       this.netLabelPlacement = {
         globalConnNetId: this.overlappingSameNetTraceGroup.globalConnNetId,
         dcConnNetId: bestCandidate.dcConnNetId,
+        netId: this.overlappingSameNetTraceGroup.netId,
+        mspConnectionPairIds: [bestCandidate.mspPairId],
+        pinIds: bestCandidate.pinIds,
         orientation: bestCandidate.orientation,
         anchorPoint: bestCandidate.anchor,
         width: bestCandidate.width,

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

@@ -159,6 +159,9 @@ export function solveNetLabelPlacementForPortOnlyPin(params: {
     const placement: NetLabelPlacement = {
       globalConnNetId: overlappingSameNetTraceGroup.globalConnNetId,
       dcConnNetId: undefined,
+      netId: overlappingSameNetTraceGroup.netId,
+      mspConnectionPairIds: [],
+      pinIds: [pinId],
       orientation,
       anchorPoint: anchor,
       width,

package/lib/solvers/SchematicTraceLinesSolver/SchematicTraceLinesSolver.ts

@@ -1,7 +1,7 @@
 import { BaseSolver } from "lib/solvers/BaseSolver/BaseSolver"
 import { visualizeInputProblem } from "../SchematicTracePipelineSolver/visualizeInputProblem"
 import { getBounds, type GraphicsObject } from "graphics-debug"
-import type { InputChip, InputProblem } from "lib/types/InputProblem"
+import type { InputChip, InputProblem, PinId } from "lib/types/InputProblem"
 import type {
   MspConnectionPair,
   MspConnectionPairId,
@@ -14,6 +14,8 @@ import type { Point } from "@tscircuit/math-utils"
 
 export interface SolvedTracePath extends MspConnectionPair {
   tracePath: Point[]
+  mspConnectionPairIds: MspConnectionPairId[]
+  pinIds: PinId[]
 }
 
 export class SchematicTraceLinesSolver extends BaseSolver {
@@ -71,6 +73,11 @@ export class SchematicTraceLinesSolver extends BaseSolver {
       this.solvedTracePaths.push({
         ...this.currentConnectionPair!,
         tracePath: this.activeSubSolver!.solvedTracePath!,
+        mspConnectionPairIds: [this.currentConnectionPair!.mspPairId],
+        pinIds: [
+          this.currentConnectionPair!.pins[0].pinId,
+          this.currentConnectionPair!.pins[1].pinId,
+        ],
       })
       this.activeSubSolver = null
       this.currentConnectionPair = null

package/package.json

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