circuit-to-svg 0.0.258 → 0.0.260

package/dist/index.js

@@ -1,4 +1,5 @@
 // lib/pcb/convert-circuit-json-to-pcb-svg.ts
+import { distance } from "circuit-json";
 import { stringify } from "svgson";
 import {
   applyToPoint as applyToPoint31,
@@ -537,7 +538,8 @@ function createSvgObjectsFromPcbFabricationNoteRect(fabricationNoteRect, ctx) {
     color,
     layer = "top",
     pcb_component_id,
-    pcb_fabrication_note_rect_id
+    pcb_fabrication_note_rect_id,
+    corner_radius
   } = fabricationNoteRect;
   if (layerFilter && layer !== layerFilter) return [];
   if (!center || typeof center.x !== "number" || typeof center.y !== "number" || typeof width !== "number" || typeof height !== "number") {
@@ -565,6 +567,9 @@ function createSvgObjectsFromPcbFabricationNoteRect(fabricationNoteRect, ctx) {
   const baseStrokeWidth = typeof stroke_width === "number" ? stroke_width : 0;
   const transformedStrokeWidth = baseStrokeWidth * Math.abs(transform.a);
   const overlayStrokeColor = color ?? DEFAULT_OVERLAY_STROKE_COLOR;
+  const baseCornerRadius = typeof corner_radius === "number" && corner_radius > 0 ? corner_radius : 0;
+  const transformedCornerRadiusX = baseCornerRadius * Math.abs(transform.a);
+  const transformedCornerRadiusY = baseCornerRadius * Math.abs(transform.d);
   const attributes = {
     x: rectX.toString(),
     y: rectY.toString(),
@@ -578,6 +583,12 @@ function createSvgObjectsFromPcbFabricationNoteRect(fabricationNoteRect, ctx) {
   if (pcb_component_id !== void 0) {
     attributes["data-pcb-component-id"] = pcb_component_id;
   }
+  if (transformedCornerRadiusX > 0) {
+    attributes.rx = transformedCornerRadiusX.toString();
+  }
+  if (transformedCornerRadiusY > 0) {
+    attributes.ry = transformedCornerRadiusY.toString();
+  }
   if (is_filled) {
     attributes.fill = color ?? DEFAULT_OVERLAY_FILL_COLOR;
   } else {
@@ -1410,7 +1421,8 @@ function createSvgObjectsFromPcbNoteRect(noteRect, ctx) {
     is_filled,
     has_stroke,
     is_stroke_dashed,
-    color
+    color,
+    corner_radius
   } = noteRect;
   if (!center || typeof center.x !== "number" || typeof center.y !== "number" || typeof width !== "number" || typeof height !== "number") {
     console.error("Invalid pcb_note_rect data", { center, width, height });
@@ -1432,6 +1444,9 @@ function createSvgObjectsFromPcbNoteRect(noteRect, ctx) {
   const rectHeight = Math.abs(bottomRightY - topLeftY);
   const baseStrokeWidth = typeof stroke_width === "number" ? stroke_width : 0;
   const transformedStrokeWidth = baseStrokeWidth * Math.abs(transform.a);
+  const baseCornerRadius = typeof corner_radius === "number" && corner_radius > 0 ? corner_radius : 0;
+  const transformedCornerRadiusX = baseCornerRadius * Math.abs(transform.a);
+  const transformedCornerRadiusY = baseCornerRadius * Math.abs(transform.d);
   const overlayColor = color ?? DEFAULT_OVERLAY_COLOR2;
   const attributes = {
     x: rectX.toString(),
@@ -1443,6 +1458,12 @@ function createSvgObjectsFromPcbNoteRect(noteRect, ctx) {
     "data-pcb-note-rect-id": noteRect.pcb_note_rect_id,
     "data-pcb-layer": "overlay"
   };
+  if (transformedCornerRadiusX > 0) {
+    attributes.rx = transformedCornerRadiusX.toString();
+  }
+  if (transformedCornerRadiusY > 0) {
+    attributes.ry = transformedCornerRadiusY.toString();
+  }
   if (is_filled) {
     attributes.fill = color ?? DEFAULT_FILL_COLOR;
   } else {
@@ -2066,7 +2087,8 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, ctx) {
     stroke_width,
     is_filled,
     has_stroke,
-    is_stroke_dashed
+    is_stroke_dashed,
+    corner_radius
   } = pcbSilkscreenRect;
   if (layerFilter && layer !== layerFilter) return [];
   if (!center || typeof center.x !== "number" || typeof center.y !== "number" || typeof width !== "number" || typeof height !== "number") {
@@ -2077,6 +2099,9 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, ctx) {
     center.x,
     center.y
   ]);
+  const baseCornerRadius = typeof corner_radius === "number" && corner_radius > 0 ? corner_radius : 0;
+  const transformedCornerRadiusX = baseCornerRadius * Math.abs(transform.a);
+  const transformedCornerRadiusY = baseCornerRadius * Math.abs(transform.d);
   const transformedWidth = width * Math.abs(transform.a);
   const transformedHeight = height * Math.abs(transform.d);
   const transformedStrokeWidth = stroke_width * Math.abs(transform.a);
@@ -2091,6 +2116,12 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, ctx) {
     "data-type": "pcb_silkscreen_rect",
     "data-pcb-layer": layer
   };
+  if (transformedCornerRadiusX > 0) {
+    attributes.rx = transformedCornerRadiusX.toString();
+  }
+  if (transformedCornerRadiusY > 0) {
+    attributes.ry = transformedCornerRadiusY.toString();
+  }
   attributes.fill = is_filled ? color : "none";
   let actualHasStroke;
   if (has_stroke === void 0) {
@@ -2902,9 +2933,9 @@ var findNearestPointInNet = (sourcePoint, netId, connectivity, circuitJson) => {
     if (pos) {
       const dx = sourcePoint.x - pos.x;
       const dy = sourcePoint.y - pos.y;
-      const distance = Math.sqrt(dx * dx + dy * dy);
-      if (distance > 0 && distance < minDistance) {
-        minDistance = distance;
+      const distance3 = Math.sqrt(dx * dx + dy * dy);
+      if (distance3 > 0 && distance3 < minDistance) {
+        minDistance = distance3;
         nearestPoint = pos;
       }
     }
@@ -3471,7 +3502,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.257",
+  version: "0.0.259",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -3495,12 +3526,12 @@ var package_default = {
     "bun-match-svg": "^0.0.12",
     esbuild: "^0.20.2",
     "performance-now": "^2.1.0",
-    "circuit-json": "^0.0.292",
+    "circuit-json": "^0.0.297",
     react: "19.1.0",
     "react-cosmos": "7.0.0",
     "react-cosmos-plugin-vite": "7.0.0",
     "react-dom": "19.1.0",
-    tscircuit: "^0.0.743",
+    tscircuit: "^0.0.827",
     tsup: "^8.0.2",
     typescript: "^5.4.5",
     "vite-tsconfig-paths": "^5.0.1"
@@ -3640,14 +3671,13 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
   for (const circuitJsonElm of circuitJson) {
     if (circuitJsonElm.type === "pcb_panel") {
       const panel = circuitJsonElm;
-      const width = toNumeric(panel.width);
-      const height = toNumeric(panel.height);
+      const width = distance.parse(panel.width);
+      const height = distance.parse(panel.height);
       if (width === void 0 || height === void 0) {
         continue;
       }
       const center = { x: width / 2, y: height / 2 };
       updateBounds(center, width, height);
-      updateBoardBounds(center, width, height);
     } else if (circuitJsonElm.type === "pcb_board") {
       if (circuitJsonElm.outline && Array.isArray(circuitJsonElm.outline) && circuitJsonElm.outline.length >= 3) {
         updateBoundsToIncludeOutline(circuitJsonElm.outline);
@@ -3664,20 +3694,20 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
           circuitJsonElm.height
         );
       }
-    } else if ("x" in circuitJsonElm && "y" in circuitJsonElm) {
-      updateBounds({ x: circuitJsonElm.x, y: circuitJsonElm.y }, 0, 0);
     } else if (circuitJsonElm.type === "pcb_smtpad") {
       const pad = circuitJsonElm;
       if (pad.shape === "rect" || pad.shape === "rotated_rect" || pad.shape === "pill") {
         updateBounds({ x: pad.x, y: pad.y }, pad.width, pad.height);
       } else if (pad.shape === "circle") {
-        const radius = toNumeric(pad.radius);
+        const radius = distance.parse(pad.radius);
         if (radius !== void 0) {
           updateBounds({ x: pad.x, y: pad.y }, radius * 2, radius * 2);
         }
       } else if (pad.shape === "polygon") {
         updateTraceBounds(pad.points);
       }
+    } else if ("x" in circuitJsonElm && "y" in circuitJsonElm) {
+      updateBounds({ x: circuitJsonElm.x, y: circuitJsonElm.y }, 0, 0);
     } else if ("route" in circuitJsonElm) {
       updateTraceBounds(circuitJsonElm.route);
     } else if (circuitJsonElm.type === "pcb_note_rect" || circuitJsonElm.type === "pcb_fabrication_note_rect") {
@@ -3691,7 +3721,7 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
       if (cutout.shape === "rect") {
         updateBounds(cutout.center, cutout.width, cutout.height);
       } else if (cutout.shape === "circle") {
-        const radius = toNumeric(cutout.radius);
+        const radius = distance.parse(cutout.radius);
         if (radius !== void 0) {
           updateBounds(cutout.center, radius * 2, radius * 2);
         }
@@ -3854,23 +3884,13 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
     console.error("Error stringifying SVG object:", error);
     throw error;
   }
-  function toNumeric(value) {
-    if (typeof value === "number") {
-      return Number.isFinite(value) ? value : void 0;
-    }
-    if (typeof value === "string") {
-      const parsed = Number.parseFloat(value);
-      return Number.isFinite(parsed) ? parsed : void 0;
-    }
-    return void 0;
-  }
   function updateBounds(center, width, height) {
     if (!center) return;
-    const centerX = toNumeric(center.x);
-    const centerY = toNumeric(center.y);
+    const centerX = distance.parse(center.x);
+    const centerY = distance.parse(center.y);
     if (centerX === void 0 || centerY === void 0) return;
-    const numericWidth = toNumeric(width) ?? 0;
-    const numericHeight = toNumeric(height) ?? 0;
+    const numericWidth = distance.parse(width) ?? 0;
+    const numericHeight = distance.parse(height) ?? 0;
     const halfWidth = numericWidth / 2;
     const halfHeight = numericHeight / 2;
     minX = Math.min(minX, centerX - halfWidth);
@@ -3881,11 +3901,11 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
   }
   function updateBoardBounds(center, width, height) {
     if (!center) return;
-    const centerX = toNumeric(center.x);
-    const centerY = toNumeric(center.y);
+    const centerX = distance.parse(center.x);
+    const centerY = distance.parse(center.y);
     if (centerX === void 0 || centerY === void 0) return;
-    const numericWidth = toNumeric(width) ?? 0;
-    const numericHeight = toNumeric(height) ?? 0;
+    const numericWidth = distance.parse(width) ?? 0;
+    const numericHeight = distance.parse(height) ?? 0;
     const halfWidth = numericWidth / 2;
     const halfHeight = numericHeight / 2;
     boardMinX = Math.min(boardMinX, centerX - halfWidth);
@@ -3898,8 +3918,8 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
   function updateBoundsToIncludeOutline(outline) {
     let updated = false;
     for (const point of outline) {
-      const x = toNumeric(point.x);
-      const y = toNumeric(point.y);
+      const x = distance.parse(point.x);
+      const y = distance.parse(point.y);
       if (x === void 0 || y === void 0) continue;
       minX = Math.min(minX, x);
       minY = Math.min(minY, y);
@@ -3914,8 +3934,8 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
   function updateBoardBoundsToIncludeOutline(outline) {
     let updated = false;
     for (const point of outline) {
-      const x = toNumeric(point.x);
-      const y = toNumeric(point.y);
+      const x = distance.parse(point.x);
+      const y = distance.parse(point.y);
       if (x === void 0 || y === void 0) continue;
       boardMinX = Math.min(boardMinX, x);
       boardMinY = Math.min(boardMinY, y);
@@ -3931,8 +3951,8 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
   function updateTraceBounds(route) {
     let updated = false;
     for (const point of route) {
-      const x = toNumeric(point?.x);
-      const y = toNumeric(point?.y);
+      const x = distance.parse(point?.x);
+      const y = distance.parse(point?.y);
       if (x === void 0 || y === void 0) continue;
       minX = Math.min(minX, x);
       minY = Math.min(minY, y);
@@ -3952,7 +3972,7 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
     } else if (item.type === "pcb_silkscreen_rect") {
       updateBounds(item.center, item.width, item.height);
     } else if (item.type === "pcb_silkscreen_circle") {
-      const radius = toNumeric(item.radius);
+      const radius = distance.parse(item.radius);
       if (radius !== void 0) {
         updateBounds(item.center, radius * 2, radius * 2);
       }
@@ -3964,7 +3984,7 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
       if (cutout.shape === "rect") {
         updateBounds(cutout.center, cutout.width, cutout.height);
       } else if (cutout.shape === "circle") {
-        const radius = toNumeric(cutout.radius);
+        const radius = distance.parse(cutout.radius);
         if (radius !== void 0) {
           updateBounds(cutout.center, radius * 2, radius * 2);
         }
@@ -10558,6 +10578,7 @@ function formatNumber2(value) {
 }
 
 // lib/pcb/convert-circuit-json-to-solder-paste-mask.ts
+import { distance as distance2 } from "circuit-json";
 import { stringify as stringify7 } from "svgson";
 import {
   applyToPoint as applyToPoint70,
@@ -10664,7 +10685,7 @@ function convertCircuitJsonToSolderPasteMask(circuitJson, options) {
   let maxX = Number.NEGATIVE_INFINITY;
   let maxY = Number.NEGATIVE_INFINITY;
   const filteredCircuitJson = circuitJson.filter(
-    (elm) => elm.type === "pcb_board" || elm.type === "pcb_solder_paste" && elm.layer === options.layer
+    (elm) => elm.type === "pcb_board" || elm.type === "pcb_panel" || elm.type === "pcb_solder_paste" && elm.layer === options.layer
   );
   for (const item of filteredCircuitJson) {
     if (item.type === "pcb_board") {
@@ -10673,6 +10694,13 @@ function convertCircuitJsonToSolderPasteMask(circuitJson, options) {
       } else if ("center" in item && "width" in item && "height" in item) {
         updateBounds(item.center, item.width, item.height);
       }
+    } else if (item.type === "pcb_panel") {
+      const panel = item;
+      const width = distance2.parse(panel.width);
+      const height = distance2.parse(panel.height);
+      if (width !== void 0 && height !== void 0) {
+        updateBounds({ x: width / 2, y: height / 2 }, width, height);
+      }
     } else if (item.type === "pcb_solder_paste" && "x" in item && "y" in item) {
       updateBounds({ x: item.x, y: item.y }, 0, 0);
     }