@tscircuit/schematic-trace-solver 0.0.132 → 0.0.133

package/dist/index.js

@@ -7964,6 +7964,42 @@ var getMaxSearchDistance = (inputProblem) => {
   return maxChipWidth * 3;
 };
 
+// lib/solvers/AvailableNetOrientationSolver/orderRoutedLabelsBeforeOverlappingPortLabels.ts
+var isPortOnlyLabel = (label) => label.mspConnectionPairIds.length === 0;
+var orderRoutedLabelsBeforeOverlappingPortLabels = ({
+  labelIndices,
+  netLabelPlacements
+}) => {
+  const orderedLabelIndices = [...labelIndices];
+  for (const routedLabelIndex of labelIndices) {
+    const routedLabel = netLabelPlacements[routedLabelIndex];
+    if (isPortOnlyLabel(routedLabel)) continue;
+    const routedBounds = getRectBounds(
+      routedLabel.center,
+      routedLabel.width,
+      routedLabel.height
+    );
+    const blockingPosition = orderedLabelIndices.findIndex((labelIndex) => {
+      const portOnlyLabel = netLabelPlacements[labelIndex];
+      if (!isPortOnlyLabel(portOnlyLabel)) return false;
+      if (portOnlyLabel.globalConnNetId === routedLabel.globalConnNetId) {
+        return false;
+      }
+      const portOnlyBounds = getRectBounds(
+        portOnlyLabel.center,
+        portOnlyLabel.width,
+        portOnlyLabel.height
+      );
+      return rectsOverlap2(routedBounds, portOnlyBounds);
+    });
+    const routedPosition = orderedLabelIndices.indexOf(routedLabelIndex);
+    if (blockingPosition === -1 || blockingPosition > routedPosition) continue;
+    orderedLabelIndices.splice(routedPosition, 1);
+    orderedLabelIndices.splice(blockingPosition, 0, routedLabelIndex);
+  }
+  return orderedLabelIndices;
+};
+
 // lib/solvers/AvailableNetOrientationSolver/visualize.ts
 var visualizeAvailableNetOrientationSolver = (params) => {
   const graphics = visualizeInputProblem(params.inputProblem);
@@ -8114,12 +8150,16 @@ var AvailableNetOrientationSolver = class extends BaseSolver {
       }
     }
     this.sortCrowdedTopBankByPin(indices);
