@tscircuit/footprinter 0.0.6 → 0.0.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/footprinter",
   "type": "module",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "",
   "main": "dist/index.cjs",
   "scripts": {

package/src/fn/bga.ts

@@ -1,7 +1,61 @@
 import type { AnySoupElement, PCBSMTPad } from "@tscircuit/soup"
 import { rectpad } from "../helpers/rectpad"
-import { type BgaDefInput, bga_def } from "../helpers/zod/bga-def"
 import { ALPHABET } from "../helpers/zod/ALPHABET"
+import { z } from "zod"
+import { length, distance } from "@tscircuit/soup"
+import { dim2d } from "src/helpers/zod/dim-2d"
+import { function_call } from "src/helpers/zod/function-call"
+import type { NowDefined } from "src/helpers/zod/now-defined"
+
+export const bga_def = z
+  .object({
+    num_pins: z.number(),
+    grid: dim2d.optional(),
+    p: distance.default("0.8mm"),
+    w: length.optional(),
+    h: length.optional(),
+    ball: length.optional().describe("ball diameter"),
+    pad: length.optional().describe("pad width/height"),
+
+    tlorigin: z.boolean().optional(),
+    blorigin: z.boolean().optional(),
+    trorigin: z.boolean().optional(),
+    brorigin: z.boolean().optional(),
+
+    missing: function_call.default([]),
+  })
+  .transform((a) => {
+    let origin: "tl" | "bl" | "tr" | "br" = "tl"
+    if (a.blorigin) origin = "bl"
+    if (a.trorigin) origin = "tr"
+    if (a.brorigin) origin = "br"
+
+    if (!a.grid) {
+      // find the largest square for the number of pins
+      const largest_square = Math.ceil(Math.sqrt(a.num_pins))
+      a.grid = { x: largest_square, y: largest_square }
+    }
+
+    if (a.missing) {
+      a.missing = a.missing.map((s) => {
+        if (typeof s === "number") return s
+        if (s === "center") return "center"
+        if (s === "topleft") return "topleft"
+        const m = s.match(/([A-Z]+)(\d+)/)
+        if (!m) return s
+        let Y = ALPHABET.indexOf(m[1]!)
+        let X = parseInt(m[2]!) - 1
+        return Y * a.grid!.x + X + 1
+      })
+    }
+
+    const new_def = { ...a, origin }
+
+    return new_def as NowDefined<typeof new_def, "w" | "h" | "grid">
+  })
+
+export type BgaDefInput = z.input<typeof bga_def>
+export type BgaDef = z.infer<typeof bga_def>
 
 export const bga = (params: BgaDefInput): AnySoupElement[] => {
   const bga_params = bga_def.parse(params)

package/src/footprinter.ts

@@ -5,6 +5,7 @@ import { led } from "./fn/led"
 import { res } from "./fn/res"
 import { bga } from "./fn/bga"
 import type { AnySoupElement } from "@tscircuit/soup"
+import { isNotNull } from "./helpers/is-not-null"
 
 export type FootprinterParamsBuilder<K extends string> = {
   [P in K | "params" | "soup"]: P extends "params" | "soup"
@@ -48,11 +49,15 @@ export type Footprinter = {
 export const string = (def: string): Footprinter => {
   let fp = footprinter()
 
-  const def_parts = def.split("_").map((s) => {
-    const m = s.match(/([a-z]+)([\(\d\.\+].*)?/)
-    const [_, fn, v] = m ?? []
-    return { fn: m?.[1]!, v: m?.[2]! }
-  })
+  const def_parts = def
+    .split("_")
+    .map((s) => {
+      const m = s.match(/([a-z]+)([\(\d\.\+\?].*)?/)
+      const [_, fn, v] = m ?? []
+      if (v?.includes("?")) return null
+      return { fn: m?.[1]!, v: m?.[2]! }
+    })
+    .filter(isNotNull)
 
   for (const { fn, v } of def_parts) {
     fp = fp[fn](v)

package/src/helpers/is-not-null.ts

@@ -0,0 +1,3 @@
+export function isNotNull<T>(value: T | null): value is T {
+  return value !== null
+}

package/tsconfig.json

@@ -5,6 +5,7 @@
     "skipLibCheck": true,
     "target": "es2022",
     "allowJs": true,
+    "baseUrl": ".",
     "resolveJsonModule": true,
     "moduleDetection": "force",
     "isolatedModules": true,

package/src/helpers/zod/bga-def.ts

@@ -1,56 +0,0 @@
-import { z } from "zod"
-import { length, distance } from "@tscircuit/soup"
-import { dim2d } from "./dim-2d"
-import { function_call } from "./function-call"
-import type { NowDefined } from "./now-defined"
-import { ALPHABET } from "./ALPHABET"
-
-export const bga_def = z
-  .object({
-    num_pins: z.number(),
-    grid: dim2d.optional(),
-    p: distance.default("0.8mm"),
-    w: length.optional(),
-    h: length.optional(),
-    ball: length.optional().describe("ball diameter"),
-    pad: length.optional().describe("pad width/height"),
-
-    tlorigin: z.boolean().optional(),
-    blorigin: z.boolean().optional(),
-    trorigin: z.boolean().optional(),
-    brorigin: z.boolean().optional(),
-
-    missing: function_call.default([]),
-  })
-  .transform((a) => {
-    let origin: "tl" | "bl" | "tr" | "br" = "tl"
-    if (a.blorigin) origin = "bl"
-    if (a.trorigin) origin = "tr"
-    if (a.brorigin) origin = "br"
-
-    if (!a.grid) {
-      // find the largest square for the number of pins
-      const largest_square = Math.ceil(Math.sqrt(a.num_pins))
-      a.grid = { x: largest_square, y: largest_square }
-    }
-
-    if (a.missing) {
-      a.missing = a.missing.map((s) => {
-        if (typeof s === "number") return s
-        if (s === "center") return "center"
-        if (s === "topleft") return "topleft"
-        const m = s.match(/([A-Z]+)(\d+)/)
-        if (!m) return s
-        let Y = ALPHABET.indexOf(m[1]!)
-        let X = parseInt(m[2]!) - 1
-        return Y * a.grid!.x + X + 1
-      })
-    }
-
-    const new_def = { ...a, origin }
-
-    return new_def as NowDefined<typeof new_def, "w" | "h" | "grid">
-  })
-
-export type BgaDefInput = z.input<typeof bga_def>
-export type BgaDef = z.infer<typeof bga_def>