circuit-to-svg 0.0.225 → 0.0.227

package/dist/index.js

@@ -35,7 +35,7 @@ function createSvgObjectsFromPcbTraceError(pcbTraceError, circuitJson, ctx) {
         x: pcbTraceError.center.x,
         y: pcbTraceError.center.y
       });
-      return [
+      return annotateTraceErrorSvgObjects([
         {
           name: "rect",
           type: "element",
@@ -72,7 +72,7 @@ function createSvgObjectsFromPcbTraceError(pcbTraceError, circuitJson, ctx) {
           ],
           value: ""
         }
-      ];
+      ]);
     } else return [];
   }
   const screenPort1 = applyToPoint(transform, {
@@ -158,7 +158,7 @@ function createSvgObjectsFromPcbTraceError(pcbTraceError, circuitJson, ctx) {
       value: ""
     }
   ];
-  return svgObjects;
+  return annotateTraceErrorSvgObjects(svgObjects);
 }
 function createSvgObjectsForViaTraceError(pcbTraceError, via, ctx) {
   const { transform } = ctx;
@@ -180,7 +180,7 @@ function createSvgObjectsForViaTraceError(pcbTraceError, via, ctx) {
     const boxHeight = 20;
     const midX = (screenCenter.x + screenVia.x) / 2;
     const midY = (screenCenter.y + screenVia.y) / 2;
-    return [
+    return annotateTraceErrorSvgObjects([
       // Rotated bounding box
       {
         name: "rect",
@@ -237,10 +237,33 @@ function createSvgObjectsForViaTraceError(pcbTraceError, via, ctx) {
         ],
         value: ""
       }
-    ];
+    ]);
   }
   return [];
 }
+function annotateTraceErrorSvgObjects(objects) {
+  return objects.map((object) => ({
+    ...object,
+    attributes: {
+      ...object.attributes ?? {},
+      "data-type": object.attributes?.["data-type"] ?? "pcb_trace_error",
+      "data-pcb-layer": object.attributes?.["data-pcb-layer"] ?? "overlay"
+    },
+    children: (object.children ?? []).map((child) => {
+      if (child?.type === "element") {
+        return {
+          ...child,
+          attributes: {
+            ...child.attributes ?? {},
+            "data-type": child.attributes?.["data-type"] ?? "pcb_trace_error",
+            "data-pcb-layer": child.attributes?.["data-pcb-layer"] ?? "overlay"
+          }
+        };
+      }
+      return child;
+    })
+  }));
+}
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-fabrication-note-path.ts
 import { applyToPoint as applyToPoint2 } from "transformation-matrix";
@@ -265,7 +288,9 @@ function createSvgObjectsFromPcbFabricationNotePath(fabNotePath, ctx) {
         d: path,
         "stroke-width": (fabNotePath.stroke_width * Math.abs(transform.a)).toString(),
         "data-pcb-component-id": fabNotePath.pcb_component_id,
-        "data-pcb-fabrication-note-path-id": fabNotePath.pcb_fabrication_note_path_id
+        "data-pcb-fabrication-note-path-id": fabNotePath.pcb_fabrication_note_path_id,
+        "data-type": "pcb_fabrication_note_path",
+        "data-pcb-layer": "overlay"
       },
       value: "",
       children: []
