@tscircuit/core 0.0.1384 → 0.0.1385

package/dist/index.d.ts

@@ -239,9 +239,9 @@ interface IIsolatedCircuit {
 interface IRootCircuit extends IIsolatedCircuit {
 }
 
-declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "RenderIsolatedSubcircuits", "InflateSubcircuitCircuitJson", "SourceNameDuplicateComponentRemoval", "PcbFootprintStringRender", "FetchPartFootprint", "InitializePortsFromChildren", "CreateNetsFromProps", "AssignFallbackProps", "CreateTracesFromProps", "CreateTracesFromNetLabels", "CreateTraceHintsFromProps", "CreateAutoplacedBreakoutPoints", "SourceGroupRender", "AssignNameToUnnamedComponents", "SourceRender", "SourceComponentPropertyValidation", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SourceDesignRuleChecks", "SimulationRender", "SchematicComponentRender", "SchematicPortRender", "SymbolContainerRender", "SchematicPrimitiveRender", "SchematicSymbolResize", "SchematicComponentSizeCalculation", "SchematicLayout", "SchematicSectionRender", "SchematicTraceRender", "SchematicSheetRender", "SchematicReplaceNetLabelsWithSymbols", "PanelBoardLayout", "ValidatePcbCoordinates", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbComponentAnchorAlignment", "PcbCalcPlacementResolution", "PcbLayout", "PcbBoardAutoSize", "PanelLayout", "PcbAutoplaceBreakoutPoints", "PcbTraceHintRender", "PcbManualTraceRender", "PcbTraceRender", "PcbRouteNetIslands", "PcbCopperPourRender", "PcbDesignRuleChecks", "SilkscreenOverlapAdjustment", "CadModelRender", "PartsEngineRender", "SupplierFootprintMismatchWarning", "SimulationSpiceEngineRender"];
+declare const orderedRenderPhases: readonly ["ReactSubtreesRender", "RenderIsolatedSubcircuits", "InflateSubcircuitCircuitJson", "SourceNameDuplicateComponentRemoval", "PcbFootprintStringRender", "FetchPartFootprint", "ResolveFootprintPinLabels", "InitializePortsFromChildren", "CreateNetsFromProps", "AssignFallbackProps", "CreateTracesFromProps", "CreateTracesFromNetLabels", "CreateTraceHintsFromProps", "CreateAutoplacedBreakoutPoints", "SourceGroupRender", "AssignNameToUnnamedComponents", "SourceRender", "SourceComponentPropertyValidation", "SourceParentAttachment", "PortMatching", "OptimizeSelectorCache", "SourceTraceRender", "SourceAddConnectivityMapKey", "SourceDesignRuleChecks", "SimulationRender", "SchematicComponentRender", "SchematicPortRender", "SymbolContainerRender", "SchematicPrimitiveRender", "SchematicSymbolResize", "SchematicComponentSizeCalculation", "SchematicLayout", "SchematicSectionRender", "SchematicTraceRender", "SchematicSheetRender", "SchematicReplaceNetLabelsWithSymbols", "PanelBoardLayout", "ValidatePcbCoordinates", "PcbComponentRender", "PcbPrimitiveRender", "PcbFootprintLayout", "PcbPortRender", "PcbPortAttachment", "PcbComponentSizeCalculation", "PcbComponentAnchorAlignment", "PcbCalcPlacementResolution", "PcbLayout", "PcbBoardAutoSize", "PanelLayout", "PcbAutoplaceBreakoutPoints", "PcbTraceHintRender", "PcbManualTraceRender", "PcbTraceRender", "PcbRouteNetIslands", "PcbCopperPourRender", "PcbDesignRuleChecks", "SilkscreenOverlapAdjustment", "CadModelRender", "PartsEngineRender", "SupplierFootprintMismatchWarning", "SimulationSpiceEngineRender"];
 type RenderPhase = (typeof orderedRenderPhases)[number];
