@tscircuit/core 0.0.711 → 0.0.713

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as circuit_json from 'circuit-json';
 import { PcbTraceError, PcbPlacementError, PcbManualEditConflictWarning, LayerRef, AnyCircuitElement, Size, AnySourceComponent, PcbTraceRoutePoint, PcbTrace as PcbTrace$1, PcbVia, SchematicPort, SchematicComponent, RouteHintPoint, CircuitJson } from 'circuit-json';
 import * as _tscircuit_props from '@tscircuit/props';
-import { PlatformConfig, subcircuitGroupProps, AutorouterConfig, traceProps, SupplierPartNumbers, SchematicPortArrangement, groupProps, boardProps, capacitorProps, chipProps, pinoutProps, diodeProps, fuseProps, jumperProps, solderjumperProps, ledProps, powerSourceProps, CommonComponentProps, resistorProps, constraintProps, fabricationNotePathProps, fabricationNoteTextProps, footprintProps, subcircuitProps, breakoutProps, breakoutPointProps, holeProps, pcbKeepoutProps, netLabelProps, platedHoleProps, silkscreenCircleProps, silkscreenPathProps, silkscreenRectProps, silkscreenTextProps, silkscreenLineProps, smtPadProps, traceHintProps, viaProps, cutoutProps, batteryProps, pinHeaderProps, resonatorProps, inductorProps, potentiometerProps, pushButtonProps, crystalProps, transistorProps, mosfetProps, switchProps, testpointProps, schematicTextProps, schematicBoxProps, schematicTableProps, schematicRowProps, schematicCellProps, CapacitorProps, ChipProps, DiodeProps, ResistorProps, ManualEditEvent, ManualEditsFile, ChipConnections, manual_edits_file } from '@tscircuit/props';
+import { PlatformConfig, subcircuitGroupProps, AutorouterConfig, traceProps, SupplierPartNumbers, CadModelProp, SchematicPortArrangement, groupProps, boardProps, capacitorProps, chipProps, pinoutProps, diodeProps, fuseProps, jumperProps, solderjumperProps, ledProps, powerSourceProps, CommonComponentProps, resistorProps, constraintProps, fabricationNotePathProps, fabricationNoteTextProps, footprintProps, subcircuitProps, breakoutProps, breakoutPointProps, holeProps, pcbKeepoutProps, netLabelProps, platedHoleProps, silkscreenCircleProps, silkscreenPathProps, silkscreenRectProps, silkscreenTextProps, silkscreenLineProps, smtPadProps, traceHintProps, viaProps, cutoutProps, batteryProps, pinHeaderProps, resonatorProps, inductorProps, potentiometerProps, pushButtonProps, crystalProps, transistorProps, mosfetProps, switchProps, testpointProps, schematicTextProps, schematicBoxProps, schematicTableProps, schematicRowProps, schematicCellProps, CapacitorProps, ChipProps, DiodeProps, ResistorProps, ManualEditEvent, ManualEditsFile, ChipConnections, manual_edits_file } from '@tscircuit/props';
 import React, { ReactElement, DetailedHTMLProps, SVGProps } from 'react';
 export { createElement } from 'react';
 import * as zod from 'zod';
@@ -1034,6 +1034,7 @@ declare class NormalComponent<ZodProps extends z.ZodType = any, PortNames extend
         _isnormalcomponent: string;
     };
     _asyncSupplierPartNumbers?: SupplierPartNumbers;
+    _asyncFootprintCadModel?: CadModelProp;
     pcb_missing_footprint_error_id?: string;
     _hasStartedFootprintUrlLoad: boolean;
     private _invalidPinLabelMessages;
