@tscircuit/schematic-trace-solver 0.0.136 → 0.0.137

package/dist/index.d.ts

@@ -1117,6 +1117,7 @@ interface SameNetJunctionAlignmentSolverInput {
 declare class SameNetJunctionAlignmentSolver extends BaseSolver {
     private input;
     outputTraces: SolvedTracePath[];
+    outputNetLabelPlacements: NetLabelPlacement[];
     constructor(input: SameNetJunctionAlignmentSolverInput);
     _step(): void;
     getOutput(): {

package/dist/index.js

@@ -11749,6 +11749,35 @@ var railIsOnFacingSide = ({
   if (pin._facingDirection === "y+") return railY > pin.y;
   return false;
 };
+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] : [];
+});
+var moveAttachedLabels = ({
+  trace,
+  reroutedTracePath,
+  netLabelPlacements,
+  attachedLabelIndexes
+}) => {
+  const attachedLabels = attachedLabelIndexes.map(
+    (index) => netLabelPlacements[index]
+  );
+  const movedAttachedLabels = moveAttachedLabelsToReroutedTrace({
+    trace,
+    originalTracePath: trace.tracePath,
+    reroutedTracePath,
+    netLabelPlacements: attachedLabels
+  });
+  const movedLabelByIndex = new Map(
+    attachedLabelIndexes.map((labelIndex, index) => [
+      labelIndex,
+      movedAttachedLabels[index]
+    ])
+  );
+  return netLabelPlacements.map(
+    (label, index) => movedLabelByIndex.get(index) ?? label
+  );
+};
 var getAlignedBranchPath = ({
   donorTrace,
   branchTrace
@@ -11789,7 +11818,8 @@ var candidateIsClear = ({
   originalTrace,
   traces,
   inputProblem,
-  netLabelPlacements
+  candidateNetLabelPlacements,
+  attachedLabelIndexes
 }) => {
   const obstacles = getObstacleRects(inputProblem);
   if (isPathCollidingWithObstacles(candidateTrace.tracePath, obstacles)) {
@@ -11801,14 +11831,15 @@ var candidateIsClear = ({
   if (doesPathCoincideWithTraces(candidateTrace.tracePath, otherNetTraces)) {
     return false;
   }
-  const candidateTraces = traces.map((trace) => {
-    if (trace.mspPairId === originalTrace.mspPairId) return candidateTrace;
-    return trace;
-  });
-  if (!preservesLabelAnchors(netLabelPlacements, traces, candidateTraces)) {
+  if (!attachedLabelIndexes.every(
+    (index) => tracePathContainsPoint(
+      candidateTrace.tracePath,
+      candidateNetLabelPlacements[index].anchorPoint
+    )
+  )) {
     return false;
   }
-  const otherNetLabelPlacements = netLabelPlacements.filter(
+  const otherNetLabelPlacements = candidateNetLabelPlacements.filter(
     (label) => label.globalConnNetId !== candidateTrace.globalConnNetId
   );
   if (pathIntersectsAnyNetLabel({
@@ -11817,7 +11848,7 @@ var candidateIsClear = ({
   })) {
     return false;
   }
-  const sameNetLabelPlacements = netLabelPlacements.filter(
+  const sameNetLabelPlacements = candidateNetLabelPlacements.filter(
     (label) => label.globalConnNetId === candidateTrace.globalConnNetId
   );
   if (!pathIntersectsAnyNetLabel({
@@ -11843,9 +11874,14 @@ var alignSameNetJunctions = ({
   netLabelPlacements
 }) => {
   let outputTraces = [...traces];
+  let outputNetLabelPlacements = [...netLabelPlacements];
   const alignedBranchTraceIds = /* @__PURE__ */ new Set();
   let alignedJunctionCount = 0;
-  for (const donorTraceId of traces.map((trace) => trace.mspPairId)) {
+  const donorTraceIds = traces.map((trace) => trace.mspPairId);
+  const pendingDonorTraceIds = new Set(donorTraceIds);
+  for (let donorIndex = 0; donorIndex < donorTraceIds.length; donorIndex++) {
+    const donorTraceId = donorTraceIds[donorIndex];
+    pendingDonorTraceIds.delete(donorTraceId);
     const donorTrace = outputTraces.find(
       (trace) => trace.mspPairId === donorTraceId
     );
@@ -11866,12 +11902,23 @@ var alignSameNetJunctions = ({
       if (!removesVisibleSegment && !shortensVisibleTrace) {
         continue;
       }
+      const attachedLabelIndexes = getAttachedLabelIndexes(
+        branchTrace,
+        outputNetLabelPlacements
+      );
+      const candidateNetLabelPlacements = moveAttachedLabels({
+        trace: branchTrace,
+        reroutedTracePath: candidatePath,
+        netLabelPlacements: outputNetLabelPlacements,
+        attachedLabelIndexes
+      });
       if (!candidateIsClear({
         candidateTrace,
         originalTrace: branchTrace,
         traces: outputTraces,
         inputProblem,
-        netLabelPlacements
+        candidateNetLabelPlacements,
+        attachedLabelIndexes
       })) {
         continue;
       }
@@ -11879,32 +11926,44 @@ var alignSameNetJunctions = ({
         if (trace.mspPairId === branchTrace.mspPairId) return candidateTrace;
         return trace;
       });
+      outputNetLabelPlacements = candidateNetLabelPlacements;
       alignedBranchTraceIds.add(branchTrace.mspPairId);
       alignedJunctionCount++;
+      if (!pendingDonorTraceIds.has(branchTrace.mspPairId)) {
+        donorTraceIds.push(branchTrace.mspPairId);
+        pendingDonorTraceIds.add(branchTrace.mspPairId);
+      }
     }
   }
-  return { traces: outputTraces, alignedJunctionCount };
+  return {
+    traces: outputTraces,
+    netLabelPlacements: outputNetLabelPlacements,
+    alignedJunctionCount
+  };
 };
 
 // lib/solvers/SameNetJunctionAlignmentSolver/SameNetJunctionAlignmentSolver.ts
 var SameNetJunctionAlignmentSolver = class extends BaseSolver {
   input;
   outputTraces;
+  outputNetLabelPlacements;
   constructor(input) {
     super();
     this.input = input;
     this.outputTraces = input.traces;
+    this.outputNetLabelPlacements = input.netLabelPlacements;
   }
   _step() {
     const result = alignSameNetJunctions(this.input);
     this.outputTraces = result.traces;
+    this.outputNetLabelPlacements = result.netLabelPlacements;
     this.stats.alignedJunctionCount = result.alignedJunctionCount;
     this.solved = true;
   }
   getOutput() {
     return {
       traces: this.outputTraces,
-      netLabelPlacements: this.input.netLabelPlacements
+      netLabelPlacements: this.outputNetLabelPlacements
     };
   }
   visualize() {
@@ -11918,7 +11977,7 @@ var SameNetJunctionAlignmentSolver = class extends BaseSolver {
         strokeColor: "purple"
       });
     }
-    for (const label of this.input.netLabelPlacements) {
+    for (const label of this.outputNetLabelPlacements) {
       const labelRect = {
         center: label.center,
         width: label.width,

package/lib/solvers/SameNetJunctionAlignmentSolver/SameNetJunctionAlignmentSolver.ts

@@ -17,16 +17,19 @@ interface SameNetJunctionAlignmentSolverInput {
 export class SameNetJunctionAlignmentSolver extends BaseSolver {
   private input: SameNetJunctionAlignmentSolverInput
   outputTraces: SolvedTracePath[]
+  outputNetLabelPlacements: NetLabelPlacement[]
 
   constructor(input: SameNetJunctionAlignmentSolverInput) {
     super()
     this.input = input
     this.outputTraces = input.traces
+    this.outputNetLabelPlacements = input.netLabelPlacements
   }
 
   override _step() {
     const result = alignSameNetJunctions(this.input)
     this.outputTraces = result.traces
+    this.outputNetLabelPlacements = result.netLabelPlacements
     this.stats.alignedJunctionCount = result.alignedJunctionCount
     this.solved = true
   }
@@ -34,7 +37,7 @@ export class SameNetJunctionAlignmentSolver extends BaseSolver {
   getOutput() {
     return {
       traces: this.outputTraces,
-      netLabelPlacements: this.input.netLabelPlacements,
+      netLabelPlacements: this.outputNetLabelPlacements,
     }
   }
 
@@ -49,7 +52,7 @@ export class SameNetJunctionAlignmentSolver extends BaseSolver {
         strokeColor: "purple",
       })
     }
-    for (const label of this.input.netLabelPlacements) {
+    for (const label of this.outputNetLabelPlacements) {
       const labelRect: Rect & { strokeColor: string } = {
         center: label.center,
         width: label.width,

package/lib/solvers/SameNetJunctionAlignmentSolver/alignSameNetJunctions.ts

@@ -3,8 +3,9 @@ import type { NetLabelPlacement } from "lib/solvers/NetLabelPlacementSolver/NetL
 import type { SolvedTracePath } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceLinesSolver"
 import { isPathCollidingWithObstacles } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceSingleLineSolver2/collisions"
 import { getObstacleRects } from "lib/solvers/SchematicTraceLinesSolver/SchematicTraceSingleLineSolver2/rect"
+import { moveAttachedLabelsToReroutedTrace } from "lib/solvers/Example28Solver/labelMovement"
+import { tracePathContainsPoint } from "lib/solvers/RailNetLabelCornerPlacementSolver/geometry"
 import { simplifyPath } from "lib/solvers/TraceCleanupSolver/simplifyPath"
-import { preservesLabelAnchors } from "lib/solvers/TraceCleanupSolver/sameNetRailAlignment/preservesLabelAnchors"
 import {
   getVisibleTraceLength,
   getVisibleTraceSegmentCount,
@@ -95,6 +96,52 @@ const railIsOnFacingSide = ({
   return false
 }
 
+const getAttachedLabelIndexes = (
+  trace: SolvedTracePath,
+  netLabelPlacements: NetLabelPlacement[],
+) =>
+  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]
+      : []
+  })
+
+const moveAttachedLabels = ({
+  trace,
+  reroutedTracePath,
+  netLabelPlacements,
+  attachedLabelIndexes,
+}: {
+  trace: SolvedTracePath
+  reroutedTracePath: Point[]
+  netLabelPlacements: NetLabelPlacement[]
+  attachedLabelIndexes: number[]
+}) => {
+  const attachedLabels = attachedLabelIndexes.map(
+    (index) => netLabelPlacements[index]!,
+  )
+  const movedAttachedLabels = moveAttachedLabelsToReroutedTrace({
+    trace,
+    originalTracePath: trace.tracePath,
+    reroutedTracePath,
+    netLabelPlacements: attachedLabels,
+  })
+  const movedLabelByIndex = new Map(
+    attachedLabelIndexes.map((labelIndex, index) => [
+      labelIndex,
+      movedAttachedLabels[index]!,
+    ]),
+  )
+  return netLabelPlacements.map(
+    (label, index) => movedLabelByIndex.get(index) ?? label,
+  )
+}
+
 const getAlignedBranchPath = ({
   donorTrace,
   branchTrace,
@@ -145,13 +192,15 @@ const candidateIsClear = ({
   originalTrace,
   traces,
   inputProblem,
-  netLabelPlacements,
+  candidateNetLabelPlacements,
+  attachedLabelIndexes,
 }: {
   candidateTrace: SolvedTracePath
   originalTrace: SolvedTracePath
   traces: SolvedTracePath[]
   inputProblem: InputProblem
-  netLabelPlacements: NetLabelPlacement[]
+  candidateNetLabelPlacements: NetLabelPlacement[]
+  attachedLabelIndexes: number[]
 }) => {
   const obstacles = getObstacleRects(inputProblem)
   if (isPathCollidingWithObstacles(candidateTrace.tracePath, obstacles)) {
@@ -165,15 +214,18 @@ const candidateIsClear = ({
     return false
   }
 
-  const candidateTraces = traces.map((trace) => {
-    if (trace.mspPairId === originalTrace.mspPairId) return candidateTrace
-    return trace
-  })
-  if (!preservesLabelAnchors(netLabelPlacements, traces, candidateTraces)) {
+  if (
+    !attachedLabelIndexes.every((index) =>
+      tracePathContainsPoint(
+        candidateTrace.tracePath,
+        candidateNetLabelPlacements[index]!.anchorPoint,
+      ),
+    )
+  ) {
     return false
   }
 
-  const otherNetLabelPlacements = netLabelPlacements.filter(
+  const otherNetLabelPlacements = candidateNetLabelPlacements.filter(
     (label) => label.globalConnNetId !== candidateTrace.globalConnNetId,
   )
   if (
@@ -185,7 +237,7 @@ const candidateIsClear = ({
     return false
   }
 
-  const sameNetLabelPlacements = netLabelPlacements.filter(
+  const sameNetLabelPlacements = candidateNetLabelPlacements.filter(
     (label) => label.globalConnNetId === candidateTrace.globalConnNetId,
   )
   // A same-net rail may follow its label edge, but never enter the label body.
@@ -221,11 +273,18 @@ export const alignSameNetJunctions = ({
   netLabelPlacements,
 }: AlignSameNetJunctionsInput) => {
   let outputTraces = [...traces]
+  let outputNetLabelPlacements = [...netLabelPlacements]
   const alignedBranchTraceIds = new Set<string>()
   let alignedJunctionCount = 0
 
-  // Reuse each aligned branch as the rail for the next load in the chain.
-  for (const donorTraceId of traces.map((trace) => trace.mspPairId)) {
+  // Reuse each aligned branch as the rail for the next load in the chain. An
+  // aligned branch may already have had its donor turn, so queue it again when
+  // its geometry changes.
+  const donorTraceIds = traces.map((trace) => trace.mspPairId)
+  const pendingDonorTraceIds = new Set(donorTraceIds)
+  for (let donorIndex = 0; donorIndex < donorTraceIds.length; donorIndex++) {
+    const donorTraceId = donorTraceIds[donorIndex]!
+    pendingDonorTraceIds.delete(donorTraceId)
     const donorTrace = outputTraces.find(
       (trace) => trace.mspPairId === donorTraceId,
     )!
@@ -252,13 +311,24 @@ export const alignSameNetJunctions = ({
       if (!removesVisibleSegment && !shortensVisibleTrace) {
         continue
       }
+      const attachedLabelIndexes = getAttachedLabelIndexes(
+        branchTrace,
+        outputNetLabelPlacements,
+      )
+      const candidateNetLabelPlacements = moveAttachedLabels({
+        trace: branchTrace,
+        reroutedTracePath: candidatePath,
+        netLabelPlacements: outputNetLabelPlacements,
+        attachedLabelIndexes,
+      })
       if (
         !candidateIsClear({
           candidateTrace,
           originalTrace: branchTrace,
           traces: outputTraces,
           inputProblem,
-          netLabelPlacements,
+          candidateNetLabelPlacements,
+          attachedLabelIndexes,
         })
       ) {
         continue
@@ -268,10 +338,19 @@ export const alignSameNetJunctions = ({
         if (trace.mspPairId === branchTrace.mspPairId) return candidateTrace
         return trace
       })
+      outputNetLabelPlacements = candidateNetLabelPlacements
       alignedBranchTraceIds.add(branchTrace.mspPairId)
       alignedJunctionCount++
+      if (!pendingDonorTraceIds.has(branchTrace.mspPairId)) {
+        donorTraceIds.push(branchTrace.mspPairId)
+        pendingDonorTraceIds.add(branchTrace.mspPairId)
+      }
     }
   }
 
-  return { traces: outputTraces, alignedJunctionCount }
+  return {
+    traces: outputTraces,
+    netLabelPlacements: outputNetLabelPlacements,
+    alignedJunctionCount,
+  }
 }

package/package.json

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