@tscircuit/core 0.0.587 → 0.0.589

package/dist/index.d.ts

@@ -271,6 +271,7 @@ interface ISubcircuit extends PrimitiveComponent {
     _shouldUseTraceByTraceRouting(): boolean;
     _parsedProps: z.infer<typeof subcircuitGroupProps>;
     _getAutorouterConfig(): AutorouterConfig;
+    _getSubcircuitLayerCount(): number;
     subcircuit_id: string | null;
 }
 
@@ -1095,6 +1096,7 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
         maxY: number;
     };
     _getAutorouterConfig(): AutorouterConfig;
+    _getSubcircuitLayerCount(): number;
     /**
      * Trace-by-trace autorouting is where each trace routes itself in a well-known
      * order. It's the most deterministic way to autoroute, because a new trace
@@ -2003,7 +2005,8 @@ declare class Board extends Group<typeof boardProps> {
     /**
      * Get all available layers for the board
      */
-    get allLayers(): string[];
+    get allLayers(): readonly ["top", "bottom", "inner1", "inner2"] | readonly ["top", "bottom"];
+    _getSubcircuitLayerCount(): number;
     doInitialPcbBoardAutoSize(): void;
     /**
      * Update the board information silkscreen text if platform config is set and

package/dist/index.js

@@ -4100,7 +4100,7 @@ var getMaxLengthFromConnectedCapacitors = (ports, { db }) => {
       return sourceComponent.max_decoupling_trace_length;
     }
     return null;
-  }).filter((length2) => length2 !== null);
+  }).filter((length4) => length4 !== null);
   if (capacitorMaxLengths.length === 0) return void 0;
   return Math.min(...capacitorMaxLengths);
 };
@@ -5505,7 +5505,7 @@ function Trace_doInitialPcbTraceRender(trace) {
             ]
           }
         ],
-        layerCount: 2,
+        layerCount: trace.getSubcircuit()._getSubcircuitLayerCount(),
         bounds: {
           minX: Math.min(a.x, b.x) - BOUNDS_MARGIN,
           maxX: Math.max(a.x, b.x) + BOUNDS_MARGIN,
@@ -7500,7 +7500,7 @@ var getSimpleRouteJsonFromCircuitJson = ({
       connections: allConns,
       // TODO add traces so that we don't run into things routed by another
       // subcircuit
-      layerCount: 2,
+      layerCount: board?.num_layers ?? 2,
       minTraceWidth
     },
     connMap
@@ -7801,6 +7801,7 @@ function Group_doInitialSourceAddConnectivityMapKey(group) {
 }
 
 // lib/components/primitive-components/Group/Group_doInitialSchematicLayoutGrid.ts
+import { length } from "circuit-json";
 function Group_doInitialSchematicLayoutGrid(group) {
   const { db } = group.root;
   const props = group._parsedProps;
@@ -7850,9 +7851,15 @@ function Group_doInitialSchematicLayoutGrid(group) {
   if (typeof gridGapOption === "number") {
     gridGapX = gridGapOption;
     gridGapY = gridGapOption;
+  } else if (typeof gridGapOption === "string") {
+    const parsed = length.parse(gridGapOption);
+    gridGapX = parsed;
+    gridGapY = parsed;
   } else if (typeof gridGapOption === "object" && gridGapOption !== null) {
-    gridGapX = gridGapOption.x;
-    gridGapY = gridGapOption.y;
+    const xRaw = gridGapOption.x;
+    const yRaw = gridGapOption.y;
+    gridGapX = typeof xRaw === "number" ? xRaw : length.parse(xRaw ?? "0mm");
+    gridGapY = typeof yRaw === "number" ? yRaw : length.parse(yRaw ?? "0mm");
   } else {
     gridGapX = 1;
     gridGapY = 1;
@@ -7920,6 +7927,7 @@ import {
   transformPCBElements,
   getPrimaryId
 } from "@tscircuit/circuit-json-util";
+import { length as length2 } from "circuit-json";
 function Group_doInitialPcbLayoutGrid(group) {
   const { db } = group.root;
   const props = group._parsedProps;
@@ -7968,9 +7976,15 @@ function Group_doInitialPcbLayoutGrid(group) {
   if (typeof gridGapOption === "number") {
     gridGapX = gridGapOption;
     gridGapY = gridGapOption;
+  } else if (typeof gridGapOption === "string") {
+    const parsed = length2.parse(gridGapOption);
+    gridGapX = parsed;
+    gridGapY = parsed;
   } else if (typeof gridGapOption === "object" && gridGapOption !== null) {
-    gridGapX = gridGapOption.x;
-    gridGapY = gridGapOption.y;
+    const xRaw = gridGapOption.x;
+    const yRaw = gridGapOption.y;
+    gridGapX = typeof xRaw === "number" ? xRaw : length2.parse(xRaw ?? "0mm");
+    gridGapY = typeof yRaw === "number" ? yRaw : length2.parse(yRaw ?? "0mm");
   } else {
     gridGapX = 1;
     gridGapY = 1;
@@ -8080,7 +8094,7 @@ import {
   convertPackOutputToPackInput,
   getGraphicsFromPackOutput
 } from "calculate-packing";
-import { length } from "circuit-json";
+import { length as length3 } from "circuit-json";
 import { transformPCBElements as transformPCBElements2 } from "@tscircuit/circuit-json-util";
 import { translate as translate6, rotate as rotate2, compose as compose4 } from "transformation-matrix";
 import Debug6 from "debug";
@@ -8092,7 +8106,7 @@ var Group_doInitialPcbLayoutPack = (group) => {
   const subtreeCircuitJson = buildSubtree2(db.toArray(), {
     source_group_id: group.source_group_id
   });
-  const gapMm = length.parse(gap ?? "0mm");
+  const gapMm = length3.parse(gap ?? "0mm");
   const packInput = {
     ...convertPackOutputToPackInput(
       convertCircuitJsonToPackOutput(subtreeCircuitJson)
@@ -8802,6 +8816,10 @@ var Group = class extends NormalComponent {
     const autorouter = this._parsedProps.autorouter || this.getInheritedProperty("autorouter");
     return getPresetAutoroutingConfig(autorouter);
   }
+  _getSubcircuitLayerCount() {
+    const layers = this.getInheritedProperty("layers");
+    return typeof layers === "number" ? layers : 2;
+  }
   /**
    * Trace-by-trace autorouting is where each trace routes itself in a well-known
    * order. It's the most deterministic way to autoroute, because a new trace
@@ -8891,7 +8909,14 @@ var Board = class extends Group {
    * Get all available layers for the board
    */
   get allLayers() {
-    return ["top", "bottom", "inner1", "inner2"];
+    const layerCount = this._parsedProps.layers ?? 2;
+    if (layerCount === 4) {
+      return ["top", "bottom", "inner1", "inner2"];
+    }
+    return ["top", "bottom"];
+  }
+  _getSubcircuitLayerCount() {
+    return this._parsedProps.layers ?? 2;
   }
   doInitialPcbBoardAutoSize() {
     if (this.root?.pcbDisabled) return;
@@ -11170,7 +11195,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.586",
+  version: "0.0.588",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -11196,7 +11221,7 @@ var package_default = {
     "@tscircuit/capacity-autorouter": "^0.0.100",
     "@tscircuit/checks": "^0.0.56",
     "@tscircuit/circuit-json-flex": "^0.0.1",
-    "@tscircuit/circuit-json-util": "^0.0.54",
+    "@tscircuit/circuit-json-util": "^0.0.57",
     "@tscircuit/footprinter": "^0.0.204",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.587",
+  "version": "0.0.589",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -27,7 +27,7 @@
     "@tscircuit/capacity-autorouter": "^0.0.100",
     "@tscircuit/checks": "^0.0.56",
     "@tscircuit/circuit-json-flex": "^0.0.1",
-    "@tscircuit/circuit-json-util": "^0.0.54",
+    "@tscircuit/circuit-json-util": "^0.0.57",
     "@tscircuit/footprinter": "^0.0.204",
     "@tscircuit/import-snippet": "^0.0.4",
     "@tscircuit/infgrid-ijump-astar": "^0.0.33",