@tscircuit/core 0.0.1460 → 0.0.1461

package/dist/index.js

@@ -173,14 +173,18 @@ var computeObstacleBounds = (obstacles) => {
 };
 
 // lib/utils/autorouting/findPossibleTraceLayerCombinations.ts
-var LAYER_SELECTION_PREFERENCE = ["top", "bottom", "inner1", "inner2"];
-var findPossibleTraceLayerCombinations = (hints, layer_path = []) => {
+var DEFAULT_LAYER_SELECTION_PREFERENCE = ["top", "bottom", "inner1", "inner2"];
+var findPossibleTraceLayerCombinationsRecursive = (hints, layerSelectionPreference, layer_path) => {
   const candidates = [];
   if (layer_path.length === 0) {
     const starting_layers = hints[0].layers;
     for (const layer of starting_layers) {
       candidates.push(
-        ...findPossibleTraceLayerCombinations(hints.slice(1), [layer])
+        ...findPossibleTraceLayerCombinationsRecursive(
+          hints.slice(1),
+          layerSelectionPreference,
+          [layer]
+        )
       );
     }
     return candidates;
@@ -207,24 +211,31 @@ var findPossibleTraceLayerCombinations = (hints, layer_path = []) => {
         return [];
       }
     }
-    return findPossibleTraceLayerCombinations(
+    return findPossibleTraceLayerCombinationsRecursive(
       hints.slice(1),
+      layerSelectionPreference,
       layer_path.concat([last_layer])
     );
   }
-  const candidate_next_layers = (current_hint.optional_via ? LAYER_SELECTION_PREFERENCE : LAYER_SELECTION_PREFERENCE.filter((layer) => layer !== last_layer)).filter(
+  const candidate_next_layers = (current_hint.optional_via ? layerSelectionPreference : layerSelectionPreference.filter((layer) => layer !== last_layer)).filter(
     (layer) => !current_hint.layers || current_hint.layers?.includes(layer)
   );
   for (const candidate_next_layer of candidate_next_layers) {
     candidates.push(
-      ...findPossibleTraceLayerCombinations(
+      ...findPossibleTraceLayerCombinationsRecursive(
         hints.slice(1),
+        layerSelectionPreference,
         layer_path.concat(candidate_next_layer)
       )
     );
   }
   return candidates;
 };
+var findPossibleTraceLayerCombinations = (hints, options = {}) => findPossibleTraceLayerCombinationsRecursive(
+  hints,
+  options.layerSelectionPreference ?? DEFAULT_LAYER_SELECTION_PREFERENCE,
+  []
+);
 
 // lib/utils/autorouting/getDominantDirection.ts
 function getDominantDirection(edge) {
@@ -2554,6 +2565,41 @@ var isRouteOutsideBoard = ({
   );
 };
 
+// lib/utils/getViaSpanLayers.ts
+var getViaSpanLayers = ({
+  fromLayer,
+  toLayer,
+  layerCount
+}) => {
+  if (fromLayer === toLayer) return [fromLayer];
+  const stack = ["top"];
+  for (let i = 1; i <= layerCount - 2; i++) {
+    stack.push(`inner${i}`);
+  }
+  stack.push("bottom");
+  const fromIndex = stack.indexOf(fromLayer);
+  const toIndex = stack.indexOf(toLayer);
+  if (fromIndex === -1 || toIndex === -1) return [fromLayer, toLayer];
+  return fromIndex <= toIndex ? stack.slice(fromIndex, toIndex + 1) : stack.slice(toIndex, fromIndex + 1).reverse();
+};
+var getViaBoardLayers = (layerCount) => {
+  if (layerCount <= 1) return ["top"];
+  return getViaSpanLayers({
+    fromLayer: "top",
+    toLayer: "bottom",
+    layerCount
+  });
+};
+var getBoardAvailableLayers = (layerCount) => {
+  const physicalLayerStack = getViaBoardLayers(layerCount);
+  if (physicalLayerStack.length <= 1) return physicalLayerStack;
+  return [
+    physicalLayerStack[0],
+    physicalLayerStack[physicalLayerStack.length - 1],
+    ...physicalLayerStack.slice(1, -1)
+  ];
+};
+
 // lib/utils/obstacles/fillCircleWithRects.ts
 function fillCircleWithRects(circle, options = {}) {
   const { center, radius } = circle;
@@ -2703,7 +2749,6 @@ var getObstaclesFromRoute = (route, source_trace_id, { viaDiameter = 0.5 } = {})
 };
 
 // lib/utils/obstacles/getObstaclesFromCircuitJson.ts
-var EVERY_LAYER = ["top", "inner1", "inner2", "bottom"];
 var QUARTER_TURN_TOLERANCE_DEGREES = 0.01;
 var getAxisAlignedRectFromRotatedRect = (rotatedRect) => {
   const normalizedRotation = (rotatedRect.rotation % 360 + 360) % 360;
@@ -2724,6 +2769,8 @@ var getAxisAlignedRectFromRotatedRect = (rotatedRect) => {
   return null;
 };
 var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
+  const board = circuitJson.find((element) => element.type === "pcb_board");
+  const everyLayer = getViaBoardLayers(board?.num_layers ?? 4);
   const withNetId = (idList) => connMap ? idList.concat(
     idList.map((id) => connMap?.getNetConnectedToId(id)).filter(Boolean)
   ) : idList;
@@ -2852,7 +2899,7 @@ var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
         obstacles.push({
           componentId: pcbComponentId,
           type: "rect",
-          layers: EVERY_LAYER,
+          layers: everyLayer,
           center: {
             x: element.center.x,
             y: element.center.y
@@ -2873,7 +2920,7 @@ var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
           obstacles.push({
             componentId: pcbComponentId,
             type: "rect",
-            layers: EVERY_LAYER,
+            layers: everyLayer,
             center: rect.center,
             width: rect.width,
             height: rect.height,
@@ -2888,7 +2935,7 @@ var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
           obstacles.push({
             componentId: pcbComponentId,
             type: "rect",
-            layers: EVERY_LAYER,
+            layers: everyLayer,
             center: rect.center,
             width: rect.width,
             height: rect.height,
@@ -2902,6 +2949,7 @@ var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
           componentId: pcbComponentId,
           // @ts-ignore
           type: "oval",
+          layers: everyLayer,
           center: {
             x: element.x,
             y: element.y
@@ -2914,7 +2962,7 @@ var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
         obstacles.push({
           componentId: pcbComponentId,
           type: "rect",
-          layers: EVERY_LAYER,
+          layers: everyLayer,
           center: {
             x: element.x,
             y: element.y
@@ -2928,7 +2976,7 @@ var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
         obstacles.push({
           componentId: pcbComponentId,
           type: "rect",
-          layers: EVERY_LAYER,
+          layers: everyLayer,
           center: {
             x: element.x,
             y: element.y
@@ -2941,7 +2989,7 @@ var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
         obstacles.push({
           componentId: pcbComponentId,
           type: "rect",
-          layers: EVERY_LAYER,
+          layers: everyLayer,
           center: {
             x: element.x,
             y: element.y
@@ -2957,7 +3005,7 @@ var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
         obstacles.push({
           componentId: pcbComponentId,
           type: "rect",
-          layers: EVERY_LAYER,
+          layers: everyLayer,
           center: {
             x: element.x,
             y: element.y
@@ -2973,7 +3021,7 @@ var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
           componentId: pcbComponentId,
           // @ts-ignore
           type: "oval",
-          layers: EVERY_LAYER,
+          layers: everyLayer,
           center: {
             x: element.x,
             y: element.y
@@ -2987,7 +3035,7 @@ var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
           componentId: pcbComponentId,
           // @ts-ignore
           type: "rect",
-          layers: EVERY_LAYER,
+          layers: everyLayer,
           center: {
             x: element.x,
             y: element.y
@@ -3001,7 +3049,7 @@ var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
           componentId: pcbComponentId,
           // @ts-ignore
           type: "oval",
-          layers: EVERY_LAYER,
+          layers: everyLayer,
           center: {
             x: element.x,
             y: element.y
@@ -3014,7 +3062,7 @@ var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
         obstacles.push({
           componentId: pcbComponentId,
           type: "rect",
-          layers: EVERY_LAYER,
+          layers: everyLayer,
           center: {
             x: element.x,
             y: element.y
@@ -3038,7 +3086,7 @@ var getObstaclesFromCircuitJson = (circuitJson, connMap) => {
             componentId: pcbComponentId,
             // @ts-ignore
             type: "rect",
-            layers: EVERY_LAYER,
+            layers: everyLayer,
             center: {
               x: centerX,
               y: centerY
@@ -3722,32 +3770,6 @@ var jlcMinTolerances = {
   min_via_pad_diameter: 0.3
 };
 
-// lib/utils/getViaSpanLayers.ts
-var getViaSpanLayers = ({
-  fromLayer,
-  toLayer,
-  layerCount
-}) => {
-  if (fromLayer === toLayer) return [fromLayer];
-  const stack = ["top"];
-  for (let i = 1; i <= layerCount - 2; i++) {
-    stack.push(`inner${i}`);
-  }
-  stack.push("bottom");
-  const fromIndex = stack.indexOf(fromLayer);
-  const toIndex = stack.indexOf(toLayer);
-  if (fromIndex === -1 || toIndex === -1) return [fromLayer, toLayer];
-  return fromIndex <= toIndex ? stack.slice(fromIndex, toIndex + 1) : stack.slice(toIndex, fromIndex + 1).reverse();
-};
-var getViaBoardLayers = (layerCount) => {
-  if (layerCount <= 1) return ["top"];
-  return getViaSpanLayers({
-    fromLayer: "top",
-    toLayer: "bottom",
-    layerCount
-  });
-};
-
 // lib/components/primitive-components/Trace/Trace_doInitialPcbManualTraceRender.ts
 var findInflatedPcbViaForPoint = (vias, point6) => {
   if (point6.route_type !== "via") return void 0;
@@ -4354,7 +4376,12 @@ function Trace_doInitialPcbTraceRender(trace) {
     ];
   }
   const candidateLayerCombinations = findPossibleTraceLayerCombinations(
-    orderedRouteObjectives
+    orderedRouteObjectives,
+    {
+      layerSelectionPreference: getBoardAvailableLayers(
+        subcircuit._getSubcircuitLayerCount()
+      )
+    }
   );
   if (SHOULD_USE_SINGLE_LAYER_ROUTING && candidateLayerCombinations.length === 0) {
     trace.renderError(
@@ -7662,7 +7689,7 @@ var PlatedHole = class extends PrimitiveComponent2 {
     };
   }
   getAvailablePcbLayers() {
-    return ["top", "inner1", "inner2", "bottom"];
+    return [...this.root?._getBoard()?.allLayers ?? ["top", "bottom"]];
   }
   getPcbSize() {
     const { _parsedProps: props } = this;
@@ -7747,6 +7774,7 @@ var PlatedHole = class extends PrimitiveComponent2 {
     const position = this._getGlobalPcbPositionBeforeLayout();
     const pcb_component_id = this.parent?.pcb_component_id ?? this.getPrimitiveContainer()?.pcb_component_id;
     const subcircuit = this.getSubcircuit();
+    const platedHoleLayers = this.getAvailablePcbLayers();
     const soldermaskMargin = props.solderMaskMargin;
     const isCoveredWithSolderMask = props.coveredWithSolderMask ?? false;
     this.emitSolderMaskMarginWarning(isCoveredWithSolderMask, soldermaskMargin);
@@ -7767,7 +7795,7 @@ var PlatedHole = class extends PrimitiveComponent2 {
         port_hints: this.getNameAndAliases(),
         x: position.x,
         y: position.y,
-        layers: ["top", "bottom"],
+        layers: platedHoleLayers,
         soldermask_margin: soldermaskMargin,
         is_covered_with_solder_mask: isCoveredWithSolderMask,
         subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
@@ -7808,7 +7836,7 @@ var PlatedHole = class extends PrimitiveComponent2 {
         pcb_plated_hole_id: this.pcb_plated_hole_id,
         x: position.x,
         y: position.y,
-        layers: ["top", "bottom"],
+        layers: platedHoleLayers,
         soldermask_margin: soldermaskMargin,
         is_covered_with_solder_mask: isCoveredWithSolderMask,
         subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
@@ -7835,7 +7863,7 @@ var PlatedHole = class extends PrimitiveComponent2 {
         port_hints: this.getNameAndAliases(),
         x: position.x,
         y: position.y,
-        layers: ["top", "bottom"],
+        layers: platedHoleLayers,
         soldermask_margin: soldermaskMargin,
         is_covered_with_solder_mask: isCoveredWithSolderMask,
         subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
@@ -7877,7 +7905,7 @@ var PlatedHole = class extends PrimitiveComponent2 {
         port_hints: this.getNameAndAliases(),
         x: position.x,
         y: position.y,
-        layers: ["top", "bottom"],
+        layers: platedHoleLayers,
         soldermask_margin: soldermaskMargin,
         is_covered_with_solder_mask: isCoveredWithSolderMask,
         subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
@@ -7909,7 +7937,7 @@ var PlatedHole = class extends PrimitiveComponent2 {
           port_hints: this.getNameAndAliases(),
           x: position.x,
           y: position.y,
-          layers: ["top", "bottom"],
+          layers: platedHoleLayers,
           soldermask_margin: soldermaskMargin,
           is_covered_with_solder_mask: isCoveredWithSolderMask,
           subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
@@ -7931,7 +7959,7 @@ var PlatedHole = class extends PrimitiveComponent2 {
           port_hints: this.getNameAndAliases(),
           x: position.x,
           y: position.y,
-          layers: ["top", "bottom"],
+          layers: platedHoleLayers,
           soldermask_margin: soldermaskMargin,
           is_covered_with_solder_mask: isCoveredWithSolderMask,
           subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
@@ -7962,7 +7990,7 @@ var PlatedHole = class extends PrimitiveComponent2 {
         port_hints: this.getNameAndAliases(),
         x: position.x,
         y: position.y,
-        layers: ["top", "bottom"],
+        layers: platedHoleLayers,
         soldermask_margin: soldermaskMargin,
         is_covered_with_solder_mask: isCoveredWithSolderMask,
         subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
@@ -16653,6 +16681,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
   );
   const obstacles = getObstaclesFromCircuitJson(
     [
+      ...board ? [board] : [],
       ...db.pcb_component.list(),
       ...db.pcb_smtpad.list(),
       ...db.pcb_plated_hole.list(),
@@ -16663,7 +16692,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
       ...db.pcb_keepout.list(),
       ...db.pcb_cutout.list()
     ].filter(
-      (e) => !subcircuit_id || relevantSubcircuitIds?.has(e.subcircuit_id)
+      (e) => e.type === "pcb_board" || !subcircuit_id || relevantSubcircuitIds?.has(e.subcircuit_id)
     ),
     sharedConnMap
   );
@@ -22834,7 +22863,7 @@ function Group_getRoutingPhasePlans(group) {
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1459",
+  version: "0.0.1460",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -22883,7 +22912,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.19",
-    "@tscircuit/props": "^0.0.578",
+    "@tscircuit/props": "^0.0.583",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.101",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -22897,7 +22926,7 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.447",
+    "circuit-json": "^0.0.450",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.105",
@@ -23078,23 +23107,25 @@ function createJumperObstacle(point6, connectedTo, obstacleIndex) {
     connectedTo: [connectedTo]
   };
 }
-function createViaObstacle(point6, connectedTo, obstacleIndex) {
+function createViaObstacle(point6, connectedTo, obstacleIndex, layerCount) {
   return {
     obstacleId: `${connectedTo}_phase_via_obstacle_${obstacleIndex}`,
     type: "rect",
-    layers: [point6.from_layer, point6.to_layer],
+    layers: getViaBoardLayers(layerCount),
     center: { x: point6.x, y: point6.y },
     width: 0.6,
     height: 0.6,
     connectedTo: [connectedTo]
   };
 }
-function addTraceObstacles(obstacles, trace) {
+function addTraceObstacles(obstacles, trace, layerCount) {
   const connectedTo = getTraceConnectionName(trace);
   for (let routeIndex = 0; routeIndex < trace.route.length; routeIndex++) {
     const routePoint = trace.route[routeIndex];
     if (isViaPoint(routePoint)) {
-      obstacles.push(createViaObstacle(routePoint, connectedTo, routeIndex));
+      obstacles.push(
+        createViaObstacle(routePoint, connectedTo, routeIndex, layerCount)
+      );
     } else if (isJumperPoint(routePoint)) {
       obstacles.push(createJumperObstacle(routePoint, connectedTo, routeIndex));
     }
@@ -23209,10 +23240,10 @@ function Group_applyDrcTolerancesToSimpleRouteJson(simpleRouteJson, drcTolerance
     minBoardEdgeClearance
   };
 }
-function Group_getObstaclesFromRoutedTraces(traces) {
+function Group_getObstaclesFromRoutedTraces(traces, layerCount) {
   const obstacles = [];
   for (const trace of traces) {
-    addTraceObstacles(obstacles, trace);
+    addTraceObstacles(obstacles, trace, layerCount);
   }
   return obstacles;
 }
@@ -24480,7 +24511,8 @@ var Group = class extends NormalComponent3 {
           ...Group_getObstaclesFromRoutedTraces(
             outputTraces.filter(
               (trace) => !traceMatchesRoutingPhase(trace, routingPhasePlan)
-            )
+            ),
+            baseSimpleRouteJson.layerCount
           )
         ];
       } else if (hasPhasedAutorouting) {
@@ -24490,7 +24522,10 @@ var Group = class extends NormalComponent3 {
         );
         simpleRouteJson.obstacles = [
           ...simpleRouteJson.obstacles,
-          ...Group_getObstaclesFromRoutedTraces(outputTraces)
+          ...Group_getObstaclesFromRoutedTraces(
+            outputTraces,
+            baseSimpleRouteJson.layerCount
+          )
         ];
       }
       simpleRouteJson = Group_applyDrcTolerancesToSimpleRouteJson(
@@ -27045,14 +27080,7 @@ var Board = class extends Group {
    * Get all available layers for the board
    */
   get allLayers() {
-    const layerCount = this._parsedProps.layers ?? 2;
-    if (layerCount === 1) {
-      return ["top"];
-    }
-    if (layerCount === 4) {
-      return ["top", "bottom", "inner1", "inner2"];
-    }
-    return ["top", "bottom"];
+    return getBoardAvailableLayers(this._parsedProps.layers ?? 2);
   }
   _getSubcircuitLayerCount() {
     return this._parsedProps.layers ?? 2;
@@ -31235,7 +31263,7 @@ var Via = class extends PrimitiveComponent2 {
     };
   }
   getAvailablePcbLayers() {
-    return ["top", "inner1", "inner2", "bottom"];
+    return this._getLayers();
   }
   _getResolvedViaDiameters(pcbStyle) {
     return getViaDiameterDefaultsWithOverrides(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1460",
+  "version": "0.0.1461",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -50,7 +50,7 @@
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.19",
-    "@tscircuit/props": "^0.0.578",
+    "@tscircuit/props": "^0.0.583",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.101",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -64,7 +64,7 @@
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.447",
+    "circuit-json": "^0.0.450",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.105",