@tscircuit/cli 0.1.2232 → 0.1.2234

package/dist/cli/main.js

@@ -57790,7 +57790,7 @@ var require_fast_json_stable_stringify = __commonJS2(function(exports2, module2)
   };
 });
 
-// node_modules/circuit-json-to-gerber/dist/chunk-WLO6XF2E.js
+// node_modules/circuit-json-to-gerber/dist/chunk-5TBXNZXW.js
 import { z as z4 } from "zod";
 import { z as z23 } from "zod";
 import { z as z32 } from "zod";
@@ -58033,7 +58033,7 @@ function getAllApertureTemplateConfigsForLayer({
         } else {
           addConfigIfNew(getApertureConfigFromCirclePcbHole(elm));
         }
-      } else if (elm.hole_shape === "rotated_pill") {
+      } else if (elm.hole_shape === "rotated_pill" || elm.hole_shape === "oval") {
         const soldermaskMargin = isSoldermaskLayer ? elm.soldermask_margin ?? 0 : 0;
         addConfigIfNew(getApertureConfigFromRotatedPillPcbHole(elm, soldermaskMargin));
       } else
@@ -59739,6 +59739,58 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
     builder.add("plot_operation", { x: ordered[i].x, y: mfy(ordered[i].y) });
   }
   builder.add("plot_operation", { x: ordered[0].x, y: mfy(ordered[0].y) });
+}, renderStiffenerLayers = (circuitJson, { flip_y_axis = false }) => {
+  const layers = {};
+  const boardCenters = new Map(circuitJson.filter((element) => element.type === "pcb_board").map((board) => [board.pcb_board_id, board.center]));
+  const stiffeners = circuitJson.filter((element) => element.type === "pcb_stiffener");
+  for (const stiffener of stiffeners) {
+    const prefix = stiffener.layer === "top" ? "F" : "B";
+    const layerName = `${prefix}_Stiffener_${stiffener.material}`;
+    layers[layerName] ??= [
+      ...getCommandHeaders({
+        layer: stiffener.layer,
+        layer_type: "stiffener"
+      }),
+      ...gerberBuilder().add("comment", {
+        comment: `Stiffener material: ${stiffener.material}`
+      }).add("define_aperture_template", {
+        aperture_number: 10,
+        standard_template_code: "C",
+        diameter: 0.05
+      }).add("select_aperture", { aperture_number: 10 }).build()
+    ];
+    const localPoints = stiffener.shape === "rect" ? getRotatedRectPoints({
+      center: stiffener.center,
+      width: stiffener.width,
+      height: stiffener.height,
+      ccwRotationDegrees: stiffener.rotation ?? 0
+    }) : stiffener.outline;
+    const boardCenter = boardCenters.get(stiffener.pcb_board_id) ?? {
+      x: 0,
+      y: 0
+    };
+    const points = localPoints.map((point) => ({
+      x: point.x + boardCenter.x,
+      y: point.y + boardCenter.y
+    }));
+    const first = points[0];
+    if (!first || points.length < 3)
+      continue;
+    const mfy = (y) => flip_y_axis ? -y : y;
+    const builder = gerberBuilder().add("comment", {
+      comment: `Stiffener thickness: ${stiffener.thickness} mm${stiffener.adhesive_thickness === undefined ? "" : `; adhesive thickness: ${stiffener.adhesive_thickness} mm`}`
+    });
+    builder.add("move_operation", { x: first.x, y: mfy(first.y) });
+    for (const point of points.slice(1)) {
+      builder.add("plot_operation", { x: point.x, y: mfy(point.y) });
+    }
+    const last = points[points.length - 1];
+    if (last.x !== first.x || last.y !== first.y) {
+      builder.add("plot_operation", { x: first.x, y: mfy(first.y) });
+    }
+    layers[layerName].push(...builder.build());
+  }
+  return layers;
 }, getEllipsePoints = ({
   x,
   y,
@@ -60463,14 +60515,16 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
               height: element.height,
               rotationDegrees: rotation2
             });
