circuit-json-to-gerber 0.0.63 → 0.0.66

package/dist/{chunk-VGLNFU2D.js → chunk-PJZ4H5LY.js}

@@ -1417,6 +1417,29 @@ var getApertureConfigFromPcbSmtpad = (elm) => {
       y_size: elm.height
     };
   }
+  if (elm.shape === "pill") {
+    if (!("width" in elm && "height" in elm)) {
+      throw new Error(
+        "Invalid pill shape in getApertureConfigFromPcbSmtpad: missing dimensions"
+      );
+    }
+    if (elm.width >= elm.height) {
+      return {
+        macro_name: "HORZPILL",
+        x_size: elm.width,
+        y_size: elm.height,
+        circle_diameter: Math.min(elm.width, elm.height),
+        circle_center_offset: elm.width / 2
+      };
+    }
+    return {
+      macro_name: "VERTPILL",
+      x_size: elm.width,
+      y_size: elm.height,
+      circle_diameter: Math.min(elm.width, elm.height),
+      circle_center_offset: elm.height / 2
+    };
+  }
   if (elm.shape === "polygon") {
     throw new Error("Polygon SMT pads are drawn as regions, not apertures");
   }
@@ -1447,6 +1470,31 @@ var getApertureConfigFromPcbSmtpadSoldermask = (elm) => {
       y_size: elm.height + soldermaskMargin * 2
     };
   }
+  if (elm.shape === "pill") {
+    if (!("width" in elm && "height" in elm)) {
+      throw new Error(
+        "Invalid pill shape in getApertureConfigFromPcbSmtpadSoldermask: missing dimensions"
+      );
+    }
+    const width = elm.width + soldermaskMargin * 2;
+    const height = elm.height + soldermaskMargin * 2;
+    if (width >= height) {
+      return {
+        macro_name: "HORZPILL",
+        x_size: width,
+        y_size: height,
+        circle_diameter: Math.min(width, height),
+        circle_center_offset: width / 2
+      };
+    }
+    return {
+      macro_name: "VERTPILL",
+      x_size: width,
+      y_size: height,
+      circle_diameter: Math.min(width, height),
+      circle_center_offset: height / 2
+    };
+  }
   if (elm.shape === "polygon") {
     throw new Error("Polygon SMT pads are drawn as regions, not apertures");
   }
@@ -1579,6 +1627,64 @@ var getApertureConfigFromPcbPlatedHole = (elm) => {
     `Unsupported shape in getApertureConfigFromPcbPlatedHole: ${elm.shape}`
   );
 };
