lbrnts 0.0.9 → 0.0.11

package/dist/index.d.ts

@@ -361,6 +361,12 @@ declare class ShapeBitmap extends ShapeBase {
 
 interface GenerateSvgOptions {
     margin?: number;
+    /** Target width for the SVG. When provided with height, scales the output. */
+    width?: number;
+    /** Target height for the SVG. When provided with width, scales the output. */
+    height?: number;
+    /** Default stroke width for shapes in mm. */
+    defaultStrokeWidth?: number;
 }
 
 declare function generateLightBurnSvg(root: LightBurnBaseElement | LightBurnBaseElement[], options?: GenerateSvgOptions): string;

package/dist/index.js

@@ -1301,7 +1301,8 @@ function collectCutSettings(root) {
 
 // lib/svg-gen/options.ts
 var DEFAULT_OPTIONS = {
-  margin: 10
+  margin: 10,
+  defaultStrokeWidth: 0.1
 };
 
 // lib/svg-gen/layout.ts
@@ -1315,16 +1316,18 @@ function computeLayout(bbox, options) {
   const minY = Math.min(0, bbox.minY) - margin;
   const maxX = Math.max(0, bbox.maxX) + margin;
   const maxY = Math.max(0, bbox.maxY) + margin;
-  const width = maxX - minX;
-  const height = maxY - minY;
-  const viewBox = `${minX} ${minY} ${width} ${height}`;
+  const contentWidth = maxX - minX;
+  const contentHeight = maxY - minY;
+  const viewBox = `${minX} ${minY} ${contentWidth} ${contentHeight}`;
   const flipY = maxY + minY;
+  const width = options?.width ?? contentWidth;
+  const height = options?.height ?? contentHeight;
   return {
     viewBox,
     width,
     height,
     flipY,
-    bg: { x: minX, y: minY, width, height }
+    bg: { x: minX, y: minY, width: contentWidth, height: contentHeight }
   };
 }
 
@@ -1415,7 +1418,7 @@ var bitmapRenderer = {
       corners.map((p) => apply(xform, p))
     );
   },
-  toSvg: (bmp, _cutSettings) => {
+  toSvg: (bmp, _cutSettings, _options) => {
     const xform = bmp.xform ? arrayToMatrix(bmp.xform) : identity();
     const transform = matToSvg(xform);
     const w = bmp.w || 0;
@@ -1434,14 +1437,15 @@ var bitmapRenderer = {
 };
 
 // lib/svg-gen/fill-patterns.ts
-function generateScanLines(bbox, settings, color) {
+function generateScanLines(bbox, settings, color, strokeWidth) {
   const lines = [];
   const angleRad = settings.angle * Math.PI / 180;
   const primaryLines = generateLinesAtAngle(
     bbox,
     settings.interval,
     angleRad,
-    color
+    color,
+    strokeWidth
   );
   lines.push(...primaryLines);
   if (settings.crossHatch) {
@@ -1450,13 +1454,14 @@ function generateScanLines(bbox, settings, color) {
       bbox,
       settings.interval,
       perpAngle,
-      color
+      color,
+      strokeWidth
     );
     lines.push(...crossLines);
   }
   return lines;
 }
-function generateLinesAtAngle(bbox, interval, angle, color) {
+function generateLinesAtAngle(bbox, interval, angle, color, strokeWidth) {
   const lines = [];
   const diagonal = Math.sqrt(
     Math.pow(bbox.maxX - bbox.minX, 2) + Math.pow(bbox.maxY - bbox.minY, 2)
@@ -1492,7 +1497,7 @@ function generateLinesAtAngle(bbox, interval, angle, color) {
           x2: String(clipped.x2),
           y2: String(clipped.y2),
           stroke: color,
-          "stroke-width": "0.1",
+          "stroke-width": String(strokeWidth),
           "stroke-opacity": "0.8"
         })
       );
@@ -1625,7 +1630,7 @@ var ellipseRenderer = {
       extremes.map((p) => apply(xform, p))
     );
   },
-  toSvg: (el, cutSettings) => {
+  toSvg: (el, cutSettings, options) => {
     const xform = el.xform ? arrayToMatrix(el.xform) : identity();
     const transform = matToSvg(xform);
     const rx = el.rx || 0;
@@ -1646,7 +1651,12 @@ var ellipseRenderer = {
         angle: cutSetting.angle || 0,
         crossHatch: cutSetting.crossHatch || false
       };
-      const fillLines = generateScanLines(localBBox, fillSettings, stroke);
+      const fillLines = generateScanLines(
+        localBBox,
+        fillSettings,
+        stroke,
+        options.strokeWidth
+      );
       children.push(...fillLines);
     }
     const child = rx === ry ? leaf("circle", {
@@ -1674,10 +1684,10 @@ var groupRenderer = {
   bbox: (grp) => {
     return grp.children.filter((c) => c instanceof ShapeBase).reduce((bb, c) => boxUnion(bb, bboxOfShape(c)), emptyBox());
   },
-  toSvg: (grp, cutSettings) => {
+  toSvg: (grp, cutSettings, options) => {
     const xform = grp.xform ? arrayToMatrix(grp.xform) : identity();
     const transform = matToSvg(xform);
-    const children = grp.children.filter((c) => c instanceof ShapeBase).map((c) => svgForShape(c, cutSettings));
+    const children = grp.children.filter((c) => c instanceof ShapeBase).map((c) => svgForShape(c, cutSettings, options));
     return g({ transform }, children);
   }
 };
@@ -1690,7 +1700,7 @@ var pathRenderer = {
     const pts = p.verts.map((v) => apply(xform, { x: v.x, y: v.y }));
     return addPts(emptyBox(), pts);
   },
-  toSvg: (p, cutSettings) => {
+  toSvg: (p, cutSettings, options) => {
     const xform = p.xform ? arrayToMatrix(p.xform) : identity();
     const transform = matToSvg(xform);
     const stroke = colorForCutIndex(p.cutIndex);
@@ -1728,7 +1738,12 @@ var pathRenderer = {
         angle: cutSetting.angle || 0,
         crossHatch: cutSetting.crossHatch || false
       };
-      const fillLines = generateScanLines(bbox, fillSettings, stroke);
+      const fillLines = generateScanLines(
+        bbox,
+        fillSettings,
+        stroke,
+        options.strokeWidth
+      );
       const clipId = `clip-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
       const clipPath = {
         name: "clipPath",
@@ -1752,7 +1767,7 @@ var pathRenderer = {
         d,
         fill: "none",
         stroke,
-        "stroke-width": "0.1"
+        "stroke-width": String(options.strokeWidth)
       })
     );
     return g({ transform }, children);
@@ -1777,7 +1792,7 @@ var rectRenderer = {
       corners.map((p) => apply(xform, p))
     );
   },
-  toSvg: (rect, cutSettings) => {
+  toSvg: (rect, cutSettings, options) => {
     const xform = rect.xform ? arrayToMatrix(rect.xform) : identity();
     const transform = matToSvg(xform);
     const w = rect.w || 0;
@@ -1799,7 +1814,12 @@ var rectRenderer = {
         angle: cutSetting.angle || 0,
         crossHatch: cutSetting.crossHatch || false
       };
-      const fillLines = generateScanLines(localBBox, fillSettings, stroke);
+      const fillLines = generateScanLines(
+        localBBox,
+        fillSettings,
+        stroke,
+        options.strokeWidth
+      );
       children.push(...fillLines);
     }
     children.push(
@@ -1834,7 +1854,7 @@ var textRenderer = {
       apply(xform, { x: 100, y: 50 })
     ]);
   },
-  toSvg: (t, _cutSettings) => {
+  toSvg: (t, _cutSettings, _options) => {
     const xform = t.xform ? arrayToMatrix(t.xform) : identity();
     const transform = matToSvg(xform);
     const stroke = colorForCutIndex(t.cutIndex);
@@ -1868,14 +1888,17 @@ function findRenderer(shape) {
 function bboxOfShape(shape) {
   return findRenderer(shape).bbox(shape);
 }
-function svgForShape(shape, cutSettings) {
-  return findRenderer(shape).toSvg(shape, cutSettings);
+function svgForShape(shape, cutSettings, options) {
+  return findRenderer(shape).toSvg(shape, cutSettings, options);
 }
 function measure(shapes) {
   return shapes.reduce((acc, s) => boxUnion(acc, bboxOfShape(s)), emptyBox());
 }
-function renderAll(shapes, cutSettings) {
-  return shapes.map((s) => svgForShape(s, cutSettings));
+function renderAll(shapes, cutSettings, svgOptions) {
+  const renderOptions = {
+    strokeWidth: svgOptions?.defaultStrokeWidth ?? DEFAULT_OPTIONS.defaultStrokeWidth
+  };
+  return shapes.map((s) => svgForShape(s, cutSettings, renderOptions));
 }
 
 // lib/svg-gen/index.ts
@@ -1884,7 +1907,7 @@ function generateLightBurnSvg(root, options) {
   const cutSettings = collectCutSettings(root);
   const bbox = measure(shapes);
   const layout = computeLayout(bbox, options);
-  const nodes = renderAll(shapes, cutSettings);
+  const nodes = renderAll(shapes, cutSettings, options);
   const svgTree = assembleSvg(nodes, layout);
   return stringify(svgTree);
 }

package/package.json

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