circuit-to-svg 0.0.430 → 0.0.431

package/dist/index.js

@@ -8017,7 +8017,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.429",
+  version: "0.0.430",
   repository: {
     type: "git",
     url: "https://github.com/tscircuit/circuit-to-svg.git"
@@ -8172,61 +8172,84 @@ function getTypePriority(type) {
   return TYPE_PRIORITY[type] ?? DEFAULT_TYPE_PRIORITY;
 }
 
-// lib/pcb/create-via-tenting-mask.ts
-function createViaTentingMask({
+// lib/pcb/create-soldermask-opening-masks.ts
+function createSoldermaskOpeningMasks({
   objects,
   layer,
   width,
-  height
+  height,
+  showSolderMask = false
 }) {
   const openings = objects.filter(
     (object) => object.attributes["data-pcb-layer"] === layer && (object.attributes.class === "pcb-pad" || object.attributes.class === "pcb-pad-exposed" || object.attributes["data-type"] === "pcb_soldermask_opening")
   );
   if (openings.length === 0) return null;
   const tenting = objects.filter((object) => object.attributes["data-type"] === "pcb_via").flatMap((object) => object.children).filter((object) => object.attributes.class === "pcb-via-tenting");
-  if (tenting.length === 0) return null;
-  const maskId = `via-tenting-mask-${layer}`;
-  for (const object of tenting) {
-    object.attributes.mask = `url(#${maskId})`;
+  const pours = objects.filter(
+    (object) => showSolderMask && object.attributes["data-pcb-layer"] === layer && (object.attributes["data-type"] === "pcb_copper_pour" || object.attributes.class === "pcb-soldermask-covered-pour")
+  );
+  const padOpenings = openings.filter(
+    (object) => object.attributes.class === "pcb-pad" || object.attributes.class === "pcb-pad-exposed"
+  );
+  const masks = [];
+  for (const { targets, cutouts, maskId } of [
+    {
+      targets: tenting,
+      cutouts: openings,
+      maskId: `via-tenting-mask-${layer}`
+    },
+    {
+      targets: pours,
+      cutouts: padOpenings,
+      maskId: `copper-pour-pad-opening-mask-${layer}`
+    }
+  ]) {
+    if (targets.length === 0 || cutouts.length === 0) continue;
+    for (const object of targets) {
+      object.attributes.mask = `url(#${maskId})`;
+    }
+    masks.push(createOpeningMask(maskId, cutouts, width, height));
   }
+  if (masks.length === 0) return null;
   return {
     name: "defs",
     type: "element",
     value: "",
     attributes: {},
+    children: masks
+  };
+}
+function createOpeningMask(maskId, openings, width, height) {
+  return {
+    name: "mask",
+    type: "element",
+    value: "",
+    attributes: {
+      id: maskId,
+      maskUnits: "userSpaceOnUse",
+      x: "0",
+      y: "0",
+      width: String(width),
+      height: String(height)
+    },
     children: [
       {
-        name: "mask",
+        name: "rect",
         type: "element",
         value: "",
         attributes: {
-          id: maskId,
-          maskUnits: "userSpaceOnUse",
           x: "0",
           y: "0",
           width: String(width),
-          height: String(height)
+          height: String(height),
+          fill: "white"
         },
-        children: [
-          {
-            name: "rect",
-            type: "element",
-            value: "",
-            attributes: {
-              x: "0",
-              y: "0",
-              width: String(width),
-              height: String(height),
-              fill: "white"
-            },
-            children: []
-          },
-          ...openings.map((opening) => ({
-            ...opening,
-            attributes: { ...opening.attributes, fill: "black" }
-          }))
-        ]
-      }
+        children: []
+      },
+      ...openings.map((opening) => ({
+        ...opening,
+        attributes: { ...opening.attributes, fill: "black" }
+      }))
     ]
   };
 }
@@ -9694,14 +9717,15 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
   if (copperPourTraceMaskDefs) {
     children.push(copperPourTraceMaskDefs);
   }
-  const viaTentingMask = createViaTentingMask({
+  const soldermaskOpeningMasks = createSoldermaskOpeningMasks({
+    showSolderMask: ctx.showSolderMask,
     objects: unsortedSvgObjects,
     layer: layer ?? "top",
     width: svgWidth,
     height: svgHeight
   });
-  if (viaTentingMask) {
-    children.push(viaTentingMask);
+  if (soldermaskOpeningMasks) {
+    children.push(soldermaskOpeningMasks);
   }
   children.push({
     name: "rect",