@@ -314,7 +339,9 @@ function createSvgObjectsFromPcbFabricationNoteText(pcbFabNoteText, ctx) {
       "dominant-baseline": "central",
       transform: matrixToString(textTransform),
       class: "pcb-fabrication-note-text",
-      fill: color || "rgba(255,255,255,0.5)"
+      fill: color || "rgba(255,255,255,0.5)",
+      "data-type": "pcb_fabrication_note_text",
+      "data-pcb-layer": "overlay"
     },
     children: [
       {
@@ -335,6 +362,7 @@ import { applyToPoint as applyToPoint4 } from "transformation-matrix";
 function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
   const { transform, colorMap: colorMap2 } = ctx;
   const [x, y] = applyToPoint4(transform, [hole.x, hole.y]);
+  const copperLayer = Array.isArray(hole.layers) && hole.layers[0] || hole.layer || "top";
   if (hole.shape === "pill") {
     const scaledOuterWidth = hole.outer_width * Math.abs(transform.a);
     const scaledOuterHeight = hole.outer_height * Math.abs(transform.a);
@@ -352,6 +380,10 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
       {
         name: "g",
         type: "element",
+        attributes: {
+          "data-type": "pcb_plated_hole",
+          "data-pcb-layer": "through"
+        },
         children: [
           // Outer pill shape
           {
@@ -361,7 +393,9 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               class: "pcb-hole-outer",
               fill: colorMap2.copper.top,
               d: `M${-outerRadiusX},${-straightLength / 2} v${straightLength} a${outerRadiusX},${outerRadiusX} 0 0 0 ${scaledOuterWidth},0 v-${straightLength} a${outerRadiusX},${outerRadiusX} 0 0 0 -${scaledOuterWidth},0 z`,
-              transform: outerTransform
+              transform: outerTransform,
+              "data-type": "pcb_plated_hole",
+              "data-pcb-layer": copperLayer
             },
             value: "",
             children: []
@@ -374,14 +408,15 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               class: "pcb-hole-inner",
               fill: colorMap2.drill,
               d: `M${-innerRadiusX},${-(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`,
-              transform: innerTransform
+              transform: innerTransform,
+              "data-type": "pcb_plated_hole_drill",
+              "data-pcb-layer": "drill"
             },
             value: "",
             children: []
           }
         ],
-        value: "",
-        attributes: {}
+        value: ""
       }
     ];
   }
@@ -396,6 +431,10 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
       {
         name: "g",
         type: "element",
+        attributes: {
+          "data-type": "pcb_plated_hole",
+          "data-pcb-layer": "through"
+        },
         children: [
           {
             name: "circle",
@@ -405,7 +444,9 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               fill: colorMap2.copper.top,
               cx: x.toString(),
               cy: y.toString(),
-              r: outerRadius.toString()
+              r: outerRadius.toString(),
+              "data-type": "pcb_plated_hole",
+              "data-pcb-layer": copperLayer
             },
             value: "",
             children: []
@@ -418,14 +459,15 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               fill: colorMap2.drill,
               cx: x.toString(),
               cy: y.toString(),
-              r: innerRadius.toString()
+              r: innerRadius.toString(),
+              "data-type": "pcb_plated_hole_drill",
+              "data-pcb-layer": "drill"
             },
             value: "",
             children: []
           }
         ],
-        value: "",
-        attributes: {}
+        value: ""
       }
     ];
   }
@@ -444,6 +486,10 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
       {
         name: "g",
         type: "element",
+        attributes: {
+          "data-type": "pcb_plated_hole",
+          "data-pcb-layer": "through"
+        },
         children: [
           // Rectangular pad (outer shape)
           {
@@ -459,7 +505,9 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               ...scaledRectBorderRadius ? {
                 rx: scaledRectBorderRadius.toString(),
                 ry: scaledRectBorderRadius.toString()
-              } : {}
+              } : {},
+              "data-type": "pcb_plated_hole",
+              "data-pcb-layer": copperLayer
             },
             value: "",
             children: []
@@ -473,14 +521,15 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               fill: colorMap2.drill,
               cx: holeCx.toString(),
               cy: holeCy.toString(),
-              r: holeRadius.toString()
+              r: holeRadius.toString(),
+              "data-type": "pcb_plated_hole_drill",
+              "data-pcb-layer": "drill"
             },
             value: "",
             children: []
           }
         ],
-        value: "",
-        attributes: {}
+        value: ""
       }
     ];
   }
@@ -503,6 +552,10 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
       {
         name: "g",
         type: "element",
+        attributes: {
+          "data-type": "pcb_plated_hole",
+          "data-pcb-layer": "through"
+        },
         children: [
           // Rectangular pad (outer shape)
           {
@@ -518,7 +571,9 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               ...scaledRectBorderRadius ? {
                 rx: scaledRectBorderRadius.toString(),
                 ry: scaledRectBorderRadius.toString()
-              } : {}
+              } : {},
+              "data-type": "pcb_plated_hole",
+              "data-pcb-layer": copperLayer
             },
             value: "",
             children: []
@@ -535,14 +590,15 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               width: scaledHoleWidth.toString(),
               height: scaledHoleHeight.toString(),
               rx: holeRadius.toString(),
-              ry: holeRadius.toString()
+              ry: holeRadius.toString(),
+              "data-type": "pcb_plated_hole_drill",
+              "data-pcb-layer": "drill"
             },
             value: "",
             children: []
           }
         ],
