@tscircuit/footprinter 0.0.315 → 0.0.317

package/dist/index.d.ts

@@ -1,6 +1,17 @@
 import { AnySoupElement, AnyCircuitElement } from 'circuit-json';
 import { z } from 'zod';
 
+type StandardSize = {
+    imperial: string;
+    metric: string;
+    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 NowDefined<T, K extends keyof T> = Omit<T, K> & Required<Pick<T, K>>;
 
 declare const any_footprinter_def: z.ZodUnion<[z.ZodObject<{
@@ -1724,17 +1735,6 @@ declare const any_footprinter_def: z.ZodUnion<[z.ZodObject<{
 }>]>;
 type AnyFootprinterDefinitionOutput = z.infer<typeof any_footprinter_def>;
 
-type StandardSize = {
-    imperial: string;
-    metric: string;
-    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 BaseOptionKey = "origin" | "norefdes" | "invert" | "faceup" | "nosilkscreen";
 type FootprinterParamsBuilder<K extends string> = {
     [P in K | BaseOptionKey | "params" | "soup" | "circuitJson"]: P extends "params" | "soup" | "circuitJson" ? Footprinter[P] : (v?: number | string | boolean) => FootprinterParamsBuilder<K>;

package/dist/index.js

@@ -146,7 +146,8 @@ var platedHoleWithRectPad = (options) => {
     rectPadWidth,
     rectPadHeight,
     holeOffsetX = 0,
-    holeOffsetY = 0
+    holeOffsetY = 0,
+    rectBorderRadius
   } = options;
   return {
     pcb_plated_hole_id: "",
@@ -159,6 +160,9 @@ var platedHoleWithRectPad = (options) => {
     pad_shape: "rect",
     rect_pad_width: mm2(rectPadWidth),
     rect_pad_height: mm2(rectPadHeight),
+    ...rectBorderRadius !== void 0 && {
+      rect_border_radius: rectBorderRadius
+    },
     pcb_port_id: "",
     layers: ["top", "bottom"],
     port_hints: [pn.toString()],
@@ -6494,18 +6498,15 @@ var jst_def = base_def.extend({
   pl: length47.optional(),
   w: length47.optional(),
   h: length47.optional(),
-  sh: z60.union([z60.boolean(), z60.string(), z60.number()]).optional().transform((v) => {
-    if (typeof v === "string") {
-      const n = Number(v);
-      return Number.isNaN(n) ? true : n;
-    }
-    return v;
-  }).describe(
+  sh: z60.boolean().optional().describe(
     'JST SH (Surface-mount) connector family. SH stands for "Super High-density".'
   ),
   ph: z60.boolean().optional().describe(
     'JST PH (Through-hole) connector family. PH stands for "Pin Header".'
   ),
+  zh: z60.boolean().optional().describe(
+    "JST ZH (Through-hole) connector family. 1.5mm pitch wire-to-board."
+  ),
   string: z60.string().optional()
 });
 var variantDefaults = {
@@ -6523,52 +6524,72 @@ var variantDefaults = {
     pl: length47.parse("1.55mm"),
     w: length47.parse("5.8mm"),
     h: length47.parse("7.8mm")
+  },
+  zh: {
+    p: length47.parse("1.5mm"),
+    id: length47.parse("0.73mm"),
+    pw: length47.parse("1.03mm"),
+    pl: length47.parse("1.73mm"),
+    w: length47.parse("3mm"),
+    h: length47.parse("3.5mm")
   }
 };
 function getVariant(params) {
   if (params.sh) return "sh";
   if (params.ph) return "ph";
+  if (params.zh) return "zh";
   return "ph";
 }
 function generatePads(variant, numPins, p, id, pw, pl) {
   const pads = [];
   if (variant === "ph") {
-    const half_p = p / 2;
-    pads.push(
-      platedHoleWithRectPad({
-        pn: 1,
-        x: -half_p,
-        y: 2,
-        holeDiameter: id,
-        rectPadWidth: pw,
-        rectPadHeight: pl
-      })
-    );
-    pads.push(
-      platedHoleWithRectPad({
-        pn: 2,
-        x: half_p,
-        y: 2,
-        holeDiameter: id,
-        rectPadWidth: pw,
-        rectPadHeight: pl
-      })
-    );
+    const startX = -((numPins - 1) / 2) * p;
+    for (let i = 0; i < numPins; i++) {
+      const x = startX + i * p;
+      pads.push(
+        platedHoleWithRectPad({
+          pn: i + 1,
+          x,
+          y: 2,
+          holeDiameter: id,
+          rectPadWidth: pw,
+          rectPadHeight: pl
+        })
+      );
+    }
+  } else if (variant === "zh") {
+    const startX = -((numPins - 1) / 2) * p;
+    for (let i = 0; i < numPins; i++) {
+      const x = startX + i * p;
+      if (i === 0) {
+        pads.push(
+          platedHoleWithRectPad({
+            pn: i + 1,
+            x,
+            y: 0,
+            holeDiameter: id,
+            rectPadWidth: pw,
+            rectPadHeight: pl,
+            rectBorderRadius: 0.12499977
+          })
+        );
+      } else {
+        pads.push(platedHolePill(i + 1, x, 0, id, pw, pl));
+      }
+    }
   } else {
     const startX = -((numPins - 1) / 2) * p;
     for (let i = 0; i < numPins; i++) {
       const x = startX + i * p;
-      console.log("x si", x);
       pads.push(rectpad(i + 1, x, -1.325, pw, pl));
     }
     const sideOffset = (numPins - 1) / 2 * p + 1.3;
-    console.log("offset", sideOffset);
     pads.push(rectpad(numPins + 1, -sideOffset, 1.22, 1.2, 1.8));
     pads.push(rectpad(numPins + 2, sideOffset, 1.22, 1.2, 1.8));
   }
   return pads;
 }
-function generateSilkscreenBody(variant, w, h) {
+function generateSilkscreenBody(variant, w, h, numPins, p) {
   if (variant === "ph") {
     return {
       type: "pcb_silkscreen_path",
@@ -6584,6 +6605,26 @@ function generateSilkscreenBody(variant, w, h) {
       stroke_width: 0.1,
       pcb_silkscreen_path_id: ""
     };
+  } else if (variant === "zh" && numPins && p) {
+    const pinSpan = (numPins - 1) * p;
+    const bodyLeft = -pinSpan / 2 - 1.5;
+    const bodyRight = pinSpan / 2 + 1.5;
+    const bodyTop = -h / 2;
+    const bodyBottom = h / 2;
+    return {
+      type: "pcb_silkscreen_path",
+      layer: "top",
+      pcb_component_id: "",
+      route: [
+        { x: bodyLeft, y: bodyTop },
+        { x: bodyRight, y: bodyTop },
+        { x: bodyRight, y: bodyBottom },
+        { x: bodyLeft, y: bodyBottom },
+        { x: bodyLeft, y: bodyTop }
+      ],
+      stroke_width: 0.1,
+      pcb_silkscreen_path_id: ""
+    };
   } else {
     return {
       type: "pcb_silkscreen_path",
@@ -6605,21 +6646,33 @@ var jst = (raw_params) => {
   const pl = params.pl ?? defaults.pl;
   const w = params.w ?? defaults.w;
   const h = params.h ?? defaults.h;
-  let numPins = variant === "sh" ? 4 : 2;
-  if (variant === "sh") {
-    const str = typeof raw_params.string === "string" ? raw_params.string : "";
-    const match = str.match(/sh(\d+)/);
-    if (match && match[1]) {
-      const parsed = parseInt(match[1], 10);
-      if (!Number.isNaN(parsed)) {
-        numPins = parsed;
-      }
-    } else if (typeof params.sh === "number") {
-      numPins = params.sh;
+  let numPins;
+  const explicitNumPins = raw_params.num_pins;
+  if (typeof explicitNumPins === "number") {
+    numPins = explicitNumPins;
+  }
+  const str = typeof raw_params.string === "string" ? raw_params.string : "";
+  const match = str.match(/(?:^|_)jst(\d+)(?:_|$)/);
+  const zhMatch = str.match(/(?:^|_)zh(\d+)(?:_|$)/);
+  if (match && match[1]) {
+    const parsed = Number.parseInt(match[1], 10);
+    if (!Number.isNaN(parsed)) {
+      numPins = parsed;
     }
   }
+  if (zhMatch && zhMatch[1]) {
+    const parsed = Number.parseInt(zhMatch[1], 10);
+    if (!Number.isNaN(parsed)) {
+      numPins = parsed;
+    }
+  }
+  if (typeof numPins !== "number") {
+    throw new Error(
+      `JST requires an explicit pin count (e.g. jst6_sh or .jst(6))${params.string ? `, from string "${params.string}"` : ""}`
+    );
+  }
   const pads = generatePads(variant, numPins, p, id, pw, pl);
-  const silkscreenBody = generateSilkscreenBody(variant, w, h);
+  const silkscreenBody = generateSilkscreenBody(variant, w, h, numPins, p);
   const silkscreenRefText = silkscreenRef(0, h / 2 + 1, 0.5);
   return {
     circuitJson: [...pads, silkscreenBody, silkscreenRefText],
@@ -6633,7 +6686,8 @@ var jst = (raw_params) => {
       h,
       num_pins: numPins,
       sh: variant === "sh",
-      ph: variant === "ph"
+      ph: variant === "ph",
+      zh: variant === "zh"
     }
   };
 };
@@ -9119,10 +9173,27 @@ var to92l = (raw_params) => {
   };
 };
 
-// src/helpers/is-not-null.ts
-function isNotNull(value) {
-  return value !== null && value !== void 0;
-}
+// src/helpers/apply-norefdes.ts
+var applyNoRefDes = (elements, parameters) => {
+  const refs = elements.filter(
+    (el) => el.type === "pcb_silkscreen_text"
+  );
+  if (refs.length === 0) return elements;
+  for (const ref of refs) {
+    if (parameters.norefdes) {
+      ref.text = "";
+    }
+  }
+  return elements;
+};
+
+// src/helpers/apply-nosilkscreen.ts
+var applyNoSilkscreen = (elements, parameters) => {
+  if (!parameters.nosilkscreen) return elements;
+  return elements.filter((element) => {
+    return element.type !== "pcb_silkscreen_path" && element.type !== "pcb_silkscreen_text";
+  });
+};
 
 // src/helpers/apply-origin.ts
 var applyOrigin = (elements, origin) => {
@@ -9218,32 +9289,15 @@ var applyOrigin = (elements, origin) => {
   return elements;
 };
 
-// src/helpers/apply-norefdes.ts
-var applyNoRefDes = (elements, parameters) => {
-  const refs = elements.filter(
-    (el) => el.type === "pcb_silkscreen_text"
-  );
-  if (refs.length === 0) return elements;
-  for (const ref of refs) {
-    if (parameters.norefdes) {
-      ref.text = "";
-    }
-  }
-  return elements;
-};
-
-// src/helpers/apply-nosilkscreen.ts
-var applyNoSilkscreen = (elements, parameters) => {
-  if (!parameters.nosilkscreen) return elements;
-  return elements.filter((element) => {
-    return element.type !== "pcb_silkscreen_path" && element.type !== "pcb_silkscreen_text";
-  });
-};
+// src/helpers/is-not-null.ts
+function isNotNull(value) {
+  return value !== null && value !== void 0;
+}
 
 // src/footprinter.ts
 var string2 = (def) => {
   let fp2 = footprinter();
-  const modifiedDef = def.replace(/^((?:\d{4}|\d{5}))(?=$|_|x)/, "res$1");
+  const modifiedDef = def.replace(/^((?:\d{4}|\d{5}))(?=$|_|x)/, "res$1").replace(/^zh(\d+)(?:$|_)/, "jst$1_zh");
   const def_parts = modifiedDef.split(/_(?!metric)/).map((s) => {
     const m = s.match(/([a-zA-Z]+)([\(\d\.\+\?].*)?/);
     if (!m) return null;