lbrnts 0.0.18 → 0.0.19

package/dist/index.js

@@ -1322,126 +1322,6 @@ function collectShapes(root) {
   return out;
 }
 
-// lib/svg-gen/collect-cut-settings.ts
-function collectCutSettings(root) {
-  const settings = /* @__PURE__ */ new Map();
-  const processElement = (el) => {
-    if (el instanceof CutSetting && el.index !== void 0) {
-      settings.set(el.index, el);
-    } else if (el instanceof LightBurnProject) {
-      for (const child of el.children) {
-        if (child instanceof CutSetting && child.index !== void 0) {
-          settings.set(child.index, child);
-        }
-      }
-    }
-  };
-  if (Array.isArray(root)) {
-    root.forEach(processElement);
-  } else {
-    processElement(root);
-  }
-  return settings;
-}
-
-// lib/svg-gen/node-helpers.ts
-var g = (attrs, children = []) => ({
-  name: "g",
-  type: "element",
-  value: "",
-  attributes: attrs,
-  children
-});
-var leaf = (name, attrs) => ({
-  name,
-  type: "element",
-  value: "",
-  attributes: attrs,
-  children: []
-});
-var textNode = (value) => ({
-  name: "",
-  type: "text",
-  value,
-  attributes: {},
-  children: []
-});
-
-// lib/svg-gen/fill-patterns.ts
-function generatePatternId(params) {
-  const opacity = params.opacity ?? 0.8;
-  const safeColor = encodeURIComponent(params.color).replace(
-    /[^a-zA-Z0-9]/g,
-    "_"
-  );
-  return `hatch-${params.interval.toFixed(4)}-${params.angleDeg}-${params.crossHatch}-${safeColor}-${params.strokeWidth.toFixed(4)}-${opacity.toFixed(2)}`;
-}
-function createHatchPattern(params) {
-  const { interval, angleDeg, crossHatch, color, strokeWidth } = params;
-  const opacity = params.opacity ?? 0.8;
-  const id = generatePatternId(params);
-  let d = `M ${-interval} 0 L ${interval} 0`;
-  if (crossHatch) {
-    d += ` M 0 ${-interval} L 0 ${interval}`;
-  }
-  return {
-    name: "pattern",
-    type: "element",
-    value: "",
-    attributes: {
-      id,
-      patternUnits: "userSpaceOnUse",
-      width: String(interval),
-      height: String(interval),
-      patternTransform: `rotate(${angleDeg})`
-    },
-    children: [
-      leaf("path", {
-        d,
-        stroke: color,
-        "stroke-width": String(strokeWidth),
-        "stroke-opacity": String(opacity)
-      })
-    ]
-  };
-}
-var HatchPatternRegistry = class {
-  patterns = /* @__PURE__ */ new Map();
-  /**
-   * Get or create a pattern for the given parameters.
-   * @returns The pattern ID to use in fill="url(#id)"
-   */
-  getOrCreate(params) {
-    const id = generatePatternId(params);
-    if (!this.patterns.has(id)) {
-      this.patterns.set(id, createHatchPattern(params));
-    }
-    return id;
-  }
-  /**
-   * Get all registered patterns for the <defs> section.
-   */
-  getPatterns() {
-    return Array.from(this.patterns.values());
-  }
-  /**
-   * Check if any patterns have been registered.
-   */
-  hasPatterns() {
-    return this.patterns.size > 0;
-  }
-};
-function fillSettingsToPatternParams(settings, color, strokeWidth, opacity) {
-  return {
-    interval: settings.interval,
-    angleDeg: settings.angle,
-    crossHatch: settings.crossHatch,
-    color,
-    strokeWidth,
-    opacity
-  };
-}
-
 // lib/svg-gen/options.ts
 var DEFAULT_OPTIONS = {
   margin: 10,
@@ -1523,6 +1403,29 @@ function addPts(bb, pts) {
   return bb;
 }
 
+// lib/svg-gen/node-helpers.ts
+var g = (attrs, children = []) => ({
+  name: "g",
+  type: "element",
+  value: "",
+  attributes: attrs,
+  children
+});
+var leaf = (name, attrs) => ({
+  name,
+  type: "element",
+  value: "",
+  attributes: attrs,
+  children: []
+});
+var textNode = (value) => ({
+  name: "",
+  type: "text",
+  value,
+  attributes: {},
+  children: []
+});
+
 // lib/svg-gen/registry/shape-bitmap.ts
 var bitmapRenderer = {
   match: (s) => s instanceof ShapeBitmap,
@@ -1541,7 +1444,7 @@ var bitmapRenderer = {
       corners.map((p) => apply(xform, p))
     );
   },
-  toSvg: (bmp, _cutSettings, _options) => {
+  toSvg: (bmp, _options) => {
     const xform = bmp.xform ? arrayToMatrix(bmp.xform) : identity();
     const transform = matToSvg(xform);
     const w = bmp.w || 0;
@@ -1635,40 +1538,12 @@ var ellipseRenderer = {
       extremes.map((p) => apply(xform, p))
     );
   },
-  toSvg: (el, cutSettings, options) => {
+  toSvg: (el, options) => {
     const xform = el.xform ? arrayToMatrix(el.xform) : identity();
     const transform = matToSvg(xform);
     const rx = el.rx || 0;
     const ry = el.ry || 0;
     const stroke = colorForCutIndex(el.cutIndex);
-    const children = [];
-    const cutSetting = el.cutIndex !== void 0 ? cutSettings.get(el.cutIndex) : void 0;
-    const shouldShowFill = cutSetting && (cutSetting.type === "Scan" || cutSetting.type === "Scan+Cut");
-    if (shouldShowFill && cutSetting) {
-      const fillSettings = {
-        interval: cutSetting.interval || 0.1,
-        angle: cutSetting.angle || 0,
-        crossHatch: cutSetting.crossHatch || false
-      };
-      const patternId = options.patternRegistry.getOrCreate(
-        fillSettingsToPatternParams(fillSettings, stroke, options.strokeWidth)
-      );
-      const fillChild = rx === ry ? leaf("circle", {
-        cx: "0",
-        cy: "0",
-        r: String(rx),
-        fill: `url(#${patternId})`,
-        stroke: "none"
-      }) : leaf("ellipse", {
-        cx: "0",
-        cy: "0",
-        rx: String(rx),
-        ry: String(ry),
-        fill: `url(#${patternId})`,
-        stroke: "none"
-      });
-      children.push(fillChild);
-    }
     const outlineChild = rx === ry ? leaf("circle", {
       cx: "0",
       cy: "0",
@@ -1683,8 +1558,7 @@ var ellipseRenderer = {
       fill: "none",
       stroke
     });
-    children.push(outlineChild);
-    return g({ transform }, children);
+    return g({ transform }, [outlineChild]);
   }
 };
 
@@ -1879,7 +1753,7 @@ var groupRenderer = {
   bbox: (grp) => {
     return grp.children.filter((c) => c instanceof ShapeBase).reduce((bb, c) => boxUnion(bb, bboxOfShape(c)), emptyBox());
   },
-  toSvg: (grp, cutSettings, options) => {
+  toSvg: (grp, options) => {
     const groupMatrix = grp.xform ? arrayToMatrix(grp.xform) : identity();
     const transform = matToSvg(groupMatrix);
     const shapeChildren = grp.children.filter(
@@ -1896,35 +1770,10 @@ var groupRenderer = {
       }
       if (pathDataParts.length > 0) {
         const combinedPathData = pathDataParts.join(" ");
-        const children2 = [];
         const firstChild = shapeChildren[0];
         const cutIndex = firstChild.cutIndex;
         const stroke = colorForCutIndex(cutIndex);
-        const cutSetting = cutIndex !== void 0 ? cutSettings.get(cutIndex) : void 0;
-        const shouldShowFill = cutSetting && (cutSetting.type === "Scan" || cutSetting.type === "Scan+Cut");
-        if (shouldShowFill && cutSetting) {
-          const fillSettings = {
-            interval: cutSetting.interval || 0.1,
-            angle: cutSetting.angle || 0,
-            crossHatch: cutSetting.crossHatch || false
-          };
-          const patternId = options.patternRegistry.getOrCreate(
-            fillSettingsToPatternParams(
-              fillSettings,
-              stroke,
-              options.strokeWidth
-            )
-          );
-          children2.push(
-            leaf("path", {
-              d: combinedPathData,
-              fill: `url(#${patternId})`,
-              "fill-rule": "nonzero",
-              stroke: "none"
-            })
-          );
-        }
-        children2.push(
+        const children2 = [
           leaf("path", {
             d: combinedPathData,
             fill: "none",
@@ -1932,13 +1781,11 @@ var groupRenderer = {
             stroke,
             "stroke-width": String(options.strokeWidth)
           })
-        );
+        ];
         return g({}, children2);
       }
     }
-    const children = shapeChildren.map(
-      (c) => svgForShape(c, cutSettings, options)
-    );
+    const children = shapeChildren.map((c) => svgForShape(c, options));
     return g({ transform }, children);
   }
 };
@@ -1951,11 +1798,10 @@ var pathRenderer = {
     const pts = p.verts.map((v) => apply(xform, { x: v.x, y: v.y }));
     return addPts(emptyBox(), pts);
   },
-  toSvg: (p, cutSettings, options) => {
+  toSvg: (p, options) => {
     const xform = p.xform ? arrayToMatrix(p.xform) : identity();
     const transform = matToSvg(xform);
     const stroke = colorForCutIndex(p.cutIndex);
-    const children = [];
     let d = "";
     for (let i = 0; i < p.prims.length; i++) {
       const prim = p.prims[i];
@@ -1977,27 +1823,7 @@ var pathRenderer = {
     if (d.length > 0 && p.isClosed) {
       d += " Z";
     }
-    const cutSetting = p.cutIndex !== void 0 ? cutSettings.get(p.cutIndex) : void 0;
-    const shouldShowFill = p.isClosed && cutSetting && (cutSetting.type === "Scan" || cutSetting.type === "Scan+Cut");
-    if (shouldShowFill && cutSetting) {
-      const fillSettings = {
-        interval: cutSetting.interval || 0.1,
-        angle: cutSetting.angle || 0,
-        crossHatch: cutSetting.crossHatch || false
-      };
-      const patternId = options.patternRegistry.getOrCreate(
-        fillSettingsToPatternParams(fillSettings, stroke, options.strokeWidth)
-      );
-      children.push(
-        leaf("path", {
-          d,
-          fill: `url(#${patternId})`,
-          "fill-rule": "nonzero",
-          stroke: "none"
-        })
-      );
-    }
-    children.push(
+    return g({ transform }, [
       leaf("path", {
         d,
         fill: "none",
@@ -2006,8 +1832,7 @@ var pathRenderer = {
         "stroke-linecap": "round",
         "stroke-linejoin": "round"
       })
-    );
-    return g({ transform }, children);
+    ]);
   }
 };
 
@@ -2029,39 +1854,14 @@ var rectRenderer = {
       corners.map((p) => apply(xform, p))
     );
   },
-  toSvg: (rect, cutSettings, options) => {
+  toSvg: (rect, options) => {
     const xform = rect.xform ? arrayToMatrix(rect.xform) : identity();
     const transform = matToSvg(xform);
     const w = rect.w || 0;
     const h = rect.h || 0;
     const cr = rect.cr || 0;
     const stroke = colorForCutIndex(rect.cutIndex);
-    const children = [];
-    const cutSetting = rect.cutIndex !== void 0 ? cutSettings.get(rect.cutIndex) : void 0;
-    const shouldShowFill = cutSetting && (cutSetting.type === "Scan" || cutSetting.type === "Scan+Cut");
-    if (shouldShowFill && cutSetting) {
-      const fillSettings = {
-        interval: cutSetting.interval || 0.1,
-        angle: cutSetting.angle || 0,
-        crossHatch: cutSetting.crossHatch || false
-      };
-      const patternId = options.patternRegistry.getOrCreate(
-        fillSettingsToPatternParams(fillSettings, stroke, options.strokeWidth)
-      );
-      children.push(
-        leaf("rect", {
-          x: "0",
-          y: "0",
-          width: String(w),
-          height: String(h),
-          rx: String(cr),
-          ry: String(cr),
-          fill: `url(#${patternId})`,
-          stroke: "none"
-        })
-      );
-    }
-    children.push(
+    return g({ transform }, [
       leaf("rect", {
         x: "0",
         y: "0",
@@ -2072,8 +1872,7 @@ var rectRenderer = {
         fill: "none",
         stroke
       })
-    );
-    return g({ transform }, children);
+    ]);
   }
 };
 
@@ -2093,7 +1892,7 @@ var textRenderer = {
       apply(xform, { x: 100, y: 50 })
     ]);
   },
-  toSvg: (t, _cutSettings, _options) => {
+  toSvg: (t, _options) => {
     const xform = t.xform ? arrayToMatrix(t.xform) : identity();
     const transform = matToSvg(xform);
     const stroke = colorForCutIndex(t.cutIndex);
@@ -2127,30 +1926,26 @@ function findRenderer(shape) {
 function bboxOfShape(shape) {
   return findRenderer(shape).bbox(shape);
 }
-function svgForShape(shape, cutSettings, options) {
-  return findRenderer(shape).toSvg(shape, cutSettings, options);
+function svgForShape(shape, options) {
+  return findRenderer(shape).toSvg(shape, options);
 }
 function measure(shapes) {
   return shapes.reduce((acc, s) => boxUnion(acc, bboxOfShape(s)), emptyBox());
 }
-function renderAll(shapes, cutSettings, options) {
-  return shapes.map((s) => svgForShape(s, cutSettings, options));
+function renderAll(shapes, options) {
+  return shapes.map((s) => svgForShape(s, options));
 }
 
 // lib/svg-gen/index.ts
 function generateLightBurnSvg(root, options) {
   const shapes = collectShapes(root);
-  const cutSettings = collectCutSettings(root);
   const bbox = measure(shapes);
   const layout = computeLayout(bbox, options);
-  const patternRegistry = new HatchPatternRegistry();
   const renderOptions = {
-    strokeWidth: options?.defaultStrokeWidth ?? DEFAULT_OPTIONS.defaultStrokeWidth,
-    patternRegistry
+    strokeWidth: options?.defaultStrokeWidth ?? DEFAULT_OPTIONS.defaultStrokeWidth
   };
-  const nodes = renderAll(shapes, cutSettings, renderOptions);
-  const defs = patternRegistry.getPatterns();
-  const svgTree = assembleSvg(nodes, layout, defs);
+  const nodes = renderAll(shapes, renderOptions);
+  const svgTree = assembleSvg(nodes, layout, []);
   return stringify(svgTree);
 }
 export {

package/package.json

@@ -2,7 +2,7 @@
   "name": "lbrnts",
   "main": "dist/index.js",
   "type": "module",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "files": [
     "dist"
   ],