circuit-json-to-gerber 0.0.75 → 0.0.76

package/dist/{chunk-EM2JSGDL.js → chunk-ER5XAENM.js}

@@ -1892,7 +1892,7 @@ var findApertureNumber = (glayer, search_params) => {
 // package.json
 var package_default = {
   name: "circuit-json-to-gerber",
-  version: "0.0.74",
+  version: "0.0.75",
   main: "dist/index.js",
   type: "module",
   scripts: {
@@ -2021,6 +2021,82 @@ var getGerberLayerName = (layer_ref, layer_type) => {
   return `${layerRefToGerberPrefix[layer_ref]}${layerTypeToGerberSuffix[layer_type]}`;
 };
 
+// src/gerber/convert-soup-to-gerber-commands/offsetPolygonOutline.ts
+var getSignedPolygonArea = (points) => {
+  let area = 0;
+  for (let i = 0; i < points.length; i++) {
+    const current = points[i];
+    const next = points[(i + 1) % points.length];
+    area += current.x * next.y - next.x * current.y;
+  }
+  return area / 2;
+};
+var getLineIntersection = (lineA, lineB) => {
+  const ax = lineA.end.x - lineA.start.x;
+  const ay = lineA.end.y - lineA.start.y;
+  const bx = lineB.end.x - lineB.start.x;
+  const by = lineB.end.y - lineB.start.y;
+  const denominator = ax * by - ay * bx;
+  if (Math.abs(denominator) < 1e-9) {
+    return null;
+  }
+  const cx = lineB.start.x - lineA.start.x;
+  const cy = lineB.start.y - lineA.start.y;
+  const t = (cx * by - cy * bx) / denominator;
+  return {
+    x: lineA.start.x + ax * t,
+    y: lineA.start.y + ay * t
+  };
+};
+var offsetPolygonOutline = (points, offset) => {
+  if (points.length < 3 || offset === 0) {
+    return points;
+  }
+  const isCounterClockwise = getSignedPolygonArea(points) > 0;
+  const shiftedEdges = [];
+  for (let i = 0; i < points.length; i++) {
+    const start = points[i];
+    const end = points[(i + 1) % points.length];
+    const dx = end.x - start.x;
+    const dy = end.y - start.y;
+    const length = Math.sqrt(dx * dx + dy * dy);
+    if (length < 1e-9) {
+      continue;
+    }
+    let normalX = -dy / length;
+    let normalY = dx / length;
+    if (isCounterClockwise) {
+      normalX = dy / length;
+      normalY = -dx / length;
+    }
+    shiftedEdges.push({
+      start: {
+        x: start.x + normalX * offset,
+        y: start.y + normalY * offset
+      },
+      end: {
+        x: end.x + normalX * offset,
+        y: end.y + normalY * offset
+      }
+    });
+  }
+  if (shiftedEdges.length < 3) {
+    return points;
+  }
+  const offsetPoints = [];
+  for (let i = 0; i < shiftedEdges.length; i++) {
+    const previousEdge = shiftedEdges[(i - 1 + shiftedEdges.length) % shiftedEdges.length];
+    const currentEdge = shiftedEdges[i];
+    const intersection = getLineIntersection(previousEdge, currentEdge);
+    if (intersection) {
+      offsetPoints.push(intersection);
+    } else {
+      offsetPoints.push(currentEdge.start);
+    }
+  }
+  return offsetPoints;
+};
+
 // src/gerber/convert-soup-to-gerber-commands/index.ts
 import { lineAlphabet } from "@tscircuit/alphabet";
 import {
@@ -2745,14 +2821,22 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
             if (element.shape === "hole_with_polygon_pad") {
               const { pad_outline } = element;
               if (!pad_outline?.length) continue;
-              const translatedPadOutline = pad_outline.map((point) => ({
+              const soldermaskGlayer2 = glayers[getGerberLayerName(layer, "soldermask")];
+              let points = pad_outline;
+              if (glayer === soldermaskGlayer2 && "soldermask_margin" in element && typeof element.soldermask_margin === "number") {
+                points = offsetPolygonOutline(
+                  pad_outline,
+                  element.soldermask_margin
+                );
+              }
+              const translatedPoints = points.map((point) => ({
                 x: point.x + element.x,
                 y: point.y + element.y
               }));
               addClosedRegionFromPoints({
                 target: glayer,
                 apertureSource: glayer,
-                points: translatedPadOutline
+                points: translatedPoints
               });
               continue;
             }
@@ -2774,10 +2858,17 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
               padHeightCandidates.push(element.rect_pad_height);
             }
             const padH = Math.max(...padHeightCandidates);
+            const soldermaskGlayer = glayers[getGerberLayerName(layer, "soldermask")];
+            let soldermaskMargin = 0;
+            if (glayer === soldermaskGlayer && "soldermask_margin" in element && typeof element.soldermask_margin === "number") {
+              soldermaskMargin = element.soldermask_margin;
+            }
+            const aperturePadW = padW + soldermaskMargin * 2;
+            const aperturePadH = padH + soldermaskMargin * 2;
             if (element.shape === "pill") {
               const circleApertureConfig = {
                 standard_template_code: "C",
-                diameter: Math.min(padW, padH)
+                diameter: Math.min(aperturePadW, aperturePadH)
               };
               let aperture_number;
               try {
@@ -2811,8 +2902,8 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
                   y: element.y + rotatedY
                 };
               };
-              const isHorizontal = padW >= padH;
-              const offset = isHorizontal ? (padW - padH) / 2 : (padH - padW) / 2;
+              const isHorizontal = aperturePadW >= aperturePadH;
+              const offset = isHorizontal ? (aperturePadW - aperturePadH) / 2 : (aperturePadH - aperturePadW) / 2;
               if (offset <= 0) {
                 const center = rotateAndTranslate(0, 0);
                 gb.add("flash_operation", { x: center.x, y: mfy(center.y) });
@@ -2843,7 +2934,6 @@ var convertSoupToGerberCommands = (circuitJson, opts = {}) => {
               }
               glayer.push(...gb.build());
             } else {
-              const soldermaskGlayer = glayers[getGerberLayerName(layer, "soldermask")];
               let apertureConfig = getApertureConfigFromPcbPlatedHole({
                 ...element,
                 ...element.shape !== "circle" ? { outer_width: padW, outer_height: padH } : {}
@@ -3135,4 +3225,4 @@ export {
   stringifyGerberCommands,
   convertSoupToGerberCommands
 };
-//# sourceMappingURL=chunk-EM2JSGDL.js.map
+//# sourceMappingURL=chunk-ER5XAENM.js.map