@tscircuit/schematic-trace-solver 0.0.124 → 0.0.126

package/dist/index.d.ts

@@ -441,6 +441,13 @@ declare class NetLabelPlacementSolver extends BaseSolver {
     visualize(): GraphicsObject;
 }
 
+interface CompletedTraceReroute {
+    initialTrace: SolvedTracePath;
+    reroutedTracePath: Point[];
+    label: NetLabelPlacement;
+    detourCount: number;
+}
+
 interface LabelMergingSolverInput {
     netLabelPlacements: NetLabelPlacement[];
     inputProblem: InputProblem;
@@ -479,6 +486,7 @@ interface SingleOverlapSolverInput {
     paddingBuffer: number;
     detourCount: number;
     tracesToAvoidOverlapping?: SolvedTracePath[];
+    netLabelPlacements?: NetLabelPlacement[];
 }
 /**
  * This solver attempts to find a valid rerouting for a single trace that is
@@ -493,6 +501,8 @@ declare class SingleOverlapSolver extends BaseSolver {
     obstacles: ReturnType<typeof getObstacleRects>;
     label: NetLabelPlacement;
     tracesToAvoidOverlapping: SolvedTracePath[];
+    netLabelPlacements: NetLabelPlacement[];
+    detourCount: number;
     _tried: number;
     constructor(solverInput: SingleOverlapSolverInput);
     _step(): void;
@@ -520,6 +530,7 @@ declare class OverlapAvoidanceStepSolver extends BaseSolver {
     allTraces: SolvedTracePath[];
     tracesToAvoidOverlapping: SolvedTracePath[];
     modifiedTraces: SolvedTracePath[];
+    completedReroutes: CompletedTraceReroute[];
     private readonly PADDING_BUFFER;
     private detourCounts;
     activeSubSolver: SingleOverlapSolver | null;
@@ -570,6 +581,7 @@ declare class TraceLabelOverlapAvoidanceSolver extends BaseSolver {
     _step(): void;
     getOutput(): {
         traces: SolvedTracePath[];
+        completedReroutes: CompletedTraceReroute[];
         netLabelPlacements: NetLabelPlacement[];
     };
     visualize(): GraphicsObject;
@@ -875,6 +887,7 @@ declare class RailNetLabelCornerPlacementSolver extends BaseSolver {
     private intersectsAnyOtherNetLabel;
     private getCornerCandidatesForLabel;
     private isConfiguredRailLabel;
+    private isLabelCrossedByOtherNetTrace;
     private pointsEqual;
     private getVerticalSegmentPointIndices;
     private isPinAlignedCorner;
@@ -957,6 +970,7 @@ declare class NetLabelTraceCollisionSolver extends BaseSolver {
     netLabelPlacements: NetLabelPlacement[];
     outputTraces: SolvedTracePath[];
     outputNetLabelPlacements: NetLabelPlacement[];
+    completedReroutes: CompletedTraceReroute[];
     activeSubSolver: SingleOverlapSolver | null;
     private recentlyFailed;
     private detourCounts;
@@ -971,6 +985,7 @@ declare class NetLabelTraceCollisionSolver extends BaseSolver {
     private reanchorLabelsOnMovedTrace;
     getOutput(): {
         traces: SolvedTracePath[];
+        completedReroutes: CompletedTraceReroute[];
         netLabelPlacements: NetLabelPlacement[];
     };
     private getOverlapKey;
@@ -1082,6 +1097,33 @@ declare class SameNetJunctionAlignmentSolver extends BaseSolver {
     visualize(): GraphicsObject;
 }
 
+interface TraceElbowTransitionSimplificationSolverInput {
+    inputProblem: InputProblem;
+    traces: SolvedTracePath[];
+    completedReroutes: CompletedTraceReroute[];
+    netLabelPlacements: NetLabelPlacement[];
+    paddingBuffer: number;
+}
+/**
+ * Post-processes traces after trace/label overlap avoidance. It removes
+ * redundant elbow transitions and, when needed, shifts a simplified elbow
+ * around a rendered label. Every replacement is revalidated against labels,
+ * components, other-net traces, and label anchors.
+ */
+declare class TraceElbowTransitionSimplificationSolver extends BaseSolver {
+    private input;
+    private outputTraces;
+    private traceIdQueue;
+    private obstacles;
+    constructor(input: TraceElbowTransitionSimplificationSolverInput);
+    _step(): void;
+    getOutput(): {
+        traces: SolvedTracePath[];
+        netLabelPlacements: NetLabelPlacement[];
+    };
+    visualize(): GraphicsObject;
+}
+
 /**
  * Pipeline solver that runs a series of solvers to find the best schematic layout.
  * Coordinates the entire layout process from chip partitioning through final packing.
@@ -1116,6 +1158,9 @@ declare class SchematicTracePipelineSolver extends BaseSolver {
     netLabelTraceCollisionSolver?: NetLabelTraceCollisionSolver;
     traceCleanupSolver2?: TraceCleanupSolver;
     netLabelNetLabelCollisionSolver?: NetLabelNetLabelCollisionSolver;
+    traceElbowTransitionSimplificationSolver?: TraceElbowTransitionSimplificationSolver;
+    preAlignmentTraceElbowTransitionSimplificationSolver?: TraceElbowTransitionSimplificationSolver;
+    finalTraceElbowTransitionSimplificationSolver?: TraceElbowTransitionSimplificationSolver;
     sameNetJunctionAlignmentSolver?: SameNetJunctionAlignmentSolver;
     startTimeOfPhase: Record<string, number>;
     endTimeOfPhase: Record<string, number>;
@@ -1123,7 +1168,7 @@ declare class SchematicTracePipelineSolver extends BaseSolver {
     firstIterationOfPhase: Record<string, number>;
     inputProblem: InputProblem;
     hideRatsNet: boolean;
-    pipelineDef: (PipelineStep<typeof MspConnectionPairSolver> | PipelineStep<typeof SchematicTraceLinesSolver> | PipelineStep<typeof LongDistancePairSolver> | PipelineStep<typeof UnroutedTraceRecoverySolver> | PipelineStep<typeof TraceOverlapShiftSolver> | PipelineStep<typeof NetLabelPlacementSolver> | PipelineStep<typeof TraceLabelOverlapAvoidanceSolver> | PipelineStep<typeof TraceCleanupSolver> | PipelineStep<typeof Example28Solver> | PipelineStep<typeof AvailableNetOrientationSolver> | PipelineStep<typeof RailNetLabelCornerPlacementSolver> | PipelineStep<typeof TraceAnchoredNetLabelOverlapSolver> | PipelineStep<typeof NetLabelTraceCollisionSolver> | PipelineStep<typeof NetLabelNetLabelCollisionSolver> | PipelineStep<typeof SameNetJunctionAlignmentSolver>)[];
+    pipelineDef: (PipelineStep<typeof MspConnectionPairSolver> | PipelineStep<typeof SchematicTraceLinesSolver> | PipelineStep<typeof LongDistancePairSolver> | PipelineStep<typeof UnroutedTraceRecoverySolver> | PipelineStep<typeof TraceOverlapShiftSolver> | PipelineStep<typeof NetLabelPlacementSolver> | PipelineStep<typeof TraceLabelOverlapAvoidanceSolver> | PipelineStep<typeof TraceElbowTransitionSimplificationSolver> | PipelineStep<typeof TraceCleanupSolver> | PipelineStep<typeof Example28Solver> | PipelineStep<typeof AvailableNetOrientationSolver> | PipelineStep<typeof RailNetLabelCornerPlacementSolver> | PipelineStep<typeof TraceAnchoredNetLabelOverlapSolver> | PipelineStep<typeof NetLabelTraceCollisionSolver> | PipelineStep<typeof NetLabelNetLabelCollisionSolver> | PipelineStep<typeof SameNetJunctionAlignmentSolver>)[];
     constructor(inputProblem: InputProblem, opts?: Options);
     getConstructorParams(): ConstructorParameters<typeof SchematicTracePipelineSolver>;
     currentPipelineStepIndex: number;