circuit-json-to-lbrn 0.0.39 → 0.0.41

package/dist/index.js

@@ -62,6 +62,7 @@ var addCirclePlatedHole = (platedHole, ctx) => {
     includeSoldermask,
     connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const centerX = platedHole.x + origin.x;
@@ -107,7 +108,9 @@ var addCirclePlatedHole = (platedHole, ctx) => {
     }
   }
   if (platedHole.outer_diameter > 0 && includeSoldermask) {
-    const smRadius = platedHole.outer_diameter / 2 + globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
+    const percentMargin = solderMaskMarginPercent / 100 * platedHole.outer_diameter;
+    const totalMargin = globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMargin;
+    const smRadius = Math.max(platedHole.outer_diameter / 2 + totalMargin, 0);
     const outer = createCirclePath({
       centerX,
       centerY,
@@ -189,6 +192,7 @@ var addOvalPlatedHole = (platedHole, ctx) => {
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   if (platedHole.outer_width <= 0 || platedHole.outer_height <= 0) {
@@ -227,9 +231,18 @@ var addOvalPlatedHole = (platedHole, ctx) => {
     }
   }
   if (platedHole.outer_width > 0 && platedHole.outer_height > 0 && includeSoldermask) {
-    const soldermaskMargin = globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
-    const smWidth = platedHole.outer_width + 2 * soldermaskMargin;
-    const smHeight = platedHole.outer_height + 2 * soldermaskMargin;
+    const percentMarginX = solderMaskMarginPercent / 100 * platedHole.outer_width;
+    const percentMarginY = solderMaskMarginPercent / 100 * platedHole.outer_height;
+    const totalMarginX = Math.max(
+      globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginX,
+      -platedHole.outer_width / 2
+    );
+    const totalMarginY = Math.max(
+      globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginY,
+      -platedHole.outer_height / 2
+    );
+    const smWidth = platedHole.outer_width + 2 * totalMarginX;
+    const smHeight = platedHole.outer_height + 2 * totalMarginY;
     const outer = createOvalPath({
       centerX,
       centerY,
@@ -266,7 +279,7 @@ var addOvalPlatedHole = (platedHole, ctx) => {
 };
 
 // lib/element-handlers/addPlatedHole/addCircularHoleWithRectPad.ts
-import { ShapePath as ShapePath3 } from "lbrnts";
+import { ShapePath as ShapePath4 } from "lbrnts";
 
 // lib/helpers/roundedRectShape.ts
 var createRoundedRectPath = ({
@@ -357,18 +370,62 @@ var createRoundedRectPath = ({
   return { verts, prims };
 };
 
-// lib/element-handlers/addPlatedHole/addCircularHoleWithRectPad.ts
-var addCircularHoleWithRectPad = (platedHole, ctx) => {
+// lib/helpers/addCopperGeometryToNetOrProject.ts
+import { ShapePath as ShapePath3 } from "lbrnts";
+
+// lib/helpers/pathToPolygon.ts
+import { Polygon, point as point2 } from "@flatten-js/core";
+var pathToPolygon = (verts) => {
+  const points = verts.map((v) => point2(v.x, v.y));
+  return new Polygon(points);
+};
+
+// lib/helpers/addCopperGeometryToNetOrProject.ts
+var addCopperGeometryToNetOrProject = ({
+  geometryId,
+  path,
+  layer,
+  ctx
+}) => {
   const {
     project,
+    connMap,
+    topCutNetGeoms,
+    bottomCutNetGeoms,
     topCopperCutSetting,
     bottomCopperCutSetting,
+    includeLayers
+  } = ctx;
+  if (!includeLayers.includes(layer)) return;
+  const netId = connMap.getNetConnectedToId(geometryId);
+  const cutSetting = layer === "top" ? topCopperCutSetting : bottomCopperCutSetting;
+  const netGeoms = layer === "top" ? topCutNetGeoms : bottomCutNetGeoms;
+  if (netId) {
+    const polygon = pathToPolygon(path.verts);
+    netGeoms.get(netId)?.push(polygon);
+  } else {
+    project.children.push(
+      new ShapePath3({
+        cutIndex: cutSetting.index,
+        verts: path.verts,
+        prims: path.prims,
+        isClosed: true
+      })
+    );
+  }
+};
+
+// lib/element-handlers/addPlatedHole/addCircularHoleWithRectPad.ts
+var addCircularHoleWithRectPad = (platedHole, ctx) => {
+  const {
+    project,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const centerX = platedHole.x + origin.x;
@@ -385,30 +442,32 @@ var addCircularHoleWithRectPad = (platedHole, ctx) => {
     borderRadius
   });
   if (includeCopper) {
-    if (includeLayers.includes("top")) {
-      project.children.push(
-        new ShapePath3({
-          cutIndex: topCopperCutSetting.index,
-          verts: padPath.verts,
-          prims: padPath.prims,
-          isClosed: true
-        })
-      );
-    }
-    if (includeLayers.includes("bottom")) {
-      project.children.push(
-        new ShapePath3({
-          cutIndex: bottomCopperCutSetting.index,
-          verts: padPath.verts,
-          prims: padPath.prims,
-          isClosed: true
-        })
-      );
-    }
+    addCopperGeometryToNetOrProject({
+      geometryId: platedHole.pcb_plated_hole_id,
+      path: padPath,
+      layer: "top",
+      ctx
+    });
+    addCopperGeometryToNetOrProject({
+      geometryId: platedHole.pcb_plated_hole_id,
+      path: padPath,
+      layer: "bottom",
+      ctx
+    });
   }
   if (includeSoldermask) {
-    const smPadWidth = padWidth + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
-    const smPadHeight = padHeight + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
+    const percentMarginX = solderMaskMarginPercent / 100 * padWidth;
+    const percentMarginY = solderMaskMarginPercent / 100 * padHeight;
+    const totalMarginX = Math.max(
+      globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginX,
+      -padWidth / 2
+    );
+    const totalMarginY = Math.max(
+      globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginY,
+      -padHeight / 2
+    );
+    const smPadWidth = padWidth + 2 * totalMarginX;
+    const smPadHeight = padHeight + 2 * totalMarginY;
     const smPadPath = createRoundedRectPath({
       centerX,
       centerY,
@@ -417,7 +476,7 @@ var addCircularHoleWithRectPad = (platedHole, ctx) => {
       borderRadius
     });
     project.children.push(
-      new ShapePath3({
+      new ShapePath4({
         cutIndex: soldermaskCutSetting.index,
         verts: smPadPath.verts,
         prims: smPadPath.prims,
@@ -435,7 +494,7 @@ var addCircularHoleWithRectPad = (platedHole, ctx) => {
       segments: 32
     });
     project.children.push(
-      new ShapePath3({
+      new ShapePath4({
         cutIndex: throughBoardCutSetting.index,
         verts: holePath.verts,
         prims: holePath.prims,
@@ -446,7 +505,7 @@ var addCircularHoleWithRectPad = (platedHole, ctx) => {
 };
 
 // lib/element-handlers/addPlatedHole/addPillHoleWithRectPad.ts
-import { ShapePath as ShapePath4 } from "lbrnts";
+import { ShapePath as ShapePath5 } from "lbrnts";
 
 // lib/helpers/pathPointUtils.ts
 var createPointAdder = ({
@@ -546,14 +605,13 @@ var createPillPath = ({
 var addPillHoleWithRectPad = (platedHole, ctx) => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const centerX = platedHole.x + origin.x;
@@ -570,30 +628,32 @@ var addPillHoleWithRectPad = (platedHole, ctx) => {
       borderRadius
     });
     if (includeCopper) {
-      if (includeLayers.includes("top")) {
-        project.children.push(
-          new ShapePath4({
-            cutIndex: topCopperCutSetting.index,
-            verts: padPath.verts,
-            prims: padPath.prims,
-            isClosed: true
-          })
-        );
-      }
-      if (includeLayers.includes("bottom")) {
-        project.children.push(
-          new ShapePath4({
-            cutIndex: bottomCopperCutSetting.index,
-            verts: padPath.verts,
-            prims: padPath.prims,
-            isClosed: true
-          })
-        );
-      }
+      addCopperGeometryToNetOrProject({
+        geometryId: platedHole.pcb_plated_hole_id,
+        path: padPath,
+        layer: "top",
+        ctx
+      });
+      addCopperGeometryToNetOrProject({
+        geometryId: platedHole.pcb_plated_hole_id,
+        path: padPath,
+        layer: "bottom",
+        ctx
+      });
     }
     if (includeSoldermask) {
-      const smPadWidth = padWidth + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
-      const smPadHeight = padHeight + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
+      const percentMarginX = solderMaskMarginPercent / 100 * padWidth;
+      const percentMarginY = solderMaskMarginPercent / 100 * padHeight;
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginX,
+        -padWidth / 2
+      );
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginY,
+        -padHeight / 2
+      );
+      const smPadWidth = padWidth + 2 * totalMarginX;
+      const smPadHeight = padHeight + 2 * totalMarginY;
       const smPadPath = createRoundedRectPath({
         centerX,
         centerY,
@@ -602,7 +662,7 @@ var addPillHoleWithRectPad = (platedHole, ctx) => {
         borderRadius
       });
       project.children.push(
-        new ShapePath4({
+        new ShapePath5({
           cutIndex: soldermaskCutSetting.index,
           verts: smPadPath.verts,
           prims: smPadPath.prims,
@@ -623,7 +683,7 @@ var addPillHoleWithRectPad = (platedHole, ctx) => {
       height: holeHeight
     });
     project.children.push(
-      new ShapePath4({
+      new ShapePath5({
         cutIndex: throughBoardCutSetting.index,
         verts: holePath.verts,
         prims: holePath.prims,
@@ -634,18 +694,17 @@ var addPillHoleWithRectPad = (platedHole, ctx) => {
 };
 
 // lib/element-handlers/addPlatedHole/addRotatedPillHoleWithRectPad.ts
-import { ShapePath as ShapePath5 } from "lbrnts";
+import { ShapePath as ShapePath6 } from "lbrnts";
 var addRotatedPillHoleWithRectPad = (platedHole, ctx) => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const centerX = platedHole.x + origin.x;
@@ -665,30 +724,32 @@ var addRotatedPillHoleWithRectPad = (platedHole, ctx) => {
       rotation: padRotation
     });
     if (includeCopper) {
-      if (includeLayers.includes("top")) {
-        project.children.push(
-          new ShapePath5({
-            cutIndex: topCopperCutSetting.index,
-            verts: padPath.verts,
-            prims: padPath.prims,
-            isClosed: true
-          })
-        );
-      }
-      if (includeLayers.includes("bottom")) {
-        project.children.push(
-          new ShapePath5({
-            cutIndex: bottomCopperCutSetting.index,
-            verts: padPath.verts,
-            prims: padPath.prims,
-            isClosed: true
-          })
-        );
-      }
+      addCopperGeometryToNetOrProject({
+        geometryId: platedHole.pcb_plated_hole_id,
+        path: padPath,
+        layer: "top",
+        ctx
+      });
+      addCopperGeometryToNetOrProject({
+        geometryId: platedHole.pcb_plated_hole_id,
+        path: padPath,
+        layer: "bottom",
+        ctx
+      });
     }
     if (includeSoldermask) {
-      const smPadWidth = padWidth + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
-      const smPadHeight = padHeight + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
+      const percentMarginX = solderMaskMarginPercent / 100 * padWidth;
+      const percentMarginY = solderMaskMarginPercent / 100 * padHeight;
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginX,
+        -padWidth / 2
+      );
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginY,
+        -padHeight / 2
+      );
+      const smPadWidth = padWidth + 2 * totalMarginX;
+      const smPadHeight = padHeight + 2 * totalMarginY;
       const smPadPath = createRoundedRectPath({
         centerX,
         centerY,
@@ -699,7 +760,7 @@ var addRotatedPillHoleWithRectPad = (platedHole, ctx) => {
         rotation: padRotation
       });
       project.children.push(
-        new ShapePath5({
+        new ShapePath6({
           cutIndex: soldermaskCutSetting.index,
           verts: smPadPath.verts,
           prims: smPadPath.prims,
@@ -722,7 +783,7 @@ var addRotatedPillHoleWithRectPad = (platedHole, ctx) => {
       rotation: holeRotation
     });
     project.children.push(
-      new ShapePath5({
+      new ShapePath6({
         cutIndex: throughBoardCutSetting.index,
         verts: holePath.verts,
         prims: holePath.prims,
@@ -733,7 +794,7 @@ var addRotatedPillHoleWithRectPad = (platedHole, ctx) => {
 };
 
 // lib/element-handlers/addPlatedHole/addHoleWithPolygonPad.ts
-import { ShapePath as ShapePath6 } from "lbrnts";
+import { ShapePath as ShapePath7 } from "lbrnts";
 
 // lib/helpers/polygonShape.ts
 var createPolygonPathFromOutline = ({
@@ -742,9 +803,9 @@ var createPolygonPathFromOutline = ({
   offsetY
 }) => {
   const verts = [];
-  for (const point6 of outline) {
-    const x = (point6.x ?? 0) + offsetX;
-    const y = (point6.y ?? 0) + offsetY;
+  for (const point5 of outline) {
+    const x = (point5.x ?? 0) + offsetX;
+    const y = (point5.y ?? 0) + offsetY;
     verts.push({ x, y });
   }
   if (verts.length === 0) {
@@ -760,8 +821,6 @@ var createPolygonPathFromOutline = ({
 var addHoleWithPolygonPad = (platedHole, ctx) => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
     throughBoardCutSetting,
     origin,
@@ -777,30 +836,22 @@ var addHoleWithPolygonPad = (platedHole, ctx) => {
       offsetY: platedHole.y + origin.y
     });
     if (includeCopper) {
-      if (includeLayers.includes("top")) {
-        project.children.push(
-          new ShapePath6({
-            cutIndex: topCopperCutSetting.index,
-            verts: pad.verts,
-            prims: pad.prims,
-            isClosed: true
-          })
-        );
-      }
-      if (includeLayers.includes("bottom")) {
-        project.children.push(
-          new ShapePath6({
-            cutIndex: bottomCopperCutSetting.index,
-            verts: pad.verts,
-            prims: pad.prims,
-            isClosed: true
-          })
-        );
-      }
+      addCopperGeometryToNetOrProject({
+        geometryId: platedHole.pcb_plated_hole_id,
+        path: pad,
+        layer: "top",
+        ctx
+      });
+      addCopperGeometryToNetOrProject({
+        geometryId: platedHole.pcb_plated_hole_id,
+        path: pad,
+        layer: "bottom",
+        ctx
+      });
     }
     if (includeSoldermask) {
       project.children.push(
-        new ShapePath6({
+        new ShapePath7({
           cutIndex: soldermaskCutSetting.index,
           verts: pad.verts,
           prims: pad.prims,
@@ -820,7 +871,7 @@ var addHoleWithPolygonPad = (platedHole, ctx) => {
       segments: 64
     });
     project.children.push(
-      new ShapePath6({
+      new ShapePath7({
         cutIndex: throughBoardCutSetting.index,
         verts: hole.verts,
         prims: hole.prims,
@@ -839,7 +890,7 @@ var addHoleWithPolygonPad = (platedHole, ctx) => {
       segments: 64
     });
     project.children.push(
-      new ShapePath6({
+      new ShapePath7({
         cutIndex: throughBoardCutSetting.index,
         verts: hole.verts,
         prims: hole.prims,
@@ -850,7 +901,7 @@ var addHoleWithPolygonPad = (platedHole, ctx) => {
 };
 
 // lib/element-handlers/addPlatedHole/addPillPlatedHole.ts
-import { ShapePath as ShapePath7 } from "lbrnts";
+import { ShapePath as ShapePath8 } from "lbrnts";
 var addPcbPlatedHolePill = (platedHole, ctx) => {
   const {
     project,
@@ -862,6 +913,7 @@ var addPcbPlatedHolePill = (platedHole, ctx) => {
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const centerX = platedHole.x + origin.x;
@@ -877,7 +929,7 @@ var addPcbPlatedHolePill = (platedHole, ctx) => {
     });
     if (includeLayers.includes("top")) {
       project.children.push(
-        new ShapePath7({
+        new ShapePath8({
           cutIndex: topCopperCutSetting.index,
           verts: outer.verts,
           prims: outer.prims,
@@ -887,7 +939,7 @@ var addPcbPlatedHolePill = (platedHole, ctx) => {
     }
     if (includeLayers.includes("bottom")) {
       project.children.push(
-        new ShapePath7({
+        new ShapePath8({
           cutIndex: bottomCopperCutSetting.index,
           verts: outer.verts,
           prims: outer.prims,
@@ -897,8 +949,18 @@ var addPcbPlatedHolePill = (platedHole, ctx) => {
     }
   }
   if (platedHole.outer_width > 0 && platedHole.outer_height > 0 && includeSoldermask) {
-    const smWidth = platedHole.outer_width + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
-    const smHeight = platedHole.outer_height + 2 * globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0);
+    const percentMarginX = solderMaskMarginPercent / 100 * platedHole.outer_width;
+    const percentMarginY = solderMaskMarginPercent / 100 * platedHole.outer_height;
+    const totalMarginX = Math.max(
+      globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginX,
+      -platedHole.outer_width / 2
+    );
+    const totalMarginY = Math.max(
+      globalCopperSoldermaskMarginAdjustment + (platedHole.soldermask_margin ?? 0) + percentMarginY,
+      -platedHole.outer_height / 2
+    );
+    const smWidth = platedHole.outer_width + 2 * totalMarginX;
+    const smHeight = platedHole.outer_height + 2 * totalMarginY;
     const outer = createPillPath({
       centerX,
       centerY,
@@ -907,7 +969,7 @@ var addPcbPlatedHolePill = (platedHole, ctx) => {
       rotation
     });
     project.children.push(
-      new ShapePath7({
+      new ShapePath8({
         cutIndex: soldermaskCutSetting.index,
         verts: outer.verts,
         prims: outer.prims,
@@ -924,7 +986,7 @@ var addPcbPlatedHolePill = (platedHole, ctx) => {
       rotation
     });
     project.children.push(
-      new ShapePath7({
+      new ShapePath8({
         cutIndex: throughBoardCutSetting.index,
         verts: inner.verts,
         prims: inner.prims,
@@ -958,21 +1020,17 @@ var addPlatedHole = (platedHole, ctx) => {
 };
 
 // lib/element-handlers/addSmtPad/addRectSmtPad.ts
-import { Box } from "@flatten-js/core";
-import { ShapePath as ShapePath8 } from "lbrnts";
+import "@flatten-js/core";
+import { ShapePath as ShapePath9 } from "lbrnts";
 var addRectSmtPad = (smtPad, ctx) => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    connMap,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -986,48 +1044,38 @@ var addRectSmtPad = (smtPad, ctx) => {
   const centerY = smtPad.y + origin.y;
   const halfWidth = smtPad.width / 2;
   const halfHeight = smtPad.height / 2;
-  const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id);
-  const copperCutSetting = padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting;
-  const netGeoms = padLayer === "top" ? topCutNetGeoms : bottomCutNetGeoms;
   if (includeCopper) {
-    if (netId) {
-      netGeoms.get(netId)?.push(
-        new Box(
-          centerX - halfWidth,
-          centerY - halfHeight,
-          centerX + halfWidth,
-          centerY + halfHeight
-        )
-      );
-    } else {
-      const verts = [
+    const path = {
+      verts: [
         { x: centerX - halfWidth, y: centerY - halfHeight },
         { x: centerX + halfWidth, y: centerY - halfHeight },
         { x: centerX + halfWidth, y: centerY + halfHeight },
         { x: centerX - halfWidth, y: centerY + halfHeight },
         { x: centerX - halfWidth, y: centerY - halfHeight }
         // Close the path
-      ];
-      const prims = [
-        { type: 0 },
-        { type: 0 },
-        { type: 0 },
-        { type: 0 },
-        { type: 0 }
-      ];
-      project.children.push(
-        new ShapePath8({
-          cutIndex: copperCutSetting.index,
-          verts,
-          prims,
-          isClosed: true
-        })
-      );
-    }
+      ],
+      prims: [{ type: 0 }, { type: 0 }, { type: 0 }, { type: 0 }, { type: 0 }]
+    };
+    addCopperGeometryToNetOrProject({
+      geometryId: smtPad.pcb_smtpad_id,
+      path,
+      layer: padLayer,
+      ctx
+    });
   }
   if (includeSoldermask) {
-    const smHalfWidth = halfWidth + globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
-    const smHalfHeight = halfHeight + globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
+    const percentMarginX = solderMaskMarginPercent / 100 * smtPad.width;
+    const percentMarginY = solderMaskMarginPercent / 100 * smtPad.height;
+    const totalMarginX = Math.max(
+      globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginX,
+      -smtPad.width / 2
+    );
+    const totalMarginY = Math.max(
+      globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginY,
+      -smtPad.height / 2
+    );
+    const smHalfWidth = halfWidth + totalMarginX;
+    const smHalfHeight = halfHeight + totalMarginY;
     const verts = [
       { x: centerX - smHalfWidth, y: centerY - smHalfHeight },
       { x: centerX + smHalfWidth, y: centerY - smHalfHeight },
@@ -1044,7 +1092,7 @@ var addRectSmtPad = (smtPad, ctx) => {
       { type: 0 }
     ];
     project.children.push(
-      new ShapePath8({
+      new ShapePath9({
         cutIndex: soldermaskCutSetting.index,
         verts,
         prims,
@@ -1055,21 +1103,16 @@ var addRectSmtPad = (smtPad, ctx) => {
 };
 
 // lib/element-handlers/addSmtPad/addCircleSmtPad.ts
-import { ShapePath as ShapePath9 } from "lbrnts";
-import { Circle as Circle2, point as point2 } from "@flatten-js/core";
+import { ShapePath as ShapePath10 } from "lbrnts";
 var addCircleSmtPad = (smtPad, ctx) => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
-    connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1079,43 +1122,44 @@ var addCircleSmtPad = (smtPad, ctx) => {
   if (!includeLayers.includes(padLayer)) {
     return;
   }
-  const copperCutSetting = padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting;
-  const netGeoms = padLayer === "top" ? topCutNetGeoms : bottomCutNetGeoms;
   const centerX = smtPad.x + origin.x;
   const centerY = smtPad.y + origin.y;
   if (smtPad.radius > 0) {
     const outerRadius = smtPad.radius;
     if (includeCopper) {
-      const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id);
-      const circle = new Circle2(point2(centerX, centerY), outerRadius);
-      const polygon = circleToPolygon(circle);
-      if (netId) {
-        netGeoms.get(netId)?.push(polygon);
-      } else {
-        const outer = createCirclePath({
-          centerX,
-          centerY,
-          radius: outerRadius
-        });
-        project.children.push(
-          new ShapePath9({
-            cutIndex: copperCutSetting.index,
-            verts: outer.verts,
-            prims: outer.prims,
-            isClosed: true
-          })
-        );
-      }
+      const path = createCirclePath({
+        centerX,
+        centerY,
+        radius: outerRadius
+      });
+      addCopperGeometryToNetOrProject({
+        geometryId: smtPad.pcb_smtpad_id,
+        path,
+        layer: padLayer,
+        ctx
+      });
     }
     if (includeSoldermask) {
-      const smRadius = outerRadius + globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
+      const elementWidth = 2 * outerRadius;
+      const elementHeight = 2 * outerRadius;
+      const percentMarginX = solderMaskMarginPercent / 100 * elementWidth;
+      const percentMarginY = solderMaskMarginPercent / 100 * elementHeight;
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginX,
+        -elementWidth / 2
+      );
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginY,
+        -elementHeight / 2
+      );
+      const smRadius = outerRadius + totalMarginX;
       const outer = createCirclePath({
         centerX,
         centerY,
         radius: smRadius
       });
       project.children.push(
-        new ShapePath9({
+        new ShapePath10({
           cutIndex: soldermaskCutSetting.index,
           verts: outer.verts,
           prims: outer.prims,
@@ -1127,29 +1171,16 @@ var addCircleSmtPad = (smtPad, ctx) => {
 };
 
 // lib/element-handlers/addSmtPad/addPillSmtPad.ts
-import { ShapePath as ShapePath10 } from "lbrnts";
-
-// lib/helpers/pathToPolygon.ts
-import { Polygon as Polygon2, point as point3 } from "@flatten-js/core";
-var pathToPolygon = (verts) => {
-  const points = verts.map((v) => point3(v.x, v.y));
-  return new Polygon2(points);
-};
-
-// lib/element-handlers/addSmtPad/addPillSmtPad.ts
+import { ShapePath as ShapePath11 } from "lbrnts";
 var addPillSmtPad = (smtPad, ctx) => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
-    connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1159,8 +1190,6 @@ var addPillSmtPad = (smtPad, ctx) => {
   if (!includeLayers.includes(padLayer)) {
     return;
   }
-  const copperCutSetting = padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting;
-  const netGeoms = padLayer === "top" ? topCutNetGeoms : bottomCutNetGeoms;
   const centerX = smtPad.x + origin.x;
   const centerY = smtPad.y + origin.y;
   if (smtPad.width > 0 && smtPad.height > 0) {
@@ -1171,24 +1200,26 @@ var addPillSmtPad = (smtPad, ctx) => {
       height: smtPad.height
     });
     if (includeCopper) {
-      const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id);
-      const polygon = pathToPolygon(outer.verts);
-      if (netId) {
-        netGeoms.get(netId)?.push(polygon);
-      } else {
-        project.children.push(
-          new ShapePath10({
-            cutIndex: copperCutSetting.index,
-            verts: outer.verts,
-            prims: outer.prims,
-            isClosed: true
-          })
-        );
-      }
+      addCopperGeometryToNetOrProject({
+        geometryId: smtPad.pcb_smtpad_id,
+        path: outer,
+        layer: padLayer,
+        ctx
+      });
     }
     if (includeSoldermask) {
-      const smWidth = smtPad.width + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
-      const smHeight = smtPad.height + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
+      const percentMarginX = solderMaskMarginPercent / 100 * smtPad.width;
+      const percentMarginY = solderMaskMarginPercent / 100 * smtPad.height;
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginX,
+        -smtPad.width / 2
+      );
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginY,
+        -smtPad.height / 2
+      );
+      const smWidth = smtPad.width + 2 * totalMarginX;
+      const smHeight = smtPad.height + 2 * totalMarginY;
       const smOuter = createPillPath({
         centerX,
         centerY,
@@ -1196,7 +1227,7 @@ var addPillSmtPad = (smtPad, ctx) => {
         height: smHeight
       });
       project.children.push(
-        new ShapePath10({
+        new ShapePath11({
           cutIndex: soldermaskCutSetting.index,
           verts: smOuter.verts,
           prims: smOuter.prims,
@@ -1208,20 +1239,16 @@ var addPillSmtPad = (smtPad, ctx) => {
 };
 
 // lib/element-handlers/addSmtPad/addRotatedPillSmtPad.ts
-import { ShapePath as ShapePath11 } from "lbrnts";
+import { ShapePath as ShapePath12 } from "lbrnts";
 var addRotatedPillSmtPad = (smtPad, ctx) => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
-    connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1231,8 +1258,6 @@ var addRotatedPillSmtPad = (smtPad, ctx) => {
   if (!includeLayers.includes(padLayer)) {
     return;
   }
-  const copperCutSetting = padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting;
-  const netGeoms = padLayer === "top" ? topCutNetGeoms : bottomCutNetGeoms;
   const centerX = smtPad.x + origin.x;
   const centerY = smtPad.y + origin.y;
   if (smtPad.width > 0 && smtPad.height > 0) {
@@ -1244,24 +1269,26 @@ var addRotatedPillSmtPad = (smtPad, ctx) => {
       rotation: (smtPad.ccw_rotation ?? 0) * (Math.PI / 180)
     });
     if (includeCopper) {
-      const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id);
-      const polygon = pathToPolygon(outer.verts);
-      if (netId) {
-        netGeoms.get(netId)?.push(polygon);
-      } else {
-        project.children.push(
-          new ShapePath11({
-            cutIndex: copperCutSetting.index,
-            verts: outer.verts,
-            prims: outer.prims,
-            isClosed: true
-          })
-        );
-      }
+      addCopperGeometryToNetOrProject({
+        geometryId: smtPad.pcb_smtpad_id,
+        path: outer,
+        layer: padLayer,
+        ctx
+      });
     }
     if (includeSoldermask) {
-      const smWidth = smtPad.width + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
-      const smHeight = smtPad.height + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
+      const percentMarginX = solderMaskMarginPercent / 100 * smtPad.width;
+      const percentMarginY = solderMaskMarginPercent / 100 * smtPad.height;
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginX,
+        -smtPad.width / 2
+      );
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginY,
+        -smtPad.height / 2
+      );
+      const smWidth = smtPad.width + 2 * totalMarginX;
+      const smHeight = smtPad.height + 2 * totalMarginY;
       const smOuter = createPillPath({
         centerX,
         centerY,
@@ -1270,7 +1297,7 @@ var addRotatedPillSmtPad = (smtPad, ctx) => {
         rotation: (smtPad.ccw_rotation ?? 0) * (Math.PI / 180)
       });
       project.children.push(
-        new ShapePath11({
+        new ShapePath12({
           cutIndex: soldermaskCutSetting.index,
           verts: smOuter.verts,
           prims: smOuter.prims,
@@ -1282,7 +1309,7 @@ var addRotatedPillSmtPad = (smtPad, ctx) => {
 };
 
 // lib/element-handlers/addSmtPad/addPolygonSmtPad.ts
-import { ShapePath as ShapePath12 } from "lbrnts";
+import { ShapePath as ShapePath13 } from "lbrnts";
 
 // lib/polygon-to-shape-path.ts
 function polygonToShapePathData(polygon) {
@@ -1315,16 +1342,12 @@ function polygonToShapePathData(polygon) {
 var addPolygonSmtPad = (smtPad, ctx) => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
-    connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1334,8 +1357,6 @@ var addPolygonSmtPad = (smtPad, ctx) => {
   if (!includeLayers.includes(padLayer)) {
     return;
   }
-  const copperCutSetting = padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting;
-  const netGeoms = padLayer === "top" ? topCutNetGeoms : bottomCutNetGeoms;
   if (smtPad.points.length >= 3) {
     const pad = createPolygonPathFromOutline({
       outline: smtPad.points,
@@ -1343,24 +1364,16 @@ var addPolygonSmtPad = (smtPad, ctx) => {
       offsetY: origin.y
     });
     if (includeCopper) {
-      const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id);
-      const polygon = pathToPolygon(pad.verts);
-      if (netId) {
-        netGeoms.get(netId)?.push(polygon);
-      } else {
-        project.children.push(
-          new ShapePath12({
-            cutIndex: copperCutSetting.index,
-            verts: pad.verts,
-            prims: pad.prims,
-            isClosed: true
-          })
-        );
-      }
+      addCopperGeometryToNetOrProject({
+        geometryId: smtPad.pcb_smtpad_id,
+        path: pad,
+        layer: padLayer,
+        ctx
+      });
     }
     if (includeSoldermask) {
       project.children.push(
-        new ShapePath12({
+        new ShapePath13({
           cutIndex: soldermaskCutSetting.index,
           verts: pad.verts,
           prims: pad.prims,
@@ -1372,20 +1385,16 @@ var addPolygonSmtPad = (smtPad, ctx) => {
 };
 
 // lib/element-handlers/addSmtPad/addRotatedRectSmtPad.ts
-import { ShapePath as ShapePath13 } from "lbrnts";
+import { ShapePath as ShapePath14 } from "lbrnts";
 var addRotatedRectSmtPad = (smtPad, ctx) => {
   const {
     project,
-    topCopperCutSetting,
-    bottomCopperCutSetting,
     soldermaskCutSetting,
-    topCutNetGeoms,
-    bottomCutNetGeoms,
     origin,
     includeCopper,
     includeSoldermask,
-    connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const padLayer = smtPad.layer || "top";
@@ -1395,8 +1404,6 @@ var addRotatedRectSmtPad = (smtPad, ctx) => {
   if (!includeLayers.includes(padLayer)) {
     return;
   }
-  const copperCutSetting = padLayer === "top" ? topCopperCutSetting : bottomCopperCutSetting;
-  const netGeoms = padLayer === "top" ? topCutNetGeoms : bottomCutNetGeoms;
   const centerX = smtPad.x + origin.x;
   const centerY = smtPad.y + origin.y;
   const rotation = (smtPad.ccw_rotation ?? 0) * (Math.PI / 180);
@@ -1412,24 +1419,26 @@ var addRotatedRectSmtPad = (smtPad, ctx) => {
       rotation
     });
     if (includeCopper) {
-      const netId = connMap.getNetConnectedToId(smtPad.pcb_smtpad_id);
-      const polygon = pathToPolygon(outer.verts);
-      if (netId) {
-        netGeoms.get(netId)?.push(polygon);
-      } else {
-        project.children.push(
-          new ShapePath13({
-            cutIndex: copperCutSetting.index,
-            verts: outer.verts,
-            prims: outer.prims,
-            isClosed: true
-          })
-        );
-      }
+      addCopperGeometryToNetOrProject({
+        geometryId: smtPad.pcb_smtpad_id,
+        path: outer,
+        layer: padLayer,
+        ctx
+      });
     }
     if (includeSoldermask) {
-      const smWidth = smtPad.width + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
-      const smHeight = smtPad.height + 2 * globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0);
+      const percentMarginX = solderMaskMarginPercent / 100 * smtPad.width;
+      const percentMarginY = solderMaskMarginPercent / 100 * smtPad.height;
+      const totalMarginX = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginX,
+        -smtPad.width / 2
+      );
+      const totalMarginY = Math.max(
+        globalCopperSoldermaskMarginAdjustment + (smtPad.soldermask_margin ?? 0) + percentMarginY,
+        -smtPad.height / 2
+      );
+      const smWidth = smtPad.width + 2 * totalMarginX;
+      const smHeight = smtPad.height + 2 * totalMarginY;
       const smOuter = createRoundedRectPath({
         centerX,
         centerY,
@@ -1440,7 +1449,7 @@ var addRotatedRectSmtPad = (smtPad, ctx) => {
         rotation
       });
       project.children.push(
-        new ShapePath13({
+        new ShapePath14({
           cutIndex: soldermaskCutSetting.index,
           verts: smOuter.verts,
           prims: smOuter.prims,
@@ -1479,8 +1488,8 @@ var splitRouteSegmentsByLayer = (trace) => {
   }
   let currentSegment = [];
   let currentLayer = null;
-  for (const point6 of trace.route) {
-    if ("route_type" in point6 && point6.route_type === "via") {
+  for (const point5 of trace.route) {
+    if ("route_type" in point5 && point5.route_type === "via") {
       if (currentLayer && currentSegment.length > 0) {
         if (!layerSegments.has(currentLayer)) {
           layerSegments.set(currentLayer, []);
@@ -1491,9 +1500,9 @@ var splitRouteSegmentsByLayer = (trace) => {
       currentLayer = null;
       continue;
     }
-    const isWirePoint = !("route_type" in point6) || point6.route_type === "wire";
-    if (isWirePoint && "layer" in point6 && point6.layer) {
-      const pointLayer = point6.layer;
+    const isWirePoint = !("route_type" in point5) || point5.route_type === "wire";
+    if (isWirePoint && "layer" in point5 && point5.layer) {
+      const pointLayer = point5.layer;
       if (pointLayer !== "top" && pointLayer !== "bottom") {
         continue;
       }
@@ -1507,7 +1516,7 @@ var splitRouteSegmentsByLayer = (trace) => {
         currentSegment = [];
       }
       currentLayer = pointLayer;
-      currentSegment.push({ x: point6.x, y: point6.y });
+      currentSegment.push({ x: point5.x, y: point5.y });
     }
   }
   if (currentLayer && currentSegment.length > 0) {
@@ -1743,9 +1752,9 @@ var addPcbTrace = (trace, ctx) => {
   if (!trace.route || trace.route.length < 2) {
     return;
   }
-  const wirePoint = trace.route.find((point6) => {
-    if (!("route_type" in point6)) return true;
-    return point6.route_type === "wire";
+  const wirePoint = trace.route.find((point5) => {
+    if (!("route_type" in point5)) return true;
+    return point5.route_type === "wire";
   });
   const traceWidth = wirePoint?.width ?? 0.15;
   const layerSegments = splitRouteSegmentsByLayer(trace);
@@ -1816,8 +1825,8 @@ var addPcbTrace = (trace, ctx) => {
 };
 
 // lib/element-handlers/addPcbBoard/index.ts
-import { Polygon as Polygon3, point as point4 } from "@flatten-js/core";
-import { ShapePath as ShapePath14 } from "lbrnts";
+import { Polygon as Polygon2, point as point3 } from "@flatten-js/core";
+import { ShapePath as ShapePath15 } from "lbrnts";
 var addPcbBoard = (board, ctx) => {
   const {
     origin,
@@ -1829,9 +1838,9 @@ var addPcbBoard = (board, ctx) => {
   } = ctx;
   let polygon = null;
   if (board.outline?.length) {
-    polygon = new Polygon3(
+    polygon = new Polygon2(
       board.outline.map(
-        (outlinePoint) => point4(outlinePoint.x + origin.x, outlinePoint.y + origin.y)
+        (outlinePoint) => point3(outlinePoint.x + origin.x, outlinePoint.y + origin.y)
       )
     );
   } else if (typeof board.width === "number" && typeof board.height === "number" && board.center) {
@@ -1841,18 +1850,18 @@ var addPcbBoard = (board, ctx) => {
     const minY = board.center.y - halfHeight + origin.y;
     const maxX = board.center.x + halfWidth + origin.x;
     const maxY = board.center.y + halfHeight + origin.y;
-    polygon = new Polygon3([
-      point4(minX, minY),
-      point4(maxX, minY),
-      point4(maxX, maxY),
-      point4(minX, maxY)
+    polygon = new Polygon2([
+      point3(minX, minY),
+      point3(maxX, minY),
+      point3(maxX, maxY),
+      point3(minX, maxY)
     ]);
   }
   if (!polygon) return;
   const { verts, prims } = polygonToShapePathData(polygon);
   if (includeCopper) {
     project.children.push(
-      new ShapePath14({
+      new ShapePath15({
         cutIndex: throughBoardCutSetting.index,
         verts,
         prims,
@@ -1890,14 +1899,14 @@ var calculateCircuitBounds = (circuitJson) => {
     }
   }
   for (const trace of db.pcb_trace.list()) {
-    const isWidthPoint = (point6) => "width" in point6 && typeof point6.width === "number";
+    const isWidthPoint = (point5) => "width" in point5 && typeof point5.width === "number";
     const halfWidth = trace.route_thickness_mode === "interpolated" ? 0 : (trace.route.find(isWidthPoint)?.width ?? 0) / 2;
-    for (const point6 of trace.route) {
-      const pointWidth = trace.route_thickness_mode === "interpolated" ? isWidthPoint(point6) ? point6.width / 2 : 0 : halfWidth;
-      minX = Math.min(minX, point6.x - pointWidth);
-      minY = Math.min(minY, point6.y - pointWidth);
-      maxX = Math.max(maxX, point6.x + pointWidth);
-      maxY = Math.max(maxY, point6.y + pointWidth);
+    for (const point5 of trace.route) {
+      const pointWidth = trace.route_thickness_mode === "interpolated" ? isWidthPoint(point5) ? point5.width / 2 : 0 : halfWidth;
+      minX = Math.min(minX, point5.x - pointWidth);
+      minY = Math.min(minY, point5.y - pointWidth);
+      maxX = Math.max(maxX, point5.x + pointWidth);
+      maxY = Math.max(maxY, point5.y + pointWidth);
     }
   }
   for (const hole of db.pcb_plated_hole.list()) {
@@ -1922,8 +1931,8 @@ var calculateOriginFromBounds = (bounds, margin) => {
 };
 
 // lib/element-handlers/addPcbVia/index.ts
-import { ShapePath as ShapePath15 } from "lbrnts";
-import { Circle as Circle3, point as point5 } from "@flatten-js/core";
+import { ShapePath as ShapePath16 } from "lbrnts";
+import { Circle as Circle2, point as point4 } from "@flatten-js/core";
 var addPcbVia = (via, ctx) => {
   const {
     db,
@@ -1939,6 +1948,7 @@ var addPcbVia = (via, ctx) => {
     includeSoldermask,
     connMap,
     globalCopperSoldermaskMarginAdjustment,
+    solderMaskMarginPercent,
     includeLayers
   } = ctx;
   const centerX = via.x + origin.x;
@@ -1955,7 +1965,7 @@ var addPcbVia = (via, ctx) => {
       }
     }
     const outerRadius = via.outer_diameter / 2;
-    const circle = new Circle3(point5(centerX, centerY), outerRadius);
+    const circle = new Circle2(point4(centerX, centerY), outerRadius);
     const polygon = circleToPolygon(circle);
     if (netId) {
       if (includeLayers.includes("top")) {
@@ -1972,7 +1982,7 @@ var addPcbVia = (via, ctx) => {
       });
       if (includeLayers.includes("top")) {
         project.children.push(
-          new ShapePath15({
+          new ShapePath16({
             cutIndex: topCopperCutSetting.index,
             verts: outer.verts,
             prims: outer.prims,
@@ -1982,7 +1992,7 @@ var addPcbVia = (via, ctx) => {
       }
       if (includeLayers.includes("bottom")) {
         project.children.push(
-          new ShapePath15({
+          new ShapePath16({
             cutIndex: bottomCopperCutSetting.index,
             verts: outer.verts,
             prims: outer.prims,
@@ -1993,14 +2003,16 @@ var addPcbVia = (via, ctx) => {
     }
   }
   if (via.outer_diameter > 0 && includeSoldermask) {
-    const smRadius = via.outer_diameter / 2 + globalCopperSoldermaskMarginAdjustment;
+    const percentMargin = solderMaskMarginPercent / 100 * via.outer_diameter;
+    const totalMargin = globalCopperSoldermaskMarginAdjustment + percentMargin;
+    const smRadius = Math.max(via.outer_diameter / 2 + totalMargin, 0);
     const outer = createCirclePath({
       centerX,
       centerY,
       radius: smRadius
     });
     project.children.push(
-      new ShapePath15({
+      new ShapePath16({
         cutIndex: soldermaskCutSetting.index,
         verts: outer.verts,
         prims: outer.prims,
@@ -2016,7 +2028,7 @@ var addPcbVia = (via, ctx) => {
       radius: innerRadius
     });
     project.children.push(
-      new ShapePath15({
+      new ShapePath16({
         cutIndex: throughBoardCutSetting.index,
         verts: inner.verts,
         prims: inner.prims,
@@ -2027,7 +2039,7 @@ var addPcbVia = (via, ctx) => {
 };
 
 // lib/element-handlers/addPcbHole/addCirclePcbHole.ts
-import { ShapePath as ShapePath16 } from "lbrnts";
+import { ShapePath as ShapePath17 } from "lbrnts";
 var addCirclePcbHole = (hole, ctx) => {
   const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   const centerX = hole.x + origin.x;
@@ -2040,7 +2052,7 @@ var addCirclePcbHole = (hole, ctx) => {
       radius
     });
     project.children.push(
-      new ShapePath16({
+      new ShapePath17({
         cutIndex: throughBoardCutSetting.index,
         verts: circlePath.verts,
         prims: circlePath.prims,
@@ -2051,7 +2063,7 @@ var addCirclePcbHole = (hole, ctx) => {
 };
 
 // lib/element-handlers/addPcbHole/addRectPcbHole.ts
-import { ShapePath as ShapePath17 } from "lbrnts";
+import { ShapePath as ShapePath18 } from "lbrnts";
 var addRectPcbHole = (hole, ctx) => {
   const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   const centerX = hole.x + origin.x;
@@ -2066,7 +2078,7 @@ var addRectPcbHole = (hole, ctx) => {
       // no border radius for rect holes
     });
     project.children.push(
-      new ShapePath17({
+      new ShapePath18({
         cutIndex: throughBoardCutSetting.index,
         verts: rectPath.verts,
         prims: rectPath.prims,
@@ -2077,7 +2089,7 @@ var addRectPcbHole = (hole, ctx) => {
 };
 
 // lib/element-handlers/addPcbHole/addOvalPcbHole.ts
-import { ShapePath as ShapePath18 } from "lbrnts";
+import { ShapePath as ShapePath19 } from "lbrnts";
 var addOvalPcbHole = (hole, ctx) => {
   const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   const centerX = hole.x + origin.x;
@@ -2090,7 +2102,7 @@ var addOvalPcbHole = (hole, ctx) => {
       height: hole.hole_height
     });
     project.children.push(
-      new ShapePath18({
+      new ShapePath19({
         cutIndex: throughBoardCutSetting.index,
         verts: ovalPath.verts,
         prims: ovalPath.prims,
@@ -2101,7 +2113,7 @@ var addOvalPcbHole = (hole, ctx) => {
 };
 
 // lib/element-handlers/addPcbHole/addPillPcbHole.ts
-import { ShapePath as ShapePath19 } from "lbrnts";
+import { ShapePath as ShapePath20 } from "lbrnts";
 var addPillPcbHole = (hole, ctx) => {
   const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   const centerX = hole.x + origin.x;
@@ -2114,7 +2126,7 @@ var addPillPcbHole = (hole, ctx) => {
       height: hole.hole_height
     });
     project.children.push(
-      new ShapePath19({
+      new ShapePath20({
         cutIndex: throughBoardCutSetting.index,
         verts: pillPath.verts,
         prims: pillPath.prims,
@@ -2125,7 +2137,7 @@ var addPillPcbHole = (hole, ctx) => {
 };
 
 // lib/element-handlers/addPcbHole/addRotatedPillPcbHole.ts
-import { ShapePath as ShapePath20 } from "lbrnts";
+import { ShapePath as ShapePath21 } from "lbrnts";
 var addRotatedPillPcbHole = (hole, ctx) => {
   const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   const centerX = hole.x + origin.x;
@@ -2140,7 +2152,7 @@ var addRotatedPillPcbHole = (hole, ctx) => {
       rotation
     });
     project.children.push(
-      new ShapePath20({
+      new ShapePath21({
         cutIndex: throughBoardCutSetting.index,
         verts: pillPath.verts,
         prims: pillPath.prims,
@@ -2171,7 +2183,7 @@ var addPcbHole = (hole, ctx) => {
 };
 
 // lib/element-handlers/addPcbCutout/addCirclePcbCutout.ts
-import { ShapePath as ShapePath21 } from "lbrnts";
+import { ShapePath as ShapePath22 } from "lbrnts";
 var addCirclePcbCutout = (cutout, ctx) => {
   const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   const centerX = cutout.center.x + origin.x;
@@ -2183,7 +2195,7 @@ var addCirclePcbCutout = (cutout, ctx) => {
       radius: cutout.radius
     });
     project.children.push(
-      new ShapePath21({
+      new ShapePath22({
         cutIndex: throughBoardCutSetting.index,
         verts: circlePath.verts,
         prims: circlePath.prims,
@@ -2194,7 +2206,7 @@ var addCirclePcbCutout = (cutout, ctx) => {
 };
 
 // lib/element-handlers/addPcbCutout/addRectPcbCutout.ts
-import { ShapePath as ShapePath22 } from "lbrnts";
+import { ShapePath as ShapePath23 } from "lbrnts";
 var addRectPcbCutout = (cutout, ctx) => {
   const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   const centerX = cutout.center.x + origin.x;
@@ -2213,7 +2225,7 @@ var addRectPcbCutout = (cutout, ctx) => {
       rotation
     });
     project.children.push(
-      new ShapePath22({
+      new ShapePath23({
         cutIndex: throughBoardCutSetting.index,
         verts: rectPath.verts,
         prims: rectPath.prims,
@@ -2224,7 +2236,7 @@ var addRectPcbCutout = (cutout, ctx) => {
 };
 
 // lib/element-handlers/addPcbCutout/addPolygonPcbCutout.ts
-import { ShapePath as ShapePath23 } from "lbrnts";
+import { ShapePath as ShapePath24 } from "lbrnts";
 var addPolygonPcbCutout = (cutout, ctx) => {
   const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   if (cutout.points.length >= 3 && includeCopper) {
@@ -2234,7 +2246,7 @@ var addPolygonPcbCutout = (cutout, ctx) => {
       offsetY: origin.y
     });
     project.children.push(
-      new ShapePath23({
+      new ShapePath24({
         cutIndex: throughBoardCutSetting.index,
         verts: polygonPath.verts,
         prims: polygonPath.prims,
@@ -2245,21 +2257,21 @@ var addPolygonPcbCutout = (cutout, ctx) => {
 };
 
 // lib/element-handlers/addPcbCutout/addPathPcbCutout.ts
-import { ShapePath as ShapePath24 } from "lbrnts";
+import { ShapePath as ShapePath25 } from "lbrnts";
 var addPathPcbCutout = (cutout, ctx) => {
   const { project, throughBoardCutSetting, origin, includeCopper } = ctx;
   if (cutout.route.length >= 2 && includeCopper) {
     const verts = [];
     const prims = [];
-    for (const point6 of cutout.route) {
+    for (const point5 of cutout.route) {
       verts.push({
-        x: point6.x + origin.x,
-        y: point6.y + origin.y
+        x: point5.x + origin.x,
+        y: point5.y + origin.y
       });
       prims.push({ type: 0 });
     }
     project.children.push(
-      new ShapePath24({
+      new ShapePath25({
         cutIndex: throughBoardCutSetting.index,
         verts,
         prims,
@@ -2288,8 +2300,8 @@ var addPcbCutout = (cutout, ctx) => {
 };
 
 // lib/createCopperShapesForLayer.ts
-import { Polygon as Polygon4, Box as Box2, BooleanOperations } from "@flatten-js/core";
-import { ShapePath as ShapePath25 } from "lbrnts";
+import { Polygon as Polygon3, Box as Box2, BooleanOperations } from "@flatten-js/core";
+import { ShapePath as ShapePath26 } from "lbrnts";
 var outputPolygon = (poly, cutIndex, project) => {
   if (poly.faces.size > 1) {
     for (const face of poly.faces) {
@@ -2298,11 +2310,11 @@ var outputPolygon = (poly, cutIndex, project) => {
         facePoints.push(edge.start);
       }
       if (facePoints.length >= 3) {
-        const facePoly = new Polygon4(facePoints);
+        const facePoly = new Polygon3(facePoints);
         const { verts: verts2, prims: prims2 } = polygonToShapePathData(facePoly);
         if (verts2.length > 0) {
           project.children.push(
-            new ShapePath25({
+            new ShapePath26({
               cutIndex,
               verts: verts2,
               prims: prims2,
@@ -2316,7 +2328,7 @@ var outputPolygon = (poly, cutIndex, project) => {
   }
   const { verts, prims } = polygonToShapePathData(poly);
   project.children.push(
-    new ShapePath25({
+    new ShapePath26({
       cutIndex,
       verts,
       prims,
@@ -2326,7 +2338,7 @@ var outputPolygon = (poly, cutIndex, project) => {
 };
 var outputIndividualGeometries = (netGeoms, cutIndex, project) => {
   for (const geom of netGeoms) {
-    const poly = geom instanceof Box2 ? new Polygon4(geom) : geom;
+    const poly = geom instanceof Box2 ? new Polygon3(geom) : geom;
     outputPolygon(poly, cutIndex, project);
   }
 };
@@ -2355,18 +2367,18 @@ var createCopperShapesForLayer = ({
     }
     if (netGeoms.length === 1) {
       const geom = netGeoms[0];
-      const poly = geom instanceof Box2 ? new Polygon4(geom) : geom;
+      const poly = geom instanceof Box2 ? new Polygon3(geom) : geom;
       outputPolygon(poly, cutIndex, project);
       continue;
     }
     try {
       let union = netGeoms[0];
       if (union instanceof Box2) {
-        union = new Polygon4(union);
+        union = new Polygon3(union);
       }
       let unionFailed = false;
       for (const geom of netGeoms.slice(1)) {
-        const poly = geom instanceof Polygon4 ? geom : new Polygon4(geom);
+        const poly = geom instanceof Polygon3 ? geom : new Polygon3(geom);
         union = BooleanOperations.unify(union, poly);
         if (union.faces.size === 0) {
           unionFailed = true;
@@ -2396,8 +2408,8 @@ var createCopperShapesForLayer = ({
 };
 
 // lib/createTraceClearanceAreasForLayer.ts
-import { Polygon as Polygon5, Box as Box3, BooleanOperations as BooleanOperations2 } from "@flatten-js/core";
-import { ShapePath as ShapePath26 } from "lbrnts";
+import { Polygon as Polygon4, Box as Box3, BooleanOperations as BooleanOperations2 } from "@flatten-js/core";
+import { ShapePath as ShapePath27 } from "lbrnts";
 var createTraceClearanceAreasForLayer = ({
   layer,
   ctx
@@ -2427,31 +2439,31 @@ var createTraceClearanceAreasForLayer = ({
     try {
       let innerUnion = innerGeoms[0];
       if (innerUnion instanceof Box3) {
-        innerUnion = new Polygon5(innerUnion);
+        innerUnion = new Polygon4(innerUnion);
       }
       for (const geom of innerGeoms.slice(1)) {
-        if (geom instanceof Polygon5) {
+        if (geom instanceof Polygon4) {
           innerUnion = BooleanOperations2.unify(innerUnion, geom);
         } else if (geom instanceof Box3) {
-          innerUnion = BooleanOperations2.unify(innerUnion, new Polygon5(geom));
+          innerUnion = BooleanOperations2.unify(innerUnion, new Polygon4(geom));
         }
       }
       let outerUnion = outerGeoms[0];
       if (outerUnion instanceof Box3) {
-        outerUnion = new Polygon5(outerUnion);
+        outerUnion = new Polygon4(outerUnion);
       }
       for (const geom of outerGeoms.slice(1)) {
-        if (geom instanceof Polygon5) {
+        if (geom instanceof Polygon4) {
           outerUnion = BooleanOperations2.unify(outerUnion, geom);
         } else if (geom instanceof Box3) {
-          outerUnion = BooleanOperations2.unify(outerUnion, new Polygon5(geom));
+          outerUnion = BooleanOperations2.unify(outerUnion, new Polygon4(geom));
         }
       }
       const clearanceArea = BooleanOperations2.subtract(outerUnion, innerUnion);
       for (const island of clearanceArea.splitToIslands()) {
         const { verts, prims } = polygonToShapePathData(island);
         project.children.push(
-          new ShapePath26({
+          new ShapePath27({
             cutIndex: cutSetting.index,
             verts,
             prims,
@@ -2482,6 +2494,7 @@ var convertCircuitJsonToLbrn = (circuitJson, options = {}) => {
   const includeCopper = options.includeCopper ?? true;
   const includeSoldermask = options.includeSoldermask ?? false;
   const globalCopperSoldermaskMarginAdjustment = options.globalCopperSoldermaskMarginAdjustment ?? 0;
+  const solderMaskMarginPercent = options.solderMaskMarginPercent ?? 0;
   const laserProfile = options.laserProfile;
   const defaultCopperSettings = {
     speed: 300,
@@ -2598,7 +2611,8 @@ var convertCircuitJsonToLbrn = (circuitJson, options = {}) => {
     traceMargin,
     laserSpotSize,
     topTraceClearanceAreaCutSetting,
-    bottomTraceClearanceAreaCutSetting
+    bottomTraceClearanceAreaCutSetting,
+    solderMaskMarginPercent
   };
   for (const net of Object.keys(connMap.netMap)) {
     ctx.topCutNetGeoms.set(net, []);