circuit-to-svg 0.0.314 → 0.0.315

package/dist/index.js

@@ -3405,6 +3405,14 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
     const [x, y] = applyToPoint24(transform, [pad.x, pad.y]);
     const cornerRadiusValue = pad.corner_radius ?? pad.rect_border_radius ?? 0;
     const scaledBorderRadius = cornerRadiusValue * Math.abs(transform.a);
+    const m = {
+      left: (pad.soldermask_margin_left ?? pad.soldermask_margin ?? 0) * Math.abs(transform.a),
+      right: (pad.soldermask_margin_right ?? pad.soldermask_margin ?? 0) * Math.abs(transform.a),
+      top: (pad.soldermask_margin_top ?? pad.soldermask_margin ?? 0) * Math.abs(transform.a),
+      bottom: (pad.soldermask_margin_bottom ?? pad.soldermask_margin ?? 0) * Math.abs(transform.a)
+    };
+    const isNegativeMargin = m.left < 0 || m.right < 0 || m.top < 0 || m.bottom < 0;
+    const isZeroMargin = m.left === 0 && m.right === 0 && m.top === 0 && m.bottom === 0;
     if (pad.shape === "rotated_rect" && pad.ccw_rotation) {
       const padElement2 = {
         name: "rect",
@@ -3430,10 +3438,10 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
       if (!shouldShowSolderMask) {
         return [padElement2];
       }
-      const maskWidth2 = width + 2 * soldermaskMargin;
-      const maskHeight2 = height + 2 * soldermaskMargin;
+      const maskWidth2 = width + m.left + m.right;
+      const maskHeight2 = height + m.top + m.bottom;
       const maskBorderRadius2 = scaledBorderRadius ? scaledBorderRadius + soldermaskMargin : 0;
-      if (soldermaskMargin < 0) {
+      if (isNegativeMargin) {
         const coveredPadElement = {
           name: "rect",
           type: "element",
@@ -3463,8 +3471,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
           attributes: {
             class: "pcb-pad-exposed",
             fill: layerNameToColor(pad.layer, colorMap2),
-            x: (-maskWidth2 / 2).toString(),
-            y: (-maskHeight2 / 2).toString(),
+            x: (-width / 2 - m.left).toString(),
+            y: (-height / 2 - m.top).toString(),
             width: maskWidth2.toString(),
             height: maskHeight2.toString(),
             transform: `translate(${x} ${y}) rotate(${-pad.ccw_rotation})`,
@@ -3478,7 +3486,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         };
         return [coveredPadElement, exposedOpeningElement];
       }
-      if (soldermaskMargin === 0) {
+      if (isZeroMargin) {
         const coveredPadElement = {
           name: "rect",
           type: "element",
@@ -3510,8 +3518,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         attributes: {
           class: "pcb-soldermask-cutout",
           fill: colorMap2.substrate,
-          x: (-maskWidth2 / 2).toString(),
-          y: (-maskHeight2 / 2).toString(),
+          x: (-width / 2 - m.left).toString(),
+          y: (-height / 2 - m.top).toString(),
           width: maskWidth2.toString(),
           height: maskHeight2.toString(),
           transform: `translate(${x} ${y}) rotate(${-pad.ccw_rotation})`,
@@ -3548,10 +3556,10 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
     if (!shouldShowSolderMask) {
       return [padElement];
     }
-    const maskWidth = width + 2 * soldermaskMargin;
-    const maskHeight = height + 2 * soldermaskMargin;
+    const maskWidth = width + m.left + m.right;
+    const maskHeight = height + m.top + m.bottom;
     const maskBorderRadius = scaledBorderRadius ? scaledBorderRadius + soldermaskMargin : 0;
-    if (soldermaskMargin < 0) {
+    if (isNegativeMargin) {
       const coveredPadElement = {
         name: "rect",
         type: "element",
@@ -3580,8 +3588,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         attributes: {
           class: "pcb-pad-exposed",
           fill: layerNameToColor(pad.layer, colorMap2),
-          x: (x - maskWidth / 2).toString(),
-          y: (y - maskHeight / 2).toString(),
+          x: (x - width / 2 - m.left).toString(),
+          y: (y - height / 2 - m.top).toString(),
           width: maskWidth.toString(),
           height: maskHeight.toString(),
           "data-type": "pcb_soldermask",
@@ -3594,7 +3602,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
       };
       return [coveredPadElement, exposedOpeningElement];
     }
-    if (soldermaskMargin === 0) {
+    if (isZeroMargin) {
       const coveredPadElement = {
         name: "rect",
         type: "element",
@@ -3625,8 +3633,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
       attributes: {
         class: "pcb-soldermask-cutout",
         fill: colorMap2.substrate,
-        x: (x - maskWidth / 2).toString(),
-        y: (y - maskHeight / 2).toString(),
+        x: (x - width / 2 - m.left).toString(),
+        y: (y - height / 2 - m.top).toString(),
         width: maskWidth.toString(),
         height: maskHeight.toString(),
         ...maskBorderRadius > 0 ? {
@@ -6034,7 +6042,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.313",
+  version: "0.0.314",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -6057,7 +6065,7 @@ var package_default = {
     "@vitejs/plugin-react": "5.0.0",
     biome: "^0.3.3",
     "bun-match-svg": "^0.0.12",
-    "circuit-json": "^0.0.351",
+    "circuit-json": "^0.0.356",
     esbuild: "^0.20.2",
     "performance-now": "^2.1.0",
     react: "19.1.0",