@nmmty/lazycanvas 0.6.4 → 1.0.0-dev.10

package/dist/structures/components/LineLayer.js

@@ -3,16 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LineLayer = void 0;
 const BaseLayer_1 = require("./BaseLayer");
 const types_1 = require("../../types");
-const LazyUtil_1 = require("../../utils/LazyUtil");
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 /**
  * Class representing a Line Layer, extending the BaseLayer class.
  */
 class LineLayer extends BaseLayer_1.BaseLayer {
-    /**
-     * The properties of the Line Layer.
-     */
-    props;
     /**
      * Constructs a new LineLayer instance.
      * @param {ILineLayerProps} [props] - The properties of the Line Layer.
@@ -24,13 +19,15 @@ class LineLayer extends BaseLayer_1.BaseLayer {
         this.props = this.validateProps(this.props);
     }
     /**
-     * Sets the end position of the line layer.
+     * Sets the position of the line 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;
     }
     /**
@@ -41,10 +38,10 @@ class LineLayer extends BaseLayer_1.BaseLayer {
      */
     setColor(color) {
         if (!color)
-            throw new LazyUtil_1.LazyError('The color of the layer must be provided');
+            throw new utils_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');
-        this.props.fillStyle = color;
+            throw new utils_1.LazyError("The color of the layer must be a valid color");
+        this.props.color = color;
         return this;
     }
     /**
@@ -60,8 +57,8 @@ class LineLayer 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,
@@ -72,16 +69,16 @@ class LineLayer extends BaseLayer_1.BaseLayer {
      * Calculates the bounding box of the line layer.
      * @param {SKRSContext2D} [ctx] - The canvas rendering context.
      * @param {Canvas | SvgCanvas} [canvas] - The canvas instance.
-     * @param {LayersManager} [manager] - The layers manager.
+     * @param {LayersManager} [manager] - The layer's manager.
      * @returns {Object} The bounding box details including start and end points, width, and height.
      */
     getBoundingBox(ctx, canvas, manager) {
         const parcer = (0, utils_1.parser)(ctx, canvas, manager);
         const { xs, ys, xe, ye } = parcer.parseBatch({
-            xs: { v: this.props.x },
-            ys: { v: this.props.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) },
+            xs: { v: this.props.position.x },
+            ys: { v: this.props.position.y, options: utils_1.defaultArg.vl(true) },
+            xe: { v: this.props.position.endX },
+            ye: { v: this.props.position.endY, options: utils_1.defaultArg.vl(true) },
         });
         let width = xe - xs;
         let height = ye - ys;
@@ -91,36 +88,36 @@ class LineLayer extends BaseLayer_1.BaseLayer {
      * Draws the line layer on the canvas.
      * @param {SKRSContext2D} [ctx] - The canvas rendering context.
      * @param {Canvas | SvgCanvas} [canvas] - The canvas instance.
-     * @param {LayersManager} [manager] - The layers manager.
+     * @param {LayersManager} [manager] - The layer's manager.
      * @param {boolean} [debug] - Whether to enable debug logging.
      */
     async draw(ctx, canvas, manager, debug) {
         const parcer = (0, utils_1.parser)(ctx, canvas, manager);
         const { xs, ys, xe, ye } = parcer.parseBatch({
-            xs: { v: this.props.x },
-            ys: { v: this.props.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) },
+            xs: { v: this.props.position.x },
+            ys: { v: this.props.position.y, options: utils_1.defaultArg.vl(true) },
+            xe: { v: this.props.position.endX },
+            ye: { v: this.props.position.endY, options: utils_1.defaultArg.vl(true) },
         });
         let width = Math.abs(xe - xs);
         let height = Math.abs(ye - ys);
-        let fillStyle = await (0, utils_1.parseFillStyle)(ctx, this.props.fillStyle, { debug, layer: { width, height, x: Math.min(xs, xe), y: Math.min(ys, ye), align: 'none' }, manager });
+        let fillStyle = await (0, utils_1.parseFillStyle)(ctx, this.props.color, {
+            debug,
+            layer: { width, height, x: Math.min(xs, xe), y: Math.min(ys, ye), align: "none" },
+            manager,
+        });
         if (debug)
-            LazyUtil_1.LazyLog.log('none', `LineLayer:`, { xs, ys, xe, ye, width, height });
+            utils_1.LazyLog.log("none", `LineLayer:`, { xs, ys, xe, ye, width, height });
         ctx.save();
-        (0, utils_1.transform)(ctx, this.props.transform, { x: xs, y: ys, 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: xs, y: ys, width, height, type: this.type });
+        }
+        utils_1.DrawUtils.drawShadow(ctx, this.props.shadow);
+        utils_1.DrawUtils.opacity(ctx, this.props.opacity);
+        utils_1.DrawUtils.filters(ctx, this.props.filter);
+        utils_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.lineTo(xe, ye);
         ctx.stroke();
         ctx.closePath();
@@ -133,8 +130,8 @@ class LineLayer extends BaseLayer_1.BaseLayer {
     toJSON() {
         let data = super.toJSON();
         let copy = { ...this.props };
-        for (const key of ['x', 'y', 'endPoint.x', 'endPoint.y', 'fillStyle']) {
-            if (copy[key] && typeof copy[key] === 'object' && 'toJSON' in copy[key]) {
+        for (const key of ["x", "y", "endPoint.x", "endPoint.y", "fillStyle"]) {
+            if (copy[key] && typeof copy[key] === "object" && "toJSON" in copy[key]) {
                 copy[key] = copy[key].toJSON();
             }
         }
@@ -148,17 +145,18 @@ class LineLayer extends BaseLayer_1.BaseLayer {
     validateProps(data) {
         return {
             ...super.validateProps(data),
-            filled: data.filled || false,
-            fillStyle: data.fillStyle || '#000000',
-            centring: data.centring || types_1.Centring.None,
-            endPoint: {
-                x: data.endPoint?.x || 0,
-                y: data.endPoint?.y || 0,
+            position: {
+                x: data.position?.x || 0,
+                y: data.position?.y || 0,
+                endX: data.position?.endX || 0,
+                endY: data.position?.endY || 0,
             },
+            color: data.color || "#000000",
+            centring: data.centring || types_1.Centring.None,
             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/MorphLayer.d.ts

@@ -1,5 +1,5 @@
 import { BaseLayer, IBaseLayer, IBaseLayerMisc, IBaseLayerProps } from "./BaseLayer";
-import { ColorType, ScaleType, LayerType, RadiusCorner } from "../../types";
+import { ColorType, ScaleType, LayerType, RadiusCorner, StrokeOptions } from "../../types";
 import { Canvas, SKRSContext2D, SvgCanvas } from "@napi-rs/canvas";
 import { LayersManager } from "../managers";
 /**
@@ -34,47 +34,18 @@ export interface IMorphLayerProps extends IBaseLayerProps {
         /**
          * The radius of the Morph Layer.
          */
-        radius: {
+        radius?: {
             [corner in RadiusCorner]?: ScaleType;
         };
     };
-    /**
-     * Whether the layer is filled.
-     */
-    filled: boolean;
     /**
      * The fill style (color or pattern) of the layer.
      */
-    fillStyle: ColorType;
+    color: ColorType;
     /**
      * The stroke properties of the morph.
      */
-    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 Morph Layer, extending the BaseLayer class.
@@ -122,7 +93,7 @@ export declare class MorphLayer extends BaseLayer<IMorphLayerProps> {
      * Draws the Morph Layer on the canvas.
      * @param {SKRSContext2D} [ctx] - The canvas rendering context.
      * @param {Canvas | SvgCanvas} [canvas] - The canvas instance.
-     * @param {LayersManager} [manager] - The layers manager.
+     * @param {LayersManager} [manager] - The layer's manager.
      * @param {boolean} [debug] - Whether to enable debug logging.
      */
     draw(ctx: SKRSContext2D, canvas: Canvas | SvgCanvas, manager: LayersManager, debug: boolean): Promise<void>;

package/dist/structures/components/MorphLayer.js

@@ -3,17 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MorphLayer = void 0;
 const BaseLayer_1 = require("./BaseLayer");
 const types_1 = require("../../types");
-const utils_1 = require("../../utils/utils");
-const LazyUtil_1 = require("../../utils/LazyUtil");
+const utils_1 = require("../../utils");
 const helpers_1 = require("../helpers");
 /**
  * Class representing a Morph Layer, extending the BaseLayer class.
  */
 class MorphLayer extends BaseLayer_1.BaseLayer {
-    /**
-     * The properties of the Morph Layer.
-     */
-    props;
     /**
      * Constructs a new MorphLayer instance.
      * @param {IMorphLayerProps} [props] - The properties of the Morph Layer.
@@ -47,10 +42,10 @@ class MorphLayer extends BaseLayer_1.BaseLayer {
      */
     setColor(color) {
         if (!color)
-            throw new LazyUtil_1.LazyError('The color of the layer must be provided');
+            throw new utils_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');
-        this.props.fillStyle = color;
+            throw new utils_1.LazyError("The color of the layer must be a valid color");
+        this.props.color = color;
         return this;
     }
     /**
@@ -66,71 +61,71 @@ class MorphLayer 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;
     }
     /**
      * Draws the Morph Layer on the canvas.
      * @param {SKRSContext2D} [ctx] - The canvas rendering context.
      * @param {Canvas | SvgCanvas} [canvas] - The canvas instance.
-     * @param {LayersManager} [manager] - The layers manager.
+     * @param {LayersManager} [manager] - The layer's manager.
      * @param {boolean} [debug] - Whether to enable debug logging.
      */
     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 || 0 },
+            ys: { v: this.props.position?.y || 0, options: utils_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));
+        const h = parcer.parse(this.props.size.height, utils_1.defaultArg.wh(w), utils_1.defaultArg.vl(true));
         const rad = {};
-        if (typeof this.props.size.radius === 'object' && this.props.size.radius !== helpers_1.Link) {
+        if (typeof this.props.size.radius === "object" && this.props.size.radius !== helpers_1.Link) {
             for (const corner in this.props.size.radius) {
                 // @ts-ignore
-                rad[corner] = parcer.parse(this.props.size.radius[corner], LazyUtil_1.defaultArg.wh(w / 2, h / 2), LazyUtil_1.defaultArg.vl(false, true));
+                rad[corner] = parcer.parse(
+                // @ts-ignore
+                this.props.size.radius[corner], utils_1.defaultArg.wh(w / 2, h / 2), utils_1.defaultArg.vl(false, 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.color, {
+            debug,
+            layer: { width: w, height: h, x: xs, y: ys, align: this.props.centring },
+            manager,
+        });
         if (debug)
-            LazyUtil_1.LazyLog.log('none', `MorphLayer:`, { x, y, w, h, rad });
+            utils_1.LazyLog.log("none", `MorphLayer:`, { x, y, w, h, rad });
         ctx.save();
-        (0, utils_1.transform)(ctx, this.props.transform, { width: w, height: h, x, y, type: this.type });
+        if (this.props.transform) {
+            (0, utils_1.transform)(ctx, this.props.transform, { width: w, height: h, x, y, type: this.type });
+        }
         ctx.beginPath();
         if (Object.keys(rad).length > 0) {
-            ctx.moveTo(x + (w / 2), y);
-            ctx.arcTo(x + w, y, x + w, y + (h / 2), rad.rightTop || rad.all || 0);
-            ctx.arcTo(x + w, y + h, x + (w / 2), y + h, rad.rightBottom || rad.all || 0);
-            ctx.arcTo(x, y + h, x, y + (h / 2), rad.leftBottom || rad.all || 0);
-            ctx.arcTo(x, y, x + (w / 2), y, rad.leftTop || rad.all || 0);
+            ctx.moveTo(x + w / 2, y);
+            ctx.arcTo(x + w, y, x + w, y + h / 2, rad.rightTop || rad.all || 0);
+            ctx.arcTo(x + w, y + h, x + w / 2, y + h, rad.rightBottom || rad.all || 0);
+            ctx.arcTo(x, y + h, x, y + h / 2, rad.leftBottom || rad.all || 0);
+            ctx.arcTo(x, y, x + w / 2, y, rad.leftTop || rad.all || 0);
         }
         else {
             ctx.rect(x, y, w, h);
         }
         ctx.closePath();
-        (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.filled) {
-            ctx.fillStyle = fillStyle;
-            ctx.fill();
+        utils_1.DrawUtils.drawShadow(ctx, this.props.shadow);
+        utils_1.DrawUtils.opacity(ctx, this.props.opacity);
+        utils_1.DrawUtils.filters(ctx, this.props.filter);
+        utils_1.DrawUtils.fillStyle(ctx, fillStyle, this.props.stroke);
+        if (this.props.stroke) {
+            ctx.stroke();
         }
         else {
-            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.stroke();
+            ctx.fill();
         }
         ctx.restore();
     }
@@ -141,8 +136,8 @@ class MorphLayer extends BaseLayer_1.BaseLayer {
     toJSON() {
         let data = super.toJSON();
         let copy = { ...this.props };
-        for (const key of ['x', 'y', 'size.width', 'size.height', 'size.radius', 'fillStyle']) {
-            if (copy[key] && typeof copy[key] === 'object' && 'toJSON' in copy[key]) {
+        for (const key of ["x", "y", "size.width", "size.height", "size.radius", "fillStyle"]) {
+            if (copy[key] && typeof copy[key] === "object" && "toJSON" in copy[key]) {
                 copy[key] = copy[key].toJSON();
             }
         }
@@ -156,21 +151,12 @@ class MorphLayer extends BaseLayer_1.BaseLayer {
     validateProps(data) {
         return {
             ...super.validateProps(data),
-            filled: data.filled || true,
-            fillStyle: data.fillStyle || '#000000',
+            color: data.color || "#000000",
             size: {
                 width: data.size?.width || 100,
                 height: data.size?.height || 100,
                 radius: data.size?.radius || { all: 0 },
             },
-            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,
-            },
         };
     }
 }

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

@@ -1,7 +1,8 @@
-import { Canvas, DOMMatrix2DInit, FillType, Path2D, PathOp, SKRSContext2D, StrokeOptions, SvgCanvas } from "@napi-rs/canvas";
+import { Canvas, DOMMatrix2DInit, FillType, Path2D, PathOp, SKRSContext2D, SvgCanvas, StrokeOptions as SKRSStrokeOptions } from "@napi-rs/canvas";
 import { ColorType, LayerType } from "../../types";
 import { BaseLayer, IBaseLayer, IBaseLayerMisc, IBaseLayerProps } from "./BaseLayer";
 import { LayersManager } from "../managers";
+import { StrokeOptions } from "../../types";
 export interface IPath2DLayer extends IBaseLayer {
     /**
      * The type of the layer, which is `Path`.
@@ -17,45 +18,16 @@ export interface IPath2DLayerProps extends IBaseLayerProps {
      * The Path2D object representing the shape of the layer.
      */
     path2D: Path2D;
-    /**
-     * Whether the layer is filled.
-     */
-    filled: boolean;
     /**
      * The fill style (color or pattern) of the layer.
      */
-    fillStyle: ColorType;
+    color: ColorType;
     /**
      * The stroke properties of the Path2D.
      */
-    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;
-    };
-    loadFromSVG: boolean;
-    clipPath: boolean;
+    stroke?: StrokeOptions;
+    loadFromSVG?: boolean;
+    clipPath?: boolean;
 }
 export declare class Path2DLayer extends BaseLayer<IPath2DLayerProps> {
     id: string;
@@ -85,7 +57,7 @@ export declare class Path2DLayer extends BaseLayer<IPath2DLayerProps> {
     moveTo(x: number, y: number): this;
     quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): this;
     rect(x: number, y: number, width: number, height: number): this;
-    stroke(stroke?: StrokeOptions): this;
+    stroke(stroke?: SKRSStrokeOptions): this;
     op(path: Path2D, op: PathOp): this;
     getFillType(): FillType;
     getFillTypeString(): string;

package/dist/structures/components/Path2DLayer.js

@@ -3,17 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Path2DLayer = void 0;
 const canvas_1 = require("@napi-rs/canvas");
 const types_1 = require("../../types");
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const BaseLayer_1 = require("./BaseLayer");
-const LazyUtil_1 = require("../../utils/LazyUtil");
 class Path2DLayer extends BaseLayer_1.BaseLayer {
-    id;
-    type = types_1.LayerType.Path;
-    zIndex;
-    visible;
-    props;
     constructor(props, misc) {
         super(types_1.LayerType.Path, props || {}, misc);
+        this.type = types_1.LayerType.Path;
         this.id = misc?.id || (0, utils_1.generateID)(types_1.LayerType.Path);
         this.zIndex = misc?.zIndex || 1;
         this.visible = misc?.visible || true;
@@ -28,10 +23,10 @@ class Path2DLayer extends BaseLayer_1.BaseLayer {
      */
     setColor(color) {
         if (!color)
-            throw new LazyUtil_1.LazyError('The color of the layer must be provided');
+            throw new utils_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');
-        this.props.fillStyle = color;
+            throw new utils_1.LazyError("The color of the layer must be a valid color");
+        this.props.color = color;
         return this;
     }
     setPath(path) {
@@ -139,28 +134,33 @@ class Path2DLayer extends BaseLayer_1.BaseLayer {
     async draw(ctx, canvas, manager, debug) {
         ctx.beginPath();
         ctx.save();
-        let fillStyle = await (0, utils_1.parseFillStyle)(ctx, this.props.fillStyle, { debug, manager });
-        (0, utils_1.transform)(ctx, this.props.transform, { width: 0, height: 0, x: 0, y: 0, 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);
-        ctx.globalCompositeOperation = this.props.globalComposite;
+        if (debug)
+            utils_1.LazyLog.log("none", `Drawing Path2D Layer: `, {
+                layerId: this.id,
+                type: this.type,
+                path: this.props.path2D.toSVGString(),
+            });
+        if (this.props.transform) {
+            (0, utils_1.transform)(ctx, this.props.transform, { width: 0, height: 0, x: 0, y: 0, type: this.type });
+        }
+        utils_1.DrawUtils.opacity(ctx, this.props.opacity);
         if (this.props.clipPath) {
             ctx.clip(this.props.path2D);
         }
-        else if (this.props.filled) {
-            ctx.fillStyle = fillStyle;
-            ctx.fill(this.props.path2D);
-        }
-        else {
-            ctx.strokeStyle = fillStyle;
-            ctx.lineWidth = this.props.stroke.width;
-            ctx.lineCap = this.props.stroke.cap;
-            ctx.lineJoin = this.props.stroke.join;
-            ctx.miterLimit = this.props.stroke.miterLimit;
-            ctx.lineDashOffset = this.props.stroke.dashOffset;
-            ctx.setLineDash(this.props.stroke.dash);
-            ctx.stroke(this.props.path2D);
+        else if (this.props.color) {
+            let fillStyle = await (0, utils_1.parseFillStyle)(ctx, this.props.color, { debug, manager });
+            if (this.props.globalComposite) {
+                ctx.globalCompositeOperation = this.props.globalComposite;
+            }
+            utils_1.DrawUtils.drawShadow(ctx, this.props.shadow);
+            utils_1.DrawUtils.filters(ctx, this.props.filter);
+            utils_1.DrawUtils.fillStyle(ctx, fillStyle, this.props.stroke);
+            if (this.props.stroke) {
+                ctx.stroke(this.props.path2D);
+            }
+            else {
+                ctx.fill(this.props.path2D);
+            }
         }
         ctx.restore();
         ctx.closePath();
@@ -175,7 +175,7 @@ class Path2DLayer extends BaseLayer_1.BaseLayer {
             type: this.type,
             zIndex: this.zIndex,
             visible: this.visible,
-            props: this.props
+            props: this.props,
         };
     }
     /**
@@ -186,19 +186,10 @@ class Path2DLayer extends BaseLayer_1.BaseLayer {
     validateProps(data) {
         return {
             ...super.validateProps(data),
-            filled: data.filled || true,
-            fillStyle: data.fillStyle || '#000000',
+            color: data.color || "#000000",
             path2D: data.path2D || new canvas_1.Path2D(),
-            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
-            },
             loadFromSVG: data.loadFromSVG || false,
-            clipPath: data.clipPath || false
+            clipPath: data.clipPath || false,
         };
     }
 }