circuit-to-svg 0.0.193 → 0.0.195

package/dist/index.js

@@ -485,11 +485,19 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
     ];
   }
   if (hole.shape === "pill_hole_with_rect_pad") {
-    const scaledRectPadWidth = hole.rect_pad_width * Math.abs(transform.a);
-    const scaledRectPadHeight = hole.rect_pad_height * Math.abs(transform.a);
-    const scaledRectBorderRadius = (hole.rect_border_radius ?? 0) * Math.abs(transform.a);
-    const scaledHoleHeight = hole.hole_height * Math.abs(transform.a);
-    const scaledHoleWidth = hole.hole_width * Math.abs(transform.a);
+    const pillHole = hole;
+    const scaledRectPadWidth = pillHole.rect_pad_width * Math.abs(transform.a);
+    const scaledRectPadHeight = pillHole.rect_pad_height * Math.abs(transform.a);
+    const scaledRectBorderRadius = (pillHole.rect_border_radius ?? 0) * Math.abs(transform.a);
+    const scaledHoleHeight = pillHole.hole_height * Math.abs(transform.a);
+    const scaledHoleWidth = pillHole.hole_width * Math.abs(transform.a);
+    const pillHoleWithOffsets = pillHole;
+    const holeOffsetX = pillHoleWithOffsets.hole_offset_x ?? 0;
+    const holeOffsetY = pillHoleWithOffsets.hole_offset_y ?? 0;
+    const [holeCenterX, holeCenterY] = applyToPoint4(transform, [
+      pillHole.x + holeOffsetX,
+      pillHole.y + holeOffsetY
+    ]);
     const holeRadius = Math.min(scaledHoleHeight, scaledHoleWidth) / 2;
     return [
       {
@@ -522,8 +530,8 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             attributes: {
               class: "pcb-hole-inner",
               fill: colorMap2.drill,
-              x: (x - scaledHoleWidth / 2).toString(),
-              y: (y - scaledHoleHeight / 2).toString(),
+              x: (holeCenterX - scaledHoleWidth / 2).toString(),
+              y: (holeCenterY - scaledHoleHeight / 2).toString(),
               width: scaledHoleWidth.toString(),
               height: scaledHoleHeight.toString(),
               rx: holeRadius.toString(),
@@ -539,11 +547,19 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
     ];
   }
   if (hole.shape === "rotated_pill_hole_with_rect_pad") {
-    const scaledRectPadWidth = hole.rect_pad_width * Math.abs(transform.a);
-    const scaledRectPadHeight = hole.rect_pad_height * Math.abs(transform.a);
-    const scaledRectBorderRadius = (hole.rect_border_radius ?? 0) * Math.abs(transform.a);
-    const scaledHoleHeight = hole.hole_height * Math.abs(transform.a);
-    const scaledHoleWidth = hole.hole_width * Math.abs(transform.a);
+    const rotatedHole = hole;
+    const scaledRectPadWidth = rotatedHole.rect_pad_width * Math.abs(transform.a);
+    const scaledRectPadHeight = rotatedHole.rect_pad_height * Math.abs(transform.a);
+    const scaledRectBorderRadius = (rotatedHole.rect_border_radius ?? 0) * Math.abs(transform.a);
+    const scaledHoleHeight = rotatedHole.hole_height * Math.abs(transform.a);
+    const scaledHoleWidth = rotatedHole.hole_width * Math.abs(transform.a);
+    const rotatedHoleWithOffsets = rotatedHole;
+    const holeOffsetX = rotatedHoleWithOffsets.hole_offset_x ?? 0;
+    const holeOffsetY = rotatedHoleWithOffsets.hole_offset_y ?? 0;
+    const [holeCenterX, holeCenterY] = applyToPoint4(transform, [
+      rotatedHole.x + holeOffsetX,
+      rotatedHole.y + holeOffsetY
+    ]);
     const holeRadius = Math.min(scaledHoleHeight, scaledHoleWidth) / 2;
     return [
       {
@@ -560,7 +576,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               y: (-scaledRectPadHeight / 2).toString(),
               width: scaledRectPadWidth.toString(),
               height: scaledRectPadHeight.toString(),
-              transform: `translate(${x} ${y}) rotate(${-hole.rect_ccw_rotation})`,
+              transform: `translate(${x} ${y}) rotate(${-rotatedHole.rect_ccw_rotation})`,
               ...scaledRectBorderRadius ? {
                 rx: scaledRectBorderRadius.toString(),
                 ry: scaledRectBorderRadius.toString()
@@ -581,7 +597,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               height: scaledHoleHeight.toString(),
               rx: holeRadius.toString(),
               ry: holeRadius.toString(),
-              transform: `translate(${x} ${y}) rotate(${-hole.hole_ccw_rotation})`
+              transform: `translate(${holeCenterX} ${holeCenterY}) rotate(${-rotatedHole.hole_ccw_rotation})`
             },
             value: "",
             children: []
@@ -1015,110 +1031,187 @@ import { applyToPoint as applyToPoint11 } from "transformation-matrix";
 function createSvgObjectsFromSmtPad(pad, ctx) {
   const { transform, layer: layerFilter, colorMap: colorMap2 } = ctx;
   if (layerFilter && pad.layer !== layerFilter) return [];
+  const isCoveredWithSolderMask = Boolean(pad?.is_covered_with_solder_mask);
+  const solderMaskColor = colorMap2.soldermask[pad.layer] ?? colorMap2.soldermask.top;
   if (pad.shape === "rect" || pad.shape === "rotated_rect") {
     const width = pad.width * Math.abs(transform.a);
     const height = pad.height * Math.abs(transform.d);
     const [x, y] = applyToPoint11(transform, [pad.x, pad.y]);
     const scaledBorderRadius = (pad.rect_border_radius ?? 0) * Math.abs(transform.a);
     if (pad.shape === "rotated_rect" && pad.ccw_rotation) {
-      return [
-        {
-          name: "rect",
-          type: "element",
-          attributes: {
-            class: "pcb-pad",
-            fill: layerNameToColor(pad.layer, colorMap2),
-            x: (-width / 2).toString(),
-            y: (-height / 2).toString(),
-            width: width.toString(),
-            height: height.toString(),
-            transform: `translate(${x} ${y}) rotate(${-pad.ccw_rotation})`,
-            "data-layer": pad.layer,
-            ...scaledBorderRadius ? {
-              rx: scaledBorderRadius.toString(),
-              ry: scaledBorderRadius.toString()
-            } : {}
-          }
-        }
-      ];
-    }
-    return [
-      {
+      const padElement2 = {
         name: "rect",
         type: "element",
+        value: "",
+        children: [],
         attributes: {
           class: "pcb-pad",
           fill: layerNameToColor(pad.layer, colorMap2),
-          x: (x - width / 2).toString(),
-          y: (y - height / 2).toString(),
+          x: (-width / 2).toString(),
+          y: (-height / 2).toString(),
           width: width.toString(),
           height: height.toString(),
+          transform: `translate(${x} ${y}) rotate(${-pad.ccw_rotation})`,
           "data-layer": pad.layer,
           ...scaledBorderRadius ? {
             rx: scaledBorderRadius.toString(),
             ry: scaledBorderRadius.toString()
           } : {}
         }
+      };
+      if (!isCoveredWithSolderMask) {
+        return [padElement2];
       }
-    ];
+      const maskElement2 = {
+        name: padElement2.name,
+        type: padElement2.type,
+        value: "",
+        children: [],
+        attributes: {
+          ...padElement2.attributes,
+          class: "pcb-solder-mask",
+          fill: solderMaskColor
+        }
+      };
+      return [padElement2, maskElement2];
+    }
+    const padElement = {
+      name: "rect",
+      type: "element",
+      value: "",
+      children: [],
+      attributes: {
+        class: "pcb-pad",
+        fill: layerNameToColor(pad.layer, colorMap2),
+        x: (x - width / 2).toString(),
+        y: (y - height / 2).toString(),
+        width: width.toString(),
+        height: height.toString(),
+        "data-layer": pad.layer,
+        ...scaledBorderRadius ? {
+          rx: scaledBorderRadius.toString(),
+          ry: scaledBorderRadius.toString()
+        } : {}
+      }
+    };
+    if (!isCoveredWithSolderMask) {
+      return [padElement];
+    }
+    const maskElement = {
+      name: padElement.name,
+      type: padElement.type,
+      value: "",
+      children: [],
+      attributes: {
+        ...padElement.attributes,
+        class: "pcb-solder-mask",
+        fill: solderMaskColor
+      }
+    };
+    return [padElement, maskElement];
   }
   if (pad.shape === "pill") {
     const width = pad.width * Math.abs(transform.a);
     const height = pad.height * Math.abs(transform.d);
     const radius = pad.radius * Math.abs(transform.a);
     const [x, y] = applyToPoint11(transform, [pad.x, pad.y]);
-    return [
-      {
-        name: "rect",
-        type: "element",
-        attributes: {
-          class: "pcb-pad",
-          fill: layerNameToColor(pad.layer, colorMap2),
-          x: (x - width / 2).toString(),
-          y: (y - height / 2).toString(),
-          width: width.toString(),
-          height: height.toString(),
-          rx: radius.toString(),
-          ry: radius.toString(),
-          "data-layer": pad.layer
-        }
+    const padElement = {
+      name: "rect",
+      type: "element",
+      value: "",
+      children: [],
+      attributes: {
+        class: "pcb-pad",
+        fill: layerNameToColor(pad.layer, colorMap2),
+        x: (x - width / 2).toString(),
+        y: (y - height / 2).toString(),
+        width: width.toString(),
+        height: height.toString(),
+        rx: radius.toString(),
+        ry: radius.toString(),
+        "data-layer": pad.layer
       }
-    ];
+    };
+    if (!isCoveredWithSolderMask) {
+      return [padElement];
+    }
+    const maskElement = {
+      name: padElement.name,
+      type: padElement.type,
+      value: "",
+      children: [],
+      attributes: {
+        ...padElement.attributes,
+        class: "pcb-solder-mask",
+        fill: solderMaskColor
+      }
+    };
+    return [padElement, maskElement];
   }
   if (pad.shape === "circle") {
     const radius = pad.radius * Math.abs(transform.a);
     const [x, y] = applyToPoint11(transform, [pad.x, pad.y]);
-    return [
-      {
-        name: "circle",
-        type: "element",
-        attributes: {
-          class: "pcb-pad",
-          fill: layerNameToColor(pad.layer, colorMap2),
-          cx: x.toString(),
-          cy: y.toString(),
-          r: radius.toString(),
-          "data-layer": pad.layer
-        }
+    const padElement = {
+      name: "circle",
+      type: "element",
+      value: "",
+      children: [],
+      attributes: {
+        class: "pcb-pad",
+        fill: layerNameToColor(pad.layer, colorMap2),
+        cx: x.toString(),
+        cy: y.toString(),
+        r: radius.toString(),
+        "data-layer": pad.layer
       }
-    ];
+    };
+    if (!isCoveredWithSolderMask) {
+      return [padElement];
+    }
+    const maskElement = {
+      name: padElement.name,
+      type: padElement.type,
+      value: "",
+      children: [],
+      attributes: {
+        ...padElement.attributes,
+        class: "pcb-solder-mask",
+        fill: solderMaskColor
+      }
+    };
+    return [padElement, maskElement];
   }
   if (pad.shape === "polygon") {
     const points = (pad.points ?? []).map(
       (point) => applyToPoint11(transform, [point.x, point.y])
     );
-    return [
-      {
-        name: "polygon",
-        type: "element",
-        attributes: {
-          class: "pcb-pad",
-          fill: layerNameToColor(pad.layer),
-          points: points.map((p) => p.join(",")).join(" "),
-          "data-layer": pad.layer
-        }
+    const padElement = {
+      name: "polygon",
+      type: "element",
+      value: "",
+      children: [],
+      attributes: {
+        class: "pcb-pad",
+        fill: layerNameToColor(pad.layer, colorMap2),
+        points: points.map((p) => p.join(",")).join(" "),
+        "data-layer": pad.layer
       }
-    ];
+    };
+    if (!isCoveredWithSolderMask) {
+      return [padElement];
+    }
+    const maskElement = {
+      name: padElement.name,
+      type: padElement.type,
+      value: "",
+      children: [],
+      attributes: {
+        ...padElement.attributes,
+        class: "pcb-solder-mask",
+        fill: solderMaskColor
+      }
+    };
+    return [padElement, maskElement];
   }
   return [];
 }
@@ -1650,7 +1743,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.192",
+  version: "0.0.194",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -1674,6 +1767,7 @@ var package_default = {
     "bun-match-svg": "^0.0.12",
     esbuild: "^0.20.2",
     "performance-now": "^2.1.0",
+    "circuit-json": "^0.0.257",
     react: "19.1.0",
     "react-cosmos": "7.0.0",
     "react-cosmos-plugin-vite": "7.0.0",
@@ -2494,10 +2588,16 @@ function createSvgObjectsFromAssemblyPlatedHole(hole, ctx) {
     ];
   }
   if (hole.shape === "circular_hole_with_rect_pad") {
-    const scaledHoleDiameter = hole.hole_diameter * Math.abs(transform.a);
-    const scaledRectPadWidth = hole.rect_pad_width * Math.abs(transform.a);
-    const scaledRectPadHeight = hole.rect_pad_height * Math.abs(transform.a);
+    const circularHole = hole;
+    const scaledHoleDiameter = circularHole.hole_diameter * Math.abs(transform.a);
+    const scaledRectPadWidth = circularHole.rect_pad_width * Math.abs(transform.a);
+    const scaledRectPadHeight = circularHole.rect_pad_height * Math.abs(transform.a);
+    const scaledRectBorderRadius = (circularHole.rect_border_radius ?? 0) * Math.abs(transform.a);
     const holeRadius = scaledHoleDiameter / 2;
+    const [holeCx, holeCy] = applyToPoint25(transform, [
+      circularHole.x + circularHole.hole_offset_x,
+      circularHole.y + circularHole.hole_offset_y
+    ]);
     return [
       {
         name: "g",
@@ -2513,7 +2613,11 @@ function createSvgObjectsFromAssemblyPlatedHole(hole, ctx) {
               x: (x - scaledRectPadWidth / 2).toString(),
               y: (y - scaledRectPadHeight / 2).toString(),
               width: scaledRectPadWidth.toString(),
-              height: scaledRectPadHeight.toString()
+              height: scaledRectPadHeight.toString(),
+              ...scaledRectBorderRadius ? {
+                rx: scaledRectBorderRadius.toString(),
+                ry: scaledRectBorderRadius.toString()
+              } : {}
             },
             value: "",
             children: []
@@ -2525,8 +2629,8 @@ function createSvgObjectsFromAssemblyPlatedHole(hole, ctx) {
             attributes: {
               class: "assembly-hole-inner",
               fill: HOLE_COLOR3,
-              cx: x.toString(),
-              cy: y.toString(),
+              cx: holeCx.toString(),
+              cy: holeCy.toString(),
               r: holeRadius.toString()
             },
             value: "",
@@ -2539,10 +2643,19 @@ function createSvgObjectsFromAssemblyPlatedHole(hole, ctx) {
     ];
   }
   if (hole.shape === "pill_hole_with_rect_pad") {
-    const scaledRectPadWidth = hole.rect_pad_width * Math.abs(transform.a);
-    const scaledRectPadHeight = hole.rect_pad_height * Math.abs(transform.a);
-    const scaledHoleHeight = hole.hole_height * Math.abs(transform.a);
-    const scaledHoleWidth = hole.hole_width * Math.abs(transform.a);
+    const pillHole = hole;
+    const scaledRectPadWidth = pillHole.rect_pad_width * Math.abs(transform.a);
+    const scaledRectPadHeight = pillHole.rect_pad_height * Math.abs(transform.a);
+    const scaledRectBorderRadius = (pillHole.rect_border_radius ?? 0) * Math.abs(transform.a);
+    const scaledHoleHeight = pillHole.hole_height * Math.abs(transform.a);
+    const scaledHoleWidth = pillHole.hole_width * Math.abs(transform.a);
+    const pillHoleWithOffsets = pillHole;
+    const holeOffsetX = pillHoleWithOffsets.hole_offset_x ?? 0;
+    const holeOffsetY = pillHoleWithOffsets.hole_offset_y ?? 0;
+    const [holeCenterX, holeCenterY] = applyToPoint25(transform, [
+      pillHole.x + holeOffsetX,
+      pillHole.y + holeOffsetY
+    ]);
     const holeRadius = Math.min(scaledHoleHeight, scaledHoleWidth) / 2;
     return [
       {
@@ -2559,7 +2672,11 @@ function createSvgObjectsFromAssemblyPlatedHole(hole, ctx) {
               x: (x - scaledRectPadWidth / 2).toString(),
               y: (y - scaledRectPadHeight / 2).toString(),
               width: scaledRectPadWidth.toString(),
-              height: scaledRectPadHeight.toString()
+              height: scaledRectPadHeight.toString(),
+              ...scaledRectBorderRadius ? {
+                rx: scaledRectBorderRadius.toString(),
+                ry: scaledRectBorderRadius.toString()
+              } : {}
             },
             value: "",
             children: []
@@ -2571,8 +2688,8 @@ function createSvgObjectsFromAssemblyPlatedHole(hole, ctx) {
             attributes: {
               class: "assembly-hole-inner",
               fill: HOLE_COLOR3,
-              x: (x - scaledHoleWidth / 2).toString(),
-              y: (y - scaledHoleHeight / 2).toString(),
+              x: (holeCenterX - scaledHoleWidth / 2).toString(),
+              y: (holeCenterY - scaledHoleHeight / 2).toString(),
               width: scaledHoleWidth.toString(),
               height: scaledHoleHeight.toString(),
               rx: holeRadius.toString(),
@@ -2588,10 +2705,19 @@ function createSvgObjectsFromAssemblyPlatedHole(hole, ctx) {
     ];
   }
   if (hole.shape === "rotated_pill_hole_with_rect_pad") {
-    const scaledRectPadWidth = hole.rect_pad_width * Math.abs(transform.a);
-    const scaledRectPadHeight = hole.rect_pad_height * Math.abs(transform.a);
-    const scaledHoleHeight = hole.hole_height * Math.abs(transform.a);
-    const scaledHoleWidth = hole.hole_width * Math.abs(transform.a);
+    const rotatedHole = hole;
+    const scaledRectPadWidth = rotatedHole.rect_pad_width * Math.abs(transform.a);
+    const scaledRectPadHeight = rotatedHole.rect_pad_height * Math.abs(transform.a);
+    const scaledRectBorderRadius = (rotatedHole.rect_border_radius ?? 0) * Math.abs(transform.a);
+    const scaledHoleHeight = rotatedHole.hole_height * Math.abs(transform.a);
+    const scaledHoleWidth = rotatedHole.hole_width * Math.abs(transform.a);
+    const rotatedHoleWithOffsets = rotatedHole;
+    const holeOffsetX = rotatedHoleWithOffsets.hole_offset_x ?? 0;
+    const holeOffsetY = rotatedHoleWithOffsets.hole_offset_y ?? 0;
+    const [holeCenterX, holeCenterY] = applyToPoint25(transform, [
+      rotatedHole.x + holeOffsetX,
+      rotatedHole.y + holeOffsetY
+    ]);
     const holeRadius = Math.min(scaledHoleHeight, scaledHoleWidth) / 2;
     return [
       {
@@ -2608,7 +2734,11 @@ function createSvgObjectsFromAssemblyPlatedHole(hole, ctx) {
               y: (-scaledRectPadHeight / 2).toString(),
               width: scaledRectPadWidth.toString(),
               height: scaledRectPadHeight.toString(),
-              transform: `translate(${x} ${y}) rotate(${-hole.rect_ccw_rotation})`
+              transform: `translate(${x} ${y}) rotate(${-rotatedHole.rect_ccw_rotation})`,
+              ...scaledRectBorderRadius ? {
+                rx: scaledRectBorderRadius.toString(),
+                ry: scaledRectBorderRadius.toString()
+              } : {}
             },
             value: "",
             children: []
@@ -2625,7 +2755,7 @@ function createSvgObjectsFromAssemblyPlatedHole(hole, ctx) {
               height: scaledHoleHeight.toString(),
               rx: holeRadius.toString(),
               ry: holeRadius.toString(),
-              transform: `translate(${x} ${y}) rotate(${-hole.hole_ccw_rotation})`
+              transform: `translate(${holeCenterX} ${holeCenterY}) rotate(${-rotatedHole.hole_ccw_rotation})`
             },
             value: "",
             children: []