@tscircuit/core 0.0.1894 → 0.0.1896

package/dist/index.js

@@ -18234,6 +18234,21 @@ function inflateSourceFiducial(sourceElm, inflatorContext) {
   }
 }
 
+// lib/components/primitive-components/Group/Group.ts
+import {
+  convertSrjToGraphicsObject,
+  getRerouteSimpleRouteJson,
+  reconnectReroutedSimpleRouteJsonRegion
+} from "@tscircuit/capacity-autorouter";
+import { getBoundsFromPoints as getBoundsFromPoints9 } from "@tscircuit/math-utils";
+import {
+  groupProps
+} from "@tscircuit/props";
+import {
+  distance as distance15
+} from "circuit-json";
+import Debug15 from "debug";
+
 // lib/utils/autorouting/with-fixed-fanout-traces.ts
 function withFixedFanoutTraces(input, fixedTraceIds) {
   if (fixedTraceIds.size === 0) return input;
@@ -18351,21 +18366,6 @@ function assignSchematicNetLabelSuperscripts(db) {
   }
 }
 
-// lib/components/primitive-components/Group/Group.ts
-import {
-  convertSrjToGraphicsObject,
-  getRerouteSimpleRouteJson,
-  reconnectReroutedSimpleRouteJsonRegion
-} from "@tscircuit/capacity-autorouter";
-import { getBoundsFromPoints as getBoundsFromPoints9 } from "@tscircuit/math-utils";
-import {
-  groupProps
-} from "@tscircuit/props";
-import {
-  distance as distance15
-} from "circuit-json";
-import Debug15 from "debug";
-
 // lib/components/base-components/is-assembly-device-container.ts
 var isAssemblyDeviceContainer = (component) => typeof component === "object" && component !== null && "isAssemblyDeviceContainer" in component && component.isAssemblyDeviceContainer === true;
 
