circuit-to-svg 0.0.279 → 0.0.281

package/dist/index.js

@@ -1582,7 +1582,8 @@ import { applyToPoint as applyToPoint12 } from "transformation-matrix";
 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 layer = Array.isArray(hole.layers) && hole.layers[0] || hole.layer || "top";
+  const maskLayer = layer;
   const isCoveredWithSolderMask = Boolean(hole.is_covered_with_solder_mask);
   const soldermaskMargin = (hole.soldermask_margin ?? 0) * Math.abs(transform.a);
   const shouldShowSolderMask = showSolderMask && isCoveredWithSolderMask && soldermaskMargin !== 0;
@@ -1620,7 +1621,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
           d: createPillPath(scaledOuterWidth, scaledOuterHeight),
           transform: outerTransform,
           "data-type": "pcb_plated_hole",
-          "data-pcb-layer": copperLayer
+          "data-pcb-layer": layer
         },
         value: "",
         children: []
@@ -1656,7 +1657,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               d: createPillPath(scaledOuterWidth, scaledOuterHeight),
               transform: outerTransform,
               "data-type": "pcb_plated_hole",
-              "data-pcb-layer": copperLayer
+              "data-pcb-layer": layer
             },
             value: "",
             children: []
@@ -1670,7 +1671,8 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               fill: colorMap2.copper.top,
               d: createPillPath(maskWidth, maskHeight),
               transform: outerTransform,
-              "data-type": "pcb_soldermask"
+              "data-type": "pcb_soldermask",
+              "data-pcb-layer": maskLayer
             },
             value: "",
             children: []
@@ -1689,7 +1691,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             d: createPillPath(maskWidth, maskHeight),
             transform: outerTransform,
             "data-type": "pcb_soldermask_opening",
-            "data-pcb-layer": "soldermask-top"
+            "data-pcb-layer": maskLayer
           },
           value: "",
           children: []
@@ -1730,7 +1732,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
           ry: (scaledOuterHeight / 2).toString(),
           transform: transformStr,
           "data-type": "pcb_plated_hole",
-          "data-pcb-layer": copperLayer
+          "data-pcb-layer": layer
         },
         value: "",
         children: []
@@ -1785,7 +1787,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
           cy: y.toString(),
           r: outerRadius.toString(),
           "data-type": "pcb_plated_hole",
-          "data-pcb-layer": copperLayer
+          "data-pcb-layer": layer
         },
         value: "",
         children: []
@@ -1821,7 +1823,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               cy: y.toString(),
               r: outerRadius.toString(),
               "data-type": "pcb_plated_hole",
-              "data-pcb-layer": copperLayer
+              "data-pcb-layer": layer
             },
             value: "",
             children: []
@@ -1836,7 +1838,8 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               cx: x.toString(),
               cy: y.toString(),
               r: maskRadius.toString(),
-              "data-type": "pcb_soldermask"
+              "data-type": "pcb_soldermask",
+              "data-pcb-layer": maskLayer
             },
             value: "",
             children: []
@@ -1856,7 +1859,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             cy: y.toString(),
             r: maskRadius.toString(),
             "data-type": "pcb_soldermask_opening",
-            "data-pcb-layer": "soldermask-top"
+            "data-pcb-layer": maskLayer
           },
           value: "",
           children: []
@@ -1904,7 +1907,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             ry: scaledRectBorderRadius.toString()
           } : {},
           "data-type": "pcb_plated_hole",
-          "data-pcb-layer": copperLayer
+          "data-pcb-layer": layer
         },
         value: "",
         children: []
@@ -1948,7 +1951,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
                 ry: scaledRectBorderRadius.toString()
               } : {},
               "data-type": "pcb_plated_hole",
-              "data-pcb-layer": copperLayer
+              "data-pcb-layer": layer
             },
             value: "",
             children: []
@@ -1968,7 +1971,8 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
                 rx: maskBorderRadius.toString(),
                 ry: maskBorderRadius.toString()
               } : {},