@@ -13863,19 +13864,6 @@ declare const voltageSourceProps: z.ZodObject<{
     schRotation?: number | undefined;
     schRelative?: boolean | undefined;
     pcbRelative?: boolean | undefined;
-    pinAttributes?: Record<string, {
-        providesPower?: boolean | undefined;
-        requiresPower?: boolean | undefined;
-        providesGround?: boolean | undefined;
-        requiresGround?: boolean | undefined;
-        providesVoltage?: string | number | undefined;
-        requiresVoltage?: string | number | undefined;
-        doNotConnect?: boolean | undefined;
-    }> | undefined;
-    peakToPeakVoltage?: number | undefined;
-    waveShape?: "square" | "sinewave" | "triangle" | "sawtooth" | undefined;
-    dutyCycle?: number | undefined;
-    supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
     cadModel?: string | {
         stlUrl: string;
         rotationOffset?: number | {
@@ -13997,6 +13985,19 @@ declare const voltageSourceProps: z.ZodObject<{
             z: number;
         } | undefined;
     } | null | undefined;
+    pinAttributes?: Record<string, {
+        providesPower?: boolean | undefined;
+        requiresPower?: boolean | undefined;
+        providesGround?: boolean | undefined;
+        requiresGround?: boolean | undefined;
+        providesVoltage?: string | number | undefined;
+        requiresVoltage?: string | number | undefined;
+        doNotConnect?: boolean | undefined;
+    }> | undefined;
+    peakToPeakVoltage?: number | undefined;
+    waveShape?: "square" | "sinewave" | "triangle" | "sawtooth" | undefined;
+    dutyCycle?: number | undefined;
+    supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
     symbolName?: string | undefined;
     doNotPlace?: boolean | undefined;
 }, {
@@ -14033,19 +14034,6 @@ declare const voltageSourceProps: z.ZodObject<{
     schRotation?: string | number | undefined;
     schRelative?: boolean | undefined;
     pcbRelative?: boolean | undefined;
-    pinAttributes?: Record<string, {
-        providesPower?: boolean | undefined;
-        requiresPower?: boolean | undefined;
-        providesGround?: boolean | undefined;
-        requiresGround?: boolean | undefined;
-        providesVoltage?: string | number | undefined;
-        requiresVoltage?: string | number | undefined;
-        doNotConnect?: boolean | undefined;
-    }> | undefined;
-    peakToPeakVoltage?: string | number | undefined;
-    waveShape?: "square" | "sinewave" | "triangle" | "sawtooth" | undefined;
-    dutyCycle?: number | undefined;
-    supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
     cadModel?: string | {
         stlUrl: string;
         rotationOffset?: number | {
@@ -14167,6 +14155,19 @@ declare const voltageSourceProps: z.ZodObject<{
             z: string | number;
         } | undefined;
     } | null | undefined;
+    pinAttributes?: Record<string, {
+        providesPower?: boolean | undefined;
+        requiresPower?: boolean | undefined;
+        providesGround?: boolean | undefined;
+        requiresGround?: boolean | undefined;
+        providesVoltage?: string | number | undefined;
+        requiresVoltage?: string | number | undefined;
+        doNotConnect?: boolean | undefined;
+    }> | undefined;
+    peakToPeakVoltage?: string | number | undefined;
+    waveShape?: "square" | "sinewave" | "triangle" | "sawtooth" | undefined;
+    dutyCycle?: number | undefined;
+    supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
     symbolName?: string | undefined;
     doNotPlace?: boolean | undefined;
 }>;
@@ -14816,19 +14817,6 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
             schRotation?: number | undefined;
             schRelative?: boolean | undefined;
             pcbRelative?: boolean | undefined;
-            pinAttributes?: Record<string, {
-                providesPower?: boolean | undefined;
-                requiresPower?: boolean | undefined;
-                providesGround?: boolean | undefined;
-                requiresGround?: boolean | undefined;
-                providesVoltage?: string | number | undefined;
-                requiresVoltage?: string | number | undefined;
-                doNotConnect?: boolean | undefined;
-            }> | undefined;
-            peakToPeakVoltage?: number | undefined;
-            waveShape?: "square" | "sinewave" | "triangle" | "sawtooth" | undefined;
-            dutyCycle?: number | undefined;
-            supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
             cadModel?: string | {
                 stlUrl: string;
                 rotationOffset?: number | {
@@ -14950,6 +14938,19 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
                     z: number;
                 } | undefined;
             } | null | undefined;
+            pinAttributes?: Record<string, {
+                providesPower?: boolean | undefined;
+                requiresPower?: boolean | undefined;
+                providesGround?: boolean | undefined;
+                requiresGround?: boolean | undefined;
+                providesVoltage?: string | number | undefined;
+                requiresVoltage?: string | number | undefined;
+                doNotConnect?: boolean | undefined;
+            }> | undefined;
+            peakToPeakVoltage?: number | undefined;
+            waveShape?: "square" | "sinewave" | "triangle" | "sawtooth" | undefined;
+            dutyCycle?: number | undefined;
+            supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
             symbolName?: string | undefined;
             doNotPlace?: boolean | undefined;
         }, {
@@ -14986,19 +14987,6 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
             schRotation?: string | number | undefined;
             schRelative?: boolean | undefined;
             pcbRelative?: boolean | undefined;
-            pinAttributes?: Record<string, {
-                providesPower?: boolean | undefined;
-                requiresPower?: boolean | undefined;
-                providesGround?: boolean | undefined;
-                requiresGround?: boolean | undefined;
-                providesVoltage?: string | number | undefined;
-                requiresVoltage?: string | number | undefined;
-                doNotConnect?: boolean | undefined;
-            }> | undefined;
-            peakToPeakVoltage?: string | number | undefined;
-            waveShape?: "square" | "sinewave" | "triangle" | "sawtooth" | undefined;
-            dutyCycle?: number | undefined;
-            supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
             cadModel?: string | {
                 stlUrl: string;
                 rotationOffset?: number | {
@@ -15120,6 +15108,19 @@ declare class VoltageSource extends NormalComponent<typeof voltageSourceProps, "
                     z: string | number;
                 } | undefined;
             } | null | undefined;
+            pinAttributes?: Record<string, {
+                providesPower?: boolean | undefined;
+                requiresPower?: boolean | undefined;
+                providesGround?: boolean | undefined;
+                requiresGround?: boolean | undefined;
+                providesVoltage?: string | number | undefined;
+                requiresVoltage?: string | number | undefined;
+                doNotConnect?: boolean | undefined;
+            }> | undefined;
+            peakToPeakVoltage?: string | number | undefined;
+            waveShape?: "square" | "sinewave" | "triangle" | "sawtooth" | undefined;
+            dutyCycle?: number | undefined;
+            supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
             symbolName?: string | undefined;
             doNotPlace?: boolean | undefined;
         }>;

package/dist/index.js

@@ -127,7 +127,8 @@ var orderedRenderPhases = [
   "PartsEngineRender"
 ];
 var asyncPhaseDependencies = {
-  PcbTraceRender: ["PcbFootprintStringRender"]
+  PcbTraceRender: ["PcbFootprintStringRender"],
+  CadModelRender: ["PcbFootprintStringRender"]
 };
 var globalRenderCounter = 0;
 var Renderable = class {
@@ -6587,6 +6588,7 @@ var parseLibraryFootprintRef = (s) => {
 };
 
 // lib/components/base-components/NormalComponent/NormalComponent_doInitialPcbFootprintStringRender.ts
+import { external_footprint_load_error } from "circuit-json";
 function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsyncEffect) {
   let { footprint } = component.props;
   footprint ??= component._getImpliedFootprintString?.();
@@ -6597,20 +6599,42 @@ function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsync
     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");
+      try {
+        const res = await fetch(url);
+        if (!res.ok) {
+          throw new Error(`Failed to fetch footprint: ${res.status}`);
+        }
+        const soup = await res.json();
+        const fpComponents = createComponentsFromCircuitJson(
+          {
+            componentName: component.name,
+            componentRotation: pcbRotation,
+            footprint: url,
+            pinLabels,
+            pcbPinLabels
+          },
+          soup
+        );
+        component.addAll(fpComponents);
+        component._markDirty("InitializePortsFromChildren");
+      } catch (err) {
+        const db = component.root?.db;
+        if (db && component.source_component_id && component.pcb_component_id) {
+          const subcircuit = component.getSubcircuit();
+          const errorMsg = `${component.getString()} failed to load external footprint "${url}": ` + (err instanceof Error ? err.message : String(err));
+          const errorObj = external_footprint_load_error.parse({
+            type: "external_footprint_load_error",
+            message: errorMsg,
+            pcb_component_id: component.pcb_component_id,
+            source_component_id: component.source_component_id,
+            subcircuit_id: subcircuit.subcircuit_id ?? void 0,
+            pcb_group_id: component.getGroup()?.pcb_group_id ?? void 0,
+            footprinter_string: url
+          });
+          db.external_footprint_load_error.insert(errorObj);
+        }
+        throw err;
+      }
     });
     return;
   }