+var getApertureConfigFromPcbPlatedHoleSoldermask = (elm) => {
+  let soldermaskMargin = 0;
+  if ("soldermask_margin" in elm && typeof elm.soldermask_margin === "number") {
+    soldermaskMargin = elm.soldermask_margin;
+  }
+  if (elm.shape === "circle") {
+    if (!("outer_diameter" in elm && "hole_diameter" in elm)) {
+      throw new Error(
+        "Invalid circle shape in getApertureConfigFromPcbPlatedHoleSoldermask: missing diameters"
+      );
+    }
+    return {
+      standard_template_code: "C",
+      diameter: elm.outer_diameter + soldermaskMargin * 2
+    };
+  }
+  if (elm.shape === "pill") {
+    if (!("outer_width" in elm && "outer_height" in elm)) {
+      throw new Error(
+        "Invalid pill shape in getApertureConfigFromPcbPlatedHoleSoldermask: missing dimensions"
+      );
+    }
+    const outerWidth = elm.outer_width + soldermaskMargin * 2;
+    const outerHeight = elm.outer_height + soldermaskMargin * 2;
+    if (outerWidth > outerHeight) {
+      return {
+        macro_name: "HORZPILL",
+        x_size: outerWidth,
+        y_size: outerHeight,
+        circle_diameter: Math.min(outerWidth, outerHeight),
+        circle_center_offset: outerWidth / 2
+      };
+    }
+    return {
+      macro_name: "VERTPILL",
+      x_size: outerWidth,
+      y_size: outerHeight,
+      circle_diameter: Math.min(outerWidth, outerHeight),
+      circle_center_offset: outerHeight / 2
+    };
+  }
+  const shape = elm.shape;
+  if (shape === "circular_hole_with_rect_pad" || shape === "pill_hole_with_rect_pad" || shape === "rotated_pill_hole_with_rect_pad") {
+    if (!("rect_pad_width" in elm && "rect_pad_height" in elm)) {
+      throw new Error(
+        `Invalid ${shape} shape in getApertureConfigFromPcbPlatedHoleSoldermask: missing dimensions`
+      );
+    }
+    return {
+      standard_template_code: "R",
+      x_size: elm.rect_pad_width + soldermaskMargin * 2,
+      y_size: elm.rect_pad_height + soldermaskMargin * 2
+    };
+  }
+  throw new Error(
+    `Unsupported shape in getApertureConfigFromPcbPlatedHoleSoldermask: ${elm.shape}`
+  );
+};
 var getApertureConfigFromCirclePcbHole = (elm) => {
   if (!("hole_diameter" in elm)) {
     throw new Error(
@@ -1590,6 +1696,21 @@ var getApertureConfigFromCirclePcbHole = (elm) => {
     diameter: elm.hole_diameter
   };
 };
+var getApertureConfigFromCirclePcbHoleSoldermask = (elm) => {
+  if (!("hole_diameter" in elm)) {
+    throw new Error(
+      `Invalid shape called in getApertureConfigFromCirclePcbHoleSoldermask: ${elm.hole_shape}`
+    );
+  }
+  let soldermaskMargin = 0;
+  if ("soldermask_margin" in elm && typeof elm.soldermask_margin === "number") {
+    soldermaskMargin = elm.soldermask_margin;
+  }
+  return {
+    standard_template_code: "C",
+    diameter: elm.hole_diameter + soldermaskMargin * 2
+  };
+};
 var getApertureConfigFromOuterDiameter = (elm) => {
   if (typeof elm.outer_diameter !== "number") {
     throw new Error(
@@ -1643,15 +1764,24 @@ function getAllApertureTemplateConfigsForLayer({
         if (glayer_name.endsWith("_Mask") && elm.is_covered_with_solder_mask === true) {
           continue;
         }
-        addConfigIfNew(getApertureConfigFromPcbPlatedHole(elm));
+        if (isSoldermaskLayer) {
+          addConfigIfNew(getApertureConfigFromPcbPlatedHoleSoldermask(elm));
+        } else {
+          addConfigIfNew(getApertureConfigFromPcbPlatedHole(elm));
+        }
       }
     } else if (elm.type === "pcb_hole") {
       if (glayer_name.endsWith("_Mask") && elm.is_covered_with_solder_mask === true) {
         continue;
       }
-      if (elm.hole_shape === "circle")
-        addConfigIfNew(getApertureConfigFromCirclePcbHole(elm));
-      else console.warn("NOT IMPLEMENTED: drawing gerber for non circle holes");
+      if (elm.hole_shape === "circle") {
+        if (isSoldermaskLayer) {
+          addConfigIfNew(getApertureConfigFromCirclePcbHoleSoldermask(elm));
+        } else {
+          addConfigIfNew(getApertureConfigFromCirclePcbHole(elm));
+        }
+      } else
+        console.warn("NOT IMPLEMENTED: drawing gerber for non circle holes");
     } else if (elm.type === "pcb_via") {
       addConfigIfNew(getApertureConfigFromOuterDiameter(elm));
     } else if (elm.type === "pcb_trace") {
@@ -1698,7 +1828,7 @@ var findApertureNumber = (glayer, search_params) => {
 // package.json
 var package_default = {
   name: "circuit-json-to-gerber",
-  version: "0.0.62",
+  version: "0.0.64",
   main: "dist/index.js",
   type: "module",
   scripts: {
@@ -2534,10 +2664,17 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
               }
               glayer.push(...gb.build());
             } else {
-              const apertureConfig = getApertureConfigFromPcbPlatedHole({
+              const soldermaskGlayer = glayers[getGerberLayerName(layer, "soldermask")];
+              let apertureConfig = getApertureConfigFromPcbPlatedHole({
                 ...element,
                 ...element.shape !== "circle" ? { outer_width: padW, outer_height: padH } : {}
               });
+              if (glayer === soldermaskGlayer) {
+                apertureConfig = getApertureConfigFromPcbPlatedHoleSoldermask({
+                  ...element,
+                  ...element.shape !== "circle" ? { outer_width: padW, outer_height: padH } : {}
+                });
+              }
               const rotation = "rect_ccw_rotation" in element && typeof element.rect_ccw_rotation === "number" && Math.abs(padW - padH) > 1e-9 ? element.rect_ccw_rotation : void 0;
               const gb = gerberBuilder().add("select_aperture", {
                 aperture_number: findApertureNumber(glayer, apertureConfig)
@@ -2565,7 +2702,7 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
               ...gerberBuilder().add("select_aperture", {
                 aperture_number: findApertureNumber(
                   glayer,
-                  getApertureConfigFromCirclePcbHole(element)
+                  getApertureConfigFromCirclePcbHoleSoldermask(element)
                 )
               }).add("flash_operation", { x: element.x, y: mfy(element.y) }).build()
             );
@@ -2819,4 +2956,4 @@ export {
   stringifyGerberCommands,
   convertSoupToGerberCommands
 };
-//# sourceMappingURL=chunk-VGLNFU2D.js.map
+//# sourceMappingURL=chunk-PJZ4H5LY.js.map