@tscircuit/core 0.0.994 → 0.0.995

package/dist/index.js

@@ -78,6 +78,7 @@ __export(components_exports, {
   SmtPad: () => SmtPad,
   SolderJumper: () => SolderJumper,
   Subcircuit: () => Subcircuit,
+  Subpanel: () => Subpanel,
   Switch: () => Switch,
   Symbol: () => SymbolComponent,
   TestPoint: () => TestPoint,
@@ -16682,6 +16683,10 @@ var Board = class extends Group6 {
 
 // lib/components/normal-components/Panel.ts
 import { panelProps } from "@tscircuit/props";
+import { distance as distance12 } from "circuit-json";
+
+// lib/components/normal-components/Subpanel.ts
+import { subpanelProps } from "@tscircuit/props";
 import { distance as distance11 } from "circuit-json";
 
 // lib/utils/panels/generate-panel-tabs-and-mouse-bites.ts
@@ -17017,16 +17022,19 @@ var packBoardsIntoGrid = ({
   return { positions, gridWidth: totalGridWidth, gridHeight: totalGridHeight };
 };
 
-// lib/components/normal-components/Panel.ts
-var Panel = class extends Group6 {
+// lib/components/normal-components/Subpanel.ts
+var Subpanel = class _Subpanel extends Group6 {
   pcb_panel_id = null;
   _tabsAndMouseBitesGenerated = false;
   get config() {
     return {
-      componentName: "Panel",
-      zodProps: panelProps
+      componentName: "Subpanel",
+      zodProps: subpanelProps
     };
   }
+  get _errorComponentName() {
+    return this.componentName.toLowerCase();
+  }
   get isGroup() {
     return true;
   }
@@ -17034,19 +17042,55 @@ var Panel = class extends Group6 {
     return true;
   }
   add(component) {
-    if (component.lowercaseComponentName !== "board") {
-      throw new Error("<panel> can only contain <board> elements");
+    if (component.lowercaseComponentName !== "board" && component.lowercaseComponentName !== "subpanel") {
+      throw new Error(
+        `<${this._errorComponentName}> can only contain <board> or <subpanel> elements`
+      );
     }
     super.add(component);
   }
   _cachedGridWidth = 0;
   _cachedGridHeight = 0;
+  /**
+   * Get all board instances from this subpanel and nested subpanels
+   */
+  _getAllBoardInstances() {
+    const boards = [];
+    for (const child of this.children) {
+      if (child instanceof Board) {
+        boards.push(child);
+      } else if (child instanceof _Subpanel) {
+        boards.push(...child._getAllBoardInstances());
+      }
+    }
+    return boards;
+  }
+  /**
+   * Check if this subpanel contains at least one board (directly or through nested subpanels)
+   */
+  _containsBoards() {
+    for (const child of this.children) {
+      if (child.componentName === "Board") {
+        return true;
+      }
+      if (child.componentName === "Subpanel" && "_containsBoards" in child) {
+        if (child._containsBoards()) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  /**
+   * Get direct board children only (not from nested subpanels)
+   */
+  _getDirectBoardChildren() {
+    return this.children.filter((c) => c instanceof Board);
+  }
   doInitialPanelBoardLayout() {
     if (this.root?.pcbDisabled) return;
     const layoutMode = this._parsedProps.layoutMode ?? "none";
-    const childBoardInstances = this.children.filter(
-      (c) => c instanceof Board
-    );
+    const childBoardInstances = this._getDirectBoardChildren();
     if (layoutMode !== "none") {
       for (const board of childBoardInstances) {
         const hasPcbX = board._parsedProps.pcbX !== void 0;
@@ -17059,7 +17103,7 @@ var Panel = class extends Group6 {
           this.root.db.source_property_ignored_warning.insert({
             source_component_id: board.source_component_id,
             property_name: propertyNames,
-            message: `Board has manual positioning (${propertyNames}) but panel layout mode is "${layoutMode}". Manual positioning will be ignored.`,
+            message: `Board has manual positioning (${propertyNames}) but ${this._errorComponentName} layout mode is "${layoutMode}". Manual positioning will be ignored.`,
             error_type: "source_property_ignored_warning"
           });
         }
@@ -17074,7 +17118,7 @@ var Panel = class extends Group6 {
       if (boardsWithoutPosition.length > 1) {
         this.root.db.pcb_placement_error.insert({
           error_type: "pcb_placement_error",
-          message: `Multiple boards in panel without pcbX/pcbY positions. When layoutMode="none", each board must have explicit pcbX and pcbY coordinates to avoid overlapping. Either set pcbX/pcbY on each board, or use layoutMode="grid" for automatic positioning.`
+          message: `Multiple boards in ${this._errorComponentName} without pcbX/pcbY positions. When layoutMode="none", each board must have explicit pcbX and pcbY coordinates to avoid overlapping. Either set pcbX/pcbY on each board, or use layoutMode="grid" for automatic positioning.`
         });
       }
     }
@@ -17098,9 +17142,7 @@ var Panel = class extends Group6 {
   doInitialPanelLayout() {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
-    const childBoardInstances = this.children.filter(
-      (c) => c instanceof Board
-    );
+    const childBoardInstances = this._getDirectBoardChildren();
     const layoutMode = this._parsedProps.layoutMode ?? "none";
     if (layoutMode === "grid") {
       for (const board of childBoardInstances) {
@@ -17111,39 +17153,7 @@ var Panel = class extends Group6 {
           display_offset_y: `${board._panelPositionOffset.y}mm`
         });
       }
-      const hasExplicitWidth = this._parsedProps.width !== void 0;
-      const hasExplicitHeight = this._parsedProps.height !== void 0;
-      const gridWidth = this._cachedGridWidth;
-      const gridHeight = this._cachedGridHeight;
-      if (hasExplicitWidth && hasExplicitHeight) {
-        db.pcb_panel.update(this.pcb_panel_id, {
-          width: distance11.parse(this._parsedProps.width),
-          height: distance11.parse(this._parsedProps.height)
-        });
-      } else if (gridWidth > 0 || gridHeight > 0) {
-        const {
-          edgePadding: edgePaddingProp,
-          edgePaddingLeft: edgePaddingLeftProp,
-          edgePaddingRight: edgePaddingRightProp,
-          edgePaddingTop: edgePaddingTopProp,
-          edgePaddingBottom: edgePaddingBottomProp
-        } = this._parsedProps;
-        const edgePadding = distance11.parse(edgePaddingProp ?? 5);
-        const edgePaddingLeft = distance11.parse(
-          edgePaddingLeftProp ?? edgePadding
-        );
-        const edgePaddingRight = distance11.parse(
-          edgePaddingRightProp ?? edgePadding
-        );
-        const edgePaddingTop = distance11.parse(edgePaddingTopProp ?? edgePadding);
-        const edgePaddingBottom = distance11.parse(
-          edgePaddingBottomProp ?? edgePadding
-        );
-        db.pcb_panel.update(this.pcb_panel_id, {
-          width: hasExplicitWidth ? distance11.parse(this._parsedProps.width) : gridWidth + edgePaddingLeft + edgePaddingRight,
-          height: hasExplicitHeight ? distance11.parse(this._parsedProps.height) : gridHeight + edgePaddingTop + edgePaddingBottom
-        });
-      }
+      this._updatePanelDimensions();
     } else {
       const panelGlobalPos = this._getGlobalPcbPositionBeforeLayout();
       for (const board of childBoardInstances) {
@@ -17158,9 +17168,55 @@ var Panel = class extends Group6 {
         });
       }
     }
+    this._generateTabsAndMouseBites();
+  }
+  /**
+   * Update dimensions for the subpanel. Subpanel updates pcb_group,
+   */
+  _updatePanelDimensions() {
+    const { db } = this.root;
+    const hasExplicitWidth = this._parsedProps.width !== void 0;
+    const hasExplicitHeight = this._parsedProps.height !== void 0;
+    const gridWidth = this._cachedGridWidth;
+    const gridHeight = this._cachedGridHeight;
+    if (!this.pcb_group_id) return;
+    if (hasExplicitWidth && hasExplicitHeight) {
+      db.pcb_group.update(this.pcb_group_id, {
+        width: distance11.parse(this._parsedProps.width),
+        height: distance11.parse(this._parsedProps.height)
+      });
+    } else if (gridWidth > 0 || gridHeight > 0) {
+      const {
+        edgePadding: edgePaddingProp,
+        edgePaddingLeft: edgePaddingLeftProp,
+        edgePaddingRight: edgePaddingRightProp,
+        edgePaddingTop: edgePaddingTopProp,
+        edgePaddingBottom: edgePaddingBottomProp
+      } = this._parsedProps;
+      const edgePadding = distance11.parse(edgePaddingProp ?? 5);
+      const edgePaddingLeft = distance11.parse(edgePaddingLeftProp ?? edgePadding);
+      const edgePaddingRight = distance11.parse(
+        edgePaddingRightProp ?? edgePadding
+      );
+      const edgePaddingTop = distance11.parse(edgePaddingTopProp ?? edgePadding);
+      const edgePaddingBottom = distance11.parse(
+        edgePaddingBottomProp ?? edgePadding
+      );
+      db.pcb_group.update(this.pcb_group_id, {
+        width: hasExplicitWidth ? distance11.parse(this._parsedProps.width) : gridWidth + edgePaddingLeft + edgePaddingRight,
+        height: hasExplicitHeight ? distance11.parse(this._parsedProps.height) : gridHeight + edgePaddingTop + edgePaddingBottom
+      });
+    }
+  }
+  /**
+   * Generate tabs and mouse bites for panelization
+   */
+  _generateTabsAndMouseBites() {
     if (this._tabsAndMouseBitesGenerated) return;
+    const { db } = this.root;
     const props = this._parsedProps;
     const panelizationMethod = props.panelizationMethod ?? "none";
+    const childBoardInstances = this._getDirectBoardChildren();
     if (panelizationMethod !== "none") {
       const childBoardIds = childBoardInstances.map((c) => c.pcb_board_id).filter((id) => !!id);
       const boardsInPanel = db.pcb_board.list().filter((b) => childBoardIds.includes(b.pcb_board_id));
@@ -17185,24 +17241,88 @@ var Panel = class extends Group6 {
     }
     this._tabsAndMouseBitesGenerated = true;
   }
-  runRenderCycle() {
-    if (!this.children.some((child) => child.componentName === "Board")) {
-      throw new Error("<panel> must contain at least one <board>");
+  /**
+   * Override to validate board containment before rendering.
+   * Subpanel uses parent Group's pcb_group rendering.
+   */
+  doInitialPcbComponentRender() {
+    if (this.root?.pcbDisabled) return;
+    if (!this._containsBoards()) {
+      throw new Error(
+        `<${this._errorComponentName}> must contain at least one <board>`
+      );
     }
-    super.runRenderCycle();
+    super.doInitialPcbComponentRender();
   }
+};
+
+// lib/components/normal-components/Panel.ts
+var Panel = class extends Subpanel {
+  get config() {
+    return {
+      componentName: "Panel",
+      zodProps: panelProps
+    };
+  }
+  /**
+   * Panel creates a pcb_panel record for the physical manufacturing panel.
+   * This overrides the Subpanel behavior which uses pcb_group.
+   */
   doInitialPcbComponentRender() {
     if (this.root?.pcbDisabled) return;
+    if (!this._containsBoards()) {
+      throw new Error(
+        `<${this._errorComponentName}> must contain at least one <board>`
+      );
+    }
     const { db } = this.root;
     const props = this._parsedProps;
     const inserted = db.pcb_panel.insert({
-      width: props.width !== void 0 ? distance11.parse(props.width) : 0,
-      height: props.height !== void 0 ? distance11.parse(props.height) : 0,
+      width: props.width !== void 0 ? distance12.parse(props.width) : 0,
+      height: props.height !== void 0 ? distance12.parse(props.height) : 0,
       center: this._getGlobalPcbPositionBeforeLayout(),
       covered_with_solder_mask: !(props.noSolderMask ?? false)
     });
     this.pcb_panel_id = inserted.pcb_panel_id;
   }
+  /**
+   * Panel updates pcb_panel dimensions instead of pcb_group
+   */
+  _updatePanelDimensions() {
+    const { db } = this.root;
+    const hasExplicitWidth = this._parsedProps.width !== void 0;
+    const hasExplicitHeight = this._parsedProps.height !== void 0;
+    const gridWidth = this._cachedGridWidth;
+    const gridHeight = this._cachedGridHeight;
+    if (!this.pcb_panel_id) return;
+    if (hasExplicitWidth && hasExplicitHeight) {
+      db.pcb_panel.update(this.pcb_panel_id, {
+        width: distance12.parse(this._parsedProps.width),
+        height: distance12.parse(this._parsedProps.height)
+      });
+    } else if (gridWidth > 0 || gridHeight > 0) {
+      const {
+        edgePadding: edgePaddingProp,
+        edgePaddingLeft: edgePaddingLeftProp,
+        edgePaddingRight: edgePaddingRightProp,
+        edgePaddingTop: edgePaddingTopProp,
+        edgePaddingBottom: edgePaddingBottomProp
+      } = this._parsedProps;
+      const edgePadding = distance12.parse(edgePaddingProp ?? 5);
+      const edgePaddingLeft = distance12.parse(edgePaddingLeftProp ?? edgePadding);
+      const edgePaddingRight = distance12.parse(
+        edgePaddingRightProp ?? edgePadding
+      );
+      const edgePaddingTop = distance12.parse(edgePaddingTopProp ?? edgePadding);
+      const edgePaddingBottom = distance12.parse(
+        edgePaddingBottomProp ?? edgePadding
+      );
+      db.pcb_panel.update(this.pcb_panel_id, {
+        width: hasExplicitWidth ? distance12.parse(this._parsedProps.width) : gridWidth + edgePaddingLeft + edgePaddingRight,
+        height: hasExplicitHeight ? distance12.parse(this._parsedProps.height) : gridHeight + edgePaddingTop + edgePaddingBottom
+      });
+    }
+  }
   updatePcbComponentRender() {
     if (this.root?.pcbDisabled) return;
     if (!this.pcb_panel_id) return;
@@ -17210,8 +17330,8 @@ var Panel = class extends Group6 {
     const props = this._parsedProps;
     const currentPanel = db.pcb_panel.get(this.pcb_panel_id);
     db.pcb_panel.update(this.pcb_panel_id, {
-      width: props.width !== void 0 ? distance11.parse(props.width) : currentPanel?.width,
-      height: props.height !== void 0 ? distance11.parse(props.height) : currentPanel?.height,
+      width: props.width !== void 0 ? distance12.parse(props.width) : currentPanel?.width,
+      height: props.height !== void 0 ? distance12.parse(props.height) : currentPanel?.height,
       center: this._getGlobalPcbPositionBeforeLayout(),
       covered_with_solder_mask: !(props.noSolderMask ?? false)
     });
@@ -19223,7 +19343,7 @@ var SilkscreenLine = class extends PrimitiveComponent2 {
 
 // lib/components/primitive-components/Fiducial.ts
 import "zod";
-import { distance as distance12 } from "circuit-json";
+import { distance as distance13 } from "circuit-json";
 import { fiducialProps } from "@tscircuit/props";
 var Fiducial = class extends PrimitiveComponent2 {
   pcb_smtpad_id = null;
@@ -19248,15 +19368,15 @@ var Fiducial = class extends PrimitiveComponent2 {
       shape: "circle",
       x: position.x,
       y: position.y,
-      radius: distance12.parse(props.padDiameter) / 2,
-      soldermask_margin: props.soldermaskPullback ? distance12.parse(props.soldermaskPullback) : distance12.parse(props.padDiameter) / 2,
+      radius: distance13.parse(props.padDiameter) / 2,
+      soldermask_margin: props.soldermaskPullback ? distance13.parse(props.soldermaskPullback) : distance13.parse(props.padDiameter) / 2,
       is_covered_with_solder_mask: true
     });
     this.pcb_smtpad_id = pcb_smtpad.pcb_smtpad_id;
   }
   getPcbSize() {
     const { _parsedProps: props } = this;
-    const d = distance12.parse(props.padDiameter);
+    const d = distance13.parse(props.padDiameter);
     return { width: d, height: d };
   }
   _setPositionFromLayout(newCenter) {
@@ -21197,7 +21317,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.993",
+  version: "0.0.994",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -21847,6 +21967,7 @@ export {
   SmtPad,
   SolderJumper,
   Subcircuit,
+  Subpanel,
   Switch,
   SymbolComponent as Symbol,
   TestPoint,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.994",
+  "version": "0.0.995",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",