circuit-to-svg 0.0.132 → 0.0.134

package/README.md

@@ -50,6 +50,12 @@ Converts a schematic circuit description to an SVG string.
 
 Converts a PCB layout description to an SVG string.
 
+#### Options
+
+- `width` and `height` – dimensions of the output SVG. Defaults to `800x600`.
+- `matchBoardAspectRatio` – if `true`, adjust the SVG dimensions so the
+  resulting aspect ratio matches the `pcb_board` found in the circuit JSON.
+
 ## Contributing
 
 Contributions are welcome! Please feel free to submit a Pull Request.

package/dist/index.d.ts

@@ -1,12 +1,20 @@
 import { AnyCircuitElement } from 'circuit-json';
+import { Matrix } from 'transformation-matrix';
 
 interface Options$3 {
     width?: number;
     height?: number;
     shouldDrawErrors?: boolean;
     shouldDrawRatsNest?: boolean;
+    layer?: "top" | "bottom";
+    matchBoardAspectRatio?: boolean;
 }
-declare function convertCircuitJsonToPcbSvg(soup: AnyCircuitElement[], options?: Options$3): string;
+interface PcbContext {
+    transform: Matrix;
+    layer?: "top" | "bottom";
+    shouldDrawErrors?: boolean;
+}
+declare function convertCircuitJsonToPcbSvg(circuitJson: AnyCircuitElement[], options?: Options$3): string;
 /**
  * @deprecated use `convertCircuitJsonToPcbSvg` instead
  */
@@ -206,6 +214,6 @@ interface Options {
     width?: number;
     height?: number;
 }
-declare function convertCircuitJsonToSolderPasteMask(soup: AnyCircuitElement[], options: Options): string;
+declare function convertCircuitJsonToSolderPasteMask(circuitJson: AnyCircuitElement[], options: Options): string;
 
-export { type ColorMap, type ColorOverrides, circuitJsonToPcbSvg, circuitJsonToSchematicSvg, convertCircuitJsonToAssemblySvg, convertCircuitJsonToPcbSvg, convertCircuitJsonToSchematicSvg, convertCircuitJsonToSolderPasteMask };
+export { type ColorMap, type ColorOverrides, type PcbContext, circuitJsonToPcbSvg, circuitJsonToSchematicSvg, convertCircuitJsonToAssemblySvg, convertCircuitJsonToPcbSvg, convertCircuitJsonToSchematicSvg, convertCircuitJsonToSolderPasteMask };

package/dist/index.js

