@tscircuit/core 0.0.1898 → 0.0.1900

package/dist/index.js

@@ -4988,7 +4988,7 @@ var Via = class extends PrimitiveComponent2 {
     const connectedNetOrTrace = this._getConnectedNetOrTrace();
     const sourceTraceId = this.source_trace_id ?? (connectedNetOrTrace instanceof Net ? void 0 : connectedNetOrTrace?.source_trace_id);
     const sourceNetId = !sourceTraceId && connectedNetOrTrace instanceof Net ? connectedNetOrTrace.source_net_id : void 0;
-    const pcb_via = db.pcb_via.insert({
+    const pcb_via3 = db.pcb_via.insert({
       x: position.x,
       y: position.y,
       hole_diameter: holeDiameter,
@@ -5003,7 +5003,7 @@ var Via = class extends PrimitiveComponent2 {
       ...sourceTraceId ? { source_trace_id: sourceTraceId } : {},
       ...sourceNetId ? { source_net_id: sourceNetId } : {}
     });
-    this.pcb_via_id = pcb_via.pcb_via_id;
+    this.pcb_via_id = pcb_via3.pcb_via_id;
   }
 };
 
@@ -5185,6 +5185,11 @@ function Trace__findConnectedPorts(trace) {
   };
 }
 
+// lib/components/primitive-components/Trace/Trace_doInitialPcbManualTraceRender.ts
+import {
+  pcb_via
+} from "circuit-json";
+
 // lib/components/primitive-components/Trace/trace-utils/compute-trace-length.ts
 function getTraceLength(route) {
   let totalLength = 0;
@@ -5495,7 +5500,7 @@ function Trace_doInitialPcbManualTraceRender(trace) {
   }
   const width = trace._getExplicitTraceThickness() ?? trace.getSubcircuit()._parsedProps.minTraceWidth ?? jlcMinTolerances.min_trace_width;
   if (inflatedPcbTraces.length > 0) {
-    const { maybeFlipLayer } = trace._getPcbPrimitiveFlippedHelpers();
+    const { isFlipped, maybeFlipLayer } = trace._getPcbPrimitiveFlippedHelpers();
     const transform2 = trace._computePcbGlobalTransformBeforeLayout();
     const insertedRoutes = [];
     const subcircuitConnectivityMapKey2 = trace.subcircuit_connectivity_map_key ?? db.source_trace.get(trace.source_trace_id)?.subcircuit_connectivity_map_key;
@@ -5541,10 +5546,11 @@ function Trace_doInitialPcbManualTraceRender(trace) {
         const point6 = transformedRoute[index];
         if (point6.route_type === "via") {
           const originalPoint = inflatedPcbTrace.route[index];
-          const inflatedPcbVia = findInflatedPcbViaForPoint(
+          const originalPcbVia = findInflatedPcbViaForPoint(
             trace._inflatedPcbVias,
             originalPoint
           );
+          const inflatedPcbVia = originalPcbVia ? pcb_via.parse(originalPcbVia) : void 0;
           const routePointViaDiameter = getViaDiameterFromRoutePoint(point6);
           const fromLayer = maybeFlipLayer(
             inflatedPcbVia?.from_layer ?? point6.from_layer
@@ -5571,7 +5577,9 @@ function Trace_doInitialPcbManualTraceRender(trace) {
             subcircuit_connectivity_map_key: inflatedPcbVia?.subcircuit_connectivity_map_key ?? subcircuitConnectivityMapKey2,
             net_is_assignable: inflatedPcbVia?.net_is_assignable,
             net_assigned: inflatedPcbVia?.net_assigned,
-            is_tented: inflatedPcbVia?.is_tented
+            // Use the same footprint flip as the route and via layers above.
+            tented_on_top: isFlipped ? inflatedPcbVia?.tented_on_bottom : inflatedPcbVia?.tented_on_top,
+            tented_on_bottom: isFlipped ? inflatedPcbVia?.tented_on_top : inflatedPcbVia?.tented_on_bottom
           });
         }
       }
@@ -8003,6 +8011,9 @@ var underscorifyPortArrangement = (portArrangement) => {
 
 // lib/utils/createComponentsFromCircuitJson.ts
 import { getUnitVectorFromDirection as getUnitVectorFromDirection2 } from "@tscircuit/math-utils";
+import {
+  pcb_via as pcb_via2
+} from "circuit-json";
 
 // lib/utils/normalizeTextForCircuitJson.ts
 function normalizeTextForCircuitJson(text) {
@@ -9455,7 +9466,10 @@ import {
 import { z as z8 } from "zod";
 var pcbViaProps = viaProps2.extend({
   layers: z8.array(layer_ref).optional(),
-  isTented: z8.boolean().optional()
+  /** @deprecated Use tentedOnTop and tentedOnBottom instead. */
+  isTented: z8.boolean().optional(),
+  tentedOnTop: z8.boolean().optional(),
+  tentedOnBottom: z8.boolean().optional()
 }).partial({
   fromLayer: true,
   toLayer: true
@@ -9514,10 +9528,17 @@ var PcbVia = class extends PrimitiveComponent2 {
   doInitialPcbPrimitiveRender() {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
-    const { holeDiameter, outerDiameter, netIsAssignable, isTented } = this._parsedProps;
+    const {
+      holeDiameter,
+      outerDiameter,
+      netIsAssignable,
+      isTented,
+      tentedOnTop,
+      tentedOnBottom
+    } = this._parsedProps;
     const subcircuit = this.getSubcircuit();
     const position = this._getGlobalPcbPositionBeforeLayout();
-    const { maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers();
+    const { isFlipped, maybeFlipLayer } = this._getPcbPrimitiveFlippedHelpers();
     const layers = this._getLayers().map(
       (layer) => maybeFlipLayer(layer)
     );
@@ -9535,7 +9556,9 @@ var PcbVia = class extends PrimitiveComponent2 {
       subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
       pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0,
       net_is_assignable: netIsAssignable,
-      is_tented: isTented
+      // Use the same footprint flip as the via layers above.
+      tented_on_top: (isFlipped ? tentedOnBottom : tentedOnTop) ?? isTented,
+      tented_on_bottom: (isFlipped ? tentedOnTop : tentedOnBottom) ?? isTented
     });
     this.pcb_via_id = pcbVia.pcb_via_id;
   }
@@ -12028,6 +12051,7 @@ var createComponentsFromCircuitJson = ({
         })
       );
     } else if (elm.type === "pcb_via") {
+      const via = pcb_via2.parse(elm);
       const layers = elm.layers ?? [];
       const pcbVia = new PcbVia({
         pcbX: elm.x,
@@ -12038,7 +12062,8 @@ var createComponentsFromCircuitJson = ({
         toLayer: elm.to_layer ?? layers[layers.length - 1],
         layers,
         netIsAssignable: elm.net_is_assignable,
-        isTented: elm.is_tented
+        tentedOnTop: via.tented_on_top,
+        tentedOnBottom: via.tented_on_bottom
       });
       pcbVia._importedPcbTraceId = elm.pcb_trace_id;
       components.push(pcbVia);
@@ -26555,6 +26580,7 @@ function normalizeFanoutPlanCorners(params) {
   if (new Set(params.plans.map((p) => p.connectionIndex)).size !== params.plans.length)
     return null;
   let plans = [...params.plans];
+  let repairedSourceCorners = false;
   if (params.repairPlaneSourceCorners || params.repairSignalSourceCorners) {
     for (let index = 0; index < plans.length; index++) {
       const plan = plans[index];
@@ -26575,8 +26601,14 @@ function normalizeFanoutPlanCorners(params) {
       );
       if (!normalized) return null;
       plans[index] = normalized;
+      repairedSourceCorners = true;
     }
   }
+  if (repairedSourceCorners && params.rematchRepairedLengths) {
+    const rematched = params.rematchRepairedLengths(plans);
+    if (!rematched) return null;
+    plans = rematched;
+  }
   const sourceNormalizedPlans = [...plans];
   const pairs3 = getDeclaredDifferentialPairs(params.inputSrj);
   for (const plan of plans) {
@@ -33338,6 +33370,90 @@ function buildOutputSimpleRouteJson(params) {
   };
 }
 
+// node_modules/@tscircuit/fanout-solver/lib/dense-boundary-routing-policy.ts
+var minimumJointBoundaryBusCount = 5;
+var maximumJointBoundaryBusCount = 40;
+var maximumJointBoundaryConnectionCount = 64;
+var minimumLargeBoundaryOnlyBusCount = 10;
+var minimumMixedRoutingPlaneBusCount = 8;
+function shouldUseJointBoundaryViaReservation(boundaryBusConnectionCounts) {
+  const boundaryBusCount = boundaryBusConnectionCounts.length;
+  const boundaryConnectionCount = boundaryBusConnectionCounts.reduce(
+    (sum, count) => sum + count,
+    0
+  );
+  return boundaryBusCount >= minimumJointBoundaryBusCount && boundaryBusCount <= maximumJointBoundaryBusCount && boundaryConnectionCount <= maximumJointBoundaryConnectionCount || boundaryBusCount === 4 && new Set(boundaryBusConnectionCounts).size > 1;
+}
+function getDenseBoundaryRoutingMode({
+  boundaryBusConnectionCounts,
+  planeBusCount
+}) {
+  const boundaryBusCount = boundaryBusConnectionCounts.length;
+  if (boundaryBusCount <= minimumLargeBoundaryOnlyBusCount - 1 && planeBusCount >= minimumMixedRoutingPlaneBusCount) {
+    return "mixed_with_planes";
+  }
+  if (boundaryBusCount >= minimumLargeBoundaryOnlyBusCount && planeBusCount === 0 && shouldUseJointBoundaryViaReservation(boundaryBusConnectionCounts)) {
+    return "large_boundary_only";
+  }
+  return null;
+}
+function getAverageBusBoundaryTargetTrack(bus) {
+  if (!bus.exitEdge) {
+    throw new Error(
+      `Cannot order boundary bus ${bus.busId} without an exit edge`
+    );
+  }
+  const boundaryDirection = getDirectionForExitEdge(bus.exitEdge);
+  return bus.connections.reduce(
+    (sum, connection) => sum + getBoundaryTargetTrack({ bus, connection, boundaryDirection }),
+    0
+  ) / bus.connections.length;
+}
+function orderDenseBoundaryBusesForRouting({
+  busesInRoutingOrder,
+  busLayerAssignments,
+  routingMode
+}) {
+  if (routingMode !== "large_boundary_only") return [...busesInRoutingOrder];
+  const singletonBuses = busesInRoutingOrder.filter(
+    (bus) => bus.connections.length === 1
+  );
+  if (new Set(singletonBuses.map((bus) => bus.exitEdge)).size !== 1) {
+    return [...busesInRoutingOrder];
+  }
+  const nonSingletonBuses = [
+    ...busesInRoutingOrder.filter((bus) => bus.connections.length >= 8).toSorted(
+      (first, second) => getAverageBusBoundaryTargetTrack(second) - getAverageBusBoundaryTargetTrack(first)
+    ),
+    ...busesInRoutingOrder.filter(
+      (bus) => bus.connections.length > 1 && bus.connections.length < 8
+    )
+  ];
+  const singletonLayerGroups = [];
+  for (const bus of singletonBuses) {
+    const targetLayer2 = busLayerAssignments[bus.busId];
+    if (!targetLayer2) {
+      throw new Error(`Cannot order boundary bus ${bus.busId} without a layer`);
+    }
+    let singletonLayerGroup = singletonLayerGroups.find(
+      (candidate) => candidate.targetLayer === targetLayer2
+    );
+    if (!singletonLayerGroup) {
+      singletonLayerGroup = { targetLayer: targetLayer2, buses: [] };
+      singletonLayerGroups.push(singletonLayerGroup);
+    }
+    singletonLayerGroup.buses.push(bus);
+  }
+  return [
+    ...nonSingletonBuses,
+    ...singletonLayerGroups.flatMap(
+      (singletonLayerGroup) => singletonLayerGroup.buses.toSorted(
+        (first, second) => getAverageBusBoundaryTargetTrack(second) - getAverageBusBoundaryTargetTrack(first)
+      )
+    )
+  ];
+}
+
 // node_modules/@tscircuit/fanout-solver/lib/source-pad-reentry.ts
 var EPSILON15 = 1e-7;
 function getSourcePadReentries(plan, clearance) {
@@ -43740,9 +43856,6 @@ function busUsesCoordinatedWinding(bus) {
     )
   );
 }
-function shouldUseJointBoundaryViaReservation(boundaryBusConnectionCounts) {
-  return boundaryBusConnectionCounts.length === 5 || boundaryBusConnectionCounts.length === 6 || boundaryBusConnectionCounts.length === 7 || boundaryBusConnectionCounts.length === 8 || boundaryBusConnectionCounts.length === 9 || boundaryBusConnectionCounts.length === 4 && new Set(boundaryBusConnectionCounts).size > 1;
-}
 function shouldDeferSingletonBoundaryViaReservation(boundaryBusConnectionCounts) {
   const boundaryBusCount = boundaryBusConnectionCounts.length;
   const singletonBusCount = boundaryBusConnectionCounts.filter(
@@ -44813,13 +44926,20 @@ var FanoutSolver = class extends BaseSolver {
     const unroutablePlaneBusIds = /* @__PURE__ */ new Set();
     let failedBoundaryBus;
     let failedWideBoundaryBus;
+    const boundaryBusConnectionCounts = boundaryBuses.map(
+      (bus) => bus.connections.length
+    );
+    const denseBoundaryRoutingMode = getDenseBoundaryRoutingMode({
+      boundaryBusConnectionCounts,
+      planeBusCount: planeBuses.length
+    });
     debugDense(
       "start",
       boundaryBuses.map((bus) => `${bus.busId}:${bus.connections.length}`),
       `planes:${planeBuses.length}`,
       `joint:${useJointBoundaryViaReservation}`
     );
-    if (boundaryBuses.length === 0 || boundaryBuses.length > 9 || 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 || denseBoundaryRoutingMode === null || 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(
@@ -44829,9 +44949,6 @@ var FanoutSolver = class extends BaseSolver {
         )
       )
     );
-    const boundaryBusConnectionCounts = boundaryBuses.map(
-      (bus) => bus.connections.length
-    );
     const singletonBoundaryBusCount = boundaryBusConnectionCounts.filter(
       (connectionCount) => connectionCount === 1
     ).length;
@@ -45132,17 +45249,21 @@ var FanoutSolver = class extends BaseSolver {
     });
     yield;
     if (seedViaPoints) {
-      const denseBoundaryBusesInRoutingOrder = [
-        ...hasForeignAllLayerObstaclesInComponent ? [] : multiLayerLeadingSingletonBuses,
-        ...boundaryBuses.filter(
-          (bus) => (hasForeignAllLayerObstaclesInComponent || !multiLayerLeadingSingletonBuses.includes(bus)) && !throughAllLeadingBuses.includes(bus)
-        ).flatMap((bus) => [
-          ...throughAllLeadingBuses.filter(
-            (candidate) => getContainingWideSourceField(candidate) === bus
-          ),
-          bus
-        ])
-      ];
+      const denseBoundaryBusesInRoutingOrder = orderDenseBoundaryBusesForRouting({
+        busesInRoutingOrder: [
+          ...hasForeignAllLayerObstaclesInComponent ? [] : multiLayerLeadingSingletonBuses,
+          ...boundaryBuses.filter(
+            (bus) => (hasForeignAllLayerObstaclesInComponent || !multiLayerLeadingSingletonBuses.includes(bus)) && !throughAllLeadingBuses.includes(bus)
+          ).flatMap((bus) => [
+            ...throughAllLeadingBuses.filter(
+              (candidate) => getContainingWideSourceField(candidate) === bus
+            ),
+            bus
+          ])
+        ],
+        busLayerAssignments: params.busLayerAssignments,
+        routingMode: denseBoundaryRoutingMode
+      });
       const allWideBusesExitDirectly = wideBoundaryBuses.every(
         (bus) => bus.exitEdge && bus.direction === getDirectionForExitEdge(bus.exitEdge)
       );
@@ -45684,7 +45805,6 @@ var FanoutSolver = class extends BaseSolver {
         debugDense("route:complete", bus.busId, busPlans.length);
         return true;
       }.bind(this);
-      const firstBoundaryBus = denseBoundaryBusesInRoutingOrder[0];
       const routedBoundaryBuses = [];
       const reserveAllPlaneDogbonesAfterFirstWideBus = (bus) => {
         if (bus.connections.length >= 8 && !useConfiguredDensePlaneRouting && !useSameNetPlaneCopperStaging && process.env.FANOUT_DEBUG_NO_PLANE_EXPANSION !== "1" && activeBoundaryReservationPlaneBuses.length < planeBuses.length) {
@@ -45692,23 +45812,32 @@ var FanoutSolver = class extends BaseSolver {
           debugDense("plane-reservations:expanded", planeBuses.length);
         }
       };
-      const firstBoundaryBusRouted = yield* routeMatchedBoundaryBusSteps(firstBoundaryBus);
-      this.setInProgressPlans({
-        phase: "route-dense-boundary-buses",
-        plans: matchedPlans,
-        strategy: "default",
-        unitIndex: ++denseWorkUnitIndex,
-        unitCount: denseWorkUnitCount,
-        busId: firstBoundaryBus.busId
-      });
-      yield;
-      if (firstBoundaryBusRouted) {
+      const firstBoundaryCandidates = denseBoundaryRoutingMode === "large_boundary_only" ? denseBoundaryBusesInRoutingOrder : denseBoundaryBusesInRoutingOrder.slice(0, 1);
+      let firstBoundaryBus;
+      for (const candidate of firstBoundaryCandidates) {
+        const candidateRouted = yield* routeMatchedBoundaryBusSteps(candidate);
+        this.setInProgressPlans({
+          phase: "route-dense-boundary-buses",
+          plans: matchedPlans,
+          strategy: "default",
+          unitIndex: ++denseWorkUnitIndex,
+          unitCount: denseWorkUnitCount,
+          busId: candidate.busId
+        });
+        yield;
+        if (!candidateRouted) continue;
+        firstBoundaryBus = candidate;
+        break;
+      }
+      if (firstBoundaryBus) {
         routedBoundaryBuses.push(firstBoundaryBus);
         reserveAllPlaneDogbonesAfterFirstWideBus(firstBoundaryBus);
       } else {
         matchedRoutingSucceeded = false;
       }
-      const remainingBoundaryBuses = denseBoundaryBusesInRoutingOrder.slice(1);
+      const remainingBoundaryBuses = denseBoundaryBusesInRoutingOrder.filter(
+        (bus) => bus !== firstBoundaryBus
+      );
       while (matchedRoutingSucceeded && remainingBoundaryBuses.length > 0) {
         const blockingSegments = matchedPlans.flatMap(
           (plan) => plan.segments.map((segment2) => ({
@@ -61704,7 +61833,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1897",
+  version: "0.0.1899",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -61744,7 +61873,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.75",
+    "@tscircuit/fanout-solver": "0.0.76",
     "@tscircuit/footprinter": "^0.0.426",
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/implicit-copper-pour-solver": "github:tscircuit/implicit-copper-pour-solver#a5cbbda0cd65fd4707c5c1af25779837c25aba92",
@@ -61757,7 +61886,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.20",
-    "@tscircuit/props": "^0.0.649",
+    "@tscircuit/props": "^0.0.653",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.191",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -61773,7 +61902,7 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.484",
+    "circuit-json": "^0.0.487",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.30",
     "circuit-json-to-gltf": "^0.0.124",
@@ -61836,8 +61965,8 @@ var package_default = {
   },
   overrides: {
     "@tscircuit/circuit-json-util": "^0.0.113",
-    "@tscircuit/props": "^0.0.649",
-    "circuit-json": "^0.0.484"
+    "@tscircuit/props": "^0.0.653",
+    "circuit-json": "^0.0.487"
   }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1898",
+  "version": "0.0.1900",
   "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.75",
+    "@tscircuit/fanout-solver": "0.0.76",
     "@tscircuit/footprinter": "^0.0.426",
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/implicit-copper-pour-solver": "github:tscircuit/implicit-copper-pour-solver#a5cbbda0cd65fd4707c5c1af25779837c25aba92",
@@ -54,7 +54,7 @@
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.20",
-    "@tscircuit/props": "^0.0.649",
+    "@tscircuit/props": "^0.0.653",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.191",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -70,7 +70,7 @@
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.484",
+    "circuit-json": "^0.0.487",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.30",
     "circuit-json-to-gltf": "^0.0.124",
@@ -133,7 +133,7 @@
   },
   "overrides": {
     "@tscircuit/circuit-json-util": "^0.0.113",
-    "@tscircuit/props": "^0.0.649",
-    "circuit-json": "^0.0.484"
+    "@tscircuit/props": "^0.0.653",
+    "circuit-json": "^0.0.487"
   }
 }