@tscircuit/cli 0.1.1977 → 0.1.1978

package/dist/cli/main.js

@@ -55441,7 +55441,7 @@ var require_fast_json_stable_stringify = __commonJS(function(exports2, module2)
   };
 });
 
-// node_modules/circuit-json-to-gerber/dist/chunk-MJSWOMMX.js
+// node_modules/circuit-json-to-gerber/dist/chunk-X27MJBIZ.js
 import { z as z4 } from "zod";
 import { z as z23 } from "zod";
 import { z as z32 } from "zod";
@@ -55677,6 +55677,9 @@ function getAllApertureTemplateConfigsForLayer({
         } else {
           addConfigIfNew(getApertureConfigFromCirclePcbHole(elm));
         }
+      } else if (elm.hole_shape === "rotated_pill") {
+        const soldermaskMargin = isSoldermaskLayer ? elm.soldermask_margin ?? 0 : 0;
+        addConfigIfNew(getApertureConfigFromRotatedPillPcbHole(elm, soldermaskMargin));
       } else
         console.warn("NOT IMPLEMENTED: drawing gerber for non circle holes");
     } else if (elm.type === "pcb_via") {
@@ -56191,6 +56194,50 @@ var import_polygon_clipping, import_fast_json_stable_stringify, import_polygon_c
   }
   builder.add("M30", {});
   return builder.build();