-              "data-type": "pcb_soldermask"
+              "data-type": "pcb_soldermask",
+              "data-pcb-layer": maskLayer
             },
             value: "",
             children: []
@@ -1993,7 +1997,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               ry: maskBorderRadius.toString()
             } : {},
             "data-type": "pcb_soldermask_opening",
-            "data-pcb-layer": "soldermask-top"
+            "data-pcb-layer": maskLayer
           },
           value: "",
           children: []
@@ -2045,7 +2049,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             ry: scaledRectBorderRadius.toString()
           } : {},
           "data-type": "pcb_plated_hole",
-          "data-pcb-layer": copperLayer
+          "data-pcb-layer": layer
         },
         value: "",
         children: []
@@ -2092,7 +2096,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
                 ry: scaledRectBorderRadius.toString()
               } : {},
               "data-type": "pcb_plated_hole",
-              "data-pcb-layer": copperLayer
+              "data-pcb-layer": layer
             },
             value: "",
             children: []
@@ -2112,7 +2116,8 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
                 rx: maskBorderRadius.toString(),
                 ry: maskBorderRadius.toString()
               } : {},
-              "data-type": "pcb_soldermask"
+              "data-type": "pcb_soldermask",
+              "data-pcb-layer": maskLayer
             },
             value: "",
             children: []
@@ -2137,7 +2142,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               ry: maskBorderRadius.toString()
             } : {},
             "data-type": "pcb_soldermask_opening",
-            "data-pcb-layer": "soldermask-top"
+            "data-pcb-layer": maskLayer
           },
           value: "",
           children: []
@@ -2189,7 +2194,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             ry: scaledRectBorderRadius.toString()
           } : {},
           "data-type": "pcb_plated_hole",
-          "data-pcb-layer": copperLayer
+          "data-pcb-layer": layer
         },
         value: "",
         children: []
@@ -2237,7 +2242,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
                 ry: scaledRectBorderRadius.toString()
               } : {},
               "data-type": "pcb_plated_hole",
-              "data-pcb-layer": copperLayer
+              "data-pcb-layer": layer
             },
             value: "",
             children: []
@@ -2258,7 +2263,8 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
                 rx: maskBorderRadius.toString(),
                 ry: maskBorderRadius.toString()
               } : {},
-              "data-type": "pcb_soldermask"
+              "data-type": "pcb_soldermask",
+              "data-pcb-layer": maskLayer
             },
             value: "",
             children: []
@@ -2283,7 +2289,8 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               rx: maskBorderRadius.toString(),
               ry: maskBorderRadius.toString()
             } : {},
-            "data-type": "pcb_soldermask"
+            "data-type": "pcb_soldermask",
+            "data-pcb-layer": maskLayer
           },
           value: "",
           children: []
@@ -2408,7 +2415,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               fill: colorMap2.copper.top,
               points: padPointsString,
               "data-type": "pcb_plated_hole",
-              "data-pcb-layer": copperLayer
+              "data-pcb-layer": layer
             },
             value: "",
             children: []
@@ -2838,7 +2845,11 @@ var DEFAULT_PCB_COLOR_MAP = {
   },
   soldermask: {
     top: "rgb(12, 55, 33)",
-    bottom: "rgb(52, 87, 136)"
+    bottom: "rgb(12, 55, 33)"
+  },
+  soldermaskOverCopper: {
+    top: "rgb(52, 135, 73)",
+    bottom: "rgb(52, 135, 73)"
   },
   substrate: "rgb(201, 162, 110)",
   // FR4 substrate color (tan/beige)
