@tscircuit/core 0.0.75 → 0.0.77

package/dist/index.d.ts

@@ -273,12 +273,8 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> {
     _portsRoutedOnPcb: Port[];
     constructor(props: z.input<typeof traceProps>);
     get config(): {
-        zodProps: z.ZodUnion<[z.ZodObject<{
-            path: z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodType<{
-                getPortSelector: () => string;
-            }, z.ZodTypeDef, {
-                getPortSelector: () => string;
-            }>]>, "many">;
+        zodProps: z.ZodUnion<[z.ZodObject<z.objectUtil.extendShape<{
+            key: z.ZodOptional<z.ZodString>;
             thickness: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
             schematicRouteHints: z.ZodOptional<z.ZodArray<z.ZodObject<{
                 x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -319,10 +315,17 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> {
                     name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
                 } | undefined;
             }>, "many">>;
-        }, "strip", z.ZodTypeAny, {
+        }, {
+            path: z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodType<{
+                getPortSelector: () => string;
+            }, z.ZodTypeDef, {
+                getPortSelector: () => string;
+            }>]>, "many">;
+        }>, "strip", z.ZodTypeAny, {
             path: (string | {
                 getPortSelector: () => string;
             })[];
+            key?: string | undefined;
             thickness?: number | undefined;
             schematicRouteHints?: {
                 x: number;
@@ -339,6 +342,7 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> {
             path: (string | {
                 getPortSelector: () => string;
             })[];
+            key?: string | undefined;
             thickness?: string | number | undefined;
             schematicRouteHints?: {
                 x: string | number;
@@ -353,17 +357,8 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> {
                     name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
                 } | undefined;
             }[] | undefined;
-        }>, z.ZodObject<{
-            from: z.ZodUnion<[z.ZodString, z.ZodType<{
-                getPortSelector: () => string;
-            }, z.ZodTypeDef, {
-                getPortSelector: () => string;
-            }>]>;
-            to: z.ZodUnion<[z.ZodString, z.ZodType<{
-                getPortSelector: () => string;
-            }, z.ZodTypeDef, {
-                getPortSelector: () => string;
-            }>]>;
+        }>, z.ZodObject<z.objectUtil.extendShape<{
+            key: z.ZodOptional<z.ZodString>;
             thickness: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
             schematicRouteHints: z.ZodOptional<z.ZodArray<z.ZodObject<{
                 x: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
@@ -404,13 +399,25 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> {
                     name: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6";
                 } | undefined;
             }>, "many">>;
-        }, "strip", z.ZodTypeAny, {
+        }, {
+            from: z.ZodUnion<[z.ZodString, z.ZodType<{
+                getPortSelector: () => string;
+            }, z.ZodTypeDef, {
+                getPortSelector: () => string;
+            }>]>;
+            to: z.ZodUnion<[z.ZodString, z.ZodType<{
+                getPortSelector: () => string;
+            }, z.ZodTypeDef, {
+                getPortSelector: () => string;
+            }>]>;
+        }>, "strip", z.ZodTypeAny, {
             from: string | {
                 getPortSelector: () => string;
             };
             to: string | {
                 getPortSelector: () => string;
             };
+            key?: string | undefined;
             thickness?: number | undefined;
             schematicRouteHints?: {
                 x: number;
@@ -430,6 +437,7 @@ declare class Trace extends PrimitiveComponent<typeof traceProps> {
             to: string | {
                 getPortSelector: () => string;
             };
+            key?: string | undefined;
             thickness?: string | number | undefined;
             schematicRouteHints?: {
                 x: string | number;
@@ -638,6 +646,7 @@ declare class NormalComponent<ZodProps extends ZodType = any, PortNames extends
      *
      */
     doInitialPortDiscovery(): void;
+    doInitialCadModelRender(): void;
 }
 
 declare class Group<Props extends z.ZodType<any, any, any> = typeof groupProps> extends NormalComponent<Props> {
@@ -669,30 +678,33 @@ declare class Board extends Group<typeof boardProps> {
             layout: z.ZodOptional<z.ZodAny>;
             routingDisabled: z.ZodOptional<z.ZodBoolean>;
             children: z.ZodAny;
+            defaultTraceWidth: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
         }, "strip", z.ZodTypeAny, {
             pcbX: number;
             pcbY: number;
             children?: any;
             width?: number | undefined;
             height?: number | undefined;
+            layout?: any;
+            routingDisabled?: boolean | undefined;
+            defaultTraceWidth?: number | undefined;
             outline?: {
                 x: number;
                 y: number;
             }[] | undefined;
-            layout?: any;
-            routingDisabled?: boolean | undefined;
         }, {
             pcbX?: string | number | undefined;
             pcbY?: string | number | undefined;
             children?: any;
             width?: string | number | undefined;
             height?: string | number | undefined;
+            layout?: any;
+            routingDisabled?: boolean | undefined;
+            defaultTraceWidth?: string | number | undefined;
             outline?: {
                 x: string | number;
                 y: string | number;
             }[] | undefined;
-            layout?: any;
-            routingDisabled?: boolean | undefined;
         }>;
     };
     doInitialPcbComponentRender(): void;
@@ -840,6 +852,7 @@ declare class Resistor extends NormalComponent<typeof resistorProps, PassivePort
         }, {
             supplierPartNumbers: z.ZodOptional<z.ZodRecord<z.ZodEnum<["jlcpcb", "macrofab", "pcbway", "digikey", "mouser", "lcsc"]>, z.ZodArray<z.ZodString, "many">>>;
         }>, {
+            key: z.ZodOptional<z.ZodAny>;
             name: z.ZodString;
             cadModel: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodObject<z.objectUtil.extendShape<{
                 rotationOffset: z.ZodOptional<z.ZodUnion<[z.ZodNumber, z.ZodObject<{
@@ -1093,6 +1106,7 @@ declare class Resistor extends NormalComponent<typeof resistorProps, PassivePort
             layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
             footprint?: Props.Footprint | undefined;
             supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
+            key?: any;
             cadModel?: string | {
                 stlUrl: string;
                 rotationOffset?: number | {
@@ -1166,6 +1180,7 @@ declare class Resistor extends NormalComponent<typeof resistorProps, PassivePort
             } | undefined;
             footprint?: Props.Footprint | undefined;
             supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
+            key?: any;
             cadModel?: string | {
                 stlUrl: string;
                 rotationOffset?: number | {
@@ -1258,6 +1273,7 @@ declare class Led extends NormalComponent<typeof ledProps, PolarizedPassivePorts
         }, {
             supplierPartNumbers: zod.ZodOptional<zod.ZodRecord<zod.ZodEnum<["jlcpcb", "macrofab", "pcbway", "digikey", "mouser", "lcsc"]>, zod.ZodArray<zod.ZodString, "many">>>;
         }>, {
+            key: zod.ZodOptional<zod.ZodAny>;
             name: zod.ZodString;
             cadModel: zod.ZodOptional<zod.ZodUnion<[zod.ZodString, zod.ZodObject<zod.objectUtil.extendShape<{
                 rotationOffset: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodObject<{
@@ -1506,6 +1522,7 @@ declare class Led extends NormalComponent<typeof ledProps, PolarizedPassivePorts
             layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
             footprint?: Props.Footprint | undefined;
             supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
+            key?: any;
             cadModel?: string | {
                 stlUrl: string;
                 rotationOffset?: number | {
@@ -1575,6 +1592,7 @@ declare class Led extends NormalComponent<typeof ledProps, PolarizedPassivePorts
             } | undefined;
             footprint?: Props.Footprint | undefined;
             supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
+            key?: any;
             cadModel?: string | {
                 stlUrl: string;
                 rotationOffset?: number | {
@@ -1666,6 +1684,7 @@ declare class Diode extends NormalComponent<typeof diodeProps, TwoPinPorts> {
         }, {
             supplierPartNumbers: zod.ZodOptional<zod.ZodRecord<zod.ZodEnum<["jlcpcb", "macrofab", "pcbway", "digikey", "mouser", "lcsc"]>, zod.ZodArray<zod.ZodString, "many">>>;
         }>, {
+            key: zod.ZodOptional<zod.ZodAny>;
             name: zod.ZodString;
             cadModel: zod.ZodOptional<zod.ZodUnion<[zod.ZodString, zod.ZodObject<zod.objectUtil.extendShape<{
                 rotationOffset: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodObject<{
@@ -1912,6 +1931,7 @@ declare class Diode extends NormalComponent<typeof diodeProps, TwoPinPorts> {
             layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
             footprint?: Props.Footprint | undefined;
             supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
+            key?: any;
             cadModel?: string | {
                 stlUrl: string;
                 rotationOffset?: number | {
@@ -1980,6 +2000,7 @@ declare class Diode extends NormalComponent<typeof diodeProps, TwoPinPorts> {
             } | undefined;
             footprint?: Props.Footprint | undefined;
             supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
+            key?: any;
             cadModel?: string | {
                 stlUrl: string;
                 rotationOffset?: number | {
@@ -2064,6 +2085,7 @@ declare class Capacitor extends NormalComponent<typeof capacitorProps, PortNames
         }, {
             supplierPartNumbers: zod.ZodOptional<zod.ZodRecord<zod.ZodEnum<["jlcpcb", "macrofab", "pcbway", "digikey", "mouser", "lcsc"]>, zod.ZodArray<zod.ZodString, "many">>>;
         }>, {
+            key: zod.ZodOptional<zod.ZodAny>;
             name: zod.ZodString;
             cadModel: zod.ZodOptional<zod.ZodUnion<[zod.ZodString, zod.ZodObject<zod.objectUtil.extendShape<{
                 rotationOffset: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodObject<{
@@ -2312,6 +2334,7 @@ declare class Capacitor extends NormalComponent<typeof capacitorProps, PortNames
             layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
             footprint?: Props.Footprint | undefined;
             supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
+            key?: any;
             cadModel?: string | {
                 stlUrl: string;
                 rotationOffset?: number | {
@@ -2381,6 +2404,7 @@ declare class Capacitor extends NormalComponent<typeof capacitorProps, PortNames
             } | undefined;
             footprint?: Props.Footprint | undefined;
             supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
+            key?: any;
             cadModel?: string | {
                 stlUrl: string;
                 rotationOffset?: number | {
@@ -2489,6 +2513,7 @@ declare class Chip<PinLabels extends string = never> extends NormalComponent<typ
         }, {
             supplierPartNumbers: zod.ZodOptional<zod.ZodRecord<zod.ZodEnum<["jlcpcb", "macrofab", "pcbway", "digikey", "mouser", "lcsc"]>, zod.ZodArray<zod.ZodString, "many">>>;
         }>, {
+            key: zod.ZodOptional<zod.ZodAny>;
             name: zod.ZodString;
             cadModel: zod.ZodOptional<zod.ZodUnion<[zod.ZodString, zod.ZodObject<zod.objectUtil.extendShape<{
                 rotationOffset: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodObject<{
@@ -2863,6 +2888,7 @@ declare class Chip<PinLabels extends string = never> extends NormalComponent<typ
             layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
             footprint?: Props.Footprint | undefined;
             supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
+            key?: any;
             cadModel?: string | {
                 stlUrl: string;
                 rotationOffset?: number | {
@@ -2970,6 +2996,7 @@ declare class Chip<PinLabels extends string = never> extends NormalComponent<typ
             } | undefined;
             footprint?: Props.Footprint | undefined;
             supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
+            key?: any;
             cadModel?: string | {
                 stlUrl: string;
                 rotationOffset?: number | {
@@ -3094,6 +3121,7 @@ declare class Jumper<PinLabels extends string = never> extends NormalComponent<t
         }, {
             supplierPartNumbers: zod.ZodOptional<zod.ZodRecord<zod.ZodEnum<["jlcpcb", "macrofab", "pcbway", "digikey", "mouser", "lcsc"]>, zod.ZodArray<zod.ZodString, "many">>>;
         }>, {
+            key: zod.ZodOptional<zod.ZodAny>;
             name: zod.ZodString;
             cadModel: zod.ZodOptional<zod.ZodUnion<[zod.ZodString, zod.ZodObject<zod.objectUtil.extendShape<{
                 rotationOffset: zod.ZodOptional<zod.ZodUnion<[zod.ZodNumber, zod.ZodObject<{
@@ -3469,6 +3497,7 @@ declare class Jumper<PinLabels extends string = never> extends NormalComponent<t
             layer?: "top" | "bottom" | "inner1" | "inner2" | "inner3" | "inner4" | "inner5" | "inner6" | undefined;
             footprint?: Props.Footprint | undefined;
             supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
+            key?: any;
             cadModel?: string | {
                 stlUrl: string;
                 rotationOffset?: number | {
@@ -3577,6 +3606,7 @@ declare class Jumper<PinLabels extends string = never> extends NormalComponent<t
             } | undefined;
             footprint?: Props.Footprint | undefined;
             supplierPartNumbers?: Partial<Record<"jlcpcb" | "macrofab" | "pcbway" | "digikey" | "mouser" | "lcsc", string[]>> | undefined;
+            key?: any;
             cadModel?: string | {
                 stlUrl: string;
                 rotationOffset?: number | {

package/dist/index.js

@@ -1982,6 +1982,28 @@ var NormalComponent = class extends PrimitiveComponent {
       this.add(newPort);
     }
   }
+  doInitialCadModelRender() {
+    const { db } = this.root;
+    const { _parsedProps: props } = this;
+    if (props.cadModel) {
+      const bounds = this._getPcbCircuitJsonBounds();
+      const cadModel = props.cadModel;
+      if (typeof cadModel === "string") {
+        throw new Error("String cadModel not yet implemented");
+      }
+      const cad_model = db.cad_component.insert({
+        // TODO z maybe depends on layer
+        position: { x: bounds.center.x, y: bounds.center.y, z: 0 },
+        pcb_component_id: this.pcb_component_id,
+        source_component_id: this.source_component_id,
+        model_stl_url: "stlUrl" in cadModel ? cadModel.stlUrl : void 0,
+        model_obj_url: "objUrl" in cadModel ? cadModel.objUrl : void 0,
+        model_jscad: "jscad" in cadModel ? cadModel.jscad : void 0
+        // TODO
+        // footprinter_string:
+      });
+    }
+  }
 };
 
 // lib/components/normal-components/Board.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/core",
   "type": "module",
-  "version": "0.0.75",
+  "version": "0.0.77",
   "types": "dist/index.d.ts",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -32,19 +32,20 @@
   },
   "dependencies": {
     "@lume/kiwi": "^0.4.3",
-    "@tscircuit/infgrid-ijump-astar": "^0.0.20",
+    "@tscircuit/infgrid-ijump-astar": "^0.0.21",
     "@tscircuit/math-utils": "^0.0.4",
-    "@tscircuit/props": "^0.0.63",
+    "@tscircuit/props": "^0.0.65",
     "@tscircuit/soup": "^0.0.73",
     "@tscircuit/soup-util": "^0.0.28",
+    "circuit-json": "^0.0.77",
     "circuit-json-to-connectivity-map": "^0.0.15",
     "footprinter": "^0.0.44",
     "nanoid": "^5.0.7",
+    "performance-now": "^2.1.0",
     "react": "^18.3.1",
     "react-reconciler": "^0.29.2",
     "schematic-symbols": "0.0.17",
     "transformation-matrix": "^2.16.1",
-    "zod": "^3.23.8",
-    "performance-now": "^2.1.0"
+    "zod": "^3.23.8"
   }
 }