circuit-to-svg 0.0.157 → 0.0.158

package/dist/index.js

@@ -938,7 +938,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
             y: (-height / 2).toString(),
             width: width.toString(),
             height: height.toString(),
-            transform: `translate(${x} ${y}) rotate(${-pad.ccw_rotation})`
+            transform: `translate(${x} ${y}) rotate(${-pad.ccw_rotation})`,
+            "data-layer": pad.layer
           }
         }
       ];
@@ -953,7 +954,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
           x: (x - width / 2).toString(),
           y: (y - height / 2).toString(),
           width: width.toString(),
-          height: height.toString()
+          height: height.toString(),
+          "data-layer": pad.layer
         }
       }
     ];
@@ -975,7 +977,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
           width: width.toString(),
           height: height.toString(),
           rx: radius.toString(),
-          ry: radius.toString()
+          ry: radius.toString(),
+          "data-layer": pad.layer
         }
       }
     ];
@@ -992,7 +995,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
           fill: layerNameToColor(pad.layer, colorMap2),
           cx: x.toString(),
           cy: y.toString(),
-          r: radius.toString()
+          r: radius.toString(),
+          "data-layer": pad.layer
         }
       }
     ];
@@ -1008,7 +1012,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         attributes: {
           class: "pcb-pad",
           fill: layerNameToColor(pad.layer),
-          points
+          points,
+          "data-layer": pad.layer
         }
       }
     ];
@@ -1428,8 +1433,9 @@ var OBJECT_ORDER = [
   "pcb_silkscreen_path",
   "pcb_via",
   "pcb_cutout",
-  "pcb_trace",
+  // Draw traces before SMT pads so pads appear on top
   "pcb_smtpad",
+  "pcb_trace",
   "pcb_component",
   "pcb_board"
 ];
@@ -1539,9 +1545,34 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
     drawPaddingOutsideBoard,
     colorMap: colorMap2
   };
-  let svgObjects = circuitJson.sort(
-    (a, b) => (OBJECT_ORDER.indexOf(b.type) ?? 9999) - (OBJECT_ORDER.indexOf(a.type) ?? 9999)
-  ).flatMap((elm) => createSvgObjects({ elm, circuitJson, ctx }));
+  function getLayer(elm) {
+    if (elm.type === "pcb_smtpad") {
+      return elm.layer === "top" || elm.layer === "bottom" ? elm.layer : void 0;
+    }
+    if (elm.type === "pcb_trace") {
+      for (const seg of elm.route ?? []) {
+        const candidate = "layer" in seg && seg.layer || "from_layer" in seg && seg.from_layer || "to_layer" in seg && seg.to_layer || void 0;
+        if (candidate === "top" || candidate === "bottom") {
+          return candidate;
+        }
+      }
+    }
+    return void 0;
+  }
+  function isCopper(elm) {
+    return elm.type === "pcb_trace" || elm.type === "pcb_smtpad";
+  }
+  let svgObjects = circuitJson.sort((a, b) => {
+    const layerA = getLayer(a);
+    const layerB = getLayer(b);
+    if (isCopper(a) && isCopper(b) && layerA !== layerB) {
+      if (layerA === "top") return 1;
+      if (layerB === "top") return -1;
+      if (layerA === "bottom") return -1;
+      if (layerB === "bottom") return 1;
+    }
+    return (OBJECT_ORDER.indexOf(b.type) ?? 9999) - (OBJECT_ORDER.indexOf(a.type) ?? 9999);
+  }).flatMap((elm) => createSvgObjects({ elm, circuitJson, ctx }));
   let strokeWidth = String(0.05 * scaleFactor);
   for (const element of circuitJson) {
     if ("stroke_width" in element) {