circuit-to-svg 0.0.272 → 0.0.274

package/dist/index.js

@@ -1580,9 +1580,12 @@ function createSvgObjectsFromPcbNoteLine(noteLine, ctx) {
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-plated-hole.ts
 import { applyToPoint as applyToPoint12 } from "transformation-matrix";
 function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
-  const { transform, colorMap: colorMap2 } = ctx;
+  const { transform, colorMap: colorMap2, showSolderMask } = ctx;
   const [x, y] = applyToPoint12(transform, [hole.x, hole.y]);
   const copperLayer = Array.isArray(hole.layers) && hole.layers[0] || hole.layer || "top";
+  const soldermaskMargin = (hole.soldermask_margin ?? 0) * Math.abs(transform.a);
+  const shouldShowSolderMask = showSolderMask && soldermaskMargin !== 0;
+  const solderMaskColor = colorMap2.soldermask.top;
   if (hole.shape === "pill") {
     const scaledOuterWidth = hole.outer_width * Math.abs(transform.a);
     const scaledOuterHeight = hole.outer_height * Math.abs(transform.a);
@@ -1605,6 +1608,55 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
         return `M${-radius},0 a${radius},${radius} 0 0 1 ${width},0 a${radius},${radius} 0 0 1 ${-width},0 z`;
       }
     };
+    const children = [
+      // Outer pill shape
+      {
+        name: "path",
+        type: "element",
+        attributes: {
+          class: "pcb-hole-outer",
+          fill: colorMap2.copper.top,
+          d: createPillPath(scaledOuterWidth, scaledOuterHeight),
+          transform: outerTransform,
+          "data-type": "pcb_plated_hole",
+          "data-pcb-layer": copperLayer
+        },
+        value: "",
+        children: []
+      },
+      // Inner pill shape
+      {
+        name: "path",
+        type: "element",
+        attributes: {
+          class: "pcb-hole-inner",
+          fill: colorMap2.drill,
+          d: createPillPath(scaledHoleWidth, scaledHoleHeight),
+          transform: innerTransform,
+          "data-type": "pcb_plated_hole_drill",
+          "data-pcb-layer": "drill"
+        },
+        value: "",
+        children: []
+      }
+    ];
+    if (shouldShowSolderMask) {
+      const maskWidth = scaledOuterWidth + 2 * soldermaskMargin;
+      const maskHeight = scaledOuterHeight + 2 * soldermaskMargin;
+      children.push({
+        name: "path",
+        type: "element",
+        attributes: {
+          class: "pcb-solder-mask",
+          fill: solderMaskColor,
+          d: createPillPath(maskWidth, maskHeight),
+          transform: outerTransform,
+          "data-type": "pcb_soldermask"
+        },
+        value: "",
+        children: []
+      });
+    }
     return [
       {
         name: "g",
@@ -1613,38 +1665,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
           "data-type": "pcb_plated_hole",
           "data-pcb-layer": "through"
         },
-        children: [
-          // Outer pill shape
-          {
-            name: "path",
-            type: "element",
-            attributes: {
-              class: "pcb-hole-outer",
-              fill: colorMap2.copper.top,
-              d: createPillPath(scaledOuterWidth, scaledOuterHeight),
-              transform: outerTransform,
-              "data-type": "pcb_plated_hole",
-              "data-pcb-layer": copperLayer
-            },
-            value: "",
-            children: []
-          },
-          // Inner pill shape
-          {
-            name: "path",
-            type: "element",
-            attributes: {
-              class: "pcb-hole-inner",
-              fill: colorMap2.drill,
-              d: createPillPath(scaledHoleWidth, scaledHoleHeight),
-              transform: innerTransform,
-              "data-type": "pcb_plated_hole_drill",
-              "data-pcb-layer": "drill"
-            },
-            value: "",
-            children: []
-          }
-        ],
+        children,
         value: ""
       }
     ];
@@ -1656,6 +1677,55 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
     const scaledHoleHeight = hole.hole_diameter * Math.abs(transform.a);
     const outerRadius = Math.min(scaledOuterWidth, scaledOuterHeight) / 2;
     const innerRadius = Math.min(scaledHoleWidth, scaledHoleHeight) / 2;
