circuit-to-svg 0.0.124 → 0.0.126

package/dist/index.d.ts

@@ -1,22 +1,22 @@
 import { AnyCircuitElement } from 'circuit-json';
 
-interface Options$2 {
+interface Options$3 {
     width?: number;
     height?: number;
     shouldDrawErrors?: boolean;
     shouldDrawRatsNest?: boolean;
 }
-declare function convertCircuitJsonToPcbSvg(soup: AnyCircuitElement[], options?: Options$2): string;
+declare function convertCircuitJsonToPcbSvg(soup: AnyCircuitElement[], options?: Options$3): string;
 /**
  * @deprecated use `convertCircuitJsonToPcbSvg` instead
  */
 declare const circuitJsonToPcbSvg: typeof convertCircuitJsonToPcbSvg;
 
-interface Options$1 {
+interface Options$2 {
     width?: number;
     height?: number;
 }
-declare function convertCircuitJsonToAssemblySvg(soup: AnyCircuitElement[], options?: Options$1): string;
+declare function convertCircuitJsonToAssemblySvg(soup: AnyCircuitElement[], options?: Options$2): string;
 
 declare const colorMap: {
     "3d_viewer": {
@@ -181,7 +181,7 @@ type ColorMap = typeof colorMap;
 type ColorOverrides = {
     schematic?: Partial<ColorMap["schematic"]>;
 };
-interface Options {
+interface Options$1 {
     colorOverrides?: ColorOverrides;
     width?: number;
     height?: number;
@@ -195,10 +195,17 @@ interface Options {
         label: string;
     }>;
 }
-declare function convertCircuitJsonToSchematicSvg(circuitJson: AnyCircuitElement[], options?: Options): string;
+declare function convertCircuitJsonToSchematicSvg(circuitJson: AnyCircuitElement[], options?: Options$1): string;
 /**
  * @deprecated use `convertCircuitJsonToSchematicSvg` instead
  */
 declare const circuitJsonToSchematicSvg: typeof convertCircuitJsonToSchematicSvg;
 
-export { type ColorMap, type ColorOverrides, circuitJsonToPcbSvg, circuitJsonToSchematicSvg, convertCircuitJsonToAssemblySvg, convertCircuitJsonToPcbSvg, convertCircuitJsonToSchematicSvg };
+interface Options {
+    layer: "top" | "bottom";
+    width?: number;
+    height?: number;
+}
+declare function convertCircuitJsonToSolderPasteMask(soup: AnyCircuitElement[], options: Options): string;
+
+export { type ColorMap, type ColorOverrides, circuitJsonToPcbSvg, circuitJsonToSchematicSvg, convertCircuitJsonToAssemblySvg, convertCircuitJsonToPcbSvg, convertCircuitJsonToSchematicSvg, convertCircuitJsonToSolderPasteMask };

package/dist/index.js

@@ -578,7 +578,8 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
     text,
     font_size = 1,
     layer = "top",
-    ccw_rotation = 0
+    ccw_rotation = 0,
+    anchor_alignment = "center"
   } = pcbSilkscreenText;
   if (!anchor_position || typeof anchor_position.x !== "number" || typeof anchor_position.y !== "number") {
     console.error("Invalid anchor_position:", anchor_position);
@@ -589,6 +590,33 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
     anchor_position.y
   ]);
   const transformedFontSize = font_size * Math.abs(transform.a);
+  let textAnchor = "middle";
+  let dominantBaseline = "central";
+  let dx = 0;
+  let dy = 0;
+  switch (anchor_alignment) {
+    case "top_left":
+      textAnchor = "start";
+      dominantBaseline = "text-before-edge";
+      break;
+    case "top_right":
+      textAnchor = "end";
+      dominantBaseline = "text-before-edge";
+      break;
+    case "bottom_left":
+      textAnchor = "start";
+      dominantBaseline = "text-after-edge";
+      break;
+    case "bottom_right":
+      textAnchor = "end";
+      dominantBaseline = "text-after-edge";
+      break;
+    case "center":
+    default:
+      textAnchor = "middle";
+      dominantBaseline = "central";
+      break;
+  }
   const textTransform = compose2(
     translate2(transformedX, transformedY),
     rotate2(ccw_rotation * Math.PI / 180),
@@ -601,11 +629,13 @@ function createSvgObjectsFromPcbSilkscreenText(pcbSilkscreenText, transform) {
     attributes: {
       x: "0",
       y: "0",
+      dx: dx.toString(),
+      dy: dy.toString(),
       fill: color,
       "font-family": "Arial, sans-serif",
       "font-size": transformedFontSize.toString(),
-      "text-anchor": "middle",
-      "dominant-baseline": "central",
+      "text-anchor": textAnchor,
+      "dominant-baseline": dominantBaseline,
       transform: matrixToString2(textTransform),
       class: `pcb-silkscreen-text pcb-silkscreen-${layer}`,
       "data-pcb-silkscreen-text-id": pcbSilkscreenText.pcb_component_id,
@@ -773,6 +803,13 @@ var LAYER_NAME_TO_COLOR = {
 function layerNameToColor(layerName) {
   return LAYER_NAME_TO_COLOR[layerName] ?? "white";
 }
+var SOLDER_PASTE_LAYER_NAME_TO_COLOR = {
+  bottom: "rgb(105, 105, 105)",
+  top: "rgb(105, 105, 105)"
+};
+function solderPasteLayerNameToColor(layerName) {
+  return SOLDER_PASTE_LAYER_NAME_TO_COLOR[layerName] ?? "rgb(105, 105, 105)";
+}
 
 // lib/pcb/svg-object-fns/create-svg-objects-from-pcb-trace.ts
 function createSvgObjectsFromPcbTrace(trace, transform) {
@@ -4093,8 +4130,8 @@ var ninePointAnchorToDominantBaseline = {
   middle_bottom: "hanging"
 };
 function getTextOffsets(pathRotation, transform) {
-  const scale8 = Math.abs(transform.a);
-  const baseOffset = scale8 * 0.1;
+  const scale9 = Math.abs(transform.a);
+  const baseOffset = scale9 * 0.1;
   const rotationOffsetMap = {
     "0": { x: baseOffset * 0.8, y: -baseOffset },
     // Left
@@ -4248,8 +4285,8 @@ var createSvgObjectsForSchNetLabelWithSymbol = ({
     } else if (textValue === "{VAL}") {
       textValue = "";
     }
-    const scale8 = Math.abs(realToScreenTransform.a);
-    const baseOffset = scale8 * 0.1;
+    const scale9 = Math.abs(realToScreenTransform.a);
+    const baseOffset = scale9 * 0.1;
     const rotationOffset = getTextOffsets(pathRotation, realToScreenTransform);
     const offsetScreenPos = {
       x: screenTextPos.x + rotationOffset.x,
@@ -4659,11 +4696,237 @@ function convertCircuitJsonToSchematicSvg(circuitJson, options) {
   return stringify3(svgObject);
 }
 var circuitJsonToSchematicSvg = convertCircuitJsonToSchematicSvg;
+
+// lib/pcb/convert-circuit-json-to-solder-paste-mask.ts
+import { stringify as stringify4 } from "svgson";
+import {
+  applyToPoint as applyToPoint38,
+  compose as compose10,
+  scale as scale8,
+  translate as translate10
+} from "transformation-matrix";
+
+// lib/pcb/svg-object-fns/convert-circuit-json-to-solder-paste-mask.ts
+import { applyToPoint as applyToPoint37 } from "transformation-matrix";
+function createSvgObjectsFromSolderPaste(solderPaste, transform) {
+  const [x, y] = applyToPoint37(transform, [solderPaste.x, solderPaste.y]);
+  if (solderPaste.shape === "rect" || solderPaste.shape === "rotated_rect") {
+    const width = solderPaste.width * Math.abs(transform.a);
+    const height = solderPaste.height * Math.abs(transform.d);
+    if (solderPaste.shape === "rotated_rect" && solderPaste.ccw_rotation) {
+      return [
+        {
+          name: "rect",
+          type: "element",
+          attributes: {
+            class: "pcb-solder-paste",
+            fill: solderPasteLayerNameToColor(solderPaste.layer),
+            x: (-width / 2).toString(),
+            y: (-height / 2).toString(),
+            width: width.toString(),
+            height: height.toString(),
+            transform: `translate(${x} ${y}) rotate(${-solderPaste.ccw_rotation})`
+          }
+        }
+      ];
+    }
+    return [
+      {
+        name: "rect",
+        type: "element",
+        attributes: {
+          class: "pcb-solder-paste",
+          fill: solderPasteLayerNameToColor(solderPaste.layer),
+          x: (x - width / 2).toString(),
+          y: (y - height / 2).toString(),
+          width: width.toString(),
+          height: height.toString()
+        }
+      }
+    ];
+  }
+  if (solderPaste.shape === "pill") {
+    const width = solderPaste.width * Math.abs(transform.a);
+    const height = solderPaste.height * Math.abs(transform.d);
+    const radius = solderPaste.radius * Math.abs(transform.a);
+    return [
+      {
+        name: "rect",
+        type: "element",
+        attributes: {
+          class: "pcb-solder-paste",
+          fill: solderPasteLayerNameToColor(solderPaste.layer),
+          x: (x - width / 2).toString(),
+          y: (y - height / 2).toString(),
+          width: width.toString(),
+          height: height.toString(),
+          rx: radius.toString()
+        }
+      }
+    ];
+  }
+  if (solderPaste.shape === "circle") {
+    const radius = solderPaste.radius * Math.abs(transform.a);
+    return [
+      {
+        name: "circle",
+        type: "element",
+        attributes: {
+          class: "pcb-solder-paste",
+          fill: solderPasteLayerNameToColor(solderPaste.layer),
+          cx: x.toString(),
+          cy: y.toString(),
+          r: radius.toString()
+        }
+      }
+    ];
+  }
+}
+
+// lib/pcb/convert-circuit-json-to-solder-paste-mask.ts
+var OBJECT_ORDER3 = [
+  "pcb_board",
+  "pcb_solder_paste"
+];
+function convertCircuitJsonToSolderPasteMask(soup, 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(
+    (elm) => elm.type === "pcb_board" || elm.type === "pcb_solder_paste" && elm.layer === options.layer
+  );
+  for (const item of filteredSoup) {
+    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 (item.type === "pcb_solder_paste" && "x" in item && "y" in item) {
+      updateBounds({ x: item.x, y: item.y }, 0, 0);
+    }
+  }
+  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;
+  const scaleX = svgWidth / circuitWidth;
+  const scaleY = svgHeight / circuitHeight;
+  const scaleFactor = Math.min(scaleX, scaleY);
+  const offsetX = (svgWidth - circuitWidth * scaleFactor) / 2;
+  const offsetY = (svgHeight - circuitHeight * scaleFactor) / 2;
+  const transform = compose10(
+    translate10(
+      offsetX - minX * scaleFactor + padding * scaleFactor,
+      svgHeight - offsetY + minY * scaleFactor - padding * scaleFactor
+    ),
+    scale8(scaleFactor, -scaleFactor)
+    // Flip in y-direction
+  );
+  const svgObjects = filteredSoup.sort(
+    (a, b) => (OBJECT_ORDER3.indexOf(b.type) ?? 9999) - (OBJECT_ORDER3.indexOf(a.type) ?? 9999)
+  ).flatMap((item) => createSvgObjects3(item, transform));
+  const svgObject = {
+    name: "svg",
+    type: "element",
+    attributes: {
+      xmlns: "http://www.w3.org/2000/svg",
+      width: svgWidth.toString(),
+      height: svgHeight.toString()
+    },
+    value: "",
+    children: [
+      {
+        name: "style",
+        type: "element",
+        children: [
+          {
+            type: "text",
+            value: ""
+          }
+        ]
+      },
+      {
+        name: "rect",
+        type: "element",
+        attributes: {
+          class: "boundary",
+          x: "0",
+          y: "0",
+          fill: "#000",
+          width: svgWidth.toString(),
+          height: svgHeight.toString()
+        }
+      },
+      createSvgObjectFromPcbBoundary2(transform, minX, minY, maxX, maxY),
+      ...svgObjects
+    ].filter((child) => child !== null)
+  };
+  try {
+    return stringify4(svgObject);
+  } catch (error) {
+    console.error("Error stringifying SVG object:", error);
+    throw error;
+  }
+  function updateBounds(center, width, height) {
+    const halfWidth = width / 2;
+    const halfHeight = height / 2;
+    minX = Math.min(minX, center.x - halfWidth);
+    minY = Math.min(minY, center.y - halfHeight);
+    maxX = Math.max(maxX, center.x + halfWidth);
+    maxY = Math.max(maxY, center.y + halfHeight);
+  }
+  function updateBoundsToIncludeOutline(outline) {
+    for (const point of outline) {
+      minX = Math.min(minX, point.x);
+      minY = Math.min(minY, point.y);
+      maxX = Math.max(maxX, point.x);
+      maxY = Math.max(maxY, point.y);
+    }
+  }
+}
+function createSvgObjects3(elm, transform) {
+  switch (elm.type) {
+    case "pcb_board":
+      return createSvgObjectsFromPcbBoard(elm, transform);
+    case "pcb_solder_paste":
+      return createSvgObjectsFromSolderPaste(elm, transform);
+    default:
+      return [];
+  }
+}
+function createSvgObjectFromPcbBoundary2(transform, minX, minY, maxX, maxY) {
+  const [x1, y1] = applyToPoint38(transform, [minX, minY]);
+  const [x2, y2] = applyToPoint38(transform, [maxX, maxY]);
+  const width = Math.abs(x2 - x1);
+  const height = Math.abs(y2 - y1);
+  const x = Math.min(x1, x2);
+  const y = Math.min(y1, y2);
+  return {
+    name: "rect",
+    type: "element",
+    value: "",
+    children: [],
+    attributes: {
+      class: "pcb-boundary",
+      fill: "none",
+      stroke: "#fff",
+      "stroke-width": "0.3",
+      x: x.toString(),
+      y: y.toString(),
+      width: width.toString(),
+      height: height.toString()
+    }
+  };
+}
 export {
   circuitJsonToPcbSvg,
   circuitJsonToSchematicSvg,
   convertCircuitJsonToAssemblySvg,
   convertCircuitJsonToPcbSvg,
-  convertCircuitJsonToSchematicSvg
+  convertCircuitJsonToSchematicSvg,
+  convertCircuitJsonToSolderPasteMask
 };
 //# sourceMappingURL=index.js.map