-declare const renderPhaseIndexMap: Map<"ReactSubtreesRender" | "RenderIsolatedSubcircuits" | "InflateSubcircuitCircuitJson" | "SourceNameDuplicateComponentRemoval" | "PcbFootprintStringRender" | "FetchPartFootprint" | "InitializePortsFromChildren" | "CreateNetsFromProps" | "AssignFallbackProps" | "CreateTracesFromProps" | "CreateTracesFromNetLabels" | "CreateTraceHintsFromProps" | "CreateAutoplacedBreakoutPoints" | "SourceGroupRender" | "AssignNameToUnnamedComponents" | "SourceRender" | "SourceComponentPropertyValidation" | "SourceParentAttachment" | "PortMatching" | "OptimizeSelectorCache" | "SourceTraceRender" | "SourceAddConnectivityMapKey" | "SourceDesignRuleChecks" | "SimulationRender" | "SchematicComponentRender" | "SchematicPortRender" | "SymbolContainerRender" | "SchematicPrimitiveRender" | "SchematicSymbolResize" | "SchematicComponentSizeCalculation" | "SchematicLayout" | "SchematicSectionRender" | "SchematicTraceRender" | "SchematicSheetRender" | "SchematicReplaceNetLabelsWithSymbols" | "PanelBoardLayout" | "ValidatePcbCoordinates" | "PcbComponentRender" | "PcbPrimitiveRender" | "PcbFootprintLayout" | "PcbPortRender" | "PcbPortAttachment" | "PcbComponentSizeCalculation" | "PcbComponentAnchorAlignment" | "PcbCalcPlacementResolution" | "PcbLayout" | "PcbBoardAutoSize" | "PanelLayout" | "PcbAutoplaceBreakoutPoints" | "PcbTraceHintRender" | "PcbManualTraceRender" | "PcbTraceRender" | "PcbRouteNetIslands" | "PcbCopperPourRender" | "PcbDesignRuleChecks" | "SilkscreenOverlapAdjustment" | "CadModelRender" | "PartsEngineRender" | "SupplierFootprintMismatchWarning" | "SimulationSpiceEngineRender", number>;
+declare const renderPhaseIndexMap: Map<"ReactSubtreesRender" | "RenderIsolatedSubcircuits" | "InflateSubcircuitCircuitJson" | "SourceNameDuplicateComponentRemoval" | "PcbFootprintStringRender" | "FetchPartFootprint" | "ResolveFootprintPinLabels" | "InitializePortsFromChildren" | "CreateNetsFromProps" | "AssignFallbackProps" | "CreateTracesFromProps" | "CreateTracesFromNetLabels" | "CreateTraceHintsFromProps" | "CreateAutoplacedBreakoutPoints" | "SourceGroupRender" | "AssignNameToUnnamedComponents" | "SourceRender" | "SourceComponentPropertyValidation" | "SourceParentAttachment" | "PortMatching" | "OptimizeSelectorCache" | "SourceTraceRender" | "SourceAddConnectivityMapKey" | "SourceDesignRuleChecks" | "SimulationRender" | "SchematicComponentRender" | "SchematicPortRender" | "SymbolContainerRender" | "SchematicPrimitiveRender" | "SchematicSymbolResize" | "SchematicComponentSizeCalculation" | "SchematicLayout" | "SchematicSectionRender" | "SchematicTraceRender" | "SchematicSheetRender" | "SchematicReplaceNetLabelsWithSymbols" | "PanelBoardLayout" | "ValidatePcbCoordinates" | "PcbComponentRender" | "PcbPrimitiveRender" | "PcbFootprintLayout" | "PcbPortRender" | "PcbPortAttachment" | "PcbComponentSizeCalculation" | "PcbComponentAnchorAlignment" | "PcbCalcPlacementResolution" | "PcbLayout" | "PcbBoardAutoSize" | "PanelLayout" | "PcbAutoplaceBreakoutPoints" | "PcbTraceHintRender" | "PcbManualTraceRender" | "PcbTraceRender" | "PcbRouteNetIslands" | "PcbCopperPourRender" | "PcbDesignRuleChecks" | "SilkscreenOverlapAdjustment" | "CadModelRender" | "PartsEngineRender" | "SupplierFootprintMismatchWarning" | "SimulationSpiceEngineRender", number>;
 type RenderPhaseFn<K extends RenderPhase = RenderPhase> = `doInitial${K}` | `update${K}` | `remove${K}`;
 type RenderPhaseStates = Record<RenderPhase, {
     initialized: boolean;
@@ -2173,6 +2173,7 @@ declare class NormalComponent<ZodProps extends z.ZodType = any, PortNames extend
     _hasStartedSupplierFootprintMismatchWarningCheck: boolean;
     private _invalidFootprintPropMessages;
     _invalidPinLabelMessages: string[];
+    _impliedFootprintPinLabels?: Record<string, string | string[]>;
     /**
      * Set to true to enable automatic silkscreen text adjustment when it overlaps with other components
      */
@@ -2203,6 +2204,7 @@ declare class NormalComponent<ZodProps extends z.ZodType = any, PortNames extend
         pinCount?: number;
         ignoreSymbolPorts?: boolean;
     }): void;
+    _resolvePinLabels(): Record<string, string | string[]> | undefined;
     _getImpliedFootprintString(): string | null;
     resolveFootprint(): any;
     _addChildrenFromStringFootprint(): void;
@@ -2242,6 +2244,8 @@ declare class NormalComponent<ZodProps extends z.ZodType = any, PortNames extend
     updateSchematicComponentSizeCalculation(): void;
     doInitialPcbComponentAnchorAlignment(): void;
     updatePcbComponentAnchorAlignment(): void;
+    doInitialResolveFootprintPinLabels(): void;
+    updateResolveFootprintPinLabels(): void;
     _renderReactSubtree(element: ReactElement): ReactSubtree;
     doInitialInitializePortsFromChildren(): void;
     updateInitializePortsFromChildren(): void;
@@ -2268,6 +2272,7 @@ declare class NormalComponent<ZodProps extends z.ZodType = any, PortNames extend
     add(componentOrElm: PrimitiveComponent | ReactElement): void;
     getPortsFromFootprint(opts?: {
         additionalAliases?: Record<string, string[]>;
+        allowImplicitPinNumbers?: boolean;
         collectInferredInternallyConnectedPins?: boolean;
     }): Port[];
     private _queueInvalidFootprintPropMessage;
@@ -25969,6 +25974,7 @@ declare class Diode extends NormalComponent<typeof diodeProps, PolarizedPassiveP
             photo: zod.ZodOptional<zod.ZodBoolean>;
             tvs: zod.ZodOptional<zod.ZodBoolean>;
             schOrientation: zod.ZodOptional<zod.ZodEnum<["vertical", "horizontal", "pos_top", "pos_bottom", "pos_left", "pos_right", "neg_top", "neg_bottom", "neg_left", "neg_right"]>>;