+    const children = [
+      {
+        name: "circle",
+        type: "element",
+        attributes: {
+          class: "pcb-hole-outer",
+          fill: colorMap2.copper.top,
+          cx: x.toString(),
+          cy: y.toString(),
+          r: outerRadius.toString(),
+          "data-type": "pcb_plated_hole",
+          "data-pcb-layer": copperLayer
+        },
+        value: "",
+        children: []
+      },
+      {
+        name: "circle",
+        type: "element",
+        attributes: {
+          class: "pcb-hole-inner",
+          fill: colorMap2.drill,
+          cx: x.toString(),
+          cy: y.toString(),
+          r: innerRadius.toString(),
+          "data-type": "pcb_plated_hole_drill",
+          "data-pcb-layer": "drill"
+        },
+        value: "",
+        children: []
+      }
+    ];
+    if (shouldShowSolderMask) {
+      const maskRadius = outerRadius + soldermaskMargin;
+      children.push({
+        name: "circle",
+        type: "element",
+        attributes: {
+          class: "pcb-solder-mask",
+          fill: solderMaskColor,
+          cx: x.toString(),
+          cy: y.toString(),
+          r: maskRadius.toString(),
+          "data-type": "pcb_soldermask"
+        },
+        value: "",
+        children: []
+      });
+    }
     return [
       {
         name: "g",
@@ -1664,38 +1734,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
           "data-type": "pcb_plated_hole",
           "data-pcb-layer": "through"
         },
-        children: [
-          {
-            name: "circle",
-            type: "element",
-            attributes: {
-              class: "pcb-hole-outer",
-              fill: colorMap2.copper.top,
-              cx: x.toString(),
-              cy: y.toString(),
-              r: outerRadius.toString(),
-              "data-type": "pcb_plated_hole",
-              "data-pcb-layer": copperLayer
-            },
-            value: "",
-            children: []
-          },
-          {
-            name: "circle",
-            type: "element",
-            attributes: {
-              class: "pcb-hole-inner",
-              fill: colorMap2.drill,
-              cx: x.toString(),
-              cy: y.toString(),
-              r: innerRadius.toString(),
-              "data-type": "pcb_plated_hole_drill",
-              "data-pcb-layer": "drill"
-            },
-            value: "",
-            children: []
-          }
-        ],
+        children,
         value: ""
       }
     ];
@@ -1711,6 +1750,69 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
       h.x + (h.hole_offset_x ?? 0),
       h.y + (h.hole_offset_y ?? 0)
     ]);
+    const children = [
+      // Rectangular pad (outer shape)
+      {
+        name: "rect",
+        type: "element",
+        attributes: {
+          class: "pcb-hole-outer-pad",
+          fill: colorMap2.copper.top,
+          x: (x - scaledRectPadWidth / 2).toString(),
+          y: (y - scaledRectPadHeight / 2).toString(),
+          width: scaledRectPadWidth.toString(),
+          height: scaledRectPadHeight.toString(),
+          ...scaledRectBorderRadius ? {
+            rx: scaledRectBorderRadius.toString(),
+            ry: scaledRectBorderRadius.toString()
+          } : {},
+          "data-type": "pcb_plated_hole",
+          "data-pcb-layer": copperLayer
+        },
+        value: "",
+        children: []
+      },
+      // Circular hole inside the rectangle (with optional offset)
+      {
+        name: "circle",
+        type: "element",
+        attributes: {
+          class: "pcb-hole-inner",
+          fill: colorMap2.drill,
+          cx: holeCx.toString(),
+          cy: holeCy.toString(),
+          r: holeRadius.toString(),
+          "data-type": "pcb_plated_hole_drill",
+          "data-pcb-layer": "drill"
+        },
+        value: "",
+        children: []
+      }
+    ];
+    if (shouldShowSolderMask) {
+      const maskWidth = scaledRectPadWidth + 2 * soldermaskMargin;
+      const maskHeight = scaledRectPadHeight + 2 * soldermaskMargin;
+      const maskBorderRadius = scaledRectBorderRadius + soldermaskMargin;
+      children.push({
+        name: "rect",
+        type: "element",
+        attributes: {
+          class: "pcb-solder-mask",
+          fill: solderMaskColor,
+          x: (x - maskWidth / 2).toString(),
+          y: (y - maskHeight / 2).toString(),
+          width: maskWidth.toString(),
+          height: maskHeight.toString(),
+          ...scaledRectBorderRadius ? {
+            rx: maskBorderRadius.toString(),
+            ry: maskBorderRadius.toString()
+          } : {},
+          "data-type": "pcb_soldermask"
+        },
+        value: "",
+        children: []
+      });
+    }
     return [
       {
         name: "g",
@@ -1719,45 +1821,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
           "data-type": "pcb_plated_hole",
           "data-pcb-layer": "through"
         },
-        children: [
-          // Rectangular pad (outer shape)
-          {
-            name: "rect",
-            type: "element",
-            attributes: {
-              class: "pcb-hole-outer-pad",
-              fill: colorMap2.copper.top,
-              x: (x - scaledRectPadWidth / 2).toString(),
-              y: (y - scaledRectPadHeight / 2).toString(),
-              width: scaledRectPadWidth.toString(),
-              height: scaledRectPadHeight.toString(),
-              ...scaledRectBorderRadius ? {
-                rx: scaledRectBorderRadius.toString(),
-                ry: scaledRectBorderRadius.toString()
-              } : {},
-              "data-type": "pcb_plated_hole",
-              "data-pcb-layer": copperLayer
-            },
-            value: "",
-            children: []
-          },
-          // Circular hole inside the rectangle (with optional offset)
-          {
-            name: "circle",
-            type: "element",
-            attributes: {
-              class: "pcb-hole-inner",
-              fill: colorMap2.drill,
-              cx: holeCx.toString(),
-              cy: holeCy.toString(),
-              r: holeRadius.toString(),
-              "data-type": "pcb_plated_hole_drill",
-              "data-pcb-layer": "drill"
-            },
-            value: "",
-            children: []
-          }
-        ],
+        children,
         value: ""
       }
     ];
