@tscircuit/schematic-trace-solver 0.0.136 → 0.0.140

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/lib/solvers/SchematicTracePipelineSolver/SchematicTracePipelineSolver.ts

@@ -22,7 +22,10 @@ import { LongDistancePairSolver } from "../LongDistancePairSolver/LongDistancePa
 import { MergedNetLabelObstacleSolver } from "../TraceLabelOverlapAvoidanceSolver/sub-solvers/LabelMergingSolver/LabelMergingSolver"
 import { TraceCleanupSolver } from "../TraceCleanupSolver/TraceCleanupSolver"
 import { Example28Solver } from "../Example28Solver/Example28Solver"
-import { moveAttachedLabelsToReroutedTrace } from "../Example28Solver/labelMovement"
+import {
+  moveAttachedLabelsToReroutedTrace,
+  moveNetLabelConnectorsToReroutedTraces,
+} from "../Example28Solver/labelMovement"
 import { AvailableNetOrientationSolver } from "../AvailableNetOrientationSolver/AvailableNetOrientationSolver"
 import { RailNetLabelCornerPlacementSolver } from "../RailNetLabelCornerPlacementSolver/RailNetLabelCornerPlacementSolver"
 import { TraceAnchoredNetLabelOverlapSolver } from "../TraceAnchoredNetLabelOverlapSolver/TraceAnchoredNetLabelOverlapSolver"
@@ -426,12 +429,17 @@ export class SchematicTracePipelineSolver extends BaseSolver {
         const previousOutput =
           instance.preAlignmentNetLabelTraceCollisionSolver!.getOutput()
         const alignmentOutput = instance.traceCleanupSolver2!.getOutput()
+        const connectorMovement = moveNetLabelConnectorsToReroutedTraces({
+          originalTraces: previousOutput.traces,
+          reroutedTraces: alignmentOutput.traces,
+          netLabelPlacements: previousOutput.netLabelPlacements,
+        })
         const previousTraceMap = new Map(
           previousOutput.traces.map((trace) => [trace.mspPairId, trace]),
         )
-        let netLabelPlacements = previousOutput.netLabelPlacements
+        let netLabelPlacements = connectorMovement.netLabelPlacements
 
-        for (const trace of alignmentOutput.traces) {
+        for (const trace of connectorMovement.traces) {
           const previousTrace = previousTraceMap.get(trace.mspPairId)
           if (!previousTrace || previousTrace.tracePath === trace.tracePath) {
             continue
@@ -455,7 +463,7 @@ export class SchematicTracePipelineSolver extends BaseSolver {
         return [
           {
             inputProblem: instance.inputProblem,
-            traces: alignmentOutput.traces,
+            traces: connectorMovement.traces,
             netLabelPlacements,
           },
         ]

package/package.json

@@ -1,7 +1,11 @@
 {
   "name": "@tscircuit/schematic-trace-solver",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tscircuit/schematic-trace-solver.git"
+  },
   "main": "dist/index.js",
-  "version": "0.0.136",
+  "version": "0.0.140",
   "type": "module",
   "scripts": {
     "start": "cosmos",