circuit-to-svg 0.0.312 → 0.0.314

package/dist/index.js

@@ -5270,12 +5270,86 @@ import {
   translate as translate5,
   toString as matrixToString8
 } from "transformation-matrix";
+var KEEPOUT_PATTERN_ID = "pcb-keepout-pattern";
+var KEEPOUT_PATTERN_SIZE = 20;
+var KEEPOUT_LINE_SPACING = 5;
+var KEEPOUT_BACKGROUND_COLOR = "rgba(255, 107, 107, 0.2)";
+function createKeepoutPatternLines(keepoutColor) {
+  const patternLines = [];
+  for (let i = -KEEPOUT_PATTERN_SIZE; i <= KEEPOUT_PATTERN_SIZE; i += KEEPOUT_LINE_SPACING) {
+    patternLines.push({
+      name: "line",
+      type: "element",
+      value: "",
+      attributes: {
+        x1: i.toString(),
+        y1: "0",
+        x2: (i + KEEPOUT_PATTERN_SIZE).toString(),
+        y2: KEEPOUT_PATTERN_SIZE.toString(),
+        stroke: keepoutColor,
+        "stroke-width": "1"
+      },
+      children: []
+    });
+  }
+  return patternLines;
+}
+function createKeepoutPatternDefs(keepoutColor) {
+  return {
+    name: "defs",
+    type: "element",
+    value: "",
+    attributes: {},
+    children: [
+      {
+        name: "pattern",
+        type: "element",
+        value: "",
+        attributes: {
+          id: KEEPOUT_PATTERN_ID,
+          width: KEEPOUT_PATTERN_SIZE.toString(),
+          height: KEEPOUT_PATTERN_SIZE.toString(),
+          patternUnits: "userSpaceOnUse"
+        },
+        children: createKeepoutPatternLines(keepoutColor)
+      }
+    ]
+  };
+}
+function createKeepoutBaseAttributes(keepoutId, layer, shapeClass, description) {
+  const attributes = {
+    class: `pcb-keepout ${shapeClass} pcb-keepout-background`,
+    "data-type": "pcb_keepout",
+    "data-pcb-layer": layer,
+    "data-pcb-keepout-id": keepoutId,
+    stroke: "none"
+  };
+  if (description) {
+    attributes["data-description"] = description;
+  }
+  return attributes;
+}
+function createKeepoutPatternAttributes(keepoutId, layer, shapeClass, description) {
+  const attributes = {
+    class: `pcb-keepout ${shapeClass} pcb-keepout-pattern`,
+    fill: `url(#${KEEPOUT_PATTERN_ID})`,
+    "data-type": "pcb_keepout",
+    "data-pcb-layer": layer,
+    "data-pcb-keepout-id": keepoutId,
+    stroke: "none"
+  };
+  if (description) {
+    attributes["data-description"] = description;
+  }
+  return attributes;
+}
 function createSvgObjectsFromPcbKeepout(keepout, ctx) {
   const { transform, layer: layerFilter, colorMap: colorMap2 } = ctx;
   if (layerFilter && !keepout.layers.includes(layerFilter)) {
     return [];
   }
   const svgObjects = [];
+  const keepoutColor = colorMap2.keepout;
   for (const layer of keepout.layers) {
     if (layerFilter && layer !== layerFilter) {
       continue;
@@ -5288,32 +5362,50 @@ function createSvgObjectsFromPcbKeepout(keepout, ctx) {
       ]);
       const scaledWidth = rectKeepout.width * Math.abs(transform.a);
       const scaledHeight = rectKeepout.height * Math.abs(transform.d);
-      const transformedStrokeWidth = 0.1 * Math.abs(transform.a);
-      const attributes = {
-        class: "pcb-keepout pcb-keepout-rect",
+      const baseTransform = matrixToString8(compose5(translate5(cx, cy)));
+      const backgroundAttributes = {
+        ...createKeepoutBaseAttributes(
+          rectKeepout.pcb_keepout_id,
+          layer,
+          "pcb-keepout-rect",
+          rectKeepout.description
+        ),
         x: (-scaledWidth / 2).toString(),
         y: (-scaledHeight / 2).toString(),
         width: scaledWidth.toString(),
         height: scaledHeight.toString(),
-        fill: "none",
-        stroke: colorMap2.keepout ?? "#FF6B6B",
-        "stroke-width": transformedStrokeWidth.toString(),
-        "stroke-dasharray": `${transformedStrokeWidth * 3} ${transformedStrokeWidth * 2}`,
-        transform: matrixToString8(compose5(translate5(cx, cy))),
-        "data-type": "pcb_keepout",
-        "data-pcb-layer": layer,
-        "data-pcb-keepout-id": rectKeepout.pcb_keepout_id
+        fill: KEEPOUT_BACKGROUND_COLOR,
+        transform: baseTransform
       };
-      if (rectKeepout.description) {
-        attributes["data-description"] = rectKeepout.description;
-      }
-      svgObjects.push({
-        name: "rect",
-        type: "element",
-        attributes,
-        children: [],
-        value: ""
-      });
+      const patternAttributes = {
+        ...createKeepoutPatternAttributes(
+          rectKeepout.pcb_keepout_id,
+          layer,
+          "pcb-keepout-rect",
+          rectKeepout.description
+        ),
+        x: (-scaledWidth / 2).toString(),
+        y: (-scaledHeight / 2).toString(),
+        width: scaledWidth.toString(),
+        height: scaledHeight.toString(),
+        transform: baseTransform
+      };
+      svgObjects.push(
+        {
+          name: "rect",
+          type: "element",
+          attributes: backgroundAttributes,
+          children: [],
+          value: ""
+        },
+        {
+          name: "rect",
+          type: "element",
+          attributes: patternAttributes,
+          children: [],
+          value: ""
+        }
+      );
     } else if (keepout.shape === "circle") {
       const circleKeepout = keepout;
       const [cx, cy] = applyToPoint33(transform, [
@@ -5321,30 +5413,45 @@ function createSvgObjectsFromPcbKeepout(keepout, ctx) {
         circleKeepout.center.y
       ]);
       const scaledRadius = circleKeepout.radius * Math.abs(transform.a);
-      const transformedStrokeWidth = 0.1 * Math.abs(transform.a);
-      const attributes = {
-        class: "pcb-keepout pcb-keepout-circle",
+      const backgroundAttributes = {
+        ...createKeepoutBaseAttributes(
+          circleKeepout.pcb_keepout_id,
+          layer,
+          "pcb-keepout-circle",
+          circleKeepout.description
+        ),
         cx: cx.toString(),
         cy: cy.toString(),
         r: scaledRadius.toString(),
-        fill: "none",
-        stroke: colorMap2.keepout ?? "#FF6B6B",
-        "stroke-width": transformedStrokeWidth.toString(),
-        "stroke-dasharray": `${transformedStrokeWidth * 3} ${transformedStrokeWidth * 2}`,
-        "data-type": "pcb_keepout",
-        "data-pcb-layer": layer,
-        "data-pcb-keepout-id": circleKeepout.pcb_keepout_id
+        fill: KEEPOUT_BACKGROUND_COLOR
       };
-      if (circleKeepout.description) {
-        attributes["data-description"] = circleKeepout.description;
-      }
-      svgObjects.push({
-        name: "circle",
-        type: "element",
-        attributes,
-        children: [],
-        value: ""
-      });
+      const patternAttributes = {
+        ...createKeepoutPatternAttributes(
+          circleKeepout.pcb_keepout_id,
+          layer,
+          "pcb-keepout-circle",
+          circleKeepout.description
+        ),
+        cx: cx.toString(),
+        cy: cy.toString(),
+        r: scaledRadius.toString()
+      };
+      svgObjects.push(
+        {
+          name: "circle",
+          type: "element",
+          attributes: backgroundAttributes,
+          children: [],
+          value: ""
+        },
+        {
+          name: "circle",
+          type: "element",
+          attributes: patternAttributes,
+          children: [],
+          value: ""
+        }
+      );
     }
   }
   return svgObjects;
@@ -5927,7 +6034,7 @@ function getSoftwareUsedString(circuitJson) {
 var package_default = {
   name: "circuit-to-svg",
   type: "module",
-  version: "0.0.311",
+  version: "0.0.313",
   description: "Convert Circuit JSON to SVG",
   main: "dist/index.js",
   files: [
@@ -6785,6 +6892,14 @@ function convertCircuitJsonToPcbSvg(circuitJson, options) {
   if (gridObjects.defs) {
     children.push(gridObjects.defs);
   }
+  const hasKeepouts = circuitJson.some((elm) => elm.type === "pcb_keepout");
+  if (hasKeepouts) {
+    children.push(
+      createKeepoutPatternDefs(
+        colorMap2.keepout ?? DEFAULT_PCB_COLOR_MAP.keepout
+      )
+    );
+  }
   children.push({
     name: "rect",
     type: "element",
@@ -10372,6 +10487,10 @@ function getSchematicBoundsFromCircuitJson(soup, padding = 0.5) {
         { width: item.radius * 2, height: item.radius * 2 },
         0
       );
+    } else if (item.type === "schematic_path") {
+      for (const point of item.points) {
+        updateBounds(point, { width: 0.02, height: 0.02 }, 0);
+      }
     }
   }
   minX -= padding;
@@ -12568,6 +12687,44 @@ function createSvgObjectsFromSchematicArc({
   ];
 }
 
+// lib/sch/svg-object-fns/create-svg-objects-from-sch-path.ts
+import { applyToPoint as applyToPoint75 } from "transformation-matrix";
+function createSvgObjectsFromSchematicPath({
+  schPath,
+  transform,
+  colorMap: colorMap2
+}) {
+  if (!schPath.points || schPath.points.length < 2) {
+    return [];
+  }
+  const transformedPoints = schPath.points.map(
+    (p) => applyToPoint75(transform, { x: p.x, y: p.y })
+  );
+  const pathD = transformedPoints.map((p, i) => `${i === 0 ? "M" : "L"} ${p.x} ${p.y}`).join(" ");
+  const strokeColor = colorMap2.schematic.component_outline;
+  const fillColor = schPath.fill_color ?? "none";
+  const strokeWidth = Math.abs(transform.a) * 0.02;
+  return [
+    {
+      name: "path",
+      type: "element",
+      attributes: {
+        d: pathD,
+        stroke: strokeColor,
+        "stroke-width": strokeWidth.toString(),
+        fill: schPath.is_filled ? fillColor : "none",
+        "stroke-linecap": "round",
+        "stroke-linejoin": "round",
+        ...schPath.schematic_component_id && {
+          "data-schematic-component-id": schPath.schematic_component_id
+        }
+      },
+      children: [],
+      value: ""
+    }
+  ];
+}
+
 // lib/sch/convert-circuit-json-to-schematic-svg.ts
 function buildNetHoverStyles(connectivityKeys) {
   const rules = [];
@@ -12662,6 +12819,7 @@ function convertCircuitJsonToSchematicSvg(circuitJson, options) {
   const schCircleSvgs = [];
   const schRectSvgs = [];
   const schArcSvgs = [];
+  const schPathSvgs = [];
   for (const elm of circuitJson) {
     if (elm.type === "schematic_debug_object") {
       schDebugObjectSvgs.push(
@@ -12768,6 +12926,14 @@ function convertCircuitJsonToSchematicSvg(circuitJson, options) {
           colorMap: colorMap2
         })
       );
+    } else if (elm.type === "schematic_path") {
+      schPathSvgs.push(
+        ...createSvgObjectsFromSchematicPath({
+          schPath: elm,
+          transform,
+          colorMap: colorMap2
+        })
+      );
     }
   }
   const schTraceBaseSvgs = schTraceSvgs.filter(
@@ -12784,6 +12950,7 @@ function convertCircuitJsonToSchematicSvg(circuitJson, options) {
     ...schCircleSvgs,
     ...schRectSvgs,
     ...schArcSvgs,
+    ...schPathSvgs,
     ...schComponentSvgs,
     ...schPortHoverSvgs,
     ...schNetLabel,
@@ -13645,18 +13812,18 @@ function formatNumber2(value) {
 import { distance as distance5 } from "circuit-json";
 import { stringify as stringify7 } from "svgson";
 import {
-  applyToPoint as applyToPoint77,
+  applyToPoint as applyToPoint78,
   compose as compose16,
   scale as scale9,
   translate as translate16
 } from "transformation-matrix";
 
 // lib/pcb/svg-object-fns/convert-circuit-json-to-solder-paste-mask.ts
-import { applyToPoint as applyToPoint76 } from "transformation-matrix";
+import { applyToPoint as applyToPoint77 } from "transformation-matrix";
 function createSvgObjectsFromSolderPaste(solderPaste, ctx) {
   const { transform, layer: layerFilter } = ctx;
   if (layerFilter && solderPaste.layer !== layerFilter) return [];
-  const [x, y] = applyToPoint76(transform, [solderPaste.x, solderPaste.y]);
+  const [x, y] = applyToPoint77(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);
@@ -13882,8 +14049,8 @@ function createSvgObjects4({ elm, ctx }) {
   }
 }
 function createSvgObjectFromPcbBoundary2(transform, minX, minY, maxX, maxY) {
-  const [x1, y1] = applyToPoint77(transform, [minX, minY]);
-  const [x2, y2] = applyToPoint77(transform, [maxX, maxY]);
+  const [x1, y1] = applyToPoint78(transform, [minX, minY]);
+  const [x2, y2] = applyToPoint78(transform, [maxX, maxY]);
   const width = Math.abs(x2 - x1);
   const height = Math.abs(y2 - y1);
   const x = Math.min(x1, x2);