@tscircuit/core 0.0.1876 → 0.0.1877

package/dist/index.js

@@ -24078,11 +24078,21 @@ function routePlaneTerminatedBus(params) {
       (direction) => direction !== bus.direction
     )
   ];
-  for (const direction of candidateDirections) {
+  const candidateDirectionPasses = [
+    ...candidateDirections.map((direction) => ({
+      direction,
+      centeredOutward: false
+    })),
+    ...candidateDirections.map((direction) => ({
+      direction,
+      centeredOutward: true
+    }))
+  ];
+  for (const { direction, centeredOutward } of candidateDirectionPasses) {
     const directionalBus = direction === bus.direction ? bus : { ...bus, direction };
     const directionalPadSize = isHorizontal(direction) ? sourceObstacle.width : sourceObstacle.height;
     const pairChannelFitsVia = getDirectionalPitch(directionalBus) / 2 - directionalPadSize / 2 >= viaDiameter / 2 + clearance - 1e-9;
-    const viaHandednesses = pairChannelFitsVia ? [0] : [1, -1];
+    const viaHandednesses = centeredOutward ? !pairChannelFitsVia && busIsOnOutwardComponentEdge(directionalBus) ? [0] : [] : pairChannelFitsVia ? [0] : [1, -1];
     for (const viaHandedness of viaHandednesses) {
       for (const connectionOrder of getConnectionOrders(directionalBus)) {
         const candidatePlans = [];
@@ -34739,6 +34749,39 @@ var FanoutSolver = class extends BaseSolver {
     const wideBoundaryBuses = unsortedBoundaryBuses.filter(
       (bus) => bus.connections.length >= 8
     );
+    const hasForeignAllLayerObstaclesInComponent = wideBoundaryBuses.some(
+      (bus) => this.routingSrj.obstacles.some(
+        (obstacle) => obstacle.componentId !== bus.componentId && this.config.layerNames.every(
+          (layer) => obstacle.layers.includes(layer)
+        ) && obstacle.center.x >= bus.componentBounds.minX && obstacle.center.x <= bus.componentBounds.maxX && obstacle.center.y >= bus.componentBounds.minY && obstacle.center.y <= bus.componentBounds.maxY
+      )
+    );
+    const dogboneCandidateCountByConnectionIndex = /* @__PURE__ */ new Map();
+    if (hasForeignAllLayerObstaclesInComponent) {
+      for (const candidate of getComponentDogboneViaSiteCandidates(
+        unsortedBoundaryBuses,
+        {
+          viaDiameter: this.config.viaDiameter,
+          viaHoleDiameter: this.config.viaHoleDiameter,
+          traceWidth: this.config.traceWidth,
+          clearance: this.config.clearance,
+          additionalObstacles: this.routingSrj.obstacles
+        }
+      )) {
+        dogboneCandidateCountByConnectionIndex.set(
+          candidate.connectionIndex,
+          (dogboneCandidateCountByConnectionIndex.get(
+            candidate.connectionIndex
+          ) ?? 0) + 1
+        );
+      }
+    }
+    const getBusDogboneCandidateCount = (bus) => bus.connections.reduce(
+      (total, connection) => total + (dogboneCandidateCountByConnectionIndex.get(
+        connection.connectionIndex
+      ) ?? 0),
+      0
+    );
     const adjacentCenteredFieldByTurningBus = /* @__PURE__ */ new Map();
     if (usePadAlignedDenseRouting && !configuredDensePlaneRouting) {
       for (const bus of wideBoundaryBuses) {
@@ -34826,6 +34869,12 @@ var FanoutSolver = class extends BaseSolver {
             ...unsortedBoundaryBuses.map((bus) => bus.connections.length)
           ) >= 8 ? first.connections.length - second.connections.length : second.connections.length - first.connections.length;
           if (connectionCountDifference !== 0) return connectionCountDifference;
+          if (hasForeignAllLayerObstaclesInComponent && first.connections.length >= 8 && second.connections.length >= 8) {
+            const dogboneCandidateCountDifference = getBusDogboneCandidateCount(first) - getBusDogboneCandidateCount(second);
+            if (dogboneCandidateCountDifference !== 0) {
+              return dogboneCandidateCountDifference;
+            }
+          }
         }
         const firstLayer = params.busLayerAssignments[first.busId];
         const secondLayer = params.busLayerAssignments[second.busId];
@@ -35226,9 +35275,9 @@ var FanoutSolver = class extends BaseSolver {
     yield;
     if (seedViaPoints) {
       const denseBoundaryBusesInRoutingOrder = [
-        ...multiLayerLeadingSingletonBuses,
+        ...hasForeignAllLayerObstaclesInComponent ? [] : multiLayerLeadingSingletonBuses,
         ...boundaryBuses.filter(
-          (bus) => !multiLayerLeadingSingletonBuses.includes(bus) && !throughAllLeadingBuses.includes(bus)
+          (bus) => (hasForeignAllLayerObstaclesInComponent || !multiLayerLeadingSingletonBuses.includes(bus)) && !throughAllLeadingBuses.includes(bus)
         ).flatMap((bus) => [
           ...throughAllLeadingBuses.filter(
             (candidate) => getContainingWideSourceField(candidate) === bus
@@ -36866,7 +36915,7 @@ var FanoutSolver = class extends BaseSolver {
           debugDense("plane-route:start", bus.busId);
           const targetLayer = params.busLayerAssignments[bus.busId];
           const blockingBusCounts = /* @__PURE__ */ new Map();
-          const busPlans = targetLayer ? routeBus({
+          let busPlans = targetLayer ? routeBus({
             srj: this.routingSrj,
             bus,
             targetLayer,
@@ -36883,6 +36932,32 @@ var FanoutSolver = class extends BaseSolver {
             blockingBusCounts,
             fixedViaPointsByConnectionIndex
           }) : null;
+          if (!busPlans && targetLayer && hasForeignAllLayerObstaclesInComponent) {
+            busPlans = routeBus({
+              srj: this.routingSrj,
+              bus,
+              targetLayer,
+              acceptedPlans: matchedPlans,
+              layerNames: this.config.layerNames,
+              traceWidth: this.config.traceWidth,
+              viaDiameter: this.config.viaDiameter,
+              viaHoleDiameter: this.config.viaHoleDiameter,
+              clearance: this.config.clearance,
+              compactBusTracks: this.config.compactBusTracks,
+              allowBlindAndBuriedVias: false,
+              allowSameNetMerges: this.config.allowSameNetMerges,
+              staticClearanceCache: this.routeStaticClearanceCache,
+              blockingBusCounts
+            });
+            if (busPlans) {
+              fixedViaPointsByConnectionIndex = new Map([
+                ...fixedViaPointsByConnectionIndex,
+                ...busPlans.flatMap(
+                  (plan) => plan.via ? [[plan.connectionIndex, plan.via.center]] : []
+                )
+              ]);
+            }
+          }
           if (!busPlans) {
             debugDense(
               "plane-route:failed",
@@ -51467,7 +51542,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1875",
+  version: "0.0.1876",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -51507,7 +51582,7 @@ var package_default = {
     "@tscircuit/common": "^0.0.20",
     "@tscircuit/copper-pour-solver": "^0.0.54",
     "@tscircuit/create-fdm-enclosure": "0.0.4",
-    "@tscircuit/fanout-solver": "0.0.66",
+    "@tscircuit/fanout-solver": "0.0.68",
     "@tscircuit/footprinter": "^0.0.426",
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/implicit-copper-pour-solver": "github:tscircuit/implicit-copper-pour-solver#a5cbbda0cd65fd4707c5c1af25779837c25aba92",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1876",
+  "version": "0.0.1877",
   "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.54",
     "@tscircuit/create-fdm-enclosure": "0.0.4",
-    "@tscircuit/fanout-solver": "0.0.66",
+    "@tscircuit/fanout-solver": "0.0.68",
     "@tscircuit/footprinter": "^0.0.426",
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/implicit-copper-pour-solver": "github:tscircuit/implicit-copper-pour-solver#a5cbbda0cd65fd4707c5c1af25779837c25aba92",