circuit-to-svg 0.0.238 → 0.0.240

package/dist/index.js

@@ -2346,8 +2346,18 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
   if (hole.hole_shape === "pill") {
     const scaledWidth = hole.hole_width * Math.abs(transform.a);
     const scaledHeight = hole.hole_height * Math.abs(transform.a);
-    const radiusX = scaledWidth / 2;
-    const straightLength = scaledHeight - scaledWidth;
+    const isHorizontal = scaledWidth > scaledHeight;
+    const radius = Math.min(scaledWidth, scaledHeight) / 2;
+    const straightLength = Math.abs(
+      isHorizontal ? scaledWidth - scaledHeight : scaledHeight - scaledWidth
+    );
+    const pathD = isHorizontal ? (
+      // Horizontal pill (wider than tall)
+      `M${x - straightLength / 2},${y - radius} h${straightLength} a${radius},${radius} 0 0 1 0,${scaledHeight} h-${straightLength} a${radius},${radius} 0 0 1 0,-${scaledHeight} z`
+    ) : (
+      // Vertical pill (taller than wide)
+      `M${x - radius},${y - straightLength / 2} v${straightLength} a${radius},${radius} 0 0 0 ${scaledWidth},0 v-${straightLength} a${radius},${radius} 0 0 0 -${scaledWidth},0 z`
+    );
     return [
       {
         name: "path",
@@ -2355,7 +2365,7 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
         attributes: {
           class: "pcb-hole",
           fill: colorMap2.drill,
-          d: `M${x - radiusX},${y - straightLength / 2} v${straightLength} a${radiusX},${radiusX} 0 0 0 ${scaledWidth},0 v-${straightLength} a${radiusX},${radiusX} 0 0 0 -${scaledWidth},0 z`,
+          d: pathD,
           "data-type": "pcb_hole",
           "data-pcb-layer": "drill"
         },
@@ -2367,9 +2377,19 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
   if (hole.hole_shape === "rotated_pill") {
     const scaledWidth = hole.hole_width * Math.abs(transform.a);
     const scaledHeight = hole.hole_height * Math.abs(transform.a);
-    const radiusX = scaledWidth / 2;
-    const straightLength = scaledHeight - scaledWidth;
     const rotation = "ccw_rotation" in hole ? hole.ccw_rotation ?? 0 : 0;
+    const isHorizontal = scaledWidth > scaledHeight;
+    const radius = Math.min(scaledWidth, scaledHeight) / 2;
+    const straightLength = Math.abs(
+      isHorizontal ? scaledWidth - scaledHeight : scaledHeight - scaledWidth
+    );
+    const pathD = isHorizontal ? (
+      // Horizontal pill (wider than tall)
+      `M${-straightLength / 2},${-radius} h${straightLength} a${radius},${radius} 0 0 1 0,${scaledHeight} h-${straightLength} a${radius},${radius} 0 0 1 0,-${scaledHeight} z`
+    ) : (
+      // Vertical pill (taller than wide)
+      `M${-radius},${-straightLength / 2} v${straightLength} a${radius},${radius} 0 0 0 ${scaledWidth},0 v-${straightLength} a${radius},${radius} 0 0 0 -${scaledWidth},0 z`
+    );
     return [
       {
         name: "path",
@@ -2377,7 +2397,7 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
         attributes: {
           class: "pcb-hole",
           fill: colorMap2.drill,
-          d: `M${-radiusX},${-straightLength / 2} v${straightLength} a${radiusX},${radiusX} 0 0 0 ${scaledWidth},0 v-${straightLength} a${radiusX},${radiusX} 0 0 0 -${scaledWidth},0 z`,
+          d: pathD,
           transform: `translate(${x} ${y}) rotate(${-rotation})`,
           "data-type": "pcb_hole",
           "data-pcb-layer": "drill"
@@ -2913,7 +2933,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.237",
+  version: "0.0.239",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -3111,6 +3131,15 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
         circuitJsonElm.width,
         circuitJsonElm.height
       );
+    } else if (circuitJsonElm.type === "pcb_cutout") {
+      const cutout = circuitJsonElm;
+      if (cutout.shape === "rect") {
+        updateBounds(cutout.center, cutout.width, cutout.height);
+      } else if (cutout.shape === "circle") {
+        updateBounds(cutout.center, cutout.radius * 2, cutout.radius * 2);
+      } else if (cutout.shape === "polygon") {
+        updateTraceBounds(cutout.points);
+      }
     } else if (circuitJsonElm.type === "pcb_silkscreen_text" || circuitJsonElm.type === "pcb_silkscreen_rect" || circuitJsonElm.type === "pcb_silkscreen_circle" || circuitJsonElm.type === "pcb_silkscreen_line") {
       updateSilkscreenBounds(circuitJsonElm);
     } else if (circuitJsonElm.type === "pcb_copper_pour") {