circuit-to-svg 0.0.108 → 0.0.110

package/dist/index.js

@@ -220,6 +220,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, transform) {
             type: "element",
             attributes: {
               class: "pcb-hole-outer",
+              fill: "rgb(200, 52, 52)",
               d: `M${x - outerRadiusX},${y - straightLength / 2} v${straightLength} a${outerRadiusX},${outerRadiusX} 0 0 0 ${scaledOuterWidth},0 v-${straightLength} a${outerRadiusX},${outerRadiusX} 0 0 0 -${scaledOuterWidth},0 z`
             },
             value: "",
@@ -231,6 +232,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, transform) {
             type: "element",
             attributes: {
               class: "pcb-hole-inner",
+              fill: "rgb(255, 38, 226)",
               d: `M${x - innerRadiusX},${y - (scaledHoleHeight - scaledHoleWidth) / 2} v${scaledHoleHeight - scaledHoleWidth} a${innerRadiusX},${innerRadiusX} 0 0 0 ${scaledHoleWidth},0 v-${scaledHoleHeight - scaledHoleWidth} a${innerRadiusX},${innerRadiusX} 0 0 0 -${scaledHoleWidth},0 z`
             },
             value: "",
@@ -259,6 +261,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, transform) {
             type: "element",
             attributes: {
               class: "pcb-hole-outer",
+              fill: "rgb(200, 52, 52)",
               cx: x.toString(),
               cy: y.toString(),
               r: outerRadius.toString()
@@ -271,6 +274,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, transform) {
             type: "element",
             attributes: {
               class: "pcb-hole-inner",
+              fill: "rgb(255, 38, 226)",
               cx: x.toString(),
               cy: y.toString(),
               r: innerRadius.toString()
@@ -333,7 +337,8 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
     text,
     font_size = 1,
     layer = "top",
-    ccw_rotation = 0
+    ccw_rotation = 0,
+    stroke_width = 0
   } = pcbSilkscreenText;
   if (!anchor_position || typeof anchor_position.x !== "number" || typeof anchor_position.y !== "number") {
     console.error("Invalid anchor_position:", anchor_position);
@@ -344,10 +349,10 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
     anchor_position.y
   ]);
   const transformedFontSize = font_size * Math.abs(transform.a);
+  const transformedStrokeWidth = stroke_width * Math.abs(transform.a);
   const textTransform = compose2(
     translate2(transformedX, transformedY),
     rotate2(ccw_rotation * Math.PI / 180)
-    // Convert degrees to radians
   );
   const svgObject = {
     name: "text",
@@ -362,7 +367,9 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
       "dominant-baseline": "central",
       transform: matrixToString2(textTransform),
       class: `pcb-silkscreen-text pcb-silkscreen-${layer}`,
-      "data-pcb-silkscreen-text-id": pcbSilkscreenText.pcb_component_id
+      "data-pcb-silkscreen-text-id": pcbSilkscreenText.pcb_component_id,
+      stroke: "#f2eda1",
+      "stroke-width": transformedStrokeWidth.toString()
     },
     children: [
       {
@@ -388,7 +395,8 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, transform) {
     width,
     height,
     layer = "top",
-    pcb_silkscreen_rect_id
+    pcb_silkscreen_rect_id,
+    stroke_width = 1
   } = pcbSilkscreenRect;
   if (!center || typeof center.x !== "number" || typeof center.y !== "number" || typeof width !== "number" || typeof height !== "number") {
     console.error("Invalid rectangle data:", { center, width, height });
@@ -400,6 +408,7 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, transform) {
   ]);
   const transformedWidth = width * Math.abs(transform.a);
   const transformedHeight = height * Math.abs(transform.d);
+  const transformedStrokeWidth = stroke_width * Math.abs(transform.a);
   const svgObject = {
     name: "rect",
     type: "element",
@@ -411,7 +420,7 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, transform) {
       class: `pcb-silkscreen-rect pcb-silkscreen-${layer}`,
       fill: "none",
       stroke: "#f2eda1",
-      "stroke-width": "1",
+      "stroke-width": transformedStrokeWidth.toString(),
       "data-pcb-silkscreen-rect-id": pcb_silkscreen_rect_id
     },
     value: "",
@@ -429,7 +438,8 @@ function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, transform)
     center,
     radius,
     layer = "top",
-    pcb_silkscreen_circle_id
+    pcb_silkscreen_circle_id,
+    stroke_width = 1
   } = pcbSilkscreenCircle;
   if (!center || typeof center.x !== "number" || typeof center.y !== "number" || typeof radius !== "number") {
     console.error("Invalid PCB Silkscreen Circle data:", { center, radius });
@@ -440,6 +450,7 @@ function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, transform)
     center.y
   ]);
   const transformedRadius = radius * Math.abs(transform.a);
