@tscircuit/footprinter 0.0.183 → 0.0.184

package/dist/index.d.ts

@@ -997,7 +997,7 @@ declare const any_footprinter_def: z.ZodUnion<[z.ZodObject<{
     legsoutside?: boolean | undefined;
 }>, z.ZodObject<{
     tht: z.ZodBoolean;
-    p: z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>;
+    p: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
     pw: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
     ph: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
     metric: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
@@ -1005,18 +1005,18 @@ declare const any_footprinter_def: z.ZodUnion<[z.ZodObject<{
     w: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
     h: z.ZodOptional<z.ZodEffects<z.ZodUnion<[z.ZodString, z.ZodNumber]>, number, string | number>>;
 }, "strip", z.ZodTypeAny, {
-    p: number;
     tht: boolean;
     w?: number | undefined;
+    p?: number | undefined;
     pw?: number | undefined;
     ph?: number | undefined;
     metric?: number | undefined;
     imperial?: number | undefined;
     h?: number | undefined;
 }, {
-    p: string | number;
     tht: boolean;
     w?: string | number | undefined;
+    p?: string | number | undefined;
     pw?: string | number | undefined;
     ph?: string | number | undefined;
     metric?: string | number | undefined;
@@ -1120,14 +1120,16 @@ declare const any_footprinter_def: z.ZodUnion<[z.ZodObject<{
 }>]>;
 type AnyFootprinterDefinitionOutput = z.infer<typeof any_footprinter_def>;
 
-declare const footprintSizes: {
+type StandardSize = {
     imperial: string;
     metric: string;
-    Z_mm_min: number;
-    G_mm_min: number;
-    X_mm_min: number;
-    C_mm_ref: number;
-}[];
+    p_mm_min: number;
+    ph_mm_min: number;
+    pw_mm_min: number;
+    h_mm_min: number;
+    w_mm_min: number;
+};
+declare const footprintSizes: StandardSize[];
 
 type FootprinterParamsBuilder<K extends string> = {
     [P in K | "params" | "soup" | "circuitJson"]: P extends "params" | "soup" | "circuitJson" ? Footprinter[P] : (v?: number | string | boolean) => FootprinterParamsBuilder<K>;

package/dist/index.js

@@ -271,111 +271,96 @@ var rectpad = (pn, x, y, w, h) => {
 import mm2 from "@tscircuit/mm";
 import { z as z2 } from "zod";
 import { length, distance } from "circuit-json";
-
-// src/helpers/silkscreenpath.ts
-var silkscreenpath = (route, options = {}) => {
-  return {
-    type: "pcb_silkscreen_path",
-    layer: options.layer || "top",
-    pcb_component_id: options.pcb_component_id || "",
-    pcb_silkscreen_path_id: options.pcb_silkscreen_path_id || "",
-    route,
-    stroke_width: options.stroke_width || 0.1
-  };
-};
-
-// src/helpers/passive-fn.ts
 var footprintSizes = [
   {
     imperial: "01005",
     metric: "0402",
-    Z_mm_min: 0.58,
-    G_mm_min: 0.18,
-    X_mm_min: 0.21,
-    C_mm_ref: 0.038
+    p_mm_min: 0.038,
+    pw_mm_min: 0.2,
+    ph_mm_min: 0.2,
+    w_mm_min: 0.58,
+    h_mm_min: 0.21
   },
   {
     imperial: "0201",
     metric: "0603",
-    Z_mm_min: 0.9,
-    G_mm_min: 0.3,
-    X_mm_min: 0.3,
-    C_mm_ref: 0.6
+    p_mm_min: 0.6,
+    pw_mm_min: 0.3,
+    ph_mm_min: 0.3,
+    w_mm_min: 0.9,
+    h_mm_min: 0.3
   },
   {
     imperial: "0402",
     metric: "1005",
-    Z_mm_min: 1.6,
-    G_mm_min: 0.4,
-    X_mm_min: 0.7,
-    C_mm_ref: 1
+    p_mm_min: 1,
+    pw_mm_min: 0.6,
+    ph_mm_min: 0.6,
+    w_mm_min: 1.6,
+    h_mm_min: 0.7
   },
   {
     imperial: "0603",
     metric: "1608",
-    Z_mm_min: 2.6,
-    G_mm_min: 0.6,
-    X_mm_min: 1,
-    C_mm_ref: 1.7
+    p_mm_min: 1.6,
+    pw_mm_min: 0.85,
+    ph_mm_min: 0.95,
+    w_mm_min: 2.6,
+    h_mm_min: 1
   },
   {
     imperial: "0805",
     metric: "2012",
-    Z_mm_min: 3,
-    G_mm_min: 0.6,
-    X_mm_min: 1.2,
-    C_mm_ref: 1.9
+    p_mm_min: 2.15,
+    pw_mm_min: 0.85,
+    ph_mm_min: 1.2,
+    w_mm_min: 3,
+    h_mm_min: 1.2
   },
   {
     imperial: "1206",
     metric: "3216",
-    Z_mm_min: 4.2,
-    G_mm_min: 1.2,
-    X_mm_min: 1.4,
-    C_mm_ref: 2.8
+    p_mm_min: 3.2,
+    pw_mm_min: 1,
+    ph_mm_min: 1.9,
+    w_mm_min: 4.2,
+    h_mm_min: 2.5
   },
   {
     imperial: "1210",
     metric: "3225",
-    Z_mm_min: 3.2,
-    G_mm_min: 1,
-    X_mm_min: 2.5,
-    C_mm_ref: 2
+    p_mm_min: 2,
+    pw_mm_min: 1.1,
+    ph_mm_min: 1.1,
+    w_mm_min: 3.2,
+    h_mm_min: 2.5
   },
   {
     imperial: "2010",
     metric: "5025",
-    Z_mm_min: 5,
-    G_mm_min: 1.2,
-    X_mm_min: 2.5,
-    C_mm_ref: 3.6
+    p_mm_min: 3.6,
+    pw_mm_min: 1.2,
+    ph_mm_min: 1.2,
+    w_mm_min: 5,
+    h_mm_min: 2.5
   },
   {
     imperial: "2512",
     metric: "6332",
-    Z_mm_min: 6.3,
-    G_mm_min: 1.2,
-    X_mm_min: 3.2,
-    C_mm_ref: 4.5
+    p_mm_min: 4.5,
+    pw_mm_min: 1.6,
+    ph_mm_min: 1.6,
+    w_mm_min: 6.3,
+    h_mm_min: 3.2
   }
 ];
-var metricMap = footprintSizes.reduce(
-  (acc, s) => {
-    acc[s.metric] = s;
-    return acc;
-  },
-  {}
-);
-var imperialMap = footprintSizes.reduce(
-  (acc, s) => {
-    acc[s.imperial] = s;
-    return acc;
-  },
-  {}
+var metricMap = Object.fromEntries(footprintSizes.map((s) => [s.metric, s]));
+var imperialMap = Object.fromEntries(
+  footprintSizes.map((s) => [s.imperial, s])
 );
 var passive_def = z2.object({
   tht: z2.boolean(),
-  p: length,
+  p: length.optional(),
   pw: length.optional(),
   ph: length.optional(),
   metric: distance.optional(),
@@ -383,10 +368,6 @@ var passive_def = z2.object({
   w: length.optional(),
   h: length.optional()
 });
-var deriveXFromH = (h) => 0.079 * h ** 2 + 0.94 * h - 9e-3;
-var deriveZFromW = (w) => 1.09 * w + 0.6;
-var deriveGFromW = (w) => 0.59 * w - 0.31;
-var deriveCFromW = (w) => -0.01 * w ** 2 + 0.94 * w + 0.03;
 var passive = (params) => {
   let { tht, p, pw, ph, metric, imperial, w, h } = params;
   if (typeof w === "string") w = mm2(w);
@@ -394,37 +375,24 @@ var passive = (params) => {
   if (typeof p === "string") p = mm2(p);
   if (typeof pw === "string") pw = mm2(pw);
   if (typeof ph === "string") ph = mm2(ph);
-  if (h > w) {
+  if (h !== void 0 && w !== void 0 && h > w) {
     throw new Error(
       "height cannot be greater than width (rotated footprint not yet implemented)"
     );
   }
   let sz;
-  if (metric) {
-    sz = metricMap[metric];
-  }
-  if (imperial) {
-    sz = imperialMap[imperial];
-  }
-  if (!sz && w && h && !pw && !ph) {
-    sz = {
-      imperial: "custom",
-      metric: "custom",
-      Z_mm_min: deriveZFromW(w),
-      G_mm_min: deriveGFromW(w),
-      X_mm_min: deriveXFromH(h),
-      C_mm_ref: deriveCFromW(w)
-    };
-  }
+  if (metric) sz = metricMap[metric];
+  if (imperial) sz = imperialMap[imperial];
   if (sz) {
-    w = sz.Z_mm_min;
-    h = sz.X_mm_min;
-    p = sz.C_mm_ref;
-    pw = (sz.Z_mm_min - sz.G_mm_min) / 2;
-    ph = (sz.Z_mm_min - sz.G_mm_min) / 2;
-  }
-  if (pw === void 0) throw new Error("could not infer pad width");
-  if (ph === void 0) throw new Error("could not infer pad width");
+    w = sz.w_mm_min;
+    h = sz.h_mm_min;
+    p = sz.p_mm_min;
+    pw = sz.pw_mm_min;
+    ph = sz.ph_mm_min;
+  }
+  if (p === void 0 || pw === void 0 || ph === void 0) {
+    throw new Error("Could not determine required pad dimensions (p, pw, ph)");
+  }
   const silkscreenLine = {
     type: "pcb_silkscreen_path",
     layer: "top",
@@ -2047,6 +2015,20 @@ var axial = (raw_params) => {
 // src/fn/pushbutton.ts
 import { length as length9 } from "circuit-json";
 import { z as z15 } from "zod";
+
+// src/helpers/silkscreenpath.ts
+var silkscreenpath = (route, options = {}) => {
+  return {
+    type: "pcb_silkscreen_path",
+    layer: options.layer || "top",
+    pcb_component_id: options.pcb_component_id || "",
+    pcb_silkscreen_path_id: options.pcb_silkscreen_path_id || "",
+    route,
+    stroke_width: options.stroke_width || 0.1
+  };
+};
+
+// src/fn/pushbutton.ts
 var pushbutton_def = z15.object({
   fn: z15.literal("pushbutton"),
   w: length9.default(4.5),
@@ -6415,7 +6397,7 @@ var electrolytic = (raw_params) => {
   const X = -(d / 2 + 0.5);
   const plusY = od / 2 + 1.5;
   const Size = 0.5;
-  const silkscreenpath3 = {
+  const silkscreenpath2 = {
     type: "pcb_silkscreen_path",
     layer: "top",
     pcb_component_id: "",
@@ -6444,7 +6426,7 @@ var electrolytic = (raw_params) => {
       silkscreenBody2,
       silkscreenBody3,
       silkscreenBody,
-      silkscreenpath3,
+      silkscreenpath2,
       silkscreenline,
       silkscreenRefText
     ],