@tscircuit/core 0.0.771 → 0.0.772

package/dist/index.d.ts

@@ -380,6 +380,14 @@ declare abstract class PrimitiveComponent<ZodProps extends ZodType = any> extend
      */
     _computePcbGlobalTransformBeforeLayout(): Matrix;
     getPrimitiveContainer(): PrimitiveComponent | null;
+    /**
+     * Walk up the component hierarchy to find the nearest NormalComponent ancestor.
+     * This is useful for primitive components that need access to component IDs
+     * (pcb_component_id, schematic_component_id, source_component_id) from their
+     * parent NormalComponent, even when there are intermediate primitive containers
+     * like Symbol in the hierarchy.
+     */
+    getParentNormalComponent(): any | null;
     /**
      * Compute the PCB bounds of this component the circuit json elements
      * associated with it.
@@ -888,18 +896,27 @@ declare const portProps: z.ZodObject<{
     aliases: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
     layer: z.ZodOptional<z.ZodString>;
     layers: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+    schX: z.ZodOptional<z.ZodNumber>;
+    schY: z.ZodOptional<z.ZodNumber>;
+    direction: z.ZodOptional<z.ZodEnum<["up", "down", "left", "right"]>>;
 }, "strip", z.ZodTypeAny, {
     name?: string | undefined;
     layer?: string | undefined;
     layers?: string[] | undefined;
     pinNumber?: number | undefined;
     aliases?: string[] | undefined;
+    schX?: number | undefined;
+    schY?: number | undefined;
+    direction?: "left" | "right" | "up" | "down" | undefined;
 }, {
     name?: string | undefined;
     layer?: string | undefined;
     layers?: string[] | undefined;
     pinNumber?: number | undefined;
     aliases?: string[] | undefined;
+    schX?: number | undefined;
+    schY?: number | undefined;
+    direction?: "left" | "right" | "up" | "down" | undefined;
 }>;
 declare class Port extends PrimitiveComponent<typeof portProps> {
     source_port_id: string | null;
@@ -917,18 +934,27 @@ declare class Port extends PrimitiveComponent<typeof portProps> {
             aliases: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
             layer: z.ZodOptional<z.ZodString>;
             layers: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
+            schX: z.ZodOptional<z.ZodNumber>;
+            schY: z.ZodOptional<z.ZodNumber>;
+            direction: z.ZodOptional<z.ZodEnum<["up", "down", "left", "right"]>>;
         }, "strip", z.ZodTypeAny, {
             name?: string | undefined;
             layer?: string | undefined;
             layers?: string[] | undefined;
             pinNumber?: number | undefined;
             aliases?: string[] | undefined;
+            schX?: number | undefined;
+            schY?: number | undefined;
+            direction?: "left" | "right" | "up" | "down" | undefined;
         }, {
             name?: string | undefined;
             layer?: string | undefined;
             layers?: string[] | undefined;
             pinNumber?: number | undefined;
             aliases?: string[] | undefined;
+            schX?: number | undefined;
+            schY?: number | undefined;
+            direction?: "left" | "right" | "up" | "down" | undefined;
         }>;
     };
     constructor(props: z.input<typeof portProps>, opts?: {
@@ -14562,6 +14588,8 @@ declare const voltageSourceProps: z.ZodObject<{
     pcbRotation?: number | undefined;
     layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
     phase?: number | undefined;
+    schX?: number | undefined;
+    schY?: number | undefined;
     pcbX?: number | undefined;
     voltage?: number | undefined;
     frequency?: number | undefined;
@@ -14579,8 +14607,6 @@ declare const voltageSourceProps: z.ZodObject<{
     schMarginLeft?: number | undefined;
     schMarginX?: number | undefined;
     schMarginY?: number | undefined;
-    schX?: number | undefined;
-    schY?: number | undefined;
     schRotation?: number | undefined;
     schRelative?: boolean | undefined;
     pcbRelative?: boolean | undefined;
@@ -14742,6 +14768,8 @@ declare const voltageSourceProps: z.ZodObject<{
         name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
     } | undefined;
     phase?: string | number | undefined;
+    schX?: string | number | undefined;
+    schY?: string | number | undefined;
     pcbX?: string | number | undefined;
     voltage?: string | number | undefined;
     frequency?: string | number | undefined;
@@ -14759,8 +14787,6 @@ declare const voltageSourceProps: z.ZodObject<{
     schMarginLeft?: string | number | undefined;
     schMarginX?: string | number | undefined;
     schMarginY?: string | number | undefined;
-    schX?: string | number | undefined;
-    schY?: string | number | undefined;
     schRotation?: string | number | undefined;
     schRelative?: boolean | undefined;
     pcbRelative?: boolean | undefined;
@@ -15563,6 +15589,8 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
             pcbRotation?: number | undefined;
             layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
             phase?: number | undefined;
+            schX?: number | undefined;
+            schY?: number | undefined;
             pcbX?: number | undefined;
             voltage?: number | undefined;
             frequency?: number | undefined;
@@ -15580,8 +15608,6 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
             schMarginLeft?: number | undefined;
             schMarginX?: number | undefined;
             schMarginY?: number | undefined;
-            schX?: number | undefined;
-            schY?: number | undefined;
             schRotation?: number | undefined;
             schRelative?: boolean | undefined;
             pcbRelative?: boolean | undefined;
@@ -15743,6 +15769,8 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
                 name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
             } | undefined;
             phase?: string | number | undefined;
+            schX?: string | number | undefined;
+            schY?: string | number | undefined;
             pcbX?: string | number | undefined;
             voltage?: string | number | undefined;
             frequency?: string | number | undefined;
@@ -15760,8 +15788,6 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
             schMarginLeft?: string | number | undefined;
             schMarginX?: string | number | undefined;
             schMarginY?: string | number | undefined;
-            schX?: string | number | undefined;
-            schY?: string | number | undefined;
             schRotation?: string | number | undefined;
             schRelative?: boolean | undefined;
             pcbRelative?: boolean | undefined;

package/dist/index.js

@@ -777,6 +777,23 @@ var PrimitiveComponent2 = class extends Renderable {
     if (this.isPrimitiveContainer) return this;
     return this.parent?.getPrimitiveContainer?.() ?? null;
   }
+  /**
+   * Walk up the component hierarchy to find the nearest NormalComponent ancestor.
+   * This is useful for primitive components that need access to component IDs
+   * (pcb_component_id, schematic_component_id, source_component_id) from their
+   * parent NormalComponent, even when there are intermediate primitive containers
+   * like Symbol in the hierarchy.
+   */
+  getParentNormalComponent() {
+    let current = this.parent;
+    while (current) {
+      if (current.isPrimitiveContainer && current.doInitialPcbComponentRender) {
+        return current;
+      }
+      current = current.parent;
+    }
+    return null;
+  }
   /**
    * Compute the PCB bounds of this component the circuit json elements
    * associated with it.
@@ -1084,7 +1101,8 @@ var PrimitiveComponent2 = class extends Renderable {
     if (!this.isSubcircuit) return;
     const ports = this.selectAll("port");
     for (const port of ports) {
-      const parentAliases = port.parent?.getNameAndAliases();
+      const parentComponent = port.getParentNormalComponent?.() ?? port.parent;
+      const parentAliases = parentComponent?.getNameAndAliases();
       const portAliases = port.getNameAndAliases();
       if (!parentAliases) continue;
       for (const parentAlias of parentAliases) {
@@ -3314,7 +3332,10 @@ var portProps = z6.object({
   pinNumber: z6.number().optional(),
   aliases: z6.array(z6.string()).optional(),
   layer: z6.string().optional(),
-  layers: z6.array(z6.string()).optional()
+  layers: z6.array(z6.string()).optional(),
+  schX: z6.number().optional(),
+  schY: z6.number().optional(),
+  direction: z6.enum(["up", "down", "left", "right"]).optional()
 });
 var Port = class extends PrimitiveComponent2 {
   source_port_id = null;
@@ -3409,7 +3430,12 @@ var Port = class extends PrimitiveComponent2 {
    * are rendered properly.
    */
   _hasSchematicPort() {
-    const symbol = this.parent?.getSchematicSymbol();
+    const { schX, schY } = this._parsedProps;
+    if (schX !== void 0 && schY !== void 0) {
+      return true;
+    }
+    const parentNormalComponent = this.getParentNormalComponent();
+    const symbol = parentNormalComponent?.getSchematicSymbol();
     if (symbol) {
       if (this.schematicSymbolPortDef) return true;
       const portsInternallyConnectedToThisPort = this._getPortsInternallyConnectedToThisPort();
@@ -3417,7 +3443,7 @@ var Port = class extends PrimitiveComponent2 {
         return true;
       return false;
     }
-    const parentBoxDim = this?.parent?._getSchematicBoxDimensions();
+    const parentBoxDim = parentNormalComponent?._getSchematicBoxDimensions();
     if (parentBoxDim && this.props.pinNumber !== void 0) {
       const localPortPosition = parentBoxDim.getPortPositionByPinNumber(
         this.props.pinNumber
@@ -3427,7 +3453,12 @@ var Port = class extends PrimitiveComponent2 {
     return false;
   }
   _getGlobalSchematicPositionBeforeLayout() {
-    const symbol = this.parent?.getSchematicSymbol();
+    const { schX, schY } = this._parsedProps;
+    if (schX !== void 0 && schY !== void 0) {
+      return { x: schX, y: schY };
+    }
+    const parentNormalComponent = this.getParentNormalComponent();
+    const symbol = parentNormalComponent?.getSchematicSymbol();
     if (symbol) {
       let schematicSymbolPortDef = this.schematicSymbolPortDef;
       if (!schematicSymbolPortDef) {
@@ -3441,12 +3472,12 @@ var Port = class extends PrimitiveComponent2 {
         }
       }
       const transform = compose3(
-        this.parent.computeSchematicGlobalTransform(),
+        parentNormalComponent.computeSchematicGlobalTransform(),
         translate3(-symbol.center.x, -symbol.center.y)
       );
       return applyToPoint5(transform, schematicSymbolPortDef);
     }
-    const parentBoxDim = this?.parent?._getSchematicBoxDimensions();
+    const parentBoxDim = parentNormalComponent?._getSchematicBoxDimensions();
     if (parentBoxDim && this.props.pinNumber !== void 0) {
       const localPortPosition = parentBoxDim.getPortPositionByPinNumber(
         this.props.pinNumber
@@ -3457,7 +3488,7 @@ var Port = class extends PrimitiveComponent2 {
         );
       }
       return applyToPoint5(
-        this.parent.computeSchematicGlobalTransform(),
+        parentNormalComponent.computeSchematicGlobalTransform(),
         localPortPosition
       );
     }
@@ -3519,7 +3550,8 @@ var Port = class extends PrimitiveComponent2 {
     return this.isMatchingAnyOf(port.getNameAndAliases());
   }
   getPortSelector() {
-    return `.${this.parent?.props.name} > port.${this.props.name}`;
+    const parentComponent = this.getParentNormalComponent() ?? this.parent;
+    return `.${parentComponent?.props.name} > port.${this.props.name}`;
   }
   getAvailablePcbLayers() {
     const { layer, layers } = this._parsedProps;
@@ -3543,35 +3575,42 @@ var Port = class extends PrimitiveComponent2 {
     const { db } = this.root;
     const { _parsedProps: props } = this;
     const port_hints = this.getNameAndAliases();
+    const parentNormalComponent = this.getParentNormalComponent();
+    const parentWithSourceId = this.parent?.source_component_id ? this.parent : parentNormalComponent;
+    const source_component_id = parentWithSourceId?.source_component_id ?? null;
     const source_port = db.source_port.insert({
       name: props.name,
       pin_number: props.pinNumber,
       port_hints,
-      source_component_id: this.parent?.source_component_id,
+      source_component_id,
       subcircuit_id: this.getSubcircuit()?.subcircuit_id
     });
     this.source_port_id = source_port.source_port_id;
   }
   doInitialSourceParentAttachment() {
     const { db } = this.root;
-    if (!this.parent?.source_component_id) {
+    const parentNormalComponent = this.getParentNormalComponent();
+    const parentWithSourceId = this.parent?.source_component_id ? this.parent : parentNormalComponent;
+    if (!parentWithSourceId?.source_component_id) {
       throw new Error(
         `${this.getString()} has no parent source component (parent: ${this.parent?.getString()})`
       );
     }
     db.source_port.update(this.source_port_id, {
-      source_component_id: this.parent?.source_component_id,
+      source_component_id: parentWithSourceId.source_component_id,
       subcircuit_id: this.getSubcircuit()?.subcircuit_id
     });
-    this.source_component_id = this.parent?.source_component_id;
+    this.source_component_id = parentWithSourceId.source_component_id;
   }
   doInitialPcbPortRender() {
     if (this.root?.pcbDisabled) return;
     const { db } = this.root;
     const { matchedComponents } = this;
-    if (!this.parent?.pcb_component_id) {
+    const parentNormalComponent = this.getParentNormalComponent();
+    const parentWithPcbComponentId = this.parent?.pcb_component_id ? this.parent : parentNormalComponent;
+    if (!parentWithPcbComponentId?.pcb_component_id) {
       throw new Error(
-        `${this.getString()} has no parent pcb component, cannot render pcb_port (parent: ${this.parent?.getString()})`
+        `${this.getString()} has no parent pcb component, cannot render pcb_port (parent: ${this.parent?.getString()}, parentNormalComponent: ${parentNormalComponent?.getString()})`
       );
     }
     const pcbMatches = matchedComponents.filter((c) => c.isPcbPrimitive);
@@ -3592,7 +3631,7 @@ var Port = class extends PrimitiveComponent2 {
       const subcircuit = this.getSubcircuit();
       const isBoardPinout = this._shouldIncludeInBoardPinout();
       const pcb_port = db.pcb_port.insert({
-        pcb_component_id: this.parent?.pcb_component_id,
+        pcb_component_id: parentWithPcbComponentId.pcb_component_id,
         layers: this.getAvailablePcbLayers(),
         subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
         pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0,
@@ -3628,10 +3667,12 @@ var Port = class extends PrimitiveComponent2 {
       }
     }
     if (!matchCenter) return;
+    const parentNormalComponent = this.getParentNormalComponent();
+    const parentWithPcbComponentId = this.parent?.pcb_component_id ? this.parent : parentNormalComponent;
     const subcircuit = this.getSubcircuit();
     const isBoardPinout = this._shouldIncludeInBoardPinout();
     const pcb_port = db.pcb_port.insert({
-      pcb_component_id: this.parent?.pcb_component_id,
+      pcb_component_id: parentWithPcbComponentId?.pcb_component_id,
       layers: this.getAvailablePcbLayers(),
       subcircuit_id: subcircuit?.subcircuit_id ?? void 0,
       pcb_group_id: this.getGroup()?.pcb_group_id ?? void 0,
@@ -3645,7 +3686,8 @@ var Port = class extends PrimitiveComponent2 {
   doInitialSchematicPortRender() {
     const { db } = this.root;
     const { _parsedProps: props } = this;
-    const container = this.getPrimitiveContainer();
+    const { schX, schY } = props;
+    const container = schX !== void 0 && schY !== void 0 ? this.getParentNormalComponent() : this.getPrimitiveContainer();
     if (!container) return;
     if (!this._hasSchematicPort()) return;
     const containerCenter = container._getGlobalSchematicPositionBeforeLayout();
@@ -3685,7 +3727,8 @@ var Port = class extends PrimitiveComponent2 {
       labelHints.push(portHint);
     }
     let bestDisplayPinLabel = void 0;
-    const showPinAliases = this.parent?.props?.showPinAliases;
+    const parentNormalComponent = this.getParentNormalComponent();
+    const showPinAliases = parentNormalComponent?.props?.showPinAliases;
     if (showPinAliases && labelHints.length > 0) {
       bestDisplayPinLabel = labelHints.join("/");
     } else if (labelHints.length > 0) {
@@ -3693,7 +3736,7 @@ var Port = class extends PrimitiveComponent2 {
     }
     const schematicPortInsertProps = {
       type: "schematic_port",
-      schematic_component_id: this.parent?.schematic_component_id,
+      schematic_component_id: parentNormalComponent?.schematic_component_id,
       center: portCenter,
       source_port_id: this.source_port_id,
       facing_direction: this.facingDirection,
@@ -7683,7 +7726,6 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       is_box_with_pins: false
     });
     this.schematic_component_id = schematic_component2.schematic_component_id;
-    this.add(symbolElement);
   }
   _doInitialSchematicComponentRenderWithSchematicBoxDimensions() {
     if (this.root?.schematicDisabled) return;
@@ -7902,6 +7944,15 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
         this.add(fpElm);
       }
     }
+    const symElm = this.props.symbol;
+    if (isValidElement(symElm)) {
+      const hasSymbolChild = this.children.some(
+        (c) => c.componentName === "Symbol"
+      );
+      if (!hasSymbolChild) {
+        this.add(symElm);
+      }
+    }
     const cmElm = this.props.cadModel;
     if (isValidElement(cmElm)) {
       this._isCadModelChild = true;
@@ -16074,7 +16125,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.770",
+  version: "0.0.771",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",

package/package.json

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