@@ -6627,26 +6651,53 @@ function NormalComponent_doInitialPcbFootprintStringRender(component, queueAsync
     }
     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);
-      for (const child of component.children) {
-        if (child.componentName === "Port") {
-          child._markDirty?.("PcbPortRender");
+      try {
+        const result = await resolverFn(libRef.footprintName);
+        let circuitJson = null;
+        if (Array.isArray(result)) {
+          circuitJson = result;
+        } else if (Array.isArray(result.footprintCircuitJson)) {
+          circuitJson = result.footprintCircuitJson;
         }
+        if (!circuitJson) return;
+        const fpComponents = createComponentsFromCircuitJson(
+          {
+            componentName: component.name,
+            componentRotation: pcbRotation,
+            footprint,
+            pinLabels,
+            pcbPinLabels
+          },
+          circuitJson
+        );
+        component.addAll(fpComponents);
+        if (!Array.isArray(result) && result.cadModel) {
+          component._asyncFootprintCadModel = result.cadModel;
+        }
+        for (const child of component.children) {
+          if (child.componentName === "Port") {
+            child._markDirty?.("PcbPortRender");
+          }
+        }
+        component._markDirty("InitializePortsFromChildren");
+      } catch (err) {
+        const db = component.root?.db;
+        if (db && component.source_component_id && component.pcb_component_id) {
+          const subcircuit = component.getSubcircuit();
+          const errorMsg = `${component.getString()} failed to load external footprint "${footprint}": ` + (err instanceof Error ? err.message : String(err));
+          const errorObj = external_footprint_load_error.parse({
+            type: "external_footprint_load_error",
+            message: errorMsg,
+            pcb_component_id: component.pcb_component_id,
+            source_component_id: component.source_component_id,
+            subcircuit_id: subcircuit.subcircuit_id ?? void 0,
+            pcb_group_id: component.getGroup()?.pcb_group_id ?? void 0,
+            footprinter_string: footprint
+          });
+          db.external_footprint_load_error.insert(errorObj);
+        }
+        throw err;
       }
-      component._markDirty("InitializePortsFromChildren");
     });
     return;
   }
