@tscircuit/core 0.0.1417 → 0.0.1419

package/dist/index.d.ts

@@ -2201,6 +2201,7 @@ declare class NormalComponent<ZodProps extends z.ZodType = any, PortNames extend
     pcb_missing_footprint_error_id?: string;
     _hasStartedFootprintUrlLoad: boolean;
     _hasStartedSupplierFootprintMismatchWarningCheck: boolean;
+    _hasInflatedCircuitJsonSymbol: boolean;
     private _invalidFootprintPropMessages;
     _invalidPinLabelMessages: string[];
     _impliedFootprintPinLabels?: Record<string, string | string[]>;
@@ -2238,6 +2239,7 @@ declare class NormalComponent<ZodProps extends z.ZodType = any, PortNames extend
     _getImpliedFootprintString(): string | null;
     resolveFootprint(): any;
     _addChildrenFromStringFootprint(): void;
+    _addChildrenFromCircuitJsonSymbol(): void;
     get portMap(): PortMap<PortNames>;
     getInstanceForReactElement(element: ReactElement): NormalComponent | null;
     doInitialSourceRender(): void;
@@ -61623,7 +61625,7 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
             frequency?: number | undefined;
             voltage?: number | undefined;
             peakToPeakVoltage?: number | undefined;
-            waveShape?: "square" | "sinewave" | "triangle" | "sawtooth" | undefined;
+            waveShape?: "square" | "triangle" | "sawtooth" | "sinewave" | undefined;
             phase?: number | undefined;
             dutyCycle?: number | undefined;
             pulseDelay?: number | undefined;
@@ -62215,7 +62217,7 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
             frequency?: string | number | undefined;
             voltage?: string | number | undefined;
             peakToPeakVoltage?: string | number | undefined;
-            waveShape?: "square" | "sinewave" | "triangle" | "sawtooth" | undefined;
+            waveShape?: "square" | "triangle" | "sawtooth" | "sinewave" | undefined;
             phase?: string | number | undefined;
             dutyCycle?: string | number | undefined;
             pulseDelay?: string | number | undefined;
@@ -66187,7 +66189,7 @@ declare class CurrentSource extends NormalComponent<typeof currentSourceProps, "
             schSheetName?: string | undefined;
             connections?: Partial<Record<"pin1" | "pin2" | "pos" | "neg", string | readonly string[] | string[]>> | undefined;
             frequency?: number | undefined;
-            waveShape?: "square" | "sinewave" | "triangle" | "sawtooth" | undefined;
+            waveShape?: "square" | "triangle" | "sawtooth" | "sinewave" | undefined;
             phase?: number | undefined;
             dutyCycle?: number | undefined;
             current?: number | undefined;
@@ -66774,7 +66776,7 @@ declare class CurrentSource extends NormalComponent<typeof currentSourceProps, "
             schSheetName?: string | undefined;
             connections?: Partial<Record<"pin1" | "pin2" | "pos" | "neg", string | readonly string[] | string[]>> | undefined;
             frequency?: string | number | undefined;
-            waveShape?: "square" | "sinewave" | "triangle" | "sawtooth" | undefined;
+            waveShape?: "square" | "triangle" | "sawtooth" | "sinewave" | undefined;
             phase?: string | number | undefined;
             dutyCycle?: string | number | undefined;
             current?: string | number | undefined;
@@ -76051,10 +76053,12 @@ declare class AutoroutingPhase extends PrimitiveComponent<typeof autoroutingPhas
             minViaHoleDiameter: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             minViaPadDiameter: zod.ZodOptional<zod.ZodEffects<zod.ZodUnion<[zod.ZodString, zod.ZodNumber]>, number, string | number>>;
             key: zod.ZodOptional<zod.ZodAny>;
