@tscircuit/core 0.0.1803 → 0.0.1804

package/dist/index.js

@@ -28276,20 +28276,43 @@ function busUsesCoordinatedWinding(bus) {
   );
 }
 function shouldUseJointBoundaryViaReservation(boundaryBusConnectionCounts) {
-  return boundaryBusConnectionCounts.length === 5 || boundaryBusConnectionCounts.length === 6 || boundaryBusConnectionCounts.length === 4 && new Set(boundaryBusConnectionCounts).size > 1;
+  return boundaryBusConnectionCounts.length === 5 || boundaryBusConnectionCounts.length === 6 || boundaryBusConnectionCounts.length === 7 || boundaryBusConnectionCounts.length === 4 && new Set(boundaryBusConnectionCounts).size > 1;
 }
 function shouldDeferSingletonBoundaryViaReservation(boundaryBusConnectionCounts) {
-  return (boundaryBusConnectionCounts.length === 5 || boundaryBusConnectionCounts.length === 6) && boundaryBusConnectionCounts.filter((count) => count === 1).length === 1;
+  return (boundaryBusConnectionCounts.length === 5 || boundaryBusConnectionCounts.length === 6 || boundaryBusConnectionCounts.length === 7) && boundaryBusConnectionCounts.filter((count) => count === 1).length === 1;
 }
 function shouldSearchAdditionalBoundaryRouteTopologies(params) {
-  if (params.boundaryBusCount === 5 || params.boundaryBusCount > 6) {
+  if (params.boundaryBusCount === 5 || params.boundaryBusCount > 7) {
     return false;
   }
-  if (params.boundaryBusCount === 6) {
+  if (params.boundaryBusCount === 6 || params.boundaryBusCount === 7) {
     return params.connectionCount > 2 && params.rawSkew - params.maximumSkew > Math.max(1, params.maximumSkew * 0.5);
   }
   return params.rawSkew - params.maximumSkew > Math.max(1, params.maximumSkew * 0.25);
 }
+function getDenseSevenBusPairRoutingPriorityKeys(params) {
+  const { pairBuses } = params;
+  const firstBus = pairBuses[0];
+  const firstSourceLayer = firstBus?.connections[0]?.sourceLayer;
+  if (params.boundaryBusCount !== 7 || pairBuses.length !== 3 || firstBus === void 0 || firstBus.exitEdge === void 0 || firstBus.assignedLayer === void 0 || firstSourceLayer === void 0 || pairBuses.some(
+    (bus) => bus.connections.length !== 2 || bus.componentId !== firstBus.componentId || bus.exitEdge !== firstBus.exitEdge || bus.assignedLayer !== firstBus.assignedLayer || bus.connections.some((connection) => {
+      const exitTarget = connection.exitTargetPoint;
+      return connection.sourceLayer !== firstSourceLayer || exitTarget?.layer !== firstBus.assignedLayer || !Number.isFinite(connection.sourcePoint.x) || !Number.isFinite(connection.sourcePoint.y) || !Number.isFinite(exitTarget?.x) || !Number.isFinite(exitTarget?.y);
+    })
+  )) {
+    return null;
+  }
+  const getMeanSourceToExitTargetDistance = (bus) => bus.connections.reduce((total, connection) => {
+    const exitTarget = connection.exitTargetPoint;
+    return total + Math.hypot(
+      exitTarget.x - connection.sourcePoint.x,
+      exitTarget.y - connection.sourcePoint.y
+    );
+  }, 0) / bus.connections.length;
+  return pairBuses.map(
+    (bus) => Number(getMeanSourceToExitTargetDistance(bus).toFixed(9))
+  );
+}
 function getCandidateEscapeLayersForBus(params) {
   const { bus, srj, config, staticClearanceCache } = params;
   const busAllowedLayers = bus.allowedLayers;
@@ -28509,11 +28532,38 @@ var FanoutSolver = class extends BaseSolver {
     const useJointBoundaryViaReservation = shouldUseJointBoundaryViaReservation(
       unsortedBoundaryBuses.map((bus) => bus.connections.length)
     );
+    const twoConnectionBoundaryBuses = unsortedBoundaryBuses.filter(
+      (bus) => bus.connections.length === 2
+    );
+    const pairRoutingPriorityKeys = getDenseSevenBusPairRoutingPriorityKeys({
+      boundaryBusCount: unsortedBoundaryBuses.length,
+      pairBuses: twoConnectionBoundaryBuses.map((bus) => ({
+        ...bus,
+        assignedLayer: params.busLayerAssignments[bus.busId]
+      }))
+    });
+    const pairRoutingPriorityKeyByBusId = pairRoutingPriorityKeys ? new Map(
+      twoConnectionBoundaryBuses.map((bus, index) => [
+        bus.busId,
+        pairRoutingPriorityKeys[index]
+      ])
+    ) : null;
     const boundaryBuses = unsortedBoundaryBuses.toSorted((first, second) => {
       if (useJointBoundaryViaReservation) {
         const connectionCountDifference = second.connections.length - first.connections.length;
         if (connectionCountDifference !== 0) return connectionCountDifference;
       }
+      const firstLayer = params.busLayerAssignments[first.busId];
+      const secondLayer = params.busLayerAssignments[second.busId];
+      const firstPairRoutingPriority = pairRoutingPriorityKeyByBusId?.get(
+        first.busId
+      );
+      const secondPairRoutingPriority = pairRoutingPriorityKeyByBusId?.get(
+        second.busId
+      );
+      if (firstPairRoutingPriority !== void 0 && secondPairRoutingPriority !== void 0 && firstPairRoutingPriority !== secondPairRoutingPriority) {
+        return firstPairRoutingPriority - secondPairRoutingPriority;
+      }
       const cornerBandDifference = Number(
         Boolean(getCornerBandSide(second.exitEdge, second.preferredExit))
       ) - Number(Boolean(getCornerBandSide(first.exitEdge, first.preferredExit)));
@@ -28536,17 +28586,17 @@ var FanoutSolver = class extends BaseSolver {
           return sourceSpanDifference;
         }
       }
-      const firstLayer = params.busLayerAssignments[first.busId];
-      const secondLayer = params.busLayerAssignments[second.busId];
       const layerDifference = this.config.layerNames.indexOf(firstLayer ?? "") - this.config.layerNames.indexOf(secondLayer ?? "");
       if (layerDifference !== 0) return -layerDifference;
-      if (unsortedBoundaryBuses.length !== 6) return 0;
+      if (unsortedBoundaryBuses.length !== 6 && unsortedBoundaryBuses.length !== 7) {
+        return 0;
+      }
       return first.busId.localeCompare(second.busId);
     });
     const planeBuses = this.preparedBuses.filter(
       (bus) => bus.termination.type === "plane"
     );
-    if (boundaryBuses.length === 0 || boundaryBuses.length > 6 || planeBuses.length < 8 || boundaryBuses.some((bus) => !busUsesCoordinatedWinding(bus)) || planeBuses.some((bus) => bus.connections.length !== 1) || boundaryBuses.length + planeBuses.length !== params.busesInRoutingOrder.length) {
+    if (boundaryBuses.length === 0 || boundaryBuses.length > 7 || planeBuses.length < 8 || boundaryBuses.some((bus) => !busUsesCoordinatedWinding(bus)) || planeBuses.some((bus) => bus.connections.length !== 1) || boundaryBuses.length + planeBuses.length !== params.busesInRoutingOrder.length) {
       return null;
     }
     const connectionNameByIndex = new Map(
@@ -41870,7 +41920,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1802",
+  version: "0.0.1803",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -41910,7 +41960,7 @@ var package_default = {
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.51",
     "@tscircuit/create-fdm-enclosure": "0.0.4",
-    "@tscircuit/fanout-solver": "0.0.43",
+    "@tscircuit/fanout-solver": "0.0.45",
     "@tscircuit/footprinter": "^0.0.426",
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/implicit-copper-pour-solver": "github:tscircuit/implicit-copper-pour-solver#47f930139fe969550e049aa7fb741bbcb1f08569",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1803",
+  "version": "0.0.1804",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -41,7 +41,7 @@
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.51",
     "@tscircuit/create-fdm-enclosure": "0.0.4",
-    "@tscircuit/fanout-solver": "0.0.43",
+    "@tscircuit/fanout-solver": "0.0.45",
     "@tscircuit/footprinter": "^0.0.426",
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/implicit-copper-pour-solver": "github:tscircuit/implicit-copper-pour-solver#47f930139fe969550e049aa7fb741bbcb1f08569",