@tscircuit/core 0.0.2301 → 0.0.2303

package/dist/index.js

@@ -70671,11 +70671,14 @@ function extractTraceCopper3(trace, layerNames) {
         type: "via",
         center: { x: routePoint.x, y: routePoint.y },
         diameter: routePoint.via_diameter ?? 0,
-        layers: getLayerSpan3(
-          routePoint.from_layer,
-          routePoint.to_layer,
-          layerNames
-        )
+        layers: getRouteViaSpanLayers3({
+          fromLayer: routePoint.from_layer,
+          toLayer: routePoint.to_layer,
+          layers: "layers" in routePoint && Array.isArray(routePoint.layers) ? routePoint.layers : void 0,
+          layerNames,
+          // Preserve endpoint-derived spans when physical metadata is absent.
+          allowBlindAndBuriedVias: true
+        })
       });
       previousWire = void 0;
       continue;
@@ -85524,7 +85527,12 @@ function routeAlternateSignalDogbones(input, options, attempt) {
     },
     connections: input.connections.map((c2) => ({
       ...c2,
-      pointsToConnect: c2.pointsToConnect.map((p2) => rotate22(p2, turns))
+      pointsToConnect: c2.pointsToConnect.map((p2) => {
+        const point52 = rotate22(p2, turns);
+        if (!point52.layers) return point52;
+        const { layer: _layer, ...handoff } = point52;
+        return handoff;
+      })
     })),
     obstacles: input.obstacles.map((o2) => ({
       ...o2,
@@ -88295,7 +88303,7 @@ function initialSignalDogbones(input, options, attempt) {
       throw error;
     const targets = new Map(options.targetLayers);
     const available = (c2, layer) => (!input.allowedLayers || input.allowedLayers.includes(layer)) && c2.pointsToConnect.every(
-      (p2) => p2.layer === layer && isUnroutedComponentPad(input, c2, p2)
+      (p2) => (p2.layers ?? [p2.layer]).includes(layer) && (p2.layers !== void 0 || isUnroutedComponentPad(input, c2, p2))
     ) && (input.buses ?? []).every(
       (b2) => !b2.connectionNames.includes(c2.name) || !b2.allowedLayers || b2.allowedLayers.includes(layer)
     );
@@ -88438,6 +88446,7 @@ function* routeMultiTerminalBuses(input, options) {
     }).sort((a2, b2) => b2.padCount - a2.padCount).map(({ terminal }) => terminal)
   }));
   const completed = [];