-    const blockedStandaloneLabelIndex = indices.find((index) => {
+    const orderedIndices = orderRoutedLabelsBeforeOverlappingPortLabels({
+      labelIndices: indices,
+      netLabelPlacements: this.outputNetLabelPlacements
+    });
+    const blockedStandaloneLabelIndex = orderedIndices.find((index) => {
       const label = this.outputNetLabelPlacements[index];
       const orientations = this.getAvailableOrientations(label);
       return this.isPortOnlyLabel(label) && this.isStandaloneSinglePinNetLabel(label) && orientations.length === 1 && isYOrientation(orientations[0]) && this.labelIntersectsDifferentNetTrace(label);
     });
-    if (blockedStandaloneLabelIndex === void 0) return indices;
+    if (blockedStandaloneLabelIndex === void 0) return orderedIndices;
     this.blockedStandaloneLabelIndex = blockedStandaloneLabelIndex;
     this.blockedStandaloneLabelTargetAnchorX = null;
     const blockedLabel = this.outputNetLabelPlacements[blockedStandaloneLabelIndex];
@@ -8127,8 +8167,8 @@ var AvailableNetOrientationSolver = class extends BaseSolver {
     const chipSide = this.getChipSideForPoint(blockedLabel.anchorPoint);
     const affectedSlots = [];
     const labelsToOrder = [];
-    for (let slot = 0; slot < indices.length; slot++) {
-      const index = indices[slot];
+    for (let slot = 0; slot < orderedIndices.length; slot++) {
+      const index = orderedIndices[slot];
       const label = this.outputNetLabelPlacements[index];
       const orientations = this.getAvailableOrientations(label);
       if (this.getChipSideForPoint(label.anchorPoint) === chipSide && orientations.length === 1 && orientations[0] === requiredOrientation) {
@@ -8158,9 +8198,9 @@ var AvailableNetOrientationSolver = class extends BaseSolver {
       ).x;
     }
     for (let i = 0; i < affectedSlots.length; i++) {
-      indices[affectedSlots[i]] = labelsToOrder[i];
+      orderedIndices[affectedSlots[i]] = labelsToOrder[i];
     }
-    return indices;
+    return orderedIndices;
   }
   sortCrowdedTopBankByPin(indices) {
     const slotsByChip = /* @__PURE__ */ new Map();

package/lib/solvers/AvailableNetOrientationSolver/AvailableNetOrientationSolver.ts

@@ -31,6 +31,7 @@ import {
   tracePathCrossesAnyBounds,
   tracePathIntersectsBounds,
 } from "./geometry"
+import { orderRoutedLabelsBeforeOverlappingPortLabels } from "./orderRoutedLabelsBeforeOverlappingPortLabels"
 import { getPinMap, getTracePins, toNetLabelPlacementPatch } from "./traces"
 import type {
   AvailableNetOrientationSolverParams,
@@ -120,7 +121,12 @@ export class AvailableNetOrientationSolver extends BaseSolver {
     }
     this.sortCrowdedTopBankByPin(indices)
 
-    const blockedStandaloneLabelIndex = indices.find((index) => {
+    const orderedIndices = orderRoutedLabelsBeforeOverlappingPortLabels({
+      labelIndices: indices,
+      netLabelPlacements: this.outputNetLabelPlacements,
+    })
+
+    const blockedStandaloneLabelIndex = orderedIndices.find((index) => {
       const label = this.outputNetLabelPlacements[index]!
       const orientations = this.getAvailableOrientations(label)
       return (
@@ -131,7 +137,7 @@ export class AvailableNetOrientationSolver extends BaseSolver {
         this.labelIntersectsDifferentNetTrace(label)
       )
     })
-    if (blockedStandaloneLabelIndex === undefined) return indices
+    if (blockedStandaloneLabelIndex === undefined) return orderedIndices
     this.blockedStandaloneLabelIndex = blockedStandaloneLabelIndex
     this.blockedStandaloneLabelTargetAnchorX = null
 
@@ -142,8 +148,8 @@ export class AvailableNetOrientationSolver extends BaseSolver {
     const affectedSlots: number[] = []
     const labelsToOrder: number[] = []
 
-    for (let slot = 0; slot < indices.length; slot++) {
-      const index = indices[slot]!
+    for (let slot = 0; slot < orderedIndices.length; slot++) {
+      const index = orderedIndices[slot]!
       const label = this.outputNetLabelPlacements[index]!
       const orientations = this.getAvailableOrientations(label)
       if (
@@ -182,10 +188,10 @@ export class AvailableNetOrientationSolver extends BaseSolver {
       ).x
     }
     for (let i = 0; i < affectedSlots.length; i++) {
-      indices[affectedSlots[i]!] = labelsToOrder[i]!
+      orderedIndices[affectedSlots[i]!] = labelsToOrder[i]!
     }
 
-    return indices
+    return orderedIndices
   }
 
   private sortCrowdedTopBankByPin(indices: number[]) {

package/lib/solvers/AvailableNetOrientationSolver/orderRoutedLabelsBeforeOverlappingPortLabels.ts

@@ -0,0 +1,47 @@
+import type { NetLabelPlacement } from "lib/solvers/NetLabelPlacementSolver/NetLabelPlacementSolver"
+import { getRectBounds } from "lib/solvers/NetLabelPlacementSolver/SingleNetLabelPlacementSolver/geometry"
+import { rectsOverlap } from "./geometry"
+
+const isPortOnlyLabel = (label: NetLabelPlacement) =>
+  label.mspConnectionPairIds.length === 0
+
+export const orderRoutedLabelsBeforeOverlappingPortLabels = ({
+  labelIndices,
+  netLabelPlacements,
+}: {
+  labelIndices: number[]
+  netLabelPlacements: NetLabelPlacement[]
+}) => {
+  const orderedLabelIndices = [...labelIndices]
+
+  for (const routedLabelIndex of labelIndices) {
+    const routedLabel = netLabelPlacements[routedLabelIndex]!
+    if (isPortOnlyLabel(routedLabel)) continue
+
+    const routedBounds = getRectBounds(
+      routedLabel.center,
+      routedLabel.width,
+      routedLabel.height,
+    )
+    const blockingPosition = orderedLabelIndices.findIndex((labelIndex) => {
+      const portOnlyLabel = netLabelPlacements[labelIndex]!
+      if (!isPortOnlyLabel(portOnlyLabel)) return false
+      if (portOnlyLabel.globalConnNetId === routedLabel.globalConnNetId) {
+        return false
+      }
+      const portOnlyBounds = getRectBounds(
+        portOnlyLabel.center,
+        portOnlyLabel.width,
+        portOnlyLabel.height,
+      )
+      return rectsOverlap(routedBounds, portOnlyBounds)
+    })
+    const routedPosition = orderedLabelIndices.indexOf(routedLabelIndex)
+    if (blockingPosition === -1 || blockingPosition > routedPosition) continue
+
+    orderedLabelIndices.splice(routedPosition, 1)
+    orderedLabelIndices.splice(blockingPosition, 0, routedLabelIndex)
+  }
+
+  return orderedLabelIndices
+}

package/package.json

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