@@ -1777,6 +1841,72 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
       pillHole.y + holeOffsetY
     ]);
     const holeRadius = Math.min(scaledHoleHeight, scaledHoleWidth) / 2;
+    const children = [
+      // Rectangular pad (outer shape)
+      {
+        name: "rect",
+        type: "element",
+        attributes: {
+          class: "pcb-hole-outer-pad",
+          fill: colorMap2.copper.top,
+          x: (x - scaledRectPadWidth / 2).toString(),
+          y: (y - scaledRectPadHeight / 2).toString(),
+          width: scaledRectPadWidth.toString(),
+          height: scaledRectPadHeight.toString(),
+          ...scaledRectBorderRadius ? {
+            rx: scaledRectBorderRadius.toString(),
+            ry: scaledRectBorderRadius.toString()
+          } : {},
+          "data-type": "pcb_plated_hole",
+          "data-pcb-layer": copperLayer
+        },
+        value: "",
+        children: []
+      },
+      // pill hole inside the rectangle
+      {
+        name: "rect",
+        type: "element",
+        attributes: {
+          class: "pcb-hole-inner",
+          fill: colorMap2.drill,
+          x: (holeCenterX - scaledHoleWidth / 2).toString(),
+          y: (holeCenterY - scaledHoleHeight / 2).toString(),
+          width: scaledHoleWidth.toString(),
+          height: scaledHoleHeight.toString(),
+          rx: holeRadius.toString(),
+          ry: holeRadius.toString(),
+          "data-type": "pcb_plated_hole_drill",
+          "data-pcb-layer": "drill"
+        },
+        value: "",
+        children: []
+      }
+    ];
+    if (shouldShowSolderMask) {
+      const maskWidth = scaledRectPadWidth + 2 * soldermaskMargin;
+      const maskHeight = scaledRectPadHeight + 2 * soldermaskMargin;
+      const maskBorderRadius = scaledRectBorderRadius + soldermaskMargin;
+      children.push({
+        name: "rect",
+        type: "element",
+        attributes: {
+          class: "pcb-solder-mask",
+          fill: solderMaskColor,
+          x: (x - maskWidth / 2).toString(),
+          y: (y - maskHeight / 2).toString(),
+          width: maskWidth.toString(),
+          height: maskHeight.toString(),
+          ...scaledRectBorderRadius ? {
+            rx: maskBorderRadius.toString(),
+            ry: maskBorderRadius.toString()
+          } : {},
+          "data-type": "pcb_soldermask"
+        },
+        value: "",
+        children: []
+      });
+    }
     return [
       {
         name: "g",
@@ -1785,48 +1915,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
           "data-type": "pcb_plated_hole",
           "data-pcb-layer": "through"
         },
-        children: [
-          // Rectangular pad (outer shape)
-          {
-            name: "rect",
-            type: "element",
-            attributes: {
-              class: "pcb-hole-outer-pad",
-              fill: colorMap2.copper.top,
-              x: (x - scaledRectPadWidth / 2).toString(),
-              y: (y - scaledRectPadHeight / 2).toString(),
-              width: scaledRectPadWidth.toString(),
-              height: scaledRectPadHeight.toString(),
-              ...scaledRectBorderRadius ? {
-                rx: scaledRectBorderRadius.toString(),
-                ry: scaledRectBorderRadius.toString()
-              } : {},
-              "data-type": "pcb_plated_hole",
-              "data-pcb-layer": copperLayer
-            },
-            value: "",
-            children: []
-          },
-          // pill hole inside the rectangle
-          {
-            name: "rect",
-            type: "element",
-            attributes: {
-              class: "pcb-hole-inner",
-              fill: colorMap2.drill,
-              x: (holeCenterX - scaledHoleWidth / 2).toString(),
-              y: (holeCenterY - scaledHoleHeight / 2).toString(),
-              width: scaledHoleWidth.toString(),
-              height: scaledHoleHeight.toString(),
-              rx: holeRadius.toString(),
-              ry: holeRadius.toString(),
-              "data-type": "pcb_plated_hole_drill",
-              "data-pcb-layer": "drill"
-            },
-            value: "",
-            children: []
-          }
-        ],
+        children,
         value: ""
       }
     ];
