circuit-to-svg 0.0.273 → 0.0.275

package/dist/index.js

@@ -1583,8 +1583,9 @@ function createSvgObjectsFromPcbPlatedHole(hole, 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 isCoveredWithSolderMask = Boolean(hole.is_covered_with_solder_mask);
   const soldermaskMargin = (hole.soldermask_margin ?? 0) * Math.abs(transform.a);
-  const shouldShowSolderMask = showSolderMask && soldermaskMargin !== 0;
+  const shouldShowSolderMask = showSolderMask && isCoveredWithSolderMask && soldermaskMargin !== 0;
   const solderMaskColor = colorMap2.soldermask.top;
   if (hole.shape === "pill") {
     const scaledOuterWidth = hole.outer_width * Math.abs(transform.a);
@@ -3068,8 +3069,9 @@ import { applyToPoint as applyToPoint24 } from "transformation-matrix";
 function createSvgObjectsFromPcbHole(hole, ctx) {
   const { transform, colorMap: colorMap2, showSolderMask } = ctx;
   const [x, y] = applyToPoint24(transform, [hole.x, hole.y]);
+  const isCoveredWithSolderMask = Boolean(hole.is_covered_with_solder_mask);
   const soldermaskMargin = (hole.soldermask_margin ?? 0) * Math.abs(transform.a);
-  const shouldShowSolderMask = showSolderMask && soldermaskMargin !== 0;
+  const shouldShowSolderMask = showSolderMask && isCoveredWithSolderMask && 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);
@@ -3490,23 +3492,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: ""
       }
@@ -4279,7 +4292,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.272",
+  version: "0.0.274",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -4303,7 +4316,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.319",
     react: "19.1.0",
     "react-cosmos": "7.0.0",
     "react-cosmos-plugin-vite": "7.0.0",