circuit-to-svg 0.0.270 → 0.0.272

package/dist/index.js

@@ -2552,6 +2552,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
   const isCoveredWithSolderMask = Boolean(pad?.is_covered_with_solder_mask);
   const shouldshowSolderMask = showSolderMask && isCoveredWithSolderMask;
   const solderMaskColor = colorMap2.soldermask[pad.layer] ?? colorMap2.soldermask.top;
+  const soldermaskMargin = (pad.soldermask_margin ?? 0) * Math.abs(transform.a);
   if (pad.shape === "rect" || pad.shape === "rotated_rect") {
     const width = pad.width * Math.abs(transform.a);
     const height = pad.height * Math.abs(transform.d);
@@ -2583,6 +2584,9 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
       if (!shouldshowSolderMask) {
         return [padElement2];
       }
+      const maskWidth2 = width + 2 * soldermaskMargin;
+      const maskHeight2 = height + 2 * soldermaskMargin;
+      const maskBorderRadius2 = scaledBorderRadius ? scaledBorderRadius + soldermaskMargin : 0;
       const maskElement2 = {
         name: padElement2.name,
         type: padElement2.type,
@@ -2592,7 +2596,15 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
           ...padElement2.attributes,
           class: "pcb-solder-mask",
           fill: solderMaskColor,
-          "data-type": "pcb_soldermask"
+          "data-type": "pcb_soldermask",
+          x: (-maskWidth2 / 2).toString(),
+          y: (-maskHeight2 / 2).toString(),
+          width: maskWidth2.toString(),
+          height: maskHeight2.toString(),
+          ...maskBorderRadius2 > 0 ? {
+            rx: maskBorderRadius2.toString(),
+            ry: maskBorderRadius2.toString()
+          } : {}
         }
       };
       return [padElement2, maskElement2];
@@ -2620,6 +2632,9 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
     if (!shouldshowSolderMask) {
       return [padElement];
     }
+    const maskWidth = width + 2 * soldermaskMargin;
+    const maskHeight = height + 2 * soldermaskMargin;
+    const maskBorderRadius = scaledBorderRadius ? scaledBorderRadius + soldermaskMargin : 0;
     const maskElement = {
       name: padElement.name,
       type: padElement.type,
@@ -2629,7 +2644,15 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         ...padElement.attributes,
         class: "pcb-solder-mask",
         fill: solderMaskColor,
-        "data-type": "pcb_soldermask"
+        "data-type": "pcb_soldermask",
+        x: (x - maskWidth / 2).toString(),
+        y: (y - maskHeight / 2).toString(),
+        width: maskWidth.toString(),
+        height: maskHeight.toString(),
+        ...maskBorderRadius > 0 ? {
+          rx: maskBorderRadius.toString(),
+          ry: maskBorderRadius.toString()
+        } : {}
       }
     };
     return [padElement, maskElement];
@@ -2660,6 +2683,9 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
     if (!shouldshowSolderMask) {
       return [padElement];
     }
+    const maskWidth = width + 2 * soldermaskMargin;
+    const maskHeight = height + 2 * soldermaskMargin;
+    const maskRadius = radius + soldermaskMargin;
     const maskElement = {
       name: padElement.name,
       type: padElement.type,
@@ -2669,7 +2695,13 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         ...padElement.attributes,
         class: "pcb-solder-mask",
         fill: solderMaskColor,
-        "data-type": "pcb_soldermask"
+        "data-type": "pcb_soldermask",
+        x: (x - maskWidth / 2).toString(),
+        y: (y - maskHeight / 2).toString(),
+        width: maskWidth.toString(),
+        height: maskHeight.toString(),
+        rx: maskRadius.toString(),
+        ry: maskRadius.toString()
       }
     };
     return [padElement, maskElement];
@@ -2695,6 +2727,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
     if (!shouldshowSolderMask) {
       return [padElement];
     }
+    const maskRadius = radius + soldermaskMargin;
     const maskElement = {
       name: padElement.name,
       type: padElement.type,
@@ -2704,7 +2737,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         ...padElement.attributes,
         class: "pcb-solder-mask",
         fill: solderMaskColor,
-        "data-type": "pcb_soldermask"
+        "data-type": "pcb_soldermask",
+        r: maskRadius.toString()
       }
     };
     return [padElement, maskElement];
@@ -2729,6 +2763,23 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
     if (!shouldshowSolderMask) {
       return [padElement];
     }
