circuit-json-to-lbrn 0.0.14 → 0.0.16

package/dist/index.d.ts

@@ -10,6 +10,7 @@ declare const convertCircuitJsonToLbrn: (circuitJson: CircuitJson, options?: {
     margin?: number;
     includeCopper?: boolean;
     includeSoldermask?: boolean;
+    soldermaskMargin?: number;
 }) => LightBurnProject;
 
 export { convertCircuitJsonToLbrn };

package/dist/index.js

@@ -1,5 +1,5 @@
 // lib/index.ts
-import { LightBurnProject, CutSetting, ShapePath as ShapePath15 } from "lbrnts";
+import { LightBurnProject, CutSetting, ShapePath as ShapePath16 } from "lbrnts";
 import { cju as cju2 } from "@tscircuit/circuit-json-util";
 
 // lib/element-handlers/addPlatedHole/addCirclePlatedHole.ts
@@ -52,7 +52,8 @@ var addCirclePlatedHole = (platedHole, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    connMap
+    connMap,
+    soldermaskMargin
   } = ctx;
   const centerX = platedHole.x + origin.x;
   const centerY = platedHole.y + origin.y;
@@ -76,8 +77,8 @@ var addCirclePlatedHole = (platedHole, ctx) => {
     }
   }
   if (platedHole.outer_diameter > 0 && includeSoldermask) {
-    const outerRadius = platedHole.outer_diameter / 2;
-    const outer = createCirclePath(centerX, centerY, outerRadius);
+    const smRadius = platedHole.outer_diameter / 2 + soldermaskMargin;
+    const outer = createCirclePath(centerX, centerY, smRadius);
     project.children.push(
       new ShapePath({
         cutIndex: soldermaskCutSetting.index,
@@ -140,7 +141,8 @@ var addOvalPlatedHole = (platedHole, ctx) => {
     throughBoardCutSetting,
     origin,
     includeCopper,
-    includeSoldermask
+    includeSoldermask,
+    soldermaskMargin
   } = ctx;
   if (platedHole.outer_width <= 0 || platedHole.outer_height <= 0) {
     return;
@@ -166,13 +168,9 @@ var addOvalPlatedHole = (platedHole, ctx) => {
     );
   }
   if (platedHole.outer_width > 0 && platedHole.outer_height > 0 && includeSoldermask) {
-    const outer = createOvalPath(
-      centerX,
-      centerY,
-      platedHole.outer_width,
-      platedHole.outer_height,
-      rotation
-    );
+    const smWidth = platedHole.outer_width + 2 * soldermaskMargin;
+    const smHeight = platedHole.outer_height + 2 * soldermaskMargin;
+    const outer = createOvalPath(centerX, centerY, smWidth, smHeight, rotation);
     project.children.push(
       new ShapePath2({
         cutIndex: soldermaskCutSetting.index,
@@ -294,7 +292,8 @@ var addCircularHoleWithRectPad = (platedHole, ctx) => {
     throughBoardCutSetting,
     origin,
     includeCopper,
-    includeSoldermask
+    includeSoldermask,
+    soldermaskMargin
   } = ctx;
   const centerX = platedHole.x + origin.x;
   const centerY = platedHole.y + origin.y;
@@ -320,11 +319,20 @@ var addCircularHoleWithRectPad = (platedHole, ctx) => {
     );
   }
   if (includeSoldermask) {
+    const smPadWidth = padWidth + 2 * soldermaskMargin;
+    const smPadHeight = padHeight + 2 * soldermaskMargin;
+    const smPadPath = createRoundedRectPath(
+      centerX,
+      centerY,
+      smPadWidth,
+      smPadHeight,
+      borderRadius
+    );
     project.children.push(
       new ShapePath3({
         cutIndex: soldermaskCutSetting.index,
-        verts: padPath.verts,
-        prims: padPath.prims,
+        verts: smPadPath.verts,
+        prims: smPadPath.prims,
         isClosed: true
       })
     );
@@ -435,7 +443,8 @@ var addPillHoleWithRectPad = (platedHole, ctx) => {
     throughBoardCutSetting,
     origin,
     includeCopper,
-    includeSoldermask
+    includeSoldermask,
+    soldermaskMargin
   } = ctx;
   const centerX = platedHole.x + origin.x;
   const centerY = platedHole.y + origin.y;
@@ -461,11 +470,20 @@ var addPillHoleWithRectPad = (platedHole, ctx) => {
       );
     }
     if (includeSoldermask) {
+      const smPadWidth = padWidth + 2 * soldermaskMargin;
+      const smPadHeight = padHeight + 2 * soldermaskMargin;
+      const smPadPath = createRoundedRectPath(
+        centerX,
+        centerY,
+        smPadWidth,
+        smPadHeight,
+        borderRadius
+      );
       project.children.push(
         new ShapePath4({
           cutIndex: soldermaskCutSetting.index,
-          verts: padPath.verts,
-          prims: padPath.prims,
+          verts: smPadPath.verts,
+          prims: smPadPath.prims,
           isClosed: true
         })
       );
@@ -503,7 +521,8 @@ var addRotatedPillHoleWithRectPad = (platedHole, ctx) => {
     throughBoardCutSetting,
     origin,
     includeCopper,
-    includeSoldermask
+    includeSoldermask,
+    soldermaskMargin
   } = ctx;
   const centerX = platedHole.x + origin.x;
   const centerY = platedHole.y + origin.y;
@@ -532,11 +551,22 @@ var addRotatedPillHoleWithRectPad = (platedHole, ctx) => {
       );
     }
     if (includeSoldermask) {
+      const smPadWidth = padWidth + 2 * soldermaskMargin;
+      const smPadHeight = padHeight + 2 * soldermaskMargin;
+      const smPadPath = createRoundedRectPath(
+        centerX,
+        centerY,
+        smPadWidth,
+        smPadHeight,
+        borderRadius,
+        4,
+        padRotation
+      );
       project.children.push(
         new ShapePath5({
           cutIndex: soldermaskCutSetting.index,
-          verts: padPath.verts,
-          prims: padPath.prims,
+          verts: smPadPath.verts,
+          prims: smPadPath.prims,
           isClosed: true
         })
       );
@@ -572,9 +602,9 @@ import { ShapePath as ShapePath6 } from "lbrnts";
 // lib/helpers/polygonShape.ts
 var createPolygonPathFromOutline = (outline, offsetX, offsetY) => {
   const verts = [];
-  for (const point5 of outline) {
-    const x = (point5.x ?? 0) + offsetX;
-    const y = (point5.y ?? 0) + offsetY;
+  for (const point6 of outline) {
+    const x = (point6.x ?? 0) + offsetX;
+    const y = (point6.y ?? 0) + offsetY;
     verts.push({ x, y });
   }
   if (verts.length === 0) {
@@ -595,7 +625,8 @@ var addHoleWithPolygonPad = (platedHole, ctx) => {
     throughBoardCutSetting,
     origin,
     includeCopper,
-    includeSoldermask
+    includeSoldermask,
+    soldermaskMargin
   } = ctx;
   if (platedHole.pad_outline.length >= 3) {
     const pad = createPolygonPathFromOutline(
@@ -664,7 +695,8 @@ var addPcbPlatedHolePill = (platedHole, ctx) => {
     throughBoardCutSetting,
     origin,
     includeCopper,
-    includeSoldermask
+    includeSoldermask,
+    soldermaskMargin
   } = ctx;
   const centerX = platedHole.x + origin.x;
   const centerY = platedHole.y + origin.y;
@@ -687,13 +719,9 @@ var addPcbPlatedHolePill = (platedHole, ctx) => {
     );
   }
   if (platedHole.outer_width > 0 && platedHole.outer_height > 0 && includeSoldermask) {
-    const outer = createPillPath(
-      centerX,
-      centerY,
-      platedHole.outer_width,
-      platedHole.outer_height,
-      rotation
-    );
+    const smWidth = platedHole.outer_width + 2 * soldermaskMargin;
+    const smHeight = platedHole.outer_height + 2 * soldermaskMargin;
+    const outer = createPillPath(centerX, centerY, smWidth, smHeight, rotation);
     project.children.push(
       new ShapePath7({
         cutIndex: soldermaskCutSetting.index,
@@ -757,7 +785,8 @@ var addRectSmtPad = (smtPad, ctx) => {
     netGeoms,
     origin,
     includeCopper,
-    includeSoldermask
+    includeSoldermask,
+    soldermaskMargin
   } = ctx;
   const centerX = smtPad.x + origin.x;
   const centerY = smtPad.y + origin.y;
@@ -801,12 +830,14 @@ var addRectSmtPad = (smtPad, ctx) => {
     }
   }
   if (includeSoldermask) {
+    const smHalfWidth = halfWidth + soldermaskMargin;
+    const smHalfHeight = halfHeight + soldermaskMargin;
     const 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 }
+      { x: centerX - smHalfWidth, y: centerY - smHalfHeight },
+      { x: centerX + smHalfWidth, y: centerY - smHalfHeight },
+      { x: centerX + smHalfWidth, y: centerY + smHalfHeight },
+      { x: centerX - smHalfWidth, y: centerY + smHalfHeight },
+      { x: centerX - smHalfWidth, y: centerY - smHalfHeight }
       // Close the path
     ];
     const prims = [
@@ -838,7 +869,8 @@ var addCircleSmtPad = (smtPad, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    connMap
+    connMap,
+    soldermaskMargin
   } = ctx;
   const centerX = smtPad.x + origin.x;
   const centerY = smtPad.y + origin.y;
@@ -863,7 +895,8 @@ var addCircleSmtPad = (smtPad, ctx) => {
       }
     }
     if (includeSoldermask) {
-      const outer = createCirclePath(centerX, centerY, outerRadius);
+      const smRadius = outerRadius + soldermaskMargin;
+      const outer = createCirclePath(centerX, centerY, smRadius);
       project.children.push(
         new ShapePath9({
           cutIndex: soldermaskCutSetting.index,
@@ -895,7 +928,8 @@ var addPillSmtPad = (smtPad, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    connMap
+    connMap,
+    soldermaskMargin
   } = ctx;
   const centerX = smtPad.x + origin.x;
   const centerY = smtPad.y + origin.y;
@@ -918,11 +952,14 @@ var addPillSmtPad = (smtPad, ctx) => {
       }
     }
     if (includeSoldermask) {
+      const smWidth = smtPad.width + 2 * soldermaskMargin;
+      const smHeight = smtPad.height + 2 * soldermaskMargin;
+      const smOuter = createPillPath(centerX, centerY, smWidth, smHeight);
       project.children.push(
         new ShapePath10({
           cutIndex: soldermaskCutSetting.index,
-          verts: outer.verts,
-          prims: outer.prims,
+          verts: smOuter.verts,
+          prims: smOuter.prims,
           isClosed: true
         })
       );
@@ -940,7 +977,8 @@ var addRotatedPillSmtPad = (smtPad, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    connMap
+    connMap,
+    soldermaskMargin
   } = ctx;
   const centerX = smtPad.x + origin.x;
   const centerY = smtPad.y + origin.y;
@@ -969,11 +1007,20 @@ var addRotatedPillSmtPad = (smtPad, ctx) => {
       }
     }
     if (includeSoldermask) {
+      const smWidth = smtPad.width + 2 * soldermaskMargin;
+      const smHeight = smtPad.height + 2 * soldermaskMargin;
+      const smOuter = createPillPath(
+        centerX,
+        centerY,
+        smWidth,
+        smHeight,
+        (smtPad.ccw_rotation ?? 0) * (Math.PI / 180)
+      );
       project.children.push(
         new ShapePath11({
           cutIndex: soldermaskCutSetting.index,
-          verts: outer.verts,
-          prims: outer.prims,
+          verts: smOuter.verts,
+          prims: smOuter.prims,
           isClosed: true
         })
       );
@@ -983,6 +1030,35 @@ var addRotatedPillSmtPad = (smtPad, ctx) => {
 
 // lib/element-handlers/addSmtPad/addPolygonSmtPad.ts
 import { ShapePath as ShapePath12 } from "lbrnts";
+
+// lib/polygon-to-shape-path.ts
+function polygonToShapePathData(polygon) {
+  const verts = [];
+  const prims = [];
+  const svgString = polygon.svg();
+  const dAttributeMatch = svgString.match(/\bd="([^"]+)"/);
+  if (!dAttributeMatch || !dAttributeMatch[1]) {
+    return { verts, prims };
+  }
+  const pathData = dAttributeMatch[1].trim();
+  const commands = pathData.match(/[MLz][^MLz]*/g) || [];
+  for (const command of commands) {
+    const type = command[0];
+    const coords = command.slice(1).trim();
+    if (type === "M" || type === "L") {
+      const parts = coords.split(",");
+      const x = Number(parts[0]);
+      const y = Number(parts[1]);
+      if (!Number.isNaN(x) && !Number.isNaN(y)) {
+        verts.push({ x, y });
+        prims.push({ type: 0 });
+      }
+    }
+  }
+  return { verts, prims };
+}
+
+// lib/element-handlers/addSmtPad/addPolygonSmtPad.ts
 var addPolygonSmtPad = (smtPad, ctx) => {
   const {
     project,
@@ -991,7 +1067,8 @@ var addPolygonSmtPad = (smtPad, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    connMap
+    connMap,
+    soldermaskMargin
   } = ctx;
   if (smtPad.points.length >= 3) {
     const pad = createPolygonPathFromOutline(smtPad.points, origin.x, origin.y);
@@ -1034,7 +1111,8 @@ var addRotatedRectSmtPad = (smtPad, ctx) => {
     origin,
     includeCopper,
     includeSoldermask,
-    connMap
+    connMap,
+    soldermaskMargin
   } = ctx;
   const centerX = smtPad.x + origin.x;
   const centerY = smtPad.y + origin.y;
@@ -1067,11 +1145,22 @@ var addRotatedRectSmtPad = (smtPad, ctx) => {
       }
     }
     if (includeSoldermask) {
+      const smWidth = smtPad.width + 2 * soldermaskMargin;
+      const smHeight = smtPad.height + 2 * soldermaskMargin;
+      const smOuter = createRoundedRectPath(
+        centerX,
+        centerY,
+        smWidth,
+        smHeight,
+        borderRadius,
+        4,
+        rotation
+      );
       project.children.push(
         new ShapePath13({
           cutIndex: soldermaskCutSetting.index,
-          verts: outer.verts,
-          prims: outer.prims,
+          verts: smOuter.verts,
+          prims: smOuter.prims,
           isClosed: true
         })
       );
@@ -1118,7 +1207,7 @@ var addPcbTrace = (trace, ctx) => {
     return;
   }
   const { route } = trace;
-  const traceWidth = route.find((point5) => point5.route_type === "wire")?.width ?? 0.15;
+  const traceWidth = route.find((point6) => point6.route_type === "wire")?.width ?? 0.15;
   const polygons = [];
   for (const routePoint of route) {
     const circle = new Flatten2.Circle(
@@ -1169,35 +1258,6 @@ 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";
-
-// lib/polygon-to-shape-path.ts
-function polygonToShapePathData(polygon) {
-  const verts = [];
-  const prims = [];
-  const svgString = polygon.svg();
-  const dAttributeMatch = svgString.match(/\bd="([^"]+)"/);
-  if (!dAttributeMatch || !dAttributeMatch[1]) {
-    return { verts, prims };
-  }
-  const pathData = dAttributeMatch[1].trim();
-  const commands = pathData.match(/[MLz][^MLz]*/g) || [];
-  for (const command of commands) {
-    const type = command[0];
-    const coords = command.slice(1).trim();
-    if (type === "M" || type === "L") {
-      const parts = coords.split(",");
-      const x = Number(parts[0]);
-      const y = Number(parts[1]);
-      if (!Number.isNaN(x) && !Number.isNaN(y)) {
-        verts.push({ x, y });
-        prims.push({ type: 0 });
-      }
-    }
-  }
-  return { verts, prims };
-}
-
-// lib/element-handlers/addPcbBoard/index.ts
 var addPcbBoard = (board, ctx) => {
   const {
     origin,
@@ -1281,14 +1341,14 @@ var calculateCircuitBounds = (circuitJson) => {
     }
   }
   for (const trace of db.pcb_trace.list()) {
-    const isWidthPoint = (point5) => "width" in point5 && typeof point5.width === "number";
+    const isWidthPoint = (point6) => "width" in point6 && typeof point6.width === "number";
     const halfWidth = trace.route_thickness_mode === "interpolated" ? 0 : (trace.route.find(isWidthPoint)?.width ?? 0) / 2;
-    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 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 hole of db.pcb_plated_hole.list()) {
@@ -1312,6 +1372,70 @@ var calculateOriginFromBounds = (bounds, margin) => {
   return { x: originX, y: originY };
 };
 
+// lib/element-handlers/addPcbVia/index.ts
+import { ShapePath as ShapePath15 } from "lbrnts";
+import { Circle as Circle3, point as point5 } from "@flatten-js/core";
+var addPcbVia = (via, ctx) => {
+  const {
+    db,
+    project,
+    copperCutSetting,
+    soldermaskCutSetting,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+    connMap,
+    soldermaskMargin
+  } = ctx;
+  const centerX = via.x + origin.x;
+  const centerY = via.y + origin.y;
+  if (via.outer_diameter > 0 && includeCopper) {
+    const viaPort = db.pcb_port.list().find((port) => port.x === via.x && port.y === via.y);
+    const netId = viaPort ? connMap.getNetConnectedToId(viaPort.pcb_port_id) : void 0;
+    const outerRadius = via.outer_diameter / 2;
+    const circle = new Circle3(point5(centerX, centerY), outerRadius);
+    const polygon = circleToPolygon(circle);
+    if (netId) {
+      ctx.netGeoms.get(netId)?.push(polygon);
+    } else {
+      const outer = createCirclePath(centerX, centerY, outerRadius);
+      project.children.push(
+        new ShapePath15({
+          cutIndex: copperCutSetting.index,
+          verts: outer.verts,
+          prims: outer.prims,
+          isClosed: true
+        })
+      );
+    }
+  }
+  if (via.outer_diameter > 0 && includeSoldermask) {
+    const smRadius = via.outer_diameter / 2 + soldermaskMargin;
+    const outer = createCirclePath(centerX, centerY, smRadius);
+    project.children.push(
+      new ShapePath15({
+        cutIndex: soldermaskCutSetting.index,
+        verts: outer.verts,
+        prims: outer.prims,
+        isClosed: true
+      })
+    );
+  }
+  if (via.hole_diameter > 0) {
+    const innerRadius = via.hole_diameter / 2;
+    const inner = createCirclePath(centerX, centerY, innerRadius);
+    project.children.push(
+      new ShapePath15({
+        cutIndex: throughBoardCutSetting.index,
+        verts: inner.verts,
+        prims: inner.prims,
+        isClosed: true
+      })
+    );
+  }
+};
+
 // lib/index.ts
 var convertCircuitJsonToLbrn = (circuitJson, options = {}) => {
   const db = cju2(circuitJson);
@@ -1365,7 +1489,8 @@ var convertCircuitJsonToLbrn = (circuitJson, options = {}) => {
     netGeoms: /* @__PURE__ */ new Map(),
     origin,
     includeCopper: options.includeCopper ?? true,
-    includeSoldermask: options.includeSoldermask ?? false
+    includeSoldermask: options.includeSoldermask ?? false,
+    soldermaskMargin: options.soldermaskMargin ?? 0
   };
   for (const net of Object.keys(connMap.netMap)) {
     ctx.netGeoms.set(net, []);
@@ -1382,6 +1507,9 @@ var convertCircuitJsonToLbrn = (circuitJson, options = {}) => {
   for (const board of db.pcb_board.list()) {
     addPcbBoard(board, ctx);
   }
+  for (const via of db.pcb_via.list()) {
+    addPcbVia(via, ctx);
+  }
   if (ctx.includeCopper) {
     for (const net of Object.keys(connMap.netMap)) {
       const netGeoms = ctx.netGeoms.get(net);
@@ -1402,7 +1530,7 @@ var convertCircuitJsonToLbrn = (circuitJson, options = {}) => {
       for (const island of union.splitToIslands()) {
         const { verts, prims } = polygonToShapePathData(island);
         project.children.push(
-          new ShapePath15({
+          new ShapePath16({
             cutIndex: copperCutSetting.index,
             verts,
             prims,

package/lib/ConvertContext.ts

@@ -22,4 +22,7 @@ export interface ConvertContext {
   // Include flags
   includeCopper: boolean
   includeSoldermask: boolean
+
+  // Soldermask margin (can be negative)
+  soldermaskMargin: number
 }

package/lib/element-handlers/addPcbVia/index.ts

@@ -0,0 +1,84 @@
+import type { PcbVia } from "circuit-json"
+import type { ConvertContext } from "../../ConvertContext"
+import { ShapePath } from "lbrnts"
+import { createCirclePath } from "../../helpers/circleShape"
+import { Circle, point } from "@flatten-js/core"
+import { circleToPolygon } from "../addPcbTrace/circle-to-polygon"
+
+export const addPcbVia = (via: PcbVia, ctx: ConvertContext): void => {
+  const {
+    db,
+    project,
+    copperCutSetting,
+    soldermaskCutSetting,
+    throughBoardCutSetting,
+    origin,
+    includeCopper,
+    includeSoldermask,
+    connMap,
+    soldermaskMargin,
+  } = ctx
+  const centerX = via.x + origin.x
+  const centerY = via.y + origin.y
+
+  // Add outer circle (copper annulus) if drawing copper - add to netGeoms for merging
+  if (via.outer_diameter > 0 && includeCopper) {
+    // Find the pcb_port associated with this via (vias don't have pcb_port_id property)
+    // We need to find a port at the same location as the via
+    const viaPort = db.pcb_port
+      .list()
+      .find((port) => port.x === via.x && port.y === via.y)
+
+    const netId = viaPort
+      ? connMap.getNetConnectedToId(viaPort.pcb_port_id)
+      : undefined
+
+    const outerRadius = via.outer_diameter / 2
+    const circle = new Circle(point(centerX, centerY), outerRadius)
+    const polygon = circleToPolygon(circle)
+
+    if (netId) {
+      // Add to netGeoms to be merged with other elements on the same net
+      ctx.netGeoms.get(netId)?.push(polygon)
+    } else {
+      // No net connection - draw directly
+      const outer = createCirclePath(centerX, centerY, outerRadius)
+      project.children.push(
+        new ShapePath({
+          cutIndex: copperCutSetting.index,
+          verts: outer.verts,
+          prims: outer.prims,
+          isClosed: true,
+        }),
+      )
+    }
+  }
+
+  // Add soldermask opening if drawing soldermask
+  if (via.outer_diameter > 0 && includeSoldermask) {
+    const smRadius = via.outer_diameter / 2 + soldermaskMargin
+    const outer = createCirclePath(centerX, centerY, smRadius)
+    project.children.push(
+      new ShapePath({
+        cutIndex: soldermaskCutSetting.index,
+        verts: outer.verts,
+        prims: outer.prims,
+        isClosed: true,
+      }),
+    )
+  }
+
+  // Add inner circle (hole) - always cut through the board regardless of mode
+  if (via.hole_diameter > 0) {
+    const innerRadius = via.hole_diameter / 2
+    const inner = createCirclePath(centerX, centerY, innerRadius)
+    project.children.push(
+      new ShapePath({
+        cutIndex: throughBoardCutSetting.index,
+        verts: inner.verts,
+        prims: inner.prims,
+        isClosed: true,
+      }),
+    )
+  }
+}

package/lib/element-handlers/addPlatedHole/addCirclePlatedHole.ts

@@ -18,6 +18,7 @@ export const addCirclePlatedHole = (
     includeCopper,
     includeSoldermask,
     connMap,
+    soldermaskMargin,
   } = ctx
   const centerX = platedHole.x + origin.x
   const centerY = platedHole.y + origin.y
@@ -48,8 +49,8 @@ export const addCirclePlatedHole = (
 
   // Add soldermask opening if drawing soldermask
   if (platedHole.outer_diameter > 0 && includeSoldermask) {
-    const outerRadius = platedHole.outer_diameter / 2
-    const outer = createCirclePath(centerX, centerY, outerRadius)
+    const smRadius = platedHole.outer_diameter / 2 + soldermaskMargin
+    const outer = createCirclePath(centerX, centerY, smRadius)
     project.children.push(
       new ShapePath({
         cutIndex: soldermaskCutSetting.index,