@tscircuit/schematic-trace-solver 0.0.187 → 0.0.189

package/dist/index.d.ts

@@ -161,8 +161,8 @@ interface InputNetConnection {
      * When true, a named net may use inline labels. Each routed connected
      * component gets a label along its representative trace, while each
      * disconnected endpoint gets an outward inline-label stub. Conversion is
-     * atomic for the whole net so inline and anchored representations are not
-     * mixed when any label cannot be placed.
+     * atomic within each routed component. An obstructed component retains its
+     * anchored label without preventing inline labels on disconnected components.
      */
     allowInlineNetLabel?: boolean;
     /** Extent of the inline text along the generated trace stub. */
@@ -1144,11 +1144,18 @@ type Candidate = {
     status: CandidateStatus | null;
 };
 interface NetLabelNetLabelCollisionSolverParams {
+    /** Use the final horizontal tag envelope after inline conversion. */
+    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[];
 }
 declare class NetLabelNetLabelCollisionSolver extends BaseSolver {
+    private params;
     inputProblem: InputProblem;
     traces: SolvedTracePath[];
     netLabelPlacements: NetLabelPlacement[];
@@ -1175,6 +1182,8 @@ declare class NetLabelNetLabelCollisionSolver extends BaseSolver {
     private buildCandidatesForLabel;
     private checkCandidate;
     private beginSearchForLabel;
+    /** Reuse the normal anchor search for a local trace-clearance proposal. */
+    getNearbyValidPlacements(label: NetLabelPlacement, maxDistance: number): NetLabelPlacement[];
     private clearActiveSearch;
     _step(): void;
     visualize(): GraphicsObject;
@@ -1256,7 +1265,8 @@ declare class TraceElbowTransitionSimplificationSolver extends BaseSolver {
 
 declare const DEFAULT_INLINE_NET_LABEL_HEIGHT = 0.18;
 /**
- * Gap between the trace and the near edge of the inline label text.
+ * Preferred gap between a trace and its inline text. A tighter parallel-wire
+ * slot may use a smaller, evenly divided gap if the full text still fits.
  */
 declare const INLINE_NET_LABEL_TRACE_MARGIN = 0.05;
 /** Clearance between a generated terminal stub and an unrelated trace. */
@@ -1310,17 +1320,22 @@ interface InlineNetLabelPlacement {
     side: "x+" | "x-" | "y+" | "y-";
 }
 interface InlineNetLabelSolverInput {
+    /** Exact connector IDs supplied by their producer; IDs are never parsed. */
+    netLabelConnectorTraceIds?: ReadonlySet<string>;
+    resolveTraceCollisions?: boolean;
     inputProblem: InputProblem;
     traces: SolvedTracePath[];
     netLabelPlacements: NetLabelPlacement[];
     completedReroutes?: CompletedTraceReroute[];
 }
 interface InlineNetLabelOutput {
+    netLabelConnectorTraceIds?: ReadonlySet<string>;
     inputProblem: InputProblem;
     traces: SolvedTracePath[];
     netLabelPlacements: NetLabelPlacement[];
     inlineNetLabelPlacements: InlineNetLabelPlacement[];
 }
+type InlineOutput = Omit<InlineNetLabelOutput, "inputProblem">;
 type QueuedInlineConnection = {
     kind: "direct_connection";
     connection: InputDirectConnection;
@@ -1332,10 +1347,11 @@ type QueuedInlineConnection = {
  * Places "inline net labels" - net names drawn alongside the trace they belong
  * to - for connections that opted in via `allowInlineNetLabel`.
  *
- * Any regular (anchored) net label placement for the same net is dropped, so a
- * net is never labeled twice.
+ * Anchored labels are removed only for the connected components represented
+ * inline. A blocked component keeps its label without undoing clear ones.
  */
 declare class InlineNetLabelSolver extends BaseSolver {
+    private readonly input;
     inputProblem: InputProblem;
     traces: SolvedTracePath[];
     inputNetLabelPlacements: NetLabelPlacement[];
@@ -1343,18 +1359,23 @@ declare class InlineNetLabelSolver extends BaseSolver {
     inlineNetLabelPlacements: InlineNetLabelPlacement[];
     /** Eligible connections still waiting to be processed. */
     queuedConnections: QueuedInlineConnection[];
+    private readonly netLabelConnectorTraceIds;
     private tracesByPinPairKey;
     private globalConnMap;
-    private supersededTraceIdsByGlobalConnNetId;
+    private inlineConversions;
     private hasAlignedPortOnlyStubs;
     private postProcessedOutput?;
+    activeSubSolver: InlineNetLabelSolver | null;
+    private refinementComplete;
+    private refinement?;
+    private currentProposal?;
     constructor(input: InlineNetLabelSolverInput);
     getConstructorParams(): [InlineNetLabelSolverInput];
     _step(): void;
     /**
      * Plans all opted-in multi-pin nets together. Short routed components can
      * mutually block the outward endpoint stubs that replace them, so tentative
-     * replacements are ignored as obstacles only while their owning net still
+     * replacements are ignored as obstacles only while their connected component still
      * converts successfully. Failed conversions retain both their traces and
      * their conventional labels, and the remaining conversions are retried.
      */
@@ -1370,14 +1391,15 @@ declare class InlineNetLabelSolver extends BaseSolver {
      * Converts every conventional label representation for an opted-in named
      * net. Routed connected components become labels on their representative
      * trace; disconnected pins become outward terminal stubs. The conversion is
-     * atomic so one blocked candidate cannot leave mixed label styles on a net.
+     * atomic within each routed component, so replacing its traces cannot strand
+     * a pin. Disconnected components can keep their own label style.
      */
     private computeNetConnectionInlinePlacements;
+    /** Prefer the normal gap, then center text in a tighter parallel-wire slot. */
+    private getInlineOffsets;
     /**
-     * Converts one conventional endpoint placement into an inline label on a
-     * generated outward stub. The stub follows the pin's true facing direction;
-     * an anchored label may finish in another direction after an elbow, which is
-     * not the direction a terminal stub should leave the pin.
+     * Converts one conventional endpoint placement into an inline label on an
+     * outward stub that follows the pin's true facing direction.
      */
     private computeTerminalInlinePlacement;
     private computeInlinePlacement;
@@ -1393,19 +1415,15 @@ declare class InlineNetLabelSolver extends BaseSolver {
      * trace belonging to another net.
      */
     private isObstructed;
-    /**
-     * Net label placements superseded by an inline label. A net gets one label or
-     * the other, never both.
-     */
-    private getSupersededNetLabelKeys;
     private getOutputTraces;
-    private getInlineGlobalsOverlappingAnchoredLabels;
+    private getBlockedInlinePlacements;
     private buildPostProcessedOutput;
-    getOutput(): {
-        traces: SolvedTracePath[];
-        netLabelPlacements: NetLabelPlacement[];
-        inlineNetLabelPlacements: InlineNetLabelPlacement[];
-    };
+    /** Enumerate nearby moves in the existing order; collect one proposal per step. */
+    private getTraceRefinementProposals;
+    private createRefinementCandidate;
+    private acceptRefinementCandidate;
+    private stepTraceRefinement;
+    getOutput(): InlineOutput;
     visualize(): GraphicsObject;
 }
 declare const visualizeInlineNetLabelOutput: ({ inputProblem, traces, netLabelPlacements, inlineNetLabelPlacements, }: InlineNetLabelOutput) => GraphicsObject;
@@ -1420,6 +1438,7 @@ declare class NetLabelToTraceSolver extends BaseSolver {
     inputProblem: InputProblem;
     outputTraces: SolvedTracePath[];
     outputNetLabelPlacements: NetLabelPlacement[];
+    private readonly recoveredTraceIds;
     private chipMap;
     private pinMap;
     private queuedCandidates;