+    let maskPoints = points;
+    if (soldermaskMargin !== 0) {
+      const centroidX = points.reduce((sum, p) => sum + p[0], 0) / points.length;
+      const centroidY = points.reduce((sum, p) => sum + p[1], 0) / points.length;
+      maskPoints = points.map(([px, py]) => {
+        const dx = px - centroidX;
+        const dy = py - centroidY;
+        const distance3 = Math.sqrt(dx * dx + dy * dy);
+        if (distance3 === 0) return [px, py];
+        const normalizedDx = dx / distance3;
+        const normalizedDy = dy / distance3;
+        return [
+          px + normalizedDx * soldermaskMargin,
+          py + normalizedDy * soldermaskMargin
+        ];
+      });
+    }
     const maskElement = {
       name: padElement.name,
       type: padElement.type,
@@ -2738,7 +2789,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         ...padElement.attributes,
         class: "pcb-solder-mask",
         fill: solderMaskColor,
-        "data-type": "pcb_soldermask"
+        "data-type": "pcb_soldermask",
+        points: maskPoints.map((p) => p.join(",")).join(" ")
       }
     };
     return [padElement, maskElement];
@@ -2804,10 +2856,25 @@ function createSvgObjectsFromPcbPanel(pcbPanel, ctx) {
   const { transform, colorMap: colorMap2, showSolderMask } = ctx;
   const width = Number(pcbPanel.width);
   const height = Number(pcbPanel.height);
-  const topLeft = applyToPoint22(transform, [0, 0]);
-  const topRight = applyToPoint22(transform, [width, 0]);
-  const bottomRight = applyToPoint22(transform, [width, height]);
-  const bottomLeft = applyToPoint22(transform, [0, height]);
+  const center = pcbPanel.center ?? { x: width / 2, y: height / 2 };
+  const halfWidth = width / 2;
+  const halfHeight = height / 2;
+  const topLeft = applyToPoint22(transform, [
+    center.x - halfWidth,
+    center.y - halfHeight
+  ]);
+  const topRight = applyToPoint22(transform, [
+    center.x + halfWidth,
+    center.y - halfHeight
+  ]);
+  const bottomRight = applyToPoint22(transform, [
+    center.x + halfWidth,
+    center.y + halfHeight
+  ]);
+  const bottomLeft = applyToPoint22(transform, [
+    center.x - halfWidth,
+    center.y + halfHeight
+  ]);
   const path = `M ${topLeft[0]} ${topLeft[1]} L ${topRight[0]} ${topRight[1]} L ${bottomRight[0]} ${bottomRight[1]} L ${bottomLeft[0]} ${bottomLeft[1]} Z`;
   const isCoveredWithSolderMask = pcbPanel.covered_with_solder_mask !== false;
   const shouldshowSolderMask = Boolean(
@@ -3963,7 +4030,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.269",
+  version: "0.0.271",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -3987,7 +4054,7 @@ var package_default = {
     "bun-match-svg": "^0.0.12",
     esbuild: "^0.20.2",
     "performance-now": "^2.1.0",
-    "circuit-json": "^0.0.315",
+    "circuit-json": "^0.0.316",
     react: "19.1.0",
     "react-cosmos": "7.0.0",
     "react-cosmos-plugin-vite": "7.0.0",
@@ -4184,7 +4251,7 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
       if (width === void 0 || height === void 0) {
         continue;
       }
-      const center = { x: width / 2, y: height / 2 };
+      const center = panel.center ?? { x: width / 2, y: height / 2 };
       updateBounds(center, width, height);
     } else if (circuitJsonElm.type === "pcb_board") {
       if (circuitJsonElm.outline && Array.isArray(circuitJsonElm.outline) && circuitJsonElm.outline.length >= 3) {
@@ -11291,7 +11358,8 @@ function convertCircuitJsonToSolderPasteMask(circuitJson, options) {
       const width = distance2.parse(panel.width);
       const height = distance2.parse(panel.height);
       if (width !== void 0 && height !== void 0) {
-        updateBounds({ x: width / 2, y: height / 2 }, width, height);
+        const center = panel.center ?? { x: width / 2, y: height / 2 };
+        updateBounds(center, width, height);
       }
     } else if (item.type === "pcb_solder_paste" && "x" in item && "y" in item) {
       updateBounds({ x: item.x, y: item.y }, 0, 0);