@tscircuit/core 0.0.1204 → 0.0.1205

package/dist/index.d.ts

@@ -1523,6 +1523,12 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
      * like Symbol in the hierarchy.
      */
     getParentNormalComponent(): any | null;
+    /**
+     * Returns the nearest ancestor group that should be collapsed into a single
+     * schematic box. Schematic render phases use this to suppress internal
+     * schematic elements while still allowing direct group ports to render.
+     */
+    getCollapsedSchematicBoxAncestor(): PrimitiveComponent | null;
     /**
      * Replaces text like {NAME}, {REF}, and {REFERENCE} with the
      * reference designator (name) of the parent NormalComponent.
@@ -2091,6 +2097,11 @@ declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps>
         zodProps: Props;
         componentName: string;
     };
+    private _ensureSchematicBoxPortsFromConnections;
+    doInitialInitializePortsFromChildren(): void;
+    updateInitializePortsFromChildren(): void;
+    _getPrimaryPinCount(): number;
+    _getPinLabelsFromPorts(): Record<string, string>;
     doInitialSourceGroupRender(): void;
     doInitialSourceRender(): void;
     doInitialSourceParentAttachment(): void;

package/dist/index.js

@@ -1587,6 +1587,21 @@ var PrimitiveComponent2 = class extends Renderable {
     }
     return null;
   }
+  /**
+   * Returns the nearest ancestor group that should be collapsed into a single
+   * schematic box. Schematic render phases use this to suppress internal
+   * schematic elements while still allowing direct group ports to render.
+   */
+  getCollapsedSchematicBoxAncestor() {
+    let current = this.parent;
+    while (current) {
+      if (current.componentName === "Group" && current._parsedProps?.showAsSchematicBox) {
+        return current;
+      }
+      current = current.parent;
+    }
+    return null;
+  }
   /**
    * Replaces text like {NAME}, {REF}, and {REFERENCE} with the
    * reference designator (name) of the parent NormalComponent.
@@ -2730,8 +2745,8 @@ var getObstaclesFromCircuitJson = (soup, connMap) => {
           height: element.height,
           rotation: element.ccw_rotation
         };
-        const singleRect = getAxisAlignedRectFromRotatedRect(rotatedRect);
-        const rect = singleRect ?? rotatedRect;
+        const axisAlignedRect = getAxisAlignedRectFromRotatedRect(rotatedRect);
+        const rect = axisAlignedRect ?? rotatedRect;
         obstacles.push({
           type: "rect",
           layers: [element.layer],
@@ -3562,6 +3577,7 @@ var Trace_doInitialSchematicTraceRender = (trace) => {
   if (trace.root?._featureMspSchematicTraceRouting) return;
   if (trace._couldNotFindPort) return;
   if (trace.root?.schematicDisabled) return;
+  if (trace.getCollapsedSchematicBoxAncestor()) return;
   const { db } = trace.root;
   const { _parsedProps: props, parent } = trace;
   if (!parent) throw new Error("Trace has no parent");
@@ -8995,9 +9011,9 @@ var Port = class extends PrimitiveComponent2 {
       return false;
     }
     const parentBoxDim = parentNormalComponent?._getSchematicBoxDimensions();
-    if (parentBoxDim && this.props.pinNumber !== void 0) {
+    if (parentBoxDim && this._parsedProps.pinNumber !== void 0) {
       const localPortPosition = parentBoxDim.getPortPositionByPinNumber(
-        this.props.pinNumber
+        this._parsedProps.pinNumber
       );
       if (localPortPosition) return true;
     }
@@ -9029,9 +9045,9 @@ var Port = class extends PrimitiveComponent2 {
       return applyToPoint16(transform, schematicSymbolPortDef);
     }
     const parentBoxDim = parentNormalComponent?._getSchematicBoxDimensions();
-    if (parentBoxDim && this.props.pinNumber !== void 0) {
+    if (parentBoxDim && this._parsedProps.pinNumber !== void 0) {
       const localPortPosition = parentBoxDim.getPortPositionByPinNumber(
-        this.props.pinNumber
+        this._parsedProps.pinNumber
       );
       if (!localPortPosition) {
         throw new Error(
@@ -9334,6 +9350,8 @@ var Port = class extends PrimitiveComponent2 {
     return void 0;
   }
   doInitialSchematicPortRender() {
+    const collapsedAncestor = this.getCollapsedSchematicBoxAncestor();
+    if (collapsedAncestor && this.parent !== collapsedAncestor) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const { schX, schY } = props;
@@ -11488,6 +11506,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
    */
   doInitialSchematicComponentRender() {
     if (this.root?.schematicDisabled) return;
+    if (this.getCollapsedSchematicBoxAncestor()) return;
     const { db } = this.root;
     if (this._invalidPinLabelMessages?.length && this.root?.db) {
       for (const message of this._invalidPinLabelMessages) {
@@ -12160,7 +12179,9 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
   }
   _getSchematicBoxDimensions() {
     if (this.getSchematicSymbol()) return null;
-    if (!this.config.shouldRenderAsSchematicBox) return null;
+    if (!this.config.shouldRenderAsSchematicBox && !this._parsedProps?.showAsSchematicBox) {
+      return null;
+    }
     const { _parsedProps: props } = this;
     const pinCount = this._getPrimaryPinCount();
     const pinSpacing = props.schPinSpacing ?? 0.2;
@@ -16288,6 +16309,15 @@ function isTreeChildExplicitlyPositioned(treeChild, group) {
   }
   return false;
 }
+function getTreeChildChipId(child, index) {
+  if (child.nodeType === "component" && child.sourceComponent) {
+    return child.sourceComponent.name || `chip_${index}`;
+  }
+  if (child.nodeType === "group" && child.sourceGroup) {
+    return child.sourceGroup.name || `group_${index}`;
+  }
+  return null;
+}
 function convertTreeToInputProblem(tree, db, group) {
   const problem = {
     chipMap: {},
@@ -16318,7 +16348,7 @@ function convertTreeToInputProblem(tree, db, group) {
       debug6(`[${group.name}] - Group: ${child.sourceGroup?.name}`);
     }
     if (child.nodeType === "component" && child.sourceComponent) {
-      const chipId = child.sourceComponent.name || `chip_${index}`;
+      const chipId = getTreeChildChipId(child, index);
       const schematicComponent = db.schematic_component.getWhere({
         source_component_id: child.sourceComponent.source_component_id
       });
@@ -16380,7 +16410,7 @@ function convertTreeToInputProblem(tree, db, group) {
         };
       }
     } else if (child.nodeType === "group" && child.sourceGroup) {
-      const groupId = child.sourceGroup.name || `group_${index}`;
+      const groupId = getTreeChildChipId(child, index);
       debug6(`[${group.name}] Processing nested group: ${groupId}`);
       const schematicGroup = db.schematic_group?.getWhere?.({
         source_group_id: child.sourceGroup.source_group_id
@@ -16476,14 +16506,7 @@ function convertTreeToInputProblem(tree, db, group) {
     for (const pinId of chip.pins) {
       const pinNumber = pinId.split(".").pop();
       const treeNode = tree.childNodes.find((child) => {
-        if (child.nodeType === "component" && child.sourceComponent) {
-          return child.sourceComponent.name === chipId;
-        }
-        if (child.nodeType === "group" && child.sourceGroup) {
-          const expectedChipId = `group_${tree.childNodes.indexOf(child)}`;
-          return expectedChipId === chipId;
-        }
-        return false;
+        return getTreeChildChipId(child, tree.childNodes.indexOf(child)) === chipId;
       });
       if (treeNode?.nodeType === "group" && treeNode.sourceGroup) {
         const schematicGroup = db.schematic_group?.getWhere?.({
@@ -16568,14 +16591,10 @@ function convertTreeToInputProblem(tree, db, group) {
                 if (sourcePort && String(sourcePort.pin_number || sourcePort.name) === String(pinNumber)) {
                   const chipId = pinId.split(".")[0];
                   const treeNode = tree.childNodes.find((child) => {
-                    if (child.nodeType === "component" && child.sourceComponent) {
-                      return child.sourceComponent.name === chipId;
-                    }
-                    if (child.nodeType === "group" && child.sourceGroup) {
-                      const expectedChipId = `group_${tree.childNodes.indexOf(child)}`;
-                      return expectedChipId === chipId;
-                    }
-                    return false;
+                    return getTreeChildChipId(
+                      child,
+                      tree.childNodes.indexOf(child)
+                    ) === chipId;
                   });
                   if (treeNode?.nodeType === "component" && treeNode.sourceComponent) {
                     const portBelongsToComponent = db.source_port.list({
@@ -16696,23 +16715,13 @@ function Group_doInitialSchematicLayoutMatchPack(group) {
       `Processing placement for chip: ${chipId} at (${placement.x}, ${placement.y})`
     );
     const treeNode = tree.childNodes.find((child) => {
-      if (child.nodeType === "component" && child.sourceComponent) {
-        const matches = child.sourceComponent.name === chipId;
-        debug6(
-          `  Checking component ${child.sourceComponent.name}: matches=${matches}`
-        );
-        return matches;
-      }
-      if (child.nodeType === "group" && child.sourceGroup) {
-        const groupName = child.sourceGroup.name;
-        const expectedChipId = `group_${tree.childNodes.indexOf(child)}`;
-        const matches = expectedChipId === chipId;
-        debug6(
-          `  Checking group ${groupName} (expected chipId: ${expectedChipId}): matches=${matches}`
-        );
-        return matches;
-      }
-      return false;
+      const expectedChipId = getTreeChildChipId(
+        child,
+        tree.childNodes.indexOf(child)
+      );
+      const matches = expectedChipId === chipId;
+      debug6(`  Checking child ${expectedChipId}: matches=${matches}`);
+      return matches;
     });
     if (!treeNode) {
       debug6(`Warning: No tree node found for chip: ${chipId}`);
@@ -16721,7 +16730,7 @@ function Group_doInitialSchematicLayoutMatchPack(group) {
         tree.childNodes.map((child, idx) => ({
           type: child.nodeType,
           name: child.nodeType === "component" ? child.sourceComponent?.name : child.sourceGroup?.name,
-          expectedChipId: child.nodeType === "group" ? `group_${idx}` : child.sourceComponent?.name
+          expectedChipId: getTreeChildChipId(child, idx)
         }))
       );
       continue;
@@ -16878,6 +16887,110 @@ function Group_doInitialSchematicLayoutMatchPack(group) {
   debug6("Matchpack layout completed successfully");
 }
 
+// lib/components/primitive-components/Group/Group_doInitialSchematicBoxComponentRender.ts
+var parsePinNumberFromPortName = (name) => {
+  if (!name) return null;
+  const match = name.match(/^pin(\d+)$/i) ?? name.match(/^(\d+)$/);
+  if (!match) return null;
+  const pinNumber = Number(match[1]);
+  return Number.isFinite(pinNumber) && pinNumber > 0 ? pinNumber : null;
+};
+var getDirectGroupPorts = (group) => {
+  return group.children.filter((child) => {
+    return child.componentName === "Port";
+  });
+};
+var normalizeGroupSchematicBoxPorts = (group) => {
+  const { db } = group.root;
+  const ports = getDirectGroupPorts(group);
+  for (const port of ports) {
+    if (port._parsedProps.pinNumber !== void 0) continue;
+    const pinNumber = parsePinNumberFromPortName(port._parsedProps.name);
+    if (pinNumber === null) continue;
+    port._parsedProps.pinNumber = pinNumber;
+  }
+  const usedPinNumbers = new Set(
+    ports.map((port) => port._parsedProps.pinNumber).filter((pinNumber) => pinNumber !== void 0)
+  );
+  let nextPinNumber = 1;
+  for (const port of ports) {
+    if (port._parsedProps.pinNumber === void 0) {
+      while (usedPinNumbers.has(nextPinNumber)) nextPinNumber++;
+      port._parsedProps.pinNumber = nextPinNumber;
+      usedPinNumbers.add(nextPinNumber);
+    }
+    if (port.source_port_id) {
+      db.source_port.update(port.source_port_id, {
+        pin_number: port._parsedProps.pinNumber,
+        port_hints: port.getNameAndAliases()
+      });
+    }
+  }
+};
+var getGroupSchematicBoxPinLabels = (group) => {
+  const pinLabels = {};
+  for (const port of getDirectGroupPorts(group)) {
+    const pinNumber = port._parsedProps.pinNumber;
+    const name = port._parsedProps.name;
+    if (pinNumber === void 0 || !name) continue;
+    if (name === `pin${pinNumber}` || name === String(pinNumber)) continue;
+    pinLabels[`pin${pinNumber}`] = name;
+  }
+  return pinLabels;
+};
+var Group_doInitialSchematicBoxComponentRender = (group) => {
+  if (group.root?.schematicDisabled) return;
+  const { db } = group.root;
+  const props = group._parsedProps;
+  normalizeGroupSchematicBoxPorts(group);
+  const dimensions = group._getSchematicBoxDimensions();
+  if (!dimensions) return;
+  const center = group._getGlobalSchematicPositionBeforeLayout();
+  const size = dimensions.getSize();
+  const portLabels = group._getPinLabelsFromPorts();
+  const schPortArrangement = group._getSchematicPortArrangement();
+  const schematicComponent = db.schematic_component.insert({
+    center,
+    size,
+    source_group_id: group.source_group_id,
+    schematic_group_id: group.schematic_group_id ?? void 0,
+    subcircuit_id: group.subcircuit_id ?? group.getSubcircuit()?.subcircuit_id ?? void 0,
+    is_schematic_group: true,
+    is_box_with_pins: true,
+    port_arrangement: underscorifyPortArrangement(schPortArrangement),
+    pin_spacing: props.schPinSpacing ?? 0.2,
+    pin_styles: underscorifyPinStyles(
+      props.schPinStyle,
+      portLabels
+    ),
+    port_labels: portLabels
+  });
+  group.schematic_component_id = schematicComponent.schematic_component_id;
+  if (group.schematic_group_id) {
+    db.schematic_group.update(group.schematic_group_id, {
+      center,
+      width: size.width,
+      height: size.height,
+      schematic_component_ids: [schematicComponent.schematic_component_id]
+    });
+  }
+  const title = props.schTitle ?? props.name;
+  if (title) {
+    db.schematic_text.insert({
+      text: title,
+      schematic_component_id: schematicComponent.schematic_component_id,
+      anchor: "left",
+      rotation: 0,
+      position: {
+        x: center.x - size.width / 2,
+        y: center.y + size.height / 2 + 0.13
+      },
+      color: "#006464",
+      font_size: 0.18
+    });
+  }
+};
+
 // lib/components/primitive-components/Group/Group_doInitialSchematicTraceRender/Group_doInitialSchematicTraceRender.ts
 import { SchematicTracePipelineSolver as SchematicTracePipelineSolver4 } from "@tscircuit/schematic-trace-solver";
 import Debug11 from "debug";
@@ -18565,6 +18678,48 @@ var Group6 = class extends NormalComponent3 {
       componentName: "Group"
     };
   }
+  _ensureSchematicBoxPortsFromConnections() {
+    if (!this._parsedProps?.showAsSchematicBox) return;
+    if (!this._parsedProps?.connections) return;
+    for (const [pinName, target] of Object.entries(
+      this._parsedProps.connections
+    )) {
+      const existingPort = this.children.find(
+        (child) => child.componentName === "Port" && child.isMatchingAnyOf([pinName])
+      );
+      if (existingPort) continue;
+      const pinNumberMatch = pinName.match(/^pin(\d+)$/i) ?? pinName.match(/^(\d+)$/);
+      const pinNumber = pinNumberMatch ? Number(pinNumberMatch[1]) : void 0;
+      this.add(
+        new Port({
+          name: pinName,
+          pinNumber,
+          connectsTo: target
+        })
+      );
+    }
+  }
+  doInitialInitializePortsFromChildren() {
+    super.doInitialInitializePortsFromChildren();
+    this._ensureSchematicBoxPortsFromConnections();
+  }
+  updateInitializePortsFromChildren() {
+    super.updateInitializePortsFromChildren();
+    this._ensureSchematicBoxPortsFromConnections();
+  }
+  _getPrimaryPinCount() {
+    const superPinCount = super._getPrimaryPinCount();
+    if (!this._parsedProps?.showAsSchematicBox) return superPinCount;
+    const directPortPinNumbers = this.children.filter((child) => child.componentName === "Port").map((port) => port._parsedProps.pinNumber).filter((pinNumber) => pinNumber !== void 0);
+    if (directPortPinNumbers.length === 0) return superPinCount;
+    return Math.max(superPinCount, ...directPortPinNumbers);
+  }
+  _getPinLabelsFromPorts() {
+    if (!this._parsedProps?.showAsSchematicBox) {
+      return super._getPinLabelsFromPorts();
+    }
+    return getGroupSchematicBoxPinLabels(this);
+  }
   doInitialSourceGroupRender() {
     const { db } = this.root;
     const hasExplicitName = typeof this._parsedProps.name === "string" && this._parsedProps.name.length > 0;
@@ -19071,6 +19226,7 @@ var Group6 = class extends NormalComponent3 {
     this._startAsyncAutorouting();
   }
   doInitialSchematicTraceRender() {
+    if (this._parsedProps.showAsSchematicBox) return;
     Group_doInitialSchematicTraceRender(this);
   }
   updatePcbTraceRender() {
@@ -19196,7 +19352,11 @@ var Group6 = class extends NormalComponent3 {
       show_as_schematic_box: props.showAsSchematicBox ?? false
     });
     this.schematic_group_id = schematic_group.schematic_group_id;
+    if (props.showAsSchematicBox) {
+      Group_doInitialSchematicBoxComponentRender(this);
+    }
     for (const child of this.children) {
+      if (child._parsedProps?.showAsSchematicBox) continue;
       if (child.schematic_component_id) {
         db.schematic_component.update(child.schematic_component_id, {
           schematic_group_id: schematic_group.schematic_group_id
@@ -19231,6 +19391,10 @@ var Group6 = class extends NormalComponent3 {
     return "relative";
   }
   doInitialSchematicLayout() {
+    if (this._parsedProps.showAsSchematicBox) {
+      this._insertSchematicBorder();
+      return;
+    }
     const schematicLayoutMode = this._getSchematicLayoutMode();
     if (schematicLayoutMode === "match-adapt") {
       this._doInitialSchematicLayoutMatchpack();
@@ -20214,7 +20378,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1203",
+  version: "0.0.1204",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -23368,6 +23532,7 @@ var NetLabel = class extends PrimitiveComponent2 {
   }
   doInitialSchematicPrimitiveRender() {
     if (this.root?.schematicDisabled) return;
+    if (this.getCollapsedSchematicBoxAncestor()) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const anchorPos = this._getGlobalSchematicPositionBeforeLayout();
@@ -23426,6 +23591,7 @@ var NetLabel = class extends PrimitiveComponent2 {
   doInitialSchematicTraceRender() {
     if (!this.root?._featureMspSchematicTraceRouting) return;
     if (this.root?.schematicDisabled) return;
+    if (this.getCollapsedSchematicBoxAncestor()) return;
     const { db } = this.root;
     const connectsTo = this._resolveConnectsTo();
     if (!connectsTo || connectsTo.length === 0) return;
@@ -25089,6 +25255,7 @@ var SchematicText = class extends PrimitiveComponent2 {
   }
   doInitialSchematicPrimitiveRender() {
     if (this.root?.schematicDisabled) return;
+    if (this.getCollapsedSchematicBoxAncestor()) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const globalPos = this._getGlobalSchematicPositionBeforeLayout();
@@ -25138,6 +25305,7 @@ var SchematicLine = class extends PrimitiveComponent2 {
   schematic_line_id;
   doInitialSchematicPrimitiveRender() {
     if (this.root?.schematicDisabled) return;
+    if (this.getCollapsedSchematicBoxAncestor()) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const globalPos = this._getGlobalSchematicPositionBeforeLayout();
@@ -25191,6 +25359,7 @@ var SchematicRect = class extends PrimitiveComponent2 {
   schematic_rect_id;
   doInitialSchematicPrimitiveRender() {
     if (this.root?.schematicDisabled) return;
+    if (this.getCollapsedSchematicBoxAncestor()) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const globalPos = this._getGlobalSchematicPositionBeforeLayout();
@@ -25259,6 +25428,7 @@ var SchematicArc = class extends PrimitiveComponent2 {
   schematic_arc_id;
   doInitialSchematicPrimitiveRender() {
     if (this.root?.schematicDisabled) return;
+    if (this.getCollapsedSchematicBoxAncestor()) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const globalPos = this._getGlobalSchematicPositionBeforeLayout();
@@ -25318,6 +25488,7 @@ var SchematicCircle = class extends PrimitiveComponent2 {
   schematic_circle_id;
   doInitialSchematicPrimitiveRender() {
     if (this.root?.schematicDisabled) return;
+    if (this.getCollapsedSchematicBoxAncestor()) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const globalPos = this._getGlobalSchematicPositionBeforeLayout();
@@ -25506,6 +25677,7 @@ var SchematicPath = class extends PrimitiveComponent2 {
   }
   doInitialSchematicPrimitiveRender() {
     if (this.root?.schematicDisabled) return;
+    if (this.getCollapsedSchematicBoxAncestor()) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const globalPos = this._getGlobalSchematicPositionBeforeLayout();
@@ -25657,6 +25829,7 @@ var SchematicBox = class extends PrimitiveComponent2 {
   }
   doInitialSchematicPrimitiveRender() {
     if (this.root?.schematicDisabled) return;
+    if (this.getCollapsedSchematicBoxAncestor()) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const basePadding = 0.6;
@@ -25778,6 +25951,7 @@ var SchematicTable = class extends PrimitiveComponent2 {
   }
   doInitialSchematicPrimitiveRender() {
     if (this.root?.schematicDisabled) return;
+    if (this.getCollapsedSchematicBoxAncestor()) return;
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const rows = this.children.filter(

package/package.json

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