circuit-to-svg 0.0.274 → 0.0.276

package/dist/index.js

@@ -1583,8 +1583,9 @@ 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 isCoveredWithSolderMask = Boolean(hole.is_covered_with_solder_mask);
   const soldermaskMargin = (hole.soldermask_margin ?? 0) * Math.abs(transform.a);
-  const shouldShowSolderMask = showSolderMask && soldermaskMargin !== 0;
+  const shouldShowSolderMask = showSolderMask && isCoveredWithSolderMask && soldermaskMargin !== 0;
   const solderMaskColor = colorMap2.soldermask.top;
   if (hole.shape === "pill") {
     const scaledOuterWidth = hole.outer_width * Math.abs(transform.a);
@@ -1670,6 +1671,64 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
       }
     ];
   }
+  if (hole.shape === "oval") {
+    const scaledOuterWidth = hole.outer_width * Math.abs(transform.a);
+    const scaledOuterHeight = hole.outer_height * Math.abs(transform.a);
+    const scaledHoleWidth = hole.hole_width * Math.abs(transform.a);
+    const scaledHoleHeight = hole.hole_height * Math.abs(transform.a);
+    const rotation = hole.ccw_rotation || 0;
+    const transformStr = rotation ? `translate(${x} ${y}) rotate(${-rotation})` : `translate(${x} ${y})`;
+    const children = [
+      // Outer oval shape
+      {
+        name: "ellipse",
+        type: "element",
+        attributes: {
+          class: "pcb-hole-outer",
+          fill: colorMap2.copper.top,
+          cx: "0",
+          cy: "0",
+          rx: (scaledOuterWidth / 2).toString(),
+          ry: (scaledOuterHeight / 2).toString(),
+          transform: transformStr,
+          "data-type": "pcb_plated_hole",
+          "data-pcb-layer": copperLayer
+        },
+        value: "",
+        children: []
+      },
+      // Inner oval shape
+      {
+        name: "ellipse",
+        type: "element",
+        attributes: {
+          class: "pcb-hole-inner",
+          fill: colorMap2.drill,
+          cx: "0",
+          cy: "0",
+          rx: (scaledHoleWidth / 2).toString(),
+          ry: (scaledHoleHeight / 2).toString(),
+          transform: transformStr,
+          "data-type": "pcb_plated_hole_drill",
+          "data-pcb-layer": "drill"
+        },
+        value: "",
+        children: []
+      }
+    ];
+    return [
+      {
+        name: "g",
+        type: "element",
+        attributes: {
+          "data-type": "pcb_plated_hole",
+          "data-pcb-layer": "through"
+        },
+        children,
+        value: ""
+      }
+    ];
+  }
   if (hole.shape === "circle") {
     const scaledOuterWidth = hole.outer_diameter * Math.abs(transform.a);
     const scaledOuterHeight = hole.outer_diameter * Math.abs(transform.a);
@@ -3068,8 +3127,9 @@ import { applyToPoint as applyToPoint24 } from "transformation-matrix";
 function createSvgObjectsFromPcbHole(hole, ctx) {
   const { transform, colorMap: colorMap2, showSolderMask } = ctx;
   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);
-  const shouldShowSolderMask = showSolderMask && soldermaskMargin !== 0;
+  const shouldShowSolderMask = showSolderMask && isCoveredWithSolderMask && soldermaskMargin !== 0;
   const solderMaskColor = colorMap2.soldermask.top;
   if (hole.hole_shape === "circle" || hole.hole_shape === "square") {
     const scaledDiameter = hole.hole_diameter * Math.abs(transform.a);
@@ -4290,7 +4350,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.273",
+  version: "0.0.275",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -4314,7 +4374,7 @@ var package_default = {
     "bun-match-svg": "^0.0.12",
     esbuild: "^0.20.2",
     "performance-now": "^2.1.0",
-    "circuit-json": "^0.0.317",
+    "circuit-json": "^0.0.319",
     react: "19.1.0",
     "react-cosmos": "7.0.0",
     "react-cosmos-plugin-vite": "7.0.0",