@@ -1846,6 +1935,73 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
       rotatedHole.y + holeOffsetY
     ]);
     const holeRadius = Math.min(scaledHoleHeight, scaledHoleWidth) / 2;
+    const children = [
+      {
+        name: "rect",
+        type: "element",
+        attributes: {
+          class: "pcb-hole-outer-pad",
+          fill: colorMap2.copper.top,
+          x: (-scaledRectPadWidth / 2).toString(),
+          y: (-scaledRectPadHeight / 2).toString(),
+          width: scaledRectPadWidth.toString(),
+          height: scaledRectPadHeight.toString(),
+          transform: `translate(${x} ${y}) rotate(${-rotatedHole.rect_ccw_rotation})`,
+          ...scaledRectBorderRadius ? {
+            rx: scaledRectBorderRadius.toString(),
+            ry: scaledRectBorderRadius.toString()
+          } : {},
+          "data-type": "pcb_plated_hole",
+          "data-pcb-layer": copperLayer
+        },
+        value: "",
+        children: []
+      },
+      {
+        name: "rect",
+        type: "element",
+        attributes: {
+          class: "pcb-hole-inner",
+          fill: colorMap2.drill,
+          x: (-scaledHoleWidth / 2).toString(),
+          y: (-scaledHoleHeight / 2).toString(),
+          width: scaledHoleWidth.toString(),
+          height: scaledHoleHeight.toString(),
+          rx: holeRadius.toString(),
+          ry: holeRadius.toString(),
+          transform: `translate(${holeCenterX} ${holeCenterY}) rotate(${-rotatedHole.hole_ccw_rotation})`,
+          "data-type": "pcb_plated_hole_drill",
+          "data-pcb-layer": "drill"
+        },
+        value: "",
+        children: []
+      }
+    ];
+    if (shouldShowSolderMask) {
+      const maskWidth = scaledRectPadWidth + 2 * soldermaskMargin;
+      const maskHeight = scaledRectPadHeight + 2 * soldermaskMargin;
+      const maskBorderRadius = scaledRectBorderRadius + soldermaskMargin;
+      children.push({
+        name: "rect",
+        type: "element",
+        attributes: {
+          class: "pcb-solder-mask",
+          fill: solderMaskColor,
+          x: (-maskWidth / 2).toString(),
+          y: (-maskHeight / 2).toString(),
+          width: maskWidth.toString(),
+          height: maskHeight.toString(),
+          transform: `translate(${x} ${y}) rotate(${-rotatedHole.rect_ccw_rotation})`,
+          ...scaledRectBorderRadius ? {
+            rx: maskBorderRadius.toString(),
+            ry: maskBorderRadius.toString()
+          } : {},
+          "data-type": "pcb_soldermask"
+        },
+        value: "",
+        children: []
+      });
+    }
     return [
       {
         name: "g",
@@ -1854,48 +2010,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
           "data-type": "pcb_plated_hole",
           "data-pcb-layer": "through"
         },
-        children: [
-          {
-            name: "rect",
-            type: "element",
-            attributes: {
-              class: "pcb-hole-outer-pad",
-              fill: colorMap2.copper.top,
-              x: (-scaledRectPadWidth / 2).toString(),
-              y: (-scaledRectPadHeight / 2).toString(),
-              width: scaledRectPadWidth.toString(),
-              height: scaledRectPadHeight.toString(),
-              transform: `translate(${x} ${y}) rotate(${-rotatedHole.rect_ccw_rotation})`,
-              ...scaledRectBorderRadius ? {
-                rx: scaledRectBorderRadius.toString(),
-                ry: scaledRectBorderRadius.toString()
-              } : {},
-              "data-type": "pcb_plated_hole",
-              "data-pcb-layer": copperLayer
-            },
-            value: "",
-            children: []
-          },
-          {
-            name: "rect",
-            type: "element",
-            attributes: {
-              class: "pcb-hole-inner",
-              fill: colorMap2.drill,
-              x: (-scaledHoleWidth / 2).toString(),
-              y: (-scaledHoleHeight / 2).toString(),
-              width: scaledHoleWidth.toString(),
-              height: scaledHoleHeight.toString(),
-              rx: holeRadius.toString(),
-              ry: holeRadius.toString(),
-              transform: `translate(${holeCenterX} ${holeCenterY}) rotate(${-rotatedHole.hole_ccw_rotation})`,
-              "data-type": "pcb_plated_hole_drill",
-              "data-pcb-layer": "drill"
-            },
-            value: "",
-            children: []
-          }
-        ],
+        children,
         value: ""
       }
     ];