@@ -2886,29 +2897,12 @@ function createSvgObjectsFromPcbTrace(trace, ctx) {
     const layer = "layer" in start ? start.layer : "layer" in end ? end.layer : null;
     if (!layer) continue;
     if (layerFilter && layer !== layerFilter) continue;
+    const maskLayer = layer;
     const copperColor = layerNameToColor(layer, colorMap2);
     const maskColor = colorMap2.soldermaskWithCopperUnderneath[layer];
     const traceWidth = "width" in start ? start.width : "width" in end ? end.width : null;
     const width = traceWidth ? (traceWidth * Math.abs(transform.a)).toString() : "0.3";
     if (showSolderMask) {
-      const copperObject = {
-        name: "path",
-        type: "element",
-        value: "",
-        children: [],
-        attributes: {
-          class: "pcb-trace",
-          stroke: copperColor,
-          fill: "none",
-          d: `M ${startPoint[0]} ${startPoint[1]} L ${endPoint[0]} ${endPoint[1]}`,
-          "stroke-width": width,
-          "stroke-linecap": "round",
-          "stroke-linejoin": "round",
-          "shape-rendering": "crispEdges",
-          "data-type": "pcb_trace",
-          "data-pcb-layer": layer
-        }
-      };
       const maskObject = {
         name: "path",
         type: "element",
@@ -2923,11 +2917,11 @@ function createSvgObjectsFromPcbTrace(trace, ctx) {
           "stroke-linecap": "round",
           "stroke-linejoin": "round",
           "shape-rendering": "crispEdges",
-          "data-type": "pcb_soldermask",
+          "data-type": "pcb_trace_soldermask",
           "data-pcb-layer": layer
         }
       };
-      svgObjects.push(maskObject, copperObject);
+      svgObjects.push(maskObject);
     } else {
       const maskOnlyObject = {
         name: "path",
@@ -2959,7 +2953,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
   const { transform, layer: layerFilter, colorMap: colorMap2, showSolderMask } = ctx;
   if (layerFilter && pad.layer !== layerFilter) return [];
   const isCoveredWithSolderMask = Boolean(pad?.is_covered_with_solder_mask);
-  const shouldshowSolderMask = showSolderMask && isCoveredWithSolderMask;
+  const shouldShowSolderMask = showSolderMask && isCoveredWithSolderMask;
   const soldermaskWithCopperUnderneathColor = colorMap2.soldermaskWithCopperUnderneath[pad.layer] ?? colorMap2.soldermaskWithCopperUnderneath.top;
   const soldermaskMargin = (pad.soldermask_margin ?? 0) * Math.abs(transform.a);
   if (pad.shape === "rect" || pad.shape === "rotated_rect") {
@@ -2990,7 +2984,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
           } : {}
         }
       };
-      if (!shouldshowSolderMask) {
+      if (!shouldShowSolderMask) {
         return [padElement2];
       }
       const maskWidth2 = width + 2 * soldermaskMargin;
@@ -3083,7 +3077,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
             ry: maskBorderRadius2.toString()
           } : {},
           "data-type": "pcb_soldermask_opening",
-          "data-pcb-layer": `soldermask-${pad.layer}`
+          "data-pcb-layer": pad.layer
         }
       };
       return [substrateElement2, padElement2];
@@ -3108,7 +3102,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         } : {}
       }
     };
-    if (!shouldshowSolderMask) {
+    if (!shouldShowSolderMask) {
       return [padElement];
     }
     const maskWidth = width + 2 * soldermaskMargin;
@@ -3197,7 +3191,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
           ry: maskBorderRadius.toString()
         } : {},
         "data-type": "pcb_soldermask_opening",
-        "data-pcb-layer": `soldermask-${pad.layer}`
+        "data-pcb-layer": pad.layer
       }
     };
     return [substrateElement, padElement];
@@ -3225,7 +3219,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         "data-pcb-layer": pad.layer
       }
     };
-    if (!shouldshowSolderMask) {
+    if (!shouldShowSolderMask) {
       return [padElement];
     }
     const maskWidth = width + 2 * soldermaskMargin;
@@ -3306,7 +3300,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         rx: maskRadius.toString(),
         ry: maskRadius.toString(),
         "data-type": "pcb_soldermask_opening",
-        "data-pcb-layer": `soldermask-${pad.layer}`
+        "data-pcb-layer": pad.layer
       }
     };
     return [substrateElement, padElement];
