circuit-to-svg 0.0.141 → 0.0.143

package/dist/index.d.ts

@@ -1,7 +1,27 @@
 import { AnyCircuitElement } from 'circuit-json';
 import { Matrix } from 'transformation-matrix';
 
+interface PcbColorMap {
+    copper: {
+        top: string;
+        bottom: string;
+    };
+    drill: string;
+    silkscreen: {
+        top: string;
+        bottom: string;
+    };
+    boardOutline: string;
+}
+interface PcbColorOverrides {
+    copper?: Partial<PcbColorMap["copper"]>;
+    drill?: string;
+    silkscreen?: Partial<PcbColorMap["silkscreen"]>;
+    boardOutline?: string;
+}
+
 interface Options$3 {
+    colorOverrides?: PcbColorOverrides;
     width?: number;
     height?: number;
     shouldDrawErrors?: boolean;
@@ -16,6 +36,7 @@ interface PcbContext {
     layer?: "top" | "bottom";
     shouldDrawErrors?: boolean;
     drawPaddingOutsideBoard?: boolean;
+    colorMap: PcbColorMap;
 }
 declare function convertCircuitJsonToPcbSvg(circuitJson: AnyCircuitElement[], options?: Options$3): string;
 /**
@@ -219,4 +240,4 @@ interface Options {
 }
 declare function convertCircuitJsonToSolderPasteMask(circuitJson: AnyCircuitElement[], options: Options): string;
 
-export { type ColorMap, type ColorOverrides, type PcbContext, circuitJsonToPcbSvg, circuitJsonToSchematicSvg, convertCircuitJsonToAssemblySvg, convertCircuitJsonToPcbSvg, convertCircuitJsonToSchematicSvg, convertCircuitJsonToSolderPasteMask };
+export { type ColorMap, type ColorOverrides, type PcbColorMap, type PcbColorOverrides, type PcbContext, circuitJsonToPcbSvg, circuitJsonToSchematicSvg, convertCircuitJsonToAssemblySvg, convertCircuitJsonToPcbSvg, convertCircuitJsonToSchematicSvg, convertCircuitJsonToSolderPasteMask };

package/dist/index.js

@@ -333,7 +333,7 @@ function createSvgObjectsFromPcbFabricationNoteText(pcbFabNoteText, ctx) {
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-plated-hole.ts
 import { applyToPoint as applyToPoint4 } from "transformation-matrix";
 function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
-  const { transform } = ctx;
+  const { transform, colorMap: colorMap2 } = ctx;
   const [x, y] = applyToPoint4(transform, [hole.x, hole.y]);
   if (hole.shape === "pill") {
     const scaledOuterWidth = hole.outer_width * Math.abs(transform.a);
@@ -356,7 +356,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             type: "element",
             attributes: {
               class: "pcb-hole-outer",
-              fill: "rgb(200, 52, 52)",
+              fill: colorMap2.copper.top,
               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: "",
@@ -368,7 +368,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             type: "element",
             attributes: {
               class: "pcb-hole-inner",
-              fill: "rgb(255, 38, 226)",
+              fill: colorMap2.drill,
               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: "",
@@ -397,7 +397,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             type: "element",
             attributes: {
               class: "pcb-hole-outer",
-              fill: "rgb(200, 52, 52)",
+              fill: colorMap2.copper.top,
               cx: x.toString(),
               cy: y.toString(),
               r: outerRadius.toString()
@@ -410,7 +410,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             type: "element",
             attributes: {
               class: "pcb-hole-inner",
-              fill: "rgb(255, 38, 226)",
+              fill: colorMap2.drill,
               cx: x.toString(),
               cy: y.toString(),
               r: innerRadius.toString()
@@ -440,7 +440,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             type: "element",
             attributes: {
               class: "pcb-hole-outer-pad",
-              fill: "rgb(200, 52, 52)",
+              fill: colorMap2.copper.top,
               x: (x - scaledRectPadWidth / 2).toString(),
               y: (y - scaledRectPadHeight / 2).toString(),
               width: scaledRectPadWidth.toString(),
@@ -455,7 +455,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             type: "element",
             attributes: {
               class: "pcb-hole-inner",
-              fill: "rgb(255, 38, 226)",
+              fill: colorMap2.drill,
               cx: x.toString(),
               cy: y.toString(),
               r: holeRadius.toString()
@@ -486,7 +486,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             type: "element",
             attributes: {
               class: "pcb-hole-outer-pad",
-              fill: "rgb(200, 52, 52)",
+              fill: colorMap2.copper.top,
               x: (x - scaledRectPadWidth / 2).toString(),
               y: (y - scaledRectPadHeight / 2).toString(),
               width: scaledRectPadWidth.toString(),
@@ -501,7 +501,7 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
             type: "element",
             attributes: {
               class: "pcb-hole-inner",
-              fill: "rgb(255, 38, 226)",
+              fill: colorMap2.drill,
               x: (x - scaledHoleWidth / 2).toString(),
               y: (y - scaledHoleHeight / 2).toString(),
               width: scaledHoleWidth.toString(),
@@ -523,15 +523,8 @@ function createSvgObjectsFromPcbPlatedHole(hole, ctx) {
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-silkscreen-path.ts
 import { applyToPoint as applyToPoint5 } from "transformation-matrix";
-
-// lib/pcb/colors.ts
-var HOLE_COLOR = "#FF26E2";
-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, ctx) {
-  const { transform, layer: layerFilter } = ctx;
+  const { transform, layer: layerFilter, colorMap: colorMap2 } = 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]);
@@ -544,7 +537,7 @@ function createSvgObjectsFromPcbSilkscreenPath(silkscreenPath, ctx) {
   }
   const layer = silkscreenPath.layer || "top";
   if (layerFilter && layer !== layerFilter) return [];
-  const color = layer === "bottom" ? SILKSCREEN_BOTTOM_COLOR : SILKSCREEN_TOP_COLOR;
+  const color = layer === "bottom" ? colorMap2.silkscreen.bottom : colorMap2.silkscreen.top;
   return [
     {
       name: "path",
@@ -576,7 +569,7 @@ import {
   toString as matrixToString2
 } from "transformation-matrix";
 function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, ctx) {
-  const { transform, layer: layerFilter } = ctx;
+  const { transform, layer: layerFilter, colorMap: colorMap2 } = ctx;
   const {
     anchor_position,
     text,
@@ -643,7 +636,7 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, ctx) {
     rotate2(ccw_rotation * Math.PI / 180),
     ...layer === "bottom" ? [scale(-1, 1)] : []
   );
-  const color = layer === "bottom" ? SILKSCREEN_BOTTOM_COLOR : SILKSCREEN_TOP_COLOR;
+  const color = layer === "bottom" ? colorMap2.silkscreen.bottom : colorMap2.silkscreen.top;
   const svgObject = {
     name: "text",
     type: "element",
@@ -679,7 +672,7 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, ctx) {
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-silkscreen-rect.ts
 import { applyToPoint as applyToPoint7 } from "transformation-matrix";
 function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, ctx) {
-  const { transform, layer: layerFilter } = ctx;
+  const { transform, layer: layerFilter, colorMap: colorMap2 } = ctx;
   const {
     center,
     width,
@@ -703,7 +696,7 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, ctx) {
   const transformedWidth = width * Math.abs(transform.a);
   const transformedHeight = height * Math.abs(transform.d);
   const transformedStrokeWidth = stroke_width * Math.abs(transform.a);
-  const color = layer === "bottom" ? SILKSCREEN_BOTTOM_COLOR : SILKSCREEN_TOP_COLOR;
+  const color = layer === "bottom" ? colorMap2.silkscreen.bottom : colorMap2.silkscreen.top;
   const attributes = {
     x: (transformedX - transformedWidth / 2).toString(),
     y: (transformedY - transformedHeight / 2).toString(),
@@ -743,7 +736,7 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, ctx) {
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-silkscreen-circle.ts
 import { applyToPoint as applyToPoint8 } from "transformation-matrix";
 function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, ctx) {
-  const { transform, layer: layerFilter } = ctx;
+  const { transform, layer: layerFilter, colorMap: colorMap2 } = ctx;
   const {
     center,
     radius,
@@ -762,7 +755,7 @@ function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, ctx) {
   ]);
   const transformedRadius = radius * Math.abs(transform.a);
   const transformedStrokeWidth = stroke_width * Math.abs(transform.a);
-  const color = layer === "bottom" ? SILKSCREEN_BOTTOM_COLOR : SILKSCREEN_TOP_COLOR;
+  const color = layer === "bottom" ? colorMap2.silkscreen.bottom : colorMap2.silkscreen.top;
   const svgObject = {
     name: "circle",
     type: "element",
@@ -784,7 +777,7 @@ function createSvgObjectsFromPcbSilkscreenCircle(pcbSilkscreenCircle, ctx) {
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-silkscreen-line.ts
 import { applyToPoint as applyToPoint9 } from "transformation-matrix";
 function createSvgObjectsFromPcbSilkscreenLine(pcbSilkscreenLine, ctx) {
-  const { transform, layer: layerFilter } = ctx;
+  const { transform, layer: layerFilter, colorMap: colorMap2 } = ctx;
   const {
     x1,
     y1,
@@ -802,7 +795,7 @@ function createSvgObjectsFromPcbSilkscreenLine(pcbSilkscreenLine, ctx) {
   const [transformedX1, transformedY1] = applyToPoint9(transform, [x1, y1]);
   const [transformedX2, transformedY2] = applyToPoint9(transform, [x2, y2]);
   const transformedStrokeWidth = stroke_width * Math.abs(transform.a);
-  const color = layer === "bottom" ? SILKSCREEN_BOTTOM_COLOR : SILKSCREEN_TOP_COLOR;
+  const color = layer === "bottom" ? colorMap2.silkscreen.bottom : colorMap2.silkscreen.top;
   return [
     {
       name: "line",
@@ -835,13 +828,30 @@ function pairs(arr) {
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-trace.ts
 import { applyToPoint as applyToPoint10 } from "transformation-matrix";
 
+// lib/pcb/colors.ts
+var DEFAULT_PCB_COLOR_MAP = {
+  copper: {
+    top: "rgb(200, 52, 52)",
+    bottom: "rgb(77, 127, 196)"
+  },
+  drill: "#FF26E2",
+  silkscreen: {
+    top: "#f2eda1",
+    bottom: "#5da9e9"
+  },
+  boardOutline: "rgba(255, 255, 255, 0.5)"
+};
+var HOLE_COLOR = DEFAULT_PCB_COLOR_MAP.drill;
+var SILKSCREEN_TOP_COLOR = DEFAULT_PCB_COLOR_MAP.silkscreen.top;
+var SILKSCREEN_BOTTOM_COLOR = DEFAULT_PCB_COLOR_MAP.silkscreen.bottom;
+
 // lib/pcb/layer-name-to-color.ts
 var LAYER_NAME_TO_COLOR = {
-  top: "rgb(200, 52, 52)",
-  bottom: "rgb(77, 127, 196)"
+  top: DEFAULT_PCB_COLOR_MAP.copper.top,
+  bottom: DEFAULT_PCB_COLOR_MAP.copper.bottom
 };
-function layerNameToColor(layerName) {
-  return LAYER_NAME_TO_COLOR[layerName] ?? "white";
+function layerNameToColor(layerName, colorMap2 = DEFAULT_PCB_COLOR_MAP) {
+  return colorMap2.copper[layerName] ?? "white";
 }
 var SOLDER_PASTE_LAYER_NAME_TO_COLOR = {
   bottom: "rgb(105, 105, 105)",
@@ -853,7 +863,7 @@ function solderPasteLayerNameToColor(layerName) {
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-trace.ts
 function createSvgObjectsFromPcbTrace(trace, ctx) {
-  const { transform, layer: layerFilter } = ctx;
+  const { transform, layer: layerFilter, colorMap: colorMap2 } = ctx;
   if (!trace.route || !Array.isArray(trace.route) || trace.route.length < 2)
     return [];
   const segments = pairs(trace.route);
@@ -864,7 +874,7 @@ function createSvgObjectsFromPcbTrace(trace, ctx) {
     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 layerColor = layerNameToColor(layer, colorMap2);
     const traceWidth = "width" in start ? start.width : "width" in end ? end.width : null;
     const svgObject = {
       name: "path",
@@ -902,12 +912,12 @@ function createSvgObjectsFromPcbTrace(trace, ctx) {
 // lib/pcb/svg-object-fns/create-svg-objects-from-smt-pads.ts
 import { applyToPoint as applyToPoint11 } from "transformation-matrix";
 function createSvgObjectsFromSmtPad(pad, ctx) {
-  const { transform, layer: layerFilter } = ctx;
-  const [x, y] = applyToPoint11(transform, [pad.x, pad.y]);
+  const { transform, layer: layerFilter, colorMap: colorMap2 } = ctx;
   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);
+    const [x, y] = applyToPoint11(transform, [pad.x, pad.y]);
     if (pad.shape === "rotated_rect" && pad.ccw_rotation) {
       return [
         {
@@ -915,7 +925,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
           type: "element",
           attributes: {
             class: "pcb-pad",
-            fill: layerNameToColor(pad.layer),
+            fill: layerNameToColor(pad.layer, colorMap2),
             x: (-width / 2).toString(),
             y: (-height / 2).toString(),
             width: width.toString(),
@@ -931,7 +941,7 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
         type: "element",
         attributes: {
           class: "pcb-pad",
-          fill: layerNameToColor(pad.layer),
+          fill: layerNameToColor(pad.layer, colorMap2),
           x: (x - width / 2).toString(),
           y: (y - height / 2).toString(),
           width: width.toString(),
@@ -944,13 +954,14 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
     const width = pad.width * Math.abs(transform.a);
     const height = pad.height * Math.abs(transform.d);
     const radius = pad.radius * Math.abs(transform.a);
+    const [x, y] = applyToPoint11(transform, [pad.x, pad.y]);
     return [
       {
         name: "rect",
         type: "element",
         attributes: {
           class: "pcb-pad",
-          fill: layerNameToColor(pad.layer),
+          fill: layerNameToColor(pad.layer, colorMap2),
           x: (x - width / 2).toString(),
           y: (y - height / 2).toString(),
           width: width.toString(),
@@ -961,13 +972,29 @@ function createSvgObjectsFromSmtPad(pad, ctx) {
       }
     ];
   }
+  if (pad.shape === "polygon") {
+    const points = (pad.points ?? []).map(
+      (point) => applyToPoint11(transform, [point.x, point.y])
+    );
+    return [
+      {
+        name: "polygon",
+        type: "element",
+        attributes: {
+          class: "pcb-pad",
+          fill: layerNameToColor(pad.layer),
+          points
+        }
+      }
+    ];
+  }
   return [];
 }
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-board.ts
 import { applyToPoint as applyToPoint12 } from "transformation-matrix";
 function createSvgObjectsFromPcbBoard(pcbBoard, ctx) {
-  const { transform } = ctx;
+  const { transform, colorMap: colorMap2 } = ctx;
   const { width, height, center, outline } = pcbBoard;
   let path;
   if (outline && Array.isArray(outline) && outline.length >= 3) {
@@ -1007,7 +1034,7 @@ function createSvgObjectsFromPcbBoard(pcbBoard, ctx) {
         class: "pcb-board",
         d: path,
         fill: "none",
-        stroke: "rgba(255, 255, 255, 0.5)",
+        stroke: colorMap2.boardOutline,
         "stroke-width": (0.1 * Math.abs(transform.a)).toString()
       }
     }
@@ -1017,7 +1044,7 @@ function createSvgObjectsFromPcbBoard(pcbBoard, ctx) {
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-via.ts
 import { applyToPoint as applyToPoint13 } from "transformation-matrix";
 function createSvgObjectsFromPcbVia(hole, ctx) {
-  const { transform } = ctx;
+  const { transform, colorMap: colorMap2 } = 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);
@@ -1034,7 +1061,7 @@ function createSvgObjectsFromPcbVia(hole, ctx) {
         type: "element",
         attributes: {
           class: "pcb-hole-outer",
-          fill: "rgb(200, 52, 52)",
+          fill: colorMap2.copper.top,
           cx: x.toString(),
           cy: y.toString(),
           r: outerRadius.toString()
@@ -1045,7 +1072,7 @@ function createSvgObjectsFromPcbVia(hole, ctx) {
         type: "element",
         attributes: {
           class: "pcb-hole-inner",
-          fill: "rgb(255, 38, 226)",
+          fill: colorMap2.drill,
           cx: x.toString(),
           cy: y.toString(),
           r: innerRadius.toString()
@@ -1058,7 +1085,7 @@ function createSvgObjectsFromPcbVia(hole, ctx) {
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-hole.ts
 import { applyToPoint as applyToPoint14 } from "transformation-matrix";
 function createSvgObjectsFromPcbHole(hole, ctx) {
-  const { transform } = ctx;
+  const { transform, colorMap: colorMap2 } = 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);
@@ -1073,7 +1100,7 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
             cx: x.toString(),
             cy: y.toString(),
             r: radius.toString(),
-            fill: HOLE_COLOR
+            fill: colorMap2.drill
           },
           children: [],
           value: ""
@@ -1090,7 +1117,7 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
           y: (y - radius).toString(),
           width: scaledDiameter.toString(),
           height: scaledDiameter.toString(),
-          fill: HOLE_COLOR
+          fill: colorMap2.drill
         },
         children: [],
         value: ""
@@ -1112,7 +1139,7 @@ function createSvgObjectsFromPcbHole(hole, ctx) {
           cy: y.toString(),
           rx: rx.toString(),
           ry: ry.toString(),
-          fill: HOLE_COLOR
+          fill: colorMap2.drill
         },
         children: [],
         value: ""
@@ -1244,7 +1271,7 @@ import {
   toString as matrixToString6
 } from "transformation-matrix";
 function createSvgObjectsFromPcbCutout(cutout, ctx) {
-  const { transform } = ctx;
+  const { transform, colorMap: colorMap2 } = ctx;
   if (cutout.shape === "rect") {
     const rectCutout = cutout;
     const [cx, cy] = applyToPoint16(transform, [
@@ -1264,7 +1291,7 @@ function createSvgObjectsFromPcbCutout(cutout, ctx) {
           y: (-scaledHeight / 2).toString(),
           width: scaledWidth.toString(),
           height: scaledHeight.toString(),
-          fill: HOLE_COLOR,
+          fill: colorMap2.drill,
           transform: matrixToString6(
             compose3(translate3(cx, cy), rotate3(svgRotation * Math.PI / 180))
           )
@@ -1290,7 +1317,7 @@ function createSvgObjectsFromPcbCutout(cutout, ctx) {
           cx: cx.toString(),
           cy: cy.toString(),
           r: scaledRadius.toString(),
-          fill: HOLE_COLOR
+          fill: colorMap2.drill
         },
         children: [],
         value: ""
@@ -1311,7 +1338,7 @@ function createSvgObjectsFromPcbCutout(cutout, ctx) {
         attributes: {
           class: "pcb-cutout pcb-cutout-polygon",
           points: pointsString,
-          fill: HOLE_COLOR
+          fill: colorMap2.drill
         },
         children: [],
         value: ""
@@ -1339,6 +1366,19 @@ var OBJECT_ORDER = [
 function convertCircuitJsonToPcbSvg(circuitJson, options) {
   const drawPaddingOutsideBoard = options?.drawPaddingOutsideBoard ?? true;
   const layer = options?.layer;
+  const colorOverrides = options?.colorOverrides;
+  const colorMap2 = {
+    copper: {
+      top: colorOverrides?.copper?.top ?? DEFAULT_PCB_COLOR_MAP.copper.top,
+      bottom: colorOverrides?.copper?.bottom ?? DEFAULT_PCB_COLOR_MAP.copper.bottom
+    },
+    drill: colorOverrides?.drill ?? DEFAULT_PCB_COLOR_MAP.drill,
+    silkscreen: {
+      top: colorOverrides?.silkscreen?.top ?? DEFAULT_PCB_COLOR_MAP.silkscreen.top,
+      bottom: colorOverrides?.silkscreen?.bottom ?? DEFAULT_PCB_COLOR_MAP.silkscreen.bottom
+    },
+    boardOutline: colorOverrides?.boardOutline ?? DEFAULT_PCB_COLOR_MAP.boardOutline
+  };
   let minX = Number.POSITIVE_INFINITY;
   let minY = Number.POSITIVE_INFINITY;
   let maxX = Number.NEGATIVE_INFINITY;
@@ -1414,7 +1454,8 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
     transform,
     layer,
     shouldDrawErrors: options?.shouldDrawErrors,
-    drawPaddingOutsideBoard
+    drawPaddingOutsideBoard,
+    colorMap: colorMap2
   };
   let svgObjects = circuitJson.sort(
     (a, b) => (OBJECT_ORDER.indexOf(b.type) ?? 9999) - (OBJECT_ORDER.indexOf(a.type) ?? 9999)
@@ -5139,7 +5180,8 @@ function convertCircuitJsonToSolderPasteMask(circuitJson, options) {
   );
   const ctx = {
     transform,
-    layer: options.layer
+    layer: options.layer,
+    colorMap: DEFAULT_PCB_COLOR_MAP
   };
   const svgObjects = filteredCircuitJson.sort(
     (a, b) => (OBJECT_ORDER3.indexOf(b.type) ?? 9999) - (OBJECT_ORDER3.indexOf(a.type) ?? 9999)