+            name: zod.ZodOptional<zod.ZodString>;
             autorouter: zod.ZodOptional<zod.ZodType<_tscircuit_props.AutorouterProp, zod.ZodTypeDef, _tscircuit_props.AutorouterProp>>;
             phaseIndex: zod.ZodOptional<zod.ZodNumber>;
         }, "strip", zod.ZodTypeAny, {
             key?: any;
+            name?: string | undefined;
             connections?: string[] | undefined;
             minTraceWidth?: number | undefined;
             minViaHoleEdgeToViaHoleEdgeClearance?: number | undefined;
@@ -76078,6 +76082,7 @@ declare class AutoroutingPhase extends PrimitiveComponent<typeof autoroutingPhas
             reroute?: boolean | undefined;
         }, {
             key?: any;
+            name?: string | undefined;
             connections?: string[] | undefined;
             minTraceWidth?: string | number | undefined;
             minViaHoleEdgeToViaHoleEdgeClearance?: string | number | undefined;
@@ -76101,6 +76106,7 @@ declare class AutoroutingPhase extends PrimitiveComponent<typeof autoroutingPhas
             reroute?: boolean | undefined;
         }>, {
             key?: any;
+            name?: string | undefined;
             connections?: string[] | undefined;
             minTraceWidth?: number | undefined;
             minViaHoleEdgeToViaHoleEdgeClearance?: number | undefined;
@@ -76124,6 +76130,7 @@ declare class AutoroutingPhase extends PrimitiveComponent<typeof autoroutingPhas
             reroute?: boolean | undefined;
         }, {
             key?: any;
+            name?: string | undefined;
             connections?: string[] | undefined;
             minTraceWidth?: string | number | undefined;
             minViaHoleEdgeToViaHoleEdgeClearance?: string | number | undefined;
@@ -135839,6 +135846,7 @@ declare class Mosfet extends NormalComponent<typeof mosfetProps> {
         } & {
             channelType: zod.ZodEnum<["n", "p"]>;
             mosfetMode: zod.ZodEnum<["enhancement", "depletion"]>;
+            connections: zod.ZodOptional<zod.ZodRecord<zod.ZodEnum<["pin1", "drain", "pin2", "source", "pin3", "gate"]>, zod.ZodUnion<[zod.ZodUnion<[zod.ZodString, zod.ZodReadonly<zod.ZodArray<zod.ZodString, "many">>]>, zod.ZodArray<zod.ZodString, "many">]>>>;
         }, "strip", zod.ZodTypeAny, {
             name: string;
             channelType: "n" | "p";
@@ -136419,6 +136427,7 @@ declare class Mosfet extends NormalComponent<typeof mosfetProps> {
             manufacturerPartNumber?: string | undefined;
             schSectionName?: string | undefined;
             schSheetName?: string | undefined;
+            connections?: Partial<Record<"pin1" | "pin2" | "source" | "pin3" | "gate" | "drain", string | readonly string[] | string[]>> | undefined;
         }, {
             name: string;
             channelType: "n" | "p";
@@ -137001,6 +137010,7 @@ declare class Mosfet extends NormalComponent<typeof mosfetProps> {
             manufacturerPartNumber?: string | undefined;
             schSectionName?: string | undefined;
             schSheetName?: string | undefined;
+            connections?: Partial<Record<"pin1" | "pin2" | "source" | "pin3" | "gate" | "drain", string | readonly string[] | string[]>> | undefined;
         }>;
         shouldRenderAsSchematicBox: boolean;
     };

package/dist/index.js

@@ -10401,8 +10401,8 @@ var createComponentsFromCircuitJson = ({
     schematicComponentsByImportedId.set(elm.schematic_component_id, elm);
   }
   const addSchematicPrimitive = (elm, primitive) => {
-    const schematicSymbolId = getSchematicSymbolId(elm);
-    const parentSymbol = schematicSymbolId ? schematicSymbolsByImportedId.get(schematicSymbolId) : void 0;
+    const schematicSymbolId = getSchematicSymbolId(elm) ?? ("schematic_component_id" in elm && typeof elm.schematic_component_id === "string" ? schematicComponentsByImportedId.get(elm.schematic_component_id)?.schematic_symbol_id : void 0);
+    const parentSymbol = typeof schematicSymbolId === "string" ? schematicSymbolsByImportedId.get(schematicSymbolId) : void 0;
     if (parentSymbol) {
       parentSymbol.add(primitive);
     } else {
@@ -11592,6 +11592,151 @@ var getNumericSchPinStyle = (pinStyles, pinLabels) => {
   return numericPinStyles;
 };
 
+// lib/utils/schematic/isCircuitJsonSymbol.ts
+var isSymbolElementType = (elementType) => elementType === "schematic_symbol" || elementType === "schematic_component" || elementType === "schematic_line" || elementType === "schematic_rect" || elementType === "schematic_circle" || elementType === "schematic_arc" || elementType === "schematic_text" || elementType === "schematic_path";
+var isCircuitJsonSymbol = (circuitJson) => {
+  return Array.isArray(circuitJson) && circuitJson.length > 0 && circuitJson.some((element) => isSymbolElementType(element.type));
+};
+
+// lib/utils/schematic/normalizeSchematicSymbolCircuitJson.ts
+var isFinitePoint = (point6) => typeof point6?.x === "number" && Number.isFinite(point6.x) && typeof point6.y === "number" && Number.isFinite(point6.y);
+var translatePoint = (point6, origin) => ({
+  x: point6.x - origin.x,
+  y: point6.y - origin.y
+});
+var isTranslatableSchematicElement = (element) => element.type === "schematic_component" || element.type === "schematic_port" || element.type === "schematic_line" || element.type === "schematic_rect" || element.type === "schematic_circle" || element.type === "schematic_arc" || element.type === "schematic_text" || element.type === "schematic_path";
+var getNormalizationOrigin = (symbolCircuitJson) => {
+  const primarySchematicComponent = symbolCircuitJson.find(
+    (element) => element.type === "schematic_component" && isFinitePoint(element.center)
+  );
+  if (primarySchematicComponent) {
+    return primarySchematicComponent.center;
+  }
+  const schematicElements = symbolCircuitJson.filter(
+    isTranslatableSchematicElement
+  );
+  if (schematicElements.length === 0) return null;
+  const bounds = getBoundsForSchematic(schematicElements);
+  if (!Number.isFinite(bounds.minX) || !Number.isFinite(bounds.maxX) || !Number.isFinite(bounds.minY) || !Number.isFinite(bounds.maxY)) {
+    return null;
+  }
+  return {
+    x: (bounds.minX + bounds.maxX) / 2,
+    y: (bounds.minY + bounds.maxY) / 2
+  };
+};
+var translateSchematicElement = (element, origin) => {
+  switch (element.type) {
+    case "schematic_component":
+    case "schematic_port":
+    case "schematic_rect":
+    case "schematic_circle":
+    case "schematic_arc":
+      return isFinitePoint(element.center) ? {
+        ...element,
+        center: translatePoint(element.center, origin)
+      } : element;
+    case "schematic_line":
+      return {
+        ...element,
+        x1: element.x1 - origin.x,
+        y1: element.y1 - origin.y,
+        x2: element.x2 - origin.x,
+        y2: element.y2 - origin.y
+      };
+    case "schematic_text":
+      return isFinitePoint(element.position) ? {
+        ...element,
+        position: translatePoint(element.position, origin)
+      } : element;
+    case "schematic_path":
+      return {
+        ...element,
+        points: element.points.map((point6) => translatePoint(point6, origin))
+      };
+    default:
+      return element;
+  }
+};
+var normalizeSchematicSymbolCircuitJson = (symbolCircuitJson) => {
+  const origin = getNormalizationOrigin(symbolCircuitJson);
+  if (!origin) return [...symbolCircuitJson];
+  if (origin.x === 0 && origin.y === 0) {
+    return [...symbolCircuitJson];
+  }
+  return symbolCircuitJson.map(
+    (element) => translateSchematicElement(element, origin)
+  );
+};
+
+// lib/utils/schematic/selectSymbolCircuitJson.ts
+var isImportedSymbolPrimitive = (elm) => elm.type === "schematic_line" || elm.type === "schematic_rect" || elm.type === "schematic_circle" || elm.type === "schematic_arc" || elm.type === "schematic_text" || elm.type === "schematic_path";
+var getStringProp = (elm, propName) => {
+  if (!(propName in elm)) return void 0;
+  const rawProp = elm[propName];
+  return typeof rawProp === "string" ? rawProp : void 0;
+};
+var selectSymbolCircuitJson = (circuitJson) => {
+  const schematicSymbols = circuitJson.filter(
+    (elm) => elm.type === "schematic_symbol"
+  );
+  const schematicComponents = circuitJson.filter(
+    (elm) => elm.type === "schematic_component"
+  );
+  const primarySymbolId = schematicComponents.find(
+    (elm) => typeof elm.schematic_symbol_id === "string"
+  )?.schematic_symbol_id ?? schematicSymbols[0]?.schematic_symbol_id;
+  const primaryComponent = (primarySymbolId ? schematicComponents.find(
+    (elm) => elm.schematic_symbol_id === primarySymbolId
+  ) : void 0) ?? schematicComponents[0];
+  const primaryComponentId = primaryComponent?.schematic_component_id;
+  const primarySourceComponentId = typeof primaryComponent?.source_component_id === "string" ? primaryComponent.source_component_id : void 0;
+  const primarySymbol = (primarySymbolId ? schematicSymbols.find(
+    (elm) => elm.schematic_symbol_id === primarySymbolId
+  ) : void 0) ?? schematicSymbols[0];
+  const relatedSourcePortIds = /* @__PURE__ */ new Set();
+  const selected = /* @__PURE__ */ new Set();
+  const selectedElements = [];
+  const add = (elm) => {
+    if (!elm || selected.has(elm)) return;
+    selected.add(elm);
+    selectedElements.push(elm);
+  };
+  add(primarySymbol);
+  add(primaryComponent);
+  for (const elm of circuitJson) {
+    if (elm.type !== "schematic_port") continue;
+    if (!primaryComponentId || elm.schematic_component_id !== primaryComponentId) {
+      continue;
+    }
+    add(elm);
+    if (typeof elm.source_port_id === "string") {
+      relatedSourcePortIds.add(elm.source_port_id);
+    }
+  }
+  for (const elm of circuitJson) {
+    if (!isImportedSymbolPrimitive(elm)) continue;
+    const schematicSymbolId = getStringProp(elm, "schematic_symbol_id");
+    const schematicComponentId = getStringProp(elm, "schematic_component_id");
+    const isRelatedPrimitive = primarySymbolId && schematicSymbolId === primarySymbolId || primaryComponentId && schematicComponentId === primaryComponentId || !primarySymbolId && !primaryComponentId;
+    if (isRelatedPrimitive) {
+      add(elm);
+    }
+  }
+  for (const elm of circuitJson) {
+    if (elm.type !== "source_port") continue;
+    if (relatedSourcePortIds.has(elm.source_port_id) || primarySourceComponentId && elm.source_component_id === primarySourceComponentId) {
+      add(elm);
+    }
+  }
+  if (selectedElements.length > 0) {
+    return selectedElements;
+  }
+  return circuitJson.filter(
+    (elm) => elm.type === "schematic_symbol" || elm.type === "schematic_component" || elm.type === "schematic_port" || isImportedSymbolPrimitive(elm)
+  );
+};
+
 // lib/components/base-components/NormalComponent/NormalComponent.ts
 import {
   isValidElement as isReactElement3,
@@ -11983,63 +12128,6 @@ var Footprint = class extends PrimitiveComponent2 {
   }
 };
 
-// lib/components/base-components/NormalComponent/NormalComponent_doInitialCheckRefDesConvention.ts
-var defaultExpectedPrefixesByFtype = {
-  simple_ammeter: ["A"],
-  simple_battery: ["B", "BT"],
-  simple_capacitor: ["C"],
-  simple_chip: ["U", "IC"],
-  simple_connector: ["J", "P", "CONN"],
-  simple_crystal: ["Y", "X"],
-  simple_current_source: ["I", "IS"],
-  simple_diode: ["D"],
-  simple_fuse: ["F"],
-  simple_inductor: ["L", "FB"],
-  simple_interconnect: ["ICN"],
-  simple_led: ["D", "LED"],
-  simple_mosfet: ["Q"],
-  simple_op_amp: ["U", "IC"],
-  simple_pin_header: ["J", "P", "JP"],
-  simple_pinout: ["J", "P"],
-  simple_potentiometer: ["RV", "RP"],
-  simple_power_source: ["B", "BT", "V", "VS"],
-  simple_push_button: ["SW", "S"],
-  simple_resistor: ["R"],
-  simple_resonator: ["Y", "X"],
-  simple_switch: ["SW", "S"],
-  simple_test_point: ["TP"],
-  simple_transistor: ["Q"],
-  simple_voltage_probe: ["VP"],
-  simple_voltage_source: ["V", "VS"]
-};
-var getDefaultExpectedRefDesPrefixesForFtype = (ftype) => {
-  if (!ftype) return void 0;
-  return defaultExpectedPrefixesByFtype[ftype];
-};
-var getRefDesPrefix = (refDes) => refDes.match(/^[A-Za-z]+/)?.[0]?.toUpperCase();
-var NormalComponent_doInitialCheckRefDesConvention = (component) => {
-  const { db } = component.root;
-  if (!component.source_component_id) return;
-  const sourceComponent = db.source_component.get(component.source_component_id);
-  if (!sourceComponent?.name || !sourceComponent.ftype) return;
-  const expectedPrefixes = component.getRefDesPrefixes();
-  if (!expectedPrefixes || expectedPrefixes.length === 0) return;
-  const actualPrefix = getRefDesPrefix(sourceComponent.name);
-  if (actualPrefix && expectedPrefixes.includes(actualPrefix)) return;
-  const expectedPrefixMessage = expectedPrefixes.length === 1 ? expectedPrefixes[0] : `one of ${expectedPrefixes.join(", ")}`;
-  db.insert({
-    type: "source_refdes_convention_warning",
-    warning_type: "source_refdes_convention_warning",
-    message: `Component ${sourceComponent.name} has ftype="${sourceComponent.ftype}" but reference designator should start with ${expectedPrefixMessage}`,
-    source_component_id: sourceComponent.source_component_id,
-    refdes: sourceComponent.name,
-    source_component_ftype: sourceComponent.ftype,
-    expected_prefixes: expectedPrefixes,
-    actual_prefix: actualPrefix,
-    subcircuit_id: sourceComponent.subcircuit_id
-  });
-};
-
 // lib/components/base-components/NormalComponent/NormalComponent__getMinimumFlexContainerSize.ts
 import { getBoundsFromPoints as getBoundsFromPoints2 } from "@tscircuit/math-utils";
 var NormalComponent__getMinimumFlexContainerSize = (component) => {
@@ -12102,6 +12190,63 @@ var NormalComponent__repositionOnPcb = (component, position) => {
   );
 };
 
+// lib/components/base-components/NormalComponent/NormalComponent_doInitialCheckRefDesConvention.ts
+var defaultExpectedPrefixesByFtype = {
+  simple_ammeter: ["A"],
+  simple_battery: ["B", "BT"],
+  simple_capacitor: ["C"],
+  simple_chip: ["U", "IC"],
+  simple_connector: ["J", "P", "CONN"],
+  simple_crystal: ["Y", "X"],
+  simple_current_source: ["I", "IS"],
+  simple_diode: ["D"],
+  simple_fuse: ["F"],
+  simple_inductor: ["L", "FB"],
+  simple_interconnect: ["ICN"],
+  simple_led: ["D", "LED"],
+  simple_mosfet: ["Q"],
+  simple_op_amp: ["U", "IC"],
+  simple_pin_header: ["J", "P", "JP"],
+  simple_pinout: ["J", "P"],
+  simple_potentiometer: ["RV", "RP"],
+  simple_power_source: ["B", "BT", "V", "VS"],
+  simple_push_button: ["SW", "S"],
+  simple_resistor: ["R"],
+  simple_resonator: ["Y", "X"],
+  simple_switch: ["SW", "S"],
+  simple_test_point: ["TP"],
+  simple_transistor: ["Q"],
+  simple_voltage_probe: ["VP"],
+  simple_voltage_source: ["V", "VS"]
+};
+var getDefaultExpectedRefDesPrefixesForFtype = (ftype) => {
+  if (!ftype) return void 0;
+  return defaultExpectedPrefixesByFtype[ftype];
+};
+var getRefDesPrefix = (refDes) => refDes.match(/^[A-Za-z]+/)?.[0]?.toUpperCase();
+var NormalComponent_doInitialCheckRefDesConvention = (component) => {
+  const { db } = component.root;
+  if (!component.source_component_id) return;
+  const sourceComponent = db.source_component.get(component.source_component_id);
+  if (!sourceComponent?.name || !sourceComponent.ftype) return;
+  const expectedPrefixes = component.getRefDesPrefixes();
+  if (!expectedPrefixes || expectedPrefixes.length === 0) return;
+  const actualPrefix = getRefDesPrefix(sourceComponent.name);
+  if (actualPrefix && expectedPrefixes.includes(actualPrefix)) return;
+  const expectedPrefixMessage = expectedPrefixes.length === 1 ? expectedPrefixes[0] : `one of ${expectedPrefixes.join(", ")}`;
+  db.insert({
+    type: "source_refdes_convention_warning",
+    warning_type: "source_refdes_convention_warning",
+    message: `Component ${sourceComponent.name} has ftype="${sourceComponent.ftype}" but reference designator should start with ${expectedPrefixMessage}`,
+    source_component_id: sourceComponent.source_component_id,
+    refdes: sourceComponent.name,
+    source_component_ftype: sourceComponent.ftype,
+    expected_prefixes: expectedPrefixes,
+    actual_prefix: actualPrefix,
+    subcircuit_id: sourceComponent.subcircuit_id
+  });
+};
+
 // lib/components/base-components/NormalComponent/NormalComponent_doInitialPcbComponentAnchorAlignment.ts
 function NormalComponent_doInitialPcbComponentAnchorAlignment(component) {
   if (component.root?.pcbDisabled) return;
@@ -12510,6 +12655,79 @@ function NormalComponent_doInitialResolveFootprintPinLabels(component) {
   }
 }
 
+// lib/components/base-components/NormalComponent/NormalComponent_doInitialSchematicComponentRender.ts
+import { schematic_manual_edit_conflict_warning } from "circuit-json";
+import { isValidElement as isReactElement2 } from "react";
+function NormalComponent_doInitialSchematicComponentRender(component) {
+  if (component.root?.schematicDisabled) return;
+  if (component.getCollapsedSchematicBoxAncestor()) return;
+  const { db } = component.root;
+  if (component._invalidPinLabelMessages?.length && component.root?.db) {
+    for (const message of component._invalidPinLabelMessages) {
+      let property_name = "pinLabels";
+      const match = message.match(/^Invalid pin label:\s*([^=]+)=\s*'([^']+)'/);
+      if (match) {
+        const label = match[2];
+        property_name = `pinLabels['${label}']`;
+      }
+      component.root.db.source_property_ignored_warning.insert({
+        source_component_id: component.source_component_id,
+        property_name,
+        message,
+        error_type: "source_property_ignored_warning"
+      });
+    }
+  }
+  if (component._parsedProps.schPinSpacing !== void 0 && component.root?.db) {
+    component.root.db.source_property_ignored_warning.insert({
+      source_component_id: component.source_component_id,
+      property_name: "schPinSpacing",
+      error_type: "source_property_ignored_warning",
+      message: "schPinSpacing is deprecated and will be ignored. Pin spacing is always 0.2."
+    });
+  }
+  const { schematicSymbolName } = component.config;
+  const { _parsedProps: props } = component;
+  const hasSymbolChild = component.children.some(
+    (c) => c.componentName === "Symbol"
+  );
+  if (props.symbol && isReactElement2(props.symbol) || hasSymbolChild) {
+    component._doInitialSchematicComponentRenderWithReactSymbol(props.symbol);
+  } else if (schematicSymbolName) {
+    component._doInitialSchematicComponentRenderWithSymbol();
+  } else {
+    const dimensions = component._getSchematicBoxDimensions();
+    if (dimensions) {
+      component._doInitialSchematicComponentRenderWithSchematicBoxDimensions();
+    }
+  }
+  const manualPlacement = component.getSubcircuit()?._getSchematicManualPlacementForComponent(component);
+  if (component.schematic_component_id && (component.props.schX !== void 0 || component.props.schY !== void 0) && !!manualPlacement) {
+    if (!component.schematic_component_id) {
+      return;
+    }
+    const warning = schematic_manual_edit_conflict_warning.parse({
+      type: "schematic_manual_edit_conflict_warning",
+      schematic_manual_edit_conflict_warning_id: `schematic_manual_edit_conflict_${component.source_component_id}`,
+      message: `${component.getString()} has both manual placement and prop coordinates. schX and schY will be used. Remove schX/schY or clear the manual placement.`,
+      schematic_component_id: component.schematic_component_id,
+      source_component_id: component.source_component_id,
+      subcircuit_id: component.getSubcircuit()?.subcircuit_id
+    });
+    db.schematic_manual_edit_conflict_warning.insert(warning);
+  }
+  const schSheetName = component._parsedProps?.schSheetName ?? component.props.schSheetName;
+  if (schSheetName && component.source_component_id && !component._resolveSchematicSheetId()) {
+    db.source_property_ignored_warning.insert({
+      source_component_id: component.source_component_id,
+      property_name: "schSheetName",
+      error_type: "source_property_ignored_warning",
+      subcircuit_id: component.getSubcircuit()?.subcircuit_id ?? void 0,
+      message: `${component.getString()} references schSheetName "${schSheetName}", which does not match any schematic sheet and will be ignored.`
+    });
+  }
+}
+
 // lib/components/base-components/NormalComponent/utils/getPcbTextBounds.ts
 function getPcbTextBounds(text) {
   const fontSize = text.font_size;
@@ -12822,79 +13040,6 @@ function NormalComponent_doInitialSupplierFootprintMismatchWarning(component) {
   });
 }
 
-// lib/components/base-components/NormalComponent/NormalComponent_doInitialSchematicComponentRender.ts
-import { schematic_manual_edit_conflict_warning } from "circuit-json";
-import { isValidElement as isReactElement2 } from "react";
-function NormalComponent_doInitialSchematicComponentRender(component) {
-  if (component.root?.schematicDisabled) return;
-  if (component.getCollapsedSchematicBoxAncestor()) return;
-  const { db } = component.root;
-  if (component._invalidPinLabelMessages?.length && component.root?.db) {
-    for (const message of component._invalidPinLabelMessages) {
-      let property_name = "pinLabels";
-      const match = message.match(/^Invalid pin label:\s*([^=]+)=\s*'([^']+)'/);
-      if (match) {
-        const label = match[2];
-        property_name = `pinLabels['${label}']`;
-      }
-      component.root.db.source_property_ignored_warning.insert({
-        source_component_id: component.source_component_id,
-        property_name,
-        message,
-        error_type: "source_property_ignored_warning"
-      });
-    }
-  }
-  if (component._parsedProps.schPinSpacing !== void 0 && component.root?.db) {
-    component.root.db.source_property_ignored_warning.insert({
-      source_component_id: component.source_component_id,
-      property_name: "schPinSpacing",
-      error_type: "source_property_ignored_warning",
-      message: "schPinSpacing is deprecated and will be ignored. Pin spacing is always 0.2."
-    });
-  }
-  const { schematicSymbolName } = component.config;
-  const { _parsedProps: props } = component;
-  const hasSymbolChild = component.children.some(
-    (c) => c.componentName === "Symbol"
-  );
-  if (props.symbol && isReactElement2(props.symbol) || hasSymbolChild) {
-    component._doInitialSchematicComponentRenderWithReactSymbol(props.symbol);
-  } else if (schematicSymbolName) {
-    component._doInitialSchematicComponentRenderWithSymbol();
-  } else {
-    const dimensions = component._getSchematicBoxDimensions();
-    if (dimensions) {
-      component._doInitialSchematicComponentRenderWithSchematicBoxDimensions();
-    }
-  }
-  const manualPlacement = component.getSubcircuit()?._getSchematicManualPlacementForComponent(component);
-  if (component.schematic_component_id && (component.props.schX !== void 0 || component.props.schY !== void 0) && !!manualPlacement) {
-    if (!component.schematic_component_id) {
-      return;
-    }
-    const warning = schematic_manual_edit_conflict_warning.parse({
-      type: "schematic_manual_edit_conflict_warning",
-      schematic_manual_edit_conflict_warning_id: `schematic_manual_edit_conflict_${component.source_component_id}`,
-      message: `${component.getString()} has both manual placement and prop coordinates. schX and schY will be used. Remove schX/schY or clear the manual placement.`,
-      schematic_component_id: component.schematic_component_id,
-      source_component_id: component.source_component_id,
-      subcircuit_id: component.getSubcircuit()?.subcircuit_id
-    });
-    db.schematic_manual_edit_conflict_warning.insert(warning);
-  }
-  const schSheetName = component._parsedProps?.schSheetName ?? component.props.schSheetName;
-  if (schSheetName && component.source_component_id && !component._resolveSchematicSheetId()) {
-    db.source_property_ignored_warning.insert({
-      source_component_id: component.source_component_id,
-      property_name: "schSheetName",
-      error_type: "source_property_ignored_warning",
-      subcircuit_id: component.getSubcircuit()?.subcircuit_id ?? void 0,
-      message: `${component.getString()} references schSheetName "${schSheetName}", which does not match any schematic sheet and will be ignored.`
-    });
-  }
-}
-
 // lib/components/base-components/NormalComponent/utils/canMergePortDefinitions.ts
 var canMergePortDefinitions = (a, b) => {
   const aPinNumber = a._parsedProps.pinNumber;
@@ -13084,6 +13229,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
   pcb_missing_footprint_error_id;
   _hasStartedFootprintUrlLoad = false;
   _hasStartedSupplierFootprintMismatchWarningCheck = false;
+  _hasInflatedCircuitJsonSymbol = false;
   _invalidFootprintPropMessages = [];
   _invalidPinLabelMessages = [];
   _impliedFootprintPinLabels;
@@ -13131,6 +13277,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     }
     this._invalidPinLabelMessages = invalidPinLabelsMessages;
     this._addChildrenFromStringFootprint();
+    this._addChildrenFromCircuitJsonSymbol();
     this.initPorts();
   }
   doInitialSourceNameDuplicateComponentRemoval() {
@@ -13181,6 +13328,8 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     const pinLabelsFromProps = propsPinLabels && Array.isArray(propsPinLabels) ? Object.fromEntries(
       propsPinLabels.map((label, index) => [`pin${index + 1}`, label])
     ) : propsPinLabels;
+    const existingChildPorts = this._getAllPortsFromChildren();
+    const hasExistingOrQueuedPortWithPinNumber = (pinNumber) => existingChildPorts.some((p) => p._parsedProps.pinNumber === pinNumber) || portsToCreate.some((p) => p._parsedProps.pinNumber === pinNumber);
     const schPortArrangement = this._getSchematicPortArrangement();
     if (schPortArrangement && !pinLabels) {
       for (const side in schPortArrangement) {
@@ -13191,6 +13340,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
               pinNumberOrLabel,
               pinLabels
             );
+            if (hasExistingOrQueuedPortWithPinNumber(pinNumber)) continue;
             portsToCreate.push(
               new Port(
                 {
@@ -13210,11 +13360,13 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       for (const side of sides) {
         const size = schPortArrangement[`${side}Size`];
         for (let i = 0; i < size; i++) {
+          const nextPinNumber = pinNum++;
+          if (hasExistingOrQueuedPortWithPinNumber(nextPinNumber)) continue;
           portsToCreate.push(
             new Port(
               {
-                pinNumber: pinNum++,
-                aliases: opts.additionalAliases?.[`pin${pinNum}`] ?? []
+                pinNumber: nextPinNumber,
+                aliases: opts.additionalAliases?.[`pin${nextPinNumber}`] ?? []
               },
               {
                 originDescription: `schPortArrangement:${side}`
@@ -13232,9 +13384,9 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
             `Invalid pinLabels key "${pinKey}". Expected "pin\${number}" (e.g. pin1, pin2).`
           );
         }
-        let existingPort = portsToCreate.find(
+        let existingPort = existingChildPorts.find(
           (p) => p._parsedProps.pinNumber === pinNumber
-        );
+        ) ?? portsToCreate.find((p) => p._parsedProps.pinNumber === pinNumber);
         const labelList = Array.isArray(label) ? label : [label];
         const propLabel = pinLabelsFromProps?.[pinKey];
         const hasPropLabel = propLabel !== void 0;
@@ -13291,10 +13443,8 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     }
     if (!this._getSchematicPortArrangement()) {
       const hasReactSymbol = isValidElement(this.props.symbol);
-      const symbolAlreadyAdded = this.children.some(
-        (c) => c.componentName === "Symbol"
-      );
-      if (hasReactSymbol && !symbolAlreadyAdded) {
+      const hasCircuitJsonSymbolProp = isCircuitJsonSymbol(this.props.symbol);
+      if (hasReactSymbol || hasCircuitJsonSymbolProp) {
       } else {
         const portsFromFootprint = this.getPortsFromFootprint({
           ...opts,
@@ -13321,7 +13471,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     }
     const requiredPinCount = opts.pinCount ?? this._getPrimaryPinCount() ?? 0;
     for (let pn = 1; pn <= requiredPinCount; pn++) {
-      if (portsToCreate.find((p) => p._parsedProps.pinNumber === pn)) continue;
+      if (hasExistingOrQueuedPortWithPinNumber(pn)) continue;
       if (!schPortArrangement && pinLabelsFromProps && !Array.isArray(propsPinLabels) && !pinLabelsFromProps[`pin${pn}`]) {
         continue;
       }
@@ -13425,6 +13575,41 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       this.addAll(fpComponents);
     }
   }
+  _addChildrenFromCircuitJsonSymbol() {
+    if (this._hasInflatedCircuitJsonSymbol) return;
+    const symbol = this._parsedProps.symbol;
+    if (!isCircuitJsonSymbol(symbol)) return;
+    if (this.children.some((component) => component.componentName === "Symbol")) {
+      this._hasInflatedCircuitJsonSymbol = true;
+      return;
+    }
+    const selectedSymbolCircuitJson = selectSymbolCircuitJson(symbol);
+    if (selectedSymbolCircuitJson.length === 0) return;
+    const symbolCircuitJson = normalizeSchematicSymbolCircuitJson(
+      selectedSymbolCircuitJson
+    );
+    const importedSymbolComponents = createComponentsFromCircuitJson(
+      {
+        componentName: this.name ?? this.componentName,
+        componentRotation: String(this.props.schRotation ?? 0)
+      },
+      symbolCircuitJson
+    );
+    if (importedSymbolComponents.length === 0) return;
+    this._hasInflatedCircuitJsonSymbol = true;
+    const hasImportedSymbolContainer = importedSymbolComponents.some(
+      (component) => component.componentName === "Symbol"
+    );
+    if (!hasImportedSymbolContainer) {
+      const symbolComponent = new SymbolComponent({
+        name: this.name ?? this.componentName
+      });
+      symbolComponent.addAll(importedSymbolComponents);
+      this.add(symbolComponent);
+      return;
+    }
+    this.addAll(importedSymbolComponents);
+  }
   get portMap() {
     return new Proxy(
       {},
@@ -25411,7 +25596,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1416",
+  version: "0.0.1418",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -25460,7 +25645,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.567",
+    "@tscircuit/props": "^0.0.570",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.95",
     "@tscircuit/solver-utils": "^0.0.16",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1417",
+  "version": "0.0.1419",
   "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.567",
+    "@tscircuit/props": "^0.0.570",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.95",
     "@tscircuit/solver-utils": "^0.0.16",