@nmmty/lazycanvas 0.6.5 → 1.0.0-dev.3

package/dist/structures/components/PolygonLayer.js

@@ -5,8 +5,8 @@ const BaseLayer_1 = require("./BaseLayer");
 const types_1 = require("../../types");
 const LazyUtil_1 = require("../../utils/LazyUtil");
 const utils_1 = require("../../utils/utils");
+const DrawUtils_1 = require("../../utils/DrawUtils");
 class PolygonLayer extends BaseLayer_1.BaseLayer {
-    props;
     constructor(props, misc) {
         super(types_1.LayerType.Polygon, props || {}, misc);
         this.props = props ? props : {};
@@ -37,9 +37,9 @@ class PolygonLayer extends BaseLayer_1.BaseLayer {
      */
     setColor(color) {
         if (!color)
-            throw new LazyUtil_1.LazyError('The color of the layer must be provided');
+            throw new LazyUtil_1.LazyError("The color of the layer must be provided");
         if (!(0, utils_1.isColor)(color))
-            throw new LazyUtil_1.LazyError('The color of the layer must be a valid color');
+            throw new LazyUtil_1.LazyError("The color of the layer must be a valid color");
         this.props.fillStyle = color;
         return this;
     }
@@ -56,13 +56,12 @@ class PolygonLayer extends BaseLayer_1.BaseLayer {
     setStroke(width, cap, join, dash, dashOffset, miterLimit) {
         this.props.stroke = {
             width,
-            cap: cap || 'butt',
-            join: join || 'miter',
+            cap: cap || "butt",
+            join: join || "miter",
             dash: dash || [],
             dashOffset: dashOffset || 0,
             miterLimit: miterLimit || 10,
         };
-        this.props.filled = false; // Ensure filled is false when stroke is set
         return this;
     }
     /**
@@ -75,15 +74,26 @@ class PolygonLayer extends BaseLayer_1.BaseLayer {
     async draw(ctx, canvas, manager, debug) {
         const parcer = (0, utils_1.parser)(ctx, canvas, manager);
         const { xs, ys, w } = parcer.parseBatch({
-            xs: { v: this.props.x },
-            ys: { v: this.props.y, options: LazyUtil_1.defaultArg.vl(true) },
+            xs: { v: this.props.position.x },
+            ys: { v: this.props.position.y, options: LazyUtil_1.defaultArg.vl(true) },
             w: { v: this.props.size.width },
         });
         const h = parcer.parse(this.props.size.height, LazyUtil_1.defaultArg.wh(w), LazyUtil_1.defaultArg.vl(true));
         let { x, y } = (0, utils_1.centring)(this.props.centring, this.type, w, h, xs, ys);
-        let fillStyle = await (0, utils_1.parseFillStyle)(ctx, this.props.fillStyle, { debug, layer: { width: w, height: h, x: xs, y: ys, align: this.props.centring }, manager });
+        let fillStyle = await (0, utils_1.parseFillStyle)(ctx, this.props.fillStyle, {
+            debug,
+            layer: { width: w, height: h, x: xs, y: ys, align: this.props.centring },
+            manager,
+        });
         if (debug)
-            LazyUtil_1.LazyLog.log('none', `PolygonLayer:`, { x, y, w, h, count: this.props.size.count, radius: this.props.size.radius });
+            LazyUtil_1.LazyLog.log("none", `PolygonLayer:`, {
+                x,
+                y,
+                w,
+                h,
+                count: this.props.size.count,
+                radius: this.props.size.radius,
+            });
         ctx.save();
         ctx.beginPath();
         // Calculate polygon vertices
@@ -92,7 +102,7 @@ class PolygonLayer extends BaseLayer_1.BaseLayer {
             const angle = (i / this.props.size.count) * (2 * Math.PI) - Math.PI / 2;
             vertices.push({
                 x: x + w / 2 + (w / 2) * Math.cos(angle),
-                y: y + h / 2 + (h / 2) * Math.sin(angle)
+                y: y + h / 2 + (h / 2) * Math.sin(angle),
             });
         }
         if (this.props.size.radius > 0) {
@@ -119,11 +129,11 @@ class PolygonLayer extends BaseLayer_1.BaseLayer {
                 // Calculate arc start and end points
                 const arcStart = {
                     x: current.x - ndx1 * cornerRadius,
-                    y: current.y - ndy1 * cornerRadius
+                    y: current.y - ndy1 * cornerRadius,
                 };
                 const arcEnd = {
                     x: current.x + ndx2 * cornerRadius,
-                    y: current.y + ndy2 * cornerRadius
+                    y: current.y + ndy2 * cornerRadius,
                 };
                 if (i === 0) {
                     ctx.moveTo(arcStart.x, arcStart.y);
@@ -148,20 +158,16 @@ class PolygonLayer extends BaseLayer_1.BaseLayer {
             }
             ctx.closePath();
         }
-        if (this.props.filled) {
-            ctx.fillStyle = fillStyle;
-            ctx.fill();
-        }
-        if (this.props.stroke && this.props.stroke.width > 0) {
-            ctx.lineWidth = this.props.stroke.width;
-            ctx.lineCap = this.props.stroke.cap;
-            ctx.lineJoin = this.props.stroke.join;
-            ctx.setLineDash(this.props.stroke.dash);
-            ctx.lineDashOffset = this.props.stroke.dashOffset;
-            ctx.miterLimit = this.props.stroke.miterLimit;
-            ctx.strokeStyle = fillStyle;
+        DrawUtils_1.DrawUtils.drawShadow(ctx, this.props.shadow);
+        DrawUtils_1.DrawUtils.opacity(ctx, this.props.opacity);
+        DrawUtils_1.DrawUtils.filters(ctx, this.props.filter);
+        DrawUtils_1.DrawUtils.fillStyle(ctx, fillStyle, this.props.stroke);
+        if (this.props.stroke) {
             ctx.stroke();
         }
+        else {
+            ctx.fill();
+        }
         ctx.restore();
     }
     /**
@@ -171,8 +177,8 @@ class PolygonLayer extends BaseLayer_1.BaseLayer {
     toJSON() {
         let data = super.toJSON();
         let copy = { ...this.props };
-        for (const key of ['x', 'y', 'size.width', 'size.height', 'fillStyle']) {
-            if (copy[key] && typeof copy[key] === 'object' && 'toJSON' in copy[key]) {
+        for (const key of ["x", "y", "size.width", "size.height", "fillStyle"]) {
+            if (copy[key] && typeof copy[key] === "object" && "toJSON" in copy[key]) {
                 copy[key] = copy[key].toJSON();
             }
         }
@@ -190,18 +196,9 @@ class PolygonLayer extends BaseLayer_1.BaseLayer {
                 width: data.size?.width || 100,
                 height: data.size?.height || 100,
                 radius: data.size?.radius || 0,
-                count: data.size?.count || 3
+                count: data.size?.count || 3,
             },
-            filled: data.filled !== undefined ? data.filled : true,
-            fillStyle: data.fillStyle || '#000000',
-            stroke: {
-                width: data.stroke?.width || 1,
-                cap: data.stroke?.cap || 'butt',
-                join: data.stroke?.join || 'miter',
-                dashOffset: data.stroke?.dashOffset || 0,
-                dash: data.stroke?.dash || [],
-                miterLimit: data.stroke?.miterLimit || 10
-            }
+            fillStyle: data.fillStyle || "#000000",
         };
     }
 }

package/dist/structures/components/QuadraticLayer.d.ts

@@ -1,5 +1,5 @@
 import { BaseLayer, IBaseLayer, IBaseLayerMisc, IBaseLayerProps } from "./BaseLayer";
-import { ColorType, ScaleType, Point, LayerType } from "../../types";
+import { ColorType, ScaleType, Point, LayerType, StrokeOptions } from "../../types";
 import { Canvas, SKRSContext2D, SvgCanvas } from "@napi-rs/canvas";
 import { LayersManager } from "../managers";
 /**
@@ -19,14 +19,20 @@ export interface IQuadraticLayer extends IBaseLayer {
  * Interface representing the properties of a Quadratic layer.
  */
 export interface IQuadraticLayerProps extends IBaseLayerProps {
+    position: IBaseLayerProps["position"] & {
+        /**
+         * The end x coordinate of the quadratic curve.
+         */
+        endX: ScaleType;
+        /**
+         * The end y coordinate of the quadratic curve.
+         */
+        endY: ScaleType;
+    };
     /**
      * The control point of the quadratic curve, including x and y coordinates.
      */
     controlPoints: Array<Point>;
-    /**
-     * The end point of the quadratic curve, including x and y coordinates.
-     */
-    endPoint: Point;
     /**
      * Whether the layer is filled.
      */
@@ -38,32 +44,7 @@ export interface IQuadraticLayerProps extends IBaseLayerProps {
     /**
      * The stroke properties of the quadratic curve.
      */
-    stroke: {
-        /**
-         * The width of the stroke.
-         */
-        width: number;
-        /**
-         * The cap style of the stroke.
-         */
-        cap: CanvasLineCap;
-        /**
-         * The join style of the stroke.
-         */
-        join: CanvasLineJoin;
-        /**
-         * The dash offset of the stroke.
-         */
-        dashOffset: number;
-        /**
-         * The dash pattern of the stroke.
-         */
-        dash: number[];
-        /**
-         * The miter limit of the stroke.
-         */
-        miterLimit: number;
-    };
+    stroke: StrokeOptions;
 }
 /**
  * Class representing a Quadratic layer, extending the BaseLayer class.
@@ -87,12 +68,14 @@ export declare class QuadraticLayer extends BaseLayer<IQuadraticLayerProps> {
      */
     setControlPoint(x: ScaleType, y: ScaleType): this;
     /**
-     * Sets the end point of the quadratic layer.
+     * Sets the position of the quadratic layer.
      * @param {ScaleType} [x] - The x-coordinate of the end point.
      * @param {ScaleType} [y] - The y-coordinate of the end point.
+     * @param {ScaleType} [endX] - The x-coordinate of the end point.
+     * @param {ScaleType} [endY] - The y-coordinate of the end point.
      * @returns {this} The current instance for chaining.
      */
-    setEndPosition(x: ScaleType, y: ScaleType): this;
+    setPosition(x: ScaleType, y: ScaleType, endX?: ScaleType, endY?: ScaleType): this;
     /**
      * Sets the color of the layer.
      * @param {ColorType} [color] - The color of the layer.

package/dist/structures/components/QuadraticLayer.js

@@ -5,14 +5,11 @@ const BaseLayer_1 = require("./BaseLayer");
 const types_1 = require("../../types");
 const utils_1 = require("../../utils/utils");
 const LazyUtil_1 = require("../../utils/LazyUtil");
+const DrawUtils_1 = require("../../utils/DrawUtils");
 /**
  * Class representing a Quadratic layer, extending the BaseLayer class.
  */
 class QuadraticLayer extends BaseLayer_1.BaseLayer {
-    /**
-     * The properties of the Quadratic layer.
-     */
-    props;
     /**
      * Constructs a new QuadraticLayer instance.
      * @param {IQuadraticLayerProps} [props] - The properties of the Quadratic layer.
@@ -34,13 +31,15 @@ class QuadraticLayer extends BaseLayer_1.BaseLayer {
         return this;
     }
     /**
-     * Sets the end point of the quadratic layer.
+     * Sets the position of the quadratic layer.
      * @param {ScaleType} [x] - The x-coordinate of the end point.
      * @param {ScaleType} [y] - The y-coordinate of the end point.
+     * @param {ScaleType} [endX] - The x-coordinate of the end point.
+     * @param {ScaleType} [endY] - The y-coordinate of the end point.
      * @returns {this} The current instance for chaining.
      */
-    setEndPosition(x, y) {
-        this.props.endPoint = { x, y };
+    setPosition(x, y, endX, endY) {
+        this.props.position = { x, y, endX: endX || 0, endY: endY || 0 };
         return this;
     }
     /**
@@ -51,9 +50,9 @@ class QuadraticLayer extends BaseLayer_1.BaseLayer {
      */
     setColor(color) {
         if (!color)
-            throw new LazyUtil_1.LazyError('The color of the layer must be provided');
+            throw new LazyUtil_1.LazyError("The color of the layer must be provided");
         if (!(0, utils_1.isColor)(color))
-            throw new LazyUtil_1.LazyError('The color of the layer must be a valid color');
+            throw new LazyUtil_1.LazyError("The color of the layer must be a valid color");
         this.props.fillStyle = color;
         return this;
     }
@@ -70,8 +69,8 @@ class QuadraticLayer extends BaseLayer_1.BaseLayer {
     setStroke(width, cap, join, dash, dashOffset, miterLimit) {
         this.props.stroke = {
             width,
-            cap: cap || 'butt',
-            join: join || 'miter',
+            cap: cap || "butt",
+            join: join || "miter",
             dash: dash || [],
             dashOffset: dashOffset || 0,
             miterLimit: miterLimit || 10,
@@ -88,14 +87,18 @@ class QuadraticLayer extends BaseLayer_1.BaseLayer {
     getBoundingBox(ctx, canvas, manager) {
         const parcer = (0, utils_1.parser)(ctx, canvas, manager);
         const { xs, ys, cx, cy, xe, ye } = parcer.parseBatch({
-            xs: { v: this.props.x },
-            ys: { v: this.props.y, options: LazyUtil_1.defaultArg.vl(true) },
+            xs: { v: this.props.position.x },
+            ys: { v: this.props.position.y, options: LazyUtil_1.defaultArg.vl(true) },
             cx: { v: this.props.controlPoints[0].x },
             cy: { v: this.props.controlPoints[0].y, options: LazyUtil_1.defaultArg.vl(true) },
-            xe: { v: this.props.endPoint.x },
-            ye: { v: this.props.endPoint.y, options: LazyUtil_1.defaultArg.vl(true) }
+            xe: { v: this.props.position.endX },
+            ye: { v: this.props.position.endY, options: LazyUtil_1.defaultArg.vl(true) },
         });
-        const { max, min, center, width, height } = (0, utils_1.getBoundingBoxBezier)([{ x: xs, y: ys }, { x: cx, y: cy }, { x: xe, y: ye }]);
+        const { max, min, center, width, height } = (0, utils_1.getBoundingBoxBezier)([
+            { x: xs, y: ys },
+            { x: cx, y: cy },
+            { x: xe, y: ye },
+        ]);
         return { max, min, center, width, height };
     }
     /**
@@ -108,31 +111,54 @@ class QuadraticLayer extends BaseLayer_1.BaseLayer {
     async draw(ctx, canvas, manager, debug) {
         const parcer = (0, utils_1.parser)(ctx, canvas, manager);
         const { xs, ys, cx, cy, xe, ye } = parcer.parseBatch({
-            xs: { v: this.props.x },
-            ys: { v: this.props.y, options: LazyUtil_1.defaultArg.vl(true) },
+            xs: { v: this.props.position.x },
+            ys: { v: this.props.position.y, options: LazyUtil_1.defaultArg.vl(true) },
             cx: { v: this.props.controlPoints[0].x },
             cy: { v: this.props.controlPoints[0].y, options: LazyUtil_1.defaultArg.vl(true) },
-            xe: { v: this.props.endPoint.x },
-            ye: { v: this.props.endPoint.y, options: LazyUtil_1.defaultArg.vl(true) }
+            xe: { v: this.props.position.endX },
+            ye: { v: this.props.position.endY, options: LazyUtil_1.defaultArg.vl(true) },
+        });
+        const { max, min, center, width, height } = (0, utils_1.getBoundingBoxBezier)([
+            { x: xs, y: ys },
+            { x: cx, y: cy },
+            { x: xe, y: ye },
+        ]);
+        let fillStyle = await (0, utils_1.parseFillStyle)(ctx, this.props.fillStyle, {
+            debug,
+            layer: { width, height, x: min.x, y: min.y, align: "none" },
+            manager,
         });
-        const { max, min, center, width, height } = (0, utils_1.getBoundingBoxBezier)([{ x: xs, y: ys }, { x: cx, y: cy }, { x: xe, y: ye }]);
-        let fillStyle = await (0, utils_1.parseFillStyle)(ctx, this.props.fillStyle, { debug, layer: { width, height, x: min.x, y: min.y, align: 'none' }, manager });
         if (debug)
-            LazyUtil_1.LazyLog.log('none', `BezierLayer:`, { xs, ys, cx, cy, xe, ye, max, min, center, width, height, fillStyle });
+            LazyUtil_1.LazyLog.log("none", `BezierLayer:`, {
+                xs,
+                ys,
+                cx,
+                cy,
+                xe,
+                ye,
+                max,
+                min,
+                center,
+                width,
+                height,
+                fillStyle,
+            });
         ctx.save();
-        (0, utils_1.transform)(ctx, this.props.transform, { x: center.x, y: center.y, width, height, type: this.type });
-        (0, utils_1.drawShadow)(ctx, this.props.shadow);
-        (0, utils_1.opacity)(ctx, this.props.opacity);
-        (0, utils_1.filters)(ctx, this.props.filter);
+        if (this.props.transform) {
+            (0, utils_1.transform)(ctx, this.props.transform, {
+                x: center.x,
+                y: center.y,
+                width,
+                height,
+                type: this.type,
+            });
+        }
+        DrawUtils_1.DrawUtils.drawShadow(ctx, this.props.shadow);
+        DrawUtils_1.DrawUtils.opacity(ctx, this.props.opacity);
+        DrawUtils_1.DrawUtils.filters(ctx, this.props.filter);
+        DrawUtils_1.DrawUtils.fillStyle(ctx, fillStyle, this.props.stroke);
         ctx.beginPath();
         ctx.moveTo(xs, ys);
-        ctx.strokeStyle = fillStyle;
-        ctx.lineWidth = this.props.stroke?.width || 1;
-        ctx.lineCap = this.props.stroke?.cap || 'butt';
-        ctx.lineJoin = this.props.stroke?.join || 'miter';
-        ctx.miterLimit = this.props.stroke?.miterLimit || 10;
-        ctx.lineDashOffset = this.props.stroke?.dashOffset || 0;
-        ctx.setLineDash(this.props.stroke?.dash || []);
         ctx.quadraticCurveTo(cx, cy, xe, ye);
         ctx.stroke();
         ctx.closePath();
@@ -145,8 +171,16 @@ class QuadraticLayer extends BaseLayer_1.BaseLayer {
     toJSON() {
         let data = super.toJSON();
         let copy = { ...this.props };
-        for (const key of ['x', 'y', 'endPoint.x', 'endPoint.y', 'controlPoint.x', 'controlPoint.y', 'fillStyle']) {
-            if (copy[key] && typeof copy[key] === 'object' && 'toJSON' in copy[key]) {
+        for (const key of [
+            "x",
+            "y",
+            "endPoint.x",
+            "endPoint.y",
+            "controlPoint.x",
+            "controlPoint.y",
+            "fillStyle",
+        ]) {
+            if (copy[key] && typeof copy[key] === "object" && "toJSON" in copy[key]) {
                 copy[key] = copy[key].toJSON();
             }
         }
@@ -160,19 +194,23 @@ class QuadraticLayer extends BaseLayer_1.BaseLayer {
     validateProps(data) {
         return {
             ...super.validateProps(data),
-            filled: data.filled || false,
-            fillStyle: data.fillStyle || '#000000',
+            position: {
+                x: data.position?.x || 0,
+                y: data.position?.y || 0,
+                endX: data.position?.endX || 0,
+                endY: data.position?.endY || 0,
+            },
+            fillStyle: data.fillStyle || "#000000",
             centring: data.centring || types_1.Centring.None,
             controlPoints: data.controlPoints || [{ x: 0, y: 0 }],
-            endPoint: data.endPoint || { x: 0, y: 0 },
             stroke: {
                 width: data.stroke?.width || 1,
-                cap: data.stroke?.cap || 'butt',
-                join: data.stroke?.join || 'miter',
+                cap: data.stroke?.cap || "butt",
+                join: data.stroke?.join || "miter",
                 dashOffset: data.stroke?.dashOffset || 0,
                 dash: data.stroke?.dash || [],
                 miterLimit: data.stroke?.miterLimit || 10,
-            }
+            },
         };
     }
 }

package/dist/structures/components/TextLayer.d.ts

@@ -1,5 +1,5 @@
 import { BaseLayer, IBaseLayer, IBaseLayerMisc, IBaseLayerProps } from "./BaseLayer";
-import { AnyTextAlign, AnyTextBaseline, AnyTextDirection, AnyWeight, ColorType, LayerType, LineCap, LineJoin, ScaleType, SubStringColor } from "../../types";
+import { AnyTextAlign, AnyTextBaseline, AnyTextDirection, AnyWeight, ColorType, LayerType, LineCap, LineJoin, ScaleType, StrokeOptions, SubStringColor } from "../../types";
 import { Canvas, SKRSContext2D, SvgCanvas } from "@napi-rs/canvas";
 import { LayersManager } from "../managers";
 /**
@@ -23,10 +23,6 @@ export interface ITextLayerProps extends IBaseLayerProps {
      * The text content of the layer.
      */
     text: string;
-    /**
-     * Whether the layer is filled.
-     */
-    filled: boolean;
     /**
      * The fill style (color or pattern) of the layer.
      */
@@ -55,7 +51,7 @@ export interface ITextLayerProps extends IBaseLayerProps {
     /**
      * Configuration for multiline text.
      */
-    multiline: {
+    multiline?: {
         /**
          * Whether multiline is enabled.
          */
@@ -68,7 +64,7 @@ export interface ITextLayerProps extends IBaseLayerProps {
     /**
      * The size of the Text layer, including width and height.
      */
-    size: {
+    size?: {
         /**
          * The width of the Text layer.
          */
@@ -101,32 +97,7 @@ export interface ITextLayerProps extends IBaseLayerProps {
     /**
      * The stroke properties of the text.
      */
-    stroke?: {
-        /**
-         * The width of the stroke.
-         */
-        width: number;
-        /**
-         * The cap style of the stroke.
-         */
-        cap: CanvasLineCap;
-        /**
-         * The join style of the stroke.
-         */
-        join: CanvasLineJoin;
-        /**
-         * The dash offset of the stroke.
-         */
-        dashOffset: number;
-        /**
-         * The dash pattern of the stroke.
-         */
-        dash: number[];
-        /**
-         * The miter limit of the stroke.
-         */
-        miterLimit: number;
-    };
+    stroke?: StrokeOptions;
 }
 /**
  * Class representing a Text layer, extending the BaseLayer class.