circuit-to-svg 0.0.312 → 0.0.313

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.312",
   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",