circuit-to-svg 0.0.200 → 0.0.202

package/dist/index.d.ts

@@ -42,6 +42,7 @@ interface Options$4 {
     backgroundColor?: string;
     drawPaddingOutsideBoard?: boolean;
     includeVersion?: boolean;
+    renderSolderMask?: boolean;
 }
 interface PcbContext {
     transform: Matrix;
@@ -49,6 +50,7 @@ interface PcbContext {
     shouldDrawErrors?: boolean;
     drawPaddingOutsideBoard?: boolean;
     colorMap: PcbColorMap;
+    renderSolderMask?: boolean;
 }
 declare function convertCircuitJsonToPcbSvg(circuitJson: AnyCircuitElement[], options?: Options$4): string;
 /**

package/dist/index.js

@@ -980,7 +980,7 @@ function solderPasteLayerNameToColor(layerName) {
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-trace.ts
 function createSvgObjectsFromPcbTrace(trace, ctx) {
-  const { transform, layer: layerFilter, colorMap: colorMap2 } = ctx;
+  const { transform, layer: layerFilter, colorMap: colorMap2, renderSolderMask } = ctx;
   if (!trace.route || !Array.isArray(trace.route) || trace.route.length < 2)
     return [];
   const segments = pairs(trace.route);
@@ -991,26 +991,66 @@ 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 = colorMap2.soldermask[layer] ?? layerNameToColor(layer, colorMap2);
+    const copperColor = layerNameToColor(layer, colorMap2);
+    const maskColor = colorMap2.soldermask[layer] ?? copperColor;
     const traceWidth = "width" in start ? start.width : "width" in end ? end.width : null;
-    const svgObject = {
-      name: "path",
-      type: "element",
-      value: "",
-      children: [],
-      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",
-        "data-layer": layer
-      }
-    };
-    svgObjects.push(svgObject);
+    const width = traceWidth ? (traceWidth * Math.abs(transform.a)).toString() : "0.3";
+    if (renderSolderMask) {
+      const copperObject = {
+        name: "path",
+        type: "element",
+        value: "",
+        children: [],
+        attributes: {
+          class: "pcb-trace",
+          stroke: copperColor,
+          fill: "none",
+          d: `M ${startPoint[0]} ${startPoint[1]} L ${endPoint[0]} ${endPoint[1]}`,
+          "stroke-width": width,
+          "stroke-linecap": "round",
+          "stroke-linejoin": "round",
+          "shape-rendering": "crispEdges",
+          "data-layer": layer
+        }
+      };
+      const maskObject = {
+        name: "path",
+        type: "element",
+        value: "",
+        children: [],
+        attributes: {
+          class: "pcb-soldermask",
+          stroke: maskColor,
+          fill: "none",
+          d: `M ${startPoint[0]} ${startPoint[1]} L ${endPoint[0]} ${endPoint[1]}`,
+          "stroke-width": width,
+          "stroke-linecap": "round",
+          "stroke-linejoin": "round",
+          "shape-rendering": "crispEdges",
+          "data-layer": layer
+        }
+      };
+      svgObjects.push(maskObject, copperObject);
+    } else {
+      const maskOnlyObject = {
+        name: "path",
+        type: "element",
+        value: "",
+        children: [],
+        attributes: {
+          class: "pcb-trace",
+          stroke: maskColor,
+          fill: "none",
+          d: `M ${startPoint[0]} ${startPoint[1]} L ${endPoint[0]} ${endPoint[1]}`,
+          "stroke-width": width,
+          "stroke-linecap": "round",
+          "stroke-linejoin": "round",
+          "shape-rendering": "crispEdges",
+          "data-layer": layer
+        }
+      };
+      svgObjects.push(maskOnlyObject);
+    }
   }
   svgObjects.sort((a, b) => {
     const layerA = a.attributes["data-layer"];
@@ -1743,7 +1783,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.199",
+  version: "0.0.201",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -1932,7 +1972,8 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
     layer,
     shouldDrawErrors: options?.shouldDrawErrors,
     drawPaddingOutsideBoard,
-    colorMap: colorMap2
+    colorMap: colorMap2,
+    renderSolderMask: options?.renderSolderMask
   };
   function getLayer(elm) {
     if (elm.type === "pcb_smtpad") {
@@ -5972,20 +6013,23 @@ var createSvgObjectsForSchPortBoxLine = ({
   }
   const screenSchPortPos = applyToPoint40(transform, schPort.center);
   const screenRealEdgePos = applyToPoint40(transform, realEdgePos);
+  const isConnected = isSourcePortConnected(circuitJson, schPort.source_port_id);
   const realLineEnd = { ...schPort.center };
-  switch (schPort.side_of_component) {
-    case "left":
-      realLineEnd.x += PIN_CIRCLE_RADIUS_MM;
-      break;
-    case "right":
-      realLineEnd.x -= PIN_CIRCLE_RADIUS_MM;
-      break;
-    case "top":
-      realLineEnd.y -= PIN_CIRCLE_RADIUS_MM;
-      break;
-    case "bottom":
-      realLineEnd.y += PIN_CIRCLE_RADIUS_MM;
-      break;
+  if (!isConnected) {
+    switch (schPort.side_of_component) {
+      case "left":
+        realLineEnd.x += PIN_CIRCLE_RADIUS_MM;
+        break;
+      case "right":
+        realLineEnd.x -= PIN_CIRCLE_RADIUS_MM;
+        break;
+      case "top":
+        realLineEnd.y -= PIN_CIRCLE_RADIUS_MM;
+        break;
+      case "bottom":
+        realLineEnd.y += PIN_CIRCLE_RADIUS_MM;
+        break;
+    }
   }
   const screenLineEnd = applyToPoint40(transform, realLineEnd);
   svgObjects.push({
@@ -5993,16 +6037,15 @@ var createSvgObjectsForSchPortBoxLine = ({
     type: "element",
     attributes: {
       class: "component-pin",
-      x1: screenLineEnd.x.toString(),
-      y1: screenLineEnd.y.toString(),
-      x2: screenRealEdgePos.x.toString(),
-      y2: screenRealEdgePos.y.toString(),
+      x1: screenRealEdgePos.x.toString(),
+      y1: screenRealEdgePos.y.toString(),
+      x2: screenLineEnd.x.toString(),
+      y2: screenLineEnd.y.toString(),
       "stroke-width": `${getSchStrokeSize(transform)}px`
     },
     value: "",
     children: []
   });
-  const isConnected = isSourcePortConnected(circuitJson, schPort.source_port_id);
   const pinRadiusPx = Math.abs(transform.a) * PIN_CIRCLE_RADIUS_MM;
   const pinChildren = [];
   if (!isConnected) {