circuit-to-svg 0.0.137 → 0.0.139

package/dist/index.js

@@ -686,7 +686,10 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, ctx) {
     height,
     layer = "top",
     pcb_silkscreen_rect_id,
-    stroke_width = 1
+    stroke_width,
+    is_filled,
+    has_stroke,
+    is_stroke_dashed
   } = pcbSilkscreenRect;
   if (layerFilter && layer !== layerFilter) return [];
   if (!center || typeof center.x !== "number" || typeof center.y !== "number" || typeof width !== "number" || typeof height !== "number") {
@@ -701,20 +704,36 @@ function createSvgObjectsFromPcbSilkscreenRect(pcbSilkscreenRect, ctx) {
   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 attributes = {
+    x: (transformedX - transformedWidth / 2).toString(),
+    y: (transformedY - transformedHeight / 2).toString(),
+    width: transformedWidth.toString(),
+    height: transformedHeight.toString(),
+    class: `pcb-silkscreen-rect pcb-silkscreen-${layer}`,
+    "data-pcb-silkscreen-rect-id": pcb_silkscreen_rect_id
+  };
+  attributes.fill = is_filled ? color : "none";
+  let actualHasStroke;
+  if (has_stroke === void 0) {
+    actualHasStroke = transformedStrokeWidth > 0;
+  } else {
+    actualHasStroke = has_stroke;
+  }
+  if (actualHasStroke) {
+    attributes.stroke = color;
+    attributes["stroke-width"] = transformedStrokeWidth.toString();
+    if (is_stroke_dashed) {
+      const dashLength = 0.1 * Math.abs(transform.a);
+      const gapLength = 0.05 * Math.abs(transform.a);
+      attributes["stroke-dasharray"] = `${dashLength} ${gapLength}`;
+    }
+  } else {
+    attributes.stroke = "none";
+  }
   const svgObject = {
     name: "rect",
     type: "element",
-    attributes: {
-      x: (transformedX - transformedWidth / 2).toString(),
-      y: (transformedY - transformedHeight / 2).toString(),
-      width: transformedWidth.toString(),
-      height: transformedHeight.toString(),
-      class: `pcb-silkscreen-rect pcb-silkscreen-${layer}`,
-      fill: "none",
-      stroke: color,
-      "stroke-width": transformedStrokeWidth.toString(),
-      "data-pcb-silkscreen-rect-id": pcb_silkscreen_rect_id
-    },
+    attributes,
     value: "",
     children: []
   };
@@ -2454,7 +2473,10 @@ function getSchematicBoundsFromCircuitJson(soup, padding = 0.5) {
       updateBounds(item.position, { width: 0.2, height: 0.4 }, 0);
     } else if (item.type === "schematic_box") {
       updateBounds(
-        { x: item.x, y: item.y },
+        {
+          x: item.x + item.width / 2,
+          y: item.y + item.height / 2
+        },
         { width: item.width, height: item.height },
         0
       );
@@ -4729,6 +4751,49 @@ var createSvgObjectsForSchNetLabel = ({
   return svgObjects;
 };
 
+// lib/sch/svg-object-fns/create-svg-objects-from-sch-box.ts
+import { applyToPoint as applyToPoint37 } from "transformation-matrix";
+var createSvgObjectsFromSchematicBox = ({
+  schematicBox,
+  transform,
+  colorMap: colorMap2
+}) => {
+  const topLeft = applyToPoint37(transform, {
+    x: schematicBox.x,
+    y: schematicBox.y
+  });
+  const bottomRight = applyToPoint37(transform, {
+    x: schematicBox.x + schematicBox.width,
+    y: schematicBox.y + schematicBox.height
+  });
+  const yTop = Math.min(topLeft.y, bottomRight.y);
+  const yBottom = Math.max(topLeft.y, bottomRight.y);
+  const xLeft = Math.min(topLeft.x, bottomRight.x);
+  const xRight = Math.max(topLeft.x, bottomRight.x);
+  const attributes = {
+    class: "schematic-box",
+    x: xLeft.toString(),
+    y: yTop.toString(),
+    width: (xRight - xLeft).toString(),
+    height: (yBottom - yTop).toString(),
+    "stroke-width": "2px",
+    stroke: colorMap2.schematic.component_outline || "black",
+    fill: "transparent"
+  };
+  if (schematicBox.is_dashed) {
+    attributes["stroke-dasharray"] = "20 8";
+  }
+  return [
+    {
+      name: "rect",
+      type: "element",
+      value: "",
+      attributes,
+      children: []
+    }
+  ];
+};
+
 // lib/sch/convert-circuit-json-to-schematic-svg.ts
 function convertCircuitJsonToSchematicSvg(circuitJson, options) {
   const realBounds = getSchematicBoundsFromCircuitJson(circuitJson);
@@ -4798,6 +4863,7 @@ function convertCircuitJsonToSchematicSvg(circuitJson, options) {
   const schNetLabel = [];
   const schText = [];
   const voltageProbeSvgs = [];
+  const schBoxSvgs = [];
   for (const elm of circuitJson) {
     if (elm.type === "schematic_debug_object") {
       schDebugObjectSvgs.push(
@@ -4815,6 +4881,14 @@ function convertCircuitJsonToSchematicSvg(circuitJson, options) {
           colorMap: colorMap2
         })
       );
+    } else if (elm.type === "schematic_box") {
+      schBoxSvgs.push(
+        ...createSvgObjectsFromSchematicBox({
+          schematicBox: elm,
+          transform,
+          colorMap: colorMap2
+        })
+      );
     } else if (elm.type === "schematic_trace") {
       schTraceSvgs.push(
         ...createSchematicTrace({
@@ -4855,6 +4929,7 @@ function convertCircuitJsonToSchematicSvg(circuitJson, options) {
     ...schTraceSvgs,
     ...schNetLabel,
     ...schText,
+    ...schBoxSvgs,
     ...voltageProbeSvgs
   );
   if (options?.labeledPoints) {
@@ -4921,18 +4996,18 @@ var circuitJsonToSchematicSvg = convertCircuitJsonToSchematicSvg;
 // lib/pcb/convert-circuit-json-to-solder-paste-mask.ts
 import { stringify as stringify4 } from "svgson";
 import {
-  applyToPoint as applyToPoint39,
+  applyToPoint as applyToPoint40,
   compose as compose11,
   scale as scale8,
   translate as translate11
 } from "transformation-matrix";
 
 // lib/pcb/svg-object-fns/convert-circuit-json-to-solder-paste-mask.ts
-import { applyToPoint as applyToPoint38 } from "transformation-matrix";
+import { applyToPoint as applyToPoint39 } from "transformation-matrix";
 function createSvgObjectsFromSolderPaste(solderPaste, ctx) {
   const { transform, layer: layerFilter } = ctx;
   if (layerFilter && solderPaste.layer !== layerFilter) return [];
-  const [x, y] = applyToPoint38(transform, [solderPaste.x, solderPaste.y]);
+  const [x, y] = applyToPoint39(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);
@@ -5126,8 +5201,8 @@ function createSvgObjects3({ elm, ctx }) {
   }
 }
 function createSvgObjectFromPcbBoundary2(transform, minX, minY, maxX, maxY) {
-  const [x1, y1] = applyToPoint39(transform, [minX, minY]);
-  const [x2, y2] = applyToPoint39(transform, [maxX, maxY]);
+  const [x1, y1] = applyToPoint40(transform, [minX, minY]);
+  const [x2, y2] = applyToPoint40(transform, [maxX, maxY]);
   const width = Math.abs(x2 - x1);
   const height = Math.abs(y2 - y1);
   const x = Math.min(x1, x2);