-        value: "",
-        attributes: {}
+        value: ""
       }
     ];
   }
@@ -565,6 +621,10 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
       {
         name: "g",
         type: "element",
+        attributes: {
+          "data-type": "pcb_plated_hole",
+          "data-pcb-layer": "through"
+        },
         children: [
           {
             name: "rect",
@@ -580,7 +640,9 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               ...scaledRectBorderRadius ? {
                 rx: scaledRectBorderRadius.toString(),
                 ry: scaledRectBorderRadius.toString()
-              } : {}
+              } : {},
+              "data-type": "pcb_plated_hole",
+              "data-pcb-layer": copperLayer
             },
             value: "",
             children: []
@@ -597,14 +659,15 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
               height: scaledHoleHeight.toString(),
               rx: holeRadius.toString(),
               ry: holeRadius.toString(),
-              transform: `translate(${holeCenterX} ${holeCenterY}) rotate(${-rotatedHole.hole_ccw_rotation})`
+              transform: `translate(${holeCenterX} ${holeCenterY}) rotate(${-rotatedHole.hole_ccw_rotation})`,
+              "data-type": "pcb_plated_hole_drill",
+              "data-pcb-layer": "drill"
             },
             value: "",
             children: []
           }
         ],
-        value: "",
-        attributes: {}
+        value: ""
       }
     ];
   }
@@ -641,7 +704,9 @@ function createSvgObjectsFromPcbSilkscreenPath(silkscreenPath, ctx) {
         "stroke-linecap": "round",
         "stroke-linejoin": "round",
         "data-pcb-component-id": silkscreenPath.pcb_component_id,
-        "data-pcb-silkscreen-path-id": silkscreenPath.pcb_silkscreen_path_id
+        "data-pcb-silkscreen-path-id": silkscreenPath.pcb_silkscreen_path_id,
+        "data-type": "pcb_silkscreen_path",
+        "data-pcb-layer": layer
       },
       value: "",
       children: []
@@ -770,7 +835,9 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, ctx) {
       transform: matrixToString2(textTransform),
       class: `pcb-silkscreen-text pcb-silkscreen-${layer}`,
       "data-pcb-silkscreen-text-id": pcbSilkscreenText.pcb_component_id,
-      stroke: "none"
+      stroke: "none",
+      "data-type": "pcb_silkscreen_text",
+      "data-pcb-layer": layer
     },
     children,
     value: ""
@@ -812,7 +879,9 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, ctx) {
     width: transformedWidth.toString(),
     height: transformedHeight.toString(),
     class: `pcb-silkscreen-rect pcb-silkscreen-${layer}`,
-    "data-pcb-silkscreen-rect-id": pcb_silkscreen_rect_id
+    "data-pcb-silkscreen-rect-id": pcb_silkscreen_rect_id,
+    "data-type": "pcb_silkscreen_rect",
+    "data-pcb-layer": layer
   };
   attributes.fill = is_filled ? color : "none";
   let actualHasStroke;
@@ -875,7 +944,9 @@ function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, ctx) {
       class: `pcb-silkscreen-circle pcb-silkscreen-${layer}`,
       stroke: color,
       "stroke-width": transformedStrokeWidth.toString(),
-      "data-pcb-silkscreen-circle-id": pcb_silkscreen_circle_id
+      "data-pcb-silkscreen-circle-id": pcb_silkscreen_circle_id,
+      "data-type": "pcb_silkscreen_circle",
+      "data-pcb-layer": layer
     },
     value: "",
     children: []
@@ -917,7 +988,9 @@ function createSvgObjectsFromPcbSilkscreenLine(pcbSilkscreenLine, ctx) {
         stroke: color,
         "stroke-width": transformedStrokeWidth.toString(),
         class: `pcb-silkscreen-line pcb-silkscreen-${layer}`,
-        "data-pcb-silkscreen-line-id": pcb_silkscreen_line_id
+        "data-pcb-silkscreen-line-id": pcb_silkscreen_line_id,
+        "data-type": "pcb_silkscreen_line",
+        "data-pcb-layer": layer
       },
       value: "",
       children: []