@@ -9,7 +9,8 @@ import {
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-trace-error.ts
 import { applyToPoint } from "transformation-matrix";
-function createSvgObjectsFromPcbTraceError(pcbTraceError, transform, circuitJson, shouldDrawErrors) {
+function createSvgObjectsFromPcbTraceError(pcbTraceError, circuitJson, ctx) {
+  const { transform, shouldDrawErrors } = ctx;
   if (!shouldDrawErrors) return [];
   const { pcb_port_ids } = pcbTraceError;
   const port1 = circuitJson.find(
@@ -27,7 +28,7 @@ function createSvgObjectsFromPcbTraceError(pcbTraceError, transform, circuitJson
       (el) => el.type === "pcb_via" && el.pcb_via_id === viaId
     );
     if (via && via.type === "pcb_via") {
-      return createSvgObjectsForViaTraceError(pcbTraceError, via, transform);
+      return createSvgObjectsForViaTraceError(pcbTraceError, via, ctx);
     }
     if (pcbTraceError.center) {
       const screenCenter = applyToPoint(transform, {
@@ -159,7 +160,8 @@ function createSvgObjectsFromPcbTraceError(pcbTraceError, transform, circuitJson
   ];
   return svgObjects;
 }
-function createSvgObjectsForViaTraceError(pcbTraceError, via, transform) {
+function createSvgObjectsForViaTraceError(pcbTraceError, via, ctx) {
+  const { transform } = ctx;
   if (pcbTraceError.center && via) {
     const screenCenter = applyToPoint(transform, {
       x: pcbTraceError.center.x,
@@ -242,7 +244,8 @@ function createSvgObjectsForViaTraceError(pcbTraceError, via, transform) {
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-fabrication-note-path.ts
 import { applyToPoint as applyToPoint2 } from "transformation-matrix";
-function createSvgObjectsFromPcbFabricationNotePath(fabNotePath, transform) {
+function createSvgObjectsFromPcbFabricationNotePath(fabNotePath, ctx) {
+  const { transform, layer: layerFilter } = ctx;
   if (!fabNotePath.route || !Array.isArray(fabNotePath.route)) return [];
   const firstPoint = fabNotePath.route[0];
   const lastPoint = fabNotePath.route[fabNotePath.route.length - 1];
@@ -272,13 +275,9 @@ function createSvgObjectsFromPcbFabricationNotePath(fabNotePath, transform) {
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-fabrication-note-text.ts
 import { toString as matrixToString } from "transformation-matrix";
-import {
-  applyToPoint as applyToPoint3,
-  compose,
-  rotate,
-  translate
-} from "transformation-matrix";
-function createSvgObjectsFromPcbFabricationNoteText(pcbFabNoteText, transform) {
+import { applyToPoint as applyToPoint3, compose, rotate, translate } from "transformation-matrix";
+function createSvgObjectsFromPcbFabricationNoteText(pcbFabNoteText, ctx) {
+  const { transform, layer: layerFilter } = ctx;
   const {
     anchor_position,
     anchor_alignment,
@@ -287,6 +286,7 @@ function createSvgObjectsFromPcbFabricationNoteText(pcbFabNoteText, transform) {
     layer = "top",
     color
   } = pcbFabNoteText;
+  if (layerFilter && layer !== layerFilter) return [];
   if (!anchor_position || typeof anchor_position.x !== "number" || typeof anchor_position.y !== "number") {
     console.error("Invalid anchor_position:", anchor_position);
     return [];
@@ -332,7 +332,8 @@ function createSvgObjectsFromPcbFabricationNoteText(pcbFabNoteText, transform) {
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-plated-hole.ts
 import { applyToPoint as applyToPoint4 } from "transformation-matrix";
-function createSvgObjectsFromPcbPlatedHole(hole, transform) {
+function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
+  const { transform } = ctx;
   const [x, y] = applyToPoint4(transform, [hole.x, hole.y]);
   if (hole.shape === "pill") {
     const scaledOuterWidth = hole.outer_width * Math.abs(transform.a);
@@ -529,7 +530,8 @@ var SILKSCREEN_TOP_COLOR = "#f2eda1";
 var SILKSCREEN_BOTTOM_COLOR = "#5da9e9";
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-silkscreen-path.ts
-function createSvgObjectsFromPcbSilkscreenPath(silkscreenPath, transform) {
+function createSvgObjectsFromPcbSilkscreenPath(silkscreenPath, ctx) {
+  const { transform, layer: layerFilter } = ctx;
   if (!silkscreenPath.route || !Array.isArray(silkscreenPath.route)) return [];
   let path = silkscreenPath.route.map((point, index) => {
     const [x, y] = applyToPoint5(transform, [point.x, point.y]);
@@ -541,6 +543,7 @@ function createSvgObjectsFromPcbSilkscreenPath(silkscreenPath, transform) {
     path += " Z";
   }
   const layer = silkscreenPath.layer || "top";
+  if (layerFilter && layer !== layerFilter) return [];
   const color = layer === "bottom" ? SILKSCREEN_BOTTOM_COLOR : SILKSCREEN_TOP_COLOR;
   return [
     {
@@ -572,7 +575,8 @@ import {
   scale,
   toString as matrixToString2
 } from "transformation-matrix";
-function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
+function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, ctx) {
+  const { transform, layer: layerFilter } = ctx;
   const {
     anchor_position,
     text,
@@ -581,6 +585,7 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
     ccw_rotation = 0,
     anchor_alignment = "center"
   } = pcbSilkscreenText;
+  if (layerFilter && layer !== layerFilter) return [];
   if (!anchor_position || typeof anchor_position.x !== "number" || typeof anchor_position.y !== "number") {
     console.error("Invalid anchor_position:", anchor_position);
     return [];
@@ -672,10 +677,9 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
 }
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-silkscreen-rect.ts
-import {
-  applyToPoint as applyToPoint7
-} from "transformation-matrix";
-function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, transform) {
+import { applyToPoint as applyToPoint7 } from "transformation-matrix";
+function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, ctx) {
+  const { transform, layer: layerFilter } = ctx;
   const {
     center,
     width,
@@ -684,6 +688,7 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, transform) {
     pcb_silkscreen_rect_id,
     stroke_width = 1
   } = pcbSilkscreenRect;
+  if (layerFilter && layer !== layerFilter) return [];
   if (!center || typeof center.x !== "number" || typeof center.y !== "number" || typeof width !== "number" || typeof height !== "number") {
     console.error("Invalid rectangle data:", { center, width, height });
     return [];
@@ -717,10 +722,9 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, transform) {
 }
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-silkscreen-circle.ts
-import {
-  applyToPoint as applyToPoint8
-} from "transformation-matrix";
-function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, transform) {
+import { applyToPoint as applyToPoint8 } from "transformation-matrix";
+function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, ctx) {
+  const { transform, layer: layerFilter } = ctx;
   const {
     center,
     radius,
@@ -728,6 +732,7 @@ function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, transform)
     pcb_silkscreen_circle_id,
     stroke_width = 1
   } = pcbSilkscreenCircle;
+  if (layerFilter && layer !== layerFilter) return [];
   if (!center || typeof center.x !== "number" || typeof center.y !== "number" || typeof radius !== "number") {
     console.error("Invalid PCB Silkscreen Circle data:", { center, radius });
     return [];
@@ -758,10 +763,9 @@ function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, transform)
 }
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-silkscreen-line.ts
-import {
-  applyToPoint as applyToPoint9
-} from "transformation-matrix";
-function createSvgObjectsFromPcbSilkscreenLine(pcbSilkscreenLine, transform) {
+import { applyToPoint as applyToPoint9 } from "transformation-matrix";
+function createSvgObjectsFromPcbSilkscreenLine(pcbSilkscreenLine, ctx) {
+  const { transform, layer: layerFilter } = ctx;
   const {
     x1,
     y1,
@@ -771,6 +775,7 @@ function createSvgObjectsFromPcbSilkscreenLine(pcbSilkscreenLine, transform) {
     layer = "top",
     pcb_silkscreen_line_id
   } = pcbSilkscreenLine;
+  if (layerFilter && layer !== layerFilter) return [];
   if (typeof x1 !== "number" || typeof y1 !== "number" || typeof x2 !== "number" || typeof y2 !== "number") {
     console.error("Invalid coordinates:", { x1, y1, x2, y2 });
     return [];
@@ -828,7 +833,8 @@ function solderPasteLayerNameToColor(layerName) {
 }
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-trace.ts
-function createSvgObjectsFromPcbTrace(trace, transform) {
+function createSvgObjectsFromPcbTrace(trace, ctx) {
+  const { transform, layer: layerFilter } = ctx;
   if (!trace.route || !Array.isArray(trace.route) || trace.route.length < 2)
     return [];
   const segments = pairs(trace.route);
@@ -838,6 +844,7 @@ function createSvgObjectsFromPcbTrace(trace, transform) {
     const endPoint = applyToPoint10(transform, [end.x, end.y]);
     const layer = "layer" in start ? start.layer : "layer" in end ? end.layer : null;
     if (!layer) continue;
+    if (layerFilter && layer !== layerFilter) continue;
     const layerColor = LAYER_NAME_TO_COLOR[layer] ?? "white";
     const traceWidth = "width" in start ? start.width : "width" in end ? end.width : null;
     const svgObject = {
@@ -875,8 +882,10 @@ function createSvgObjectsFromPcbTrace(trace, transform) {
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-smt-pads.ts
 import { applyToPoint as applyToPoint11 } from "transformation-matrix";
-function createSvgObjectsFromSmtPad(pad, transform) {
+function createSvgObjectsFromSmtPad(pad, ctx) {
+  const { transform, layer: layerFilter } = ctx;
   const [x, y] = applyToPoint11(transform, [pad.x, pad.y]);
+  if (layerFilter && pad.layer !== layerFilter) return [];
   if (pad.shape === "rect" || pad.shape === "rotated_rect") {
     const width = pad.width * Math.abs(transform.a);
     const height = pad.height * Math.abs(transform.d);
@@ -938,7 +947,8 @@ function createSvgObjectsFromSmtPad(pad, transform) {
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-board.ts
 import { applyToPoint as applyToPoint12 } from "transformation-matrix";
-function createSvgObjectsFromPcbBoard(pcbBoard, transform) {
+function createSvgObjectsFromPcbBoard(pcbBoard, ctx) {
+  const { transform } = ctx;
   const { width, height, center, outline } = pcbBoard;
   let path;
   if (outline && Array.isArray(outline) && outline.length >= 3) {
@@ -987,7 +997,8 @@ function createSvgObjectsFromPcbBoard(pcbBoard, transform) {
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-via.ts
 import { applyToPoint as applyToPoint13 } from "transformation-matrix";
-function createSvgObjectsFromPcbVia(hole, transform) {
+function createSvgObjectsFromPcbVia(hole, ctx) {
+  const { transform } = ctx;
   const [x, y] = applyToPoint13(transform, [hole.x, hole.y]);
   const scaledOuterWidth = hole.outer_diameter * Math.abs(transform.a);
   const scaledOuterHeight = hole.outer_diameter * Math.abs(transform.a);
@@ -1027,7 +1038,8 @@ function createSvgObjectsFromPcbVia(hole, transform) {
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-hole.ts
 import { applyToPoint as applyToPoint14 } from "transformation-matrix";
-function createSvgObjectsFromPcbHole(hole, transform) {
+function createSvgObjectsFromPcbHole(hole, ctx) {
+  const { transform } = ctx;
   const [x, y] = applyToPoint14(transform, [hole.x, hole.y]);
   if (hole.hole_shape === "circle" || hole.hole_shape === "square") {
     const scaledDiameter = hole.hole_diameter * Math.abs(transform.a);
@@ -1135,7 +1147,8 @@ var findNearestPointInNet = (sourcePoint, netId, connectivity, circuitJson) => {
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-rats-nests.ts
 import { su as su2 } from "@tscircuit/circuit-json-util";
-function createSvgObjectsForRatsNest(circuitJson, transform) {
+function createSvgObjectsForRatsNest(circuitJson, ctx) {
+  const { transform } = ctx;
   const connectivity = getFullConnectivityMapFromCircuitJson(circuitJson);
   const pcbPorts = circuitJson.filter((elm) => elm.type === "pcb_port");
   const sourceTraces = circuitJson.filter((elm) => elm.type === "source_trace");
@@ -1211,7 +1224,8 @@ import {
   translate as translate3,
   toString as matrixToString6
 } from "transformation-matrix";
-function createSvgObjectsFromPcbCutout(cutout, transform) {
+function createSvgObjectsFromPcbCutout(cutout, ctx) {
+  const { transform } = ctx;
   if (cutout.shape === "rect") {
     const rectCutout = cutout;
     const [cx, cy] = applyToPoint16(transform, [
@@ -1303,34 +1317,64 @@ var OBJECT_ORDER = [
   "pcb_component",
   "pcb_board"
 ];
-function convertCircuitJsonToPcbSvg(soup, options) {
+function convertCircuitJsonToPcbSvg(circuitJson, options) {
+  const layer = options?.layer;
   let minX = Number.POSITIVE_INFINITY;
   let minY = Number.POSITIVE_INFINITY;
   let maxX = Number.NEGATIVE_INFINITY;
   let maxY = Number.NEGATIVE_INFINITY;
-  for (const item of soup) {
-    if (item.type === "pcb_board") {
-      if (item.outline && Array.isArray(item.outline) && item.outline.length >= 3)
-        updateBoundsToIncludeOutline(item.outline);
-      else if ("center" in item && "width" in item && "height" in item)
-        updateBounds(item.center, item.width, item.height);
-    } else if ("x" in item && "y" in item) {
-      updateBounds({ x: item.x, y: item.y }, 0, 0);
-    } else if ("route" in item) {
-      updateTraceBounds(item.route);
-    } else if (item.type === "pcb_silkscreen_text" || item.type === "pcb_silkscreen_rect" || item.type === "pcb_silkscreen_circle" || item.type === "pcb_silkscreen_line") {
-      updateSilkscreenBounds(item);
+  let boardMinX = Number.POSITIVE_INFINITY;
+  let boardMinY = Number.POSITIVE_INFINITY;
+  let boardMaxX = Number.NEGATIVE_INFINITY;
+  let boardMaxY = Number.NEGATIVE_INFINITY;
+  for (const circuitJsonElm of circuitJson) {
+    if (circuitJsonElm.type === "pcb_board") {
+      if (circuitJsonElm.outline && Array.isArray(circuitJsonElm.outline) && circuitJsonElm.outline.length >= 3) {
+        updateBoundsToIncludeOutline(circuitJsonElm.outline);
+        updateBoardBoundsToIncludeOutline(circuitJsonElm.outline);
+      } else if ("center" in circuitJsonElm && "width" in circuitJsonElm && "height" in circuitJsonElm) {
+        updateBounds(
+          circuitJsonElm.center,
+          circuitJsonElm.width,
+          circuitJsonElm.height
+        );
+        updateBoardBounds(
+          circuitJsonElm.center,
+          circuitJsonElm.width,
+          circuitJsonElm.height
+        );
+      }
+    } 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_silkscreen_text" || circuitJsonElm.type === "pcb_silkscreen_rect" || circuitJsonElm.type === "pcb_silkscreen_circle" || circuitJsonElm.type === "pcb_silkscreen_line") {
+      updateSilkscreenBounds(circuitJsonElm);
     }
   }
   const padding = 1;
   const circuitWidth = maxX - minX + 2 * padding;
   const circuitHeight = maxY - minY + 2 * padding;
-  const svgWidth = options?.width ?? 800;
-  const svgHeight = options?.height ?? 600;
+  let svgWidth = options?.width ?? 800;
+  let svgHeight = options?.height ?? 600;
+  if (options?.matchBoardAspectRatio) {
+    const boardWidth = boardMaxX - boardMinX;
+    const boardHeight = boardMaxY - boardMinY;
+    if (boardWidth > 0 && boardHeight > 0) {
+      const aspect = boardWidth / boardHeight;
+      if (options?.width && !options?.height) {
+        svgHeight = options.width / aspect;
+      } else if (options?.height && !options?.width) {
+        svgWidth = options.height * aspect;
+      } else {
+        svgHeight = svgWidth / aspect;
+      }
+    }
+  }
   const paths = [];
-  for (const item of soup) {
-    if ("route" in item && item.route !== void 0) {
-      paths.push(item.route);
+  for (const circuitJsonElm of circuitJson) {
+    if ("route" in circuitJsonElm && circuitJsonElm.route !== void 0) {
+      paths.push(circuitJsonElm.route);
     }
   }
   const scaleX = svgWidth / circuitWidth;
@@ -1346,20 +1390,23 @@ function convertCircuitJsonToPcbSvg(soup, options) {
     scale2(scaleFactor, -scaleFactor)
     // Flip in y-direction
   );
-  let svgObjects = soup.sort(
+  const ctx = {
+    transform,
+    layer,
+    shouldDrawErrors: options?.shouldDrawErrors
+  };
+  let svgObjects = circuitJson.sort(
     (a, b) => (OBJECT_ORDER.indexOf(b.type) ?? 9999) - (OBJECT_ORDER.indexOf(a.type) ?? 9999)
-  ).flatMap(
-    (item) => createSvgObjects(item, transform, soup, options?.shouldDrawErrors)
-  );
+  ).flatMap((elm) => createSvgObjects({ elm, circuitJson, ctx }));
   let strokeWidth = String(0.05 * scaleFactor);
-  for (const element of soup) {
+  for (const element of circuitJson) {
     if ("stroke_width" in element) {
       strokeWidth = String(scaleFactor * element.stroke_width);
       break;
     }
   }
   if (options?.shouldDrawRatsNest) {
-    const ratsNestObjects = createSvgObjectsForRatsNest(soup, transform);
+    const ratsNestObjects = createSvgObjectsForRatsNest(circuitJson, ctx);
     svgObjects = svgObjects.concat(ratsNestObjects);
   }
   const svgObject = {
@@ -1412,6 +1459,14 @@ function convertCircuitJsonToPcbSvg(soup, options) {
     maxX = Math.max(maxX, center.x + halfWidth);
     maxY = Math.max(maxY, center.y + halfHeight);
   }
+  function updateBoardBounds(center, width, height) {
+    const halfWidth = width / 2;
+    const halfHeight = height / 2;
+    boardMinX = Math.min(boardMinX, center.x - halfWidth);
+    boardMinY = Math.min(boardMinY, center.y - halfHeight);
+    boardMaxX = Math.max(boardMaxX, center.x + halfWidth);
+    boardMaxY = Math.max(boardMaxY, center.y + halfHeight);
+  }
   function updateBoundsToIncludeOutline(outline) {
     for (const point of outline) {
       minX = Math.min(minX, point.x);
@@ -1420,6 +1475,14 @@ function convertCircuitJsonToPcbSvg(soup, options) {
       maxY = Math.max(maxY, point.y);
     }
   }
+  function updateBoardBoundsToIncludeOutline(outline) {
+    for (const point of outline) {
+      boardMinX = Math.min(boardMinX, point.x);
+      boardMinY = Math.min(boardMinY, point.y);
+      boardMaxX = Math.max(boardMaxX, point.x);
+      boardMaxY = Math.max(boardMaxY, point.y);
+    }
+  }
   function updateTraceBounds(route) {
     for (const point of route) {
       minX = Math.min(minX, point.x);
@@ -1452,50 +1515,53 @@ function convertCircuitJsonToPcbSvg(soup, options) {
     }
   }
 }
-function createSvgObjects(elm, transform, soup, shouldDrawErrors) {
+function createSvgObjects({
+  elm,
+  circuitJson,
+  ctx
+}) {
+  const { transform, layer: layerFilter, shouldDrawErrors } = ctx;
   switch (elm.type) {
     case "pcb_trace_error":
-      return createSvgObjectsFromPcbTraceError(
-        elm,
-        transform,
-        soup,
-        shouldDrawErrors
-      ).filter(Boolean);
+      return createSvgObjectsFromPcbTraceError(elm, circuitJson, ctx).filter(
+        Boolean
+      );
     case "pcb_component":
-      return [createSvgObjectsFromPcbComponent(elm, transform)].filter(Boolean);
+      return [createSvgObjectsFromPcbComponent(elm, ctx)].filter(Boolean);
     case "pcb_trace":
-      return createSvgObjectsFromPcbTrace(elm, transform);
+      return createSvgObjectsFromPcbTrace(elm, ctx);
     case "pcb_plated_hole":
-      return createSvgObjectsFromPcbPlatedHole(elm, transform).filter(Boolean);
+      return createSvgObjectsFromPcbPlatedHole(elm, ctx).filter(Boolean);
     case "pcb_hole":
-      return createSvgObjectsFromPcbHole(elm, transform);
+      return createSvgObjectsFromPcbHole(elm, ctx);
     case "pcb_smtpad":
-      return createSvgObjectsFromSmtPad(elm, transform);
+      return createSvgObjectsFromSmtPad(elm, ctx);
     case "pcb_silkscreen_text":
-      return createSvgObjectsFromPcbSilkscreenText(elm, transform);
+      return createSvgObjectsFromPcbSilkscreenText(elm, ctx);
     case "pcb_silkscreen_rect":
-      return createSvgObjectsFromPcbSilkscreenRect(elm, transform);
+      return createSvgObjectsFromPcbSilkscreenRect(elm, ctx);
     case "pcb_silkscreen_circle":
-      return createSvgObjectsFromPcbSilkscreenCircle(elm, transform);
+      return createSvgObjectsFromPcbSilkscreenCircle(elm, ctx);
     case "pcb_silkscreen_line":
-      return createSvgObjectsFromPcbSilkscreenLine(elm, transform);
+      return createSvgObjectsFromPcbSilkscreenLine(elm, ctx);
     case "pcb_fabrication_note_path":
-      return createSvgObjectsFromPcbFabricationNotePath(elm, transform);
+      return createSvgObjectsFromPcbFabricationNotePath(elm, ctx);
     case "pcb_fabrication_note_text":
-      return createSvgObjectsFromPcbFabricationNoteText(elm, transform);
+      return createSvgObjectsFromPcbFabricationNoteText(elm, ctx);
     case "pcb_silkscreen_path":
-      return createSvgObjectsFromPcbSilkscreenPath(elm, transform);
+      return createSvgObjectsFromPcbSilkscreenPath(elm, ctx);
     case "pcb_board":
-      return createSvgObjectsFromPcbBoard(elm, transform);
+      return createSvgObjectsFromPcbBoard(elm, ctx);
     case "pcb_via":
-      return createSvgObjectsFromPcbVia(elm, transform);
+      return createSvgObjectsFromPcbVia(elm, ctx);
     case "pcb_cutout":
-      return createSvgObjectsFromPcbCutout(elm, transform);
+      return createSvgObjectsFromPcbCutout(elm, ctx);
     default:
       return [];
   }
 }
-function createSvgObjectsFromPcbComponent(component, transform) {
+function createSvgObjectsFromPcbComponent(component, ctx) {
+  const { transform } = ctx;
   const { center, width, height, rotation = 0 } = component;
   const [x, y] = applyToPoint17(transform, [center.x, center.y]);
   const scaledWidth = width * Math.abs(transform.a);
@@ -4842,7 +4908,9 @@ import {
 
 // lib/pcb/svg-object-fns/convert-circuit-json-to-solder-paste-mask.ts
 import { applyToPoint as applyToPoint38 } from "transformation-matrix";
-function createSvgObjectsFromSolderPaste(solderPaste, transform) {
+function createSvgObjectsFromSolderPaste(solderPaste, ctx) {
+  const { transform, layer: layerFilter } = ctx;
+  if (layerFilter && solderPaste.layer !== layerFilter) return [];
   const [x, y] = applyToPoint38(transform, [solderPaste.x, solderPaste.y]);
   if (solderPaste.shape === "rect" || solderPaste.shape === "rotated_rect") {
     const width = solderPaste.width * Math.abs(transform.a);
@@ -4922,15 +4990,15 @@ var OBJECT_ORDER3 = [
   "pcb_board",
   "pcb_solder_paste"
 ];
-function convertCircuitJsonToSolderPasteMask(soup, options) {
+function convertCircuitJsonToSolderPasteMask(circuitJson, options) {
   let minX = Number.POSITIVE_INFINITY;
   let minY = Number.POSITIVE_INFINITY;
   let maxX = Number.NEGATIVE_INFINITY;
   let maxY = Number.NEGATIVE_INFINITY;
-  const filteredSoup = soup.filter(
+  const filteredCircuitJson = circuitJson.filter(
     (elm) => elm.type === "pcb_board" || elm.type === "pcb_solder_paste" && elm.layer === options.layer
   );
-  for (const item of filteredSoup) {
+  for (const item of filteredCircuitJson) {
     if (item.type === "pcb_board") {
       if (item.outline && Array.isArray(item.outline) && item.outline.length >= 3) {
         updateBoundsToIncludeOutline(item.outline);
@@ -4959,9 +5027,13 @@ function convertCircuitJsonToSolderPasteMask(soup, options) {
     scale8(scaleFactor, -scaleFactor)
     // Flip in y-direction
   );
-  const svgObjects = filteredSoup.sort(
+  const ctx = {
+    transform,
+    layer: options.layer
+  };
+  const svgObjects = filteredCircuitJson.sort(
     (a, b) => (OBJECT_ORDER3.indexOf(b.type) ?? 9999) - (OBJECT_ORDER3.indexOf(a.type) ?? 9999)
-  ).flatMap((item) => createSvgObjects3(item, transform));
+  ).flatMap((item) => createSvgObjects3({ elm: item, ctx }));
   const svgObject = {
     name: "svg",
     type: "element",
@@ -5021,12 +5093,13 @@ function convertCircuitJsonToSolderPasteMask(soup, options) {
     }
   }
 }
-function createSvgObjects3(elm, transform) {
+function createSvgObjects3({ elm, ctx }) {
+  const { transform } = ctx;
   switch (elm.type) {
     case "pcb_board":
-      return createSvgObjectsFromPcbBoard(elm, transform);
+      return createSvgObjectsFromPcbBoard(elm, ctx);
     case "pcb_solder_paste":
-      return createSvgObjectsFromSolderPaste(elm, transform);
+      return createSvgObjectsFromSolderPaste(elm, ctx);
     default:
       return [];
   }