-            renderPillFlash({
-              glayer: glayers[getGerberLayerName(layer, "soldermask")],
-              x: element.x,
-              y: element.y,
-              width: element.width + soldermaskMargin * 2,
-              height: element.height + soldermaskMargin * 2,
-              rotationDegrees: rotation2
-            });
+            if (element.is_covered_with_solder_mask !== true) {
+              renderPillFlash({
+                glayer: glayers[getGerberLayerName(layer, "soldermask")],
+                x: element.x,
+                y: element.y,
+                width: element.width + soldermaskMargin * 2,
+                height: element.height + soldermaskMargin * 2,
+                rotationDegrees: rotation2
+              });
+            }
             continue;
           }
           if (element.shape === "rotated_rect" && !element.corner_radius && !element.rect_border_radius) {
@@ -60487,6 +60541,9 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
                 height: element.height + soldermaskMargin * 2
               }
             ]) {
+              if (element.is_covered_with_solder_mask === true && glayer === glayers[getGerberLayerName(layer, "soldermask")]) {
+                continue;
+              }
               addClosedRegionFromPoints({
                 target: glayer,
                 apertureSource: glayer,
@@ -60511,6 +60568,9 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
               apertureConfig: getApertureConfigFromPcbSmtpadSoldermask(element)
             }
           ]) {
+            if (element.is_covered_with_solder_mask === true && glayer === glayers[getGerberLayerName(layer, "soldermask")]) {
+              continue;
+            }
             const apertureNumber = findApertureNumber(glayer, apertureConfig);
             const gb = gerberBuilder().add("select_aperture", {
               aperture_number: apertureNumber
@@ -60759,7 +60819,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
           for (const glayer of [
             glayers[getGerberLayerName(layer, "soldermask")]
           ]) {
-            if (element.hole_shape === "rotated_pill") {
+            if (element.hole_shape === "rotated_pill" || element.hole_shape === "oval") {
               const soldermaskMargin = element.soldermask_margin ?? 0;
               renderPillFlash({
                 glayer,
@@ -60767,7 +60827,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
                 y: element.y,
                 width: element.hole_width + soldermaskMargin * 2,
                 height: element.hole_height + soldermaskMargin * 2,
-                rotationDegrees: element.ccw_rotation
+                rotationDegrees: element.hole_shape === "rotated_pill" ? element.ccw_rotation : 0
               });
               continue;
             }
@@ -60785,8 +60845,12 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
           const layersToAddTo = [
             glayers[getGerberLayerName(layer, "copper")]
           ];
-          if (element.is_tented === false && isOuterLayerRef(layer)) {
-            layersToAddTo.push(glayers[getGerberLayerName(layer, "soldermask")]);
+          if (isOuterLayerRef(layer)) {
+            const tenting = element;
+            const isTented = (layer === "top" ? tenting.tented_on_top : tenting.tented_on_bottom) ?? tenting.is_tented;
+            if (isTented === false) {
+              layersToAddTo.push(glayers[getGerberLayerName(layer, "soldermask")]);
+            }
           }
           for (const glayer of layersToAddTo) {
             glayer.push(...gerberBuilder().add("select_aperture", {
@@ -60894,7 +60958,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
       if (element.type !== "pcb_hole") {
         continue;
       }
-      if (element.hole_shape === "rotated_pill") {
+      if (element.hole_shape === "rotated_pill" || element.hole_shape === "oval") {
         copperGlayer.push(...gerberBuilder().add("set_layer_polarity", { polarity: "C" }).build());
         renderPillFlash({
           glayer: copperGlayer,
@@ -60902,7 +60966,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
           y: element.y,
           width: element.hole_width,
           height: element.hole_height,
-          rotationDegrees: element.ccw_rotation
+          rotationDegrees: element.hole_shape === "rotated_pill" ? element.ccw_rotation : 0
         });
         copperGlayer.push(...gerberBuilder().add("set_layer_polarity", { polarity: "D" }).build());
         continue;
@@ -60914,6 +60978,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
       }).add("flash_operation", { x: element.x, y: mfy(element.y) }).add("set_layer_polarity", { polarity: "D" }).build());
     }
   }
+  Object.assign(glayers, renderStiffenerLayers(circuitJson, opts));
   for (const key of Object.keys(glayers)) {
     glayers[key].push(...gerberBuilder().add("end_of_file", {}).build());
   }
@@ -60934,7 +60999,7 @@ var import_polygon_clipping2, import_fast_json_stable_stringify, import_polygon_
   ]));
   return { ...gerberFiles, ...drillFiles };
 };
-var init_chunk_WLO6XF2E = __esm(() => {
+var init_chunk_5TBXNZXW = __esm(() => {
   import_polygon_clipping2 = __toESM3(require_polygon_clipping_cjs(), 1);
   import_fast_json_stable_stringify = __toESM3(require_fast_json_stable_stringify(), 1);
   import_polygon_clipping3 = __toESM3(require_polygon_clipping_cjs(), 1);
@@ -61549,7 +61614,7 @@ ${template_code}%`;
   };
   package_default6 = {
     name: "circuit-json-to-gerber",
-    version: "0.0.104",
+    version: "0.0.109",
     repository: {
       type: "git",
       url: "https://github.com/tscircuit/circuit-json-to-gerber"
@@ -61579,7 +61644,7 @@ ${template_code}%`;
       "@types/react-dom": "^19.1.5",
       archiver: "^7.0.1",
       "bun-match-svg": "^0.0.13",
-      "circuit-json": "^0.0.456",
+      "circuit-json": "^0.0.509",
       commander: "^12.1.0",
       "format-si-unit": "^0.0.7",
       "gerber-to-svg": "^4.2.8",
@@ -61611,6 +61676,8 @@ ${template_code}%`;
     "bottom-silkscreen": "Legend,Bot",
     "top-fabrication": "Other,Fab,Top",
     "bottom-fabrication": "Other,Fab,Bot",
+    "top-stiffener": "Other,Stiffener,Top",
+    "bottom-stiffener": "Other,Stiffener,Bot",
     "top-paste": "Paste,Top",
     "bottom-paste": "Paste,Bot",
     edgecut: "Profile,NP"
@@ -61633,7 +61700,7 @@ ${template_code}%`;
 
 // node_modules/circuit-json-to-gerber/dist/index.js
 var init_dist = __esm(() => {
-  init_chunk_WLO6XF2E();
+  init_chunk_5TBXNZXW();
 });
 
 // node_modules/@tracespace/xml-id/index.js
@@ -154298,7 +154365,7 @@ var import_perfect_cli = __toESM3(require_dist3(), 1);
 // lib/getVersion.ts
 import { createRequire as createRequire2 } from "node:module";
 // package.json
-var version = "0.1.2231";
+var version = "0.1.2233";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -154322,7 +154389,7 @@ var package_default = {
     "@tscircuit/eval": "0.0.1402",
     "@tscircuit/fake-snippets": "^0.0.182",
     "@tscircuit/file-server": "^0.0.32",
-    "@tscircuit/footprinter": "^0.0.426",
+    "@tscircuit/footprinter": "^0.0.430",
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/krt-wasm": "^0.1.6",
     "@tscircuit/math-utils": "0.0.36",
@@ -154348,8 +154415,8 @@ var package_default = {
     "circuit-json-to-bom-csv": "^0.0.19",
     "circuit-json-to-connectivity-map": "^0.0.32",
     "circuit-json-to-fdm-component-box": "^0.0.2",
-    "circuit-json-to-footprinter": "^0.0.58",
-    "circuit-json-to-gerber": "^0.0.105",
+    "circuit-json-to-footprinter": "^0.0.59",
+    "circuit-json-to-gerber": "^0.0.110",
     "circuit-json-to-kicad": "0.0.230",
     "circuit-json-to-pnp-csv": "^0.0.18",
     "circuit-json-to-readable-netlist": "^0.0.15",
@@ -337889,7 +337956,7 @@ var convertKicadFootprintToTsx = async ({
   console.log(kleur_default.green(`Converted ${outputPath}`));
 };
 
-// node_modules/circuit-json-to-footprinter/dist/chunk-VEAX3CQP.js
+// node_modules/circuit-json-to-footprinter/dist/chunk-K4WFTP36.js
 import {
   getBoundsCenter,
   getBoundsFromPoints as getBoundsFromPoints4
@@ -340635,7 +340702,7 @@ var getManifoldModule = async () => {
   return manifoldModulePromise;
 };
 
-// node_modules/circuit-json-to-footprinter/dist/chunk-VEAX3CQP.js
+// node_modules/circuit-json-to-footprinter/dist/chunk-K4WFTP36.js
 import { getBoundsCenter as getBoundsCenter2, isPointInsidePolygon as isPointInsidePolygon3 } from "@tscircuit/math-utils";
 var HOLE_SHAPE_KIND = {
   circle: "circle",
@@ -341045,6 +341112,7 @@ var getNumericPinNumbers = (pad) => [
     return match?.[1] ? [Number.parseInt(match[1], 10)] : [];
   }))
 ];
+var getBallCoordinates = (pad) => (pad?.element.port_hints ?? []).filter((hint) => /^[A-Z]+[1-9]\d*$/.test(hint));
 var matchPadsByPosition = (leftPads, rightPads) => {
   const availableRight = new Set(rightPads.map((_, index) => index));
   const pairs = [];
@@ -341079,10 +341147,14 @@ var comparePinHints = (left, right) => {
   for (const [leftPad, rightPad] of pairs) {
     const leftPinNumbers = getNumericPinNumbers(leftPad);
     const rightPinNumbers = getNumericPinNumbers(rightPad);
-    if (leftPinNumbers.length === 0 && rightPinNumbers.length === 0)
+    const leftBalls = getBallCoordinates(leftPad);
+    const rightBalls = getBallCoordinates(rightPad);
+    if (leftPinNumbers.length === 0 && rightPinNumbers.length === 0 && leftBalls.length === 0 && rightBalls.length === 0)
       continue;
     comparedPinCount += 1;
-    if (leftPinNumbers.some((pinNumber) => rightPinNumbers.includes(pinNumber))) {
+    const hasNumericPair = leftPinNumbers.length > 0 && rightPinNumbers.length > 0;
+    const hasBallPair = leftBalls.length > 0 && rightBalls.length > 0;
+    if ((hasNumericPair || leftPinNumbers.length === 0 && rightPinNumbers.length === 0 && hasBallPair) && (!hasNumericPair || leftPinNumbers.some((pinNumber) => rightPinNumbers.includes(pinNumber))) && (!hasBallPair || leftBalls.some((ball) => rightBalls.includes(ball)))) {
       matchedPinCount += 1;
       continue;
     }
@@ -342999,36 +343071,66 @@ var getSot223Seed = (target) => {
   }
   return;
 };
-var getBgaGridSeed = (target) => {
+var getBgaGridSeeds = (target) => {
   const pads = getPadGeometries(target);
-  if (pads.length < 4 || pads.some(({ copper, drill, element }) => element.type !== "pcb_smtpad" || drill || copper.shape !== "rect")) {
-    return;
+  if (pads.length < 4 || pads.some(({ copper, drill, element }) => element.type !== "pcb_smtpad" || drill || copper.shape !== "rect" && copper.shape !== "circle")) {
+    return [];
   }
   const bounds = pads.map(({ copper }) => getPadBounds3(copper));
   const pad = median(bounds.map(({ width, height }) => (width + height) / 2));
   const tolerance = Math.max(0.005, pad * 0.08);
   if (bounds.some(({ width, height }) => Math.abs(width - height) > tolerance || Math.abs(width - pad) > tolerance || Math.abs(height - pad) > tolerance)) {
-    return;
+    return [];
   }
   const columns = clusterCoordinates(pads.map(({ copper }) => copper.x), tolerance);
   const rows = clusterCoordinates(pads.map(({ copper }) => copper.y), tolerance);
-  if (columns.length < 2 || rows.length < 2 || columns.length * rows.length !== pads.length) {
-    return;
+  if (columns.length < 2 || rows.length < 2 || columns.length * rows.length < pads.length) {
+    return [];
   }
   const columnPitches = columns.slice(1).map((coordinate, index) => coordinate - columns[index]);
   const rowPitches = rows.slice(1).map((coordinate, index) => coordinate - rows[index]);
-  const pitch = median([...columnPitches, ...rowPitches]);
+  const pitch = median([
+    (columns.at(-1) - columns[0]) / (columns.length - 1),
+    (rows.at(-1) - rows[0]) / (rows.length - 1)
+  ]);
   if (pitch <= pad || [...columnPitches, ...rowPitches].some((candidate) => Math.abs(candidate - pitch) > tolerance)) {
-    return;
+    return [];
   }
-  for (const column of columns) {
-    for (const row of rows) {
-      if (pads.filter(({ copper }) => Math.abs(copper.x - column) <= tolerance && Math.abs(copper.y - row) <= tolerance).length !== 1) {
-        return;
+  const occupied = /* @__PURE__ */ new Set;
+  for (const { copper } of pads) {
+    const x = columns.findIndex((column) => Math.abs(copper.x - column) <= tolerance);
+    const y = rows.findIndex((row) => Math.abs(copper.y - row) <= tolerance);
+    const position = y * columns.length + x;
+    if (x < 0 || y < 0 || occupied.has(position))
+      return [];
+    occupied.add(position);
+  }
+  const shapes = new Set(pads.map(({ copper }) => copper.shape));
+  if (shapes.size !== 1)
+    return [];
+  const base = `bga${pads.length}_grid${columns.length}x${rows.length}_p${formatPreciseLength(pitch)}_pad${formatPreciseLength(pad)}`;
+  const padModifier = shapes.has("rect") ? "_rectpads" : "";
+  const seeds = [];
+  for (const origin of ["tl", "bl", "tr", "br"]) {
+    const missing = [];
+    for (let y = 0;y < rows.length; y++) {
+      for (let x = 0;x < columns.length; x++) {
+        if (occupied.has(y * columns.length + x))
+          continue;
+        const pinX = origin.endsWith("r") ? columns.length - 1 - x : x;
+        const pinY = origin.startsWith("b") ? rows.length - 1 - y : y;
+        missing.push(pinY * columns.length + pinX + 1);
       }
     }
+    missing.sort((left, right) => left - right);
+    const mask = missing.length ? `_missing(${missing.join(",")})` : "";
+    const seed = `${base}${mask}_${origin}origin${padModifier}`;
+    seeds.push(seed);
+    for (const numbering of ["rowmajor", "columnmajor", "ballcoords"]) {
+      seeds.push(`${seed}_pinnumbering(${numbering})`);
+    }
   }
-  return `bga${pads.length}_grid${columns.length}x${rows.length}_p${formatPreciseLength(pitch)}_pad${formatPreciseLength(pad)}_rectpads`;
+  return seeds;
 };
 var getStaggeredSmdPinHeaderSeed = (target) => {
   const description = `${target.title} ${target.subtitle} ${target.sourceHints?.join(" ") ?? ""}`.toLowerCase();
@@ -343189,9 +343291,8 @@ var generateSeeds = (target, analysis) => {
     if (family !== "usbcmidmount")
       seeds.add(family);
   }
-  const bgaGridSeed = getBgaGridSeed(target);
-  if (bgaGridSeed)
-    seeds.add(bgaGridSeed);
+  for (const seed of getBgaGridSeeds(target))
+    seeds.add(seed);
   const staggeredSmdPinHeaderSeed = getStaggeredSmdPinHeaderSeed(target);
   if (staggeredSmdPinHeaderSeed)
     seeds.add(staggeredSmdPinHeaderSeed);
@@ -343696,7 +343797,7 @@ var selectSeedsToOptimize = (candidates, analysis, target) => {
   return [...selected.values()].slice(0, MAX_OPTIMIZED_SEEDS);
 };
 var findActiveParameters = (seed, analysis) => {
-  if (seed.family === "fpc" || seed.family === "jst" && (seed.footprinterString.includes("_smd") || seed.footprinterString.includes("_zh"))) {
+  if (seed.family === "bga" && seed.footprinterString.includes("_pinnumbering(") || seed.family === "fpc" || seed.family === "jst" && (seed.footprinterString.includes("_smd") || seed.footprinterString.includes("_zh"))) {
     return [];
   }
   const active = [];

package/dist/lib/index.js

@@ -69109,7 +69109,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.2231";
+var version = "0.1.2233";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -69133,7 +69133,7 @@ var package_default = {
     "@tscircuit/eval": "0.0.1402",
     "@tscircuit/fake-snippets": "^0.0.182",
     "@tscircuit/file-server": "^0.0.32",
-    "@tscircuit/footprinter": "^0.0.426",
+    "@tscircuit/footprinter": "^0.0.430",
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/krt-wasm": "^0.1.6",
     "@tscircuit/math-utils": "0.0.36",
@@ -69159,8 +69159,8 @@ var package_default = {
     "circuit-json-to-bom-csv": "^0.0.19",
     "circuit-json-to-connectivity-map": "^0.0.32",
     "circuit-json-to-fdm-component-box": "^0.0.2",
-    "circuit-json-to-footprinter": "^0.0.58",
-    "circuit-json-to-gerber": "^0.0.105",
+    "circuit-json-to-footprinter": "^0.0.59",
+    "circuit-json-to-gerber": "^0.0.110",
     "circuit-json-to-kicad": "0.0.230",
     "circuit-json-to-pnp-csv": "^0.0.18",
     "circuit-json-to-readable-netlist": "^0.0.15",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.2232",
+  "version": "0.1.2234",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/cli"
@@ -21,7 +21,7 @@
     "@tscircuit/eval": "0.0.1402",
     "@tscircuit/fake-snippets": "^0.0.182",
     "@tscircuit/file-server": "^0.0.32",
-    "@tscircuit/footprinter": "^0.0.426",
+    "@tscircuit/footprinter": "^0.0.430",
     "@tscircuit/image-utils": "^0.0.8",
     "@tscircuit/krt-wasm": "^0.1.6",
     "@tscircuit/math-utils": "0.0.36",
@@ -47,8 +47,8 @@
     "circuit-json-to-bom-csv": "^0.0.19",
     "circuit-json-to-connectivity-map": "^0.0.32",
     "circuit-json-to-fdm-component-box": "^0.0.2",
-    "circuit-json-to-footprinter": "^0.0.58",
-    "circuit-json-to-gerber": "^0.0.105",
+    "circuit-json-to-footprinter": "^0.0.59",
+    "circuit-json-to-gerber": "^0.0.110",
     "circuit-json-to-kicad": "0.0.230",
     "circuit-json-to-pnp-csv": "^0.0.18",
     "circuit-json-to-readable-netlist": "^0.0.15",