+}, getDrillLayerSpanKey = (span, layerCount) => {
+  const normalizedSpan = normalizeLayerSpan(span, layerCount);
+  return `L${getLayerNumber(normalizedSpan.from_layer, layerCount)}-L${getLayerNumber(normalizedSpan.to_layer, layerCount)}`;
+}, hasDrillGeometry = (element) => {
+  if ("hole_diameter" in element && typeof element.hole_diameter === "number") {
+    return true;
+  }
+  return "hole_width" in element && typeof element.hole_width === "number" && "hole_height" in element && typeof element.hole_height === "number";
+}, convertSoupToExcellonDrillCommandLayers = ({
+  circuitJson,
+  flip_y_axis = false
+}) => {
+  const layerCount = getLayerCount(circuitJson);
+  const platedSpans = new Map(getDrillableElements(circuitJson).flatMap((element) => {
+    const span = getPlatedElementLayerSpan(element, layerCount);
+    if (!span) {
+      return [];
+    }
+    return [[getDrillLayerSpanKey(span, layerCount), span]];
+  }));
+  const platedDrillLayers = Object.fromEntries([...platedSpans.entries()].sort().map(([spanKey, span]) => [
+    `drill-${spanKey}.drl`,
+    convertSoupToExcellonDrillCommands({
+      circuitJson,
+      is_plated: true,
+      flip_y_axis,
+      layer_span: span
+    })
+  ]));
+  const hasNonPlatedDrill = circuitJson.some((element) => {
+    return element.type === "pcb_hole" && hasDrillGeometry(element);
+  });
+  const hasInternalCircularCutoutDrill = getInternalCircularCutoutDrills(circuitJson).length > 0;
+  if (!hasNonPlatedDrill && !hasInternalCircularCutoutDrill) {
+    return platedDrillLayers;
+  }
+  return {
+    ...platedDrillLayers,
+    "drill_npth.drl": convertSoupToExcellonDrillCommands({
+      circuitJson,
+      is_plated: false,
+      flip_y_axis
+    })
+  };
 }, defineGerberCommand = ({
   command_code,
   schema,
@@ -56696,6 +56743,11 @@ var import_polygon_clipping, import_fast_json_stable_stringify, import_polygon_c
     standard_template_code: "C",
     diameter: elm.hole_diameter + soldermaskMargin * 2
   };
+}, getApertureConfigFromRotatedPillPcbHole = (elm, soldermaskMargin = 0) => {
+  return {
+    standard_template_code: "C",
+    diameter: Math.min(elm.hole_width, elm.hole_height) + soldermaskMargin * 2
+  };
 }, getApertureConfigFromOuterDiameter = (elm) => {
   if (typeof elm.outer_diameter !== "number") {
     throw new Error("outer_diameter not specified in getApertureConfigFromOuterDiameter");
@@ -58290,6 +58342,18 @@ var import_polygon_clipping, import_fast_json_stable_stringify, import_polygon_c
           for (const glayer of [
             glayers[getGerberLayerName(layer, "soldermask")]
           ]) {
+            if (element.hole_shape === "rotated_pill") {
+              const soldermaskMargin = element.soldermask_margin ?? 0;
+              renderPillFlash({
+                glayer,
+                x: element.x,
+                y: element.y,
+                width: element.hole_width + soldermaskMargin * 2,
+                height: element.hole_height + soldermaskMargin * 2,
+                rotationDegrees: element.ccw_rotation
+              });
+              continue;
+            }
             if (element.hole_shape !== "circle") {
               console.warn("NOT IMPLEMENTED: drawing gerber for non-round holes");
               continue;
@@ -58410,9 +58474,24 @@ var import_polygon_clipping, import_fast_json_stable_stringify, import_polygon_c
       continue;
     const copperGlayer = glayers[getGerberLayerName(layer, "copper")];
     for (const element of circuitJson) {
-      if (element.type !== "pcb_hole" || element.hole_shape !== "circle") {
+      if (element.type !== "pcb_hole") {
+        continue;
+      }
+      if (element.hole_shape === "rotated_pill") {
+        copperGlayer.push(...gerberBuilder().add("set_layer_polarity", { polarity: "C" }).build());
+        renderPillFlash({
+          glayer: copperGlayer,
+          x: element.x,
+          y: element.y,
+          width: element.hole_width,
+          height: element.hole_height,
+          rotationDegrees: element.ccw_rotation
+        });
+        copperGlayer.push(...gerberBuilder().add("set_layer_polarity", { polarity: "D" }).build());
         continue;
       }
+      if (element.hole_shape !== "circle")
+        continue;
       copperGlayer.push(...gerberBuilder().add("set_layer_polarity", { polarity: "C" }).add("select_aperture", {
         aperture_number: findApertureNumber(copperGlayer, getApertureConfigFromCirclePcbHole(element))
       }).add("flash_operation", { x: element.x, y: mfy(element.y) }).add("set_layer_polarity", { polarity: "D" }).build());
@@ -58422,8 +58501,23 @@ var import_polygon_clipping, import_fast_json_stable_stringify, import_polygon_c
     glayers[key].push(...gerberBuilder().add("end_of_file", {}).build());
   }
   return glayers;
+}, convertCircuitJsonToGerberFiles = (circuitJson, options = {}) => {
+  const { flip_y_axis = false } = options;
+  const gerberCommandLayers = convertSoupToGerberCommands(circuitJson, {
+    flip_y_axis
+  });
+  const gerberFiles = Object.fromEntries(Object.entries(stringifyGerberCommandLayers(gerberCommandLayers)).map(([layerName, contents]) => [`${layerName}.gbr`, contents]));
+  const drillCommandLayers = convertSoupToExcellonDrillCommandLayers({
+    circuitJson,
+    flip_y_axis
+  });
+  const drillFiles = Object.fromEntries(Object.entries(drillCommandLayers).map(([fileName, commands]) => [
+    fileName,
+    stringifyExcellonDrill(commands)
+  ]));
+  return { ...gerberFiles, ...drillFiles };
 };
-var init_chunk_MJSWOMMX = __esm(() => {
+var init_chunk_X27MJBIZ = __esm(() => {
   import_polygon_clipping = __toESM2(require_polygon_clipping_cjs(), 1);
   import_fast_json_stable_stringify = __toESM2(require_fast_json_stable_stringify(), 1);
   import_polygon_clipping2 = __toESM2(require_polygon_clipping_cjs(), 1);
@@ -59038,7 +59132,11 @@ ${template_code}%`;
   };
   package_default5 = {
     name: "circuit-json-to-gerber",
-    version: "0.0.93",
+    version: "0.0.96",
+    repository: {
+      type: "git",
+      url: "https://github.com/tscircuit/circuit-json-to-gerber"
+    },
     license: "MIT",
     main: "dist/index.js",
     type: "module",
@@ -59117,7 +59215,7 @@ ${template_code}%`;
 
 // node_modules/circuit-json-to-gerber/dist/index.js
 var init_dist = __esm(() => {
-  init_chunk_MJSWOMMX();
+  init_chunk_X27MJBIZ();
 });
 
 // node_modules/@tracespace/xml-id/index.js
@@ -136094,7 +136192,7 @@ var package_default = {
     "circuit-json-to-connectivity-map": "^0.0.25",
     "circuit-json-to-fdm-component-box": "^0.0.2",
     "circuit-json-to-footprinter": "^0.0.15",
-    "circuit-json-to-gerber": "^0.0.94",
+    "circuit-json-to-gerber": "^0.0.97",
     "circuit-json-to-kicad": "0.0.157",
     "circuit-json-to-pnp-csv": "^0.0.9",
     "circuit-json-to-readable-netlist": "^0.0.15",
@@ -316223,28 +316321,11 @@ var exportSnippet = async ({
     }
     case "gerbers": {
       const zip = new import_jszip4.default;
-      const gerberLayerCmds = convertSoupToGerberCommands(circuitJson, {
-        flip_y_axis: false
-      });
-      const gerberFileContents = stringifyGerberCommandLayers(gerberLayerCmds);
-      for (const [fileName, fileContents] of Object.entries(gerberFileContents)) {
-        zip.file(`${fileName}.gbr`, fileContents);
-      }
-      const platedDrillCmds = convertSoupToExcellonDrillCommands({
-        circuitJson,
-        is_plated: true,
-        flip_y_axis: false
-      });
-      if (platedDrillCmds.length > 0) {
-        zip.file("drill.drl", stringifyExcellonDrill(platedDrillCmds));
-      }
-      const nonPlatedDrillCmds = convertSoupToExcellonDrillCommands({
-        circuitJson,
-        is_plated: false,
+      const gerberFiles = convertCircuitJsonToGerberFiles(circuitJson, {
         flip_y_axis: false
       });
-      if (nonPlatedDrillCmds.length > 0) {
-        zip.file("drill_npth.drl", stringifyExcellonDrill(nonPlatedDrillCmds));
+      for (const [fileName, fileContents] of Object.entries(gerberFiles)) {
+        zip.file(fileName, fileContents);
       }
       const bomRows = await convertCircuitJsonToBomRows({ circuitJson });
       const bomCsv = await convertBomRowsToCsv(bomRows);

package/dist/lib/index.js

@@ -65807,7 +65807,7 @@ var package_default = {
     "circuit-json-to-connectivity-map": "^0.0.25",
     "circuit-json-to-fdm-component-box": "^0.0.2",
     "circuit-json-to-footprinter": "^0.0.15",
-    "circuit-json-to-gerber": "^0.0.94",
+    "circuit-json-to-gerber": "^0.0.97",
     "circuit-json-to-kicad": "0.0.157",
     "circuit-json-to-pnp-csv": "^0.0.9",
     "circuit-json-to-readable-netlist": "^0.0.15",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.1977",
+  "version": "0.1.1978",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/cli"
@@ -45,7 +45,7 @@
     "circuit-json-to-connectivity-map": "^0.0.25",
     "circuit-json-to-fdm-component-box": "^0.0.2",
     "circuit-json-to-footprinter": "^0.0.15",
-    "circuit-json-to-gerber": "^0.0.94",
+    "circuit-json-to-gerber": "^0.0.97",
     "circuit-json-to-kicad": "0.0.157",
     "circuit-json-to-pnp-csv": "^0.0.9",
     "circuit-json-to-readable-netlist": "^0.0.15",