@tscircuit/core 0.0.1805 → 0.0.1806

package/dist/index.js

@@ -24036,9 +24036,28 @@ function matchComponent(params) {
     })
   );
   if (entries.some((entry) => entry.candidates.length === 0)) return null;
-  const assignedCandidates = /* @__PURE__ */ new Map();
+  const forcedCandidates = entries.flatMap(
+    (entry) => entry.candidates.length === 1 ? [entry.candidates[0]] : []
+  );
+  for (let candidateIndex = 0; candidateIndex < forcedCandidates.length; candidateIndex++) {
+    const candidate = forcedCandidates[candidateIndex];
+    for (let previousIndex = 0; previousIndex < candidateIndex; previousIndex++) {
+      if (!candidatesAreMutuallyClear({
+        first: candidate,
+        second: forcedCandidates[previousIndex],
+        rules
+      })) {
+        return null;
+      }
+    }
+  }
+  const assignedCandidates = new Map(
+    forcedCandidates.map((candidate) => [candidate.connectionIndex, candidate])
+  );
   const remaining = new Set(
-    entries.map((entry) => entry.connection.preparedConnection.connectionIndex)
+    entries.flatMap(
+      (entry) => entry.candidates.length > 1 ? [entry.connection.preparedConnection.connectionIndex] : []
+    )
   );
   const entryByConnectionIndex = new Map(
     entries.map((entry) => [
@@ -24046,6 +24065,14 @@ function matchComponent(params) {
       entry
     ])
   );
+  if (remaining.size === 0) {
+    return new Map(
+      [...assignedCandidates.entries()].map(([connectionIndex, candidate]) => [
+        connectionIndex,
+        { ...candidate.point }
+      ])
+    );
+  }
   const getViableCandidates = (entry) => entry.candidates.filter(
     (candidate) => [...assignedCandidates.values()].every(
       (assignedCandidate) => candidatesAreMutuallyClear({
@@ -28276,25 +28303,48 @@ function busUsesCoordinatedWinding(bus) {
   );
 }
 function shouldUseJointBoundaryViaReservation(boundaryBusConnectionCounts) {
-  return boundaryBusConnectionCounts.length === 5 || boundaryBusConnectionCounts.length === 6 || boundaryBusConnectionCounts.length === 7 || boundaryBusConnectionCounts.length === 4 && new Set(boundaryBusConnectionCounts).size > 1;
+  return boundaryBusConnectionCounts.length === 5 || boundaryBusConnectionCounts.length === 6 || boundaryBusConnectionCounts.length === 7 || boundaryBusConnectionCounts.length === 8 || boundaryBusConnectionCounts.length === 4 && new Set(boundaryBusConnectionCounts).size > 1;
 }
 function shouldDeferSingletonBoundaryViaReservation(boundaryBusConnectionCounts) {
-  return (boundaryBusConnectionCounts.length === 5 || boundaryBusConnectionCounts.length === 6 || boundaryBusConnectionCounts.length === 7) && boundaryBusConnectionCounts.filter((count) => count === 1).length === 1;
+  const boundaryBusCount = boundaryBusConnectionCounts.length;
+  const singletonBusCount = boundaryBusConnectionCounts.filter(
+    (count) => count === 1
+  ).length;
+  return (boundaryBusCount === 5 || boundaryBusCount === 6 || boundaryBusCount === 7) && singletonBusCount === 1 || boundaryBusCount === 8 && (singletonBusCount === 1 || singletonBusCount === 2);
 }
 function shouldSearchAdditionalBoundaryRouteTopologies(params) {
-  if (params.boundaryBusCount === 5 || params.boundaryBusCount > 7) {
+  if (params.boundaryBusCount === 5 || params.boundaryBusCount > 8) {
     return false;
   }
-  if (params.boundaryBusCount === 6 || params.boundaryBusCount === 7) {
+  if (params.boundaryBusCount === 6 || params.boundaryBusCount === 7 || params.boundaryBusCount === 8) {
     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) {
+function getDenseSingletonBoundaryGeometry(bus) {
+  const connection = bus.connections[0];
+  const target = connection?.exitTargetPoint;
+  let targetProjection = 0;
+  if (connection && target) {
+    const deltaX = target.x - connection.sourcePoint.x;
+    const deltaY = target.y - connection.sourcePoint.y;
+    targetProjection = bus.direction === "right" ? deltaX : bus.direction === "left" ? -deltaX : bus.direction === "up" ? deltaY : -deltaY;
+  }
+  return {
+    isCorner: Boolean(getCornerBandSide(bus.exitEdge, bus.preferredExit)),
+    targetProjection
+  };
+}
+function compareDenseSingletonBoundaryDeferralPriority(first, second) {
+  const firstGeometry = getDenseSingletonBoundaryGeometry(first);
+  const secondGeometry = getDenseSingletonBoundaryGeometry(second);
+  return Number(firstGeometry.isCorner) - Number(secondGeometry.isCorner) || (firstGeometry.isCorner && secondGeometry.isCorner ? Number(firstGeometry.targetProjection > 0) - Number(secondGeometry.targetProjection > 0) : 0) || first.busId.localeCompare(second.busId);
+}
+function getDenseBoundaryPairRoutingPriorityKeys(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(
+  if (params.boundaryBusCount !== 7 && params.boundaryBusCount !== 8 || 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);
@@ -28302,15 +28352,17 @@ function getDenseSevenBusPairRoutingPriorityKeys(params) {
   )) {
     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;
+  const getMaximumSourceToExitTargetDistance = (bus) => Math.max(
+    ...bus.connections.map((connection) => {
+      const exitTarget = connection.exitTargetPoint;
+      return Math.hypot(
+        exitTarget.x - connection.sourcePoint.x,
+        exitTarget.y - connection.sourcePoint.y
+      );
+    })
+  );
   return pairBuses.map(
-    (bus) => Number(getMeanSourceToExitTargetDistance(bus).toFixed(9))
+    (bus) => Number(getMaximumSourceToExitTargetDistance(bus).toFixed(9))
   );
 }
 function getCandidateEscapeLayersForBus(params) {
@@ -28535,7 +28587,7 @@ var FanoutSolver = class extends BaseSolver {
     const twoConnectionBoundaryBuses = unsortedBoundaryBuses.filter(
       (bus) => bus.connections.length === 2
     );
-    const pairRoutingPriorityKeys = getDenseSevenBusPairRoutingPriorityKeys({
+    const pairRoutingPriorityKeys = getDenseBoundaryPairRoutingPriorityKeys({
       boundaryBusCount: unsortedBoundaryBuses.length,
       pairBuses: twoConnectionBoundaryBuses.map((bus) => ({
         ...bus,
@@ -28588,7 +28640,7 @@ var FanoutSolver = class extends BaseSolver {
       }
       const layerDifference = this.config.layerNames.indexOf(firstLayer ?? "") - this.config.layerNames.indexOf(secondLayer ?? "");
       if (layerDifference !== 0) return -layerDifference;
-      if (unsortedBoundaryBuses.length !== 6 && unsortedBoundaryBuses.length !== 7) {
+      if (unsortedBoundaryBuses.length !== 6 && unsortedBoundaryBuses.length !== 7 && unsortedBoundaryBuses.length !== 8) {
         return 0;
       }
       return first.busId.localeCompare(second.busId);
@@ -28596,7 +28648,7 @@ var FanoutSolver = class extends BaseSolver {
     const planeBuses = this.preparedBuses.filter(
       (bus) => bus.termination.type === "plane"
     );
-    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) {
+    if (boundaryBuses.length === 0 || boundaryBuses.length > 8 || 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(
@@ -28606,13 +28658,17 @@ var FanoutSolver = class extends BaseSolver {
         )
       )
     );
+    const singletonBoundaryBusCount = boundaryBuses.filter(
+      (bus) => bus.connections.length === 1
+    ).length;
+    const useGeometryAwareSingletonOutwardPreference = boundaryBuses.length === 8 && singletonBoundaryBusCount === 2;
     const preferredBoundaryPerpendicularSideByBusId = new Map(
       boundaryBuses.map((bus) => [bus.busId, 1])
     );
     const preferBoundaryOutwardByBusId = new Map(
       boundaryBuses.map((bus) => [
         bus.busId,
-        getExitEdgeForDirection(bus.direction) !== bus.exitEdge
+        useGeometryAwareSingletonOutwardPreference && bus.connections.length === 1 && getCornerBandSide(bus.exitEdge, bus.preferredExit) ? getDenseSingletonBoundaryGeometry(bus).targetProjection > 0 : getExitEdgeForDirection(bus.direction) !== bus.exitEdge
       ])
     );
     const canShareCopper = (firstConnectionIndex, secondConnectionIndex) => {
@@ -28632,10 +28688,14 @@ var FanoutSolver = class extends BaseSolver {
     const boundaryBusConnectionCounts = boundaryBuses.map(
       (bus) => bus.connections.length
     );
-    const provisionalSingletonBus = shouldDeferSingletonBoundaryViaReservation(
-      boundaryBusConnectionCounts
-    ) ? boundaryBuses.find((bus) => bus.connections.length === 1) : void 0;
-    const initiallyMatchedBoundaryBuses = provisionalSingletonBus ? boundaryBuses.filter((bus) => bus !== provisionalSingletonBus) : boundaryBuses;
+    const singletonBoundaryBuses = boundaryBuses.filter(
+      (bus) => bus.connections.length === 1
+    );
+    const provisionalSingletonBuses = shouldDeferSingletonBoundaryViaReservation(boundaryBusConnectionCounts) ? singletonBoundaryBuses.toSorted(compareDenseSingletonBoundaryDeferralPriority).slice(0, 1) : [];
+    const provisionalSingletonBusSet = new Set(provisionalSingletonBuses);
+    const initiallyMatchedBoundaryBuses = boundaryBuses.filter(
+      (bus) => !provisionalSingletonBusSet.has(bus)
+    );
     const jointViaPoints = useJointBoundaryViaReservation ? matchComponentDogboneViaSites(
       [...planeBuses, ...initiallyMatchedBoundaryBuses],
       {
@@ -41920,7 +41980,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1804",
+  version: "0.0.1805",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -41960,7 +42020,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.45",
+    "@tscircuit/fanout-solver": "0.0.46",
     "@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.1805",
+  "version": "0.0.1806",
   "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.45",
+    "@tscircuit/fanout-solver": "0.0.46",
     "@tscircuit/footprinter": "^0.0.426",
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/implicit-copper-pour-solver": "github:tscircuit/implicit-copper-pour-solver#47f930139fe969550e049aa7fb741bbcb1f08569",