circuit-to-svg 0.0.107 → 0.0.109

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()
@@ -307,6 +311,8 @@ function createSvgObjectsFromPcbSilkscreenPath(silkscreenPath, transform) {
       attributes: {
         class: `pcb-silkscreen pcb-silkscreen-${silkscreenPath.layer}`,
         d: path,
+        fill: "none",
+        stroke: "#f2eda1",
         "stroke-width": (silkscreenPath.stroke_width * Math.abs(transform.a)).toString(),
         "data-pcb-component-id": silkscreenPath.pcb_component_id,
         "data-pcb-silkscreen-path-id": silkscreenPath.pcb_silkscreen_path_id
@@ -353,6 +359,7 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
     attributes: {
       x: "0",
       y: "0",
+      fill: "#f2eda1",
       "font-family": "Arial, sans-serif",
       "font-size": transformedFontSize.toString(),
       "text-anchor": "middle",
@@ -406,7 +413,8 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, transform) {
       width: transformedWidth.toString(),
       height: transformedHeight.toString(),
       class: `pcb-silkscreen-rect pcb-silkscreen-${layer}`,
-      stroke: "red",
+      fill: "none",
+      stroke: "#f2eda1",
       "stroke-width": "1",
       "data-pcb-silkscreen-rect-id": pcb_silkscreen_rect_id
     },
@@ -436,9 +444,6 @@ function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, transform)
     center.y
   ]);
   const transformedRadius = radius * Math.abs(transform.a);
-  console.debug(
-    `Transformed Circle - X: ${transformedX}, Y: ${transformedY}, Radius: ${transformedRadius}`
-  );
   const svgObject = {
     name: "circle",
     type: "element",
@@ -447,14 +452,13 @@ function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, transform)
       cy: transformedY.toString(),
       r: transformedRadius.toString(),
       class: `pcb-silkscreen-circle pcb-silkscreen-${layer}`,
-      stroke: "red",
-      "stroke-width": "3",
+      stroke: "#f2eda1",
+      "stroke-width": "1",
       "data-pcb-silkscreen-circle-id": pcb_silkscreen_circle_id
     },
     value: "",
     children: []
   };
-  console.log(svgObject);
   return [svgObject];
 }
 
@@ -488,6 +492,7 @@ function createSvgObjectsFromPcbSilkscreenLine(pcbSilkscreenLine, transform) {
         y1: transformedY1.toString(),
         x2: transformedX2.toString(),
         y2: transformedY2.toString(),
+        stroke: "#f2eda1",
         "stroke-width": transformedStrokeWidth.toString(),
         class: `pcb-silkscreen-line pcb-silkscreen-${layer}`,
         "data-pcb-silkscreen-line-id": pcb_silkscreen_line_id
@@ -532,7 +537,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: "",
@@ -540,14 +545,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;
 }
 
@@ -655,6 +674,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()
       }
@@ -681,6 +701,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()
@@ -691,6 +712,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()
@@ -972,19 +994,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; }
-              .pcb-silkscreen { fill: none; }
-              .pcb-silkscreen-top { stroke: #f2eda1; }
-              .pcb-silkscreen-bottom { stroke: #f2eda1; }
-              .pcb-silkscreen-text { fill: #f2eda1; }
-            `
+            value: ""
           }
         ]
       },
@@ -995,6 +1005,7 @@ function convertCircuitJsonToPcbSvg(soup, options) {
           class: "boundary",
           x: "0",
           y: "0",
+          fill: "#000",
           width: svgWidth.toString(),
           height: svgHeight.toString()
         }
@@ -1139,6 +1150,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(),