+            pinLabels: zod.ZodOptional<zod.ZodRecord<zod.ZodEnum<["pin1", "left", "anode", "pos", "pin2", "right", "cathode", "neg"]>, zod.ZodUnion<[zod.ZodUnion<[zod.ZodString, zod.ZodReadonly<zod.ZodArray<zod.ZodString, "many">>]>, zod.ZodArray<zod.ZodString, "many">]>>>;
         }, "strip", zod.ZodTypeAny, {
             name: string;
             variant: "standard" | "schottky" | "zener" | "avalanche" | "photo" | "tvs";
@@ -26549,6 +26555,7 @@ declare class Diode extends NormalComponent<typeof diodeProps, PolarizedPassiveP
             schSectionName?: string | undefined;
             schSheetName?: string | undefined;
             connections?: Partial<Record<"pin1" | "pin2" | "anode" | "pos" | "cathode" | "neg", string | readonly string[] | string[]>> | undefined;
+            pinLabels?: Partial<Record<"left" | "right" | "pin1" | "pin2" | "anode" | "pos" | "cathode" | "neg", string | readonly string[] | string[]>> | undefined;
             standard?: boolean | undefined;
             schOrientation?: "vertical" | "horizontal" | "pos_top" | "pos_bottom" | "pos_left" | "pos_right" | "neg_top" | "neg_bottom" | "neg_left" | "neg_right" | undefined;
             schottky?: boolean | undefined;
@@ -27137,6 +27144,7 @@ declare class Diode extends NormalComponent<typeof diodeProps, PolarizedPassiveP
             schSectionName?: string | undefined;
             schSheetName?: string | undefined;
             connections?: Partial<Record<"pin1" | "pin2" | "anode" | "pos" | "cathode" | "neg", string | readonly string[] | string[]>> | undefined;
+            pinLabels?: Partial<Record<"left" | "right" | "pin1" | "pin2" | "anode" | "pos" | "cathode" | "neg", string | readonly string[] | string[]>> | undefined;
             standard?: boolean | undefined;
             schOrientation?: "vertical" | "horizontal" | "pos_top" | "pos_bottom" | "pos_left" | "pos_right" | "neg_top" | "neg_bottom" | "neg_left" | "neg_right" | undefined;
             schottky?: boolean | undefined;
@@ -27725,6 +27733,7 @@ declare class Diode extends NormalComponent<typeof diodeProps, PolarizedPassiveP
             schSectionName?: string | undefined;
             schSheetName?: string | undefined;
             connections?: Partial<Record<"pin1" | "pin2" | "anode" | "pos" | "cathode" | "neg", string | readonly string[] | string[]>> | undefined;
+            pinLabels?: Partial<Record<"left" | "right" | "pin1" | "pin2" | "anode" | "pos" | "cathode" | "neg", string | readonly string[] | string[]>> | undefined;
             standard?: boolean | undefined;
             schOrientation?: "vertical" | "horizontal" | "pos_top" | "pos_bottom" | "pos_left" | "pos_right" | "neg_top" | "neg_bottom" | "neg_left" | "neg_right" | undefined;
             schottky?: boolean | undefined;
@@ -28313,6 +28322,7 @@ declare class Diode extends NormalComponent<typeof diodeProps, PolarizedPassiveP
             schSectionName?: string | undefined;
             schSheetName?: string | undefined;
             connections?: Partial<Record<"pin1" | "pin2" | "anode" | "pos" | "cathode" | "neg", string | readonly string[] | string[]>> | undefined;
+            pinLabels?: Partial<Record<"left" | "right" | "pin1" | "pin2" | "anode" | "pos" | "cathode" | "neg", string | readonly string[] | string[]>> | undefined;
             standard?: boolean | undefined;
             schOrientation?: "vertical" | "horizontal" | "pos_top" | "pos_bottom" | "pos_left" | "pos_right" | "neg_top" | "neg_bottom" | "neg_left" | "neg_right" | undefined;
             schottky?: boolean | undefined;
@@ -28907,6 +28917,7 @@ declare class Diode extends NormalComponent<typeof diodeProps, PolarizedPassiveP
             schSectionName?: string | undefined;
             schSheetName?: string | undefined;
             connections?: Partial<Record<"pin1" | "pin2" | "anode" | "pos" | "cathode" | "neg", string | readonly string[] | string[]>> | undefined;
+            pinLabels?: Partial<Record<"left" | "right" | "pin1" | "pin2" | "anode" | "pos" | "cathode" | "neg", string | readonly string[] | string[]>> | undefined;
             schOrientation?: "vertical" | "horizontal" | "pos_top" | "pos_bottom" | "pos_left" | "pos_right" | "neg_top" | "neg_bottom" | "neg_left" | "neg_right" | undefined;
         }, {
             name: string;
@@ -29489,6 +29500,7 @@ declare class Diode extends NormalComponent<typeof diodeProps, PolarizedPassiveP
             schSectionName?: string | undefined;
             schSheetName?: string | undefined;
             connections?: Partial<Record<"pin1" | "pin2" | "anode" | "pos" | "cathode" | "neg", string | readonly string[] | string[]>> | undefined;
+            pinLabels?: Partial<Record<"left" | "right" | "pin1" | "pin2" | "anode" | "pos" | "cathode" | "neg", string | readonly string[] | string[]>> | undefined;
             standard?: boolean | undefined;
             schOrientation?: "vertical" | "horizontal" | "pos_top" | "pos_bottom" | "pos_left" | "pos_right" | "neg_top" | "neg_bottom" | "neg_left" | "neg_right" | undefined;
             schottky?: boolean | undefined;
@@ -29502,10 +29514,10 @@ declare class Diode extends NormalComponent<typeof diodeProps, PolarizedPassiveP
     };
     initPorts(): void;
     doInitialSourceRender(): void;