@@ -1015,7 +1088,8 @@ function createSvgObjectsFromPcbTrace(trace, ctx) {
           "stroke-linecap": "round",
           "stroke-linejoin": "round",
           "shape-rendering": "crispEdges",
-          "data-layer": layer
+          "data-type": "pcb_trace",
+          "data-pcb-layer": layer
         }
       };
       const maskObject = {
@@ -1032,7 +1106,8 @@ function createSvgObjectsFromPcbTrace(trace, ctx) {
           "stroke-linecap": "round",
           "stroke-linejoin": "round",
           "shape-rendering": "crispEdges",
-          "data-layer": layer
+          "data-type": "pcb_soldermask",
+          "data-pcb-layer": layer
         }
       };
       svgObjects.push(maskObject, copperObject);
@@ -1051,23 +1126,13 @@ function createSvgObjectsFromPcbTrace(trace, ctx) {
           "stroke-linecap": "round",
           "stroke-linejoin": "round",
           "shape-rendering": "crispEdges",
-          "data-layer": layer
+          "data-type": renderSolderMask ? "pcb_soldermask" : "pcb_trace",
+          "data-pcb-layer": layer
         }
       };
       svgObjects.push(maskOnlyObject);
     }
   }
-  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;
 }
 
@@ -1098,7 +1163,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
           width: width.toString(),
           height: height.toString(),
           transform: `translate(${x} ${y}) rotate(${-pad.ccw_rotation})`,
-          "data-layer": pad.layer,
+          "data-type": "pcb_smtpad",
+          "data-pcb-layer": pad.layer,
           ...scaledBorderRadius ? {
             rx: scaledBorderRadius.toString(),
             ry: scaledBorderRadius.toString()
@@ -1116,7 +1182,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         attributes: {
           ...padElement2.attributes,
           class: "pcb-solder-mask",
-          fill: solderMaskColor
+          fill: solderMaskColor,
+          "data-type": "pcb_soldermask"
         }
       };
       return [padElement2, maskElement2];
@@ -1133,7 +1200,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         y: (y - height / 2).toString(),
         width: width.toString(),
         height: height.toString(),
-        "data-layer": pad.layer,
+        "data-type": "pcb_smtpad",
+        "data-pcb-layer": pad.layer,
         ...scaledBorderRadius ? {
           rx: scaledBorderRadius.toString(),
           ry: scaledBorderRadius.toString()
@@ -1151,7 +1219,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
       attributes: {
         ...padElement.attributes,
         class: "pcb-solder-mask",
-        fill: solderMaskColor
+        fill: solderMaskColor,
+        "data-type": "pcb_soldermask"
       }
     };
     return [padElement, maskElement];
@@ -1175,7 +1244,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         height: height.toString(),
         rx: radius.toString(),
         ry: radius.toString(),
-        "data-layer": pad.layer
+        "data-type": "pcb_smtpad",
+        "data-pcb-layer": pad.layer
       }
     };
     if (!shouldRenderSolderMask) {
@@ -1189,7 +1259,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
       attributes: {
         ...padElement.attributes,
         class: "pcb-solder-mask",
-        fill: solderMaskColor
+        fill: solderMaskColor,
+        "data-type": "pcb_soldermask"
       }
     };
     return [padElement, maskElement];
@@ -1208,7 +1279,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         cx: x.toString(),
         cy: y.toString(),
         r: radius.toString(),
-        "data-layer": pad.layer
+        "data-type": "pcb_smtpad",
+        "data-pcb-layer": pad.layer
       }
     };
     if (!shouldRenderSolderMask) {
@@ -1222,7 +1294,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
       attributes: {
         ...padElement.attributes,
         class: "pcb-solder-mask",
-        fill: solderMaskColor
+        fill: solderMaskColor,
+        "data-type": "pcb_soldermask"
       }
     };
     return [padElement, maskElement];
@@ -1240,7 +1313,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         class: "pcb-pad",
         fill: layerNameToColor(pad.layer, colorMap2),
         points: points.map((p) => p.join(",")).join(" "),
