circuit-json-to-gerber 0.0.68 → 0.0.70

package/dist/{chunk-LCX42IEO.js → chunk-ISNPG4RS.js}

@@ -1112,7 +1112,17 @@ var define_aperture_template = defineGerberCommand({
       if (macro_name === "HORZPILL" || macro_name === "VERTPILL") {
         commandString += `${props.x_size.toFixed(6)}X${props.y_size.toFixed(6)}X${props.circle_diameter.toFixed(6)}X${props.circle_center_offset.toFixed(6)}`;
       } else if (macro_name === "ROUNDRECT") {
-        throw new Error("ROUNDRECT macro not implemented yet");
+        commandString += [
+          props.corner_radius,
+          props.corner_1_x,
+          props.corner_1_y,
+          props.corner_2_x,
+          props.corner_2_y,
+          props.corner_3_x,
+          props.corner_3_y,
+          props.corner_4_x,
+          props.corner_4_y
+        ].map((value) => value.toFixed(6)).join("X");
       }
       commandString += "*%";
       return commandString;
@@ -1289,7 +1299,7 @@ var defineCommonMacros = (glayer) => {
 1,1,$3,0.0,$4*
 `.trim()
     }).add("define_macro_aperture_template", {
-      macro_name: "RoundRect",
+      macro_name: "ROUNDRECT",
       template_code: `
 0 Rectangle with rounded corners*
 0 $1 Corner radius*
@@ -1355,6 +1365,26 @@ var getLayerRefFromGerberLayerName = (glayer_name) => {
   if (innerLayerMatch) return `inner${innerLayerMatch[1]}`;
   throw new Error(`Could not infer layer ref from ${glayer_name}`);
 };
+var getClampedRoundedRectCornerRadius = (width, height, cornerRadius) => {
+  if (typeof cornerRadius !== "number") return 0;
+  return Math.max(0, Math.min(cornerRadius, width / 2, height / 2));
+};
+var getRoundedRectApertureConfig = (width, height, cornerRadius) => {
+  const halfWidth = width / 2;
+  const halfHeight = height / 2;
+  return {
+    macro_name: "ROUNDRECT",
+    corner_radius: cornerRadius,
+    corner_1_x: -halfWidth + cornerRadius,
+    corner_1_y: halfHeight - cornerRadius,
+    corner_2_x: halfWidth - cornerRadius,
+    corner_2_y: halfHeight - cornerRadius,
+    corner_3_x: halfWidth - cornerRadius,
+    corner_3_y: -halfHeight + cornerRadius,
+    corner_4_x: -halfWidth + cornerRadius,
+    corner_4_y: -halfHeight + cornerRadius
+  };
+};
 function defineAperturesForLayer({
   glayer,
   circuitJson,
@@ -1403,7 +1433,21 @@ function defineAperturesForLayer({
     ...gerberBuilder().add("delete_attribute", {}).add("comment", { comment: "aperture END LIST" }).build()
   );
 }
+var REGION_APERTURE_CONFIG = {
+  standard_template_code: "C",
+  diameter: 1e-3
+};
 var getApertureConfigFromPcbSmtpad = (elm) => {
+  if (elm.shape === "rect" || elm.shape === "rotated_rect") {
+    const cornerRadius = getClampedRoundedRectCornerRadius(
+      elm.width,
+      elm.height,
+      "corner_radius" in elm ? elm.corner_radius : void 0
+    );
+    if (cornerRadius > 0) {
+      return getRoundedRectApertureConfig(elm.width, elm.height, cornerRadius);
+    }
+  }
   if (elm.shape === "rect") {
     return {
       standard_template_code: "R",
@@ -1457,6 +1501,18 @@ var getApertureConfigFromPcbSmtpadSoldermask = (elm) => {
   if ("soldermask_margin" in elm && typeof elm.soldermask_margin === "number") {
     soldermaskMargin = elm.soldermask_margin;
   }
+  if (elm.shape === "rect" || elm.shape === "rotated_rect") {
+    const width = elm.width + soldermaskMargin * 2;
+    const height = elm.height + soldermaskMargin * 2;
+    const cornerRadius = getClampedRoundedRectCornerRadius(
+      width,
+      height,
+      "corner_radius" in elm && typeof elm.corner_radius === "number" ? elm.corner_radius + soldermaskMargin : void 0
+    );
+    if (cornerRadius > 0) {
+      return getRoundedRectApertureConfig(width, height, cornerRadius);
+    }
+  }
   if (elm.shape === "rect") {
     return {
       standard_template_code: "R",
@@ -1737,6 +1793,7 @@ function getAllApertureTemplateConfigsForLayer({
   const configs = [];
   const configHashMap = /* @__PURE__ */ new Set();
   const isSoldermaskLayer = glayer_name.endsWith("_Mask");
+  const isCopperLayer = glayer_name.endsWith("_Cu");
   const addConfigIfNew = (config) => {
     const hash = stableStringify(config);
     if (!configHashMap.has(hash)) {
@@ -1768,6 +1825,9 @@ function getAllApertureTemplateConfigsForLayer({
       }
     } else if (elm.type === "pcb_plated_hole") {
       if (elm.layers.includes(layer)) {
+        if (elm.shape === "hole_with_polygon_pad") {
+          continue;
+        }
         if (glayer_name.endsWith("_Mask") && elm.is_covered_with_solder_mask === true) {
           continue;
         }
@@ -1806,6 +1866,27 @@ function getAllApertureTemplateConfigsForLayer({
         addConfigIfNew(getApertureConfigFromPcbCopperText(elm));
     }
   }
+  const needsRegionAperture = circuitJson.some((elm) => {
+    if (elm.type === "pcb_copper_pour") {
+      if (elm.layer !== layer) return false;
+      if (isCopperLayer) return true;
+      return isSoldermaskLayer && elm.covered_with_solder_mask === false;
+    }
+    if (elm.type === "pcb_smtpad" && elm.shape === "polygon") {
+      if (elm.layer !== layer) return false;
+      if (isCopperLayer) return true;
+      return isSoldermaskLayer && elm.is_covered_with_solder_mask !== true;
+    }
+    if (elm.type === "pcb_plated_hole" && elm.shape === "hole_with_polygon_pad") {
+      if (!elm.layers.includes(layer)) return false;
+      if (isCopperLayer) return true;
+      return isSoldermaskLayer && elm.is_covered_with_solder_mask !== true;
+    }
+    return false;
+  });
+  if (needsRegionAperture) {
+    addConfigIfNew(REGION_APERTURE_CONFIG);
+  }
   return configs;
 }
 
@@ -1835,7 +1916,7 @@ var findApertureNumber = (glayer, search_params) => {
 // package.json
 var package_default = {
   name: "circuit-json-to-gerber",
-  version: "0.0.67",
+  version: "0.0.68",
   main: "dist/index.js",
   type: "module",
   scripts: {
@@ -2068,6 +2149,34 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
     }).build()
   );
   const mfy = (y) => opts.flip_y_axis ? -y : y;
+  const getRegionApertureNumber = (glayer) => findApertureNumber(glayer, REGION_APERTURE_CONFIG);
+  const addClosedRegionFromPoints = ({
+    target,
+    apertureSource,
+    points
+  }) => {
+    if (points.length === 0) return;
+    const regionApertureNumber = getRegionApertureNumber(apertureSource);
+    const regionBuilder = gerberBuilder().add("select_aperture", {
+      aperture_number: regionApertureNumber
+    }).add("start_region_statement", {});
+    regionBuilder.add("move_operation", {
+      x: points[0].x,
+      y: mfy(points[0].y)
+    });
+    for (let i = 1; i < points.length; i++) {
+      regionBuilder.add("plot_operation", {
+        x: points[i].x,
+        y: mfy(points[i].y)
+      });
+    }
+    regionBuilder.add("plot_operation", {
+      x: points[0].x,
+      y: mfy(points[0].y)
+    });
+    regionBuilder.add("end_region_statement", {});
+    target.push(...regionBuilder.build());
+  };
   const renderVectorText = (element, layer, layerType, getApertureConfig) => {
     if (element.layer !== layer) return;
     const CAP_HEIGHT_SCALE = 0.7;
@@ -2308,7 +2417,8 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
           const { brep_shape } = element;
           if (!brep_shape) continue;
           const { outer_ring, inner_rings } = brep_shape;
-          const outer_builder = gerberBuilder().add("select_aperture", { aperture_number: 10 }).add("start_region_statement", {});
+          const regionApertureNumber = getRegionApertureNumber(copper_glayer);
+          const outer_builder = gerberBuilder().add("select_aperture", { aperture_number: regionApertureNumber }).add("start_region_statement", {});
           drawRingToBuilder(outer_builder, reverseRing(outer_ring));
           outer_builder.add("end_region_statement", {});
           all_pour_commands.push(...outer_builder.build());
@@ -2317,7 +2427,9 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
               ...gerberBuilder().add("set_layer_polarity", { polarity: "C" }).build()
             );
             for (const inner_ring of inner_rings) {
-              const inner_builder = gerberBuilder().add("select_aperture", { aperture_number: 10 }).add("start_region_statement", {});
+              const inner_builder = gerberBuilder().add("select_aperture", {
+                aperture_number: regionApertureNumber
+              }).add("start_region_statement", {});
               drawRingToBuilder(inner_builder, inner_ring);
               inner_builder.add("end_region_statement", {});
               all_pour_commands.push(...inner_builder.build());
@@ -2352,7 +2464,8 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
           const transformedPoints = points.map(
             (p) => applyToPoint(transformMatrix, p)
           );
-          const rect_builder = gerberBuilder().add("select_aperture", { aperture_number: 10 }).add("start_region_statement", {});
+          const regionApertureNumber = getRegionApertureNumber(copper_glayer);
+          const rect_builder = gerberBuilder().add("select_aperture", { aperture_number: regionApertureNumber }).add("start_region_statement", {});
           rect_builder.add("move_operation", {
             x: transformedPoints[0].x,
             y: mfy(transformedPoints[0].y)
@@ -2371,25 +2484,11 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
           all_pour_commands.push(...rect_builder.build());
         } else if (element.shape === "polygon") {
           const { points } = element;
-          if (points.length > 0) {
-            const poly_builder = gerberBuilder().add("select_aperture", { aperture_number: 10 }).add("start_region_statement", {});
-            poly_builder.add("move_operation", {
-              x: points[0].x,
-              y: mfy(points[0].y)
-            });
-            for (let i = 1; i < points.length; i++) {
-              poly_builder.add("plot_operation", {
-                x: points[i].x,
-                y: mfy(points[i].y)
-              });
-            }
-            poly_builder.add("plot_operation", {
-              x: points[0].x,
-              y: mfy(points[0].y)
-            });
-            poly_builder.add("end_region_statement", {});
-            all_pour_commands.push(...poly_builder.build());
-          }
+          addClosedRegionFromPoints({
+            target: all_pour_commands,
+            apertureSource: copper_glayer,
+            points
+          });
         }
         copper_glayer.push(...all_pour_commands);
         if (element.covered_with_solder_mask === false) {
@@ -2540,26 +2639,13 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
             );
           }
           for (const glayer of layers_to_add_to) {
-            const pad_builder = gerberBuilder().add("select_aperture", { aperture_number: 10 }).add("start_region_statement", {});
             const { points } = element;
-            if (points && points.length > 0) {
-              pad_builder.add("move_operation", {
-                x: points[0].x,
-                y: mfy(points[0].y)
-              });
-              for (let i = 1; i < points.length; i++) {
-                pad_builder.add("plot_operation", {
-                  x: points[i].x,
-                  y: mfy(points[i].y)
-                });
-              }
-              pad_builder.add("plot_operation", {
-                x: points[0].x,
-                y: mfy(points[0].y)
-              });
-            }
-            pad_builder.add("end_region_statement", {});
-            glayer.push(...pad_builder.build());
+            if (!points) continue;
+            addClosedRegionFromPoints({
+              target: glayer,
+              apertureSource: glayer,
+              points
+            });
           }
         }
       } else if (element.type === "pcb_solder_paste") {
@@ -2609,6 +2695,16 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
             layersToAddTo.push(glayers[getGerberLayerName(layer, "soldermask")]);
           }
           for (const glayer of layersToAddTo) {
+            if (element.shape === "hole_with_polygon_pad") {
+              const { pad_outline } = element;
+              if (!pad_outline?.length) continue;
+              addClosedRegionFromPoints({
+                target: glayer,
+                apertureSource: glayer,
+                points: pad_outline
+              });
+              continue;
+            }
             const holeW = "hole_width" in element && typeof element.hole_width === "number" ? element.hole_width : 0;
             const holeH = "hole_height" in element && typeof element.hole_height === "number" ? element.hole_height : 0;
             const padWidthCandidates = [holeW];
@@ -2988,4 +3084,4 @@ export {
   stringifyGerberCommands,
   convertSoupToGerberCommands
 };
-//# sourceMappingURL=chunk-LCX42IEO.js.map
+//# sourceMappingURL=chunk-ISNPG4RS.js.map