@@ -6681,6 +6732,7 @@ var NormalComponent2 = class extends PrimitiveComponent2 {
     _isnormalcomponent: "_isNormalComponent"
   };
   _asyncSupplierPartNumbers;
+  _asyncFootprintCadModel;
   pcb_missing_footprint_error_id;
   _hasStartedFootprintUrlLoad = false;
   _invalidPinLabelMessages = [];
@@ -7416,7 +7468,8 @@ var NormalComponent2 = class extends PrimitiveComponent2 {
   doInitialCadModelRender() {
     const { db } = this.root;
     const { boardThickness = 0 } = this.root?._getBoard() ?? {};
-    const cadModel = this._parsedProps.cadModel;
+    const cadModelProp = this._parsedProps.cadModel;
+    const cadModel = cadModelProp === void 0 ? this._asyncFootprintCadModel : cadModelProp;
     const footprint = this.props.footprint ?? this._getImpliedFootprintString();
     if (!this.pcb_component_id) return;
     if (!cadModel && !footprint) return;
@@ -7455,10 +7508,15 @@ var NormalComponent2 = class extends PrimitiveComponent2 {
       source_component_id: this.source_component_id,
       model_stl_url: "stlUrl" in (cadModel ?? {}) ? this._addCachebustToModelUrl(cadModel.stlUrl) : void 0,
       model_obj_url: "objUrl" in (cadModel ?? {}) ? this._addCachebustToModelUrl(cadModel.objUrl) : void 0,
+      model_mtl_url: "mtlUrl" in (cadModel ?? {}) ? this._addCachebustToModelUrl(cadModel.mtlUrl) : void 0,
       model_gltf_url: "gltfUrl" in (cadModel ?? {}) ? this._addCachebustToModelUrl(cadModel.gltfUrl) : void 0,
+      model_glb_url: "glbUrl" in (cadModel ?? {}) ? this._addCachebustToModelUrl(cadModel.glbUrl) : void 0,
+      model_step_url: "stepUrl" in (cadModel ?? {}) ? this._addCachebustToModelUrl(cadModel.stepUrl) : void 0,
+      model_wrl_url: "wrlUrl" in (cadModel ?? {}) ? this._addCachebustToModelUrl(cadModel.wrlUrl) : void 0,
       model_jscad: "jscad" in (cadModel ?? {}) ? cadModel.jscad : void 0,
       footprinter_string: typeof footprint === "string" && !cadModel ? footprint : void 0
     });
+    this.cad_component_id = cad_model.cad_component_id;
   }
   _addCachebustToModelUrl(url) {
     if (!url || !url.includes("modelcdn.tscircuit.com")) return url;
@@ -14642,7 +14700,7 @@ import { identity as identity6 } from "transformation-matrix";
 var package_default = {
   name: "@tscircuit/core",
   type: "module",
-  version: "0.0.710",
+  version: "0.0.712",
   types: "dist/index.d.ts",
   main: "dist/index.js",
   module: "dist/index.js",
@@ -14695,7 +14753,7 @@ var package_default = {
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.245",
+    "circuit-json": "^0.0.247",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.6",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.711",
+  "version": "0.0.713",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -54,7 +54,7 @@
     "bun-match-svg": "0.0.12",
     "calculate-elbow": "^0.0.12",
     "chokidar-cli": "^3.0.0",
-    "circuit-json": "^0.0.245",
+    "circuit-json": "^0.0.247",
     "circuit-json-to-bpc": "^0.0.13",
     "circuit-json-to-connectivity-map": "^0.0.22",
     "circuit-json-to-simple-3d": "^0.0.6",