-        "data-layer": pad.layer
+        "data-type": "pcb_smtpad",
+        "data-pcb-layer": pad.layer
       }
     };
     if (!shouldRenderSolderMask) {
@@ -1254,7 +1328,8 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
       attributes: {
         ...padElement.attributes,
         class: "pcb-solder-mask",
-        fill: solderMaskColor
+        fill: solderMaskColor,
+        "data-type": "pcb_soldermask"
       }
     };
     return [padElement, maskElement];
@@ -1306,7 +1381,9 @@ function createSvgObjectsFromPcbBoard(pcbBoard, ctx) {
         d: path,
         fill: "none",
         stroke: colorMap2.boardOutline,
-        "stroke-width": (0.1 * Math.abs(transform.a)).toString()
+        "stroke-width": (0.1 * Math.abs(transform.a)).toString(),
+        "data-type": "pcb_board",
+        "data-pcb-layer": "board"
       }
     }
   ];
@@ -1326,6 +1403,10 @@ function createSvgObjectsFromPcbVia(hole, ctx) {
   return {
     name: "g",
     type: "element",
+    attributes: {
+      "data-type": "pcb_via",
+      "data-pcb-layer": "through"
+    },
     children: [
       {
         name: "circle",
@@ -1335,7 +1416,9 @@ function createSvgObjectsFromPcbVia(hole, ctx) {
           fill: colorMap2.copper.top,
           cx: x.toString(),
           cy: y.toString(),
-          r: outerRadius.toString()
+          r: outerRadius.toString(),
+          "data-type": "pcb_via",
+          "data-pcb-layer": "top"
         }
       },
       {
@@ -1346,7 +1429,9 @@ function createSvgObjectsFromPcbVia(hole, ctx) {
           fill: colorMap2.drill,
           cx: x.toString(),
           cy: y.toString(),
-          r: innerRadius.toString()
+          r: innerRadius.toString(),
+          "data-type": "pcb_via",
+          "data-pcb-layer": "drill"
         }
       }
     ]
@@ -1371,7 +1456,9 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
             cx: x.toString(),
             cy: y.toString(),
             r: radius.toString(),
-            fill: colorMap2.drill
+            fill: colorMap2.drill,
+            "data-type": "pcb_hole",
+            "data-pcb-layer": "drill"
           },
           children: [],
           value: ""
@@ -1388,7 +1475,9 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
           y: (y - radius).toString(),
           width: scaledDiameter.toString(),
           height: scaledDiameter.toString(),
-          fill: colorMap2.drill
+          fill: colorMap2.drill,
+          "data-type": "pcb_hole",
+          "data-pcb-layer": "drill"
         },
         children: [],
         value: ""
@@ -1410,7 +1499,9 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
           cy: y.toString(),
           rx: rx.toString(),
           ry: ry.toString(),
-          fill: colorMap2.drill
+          fill: colorMap2.drill,
+          "data-type": "pcb_hole",
+          "data-pcb-layer": "drill"
         },
         children: [],
         value: ""