-    pos: Port;
-    anode: Port;
-    neg: Port;
-    cathode: Port;
+    get pos(): Port;
+    get anode(): Port;
+    get neg(): Port;
+    get cathode(): Port;
 }
 
 declare class Fuse extends NormalComponent<typeof fuseProps, PassivePorts> {

package/dist/index.js

@@ -326,6 +326,7 @@ var orderedRenderPhases = [
   "SourceNameDuplicateComponentRemoval",
   "PcbFootprintStringRender",
   "FetchPartFootprint",
+  "ResolveFootprintPinLabels",
   "InitializePortsFromChildren",
   "CreateNetsFromProps",
   "AssignFallbackProps",
@@ -386,6 +387,7 @@ var renderPhaseIndexMap = new Map(
 );
 var asyncPhaseDependencies = {
   InflateSubcircuitCircuitJson: ["RenderIsolatedSubcircuits"],
+  ResolveFootprintPinLabels: ["PcbFootprintStringRender", "FetchPartFootprint"],
   SchematicComponentRender: ["PcbFootprintStringRender", "FetchPartFootprint"],
   SchematicPortRender: ["PcbFootprintStringRender", "FetchPartFootprint"],
   SymbolContainerRender: ["PcbFootprintStringRender", "FetchPartFootprint"],
@@ -10246,6 +10248,13 @@ var calculateCcwRotation = (componentRotationStr, elementCcwRotation) => {
   return normalizedRotation;
 };
 var optional = (value) => value ?? void 0;
+var getPinNumberFromPortHints = (portHints) => {
+  for (const hint of portHints ?? []) {
+    if (/^\d+$/.test(hint)) return Number(hint);
+    const pinNameMatch = /^pin(\d+)$/i.exec(hint);
+    if (pinNameMatch) return Number(pinNameMatch[1]);
+  }
+};
 var getFacingDirectionFromSide = (side) => {
   switch (side) {
     case "left":
@@ -10282,13 +10291,52 @@ var createComponentsFromCircuitJson = ({
   const components = [];
   const schematicSymbolsByImportedId = /* @__PURE__ */ new Map();
   const schematicComponentsByImportedId = /* @__PURE__ */ new Map();
+  const sourceComponentIdByPcbComponentId = /* @__PURE__ */ new Map();
   const sourcePortsByImportedId = /* @__PURE__ */ new Map();
+  const sourcePortsByComponentAndPinNumber = /* @__PURE__ */ new Map();
   const schematicStrokeWidthBySymbolId = /* @__PURE__ */ new Map();
   for (const elm of circuitJson) {
+    if (elm.type === "pcb_component" && typeof elm.source_component_id === "string") {
+      sourceComponentIdByPcbComponentId.set(
+        elm.pcb_component_id,
+        elm.source_component_id
+      );
+    }
     if (elm.type === "source_port") {
       sourcePortsByImportedId.set(elm.source_port_id, elm);
+      if (typeof elm.pin_number === "number" && typeof elm.source_component_id === "string") {
+        let sourcePortsByPinNumber = sourcePortsByComponentAndPinNumber.get(
+          elm.source_component_id
+        );
+        if (!sourcePortsByPinNumber) {
+          sourcePortsByPinNumber = /* @__PURE__ */ new Map();
+          sourcePortsByComponentAndPinNumber.set(
+            elm.source_component_id,
+            sourcePortsByPinNumber
+          );
+        }
+        sourcePortsByPinNumber.set(elm.pin_number, elm);
+      }
     }
   }
+  const getPortHintsWithSourcePortAliases = (portHints, pcbComponentId) => {
+    const pinNumber = getPinNumberFromPortHints(portHints);
+    const sourceComponentId = typeof pcbComponentId === "string" ? sourceComponentIdByPcbComponentId.get(pcbComponentId) : void 0;
+    const sourcePort = typeof pinNumber === "number" && sourceComponentId ? sourcePortsByComponentAndPinNumber.get(sourceComponentId)?.get(pinNumber) : void 0;
+    if (!sourcePort) return portHints;
+    const mergedPortHints = Array.from(
+      new Set(
+        [
+          ...portHints ?? [],
+          ...sourcePort.port_hints ?? [],
+          sourcePort.name
+        ].filter(
+          (alias) => typeof alias === "string" && alias.length > 0
+        )
+      )
+    );
+    return mergedPortHints.length > 0 ? mergedPortHints : portHints;
+  };
   for (const elm of circuitJson) {
     if (elm.type !== "schematic_symbol") continue;
     const schematicSymbol = new SymbolComponent({
@@ -10320,6 +10368,10 @@ var createComponentsFromCircuitJson = ({
     }
   };
   for (const elm of circuitJson) {
+    const resolvedPortHints = "port_hints" in elm ? getPortHintsWithSourcePortAliases(
+      elm.port_hints,
+      "pcb_component_id" in elm ? elm.pcb_component_id : void 0
+    ) : void 0;
     if (elm.type === "pcb_smtpad" && elm.shape === "rect") {
       components.push(
         new SmtPad({
@@ -10329,7 +10381,7 @@ var createComponentsFromCircuitJson = ({
           shape: "rect",
           height: elm.height,
           width: elm.width,
-          portHints: elm.port_hints,
+          portHints: resolvedPortHints,
           rectBorderRadius: elm.rect_border_radius
         })
       );
@@ -10341,7 +10393,7 @@ var createComponentsFromCircuitJson = ({
           layer: elm.layer,
           shape: "circle",
           radius: elm.radius,
-          portHints: elm.port_hints
+          portHints: resolvedPortHints
         })
       );
     } else if (elm.type === "pcb_smtpad" && elm.shape === "pill") {
@@ -10351,7 +10403,7 @@ var createComponentsFromCircuitJson = ({
           height: elm.height,
           width: elm.width,
           radius: elm.radius,
-          portHints: elm.port_hints,
+          portHints: resolvedPortHints,
           pcbX: elm.x,
           pcbY: elm.y,
           layer: elm.layer
@@ -10368,7 +10420,7 @@ var createComponentsFromCircuitJson = ({
           width: elm.width,
           ccwRotation: elm.ccw_rotation,
           cornerRadius: elm.corner_radius,
-          portHints: elm.port_hints
+          portHints: resolvedPortHints
         })
       );
     } else if (elm.type === "pcb_smtpad" && elm.shape === "polygon") {
@@ -10376,7 +10428,7 @@ var createComponentsFromCircuitJson = ({
         new SmtPad({
           shape: "polygon",
           points: elm.points,
-          portHints: elm.port_hints,
+          portHints: resolvedPortHints,
           layer: elm.layer
         })
       );
@@ -10411,7 +10463,7 @@ var createComponentsFromCircuitJson = ({
             shape: "circle",
             holeDiameter: elm.hole_diameter,
             outerDiameter: elm.outer_diameter,
-            portHints: elm.port_hints
+            portHints: resolvedPortHints
           })
         );
       } else if (elm.shape === "circular_hole_with_rect_pad") {
@@ -10423,7 +10475,7 @@ var createComponentsFromCircuitJson = ({
             holeDiameter: elm.hole_diameter,
             rectPadHeight: elm.rect_pad_height,
             rectPadWidth: elm.rect_pad_width,
-            portHints: elm.port_hints,
+            portHints: resolvedPortHints,
             rectBorderRadius: elm.rect_border_radius,
             holeOffsetX: elm.hole_offset_x,
             holeOffsetY: elm.hole_offset_y
@@ -10439,7 +10491,7 @@ var createComponentsFromCircuitJson = ({
             holeHeight: elm.hole_height,
             outerWidth: elm.outer_width,
             outerHeight: elm.outer_height,
-            portHints: elm.port_hints
+            portHints: resolvedPortHints
           })
         );
       } else if (elm.shape === "pill_hole_with_rect_pad") {
@@ -10455,7 +10507,7 @@ var createComponentsFromCircuitJson = ({
             rectPadWidth: elm.rect_pad_width,
             rectPadHeight: elm.rect_pad_height,
             rectBorderRadius: elm.rect_border_radius,
-            portHints: elm.port_hints,
+            portHints: resolvedPortHints,
             holeOffsetX: elm.hole_offset_x,
             holeOffsetY: elm.hole_offset_y
           })
@@ -10473,7 +10525,7 @@ var createComponentsFromCircuitJson = ({
             rectPadWidth: elm.rect_pad_width,
             rectPadHeight: elm.rect_pad_height,
             rectBorderRadius: elm.rect_border_radius,
-            portHints: elm.port_hints,
+            portHints: resolvedPortHints,
             holeOffsetX: elm.hole_offset_x,
             holeOffsetY: elm.hole_offset_y,
             pcbRotation: elm.hole_ccw_rotation
@@ -10492,7 +10544,7 @@ var createComponentsFromCircuitJson = ({
             padOutline: elm.pad_outline || [],
             holeOffsetX: elm.hole_offset_x,
             holeOffsetY: elm.hole_offset_y,
-            portHints: elm.port_hints
+            portHints: resolvedPortHints
           })
         );
       }
@@ -12129,7 +12181,8 @@ var shouldAddOutsideFootprintWrapper = (component) => component.componentName ==
 function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsyncEffect) {
   const footprint = component.resolveFootprint();
   if (!footprint) return;
-  const { pcbRotation, pinLabels, pcbPinLabels } = component.props;
+  const { pcbRotation, pcbPinLabels } = component.props;
+  const pinLabels = component._resolvePinLabels();
   const fileExtension = getFileExtension(String(footprint));
   const footprintParser = fileExtension ? component.root?.platform?.footprintFileParserMap?.[fileExtension] : null;
   if (typeof footprint === "string" && (isHttpUrl(footprint) || isStaticAssetPath(footprint)) && footprintParser) {
@@ -12150,6 +12203,7 @@ function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsync
           result.footprintCircuitJson
         );
         component.addAll(fpComponents);
+        component._markDirty("ResolveFootprintPinLabels");
         component._markDirty("InitializePortsFromChildren");
       } catch (err) {
         const db = component.root?.db;
@@ -12194,6 +12248,7 @@ function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsync
           soup
         );
         component.addAll(fpComponents);
+        component._markDirty("ResolveFootprintPinLabels");
         component._markDirty("InitializePortsFromChildren");
       } catch (err) {
         const db = component.root?.db;
@@ -12265,6 +12320,7 @@ function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsync
             child._markDirty?.("PcbPortRender");
           }
         }
+        component._markDirty("ResolveFootprintPinLabels");
         component._markDirty("InitializePortsFromChildren");
       } catch (err) {
         const db = component.root?.db;
@@ -12324,6 +12380,48 @@ function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsync
   }
 }
 
+// lib/components/base-components/NormalComponent/NormalComponent_doInitialResolveFootprintPinLabels.ts
+function NormalComponent_doInitialResolveFootprintPinLabels(component) {
+  const pinLabelsBeforeFootprint = component._impliedFootprintPinLabels ?? {};
+  const pinLabels = {};
+  const portsFromFootprint = component.getPortsFromFootprint({
+    allowImplicitPinNumbers: !component._parsedProps.pinLabels
+  });
+  for (const port of portsFromFootprint) {
+    const pinNumber = port._parsedProps.pinNumber;
+    if (pinNumber === void 0) continue;
+    const genericPinLabels = /* @__PURE__ */ new Set([`pin${pinNumber}`, `${pinNumber}`]);
+    const labels = port.getNameAndAliases().filter((label) => !genericPinLabels.has(label));
+    if (labels.length > 0) {
+      pinLabels[`pin${pinNumber}`] = labels;
+    }
+  }
+  const impliedFootprintPinLabels = { ...pinLabels };
+  for (const [pinKey, labels] of Object.entries(pinLabelsBeforeFootprint)) {
+    impliedFootprintPinLabels[pinKey] = Array.isArray(labels) ? labels : [labels];
+  }
+  component._impliedFootprintPinLabels = impliedFootprintPinLabels;
+  if (Object.keys(component._impliedFootprintPinLabels).length === 0) {
+    return;
+  }
+  for (const child of component.children) {
+    if (child.componentName !== "Port") continue;
+    const port = child;
+    const pinNumber = port._parsedProps.pinNumber;
+    if (pinNumber === void 0) continue;
+    const pinKey = `pin${pinNumber}`;
+    const labels = component._impliedFootprintPinLabels[pinKey];
+    if (!labels) continue;
+    const labelList = Array.isArray(labels) ? labels : [labels];
+    const existingLabels = port.getNameAndAliases();
+    for (const label of labelList) {
+      if (!existingLabels.includes(label)) {
+        port.externallyAddedAliases.push(label);
+      }
+    }
+  }
+}
+
 // lib/components/base-components/NormalComponent/utils/getPcbTextBounds.ts
 function getPcbTextBounds(text) {
   const fontSize = text.font_size;
@@ -12784,7 +12882,14 @@ function getPrimaryPortsFromPortHintGroups(portHintGroups, opts) {
       (hint) => hint.startsWith("pin") || /^(?:pin)?\d+$/.test(hint)
     );
     if (!hasPinIdentifier) {
-      portHintsList = [...portHintsList, `pin${implicitPinNumber}`];
+      const explicitPinNumber = portHintsList.map((hint) => opts?.implicitPinNumberByHint?.get(hint)).find((pinNumber2) => pinNumber2 !== void 0);
+      if (explicitPinNumber !== void 0) {
+        portHintsList = [...portHintsList, `pin${explicitPinNumber}`];
+      } else if (opts?.allowImplicitPinNumbers === false) {
+        continue;
+      } else {
+        portHintsList = [...portHintsList, `pin${implicitPinNumber}`];
+      }
     }
     implicitPinNumber++;
     const newPort = getPortFromHints(portHintsList, opts);
@@ -12891,6 +12996,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
   _hasStartedSupplierFootprintMismatchWarningCheck = false;
   _invalidFootprintPropMessages = [];
   _invalidPinLabelMessages = [];
+  _impliedFootprintPinLabels;
   /**
    * Set to true to enable automatic silkscreen text adjustment when it overlaps with other components
    */
@@ -12980,15 +13086,20 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     this._inferredInternallyConnectedPinNames = [];
     const { config } = this;
     const portsToCreate = [];
+    const pinLabels = this._resolvePinLabels();
+    const propsPinLabels = this._parsedProps.pinLabels;
+    const pinLabelsFromProps = propsPinLabels && Array.isArray(propsPinLabels) ? Object.fromEntries(
+      propsPinLabels.map((label, index) => [`pin${index + 1}`, label])
+    ) : propsPinLabels;
     const schPortArrangement = this._getSchematicPortArrangement();
-    if (schPortArrangement && !this._parsedProps.pinLabels) {
+    if (schPortArrangement && !pinLabels) {
       for (const side in schPortArrangement) {
         const pins = schPortArrangement[side].pins;
         if (Array.isArray(pins)) {
           for (const pinNumberOrLabel of pins) {
             const pinNumber = parsePinNumberFromLabelsOrThrow(
               pinNumberOrLabel,
-              this._parsedProps.pinLabels
+              pinLabels
             );
             portsToCreate.push(
               new Port(
@@ -13023,7 +13134,6 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
         }
       }
     }
-    const pinLabels = this._parsedProps.pinLabels;
     if (pinLabels) {
       for (const [pinKey, label] of Object.entries(pinLabels)) {
         const pinNumber = getPinNumberFromPinLabelsKey(pinKey);
@@ -13035,16 +13145,20 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
         let existingPort = portsToCreate.find(
           (p) => p._parsedProps.pinNumber === pinNumber
         );
-        const primaryLabel = Array.isArray(label) ? label[0] : label;
-        const otherLabels = Array.isArray(label) ? label.slice(1) : [];
+        const labelList = Array.isArray(label) ? label : [label];
+        const propLabel = pinLabelsFromProps?.[pinKey];
+        const hasPropLabel = propLabel !== void 0;
+        const primaryLabel = hasPropLabel ? labelList[0] : `pin${pinNumber}`;
+        const otherLabels = hasPropLabel ? labelList.slice(1) : labelList;
         if (!existingPort) {
           existingPort = new Port(
             {
               pinNumber,
               name: primaryLabel,
               aliases: [
+                ...hasPropLabel ? [] : opts.additionalAliases?.[`pin${pinNumber}`] ?? [],
                 ...otherLabels,
-                ...opts.additionalAliases?.[`pin${pinNumber}`] ?? []
+                ...hasPropLabel ? opts.additionalAliases?.[`pin${pinNumber}`] ?? [] : []
               ]
             },
             {
@@ -13054,7 +13168,6 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
           portsToCreate.push(existingPort);
         } else {
           existingPort.externallyAddedAliases.push(primaryLabel, ...otherLabels);
-          existingPort.props.name = primaryLabel;
         }
       }
     }
@@ -13093,6 +13206,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       } else {
         const portsFromFootprint = this.getPortsFromFootprint({
           ...opts,
+          allowImplicitPinNumbers: !pinLabelsFromProps,
           collectInferredInternallyConnectedPins: true
         });
         const existingPorts = this._getAllPortsFromChildren();
@@ -13126,7 +13240,7 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
         continue;
       }
       let explicitlyListedPinNumbersInSchPortArrangement = getPinsFromPortArrangement(schPortArrangement).map(
-        (pn2) => parsePinNumberFromLabelsOrThrow(pn2, this._parsedProps.pinLabels)
+        (pn2) => parsePinNumberFromLabelsOrThrow(pn2, pinLabels)
       );
       if ([
         "leftSize",
@@ -13168,6 +13282,18 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
       this.addAll(portsToCreate);
     }
   }
+  _resolvePinLabels() {
+    const pinLabels = this._parsedProps.pinLabels;
+    const parsedPinLabels = pinLabels && Array.isArray(pinLabels) ? Object.fromEntries(
+      pinLabels.map((label, index) => [`pin${index + 1}`, label])
+    ) : pinLabels;
+    const resolvedPinLabels = {
+      ...this._impliedFootprintPinLabels ?? {},
+      ...parsedPinLabels ?? {}
+    };
+    if (Object.keys(resolvedPinLabels).length === 0) return void 0;
+    return resolvedPinLabels;
+  }
   _getImpliedFootprintString() {
     return null;
   }
@@ -13176,7 +13302,8 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     return this._parsedProps.footprint ?? this.props.footprint ?? this._getImpliedFootprintString?.();
   }
   _addChildrenFromStringFootprint() {
-    const { pcbRotation, pinLabels, pcbPinLabels } = this.props;
+    const { pcbRotation, pcbPinLabels } = this.props;
+    const pinLabels = this._resolvePinLabels();
     const footprint = this.resolveFootprint();
     if (!footprint) return;
     if (typeof footprint === "string") {
@@ -13549,6 +13676,12 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
   updatePcbComponentAnchorAlignment() {
     this.doInitialPcbComponentAnchorAlignment();
   }
+  doInitialResolveFootprintPinLabels() {
+    NormalComponent_doInitialResolveFootprintPinLabels(this);
+  }
+  updateResolveFootprintPinLabels() {
+    this.doInitialResolveFootprintPinLabels();
+  }
   _renderReactSubtree(element) {
     const component = createInstanceFromReactElement(element);
     return {
@@ -13725,9 +13858,25 @@ var NormalComponent3 = class extends PrimitiveComponent2 {
     if (opts?.collectInferredInternallyConnectedPins) {
       inferredInternallyConnectedPinNames = this._inferredInternallyConnectedPinNames;
     }
+    const implicitPinNumberByHint = /* @__PURE__ */ new Map();
+    const explicitPinLabels = this._parsedProps?.pinLabels ?? this.props.pinLabels;
+    if (explicitPinLabels) {
+      const pinLabelEntries = Array.isArray(explicitPinLabels) ? explicitPinLabels.map((label, index) => [`pin${index + 1}`, label]) : Object.entries(explicitPinLabels);
+      for (const [pinKey, labelOrLabels] of pinLabelEntries) {
+        const pinNumber = getPinNumberFromPinLabelsKey(pinKey);
+        if (pinNumber === null) continue;
+        const labels = Array.isArray(labelOrLabels) ? labelOrLabels : [labelOrLabels];
+        for (const label of labels) {
+          if (typeof label === "string" && label.length > 0) {
+            implicitPinNumberByHint.set(label, pinNumber);
+          }
+        }
+      }
+    }
     const primaryPortOpts = {
       ...opts,
-      inferredInternallyConnectedPinNames
+      inferredInternallyConnectedPinNames,
+      implicitPinNumberByHint
     };
     let { footprint } = this.props;
     if (typeof footprint === "string" && parseLibraryFootprintRef(footprint) && this.children.some((c) => c.componentName === "Footprint")) {
@@ -14898,6 +15047,11 @@ var inflateSourceChip = (sourceElm, inflatorContext) => {
 
 // lib/components/normal-components/Diode.ts
 import { diodeProps } from "@tscircuit/props";
+
+// lib/components/base-components/NormalComponent/utils/isFootprinterString.ts
+var isFootprinterString = (footprint) => typeof footprint === "string" && !parseLibraryFootprintRef(footprint) && !isHttpUrl(footprint) && !isStaticAssetPath(footprint);
+
+// lib/components/normal-components/Diode.ts
 var Diode = class extends NormalComponent3 {
   get config() {
     const symbolMap = {
@@ -14915,10 +15069,18 @@ var Diode = class extends NormalComponent3 {
     };
   }
   initPorts() {
+    const hasFootprintChild = this.children.some(
+      (child) => child.componentName === "Footprint"
+    );
+    const footprint = this.resolveFootprint();
+    const hasPinLabels = Boolean(this._resolvePinLabels());
+    const shouldAddDefaultAliases = !hasPinLabels && !hasFootprintChild && (!footprint || isFootprinterString(footprint));
     super.initPorts({
+      pinCount: 2,
+      ignoreSymbolPorts: !hasPinLabels && !shouldAddDefaultAliases,
       additionalAliases: {
-        pin1: ["anode", "pos", "left"],
-        pin2: ["cathode", "neg", "right"]
+        pin1: shouldAddDefaultAliases ? ["anode", "pos", "left"] : [],
+        pin2: shouldAddDefaultAliases ? ["cathode", "neg", "right"] : []
       }
     });
   }
@@ -14935,35 +15097,70 @@ var Diode = class extends NormalComponent3 {
     });
     this.source_component_id = source_component.source_component_id;
   }
-  pos = this.portMap.pin1;
-  anode = this.portMap.pin1;
-  neg = this.portMap.pin2;
-  cathode = this.portMap.pin2;
+  get pos() {
+    return this.portMap.pos;
+  }
+  get anode() {
+    return this.portMap.anode;
+  }
+  get neg() {
+    return this.portMap.neg;
+  }
+  get cathode() {
+    return this.portMap.cathode;
+  }
 };
 
 // lib/components/primitive-components/Group/Subcircuit/inflators/inflateSourceDiode.ts
+var getLabels = (sourcePort) => Array.from(
+  new Set(
+    [sourcePort?.name, ...sourcePort?.port_hints ?? []].filter(
+      (label) => typeof label === "string" && label.length > 0
+    )
+  )
+);
+var getImportedDiodePinLabels = (sourceElm, inflatorContext) => {
+  const sourcePorts = inflatorContext.injectionDb.source_port.list().filter(
+    (port) => port.source_component_id === sourceElm.source_component_id
+  );
+  const pinLabels = {};
+  for (const sourcePort of sourcePorts) {
+    if (sourcePort.pin_number === void 0 || sourcePort.pin_number === null) {
+      continue;
+    }
+    const labels = getLabels(sourcePort);
+    if (labels.length === 0) continue;
+    pinLabels[`pin${sourcePort.pin_number}`] = labels;
+  }
+  return Object.keys(pinLabels).length > 0 ? pinLabels : void 0;
+};
 function inflateSourceDiode(sourceElm, inflatorContext) {
   const { injectionDb, subcircuit, groupsMap } = inflatorContext;
   const pcbElm = injectionDb.pcb_component.getWhere({
     source_component_id: sourceElm.source_component_id
   });
-  const cadElm = injectionDb.cad_component.getWhere({
-    source_component_id: sourceElm.source_component_id
-  });
   const { pcbX, pcbY } = getInflatedPcbPlacement({
     pcbComponent: pcbElm,
     sourceGroupId: sourceElm.source_group_id,
     inflatorContext
   });
-  const diode = new Diode({
+  const importedPinLabels = getImportedDiodePinLabels(
+    sourceElm,
+    inflatorContext
+  );
+  const diodeProps2 = {
     name: sourceElm.name,
+    manufacturerPartNumber: sourceElm.manufacturer_part_number,
+    supplierPartNumbers: sourceElm.supplier_part_numbers ?? void 0,
+    pinLabels: importedPinLabels,
     layer: pcbElm?.layer,
     pcbX,
     pcbY,
     pcbRotation: pcbElm?.rotation,
     doNotPlace: pcbElm?.do_not_place,
     obstructsWithinBounds: pcbElm?.obstructs_within_bounds
-  });
+  };
+  const diode = new Diode(diodeProps2);
   if (pcbElm) {
     const footprint = inflateFootprintComponent(pcbElm, {
       ...inflatorContext,
@@ -24872,7 +25069,7 @@ import { identity as identity5 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.1383",
+  version: "0.0.1384",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -24921,7 +25118,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.36",
     "@tscircuit/miniflex": "^0.0.4",
     "@tscircuit/ngspice-spice-engine": "^0.0.18",
-    "@tscircuit/props": "^0.0.565",
+    "@tscircuit/props": "^0.0.566",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.75",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -24940,7 +25137,7 @@ var package_default = {
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.105",
     "circuit-json-to-spice": "^0.0.40",
-    "circuit-to-svg": "^0.0.369",
+    "circuit-to-svg": "^0.0.371",
     concurrently: "^9.1.2",
     "connectivity-map": "^1.0.0",
     debug: "^4.3.6",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.1384",
+  "version": "0.0.1385",
   "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.18",
-    "@tscircuit/props": "^0.0.565",
+    "@tscircuit/props": "^0.0.566",
     "@tscircuit/schematic-match-adapt": "^0.0.18",
     "@tscircuit/schematic-trace-solver": "^0.0.75",
     "@tscircuit/solver-utils": "^0.0.16",
@@ -69,7 +69,7 @@
     "circuit-json-to-connectivity-map": "^0.0.23",
     "circuit-json-to-gltf": "^0.0.105",
     "circuit-json-to-spice": "^0.0.40",
-    "circuit-to-svg": "^0.0.369",
+    "circuit-to-svg": "^0.0.371",
     "concurrently": "^9.1.2",
     "connectivity-map": "^1.0.0",
     "debug": "^4.3.6",