+  const physicalLayers = getCopperLayerNames3(input.layerCount);
   let groups = [
     connections.map((connection) => ({
       ...connection,
@@ -88464,8 +88473,6 @@ function* routeMultiTerminalBuses(input, options) {
           (pair) => pair.connectionNames.every((name) => names.has(name))
         )
       };
-      if (terminalIndex > 1)
-        request.allowedLayers = [group[0].pointsToConnect[1].layer];
       const solver = new BusLanesPipelineSolver(request, options);
       while (!solver.solved && !solver.failed) {
         solver.step();
@@ -88486,18 +88493,36 @@ function* routeMultiTerminalBuses(input, options) {
       if (!terminal) continue;
       if (!effectiveCarrierLayers(input, connection).includes(terminal.layer))
         throw Error("No permitted surface layer for a multi-terminal branch");
-      const attachments = completed.filter((trace) => trace.connection_name === connection.name).flatMap(
-        (trace) => trace.route.flatMap((point52) => {
-          if (point52.route_type === "wire" && point52.layer === terminal.layer)
-            return [point52];
-          if (point52.route_type === "via" && (point52.layers?.includes(terminal.layer) || point52.from_layer === terminal.layer || point52.to_layer === terminal.layer))
-            return [{ x: point52.x, y: point52.y, layer: terminal.layer }];
-          return [];
-        })
-      );
-      attachments.sort(
-        (a2, b2) => Math.hypot(a2.x - terminal.x, a2.y - terminal.y) - Math.hypot(b2.x - terminal.x, b2.y - terminal.y)
-      );
+      const attachments = completed.filter((trace) => trace.connection_name === connection.name).flatMap((trace) => {
+        const vias = trace.route.flatMap((point52) => {
+          if (point52.route_type !== "via") return [];
+          const layers = getRouteViaSpanLayers3({
+            fromLayer: point52.from_layer,
+            toLayer: point52.to_layer,
+            layers: point52.layers,
+            layerNames: physicalLayers,
+            allowBlindAndBuriedVias: input.allowBlindAndBuriedVias ?? false
+          });
+          if (!layers.includes(terminal.layer)) return [];
+          return [{ x: point52.x, y: point52.y, layer: terminal.layer, layers }];
+        });
+        return [
+          ...vias,
+          ...trace.route.flatMap(
+            (point52) => point52.route_type === "wire" && point52.layer === terminal.layer ? [point52] : []
+          )
+        ];
+      });
+      const carrierLayers = effectiveCarrierLayers(input, connection);
+      attachments.sort((a2, b2) => {
+        const reachesAnotherCarrierA = !!a2.layers?.some(
+          (layer) => layer !== terminal.layer && carrierLayers.includes(layer)
+        );
+        const reachesAnotherCarrierB = !!b2.layers?.some(
+          (layer) => layer !== terminal.layer && carrierLayers.includes(layer)
+        );
+        return Number(reachesAnotherCarrierB) - Number(reachesAnotherCarrierA) || Math.hypot(a2.x - terminal.x, a2.y - terminal.y) - Math.hypot(b2.x - terminal.x, b2.y - terminal.y);
+      });
       if (!attachments.length)
         throw Error("No routed copper for a multi-terminal branch");
       const branch = {
@@ -115364,16 +115389,18 @@ function* expandedSignalSites({
   );
   for (const end of [0, 1]) {
     const pad = connection.pointsToConnect[end];
-    if (pad.layer === targetLayer2) {
+    if ((pad.layers ?? [pad.layer]).includes(targetLayer2)) {
+      const { layers: _layers, ...fixedPad } = pad;
+      const point52 = { ...fixedPad, layer: targetLayer2 };
       ends[end].push({
-        point: pad,
+        point: point52,
         length: 0,
         escape: {
           type: "pcb_trace",
           pcb_trace_id: `expanded_surface_${connection.name}_${end}`,
           connection_name: connection.name,
           source_trace_id: connection.source_trace_id ?? connection.name,
-          route: [{ ...pad, route_type: "wire", width }]
+          route: [{ ...point52, route_type: "wire", width }]
         }
       });
       continue;
@@ -116914,9 +116941,12 @@ function* negotiateSignalSites(state, remove, stopWithOneRemaining = false, expa
     const carrierLayers = signalLayers(native, connection);
     for (let end = 0; end < 2; end++) {
       const point52 = connection.pointsToConnect[end];
-      if (carrierLayers.includes(point52.layer))
+      for (const layer of carrierLayers) {
+        if (!(point52.layers ?? [point52.layer]).includes(layer)) continue;
+        const { layers: _layers, ...fixedPoint } = point52;
+        const handoff = { ...fixedPoint, layer };
         ends[end].push({
-          point: point52,
+          point: handoff,
           escape: {
             type: "pcb_trace",
             pcb_trace_id: `local_surface_${connection.name}_${end}`,
@@ -116924,14 +116954,14 @@ function* negotiateSignalSites(state, remove, stopWithOneRemaining = false, expa
             source_trace_id: connection.source_trace_id ?? connection.name,
             route: [
               {
-                ...point52,
+                ...handoff,
                 route_type: "wire",
-                layer: point52.layer,
                 width: signalWidth(native, connection)
               }
             ]
           }
         });
+      }
     }
     for (let variant = 0; variant < 4; variant++) {
       try {
@@ -122829,6 +122859,29 @@ var BusLanesPipelineSolver = class extends BaseSolver9 {
       this.phase = "native_pair_approaches";
     }
   }
+  isNegotiableTerminal(connection, point52) {
+    if (isUnroutedComponentPad(this.routingInput, connection, point52))
+      return true;
+    if (!point52.layers?.length || !point52.layers.includes(point52.layer))
+      return false;
+    const physical = getCopperLayerNames3(this.routingInput.layerCount);
+    return !!this.routingInput.traces?.some(
+      (trace) => (trace.connection_name === connection.name || connection.source_trace_id !== void 0 && trace.source_trace_id === connection.source_trace_id) && trace.route.some((via) => {
+        if (via.route_type !== "via" || Math.hypot(via.x - point52.x, via.y - point52.y) > 1e-8)
+          return false;
+        const span = getRouteViaSpanLayers3({
+          fromLayer: via.from_layer,
+          toLayer: via.to_layer,
+          layers: via.layers,
+          layerNames: physical,
+          allowBlindAndBuriedVias: this.routingInput.allowBlindAndBuriedVias ?? false
+        });
+        return point52.layers.every(
+          (layer) => physical.includes(layer) && span.includes(layer)
+        );
+      })
+    );
+  }
   getConstructorParams() {
     return [this.input, this.options];
   }
@@ -123148,8 +123201,10 @@ var BusLanesPipelineSolver = class extends BaseSolver9 {
       )
     );
     this.canNegotiateGeneratedSites = !!(usedNativeFallback && this.routingInput.traces?.length && this.options.denseSearch && this.options.smoothTuning && !this.routingInput.differentialPairs?.length && this.routingInput.connections.every(
-      (connection) => connection.pointsToConnect.every(
+      (connection) => connection.pointsToConnect.some(
         (point52) => isUnroutedComponentPad(this.routingInput, connection, point52)
+      ) && connection.pointsToConnect.every(
+        (point52) => this.isNegotiableTerminal(connection, point52)
       )
     ));
     const terminalLayers = /* @__PURE__ */ new Map();
@@ -159305,7 +159360,7 @@ var RoutingPhasePreparationError = class extends Error {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.2300",
+  version: "0.0.2302",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -159343,13 +159398,13 @@ var package_default = {
     "@tsci/tscircuit.ti": "github:tscircuit/ti#57e314be4b2b06bc546d4def7453e619604d1157",
     "@tscircuit/alphabet": "0.0.25",
     "@tscircuit/bga-fanout-solver": "github:tscircuit/bga-fanout-solver#247c835cb8d69b65e53891dcf869731079415b39",
-    "@tscircuit/bus-lanes-solver": "https://jscdn.tscircuit.com/@tscircuit/bus-lanes-solver/0.0.48.tgz",
+    "@tscircuit/bus-lanes-solver": "https://jscdn.tscircuit.com/@tscircuit/bus-lanes-solver/0.0.49.tgz",
     "@tscircuit/cableprinter": "^0.0.6",
-    "@tscircuit/capacity-autorouter": "^0.0.1059",
+    "@tscircuit/capacity-autorouter": "^0.0.1060",
     "@tscircuit/checks": "^0.0.270",
     "@tscircuit/circuit-json-util": "^0.0.128",
     "@tscircuit/common": "^0.0.20",
-    "@tscircuit/copper-pour-solver": "^0.0.67",
+    "@tscircuit/copper-pour-solver": "^0.0.72",
     "@tscircuit/create-fdm-enclosure": "0.0.4",
     "@tscircuit/dogbone-solver": "https://jscdn.tscircuit.com/@tscircuit/dogbone-solver/0.0.1.tgz",
     "@tscircuit/fanout-solver": "0.0.81",
@@ -171617,6 +171672,7 @@ var renderAllCopperPoursForSubcircuit = async (subcircuit) => {
       const { _parsedProps: props } = copperPour;
       const clearance = props.clearance ?? 0.2;
       return {
+        pcb_board_id: pcbBoard?.pcb_board_id,
         layer: props.layer,
         crosshatch: props.crosshatch,
         crosshatchPitch: props.crosshatchPitch,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.2301",
+  "version": "0.0.2303",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -39,13 +39,13 @@
     "@tsci/tscircuit.ti": "github:tscircuit/ti#57e314be4b2b06bc546d4def7453e619604d1157",
     "@tscircuit/alphabet": "0.0.25",
     "@tscircuit/bga-fanout-solver": "github:tscircuit/bga-fanout-solver#247c835cb8d69b65e53891dcf869731079415b39",
-    "@tscircuit/bus-lanes-solver": "https://jscdn.tscircuit.com/@tscircuit/bus-lanes-solver/0.0.48.tgz",
+    "@tscircuit/bus-lanes-solver": "https://jscdn.tscircuit.com/@tscircuit/bus-lanes-solver/0.0.49.tgz",
     "@tscircuit/cableprinter": "^0.0.6",
-    "@tscircuit/capacity-autorouter": "^0.0.1059",
+    "@tscircuit/capacity-autorouter": "^0.0.1060",
     "@tscircuit/checks": "^0.0.270",
     "@tscircuit/circuit-json-util": "^0.0.128",
     "@tscircuit/common": "^0.0.20",
-    "@tscircuit/copper-pour-solver": "^0.0.67",
+    "@tscircuit/copper-pour-solver": "^0.0.72",
     "@tscircuit/create-fdm-enclosure": "0.0.4",
     "@tscircuit/dogbone-solver": "https://jscdn.tscircuit.com/@tscircuit/dogbone-solver/0.0.1.tgz",
     "@tscircuit/fanout-solver": "0.0.81",