@tscircuit/core 0.0.1910 → 0.0.1911

package/dist/index.js

@@ -29210,6 +29210,7 @@ var BoundaryTerminalCopper = class {
 import {
   PortfolioSingleIntraNodeSolver
 } from "@tscircuit/capacity-autorouter";
+import { BaseSolver } from "@tscircuit/solver-utils";
 
 // node_modules/@tscircuit/fanout-solver/lib/cache-via-occupant-neighborhoods.ts
 function cacheViaOccupantNeighborhoods(router) {
@@ -29465,6 +29466,57 @@ function attachSourceOriginTransitSearch(router, requiresTransit, topZ, minimumV
 function getBusTargetLayer(params, busId) {
   return params.targetLayerByBusId?.get(busId) ?? params.targetLayer;
 }
+var BatchedReservedViaRoutingSolver = class extends BaseSolver {
+  constructor(options) {
+    super();
+    this.options = options;
+    this.activeSubSolver = options.router;
+    this.MAX_ITERATIONS = Math.ceil(options.router.MAX_ITERATIONS / 5e3) + 1;
+  }
+  options;
+  partialCandidates = [];
+  partialSignatures = /* @__PURE__ */ new Set();
+  _step() {
+    const { router } = this.options;
+    for (let batch = 0; batch < 5e3 && !router.solved && !router.failed; batch++)
+      router.step();
+    this.collectPartialCandidate();
+    this.stats = {
+      iterations: router.iterations,
+      routedConnectionCount: router.getSolvedRouteCount(),
+      connectionCount: this.options.connectionCount
+    };
+    if (router.solved || router.failed) {
+      this.activeSubSolver = null;
+      this.solved = true;
+    }
+  }
+  collectPartialCandidate() {
+    const { router, connectionCount, sourceOrigin, maximumPartialCandidates } = this.options;
+    if (maximumPartialCandidates === 0 || connectionCount < (sourceOrigin ? 2 : 3) || router.getSolvedRouteCount() !== connectionCount - 1)
+      return;
+    const output = router.getOutput();
+    const signature = output.map((route) => {
+      const middle = route.route[Math.floor(route.route.length / 2)];
+      return `${route.connectionName}:${route.route.length}:${middle.x},${middle.y}`;
+    }).sort().join(";");
+    if (this.partialSignatures.has(signature) || sourceOrigin && this.partialCandidates.length >= maximumPartialCandidates)
+      return;
+    this.partialSignatures.add(signature);
+    this.partialCandidates.push(output);
+    if (this.partialCandidates.length > maximumPartialCandidates)
+      this.partialCandidates.shift();
+  }
+  computeProgress() {
+    return this.options.router.iterations / this.options.router.MAX_ITERATIONS;
+  }
+  getConstructorParams() {
+    return [this.options];
+  }
+  visualize() {
+    return this.activeSubSolver?.visualize() ?? this.options.router.visualize();
+  }
+};
 var CopperIndex = class _CopperIndex {
   constructor(cellSize, margin) {
     this.cellSize = cellSize;
@@ -30288,32 +30340,30 @@ function* routeReservedViaBusesWorker(params, validatedTerminalSplices) {
     if (sourceOrigin && !isVia && layer === "top" && router._moveCost >= 0 && (!transitSearch || transitSearch.beforeFirstVia()))
       router._moveCost += baseCost * (sourceTravelCost - 1);
   };
-  const partialCandidates = [];
-  const partialSignatures = /* @__PURE__ */ new Set();
   const maximumPartialCandidates = sourceOrigin ? maximumSourceOriginRepairAttempts : maximumLocalRepairAttempts;
-  while (!router.solved && !router.failed) {
-    for (let batch = 0; batch < 5e3 && !router.solved && !router.failed; batch++)
-      router.step();
-    const routedConnectionCount = router.getSolvedRouteCount();
-    if (maximumPartialCandidates > 0 && connections.length >= (sourceOrigin ? 2 : 3) && routedConnectionCount === connections.length - 1) {
-      const output = router.getOutput();
-      const signature = output.map((route) => {
-        const middle = route.route[Math.floor(route.route.length / 2)];
-        return `${route.connectionName}:${route.route.length}:${middle.x},${middle.y}`;
-      }).sort().join(";");
-      if (!partialSignatures.has(signature) && (!sourceOrigin || partialCandidates.length < maximumPartialCandidates)) {
-        partialSignatures.add(signature);
-        partialCandidates.push(output);
-        if (partialCandidates.length > maximumPartialCandidates)
-          partialCandidates.shift();
-      }
-    }
+  router.setup();
+  const routingSolver = new BatchedReservedViaRoutingSolver({
+    router,
+    connectionCount: connections.length,
+    sourceOrigin,
+    maximumPartialCandidates
+  });
+  yield {
+    type: "subsolver",
+    solver: routingSolver,
+    iterations: router.iterations,
+    routedConnectionCount: router.getSolvedRouteCount(),
+    connectionCount: connections.length
+  };
+  while (!routingSolver.solved && !routingSolver.failed) {
+    routingSolver.step();
     yield {
       iterations: router.iterations,
-      routedConnectionCount,
+      routedConnectionCount: router.getSolvedRouteCount(),
       connectionCount: connections.length
     };
   }
+  const { partialCandidates } = routingSolver;
   const makePrefixes = (routed) => allBuses.flatMap(
     (bus) => bus.connections.filter((connection) => !routed.has(connection.connectionIndex)).map((connection) => {
       const viaPoint = params.fixedViaPointsByConnectionIndex.get(
@@ -32699,6 +32749,12 @@ function* rerouteSourceOriginLengthsSteps(params) {
   return null;
 }
 
+// node_modules/@tscircuit/fanout-solver/lib/subsolver-request.ts
+import { BaseSolver as BaseSolver2 } from "@tscircuit/solver-utils";
+function isSubsolverRequest(request) {
+  return typeof request === "object" && request !== null && "type" in request && request.type === "subsolver" && "solver" in request && request.solver instanceof BaseSolver2;
+}
+
 // node_modules/@tscircuit/fanout-solver/lib/route-peripheral-buses.ts
 function* routePeripheralBusesSteps(params) {
   const { srj, buses, layerNames } = params;
@@ -32755,6 +32811,11 @@ function* routePeripheralBusesSteps(params) {
   });
   let step = routing.next();
   while (!step.done) {
+    if (isSubsolverRequest(step.value)) {
+      const output = yield step.value;
+      step = routing.next(output);
+      continue;
+    }
     yield {
       phase: "route-layer",
       iterations: step.value.iterations,
@@ -32879,7 +32940,7 @@ function* routePeripheralBusesSteps(params) {
 }
 
 // node_modules/@tscircuit/fanout-solver/lib/fanout-solver.ts
-import { BaseSolver } from "@tscircuit/solver-utils";
+import { BaseSolver as BaseSolver3 } from "@tscircuit/solver-utils";
 
 // node_modules/@tscircuit/fanout-solver/lib/select-compatible-candidates.ts
 function selectCompatibleCandidates(params) {
@@ -39901,6 +39962,11 @@ function* routeLayerReservedAttemptSteps(params, attemptState, attemptedWideSour
       })();
       let next = steps.next();
       while (!next.done) {
+        if (isSubsolverRequest(next.value)) {
+          const output = yield next.value;
+          next = steps.next(output);
+          continue;
+        }
         yield {
           phase: "route-layer",
           layer,
@@ -40109,6 +40175,11 @@ function* routeLayerReservedAttemptSteps(params, attemptState, attemptedWideSour
         });
         let replacement = replacementSteps.next();
         while (!replacement.done) {
+          if (isSubsolverRequest(replacement.value)) {
+            const output = yield replacement.value;
+            replacement = replacementSteps.next(output);
+            continue;
+          }
           yield {
             phase: "repair-lengths",
             layer,
@@ -43422,7 +43493,7 @@ function visualizeSimpleRouteJson(srj) {
 
 // node_modules/@tscircuit/fanout-solver/lib/fanout-solver.ts
 var process = getRuntimeProcess(globalThis);
-var FanoutWorkSolver = class extends BaseSolver {
+var FanoutWorkSolver = class extends BaseSolver3 {
   constructor(solverName, generator, getVisualization, getStats, getProgress) {
     super();
     this.solverName = solverName;
@@ -43472,10 +43543,8 @@ var FanoutWorkSolver = class extends BaseSolver {
       this.solved = true;
       return;
     }
-    const yielded = result.value;
-    if (yielded?.type === "subsolver" && yielded.solver instanceof BaseSolver) {
-      this.activeSubSolver = yielded.solver;
-    }
+    if (isSubsolverRequest(result.value))
+      this.activeSubSolver = result.value.solver;
   }
   computeProgress() {
     return this.getProgress();
@@ -43979,7 +44048,7 @@ function getCandidateEscapeLayersForBus(params) {
   const candidateLayers = individuallyRoutableLayers.length > 0 ? individuallyRoutableLayers : allowedEscapeLayers;
   return candidateLayers;
 }
-var FanoutSolver = class extends BaseSolver {
+var FanoutSolver = class extends BaseSolver3 {
   constructor(inputSrj, options = {}) {
     super();
     this.inputSrj = inputSrj;
@@ -44131,6 +44200,19 @@ var FanoutSolver = class extends BaseSolver {
     const steps = peripheralRouting ? routePeripheralBusesSteps(params) : routeLayerReservedBusesSteps(params);
     let next = steps.next();
     while (!next.done) {
+      if (isSubsolverRequest(next.value)) {
+        this.stats = {
+          ...this.stats,
+          phase: "layer-reserved-route-layer",
+          workUnit: next.value.routedConnectionCount,
+          workUnitCount: this.inputSrj.connections.length,
+          routedConnections: `${next.value.routedConnectionCount}/${this.inputSrj.connections.length}`,
+          routingIterations: next.value.iterations
+        };
+        const output = yield next.value;
+        next = steps.next(output);
+        continue;
+      }
       this.stats = {
         ...this.stats,
         phase: `layer-reserved-${next.value.phase}`,
@@ -49211,7 +49293,7 @@ import { CreateFdmEnclosureSolver } from "@tscircuit/create-fdm-enclosure";
 // node_modules/@tscircuit/implicit-copper-pour-solver/lib/implicit-copper-pour-pipeline-solver.ts
 import {
   BasePipelineSolver,
-  BaseSolver as BaseSolver2,
+  BaseSolver as BaseSolver4,
   definePipelineStep
 } from "@tscircuit/solver-utils";
 
@@ -50851,7 +50933,7 @@ var mergeSolverGraphics = (source, overlay) => {
 };
 
 // node_modules/@tscircuit/implicit-copper-pour-solver/lib/implicit-copper-pour-pipeline-solver.ts
-var PrepareCircuitJsonSolver = class extends BaseSolver2 {
+var PrepareCircuitJsonSolver = class extends BaseSolver4 {
   constructor(input) {
     super();
     this.input = input;
@@ -50867,7 +50949,7 @@ var PrepareCircuitJsonSolver = class extends BaseSolver2 {
     return this.output;
   }
 };
-var AssignGridCellsSolver = class extends BaseSolver2 {
+var AssignGridCellsSolver = class extends BaseSolver4 {
   constructor(input) {
     super();
     this.input = input;
@@ -50890,7 +50972,7 @@ var AssignGridCellsSolver = class extends BaseSolver2 {
     return this.output;
   }
 };
-var TracePowerPolygonsSolver = class extends BaseSolver2 {
+var TracePowerPolygonsSolver = class extends BaseSolver4 {
   constructor(input) {
     super();
     this.input = input;
@@ -50926,7 +51008,7 @@ var TracePowerPolygonsSolver = class extends BaseSolver2 {
     };
   }
 };
-var SimplifyPolygonEdgesSolver = class extends BaseSolver2 {
+var SimplifyPolygonEdgesSolver = class extends BaseSolver4 {
   constructor(input) {
     super();
     this.input = input;
@@ -51064,7 +51146,7 @@ import { LayoutPipelineSolver } from "@tscircuit/matchpack";
 import { SchematicTracePipelineSolver } from "@tscircuit/schematic-trace-solver";
 
 // node_modules/@tscircuit/via-stitch-solver/lib/solvers/ViaStitchSolver.ts
-import { BaseSolver as BaseSolver3 } from "@tscircuit/solver-utils";
+import { BaseSolver as BaseSolver5 } from "@tscircuit/solver-utils";
 
 // node_modules/@tscircuit/via-stitch-solver/lib/geometry/brep-point-containment.ts
 var POINT_EPSILON = 1e-8;
@@ -51391,7 +51473,7 @@ var getGridCoordinates = ({
   }
   return coordinates;
 };
-var ViaStitchSolver = class extends BaseSolver3 {
+var ViaStitchSolver = class extends BaseSolver5 {
   constructor(input) {
     super();
     this.input = input;
@@ -62028,7 +62110,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1909",
+  version: "0.0.1910",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -62068,7 +62150,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.76",
+    "@tscircuit/fanout-solver": "0.0.78",
     "@tscircuit/footprinter": "^0.0.426",
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/implicit-copper-pour-solver": "github:tscircuit/implicit-copper-pour-solver#a5cbbda0cd65fd4707c5c1af25779837c25aba92",
@@ -71946,7 +72028,7 @@ var validateWindingBreakoutInput = (input) => {
 };
 
 // node_modules/@tscircuit/winding-breakout-point-solver/lib/solvers/GatePlacementSolver.ts
-import { BaseSolver as BaseSolver4 } from "@tscircuit/solver-utils";
+import { BaseSolver as BaseSolver6 } from "@tscircuit/solver-utils";
 
 // node_modules/@tscircuit/winding-breakout-point-solver/lib/gate-placement/place-breakout-gates.ts
 var GEOMETRY_EPSILON = 1e-9;
@@ -72476,7 +72558,7 @@ var getSharedGateSlotCount = (points) => new Set(
     (point6) => `${point6.regionId}:${point6.x.toFixed(9)}:${point6.y.toFixed(9)}`
   )
 ).size;
-var GatePlacementSolver = class extends BaseSolver4 {
+var GatePlacementSolver = class extends BaseSolver6 {
   constructor(params) {
     super();
     this.params = params;
@@ -72615,7 +72697,7 @@ var GatePlacementSolver = class extends BaseSolver4 {
 };
 
 // node_modules/@tscircuit/winding-breakout-point-solver/lib/solvers/ReferenceOrderingSolver.ts
-import { BaseSolver as BaseSolver5 } from "@tscircuit/solver-utils";
+import { BaseSolver as BaseSolver7 } from "@tscircuit/solver-utils";
 
 // node_modules/@tscircuit/winding-breakout-point-solver/lib/ordering/get-natural-winding-order.ts
 var getNaturalWindingOrder = (region, connections) => connections.map((connection) => {
@@ -72682,7 +72764,7 @@ var getReferenceWindingOrder = (naturalOrder, atomicGroups, buses) => {
 };
 
 // node_modules/@tscircuit/winding-breakout-point-solver/lib/solvers/ReferenceOrderingSolver.ts
-var ReferenceOrderingSolver = class extends BaseSolver5 {
+var ReferenceOrderingSolver = class extends BaseSolver7 {
   constructor(params) {
     super();
     this.params = params;

package/package.json

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