@@ -3329,7 +3323,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         "data-pcb-layer": pad.layer
       }
     };
-    if (!shouldshowSolderMask) {
+    if (!shouldShowSolderMask) {
       return [padElement];
     }
     const maskRadius = radius + soldermaskMargin;
@@ -3396,7 +3390,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         cy: y.toString(),
         r: maskRadius.toString(),
         "data-type": "pcb_soldermask_opening",
-        "data-pcb-layer": `soldermask-${pad.layer}`
+        "data-pcb-layer": pad.layer
       }
     };
     return [substrateElement, padElement];
@@ -3418,7 +3412,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         "data-pcb-layer": pad.layer
       }
     };
-    if (!shouldshowSolderMask) {
+    if (!shouldShowSolderMask) {
       return [padElement];
     }
     let maskPoints = points;
@@ -3493,7 +3487,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         fill: colorMap2.substrate,
         points: maskPoints.map((p) => p.join(",")).join(" "),
         "data-type": "pcb_soldermask_opening",
-        "data-pcb-layer": `soldermask-${pad.layer}`
+        "data-pcb-layer": pad.layer
       }
     };
     return [substrateElement, padElement];
@@ -3536,6 +3530,8 @@ function createSvgObjectsFromPcbBoard(pcbBoard, ctx) {
   path += " Z";
   const svgObjects = [];
   if (showSolderMask) {
+    const layer = ctx.layer ?? "top";
+    const maskLayer = layer === "bottom" ? "soldermask-bottom" : "soldermask-top";
     svgObjects.push({
       name: "path",
       type: "element",
@@ -3548,7 +3544,7 @@ function createSvgObjectsFromPcbBoard(pcbBoard, ctx) {
         "fill-opacity": "0.8",
         stroke: "none",
         "data-type": "pcb_soldermask",
-        "data-pcb-layer": "soldermask-top"
+        "data-pcb-layer": maskLayer
       }
     });
   }
@@ -3597,7 +3593,7 @@ function createSvgObjectsFromPcbPanel(pcbPanel, ctx) {
   ]);
   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(
+  const shouldShowSolderMask = Boolean(
     showSolderMask && isCoveredWithSolderMask
   );
   return [
@@ -3672,6 +3668,7 @@ function createSvgObjectsFromPcbVia(hole, ctx) {
 import { applyToPoint as applyToPoint24 } from "transformation-matrix";
 function createSvgObjectsFromPcbHole(hole, ctx) {
   const { transform, colorMap: colorMap2, showSolderMask } = ctx;
+  const layer = ctx.layer ?? "top";
   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);
@@ -3727,7 +3724,8 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
             cx: x.toString(),
             cy: y.toString(),
             r: maskRadius.toString(),
-            "data-type": "pcb_soldermask"
+            "data-type": "pcb_soldermask",
+            "data-pcb-layer": "drill"
           }
         };
         return [coveredElement, exposedElement];
@@ -3744,7 +3742,7 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
           cy: y.toString(),
           r: maskRadius.toString(),
           "data-type": "pcb_soldermask_opening",
-          "data-pcb-layer": "soldermask-top"
+          "data-pcb-layer": layer
         }
       };
       return [substrateElement2, holeElement2];
@@ -3798,7 +3796,8 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
           y: (y - maskDiameter / 2).toString(),
           width: maskDiameter.toString(),
           height: maskDiameter.toString(),
-          "data-type": "pcb_soldermask"
+          "data-type": "pcb_soldermask",
+          "data-pcb-layer": "drill"
         }
       };
       return [coveredElement, exposedElement];
@@ -3816,7 +3815,7 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
         width: maskDiameter.toString(),
         height: maskDiameter.toString(),
         "data-type": "pcb_soldermask_opening",
-        "data-pcb-layer": "soldermask-top"
+        "data-pcb-layer": layer
       }
     };
     return [substrateElement, holeElement];