@@ -1520,7 +1611,9 @@ function createSvgObjectsForRatsNest(circuitJson, ctx) {
       y2: transformedEnd[1].toString(),
       stroke: "white",
       "stroke-width": "1",
-      "stroke-dasharray": "6,6"
+      "stroke-dasharray": "6,6",
+      "data-type": "pcb_rats_nest",
+      "data-pcb-layer": "overlay"
     };
     svgObjects.push({
       name: "line",
@@ -1565,7 +1658,9 @@ function createSvgObjectsFromPcbCutout(cutout, ctx) {
           fill: colorMap2.drill,
           transform: matrixToString6(
             compose3(translate3(cx, cy), rotate3(svgRotation * Math.PI / 180))
-          )
+          ),
+          "data-type": "pcb_cutout",
+          "data-pcb-layer": "drill"
         },
         children: [],
         value: ""
@@ -1588,7 +1683,9 @@ function createSvgObjectsFromPcbCutout(cutout, ctx) {
           cx: cx.toString(),
           cy: cy.toString(),
           r: scaledRadius.toString(),
-          fill: colorMap2.drill
+          fill: colorMap2.drill,
+          "data-type": "pcb_cutout",
+          "data-pcb-layer": "drill"
         },
         children: [],
         value: ""
@@ -1609,7 +1706,9 @@ function createSvgObjectsFromPcbCutout(cutout, ctx) {
         attributes: {
           class: "pcb-cutout pcb-cutout-polygon",
           points: pointsString,
-          fill: colorMap2.drill
+          fill: colorMap2.drill,
+          "data-type": "pcb_cutout",
+          "data-pcb-layer": "drill"
         },
         children: [],
         value: ""
@@ -1685,7 +1784,8 @@ function createSvgObjectsFromPcbCopperPour(pour, ctx) {
           transform: matrixToString7(
             compose4(translate4(cx, cy), rotate4(svgRotation * Math.PI / 180))
           ),
-          "data-layer": layer
+          "data-type": "pcb_copper_pour",
+          "data-pcb-layer": layer
         },
         children: [],
         value: ""
@@ -1707,7 +1807,8 @@ function createSvgObjectsFromPcbCopperPour(pour, ctx) {
           points: pointsString,
           fill: color,
           "fill-opacity": opacity,
-          "data-layer": layer
+          "data-type": "pcb_copper_pour",
+          "data-pcb-layer": layer
         },
         children: [],
         value: ""
@@ -1730,7 +1831,8 @@ function createSvgObjectsFromPcbCopperPour(pour, ctx) {
           fill: color,
           "fill-rule": "evenodd",
           "fill-opacity": opacity,
-          "data-layer": layer
+          "data-type": "pcb_copper_pour",
+          "data-pcb-layer": layer
         },
         children: [],
         value: ""
@@ -1756,7 +1858,11 @@ function createSvgObjectsFromPcbComponent(component, ctx) {
     {
       name: "g",
       type: "element",
-      attributes: { transform: transformStr },
+      attributes: {
+        transform: transformStr,
+        "data-type": "pcb_component",
+        "data-pcb-layer": component.layer ?? "top"
+      },
       children: [
         {
           name: "rect",
@@ -1768,7 +1874,9 @@ function createSvgObjectsFromPcbComponent(component, ctx) {
             width: scaledWidth.toString(),
             height: scaledHeight.toString(),
             fill: ctx.colorMap.debugComponent.fill ?? "transparent",
-            stroke: ctx.colorMap.debugComponent.stroke ?? "transparent"
+            stroke: ctx.colorMap.debugComponent.stroke ?? "transparent",
+            "data-type": "pcb_component",
+            "data-pcb-layer": component.layer ?? "top"
           }
         }
       ],
@@ -1789,7 +1897,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.224",
+  version: "0.0.226",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -1835,23 +1943,76 @@ var package_default = {
 // lib/package-version.ts
 var CIRCUIT_TO_SVG_VERSION = package_default.version;
 
+// lib/pcb/sort-svg-objects-by-pcb-layer.ts
+var TYPE_PRIORITY = {
+  pcb_background: 0,
+  pcb_boundary: 1,
+  pcb_board: 10,
+  pcb_cutout: 15,
+  pcb_hole: 18,
+  pcb_plated_hole_drill: 19,
+  pcb_plated_hole: 20,
+  pcb_trace: 30,
+  pcb_smtpad: 30,
+  pcb_copper_pour: 35,
+  pcb_via: 36,
+  pcb_soldermask: 40,
+  pcb_solder_paste: 45,
+  pcb_silkscreen_text: 50,
+  pcb_silkscreen_path: 50,
+  pcb_silkscreen_rect: 50,
+  pcb_silkscreen_circle: 50,
+  pcb_silkscreen_line: 50,
+  pcb_component: 60,
+  pcb_fabrication_note_text: 70,
+  pcb_fabrication_note_path: 70,
+  pcb_trace_error: 80,
+  pcb_rats_nest: 85
+};
+var DEFAULT_TYPE_PRIORITY = 100;
+function sortSvgObjectsByPcbLayer(objects) {
+  return objects.map((object, index) => ({
+    object,
+    index,
+    layerPriority: getLayerPriority(
+      object.attributes?.["data-pcb-layer"] ?? void 0
+    ),
+    typePriority: getTypePriority(
+      object.attributes?.["data-type"] ?? void 0
+    )
+  })).sort((a, b) => {
+    if (a.layerPriority !== b.layerPriority) {
+      return a.layerPriority - b.layerPriority;
+    }
+    if (a.typePriority !== b.typePriority) {
+      return a.typePriority - b.typePriority;
+    }
+    return a.index - b.index;
+  }).map(({ object }) => object);
+}
+function getLayerPriority(layer) {
+  if (!layer) return 500;
+  const normalized = layer.toLowerCase();
+  if (normalized === "global") return -100;
+  if (normalized === "bottom") return 0;
+  if (normalized === "board") return 2;
+  if (normalized.startsWith("inner")) {
+    const match = normalized.match(/\d+/);
+    const layerIndex = match ? parseInt(match[0], 10) : 0;
+    return 5 + layerIndex;
+  }
+  if (normalized === "through") return 18;
+  if (normalized === "top") return 20;
+  if (normalized === "drill") return 30;
+  if (normalized === "overlay") return 40;
+  return 10;
+}
+function getTypePriority(type) {
+  if (!type) return DEFAULT_TYPE_PRIORITY;
+  return TYPE_PRIORITY[type] ?? DEFAULT_TYPE_PRIORITY;
+}
+
 // lib/pcb/convert-circuit-json-to-pcb-svg.ts
-var OBJECT_ORDER = [
-  "pcb_trace_error",
-  "pcb_plated_hole",
-  "pcb_fabrication_note_text",
-  "pcb_fabrication_note_path",
-  "pcb_silkscreen_text",
-  "pcb_silkscreen_path",
-  "pcb_via",
-  "pcb_cutout",
-  "pcb_copper_pour",
-  // Draw traces before SMT pads so pads appear on top
-  "pcb_smtpad",
-  "pcb_trace",
-  "pcb_component",
-  "pcb_board"
-];
 function convertCircuitJsonToPcbSvg(circuitJson, options) {
   const drawPaddingOutsideBoard = options?.drawPaddingOutsideBoard ?? true;
   const layer = options?.layer;
@@ -1985,34 +2146,10 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
     colorMap: colorMap2,
     renderSolderMask: options?.renderSolderMask
   };
-  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 }));
+  const unsortedSvgObjects = circuitJson.flatMap(
+    (elm) => createSvgObjects({ elm, circuitJson, ctx })
+  );
+  let svgObjects = sortSvgObjectsByPcbLayer(unsortedSvgObjects);
   let strokeWidth = String(0.05 * scaleFactor);
   for (const element of circuitJson) {
     if ("stroke_width" in element) {
@@ -2022,7 +2159,7 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
   }
   if (options?.shouldDrawRatsNest) {
     const ratsNestObjects = createSvgObjectsForRatsNest(circuitJson, ctx);
-    svgObjects = svgObjects.concat(ratsNestObjects);
+    svgObjects = sortSvgObjectsByPcbLayer([...svgObjects, ...ratsNestObjects]);
   }
   const children = [
     {
@@ -2050,7 +2187,9 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
         y: "0",
         fill: options?.backgroundColor ?? "#000",
         width: svgWidth.toString(),
-        height: svgHeight.toString()
+        height: svgHeight.toString(),
+        "data-type": "pcb_background",
+        "data-pcb-layer": "global"
       },
       children: []
     }
@@ -2216,7 +2355,9 @@ function createSvgObjectFromPcbBoundary(transform, minX, minY, maxX, maxY) {
       x: x.toString(),
       y: y.toString(),
       width: width.toString(),
-      height: height.toString()
+      height: height.toString(),
+      "data-type": "pcb_boundary",
+      "data-pcb-layer": "global"
     }
   };
 }
@@ -2945,7 +3086,7 @@ function createSvgObjectsFromAssemblySmtPad(pad, ctx) {
 }
 
 // lib/assembly/convert-circuit-json-to-assembly-svg.ts
-var OBJECT_ORDER2 = [
+var OBJECT_ORDER = [
   "pcb_component",
   "pcb_smtpad",
   "pcb_hole",
@@ -2988,7 +3129,7 @@ function convertCircuitJsonToAssemblySvg(soup, options) {
   );
   const ctx = { transform };
   const svgObjects = soup.sort(
-    (a, b) => (OBJECT_ORDER2.indexOf(b.type) ?? 9999) - (OBJECT_ORDER2.indexOf(a.type) ?? 9999)
+    (a, b) => (OBJECT_ORDER.indexOf(b.type) ?? 9999) - (OBJECT_ORDER.indexOf(a.type) ?? 9999)
   ).flatMap((item) => createSvgObjects2(item, ctx, soup));
   const softwareUsedString = getSoftwareUsedString(soup);
   const version = CIRCUIT_TO_SVG_VERSION;
@@ -4161,7 +4302,7 @@ function getClosestEdge(port_pos_real, board_bounds) {
 }
 
 // lib/pinout/convert-circuit-json-to-pinout-svg.ts
-var OBJECT_ORDER3 = [
+var OBJECT_ORDER2 = [
   "pcb_board",
   "pcb_smtpad",
   "pcb_hole",
@@ -4321,7 +4462,7 @@ function convertCircuitJsonToPinoutSvg(soup, options) {
     label_positions
   };
   const svgObjects = soup.sort(
-    (a, b) => (OBJECT_ORDER3.indexOf(a.type) ?? 9999) - (OBJECT_ORDER3.indexOf(b.type) ?? 9999)
+    (a, b) => (OBJECT_ORDER2.indexOf(a.type) ?? 9999) - (OBJECT_ORDER2.indexOf(b.type) ?? 9999)
   ).flatMap((item) => createSvgObjects3(item, ctx, soup));
   const softwareUsedString = getSoftwareUsedString(soup);
   const version = CIRCUIT_TO_SVG_VERSION;
@@ -8888,7 +9029,9 @@ function createSvgObjectsFromSolderPaste(solderPaste, ctx) {
             y: (-height / 2).toString(),
             width: width.toString(),
             height: height.toString(),
-            transform: `translate(${x} ${y}) rotate(${-solderPaste.ccw_rotation})`
+            transform: `translate(${x} ${y}) rotate(${-solderPaste.ccw_rotation})`,
+            "data-type": "pcb_solder_paste",
+            "data-pcb-layer": solderPaste.layer
           }
         }
       ];
@@ -8903,7 +9046,9 @@ function createSvgObjectsFromSolderPaste(solderPaste, ctx) {
           x: (x - width / 2).toString(),
           y: (y - height / 2).toString(),
           width: width.toString(),
-          height: height.toString()
+          height: height.toString(),
+          "data-type": "pcb_solder_paste",
+          "data-pcb-layer": solderPaste.layer
         }
       }
     ];
@@ -8923,7 +9068,9 @@ function createSvgObjectsFromSolderPaste(solderPaste, ctx) {
           y: (y - height / 2).toString(),
           width: width.toString(),
           height: height.toString(),
-          rx: radius.toString()
+          rx: radius.toString(),
+          "data-type": "pcb_solder_paste",
+          "data-pcb-layer": solderPaste.layer
         }
       }
     ];