@@ -2951,94 +3066,170 @@ function createSvgObjectsFromPcbVia(hole, ctx) {
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-hole.ts
 import { applyToPoint as applyToPoint24 } from "transformation-matrix";
 function createSvgObjectsFromPcbHole(hole, ctx) {
-  const { transform, colorMap: colorMap2 } = ctx;
+  const { transform, colorMap: colorMap2, showSolderMask } = ctx;
   const [x, y] = applyToPoint24(transform, [hole.x, hole.y]);
+  const soldermaskMargin = (hole.soldermask_margin ?? 0) * Math.abs(transform.a);
+  const shouldShowSolderMask = showSolderMask && soldermaskMargin !== 0;
+  const solderMaskColor = colorMap2.soldermask.top;
   if (hole.hole_shape === "circle" || hole.hole_shape === "square") {
     const scaledDiameter = hole.hole_diameter * Math.abs(transform.a);
     const radius = scaledDiameter / 2;
     if (hole.hole_shape === "circle") {
-      return [
-        {
-          name: "circle",
-          type: "element",
-          attributes: {
-            class: "pcb-hole",
-            cx: x.toString(),
-            cy: y.toString(),
-            r: radius.toString(),
-            fill: colorMap2.drill,
-            "data-type": "pcb_hole",
-            "data-pcb-layer": "drill"
-          },
-          children: [],
-          value: ""
-        }
-      ];
-    }
-    return [
-      {
-        name: "rect",
+      const holeElement2 = {
+        name: "circle",
         type: "element",
         attributes: {
           class: "pcb-hole",
-          x: (x - radius).toString(),
-          y: (y - radius).toString(),
-          width: scaledDiameter.toString(),
-          height: scaledDiameter.toString(),
+          cx: x.toString(),
+          cy: y.toString(),
+          r: radius.toString(),
           fill: colorMap2.drill,
           "data-type": "pcb_hole",
           "data-pcb-layer": "drill"
         },
         children: [],
         value: ""
+      };
+      if (!shouldShowSolderMask) {
+        return [holeElement2];
       }
-    ];
+      const maskRadius = radius + soldermaskMargin;
+      const maskElement2 = {
+        name: holeElement2.name,
+        type: holeElement2.type,
+        value: "",
+        children: [],
+        attributes: {
+          ...holeElement2.attributes,
+          class: "pcb-solder-mask",
+          fill: solderMaskColor,
+          "data-type": "pcb_soldermask",
+          r: maskRadius.toString()
+        }
+      };
+      return [holeElement2, maskElement2];
+    }
+    const holeElement = {
+      name: "rect",
+      type: "element",
+      attributes: {
+        class: "pcb-hole",
+        x: (x - radius).toString(),
+        y: (y - radius).toString(),
+        width: scaledDiameter.toString(),
+        height: scaledDiameter.toString(),
+        fill: colorMap2.drill,
+        "data-type": "pcb_hole",
+        "data-pcb-layer": "drill"
+      },
+      children: [],
+      value: ""
+    };
+    if (!shouldShowSolderMask) {
+      return [holeElement];
+    }
+    const maskDiameter = scaledDiameter + 2 * soldermaskMargin;
+    const maskElement = {
+      name: holeElement.name,
+      type: holeElement.type,
+      value: "",
+      children: [],
+      attributes: {
+        ...holeElement.attributes,
+        class: "pcb-solder-mask",
+        fill: solderMaskColor,
+        "data-type": "pcb_soldermask",
+        x: (x - maskDiameter / 2).toString(),
+        y: (y - maskDiameter / 2).toString(),
+        width: maskDiameter.toString(),
+        height: maskDiameter.toString()
+      }
+    };
+    return [holeElement, maskElement];
   }
   if (hole.hole_shape === "oval") {
     const scaledWidth = hole.hole_width * Math.abs(transform.a);
     const scaledHeight = hole.hole_height * Math.abs(transform.a);
     const rx = scaledWidth / 2;
     const ry = scaledHeight / 2;
-    return [
-      {
-        name: "ellipse",
-        type: "element",
-        attributes: {
-          class: "pcb-hole",
-          cx: x.toString(),
-          cy: y.toString(),
-          rx: rx.toString(),
-          ry: ry.toString(),
-          fill: colorMap2.drill,
-          "data-type": "pcb_hole",
-          "data-pcb-layer": "drill"
-        },
-        children: [],
-        value: ""
+    const holeElement = {
+      name: "ellipse",
+      type: "element",
+      attributes: {
+        class: "pcb-hole",
+        cx: x.toString(),
+        cy: y.toString(),
+        rx: rx.toString(),
+        ry: ry.toString(),
+        fill: colorMap2.drill,
+        "data-type": "pcb_hole",
+        "data-pcb-layer": "drill"
+      },
+      children: [],
+      value: ""
+    };
+    if (!shouldShowSolderMask) {
+      return [holeElement];
+    }
+    const maskRx = rx + soldermaskMargin;
+    const maskRy = ry + soldermaskMargin;
+    const maskElement = {
+      name: holeElement.name,
+      type: holeElement.type,
+      value: "",
+      children: [],
+      attributes: {
+        ...holeElement.attributes,
+        class: "pcb-solder-mask",
+        fill: solderMaskColor,
+        "data-type": "pcb_soldermask",
+        rx: maskRx.toString(),
+        ry: maskRy.toString()
       }
-    ];
+    };
+    return [holeElement, maskElement];
   }
   if (hole.hole_shape === "rect") {
     const scaledWidth = hole.hole_width * Math.abs(transform.a);
     const scaledHeight = hole.hole_height * Math.abs(transform.a);
-    return [
-      {
-        name: "rect",
-        type: "element",
-        attributes: {
-          class: "pcb-hole",
-          x: (x - scaledWidth / 2).toString(),
-          y: (y - scaledHeight / 2).toString(),
-          width: scaledWidth.toString(),
-          height: scaledHeight.toString(),
-          fill: colorMap2.drill,
-          "data-type": "pcb_hole",
-          "data-pcb-layer": "drill"
-        },
-        children: [],
-        value: ""
+    const holeElement = {
+      name: "rect",
+      type: "element",
+      attributes: {
+        class: "pcb-hole",
+        x: (x - scaledWidth / 2).toString(),
+        y: (y - scaledHeight / 2).toString(),
+        width: scaledWidth.toString(),
+        height: scaledHeight.toString(),
+        fill: colorMap2.drill,
+        "data-type": "pcb_hole",
+        "data-pcb-layer": "drill"
+      },
+      children: [],
+      value: ""
+    };
+    if (!shouldShowSolderMask) {
+      return [holeElement];
+    }
+    const maskWidth = scaledWidth + 2 * soldermaskMargin;
+    const maskHeight = scaledHeight + 2 * soldermaskMargin;
+    const maskElement = {
+      name: holeElement.name,
+      type: holeElement.type,
+      value: "",
+      children: [],
+      attributes: {
+        ...holeElement.attributes,
+        class: "pcb-solder-mask",
+        fill: solderMaskColor,
+        "data-type": "pcb_soldermask",
+        x: (x - maskWidth / 2).toString(),
+        y: (y - maskHeight / 2).toString(),
+        width: maskWidth.toString(),
+        height: maskHeight.toString()
       }
-    ];
+    };
+    return [holeElement, maskElement];
   }
   if (hole.hole_shape === "pill") {
     const scaledWidth = hole.hole_width * Math.abs(transform.a);
@@ -3055,21 +3246,50 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
       // Vertical pill (taller than wide)
       `M${x - radius},${y - straightLength / 2} v${straightLength} a${radius},${radius} 0 0 0 ${scaledWidth},0 v-${straightLength} a${radius},${radius} 0 0 0 -${scaledWidth},0 z`
     );
-    return [
-      {
-        name: "path",
-        type: "element",
-        attributes: {
-          class: "pcb-hole",
-          fill: colorMap2.drill,
-          d: pathD,
-          "data-type": "pcb_hole",
-          "data-pcb-layer": "drill"
-        },
-        children: [],
-        value: ""
+    const holeElement = {
+      name: "path",
+      type: "element",
+      attributes: {
+        class: "pcb-hole",
+        fill: colorMap2.drill,
+        d: pathD,
+        "data-type": "pcb_hole",
+        "data-pcb-layer": "drill"
+      },
+      children: [],
+      value: ""
+    };
+    if (!shouldShowSolderMask) {
+      return [holeElement];
+    }
+    const maskWidth = scaledWidth + 2 * soldermaskMargin;
+    const maskHeight = scaledHeight + 2 * soldermaskMargin;
+    const maskIsHorizontal = maskWidth > maskHeight;
+    const maskRadius = Math.min(maskWidth, maskHeight) / 2;
+    const maskStraightLength = Math.abs(
+      maskIsHorizontal ? maskWidth - maskHeight : maskHeight - maskWidth
+    );
+    const maskPathD = maskIsHorizontal ? (
+      // Horizontal pill (wider than tall)
+      `M${x - maskStraightLength / 2},${y - maskRadius} h${maskStraightLength} a${maskRadius},${maskRadius} 0 0 1 0,${maskHeight} h-${maskStraightLength} a${maskRadius},${maskRadius} 0 0 1 0,-${maskHeight} z`
+    ) : (
+      // Vertical pill (taller than wide)
+      `M${x - maskRadius},${y - maskStraightLength / 2} v${maskStraightLength} a${maskRadius},${maskRadius} 0 0 0 ${maskWidth},0 v-${maskStraightLength} a${maskRadius},${maskRadius} 0 0 0 -${maskWidth},0 z`
+    );
+    const maskElement = {
+      name: holeElement.name,
+      type: holeElement.type,
+      value: "",
+      children: [],
+      attributes: {
+        ...holeElement.attributes,
+        class: "pcb-solder-mask",
+        fill: solderMaskColor,
+        "data-type": "pcb_soldermask",
+        d: maskPathD
       }
-    ];
+    };
+    return [holeElement, maskElement];
   }
   if (hole.hole_shape === "rotated_pill") {
     const scaledWidth = hole.hole_width * Math.abs(transform.a);
@@ -3087,22 +3307,51 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
       // Vertical pill (taller than wide)
       `M${-radius},${-straightLength / 2} v${straightLength} a${radius},${radius} 0 0 0 ${scaledWidth},0 v-${straightLength} a${radius},${radius} 0 0 0 -${scaledWidth},0 z`
     );
-    return [
-      {
-        name: "path",
-        type: "element",
-        attributes: {
-          class: "pcb-hole",
-          fill: colorMap2.drill,
-          d: pathD,
-          transform: `translate(${x} ${y}) rotate(${-rotation})`,
-          "data-type": "pcb_hole",
-          "data-pcb-layer": "drill"
-        },
-        children: [],
-        value: ""
+    const holeElement = {
+      name: "path",
+      type: "element",
+      attributes: {
+        class: "pcb-hole",
+        fill: colorMap2.drill,
+        d: pathD,
+        transform: `translate(${x} ${y}) rotate(${-rotation})`,
+        "data-type": "pcb_hole",
+        "data-pcb-layer": "drill"
+      },
+      children: [],
+      value: ""
+    };
+    if (!shouldShowSolderMask) {
+      return [holeElement];
+    }
+    const maskWidth = scaledWidth + 2 * soldermaskMargin;
+    const maskHeight = scaledHeight + 2 * soldermaskMargin;
+    const maskIsHorizontal = maskWidth > maskHeight;
+    const maskRadius = Math.min(maskWidth, maskHeight) / 2;
+    const maskStraightLength = Math.abs(
+      maskIsHorizontal ? maskWidth - maskHeight : maskHeight - maskWidth
+    );
+    const maskPathD = maskIsHorizontal ? (
+      // Horizontal pill (wider than tall)
+      `M${-maskStraightLength / 2},${-maskRadius} h${maskStraightLength} a${maskRadius},${maskRadius} 0 0 1 0,${maskHeight} h-${maskStraightLength} a${maskRadius},${maskRadius} 0 0 1 0,-${maskHeight} z`
+    ) : (
+      // Vertical pill (taller than wide)
+      `M${-maskRadius},${-maskStraightLength / 2} v${maskStraightLength} a${maskRadius},${maskRadius} 0 0 0 ${maskWidth},0 v-${maskStraightLength} a${maskRadius},${maskRadius} 0 0 0 -${maskWidth},0 z`
+    );
+    const maskElement = {
+      name: holeElement.name,
+      type: holeElement.type,
+      value: "",
+      children: [],
+      attributes: {
+        ...holeElement.attributes,
+        class: "pcb-solder-mask",
+        fill: solderMaskColor,
+        "data-type": "pcb_soldermask",
+        d: maskPathD
       }
-    ];
+    };
+    return [holeElement, maskElement];
   }
   return [];
 }
@@ -3241,23 +3490,34 @@ function createSvgObjectsFromPcbCutout(cutout, ctx) {
     const scaledWidth = rectCutout.width * Math.abs(transform.a);
     const scaledHeight = rectCutout.height * Math.abs(transform.d);
     const svgRotation = -(rectCutout.rotation ?? 0);
+    const { corner_radius } = rectCutout;
+    const baseCornerRadius = typeof corner_radius === "number" && corner_radius > 0 ? corner_radius : 0;
+    const transformedCornerRadiusX = baseCornerRadius * Math.abs(transform.a);
+    const transformedCornerRadiusY = baseCornerRadius * Math.abs(transform.d);
+    const attributes = {
+      class: "pcb-cutout pcb-cutout-rect",
+      x: (-scaledWidth / 2).toString(),
+      y: (-scaledHeight / 2).toString(),
+      width: scaledWidth.toString(),
+      height: scaledHeight.toString(),
+      fill: colorMap2.drill,
+      transform: matrixToString6(
+        compose3(translate3(cx, cy), rotate3(svgRotation * Math.PI / 180))
+      ),
+      "data-type": "pcb_cutout",
+      "data-pcb-layer": "drill"
+    };
+    if (transformedCornerRadiusX > 0) {
+      attributes.rx = transformedCornerRadiusX.toString();
+    }
+    if (transformedCornerRadiusY > 0) {
+      attributes.ry = transformedCornerRadiusY.toString();
+    }
     return [
       {
         name: "rect",
         type: "element",
-        attributes: {
-          class: "pcb-cutout pcb-cutout-rect",
-          x: (-scaledWidth / 2).toString(),
-          y: (-scaledHeight / 2).toString(),
-          width: scaledWidth.toString(),
-          height: scaledHeight.toString(),
-          fill: colorMap2.drill,
-          transform: matrixToString6(
-            compose3(translate3(cx, cy), rotate3(svgRotation * Math.PI / 180))
-          ),
-          "data-type": "pcb_cutout",
-          "data-pcb-layer": "drill"
-        },
+        attributes,
         children: [],
         value: ""
       }
@@ -4030,7 +4290,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.271",
+  version: "0.0.273",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -4054,7 +4314,7 @@ var package_default = {
     "bun-match-svg": "^0.0.12",
     esbuild: "^0.20.2",
     "performance-now": "^2.1.0",
-    "circuit-json": "^0.0.316",
+    "circuit-json": "^0.0.317",
     react: "19.1.0",
     "react-cosmos": "7.0.0",
     "react-cosmos-plugin-vite": "7.0.0",