@@ -3876,7 +3875,8 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
           cy: y.toString(),
           rx: maskRx.toString(),
           ry: maskRy.toString(),
-          "data-type": "pcb_soldermask"
+          "data-type": "pcb_soldermask",
+          "data-pcb-layer": "drill"
         }
       };
       return [coveredElement, exposedElement];
@@ -3894,7 +3894,7 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
         rx: maskRx.toString(),
         ry: maskRy.toString(),
         "data-type": "pcb_soldermask_opening",
-        "data-pcb-layer": "soldermask-top"
+        "data-pcb-layer": layer
       }
     };
     return [substrateElement, holeElement];
@@ -3952,7 +3952,8 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
           y: (y - maskHeight / 2).toString(),
           width: maskWidth.toString(),
           height: maskHeight.toString(),
-          "data-type": "pcb_soldermask"
+          "data-type": "pcb_soldermask",
+          "data-pcb-layer": "drill"
         }
       };
       return [coveredElement, exposedElement];
@@ -3970,7 +3971,7 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
         width: maskWidth.toString(),
         height: maskHeight.toString(),
         "data-type": "pcb_soldermask_opening",
-        "data-pcb-layer": "soldermask-top"
+        "data-pcb-layer": layer
       }
     };
     return [substrateElement, holeElement];
@@ -4043,7 +4044,8 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
           class: "pcb-hole-exposed",
           fill: colorMap2.drill,
           d: maskPathD,
-          "data-type": "pcb_soldermask"
+          "data-type": "pcb_soldermask",
+          "data-pcb-layer": "drill"
         }
       };
       return [coveredElement, exposedElement];
@@ -4058,7 +4060,7 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
         fill: colorMap2.substrate,
         d: maskPathD,
         "data-type": "pcb_soldermask_opening",
-        "data-pcb-layer": "soldermask-top"
+        "data-pcb-layer": layer
       }
     };
     return [substrateElement, holeElement];
@@ -4135,7 +4137,8 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
           fill: colorMap2.drill,
           d: maskPathD,
           transform: `translate(${x} ${y}) rotate(${-rotation})`,
-          "data-type": "pcb_soldermask"
+          "data-type": "pcb_soldermask",
+          "data-pcb-layer": "drill"
         }
       };
       return [coveredElement, exposedElement];
@@ -4150,7 +4153,7 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
         fill: colorMap2.substrate,
         d: maskPathD,
         "data-type": "pcb_soldermask_opening",
-        "data-pcb-layer": "soldermask-top"
+        "data-pcb-layer": layer
       }
     };
     return [substrateElement, holeElement];
@@ -4415,40 +4418,118 @@ function ringToPathD(vertices, transform) {
   return d;
 }
 
