@tscircuit/core 0.0.690 → 0.0.691

package/dist/index.d.ts

@@ -1047,7 +1047,6 @@ declare class NormalComponent<ZodProps extends z.ZodType = any, PortNames extend
         ignoreSymbolPorts?: boolean;
     }): void;
     _getImpliedFootprintString(): string | null;
-    _isFootprintUrl(s: string): boolean;
     _addChildrenFromStringFootprint(): void;
     get portMap(): PortMap<PortNames>;
     getInstanceForReactElement(element: ReactElement): NormalComponent | null;

package/dist/index.js

@@ -30,7 +30,7 @@ __export(components_exports, {
   Mosfet: () => Mosfet,
   Net: () => Net,
   NetLabel: () => NetLabel,
-  NormalComponent: () => NormalComponent,
+  NormalComponent: () => NormalComponent2,
   PcbTrace: () => PcbTrace,
   PinHeader: () => PinHeader,
   Pinout: () => Pinout,
@@ -3697,7 +3697,7 @@ var getAllDimensionsForSchematicBox = (params) => {
 
 // lib/components/base-components/NormalComponent/NormalComponent.ts
 import {
-  isValidElement as isReactElement,
+  isValidElement as isReactElement2,
   isValidElement
 } from "react";
 import { symbols as symbols2 } from "schematic-symbols";
@@ -6455,6 +6455,94 @@ function isValidPinLabel(pin, label) {
   }
 }
 
+// lib/components/base-components/NormalComponent/NormalComponent_doInitialPcbFootprintStringRender.ts
+import { isValidElement as isReactElement } from "react";
+
+// lib/components/base-components/NormalComponent/utils/isFoorprintUrl.ts
+var isFootprintUrl = (s) => s.startsWith("http://") || s.startsWith("https://");
+
+// lib/components/base-components/NormalComponent/utils/parseLibraryFootprintRef.ts
+var parseLibraryFootprintRef = (s) => {
+  if (isFootprintUrl(s)) return null;
+  const idx = s.indexOf(":");
+  if (idx <= 0) return null;
+  const footprintLib = s.slice(0, idx);
+  const footprintName = s.slice(idx + 1);
+  if (!footprintLib || !footprintName) return null;
+  return { footprintLib, footprintName };
+};
+
+// lib/components/base-components/NormalComponent/NormalComponent_doInitialPcbFootprintStringRender.ts
+function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsyncEffect) {
+  let { footprint } = component.props;
+  footprint ??= component._getImpliedFootprintString?.();
+  if (!footprint) return;
+  const { pcbRotation, pinLabels, pcbPinLabels } = component.props;
+  if (typeof footprint === "string" && isFootprintUrl(footprint)) {
+    if (component._hasStartedFootprintUrlLoad) return;
+    component._hasStartedFootprintUrlLoad = true;
+    const url = footprint;
+    queueAsyncEffect("load-footprint-url", async () => {
+      const res = await fetch(url);
+      const soup = await res.json();
+      const fpComponents = createComponentsFromCircuitJson(
+        {
+          componentName: component.name,
+          componentRotation: pcbRotation,
+          footprint: url,
+          pinLabels,
+          pcbPinLabels
+        },
+        soup
+      );
+      component.addAll(fpComponents);
+      component._markDirty("InitializePortsFromChildren");
+    });
+    return;
+  }
+  if (typeof footprint === "string") {
+    const libRef = parseLibraryFootprintRef(footprint);
+    if (!libRef) return;
+    if (component._hasStartedFootprintUrlLoad) return;
+    component._hasStartedFootprintUrlLoad = true;
+    const platform = component.root?.platform;
+    const libMap = platform?.footprintLibraryMap?.[libRef.footprintLib];
+    let resolverFn;
+    if (typeof libMap === "function") {
+      resolverFn = libMap;
+    }
+    if (!resolverFn) return;
+    queueAsyncEffect("load-lib-footprint", async () => {
+      const result = await resolverFn(libRef.footprintName);
+      const circuitJson = Array.isArray(result) ? result : Array.isArray(result?.footprintCircuitJson) ? result.footprintCircuitJson : null;
+      if (!circuitJson) return;
+      const fpComponents = createComponentsFromCircuitJson(
+        {
+          componentName: component.name,
+          componentRotation: pcbRotation,
+          footprint,
+          pinLabels,
+          pcbPinLabels
+        },
+        circuitJson
+      );
+      component.addAll(fpComponents);
+      component._markDirty("InitializePortsFromChildren");
+    });
+    return;
+  }
+  if (isReactElement(footprint)) {
+    if (component.reactSubtrees.some((rs) => rs.element === footprint)) return;
+    const subtree = component._renderReactSubtree(footprint);
+    component.reactSubtrees.push(subtree);
+    component.add(subtree.component);
+    return;
+  }
+  if (!isReactElement(footprint) && footprint.componentName === "Footprint") {
+    component.add(footprint);
+  }
+}
+
 // lib/components/base-components/NormalComponent/NormalComponent.ts
 var debug3 = Debug4("tscircuit:core");
 var rotation3 = z8.object({
@@ -6462,7 +6550,7 @@ var rotation3 = z8.object({
   y: rotation,
   z: rotation
 });
-var NormalComponent = class extends PrimitiveComponent2 {
+var NormalComponent2 = class extends PrimitiveComponent2 {
   reactSubtrees = [];
   _impliedFootprint;
   isPrimitiveContainer = true;
@@ -6718,16 +6806,14 @@ var NormalComponent = class extends PrimitiveComponent2 {
   _getImpliedFootprintString() {
     return null;
   }
-  _isFootprintUrl(s) {
-    return s.startsWith("http://") || s.startsWith("https://");
-  }
   _addChildrenFromStringFootprint() {
     const { pcbRotation, pinLabels, pcbPinLabels } = this.props;
     let { footprint } = this.props;
     footprint ??= this._getImpliedFootprintString?.();
     if (!footprint) return;
     if (typeof footprint === "string") {
-      if (this._isFootprintUrl(footprint)) return;
+      if (isFootprintUrl(footprint)) return;
+      if (parseLibraryFootprintRef(footprint)) return;
       const fpSoup = fp.string(footprint).soup();
       const fpComponents = createComponentsFromCircuitJson(
         {
@@ -6997,42 +7083,10 @@ var NormalComponent = class extends PrimitiveComponent2 {
   doInitialReactSubtreesRender() {
   }
   doInitialPcbFootprintStringRender() {
-    let { footprint } = this.props;
-    footprint ??= this._getImpliedFootprintString?.();
-    if (!footprint) return;
-    const { pcbRotation, pinLabels, pcbPinLabels } = this.props;
-    if (typeof footprint === "string" && this._isFootprintUrl(footprint)) {
-      if (this._hasStartedFootprintUrlLoad) return;
-      this._hasStartedFootprintUrlLoad = true;
-      const url = footprint;
-      this._queueAsyncEffect("load-footprint-url", async () => {
-        const res = await fetch(url);
-        const soup = await res.json();
-        const fpComponents = createComponentsFromCircuitJson(
-          {
-            componentName: this.name,
-            componentRotation: pcbRotation,
-            footprint: url,
-            pinLabels,
-            pcbPinLabels
-          },
-          soup
-        );
-        this.addAll(fpComponents);
-        this._markDirty("InitializePortsFromChildren");
-      });
-      return;
-    }
-    if (isReactElement(footprint)) {
-      if (this.reactSubtrees.some((rs) => rs.element === footprint)) return;
-      const subtree = this._renderReactSubtree(footprint);
-      this.reactSubtrees.push(subtree);
-      this.add(subtree.component);
-      return;
-    }
-    if (!isValidElement(footprint) && footprint.componentName === "Footprint") {
-      this.add(footprint);
-    }
+    NormalComponent_doInitialPcbFootprintStringRender(
+      this,
+      (name, effect) => this._queueAsyncEffect(name, effect)
+    );
   }
   _hasExistingPortExactly(port1) {
     const existingPorts = this.children.filter(
@@ -7046,7 +7100,7 @@ var NormalComponent = class extends PrimitiveComponent2 {
   }
   add(componentOrElm) {
     let component;
-    if (isReactElement(componentOrElm)) {
+    if (isReactElement2(componentOrElm)) {
       const subtree = this._renderReactSubtree(componentOrElm);
       this.reactSubtrees.push(subtree);
       component = subtree.component;
@@ -7075,7 +7129,8 @@ var NormalComponent = class extends PrimitiveComponent2 {
       footprint = this.children.find((c) => c.componentName === "Footprint");
     }
     if (typeof footprint === "string") {
-      if (this._isFootprintUrl(footprint)) return [];
+      if (isFootprintUrl(footprint)) return [];
+      if (parseLibraryFootprintRef(footprint)) return [];
       const fpSoup = fp.string(footprint).soup();
       const newPorts2 = [];
       for (const elm of fpSoup) {
@@ -10678,7 +10733,7 @@ var Group_doInitialSchematicTraceRender = (group) => {
 };
 
 // lib/components/primitive-components/Group/Group.ts
-var Group6 = class extends NormalComponent {
+var Group6 = class extends NormalComponent2 {
   pcb_group_id = null;
   schematic_group_id = null;
   subcircuit_id = null;
@@ -11651,7 +11706,7 @@ var FTYPE = stringProxy;
 
 // lib/components/normal-components/Capacitor.ts
 import { formatSiUnit } from "format-si-unit";
-var Capacitor = class extends NormalComponent {
+var Capacitor = class extends NormalComponent2 {
   _adjustSilkscreenTextAutomatically = true;
   // @ts-ignore (cause the symbolName is string and not fixed)
   get config() {
@@ -11727,7 +11782,7 @@ var Capacitor = class extends NormalComponent {
 
 // lib/components/normal-components/Chip.ts
 import { chipProps as chipProps2 } from "@tscircuit/props";
-var Chip = class extends NormalComponent {
+var Chip = class extends NormalComponent2 {
   schematicBoxDimensions = null;
   constructor(props) {
     super(props);
@@ -11899,7 +11954,7 @@ var Pinout = class extends Chip {
 
 // lib/components/normal-components/Diode.ts
 import { diodeProps } from "@tscircuit/props";
-var Diode = class extends NormalComponent {
+var Diode = class extends NormalComponent2 {
   // @ts-ignore
   get config() {
     const symbolMap = {
@@ -11946,7 +12001,7 @@ var Diode = class extends NormalComponent {
 // lib/components/normal-components/Fuse.ts
 import { fuseProps } from "@tscircuit/props";
 import { formatSiUnit as formatSiUnit2 } from "format-si-unit";
-var Fuse = class extends NormalComponent {
+var Fuse = class extends NormalComponent2 {
   get config() {
     return {
       componentName: "fuse",
@@ -11981,7 +12036,7 @@ var Fuse = class extends NormalComponent {
 
 // lib/components/normal-components/Jumper.ts
 import { jumperProps } from "@tscircuit/props";
-var Jumper = class extends NormalComponent {
+var Jumper = class extends NormalComponent2 {
   schematicDimensions = null;
   get config() {
     return {
@@ -12080,7 +12135,7 @@ var Jumper = class extends NormalComponent {
 
 // lib/components/normal-components/SolderJumper.ts
 import { solderjumperProps } from "@tscircuit/props";
-var SolderJumper = class extends NormalComponent {
+var SolderJumper = class extends NormalComponent2 {
   schematicDimensions = null;
   _getPinNumberFromBridgedPinName(pinName) {
     const port = this.selectOne(`port.${pinName}`, {
@@ -12234,7 +12289,7 @@ var SolderJumper = class extends NormalComponent {
 
 // lib/components/normal-components/Led.ts
 import { ledProps } from "@tscircuit/props";
-var Led = class extends NormalComponent {
+var Led = class extends NormalComponent2 {
   get config() {
     const symbolMap = {
       laser: "laser_diode"
@@ -12282,7 +12337,7 @@ var Led = class extends NormalComponent {
 
 // lib/components/normal-components/PowerSource.ts
 import { powerSourceProps } from "@tscircuit/props";
-var PowerSource = class extends NormalComponent {
+var PowerSource = class extends NormalComponent2 {
   // @ts-ignore
   get config() {
     return {
@@ -12333,7 +12388,7 @@ var voltageSourceProps = commonComponentProps.extend({
   phase: rotation2.optional(),
   dutyCycle: z12.number().optional()
 });
-var VoltageSource = class extends NormalComponent {
+var VoltageSource = class extends NormalComponent2 {
   get config() {
     const isSquare = this.props.waveShape === "square";
     return {
@@ -12404,7 +12459,7 @@ var VoltageSource = class extends NormalComponent {
 // lib/components/normal-components/Resistor.ts
 import { resistorProps } from "@tscircuit/props";
 import { formatSiUnit as formatSiUnit3 } from "format-si-unit";
-var Resistor = class extends NormalComponent {
+var Resistor = class extends NormalComponent2 {
   _adjustSilkscreenTextAutomatically = true;
   get config() {
     return {
@@ -13145,7 +13200,7 @@ var Via = class extends PrimitiveComponent2 {
 
 // lib/components/normal-components/Battery.ts
 import { batteryProps } from "@tscircuit/props";
-var Battery = class extends NormalComponent {
+var Battery = class extends NormalComponent2 {
   get config() {
     return {
       componentName: "Battery",
@@ -13178,7 +13233,7 @@ var Battery = class extends NormalComponent {
 
 // lib/components/normal-components/PinHeader.ts
 import { pinHeaderProps } from "@tscircuit/props";
-var PinHeader = class extends NormalComponent {
+var PinHeader = class extends NormalComponent2 {
   get config() {
     return {
       componentName: "PinHeader",
@@ -13287,7 +13342,7 @@ function getResonatorSymbolName(variant) {
       return "crystal";
   }
 }
-var Resonator = class extends NormalComponent {
+var Resonator = class extends NormalComponent2 {
   get config() {
     return {
       componentName: "Resonator",
@@ -13323,7 +13378,7 @@ var Resonator = class extends NormalComponent {
 // lib/components/normal-components/Inductor.ts
 import { inductorProps } from "@tscircuit/props";
 import { formatSiUnit as formatSiUnit5 } from "format-si-unit";
-var Inductor = class extends NormalComponent {
+var Inductor = class extends NormalComponent2 {
   _adjustSilkscreenTextAutomatically = true;
   get config() {
     return {
@@ -13371,7 +13426,7 @@ function getPotentiometerSymbolName(variant) {
       return "potentiometer2";
   }
 }
-var Potentiometer = class extends NormalComponent {
+var Potentiometer = class extends NormalComponent2 {
   get config() {
     return {
       componentName: "Potentiometer",
@@ -13401,7 +13456,7 @@ var Potentiometer = class extends NormalComponent {
 // lib/components/normal-components/PushButton.ts
 import { pushButtonProps } from "@tscircuit/props";
 import { symbols as symbols3 } from "schematic-symbols";
-var PushButton = class extends NormalComponent {
+var PushButton = class extends NormalComponent2 {
   get config() {
     return {
       componentName: "PushButton",
@@ -13466,7 +13521,7 @@ var PushButton = class extends NormalComponent {
 // lib/components/normal-components/Crystal.ts
 import { crystalProps } from "@tscircuit/props";
 import { formatSiUnit as formatSiUnit7 } from "format-si-unit";
-var Crystal = class extends NormalComponent {
+var Crystal = class extends NormalComponent2 {
   // @ts-ignore
   get config() {
     const symbolName = this.props.symbolName ?? (this.props.pinVariant === "four_pin" ? "crystal_4pin" : "crystal");
@@ -13517,7 +13572,7 @@ var Crystal = class extends NormalComponent {
 
 // lib/components/normal-components/Transistor.ts
 import { transistorProps } from "@tscircuit/props";
-var Transistor = class extends NormalComponent {
+var Transistor = class extends NormalComponent2 {
   get config() {
     const baseSymbolName = this.props.type === "npn" ? "npn_bipolar_transistor" : "pnp_bipolar_transistor";
     return {
@@ -13562,7 +13617,7 @@ var Transistor = class extends NormalComponent {
 
 // lib/components/normal-components/Mosfet.ts
 import { mosfetProps } from "@tscircuit/props";
-var Mosfet = class extends NormalComponent {
+var Mosfet = class extends NormalComponent2 {
   get config() {
     const mosfetMode = this.props.mosfetMode === "depletion" ? "d" : "e";
     const channelType = this.props.channelType;
@@ -13589,7 +13644,7 @@ var Mosfet = class extends NormalComponent {
 
 // lib/components/normal-components/Switch.ts
 import { switchProps } from "@tscircuit/props";
-var Switch = class extends NormalComponent {
+var Switch = class extends NormalComponent2 {
   _getSwitchType() {
     const { spst, spdt, dpst, dpdt, type } = this._parsedProps ?? {};
     if (dpdt) return "dpdt";
@@ -13636,7 +13691,7 @@ var TESTPOINT_DEFAULTS = {
   SMT_CIRCLE_DIAMETER: 1.2,
   SMT_RECT_SIZE: 2
 };
-var TestPoint = class extends NormalComponent {
+var TestPoint = class extends NormalComponent2 {
   get config() {
     return {
       componentName: "TestPoint",
@@ -14117,7 +14172,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.689",
+  version: "0.0.690",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -14156,7 +14211,7 @@ var package_default = {
     "@tscircuit/matchpack": "^0.0.16",
     "@tscircuit/math-utils": "^0.0.18",
     "@tscircuit/miniflex": "^0.0.4",
-    "@tscircuit/props": "0.0.297",
+    "@tscircuit/props": "0.0.298",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.25",
@@ -14635,7 +14690,7 @@ export {
   Mosfet,
   Net,
   NetLabel,
-  NormalComponent,
+  NormalComponent2 as NormalComponent,
   PcbTrace,
   PinHeader,
   Pinout,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.690",
+  "version": "0.0.691",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -40,7 +40,7 @@
     "@tscircuit/matchpack": "^0.0.16",
     "@tscircuit/math-utils": "^0.0.18",
     "@tscircuit/miniflex": "^0.0.4",
-    "@tscircuit/props": "0.0.297",
+    "@tscircuit/props": "0.0.298",
     "@tscircuit/schematic-autolayout": "^0.0.6",
     "@tscircuit/schematic-match-adapt": "^0.0.16",
     "@tscircuit/schematic-trace-solver": "^0.0.25",