@@ -21825,8 +21825,6 @@ function* routeViaMinimalWindingAlternativesSteps(params, maximumAlternatives =
   const gridStep = params.gridStep ?? (alignGridToPitch ? pitch / (2 * Math.ceil(pitch / (2 * baseGridStep))) : baseGridStep);
   if (!Number.isFinite(gridStep) || gridStep <= 0) return [];
   const { minX, maxX, minY, maxY } = bus.sharedBoundary;
-  const exitAxis = bus.exitEdge === "left" || bus.exitEdge === "right" ? "x" : "y";
-  const exitCoordinate = bus.exitEdge === "left" ? minX : bus.exitEdge === "right" ? maxX : bus.exitEdge === "top" ? maxY : minY;
   const originX = params.gridOrigin?.x ?? bus.xCoordinates[0] ?? minX;
   const originY = params.gridOrigin?.y ?? bus.yCoordinates[0] ?? minY;
   const gridMinX = alignGridToPitch ? originX + Math.ceil((minX - originX) / gridStep) * gridStep : minX;
@@ -21966,8 +21964,9 @@ function* routeViaMinimalWindingAlternativesSteps(params, maximumAlternatives =
   const segmentIsClear = (params2) => {
     const { segment: segment2, terminal, acceptedAttemptSegmentIndex } = params2;
     if (forbidEarlyExitBoundaryContact) {
+      const boundary = bus.sharedBoundary;
       for (const point6 of [segment2.start, segment2.end])
-        if (Math.abs(point6[exitAxis] - exitCoordinate) < EPSILON6 && distance9(point6, terminal.exitPoint) > EPSILON6)
+        if ((Math.abs(point6.x - boundary.minX) < EPSILON6 || Math.abs(point6.x - boundary.maxX) < EPSILON6 || Math.abs(point6.y - boundary.minY) < EPSILON6 || Math.abs(point6.y - boundary.maxY) < EPSILON6) && distance9(point6, terminal.exitPoint) > EPSILON6)
           return false;
     }
     const connectionName = terminal.connection.connection.name;
@@ -24627,7 +24626,8 @@ function* routeBusAlternativesSteps(params, maxAlternatives = 1, includeVisualiz
     fixedViaFallbackRouteOrderAttempts = 24,
     allowFixedViaReservedExitFallback = false,
     cornerBandTargetTrackOffset,
-    cornerExitLaneOffset
+    cornerExitLaneOffset,
+    forbidEarlyExitBoundaryContact = false
   } = params;
   if (!Number.isInteger(maxAlternatives) || maxAlternatives < 1) {
     throw new Error(
@@ -24778,7 +24778,8 @@ function* routeBusAlternativesSteps(params, maxAlternatives = 1, includeVisualiz
         gridStep: params.windingGridStep,
         alignGridToPads: alignWindingGridToPads,
         sourceEscapePaths: params.sourceEscapePaths,
-        heuristicWeight: params.windingHeuristicWeight
+        heuristicWeight: params.windingHeuristicWeight,
+        forbidEarlyExitBoundaryContact
       },
       maxAlternatives,
       includeVisualization
@@ -25187,7 +25188,8 @@ function* routeBusAlternativesSteps(params, maxAlternatives = 1, includeVisualiz
           gridStepDivisor,
           gridStep: params.windingGridStep,
           sourceEscapePaths: params.sourceEscapePaths,
-          preferTargetDirectedLaneBias: terminalPattern.preferTargetDirectedLaneBias
+          preferTargetDirectedLaneBias: terminalPattern.preferTargetDirectedLaneBias,
+          forbidEarlyExitBoundaryContact
         },
         fixedViaPointsByConnectionIndex && viaMinimalOnly ? Math.min(2, Math.max(1, maxAlternatives - alternatives.length)) : terminalPattern.maximumRouteOrderAttempts === void 0 ? Math.min(2, maxAlternatives - alternatives.length) : 2,
         includeVisualization
@@ -25452,7 +25454,8 @@ function* routeBusAlternativesSteps(params, maxAlternatives = 1, includeVisualiz
           reservedVias: bus.connections.length > 1 ? [...reservedVias, ...boundaryVias] : reservedVias,
           gridStepDivisor: 2,
           allowSourceLayerRouting: true,
-          alignGridToPads: true
+          alignGridToPads: true,
+          forbidEarlyExitBoundaryContact
         },
         1,
         includeVisualization
@@ -25495,7 +25498,8 @@ function* routeBusAlternativesSteps(params, maxAlternatives = 1, includeVisualiz
             reservedVias,
             softReservedVias,
             gridStepDivisor: 2,
-            alignGridToPads: true
+            alignGridToPads: true,
+            forbidEarlyExitBoundaryContact
           },
           1,
           includeVisualization
@@ -27682,6 +27686,46 @@ function matchBusPlanLengths(params) {
     throw error;
   }
 }
+function getDeclaredPairPlan({
+  plans,
+  connectionIndex,
+  connectionName
+}) {
+  const matchingPlans = plans.filter(
+    (plan2) => plan2.connectionIndex === connectionIndex
+  );
+  const plan = matchingPlans[0];
+  if (matchingPlans.length !== 1 || !plan || plan.connectionName !== connectionName || !Number.isFinite(plan.length))
+    throw new Error(
+      `Differential-pair matching cannot resolve exactly one original plan for ${connectionName}`
+    );
+  const measuredLength = [
+    ...plan.segments,
+    ...plan.planeEndpointSegments ?? []
+  ].reduce((sum, segment2) => sum + distance9(segment2.start, segment2.end), 0);
+  if (!Number.isFinite(measuredLength) || Math.abs(measuredLength - plan.length) > EPSILON9)
+    throw new Error(
+      `Differential-pair matching found inconsistent copper length for ${plan.connectionName}`
+    );
+  return plan;
+}
+function getDeclaredPairPlans({
+  plans,
+  pair
+}) {
+  return [
+    getDeclaredPairPlan({
+      plans,
+      connectionIndex: pair.connectionIndices[0],
+      connectionName: pair.connectionNames[0]
+    }),
+    getDeclaredPairPlan({
+      plans,
+      connectionIndex: pair.connectionIndices[1],
+      connectionName: pair.connectionNames[1]
+    })
+  ];
+}
 function matchDeclaredPairLengths(params, originalPlans, pairs3, validatePlans, workBudget) {
   const byIndex = new Map(
     params.preparedBuses.flatMap(
@@ -27701,23 +27745,6 @@ function matchDeclaredPairLengths(params, originalPlans, pairs3, validatePlans,
     )
   }));
   let plans = originalPlans;
-  const pairPlans = (candidate, pair) => pair.connectionIndices.map((index, i) => {
-    const matches = candidate.filter((plan2) => plan2.connectionIndex === index);
-    const plan = matches[0];
-    if (matches.length !== 1 || plan?.connectionName !== pair.connectionNames[i] || !Number.isFinite(plan.length))
-      throw new Error(
-        `Differential-pair matching cannot resolve exactly one original plan for ${pair.connectionNames[i]}`
-      );
-    const measured = [
-      ...plan.segments,
-      ...plan.planeEndpointSegments ?? []
-    ].reduce((sum, segment2) => sum + distance9(segment2.start, segment2.end), 0);
-    if (!Number.isFinite(measured) || Math.abs(measured - plan.length) > EPSILON9)
-      throw new Error(
-        `Differential-pair matching found inconsistent copper length for ${plan.connectionName}`
-      );
-    return plan;
-  });
   const originalBusLimitsHold = (candidate) => scopedBuses.every(({ bus, indices }) => {
     if (bus.maxLengthSkew === void 0) return true;
     const own = getPlansForIndices(candidate, indices);
@@ -27725,7 +27752,7 @@ function matchDeclaredPairLengths(params, originalPlans, pairs3, validatePlans,
   });
   for (let pass = 0; pass <= activePairs.length; pass++) {
     for (const pair of activePairs) {
-      const own = pairPlans(plans, pair);
+      const own = getDeclaredPairPlans({ plans, pair });
       if (getBusSkew(own) <= pair.lengthTolerance + EPSILON9) continue;
       const entries = pair.connectionIndices.map((index) => byIndex.get(index));
       const owner = entries.find((entry) => entry).bus;
@@ -27749,7 +27776,7 @@ function matchDeclaredPairLengths(params, originalPlans, pairs3, validatePlans,
           unroutedSourceBuses: void 0,
           allowUnconstrainedLaneRerouting: false,
           allowPairLaneSpreading: entries[0].bus === entries[1].bus && params.allowPairLaneSpreading,
-          candidatePlansAreFeasible: (candidate) => originalBusLimitsHold(candidate) && pairPlans(candidate, pair).every(
+          candidatePlansAreFeasible: (candidate) => originalBusLimitsHold(candidate) && getDeclaredPairPlans({ plans: candidate, pair }).every(
             (plan) => plan.length <= maximum + EPSILON9
           ) && (!params.candidatePlansAreFeasible || params.candidatePlansAreFeasible(candidate))
         },
@@ -27760,7 +27787,7 @@ function matchDeclaredPairLengths(params, originalPlans, pairs3, validatePlans,
       plans = result.plans;
     }
     if (activePairs.every(
-      (pair) => getBusSkew(pairPlans(plans, pair)) <= pair.lengthTolerance + EPSILON9
+      (pair) => getBusSkew(getDeclaredPairPlans({ plans, pair })) <= pair.lengthTolerance + EPSILON9
     )) {
       if (!originalBusLimitsHold(plans))
         return {
@@ -27773,7 +27800,7 @@ function matchDeclaredPairLengths(params, originalPlans, pairs3, validatePlans,
     }
   }
   const failed = activePairs.find(
-    (pair) => getBusSkew(pairPlans(plans, pair)) > pair.lengthTolerance + EPSILON9
+    (pair) => getBusSkew(getDeclaredPairPlans({ plans, pair })) > pair.lengthTolerance + EPSILON9
   );
   return {
     plans: null,
@@ -42350,8 +42377,11 @@ function validatePlanStructure(params) {
     plan,
     issues
   });
-  if (traceSegments.length !== plan.segments.length || traceSegments.some((segment2, index) => {
-    const declared = plan.segments[index];
+  const declaredTraceSegments = plan.segments.filter(
+    (segment2) => distance9(segment2.start, segment2.end) > EPSILON23
+  );
+  if (traceSegments.length !== declaredTraceSegments.length || traceSegments.some((segment2, index) => {
+    const declared = declaredTraceSegments[index];
     return !declared || segment2.layer !== declared.layer || Math.abs(segment2.width - declared.width) > EPSILON23 || !pointsMatch3(segment2.start, declared.start) || !pointsMatch3(segment2.end, declared.end);
   })) {
     addIssue2(
@@ -44228,6 +44258,10 @@ var FanoutSolver = class extends BaseSolver {
       params.generator,
       params.getProgress
     );
+    this.MAX_ITERATIONS = Math.max(
+      this.MAX_ITERATIONS,
+      this.iterations + solver.MAX_ITERATIONS + 1
+    );
     this.activeOperation = {
       solver,
       onSolved: params.onSolved
@@ -45109,6 +45143,34 @@ var FanoutSolver = class extends BaseSolver {
           bus
         ])
       ];
+      const allWideBusesExitDirectly = wideBoundaryBuses.every(
+        (bus) => bus.exitEdge && bus.direction === getDirectionForExitEdge(bus.exitEdge)
+      );
+      const recoveryLeadingBuses = useSameNetPlaneCopperStaging && allWideBusesExitDirectly ? singletonBoundaryBuses.filter((bus) => {
+        const containingWideBus = getContainingWideSourceField(bus);
+        return Boolean(
+          containingWideBus && bus.direction === containingWideBus.direction
+        );
+      }) : [];
+      if (params.boundaryRecovery && recoveryLeadingBuses.length > 0) {
+        const recoveredBusIndex = denseBoundaryBusesInRoutingOrder.findIndex(
+          (bus) => bus.busId === params.boundaryRecovery.busId
+        );
+        if (recoveredBusIndex >= 0) {
+          const recoveredBus = denseBoundaryBusesInRoutingOrder[recoveredBusIndex];
+          const leadingBusSet = new Set(recoveryLeadingBuses);
+          const remainingBuses = denseBoundaryBusesInRoutingOrder.filter(
+            (bus) => bus !== recoveredBus && !leadingBusSet.has(bus)
+          );
+          denseBoundaryBusesInRoutingOrder.splice(
+            0,
+            denseBoundaryBusesInRoutingOrder.length,
+            recoveredBus,
+            ...recoveryLeadingBuses,
+            ...remainingBuses
+          );
+        }
+      }
       for (const [bus] of adjacentCenteredFieldByTurningBus) {
         const axis = bus.direction === "up" || bus.direction === "down" ? "y" : "x";
         const sign = bus.direction === "up" || bus.direction === "right" ? 1 : -1;
@@ -45278,6 +45340,12 @@ var FanoutSolver = class extends BaseSolver {
         const adaptiveWindingRouteOrder = !useConfiguredDensePlaneRouting && !getCornerBandSide(bus.exitEdge, bus.preferredExit) && bus.connections.length > 2 && wideBoundaryBuses.some(
           (candidate) => getCornerBandSide(candidate.exitEdge, candidate.preferredExit)
         );
+        const adjacentBoundaryMargin = this.config.traceWidth + this.config.clearance;
+        const exitsNearAdjacentBoundary = bus.connections.some((connection) => {
+          const target = connection.exitTargetPoint ?? connection.targetPoint;
+          const boundary = bus.sharedBoundary;
+          return bus.exitEdge === "left" || bus.exitEdge === "right" ? target.y - boundary.minY <= adjacentBoundaryMargin + 1e-9 || boundary.maxY - target.y <= adjacentBoundaryMargin + 1e-9 : target.x - boundary.minX <= adjacentBoundaryMargin + 1e-9 || boundary.maxX - target.x <= adjacentBoundaryMargin + 1e-9;
+        });
         const routeParams = {
           srj: this.routingSrj,
           bus,
@@ -45299,6 +45367,7 @@ var FanoutSolver = class extends BaseSolver {
           preferCornerBoundaryVia: useConfiguredDensePlaneRouting,
           adaptiveWindingRouteOrder,
           allowFixedViaReservedExitFallback: useBoundaryRecovery,
+          forbidEarlyExitBoundaryContact: exitsNearAdjacentBoundary,
           // Retain pad-aligned channels even when plane sites are reserved
           // adaptively; the boundary grid can fence off a turning wide bus.
           alignWindingGridToPads: usePadAlignedDenseRouting && !configuredDensePlaneRouting,
@@ -46875,7 +46944,25 @@ var FanoutSolver = class extends BaseSolver {
         densePlansAreClear
       );
       if (densePlansAreClear) {
-        return { plans: matchedPlans, failedBusIds: [] };
+        const plans = this.normalizeCompletePlanCorners(matchedPlans);
+        if (plans) {
+          const outputSrj = buildOutputSimpleRouteJson({
+            inputSrj: this.inputSrj,
+            plans,
+            layerNames: this.config.layerNames
+          });
+          const completeValidation = this.validateCompletePlans(
+            plans,
+            outputSrj
+          );
+          if (completeValidation.valid) {
+            return {
+              plans,
+              failedBusIds: [],
+              stopAfterCompleteValidation: true
+            };
+          }
+        }
       }
     }
     if ((useAdaptiveDensePlaneRouting || useSameNetPlaneCopperStaging) && unroutablePlaneBusIds.size > 0 && (params.planeReservationRetryCount ?? 0) < 5) {
@@ -47409,7 +47496,8 @@ var FanoutSolver = class extends BaseSolver {
       yield;
     }
     let validationIssues;
-    if (plans.length === this.inputSrj.connections.length) {
+    const stopAfterCompleteValidation = mixedTerminationState?.stopAfterCompleteValidation === true && plans.length === this.inputSrj.connections.length;
+    if (!stopAfterCompleteValidation && plans.length === this.inputSrj.connections.length) {
       const lengthMatching = this.matchCompletePlanLengths(plans);
       if (lengthMatching.plans) {
         plans = lengthMatching.plans;
@@ -47430,7 +47518,7 @@ var FanoutSolver = class extends BaseSolver {
         blockingBusCounts.clear();
       }
     }
-    if (plans.length === this.inputSrj.connections.length) {
+    if (!stopAfterCompleteValidation && plans.length === this.inputSrj.connections.length) {
       const normalized = this.normalizeCompletePlanCorners(plans);
       if (normalized) {
         plans = normalized;
@@ -48729,6 +48817,19 @@ var FanoutAutorouter = class _FanoutAutorouter {
   }
 };
 
+// lib/utils/autorouting/compare-pcb-vias.ts
+var PCB_VIA_PHYSICAL_MATCH_TOLERANCE_MM = 1e-6;
+function pcbViasSharePhysicalHole(firstPcbVia, secondPcbVia) {
+  if (!firstPcbVia.subcircuit_connectivity_map_key || firstPcbVia.subcircuit_connectivity_map_key !== secondPcbVia.subcircuit_connectivity_map_key || firstPcbVia.subcircuit_id !== secondPcbVia.subcircuit_id) {
+    return false;
+  }
+  const firstPcbViaLayers = firstPcbVia.layers.toSorted();
+  const secondPcbViaLayers = secondPcbVia.layers.toSorted();
+  return Math.abs(firstPcbVia.x - secondPcbVia.x) <= PCB_VIA_PHYSICAL_MATCH_TOLERANCE_MM && Math.abs(firstPcbVia.y - secondPcbVia.y) <= PCB_VIA_PHYSICAL_MATCH_TOLERANCE_MM && Math.abs(firstPcbVia.hole_diameter - secondPcbVia.hole_diameter) <= PCB_VIA_PHYSICAL_MATCH_TOLERANCE_MM && Math.abs(firstPcbVia.outer_diameter - secondPcbVia.outer_diameter) <= PCB_VIA_PHYSICAL_MATCH_TOLERANCE_MM && firstPcbViaLayers.length === secondPcbViaLayers.length && firstPcbViaLayers.every(
+    (firstPcbViaLayer, pcbViaLayerIndex) => firstPcbViaLayer === secondPcbViaLayers[pcbViaLayerIndex]
+  );
+}
+
 // lib/utils/autorouting/createSourceTracesFromOffboardConnections.ts
 var createSourceTracesFromOffboardConnections = ({
   db,
@@ -61603,7 +61704,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1893",
+  version: "0.0.1895",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -61643,7 +61744,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.72",
+    "@tscircuit/fanout-solver": "0.0.74",
     "@tscircuit/footprinter": "^0.0.426",
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/implicit-copper-pour-solver": "github:tscircuit/implicit-copper-pour-solver#a5cbbda0cd65fd4707c5c1af25779837c25aba92",
@@ -63719,7 +63820,10 @@ var Group5 = class extends NormalComponent3 {
         }
         simpleRouteJson = {
           ...phaseInput,
-          traces: [...phaseInput.traces ?? [], ...outputTraces]
+          traces: getAccumulatedPcbTracesWithStageOutputReplacements({
+            accumulatedPcbTraces: phaseInput.traces ?? [],
+            stageOutputPcbTraces: outputTraces
+          })
         };
       }
       simpleRouteJson = withFixedFanoutTraces(
@@ -64225,6 +64329,7 @@ var Group5 = class extends NormalComponent3 {
       outputPcbTraces: output_pcb_traces,
       pcbTraceIdsToReplace: pcb_trace_ids_to_be_replaced
     });
+    const materializedPcbVias = db.pcb_via.list();
     for (const pcb_trace of output_pcb_traces) {
       if (pcb_trace.type !== "pcb_trace") continue;
       pcb_trace.subcircuit_id ??= this.subcircuit_id;
@@ -64312,7 +64417,7 @@ var Group5 = class extends NormalComponent3 {
             const routedViaPoint = point6;
             const fromLayer = point6.from_layer;
             const toLayer = point6.to_layer;
-            db.pcb_via.insert({
+            const pcbVia = {
               pcb_trace_id: pcb_trace.pcb_trace_id,
               x: point6.x,
               y: point6.y,
@@ -64330,7 +64435,13 @@ var Group5 = class extends NormalComponent3 {
               subcircuit_id: this.subcircuit_id,
               pcb_group_id: this.pcb_group_id ?? void 0,
               subcircuit_connectivity_map_key: subcircuitConnectivityMapKey
-            });
+            };
+            if (materializedPcbVias.some(
+              (materializedPcbVia) => pcbViasSharePhysicalHole(materializedPcbVia, pcbVia)
+            )) {
+              continue;
+            }
+            materializedPcbVias.push(db.pcb_via.insert(pcbVia));
           }
         }
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1894",
+  "version": "0.0.1896",
   "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.72",
+    "@tscircuit/fanout-solver": "0.0.74",
     "@tscircuit/footprinter": "^0.0.426",
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/implicit-copper-pour-solver": "github:tscircuit/implicit-copper-pour-solver#a5cbbda0cd65fd4707c5c1af25779837c25aba92",