+// lib/pcb/svg-object-fns/create-soldermask-cutout-element.ts
+function createSoldermaskCutoutElement({
+  elementType,
+  shapeAttributes,
+  layer,
+  colorMap: colorMap2,
+  additionalAttributes
+}) {
+  const baseAttributes = {
+    class: "pcb-soldermask-cutout",
+    fill: colorMap2.substrate,
+    "data-type": "pcb_soldermask_opening",
+    "data-pcb-layer": layer,
+    ...shapeAttributes,
+    ...additionalAttributes
+  };
+  return {
+    name: elementType,
+    type: "element",
+    value: "",
+    children: [],
+    attributes: baseAttributes
+  };
+}
+
+// lib/pcb/svg-object-fns/create-soldermask-overlay-element.ts
+function createSoldermaskOverlayElement({
+  elementType,
+  shapeAttributes,
+  layer,
+  fillColor,
+  fillOpacity,
+  className,
+  additionalAttributes
+}) {
+  const baseAttributes = {
+    class: className,
+    fill: fillColor,
+    "fill-opacity": fillOpacity,
+    "data-type": "pcb_soldermask",
+    "data-pcb-layer": layer,
+    ...shapeAttributes,
+    ...additionalAttributes
+  };
+  return {
+    name: elementType,
+    type: "element",
+    value: "",
+    children: [],
+    attributes: baseAttributes
+  };
+}
+
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-copper-pour.ts
 function createSvgObjectsFromPcbCopperPour(pour, ctx) {
-  const { transform, layer: layerFilter, colorMap: colorMap2 } = ctx;
+  const { transform, layer: layerFilter, colorMap: colorMap2, showSolderMask } = ctx;
   const { layer } = pour;
   if (layerFilter && layer !== layerFilter) return [];
   const color = layerNameToColor(layer, colorMap2);
   const opacity = "0.5";
+  const isCoveredWithSolderMask = pour.covered_with_solder_mask !== false;
+  const maskOverlayColor = layer === "bottom" ? colorMap2.soldermaskOverCopper.bottom : colorMap2.soldermaskOverCopper.top;
+  const maskOverlayOpacity = "0.9";
   if (pour.shape === "rect") {
     const [cx, cy] = applyToPoint28(transform, [pour.center.x, pour.center.y]);
     const scaledWidth = pour.width * Math.abs(transform.a);
     const scaledHeight = pour.height * Math.abs(transform.d);
     const svgRotation = -(pour.rotation ?? 0);
-    return [
-      {
-        name: "rect",
-        type: "element",
-        attributes: {
-          class: "pcb-copper-pour pcb-copper-pour-rect",
-          x: (-scaledWidth / 2).toString(),
-          y: (-scaledHeight / 2).toString(),
-          width: scaledWidth.toString(),
-          height: scaledHeight.toString(),
-          fill: color,
-          "fill-opacity": opacity,
-          transform: matrixToString7(
-            compose4(translate4(cx, cy), rotate4(svgRotation * Math.PI / 180))
-          ),
-          "data-type": "pcb_copper_pour",
-          "data-pcb-layer": layer
-        },
-        children: [],
-        value: ""
+    const rectAttributes = {
+      x: (-scaledWidth / 2).toString(),
+      y: (-scaledHeight / 2).toString(),
+      width: scaledWidth.toString(),
+      height: scaledHeight.toString(),
+      transform: matrixToString7(
+        compose4(translate4(cx, cy), rotate4(svgRotation * Math.PI / 180))
+      )
+    };
+    const copperRect = {
+      name: "rect",
+      type: "element",
+      value: "",
+      children: [],
+      attributes: {
+        class: "pcb-copper-pour pcb-copper-pour-rect",
+        ...rectAttributes,
+        fill: color,
+        "fill-opacity": opacity,
+        "data-type": "pcb_copper_pour",
+        "data-pcb-layer": layer
       }
-    ];
+    };
+    const maskRect = showSolderMask ? isCoveredWithSolderMask ? createSoldermaskOverlayElement({
+      elementType: "rect",
+      shapeAttributes: rectAttributes,
+      layer,
+      fillColor: maskOverlayColor,
+      fillOpacity: maskOverlayOpacity,
+      className: "pcb-soldermask-covered-pour"
+    }) : createSoldermaskCutoutElement({
+      elementType: "rect",
+      shapeAttributes: rectAttributes,
+      layer,
+      colorMap: colorMap2
+    }) : null;
+    if (!maskRect) {
+      return [copperRect];
+    }
+    const isSubstrateOnly = !isCoveredWithSolderMask && pour.pcb_copper_pour_id?.includes("substrate_only");
+    if (isSubstrateOnly) {
+      return [maskRect];
+    }
+    return [copperRect, maskRect];
   }
   if (pour.shape === "polygon") {
     if (!pour.points || pour.points.length === 0) return [];
@@ -4456,22 +4537,41 @@ function createSvgObjectsFromPcbCopperPour(pour, ctx) {
       (p) => applyToPoint28(transform, [p.x, p.y])
     );
     const pointsString = transformedPoints.map((p) => `${p[0]},${p[1]}`).join(" ");
-    return [
-      {
-        name: "polygon",
-        type: "element",
-        attributes: {
-          class: "pcb-copper-pour pcb-copper-pour-polygon",
-          points: pointsString,
-          fill: color,
-          "fill-opacity": opacity,
-          "data-type": "pcb_copper_pour",
-          "data-pcb-layer": layer
-        },
-        children: [],
-        value: ""
+    const copperPolygon = {
+      name: "polygon",
+      type: "element",
+      value: "",
+      children: [],
+      attributes: {
+        class: "pcb-copper-pour pcb-copper-pour-polygon",
+        points: pointsString,
+        fill: color,
+        "fill-opacity": opacity,
+        "data-type": "pcb_copper_pour",
+        "data-pcb-layer": layer
       }
-    ];
+    };
+    const maskPolygon = showSolderMask ? isCoveredWithSolderMask ? createSoldermaskOverlayElement({
+      elementType: "polygon",
+      shapeAttributes: { points: pointsString },
+      layer,
+      fillColor: maskOverlayColor,
+      fillOpacity: maskOverlayOpacity,
+      className: "pcb-soldermask-covered-pour"
+    }) : createSoldermaskCutoutElement({
+      elementType: "polygon",
+      shapeAttributes: { points: pointsString },
+      layer,
+      colorMap: colorMap2
+    }) : null;
+    if (!maskPolygon) {
+      return [copperPolygon];
+    }
+    const isSubstrateOnly = !isCoveredWithSolderMask && pour.pcb_copper_pour_id?.includes("substrate_only");
+    if (isSubstrateOnly) {
+      return [maskPolygon];
+    }
+    return [copperPolygon, maskPolygon];
   }
   if (pour.shape === "brep") {
     const { brep_shape } = pour;
@@ -4479,23 +4579,42 @@ function createSvgObjectsFromPcbCopperPour(pour, ctx) {
     for (const inner_ring of brep_shape.inner_rings ?? []) {
       d += ` ${ringToPathD(inner_ring.vertices, transform)}`;
     }
-    return [
-      {
-        name: "path",
-        type: "element",
-        attributes: {
-          class: "pcb-copper-pour pcb-copper-pour-brep",
-          d,
-          fill: color,
-          "fill-rule": "evenodd",
-          "fill-opacity": opacity,
-          "data-type": "pcb_copper_pour",
-          "data-pcb-layer": layer
-        },
-        children: [],
-        value: ""
+    const copperPath = {
+      name: "path",
+      type: "element",
+      value: "",
+      children: [],
+      attributes: {
+        class: "pcb-copper-pour pcb-copper-pour-brep",
+        d,
+        fill: color,
+        "fill-rule": "evenodd",
+        "fill-opacity": opacity,
+        "data-type": "pcb_copper_pour",
+        "data-pcb-layer": layer
       }
-    ];
+    };
+    const maskPath = showSolderMask ? isCoveredWithSolderMask ? createSoldermaskOverlayElement({
+      elementType: "path",
+      shapeAttributes: { d, "fill-rule": "evenodd" },
+      layer,
+      fillColor: maskOverlayColor,
+      fillOpacity: maskOverlayOpacity,
+      className: "pcb-soldermask-covered-pour"
+    }) : createSoldermaskCutoutElement({
+      elementType: "path",
+      shapeAttributes: { d, "fill-rule": "evenodd" },
+      layer,
+      colorMap: colorMap2
+    }) : null;
+    if (!maskPath) {
+      return [copperPath];
+    }
+    const isSubstrateOnly = !isCoveredWithSolderMask && pour.pcb_copper_pour_id?.includes("substrate_only");
+    if (isSubstrateOnly) {
+      return [maskPath];
+    }
+    return [copperPath, maskPath];
   }
   return [];
 }
@@ -5092,7 +5211,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.278",
+  version: "0.0.280",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -5121,7 +5240,7 @@ var package_default = {
     "react-cosmos": "7.0.0",
     "react-cosmos-plugin-vite": "7.0.0",
     "react-dom": "19.1.0",
-    tscircuit: "^0.0.827",
+    tscircuit: "^0.0.937",
     tsup: "^8.0.2",
     typescript: "^5.4.5",
     "vite-tsconfig-paths": "^5.0.1"
@@ -5148,12 +5267,13 @@ var TYPE_PRIORITY = {
   pcb_hole: 18,
   pcb_plated_hole_drill: 19,
   pcb_plated_hole: 20,
+  pcb_trace_soldermask: 25,
   pcb_trace: 30,
   pcb_smtpad: 30,
   pcb_copper_pour: 35,
   pcb_via: 36,
   pcb_soldermask: 40,
-  pcb_soldermask_opening: 41,
+  pcb_soldermask_opening: 25,
   pcb_solder_paste: 45,
   pcb_silkscreen_text: 50,
   pcb_silkscreen_path: 50,
@@ -5198,13 +5318,13 @@ function getLayerPriority(layer) {
   if (!layer) return 500;
   const normalized = layer.toLowerCase();
   if (normalized === "global") return -100;
-  if (normalized === "bottom") return 0;
+  if (normalized === "bottom") return 4;
   if (normalized === "board") return 2;
   if (normalized === "soldermask-top" || normalized === "soldermask-bottom")
     return 3;
   if (normalized.startsWith("inner")) {
     const match = normalized.match(/\d+/);
-    const layerIndex = match ? parseInt(match[0], 10) : 0;
+    const layerIndex = match ? Number.parseInt(match[0], 10) : 0;
     return 5 + layerIndex;
   }
   if (normalized === "through") return 18;
@@ -5292,6 +5412,10 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
       top: colorOverrides?.soldermask?.top ?? DEFAULT_PCB_COLOR_MAP.soldermask.top,
       bottom: colorOverrides?.soldermask?.bottom ?? DEFAULT_PCB_COLOR_MAP.soldermask.bottom
     },
+    soldermaskOverCopper: {
+      top: colorOverrides?.soldermaskOverCopper?.top ?? DEFAULT_PCB_COLOR_MAP.soldermaskOverCopper.top,
+      bottom: colorOverrides?.soldermaskOverCopper?.bottom ?? DEFAULT_PCB_COLOR_MAP.soldermaskOverCopper.bottom
+    },
     soldermaskWithCopperUnderneath: {
       top: colorOverrides?.soldermaskWithCopperUnderneath?.top ?? DEFAULT_PCB_COLOR_MAP.soldermaskWithCopperUnderneath.top,
       bottom: colorOverrides?.soldermaskWithCopperUnderneath?.bottom ?? DEFAULT_PCB_COLOR_MAP.soldermaskWithCopperUnderneath.bottom
@@ -5441,10 +5565,9 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
     showAnchorOffsets: options?.showAnchorOffsets,
     circuitJson
   };
-  const unsortedSvgObjects = circuitJson.flatMap(
+  let unsortedSvgObjects = circuitJson.flatMap(
     (elm) => createSvgObjects({ elm, circuitJson, ctx })
   );
-  let svgObjects = sortSvgObjectsByPcbLayer(unsortedSvgObjects);
   let strokeWidth = String(0.05 * scaleFactor);
   for (const element of circuitJson) {
     if ("stroke_width" in element) {
@@ -5454,8 +5577,9 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
   }
   if (options?.shouldDrawRatsNest) {
     const ratsNestObjects = createSvgObjectsForRatsNest(circuitJson, ctx);
-    svgObjects = sortSvgObjectsByPcbLayer([...svgObjects, ...ratsNestObjects]);
+    unsortedSvgObjects = [...unsortedSvgObjects, ...ratsNestObjects];
   }
+  const svgObjects = sortSvgObjectsByPcbLayer(unsortedSvgObjects);
   const children = [
     {
       name: "style",