+  const transformedStrokeWidth = stroke_width * Math.abs(transform.a);
   const svgObject = {
     name: "circle",
     type: "element",
@@ -449,7 +460,7 @@ function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, transform)
       r: transformedRadius.toString(),
       class: `pcb-silkscreen-circle pcb-silkscreen-${layer}`,
       stroke: "#f2eda1",
-      "stroke-width": "1",
+      "stroke-width": transformedStrokeWidth.toString(),
       "data-pcb-silkscreen-circle-id": pcb_silkscreen_circle_id
     },
     value: "",
@@ -533,7 +544,7 @@ function createSvgObjectsFromPcbTrace(trace, transform) {
     if (!layer) continue;
     const layerColor = LAYER_NAME_TO_COLOR[layer] ?? "white";
     const traceWidth = "width" in start ? start.width : "width" in end ? end.width : null;
-    svgObjects.push({
+    const svgObject = {
       name: "path",
       type: "element",
       value: "",
@@ -541,14 +552,28 @@ function createSvgObjectsFromPcbTrace(trace, transform) {
       attributes: {
         class: "pcb-trace",
         stroke: layerColor,
+        fill: "none",
         d: `M ${startPoint[0]} ${startPoint[1]} L ${endPoint[0]} ${endPoint[1]}`,
         "stroke-width": traceWidth ? (traceWidth * Math.abs(transform.a)).toString() : "0.3",
         "stroke-linecap": "round",
         "stroke-linejoin": "round",
-        "shape-rendering": "crispEdges"
+        "shape-rendering": "crispEdges",
+        "data-layer": layer
       }
-    });
+    };
+    svgObjects.push(svgObject);
   }
+  svgObjects.sort((a, b) => {
+    const layerA = a.attributes["data-layer"];
+    const layerB = b.attributes["data-layer"];
+    if (layerA === "bottom" && layerB !== "bottom") {
+      return -1;
+    }
+    if (layerA === "top" && layerB !== "top") {
+      return 1;
+    }
+    return 0;
+  });
   return svgObjects;
 }
 
@@ -656,6 +681,7 @@ function createSvgObjectsFromPcbBoard(pcbBoard, transform) {
       attributes: {
         class: "pcb-board",
         d: path,
+        fill: "none",
         stroke: "rgba(255, 255, 255, 0.5)",
         "stroke-width": (0.1 * Math.abs(transform.a)).toString()
       }
@@ -682,6 +708,7 @@ function createSvgObjectsFromPcbVia(hole, transform) {
         type: "element",
         attributes: {
           class: "pcb-hole-outer",
+          fill: "rgb(200, 52, 52)",
           cx: x.toString(),
           cy: y.toString(),
           r: outerRadius.toString()
@@ -692,6 +719,7 @@ function createSvgObjectsFromPcbVia(hole, transform) {
         type: "element",
         attributes: {
           class: "pcb-hole-inner",
+          fill: "rgb(255, 38, 226)",
           cx: x.toString(),
           cy: y.toString(),
           r: innerRadius.toString()
@@ -973,15 +1001,7 @@ function convertCircuitJsonToPcbSvg(soup, options) {
         children: [
           {
             type: "text",
-            value: `
-              .boundary { fill: #000; }
-              .pcb-board { fill: none; }
-              .pcb-trace { fill: none; }
-              .pcb-hole-outer { fill: rgb(200, 52, 52); }
-              .pcb-hole-inner { fill: rgb(255, 38, 226); }
-              .pcb-pad { }
-              .pcb-boundary { fill: none; stroke: #fff; stroke-width: 0.3; }
-            `
+            value: ""
           }
         ]
       },
@@ -992,6 +1012,7 @@ function convertCircuitJsonToPcbSvg(soup, options) {
           class: "boundary",
           x: "0",
           y: "0",
+          fill: "#000",
           width: svgWidth.toString(),
           height: svgHeight.toString()
         }
@@ -1136,6 +1157,9 @@ function createSvgObjectFromPcbBoundary(transform, minX, minY, maxX, maxY) {
     children: [],
     attributes: {
       class: "pcb-boundary",
+      fill: "none",
+      stroke: "#fff",
+      "stroke-width": "0.3",
       x: x.toString(),
       y: y.toString(),
       width: width.toString(),
@@ -1882,7 +1906,7 @@ function getSchematicBoundsFromCircuitJson(soup, padding = 0.5) {
   const portSize = 0.2;
   for (const item of soup) {
     if (item.type === "schematic_component") {
-      updateBounds(item.center, item.size, item.rotation || 0);
+      updateBounds(item.center, item.size, 0);
     } else if (item.type === "schematic_port") {
       updateBounds(item.center, { width: portSize, height: portSize }, 0);
     } else if (item.type === "schematic_debug_object") {