@@ -8939,7 +9086,9 @@ function createSvgObjectsFromSolderPaste(solderPaste, ctx) {
           fill: solderPasteLayerNameToColor(solderPaste.layer),
           cx: x.toString(),
           cy: y.toString(),
-          r: radius.toString()
+          r: radius.toString(),
+          "data-type": "pcb_solder_paste",
+          "data-pcb-layer": solderPaste.layer
         }
       }
     ];
@@ -8947,7 +9096,7 @@ function createSvgObjectsFromSolderPaste(solderPaste, ctx) {
 }
 
 // lib/pcb/convert-circuit-json-to-solder-paste-mask.ts
-var OBJECT_ORDER4 = [
+var OBJECT_ORDER3 = [
   "pcb_board",
   "pcb_solder_paste"
 ];
@@ -8994,7 +9143,7 @@ function convertCircuitJsonToSolderPasteMask(circuitJson, options) {
     colorMap: DEFAULT_PCB_COLOR_MAP
   };
   const svgObjects = filteredCircuitJson.sort(
-    (a, b) => (OBJECT_ORDER4.indexOf(b.type) ?? 9999) - (OBJECT_ORDER4.indexOf(a.type) ?? 9999)
+    (a, b) => (OBJECT_ORDER3.indexOf(b.type) ?? 9999) - (OBJECT_ORDER3.indexOf(a.type) ?? 9999)
   ).flatMap((item) => createSvgObjects4({ elm: item, ctx }));
   const softwareUsedString = getSoftwareUsedString(circuitJson);
   const version = CIRCUIT_TO_SVG_VERSION;