@nmmty/lazycanvas 0.3.0 → 0.3.1

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

@@ -1,6 +1,7 @@
 import { BaseLayer } from "./BaseLayer";
 import { ColorType, IBezierLayer, IBezierLayerProps, ScaleType } from "../../types";
 import { Canvas, SKRSContext2D } from "@napi-rs/canvas";
+import { LayersManager } from "../managers/LayersManager";
 export declare class BezierLayer extends BaseLayer<IBezierLayerProps> {
     props: IBezierLayerProps;
     constructor(props?: IBezierLayerProps);
@@ -33,7 +34,7 @@ export declare class BezierLayer extends BaseLayer<IBezierLayerProps> {
      * @param miterLimit {number} - The `miterLimit` of the stroke.
      */
     setStroke(width: number, cap?: CanvasLineCap, join?: CanvasLineJoin, dash?: number[], dashOffset?: number, miterLimit?: number): this;
-    draw(ctx: SKRSContext2D, canvas: Canvas, debug: boolean): Promise<void>;
+    draw(ctx: SKRSContext2D, canvas: Canvas, manager: LayersManager, debug: boolean): Promise<void>;
     /**
      * @returns {IBezierLayer}
      */

package/dist/structures/components/BezierLayer.js

@@ -75,15 +75,15 @@ class BezierLayer extends BaseLayer_1.BaseLayer {
         };
         return this;
     }
-    async draw(ctx, canvas, debug) {
-        const xs = (0, utils_1.parseToNormal)(this.props.x, canvas);
-        const ys = (0, utils_1.parseToNormal)(this.props.y, canvas, { width: 0, height: 0 }, { vertical: true });
-        const cp1x = (0, utils_1.parseToNormal)(this.props.controlPoints[0].x, canvas);
-        const cp1y = (0, utils_1.parseToNormal)(this.props.controlPoints[0].y, canvas, { width: 0, height: 0 }, { vertical: true });
-        const cp2x = (0, utils_1.parseToNormal)(this.props.controlPoints[1].x, canvas);
-        const cp2y = (0, utils_1.parseToNormal)(this.props.controlPoints[1].y, canvas, { width: 0, height: 0 }, { vertical: true });
-        const xe = (0, utils_1.parseToNormal)(this.props.endPoint.x, canvas);
-        const ye = (0, utils_1.parseToNormal)(this.props.endPoint.y, canvas, { width: 0, height: 0 }, { vertical: true });
+    async draw(ctx, canvas, manager, debug) {
+        const xs = (0, utils_1.parseToNormal)(this.props.x, ctx, canvas);
+        const ys = (0, utils_1.parseToNormal)(this.props.y, ctx, canvas, { width: 0, height: 0 }, { vertical: true });
+        const cp1x = (0, utils_1.parseToNormal)(this.props.controlPoints[0].x, ctx, canvas);
+        const cp1y = (0, utils_1.parseToNormal)(this.props.controlPoints[0].y, ctx, canvas, { width: 0, height: 0 }, { vertical: true });
+        const cp2x = (0, utils_1.parseToNormal)(this.props.controlPoints[1].x, ctx, canvas);
+        const cp2y = (0, utils_1.parseToNormal)(this.props.controlPoints[1].y, ctx, canvas, { width: 0, height: 0 }, { vertical: true });
+        const xe = (0, utils_1.parseToNormal)(this.props.endPoint.x, ctx, canvas);
+        const ye = (0, utils_1.parseToNormal)(this.props.endPoint.y, ctx, canvas, { width: 0, height: 0 }, { vertical: true });
         const { max, min, center, width, height } = (0, utils_1.getBoundingBoxBezier)([{ x: xs, y: ys }, { x: cp1x, y: cp1y }, { x: cp2x, y: cp2y }, { x: xe, y: ye }]);
         let fillStyle = await (0, utils_1.parseFillStyle)(ctx, this.props.fillStyle);
         if (debug)

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

@@ -1,6 +1,7 @@
 import { BaseLayer } from "./BaseLayer";
 import { IImageLayer, IImageLayerProps, ScaleType } from "../../types";
 import { Canvas, SKRSContext2D } from "@napi-rs/canvas";
+import { LayersManager } from "../managers/LayersManager";
 export declare class ImageLayer extends BaseLayer<IImageLayerProps> {
     props: IImageLayerProps;
     constructor(props?: IImageLayerProps);
@@ -16,7 +17,7 @@ export declare class ImageLayer extends BaseLayer<IImageLayerProps> {
      * @param radius {ScaleType} - The `radius` of the image. (optional)
      */
     setSize(width: ScaleType, height: ScaleType, radius?: ScaleType): this;
-    draw(ctx: SKRSContext2D, canvas: Canvas, debug: boolean): Promise<void>;
+    draw(ctx: SKRSContext2D, canvas: Canvas, manager: LayersManager, debug: boolean): Promise<void>;
     /**
      * @returns {IImageLayer}
      */

package/dist/structures/components/ImageLayer.js

@@ -61,12 +61,12 @@ class ImageLayer extends BaseLayer_1.BaseLayer {
         };
         return this;
     }
-    async draw(ctx, canvas, debug) {
-        let xs = (0, utils_1.parseToNormal)(this.props.x, canvas);
-        let ys = (0, utils_1.parseToNormal)(this.props.y, canvas, { width: 0, height: 0 }, { vertical: true });
-        let w = (0, utils_1.parseToNormal)(this.props.size.width, canvas);
-        let h = (0, utils_1.parseToNormal)(this.props.size.height, canvas, { width: w, height: 0 }, { vertical: true });
-        let r = (0, utils_1.parseToNormal)(this.props.size.radius, canvas, { width: w, height: h }, { layer: true });
+    async draw(ctx, canvas, manager, debug) {
+        let xs = (0, utils_1.parseToNormal)(this.props.x, ctx, canvas);
+        let ys = (0, utils_1.parseToNormal)(this.props.y, ctx, canvas, { width: 0, height: 0 }, { vertical: true });
+        let w = (0, utils_1.parseToNormal)(this.props.size.width, ctx, canvas);
+        let h = (0, utils_1.parseToNormal)(this.props.size.height, ctx, canvas, { width: w, height: 0 }, { vertical: true });
+        let r = (0, utils_1.parseToNormal)(this.props.size.radius, ctx, canvas, { width: w, height: h }, { layer: true });
         let { x, y } = (0, utils_1.centring)(this.props.centring, this.type, w, h, xs, ys);
         if (debug)
             LazyUtil_1.LazyLog.log('none', `ImageLayer:`, { x, y, w, h, r });

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

@@ -1,6 +1,7 @@
 import { BaseLayer } from "./BaseLayer";
 import { IMorphLayer, IMorphLayerProps, ColorType, ScaleType } from "../../types";
 import { Canvas, SKRSContext2D } from "@napi-rs/canvas";
+import { LayersManager } from "../managers/LayersManager";
 export declare class MorphLayer extends BaseLayer<IMorphLayerProps> {
     props: IMorphLayerProps;
     constructor(props?: IMorphLayerProps);
@@ -31,7 +32,7 @@ export declare class MorphLayer extends BaseLayer<IMorphLayerProps> {
      * @param filled {boolean} - The `filled` of the layer.
      */
     setFilled(filled: boolean): this;
-    draw(ctx: SKRSContext2D, canvas: Canvas, debug: boolean): Promise<void>;
+    draw(ctx: SKRSContext2D, canvas: Canvas, manager: LayersManager, debug: boolean): Promise<void>;
     /**
      * @returns {IMorphLayer}
      */

package/dist/structures/components/MorphLayer.js

@@ -80,12 +80,12 @@ class MorphLayer extends BaseLayer_1.BaseLayer {
         this.props.filled = filled;
         return this;
     }
-    async draw(ctx, canvas, debug) {
-        const xs = (0, utils_1.parseToNormal)(this.props.x, canvas);
-        const ys = (0, utils_1.parseToNormal)(this.props.y, canvas, { width: 0, height: 0 }, { vertical: true });
-        const w = (0, utils_1.parseToNormal)(this.props.size.width, canvas);
-        const h = (0, utils_1.parseToNormal)(this.props.size.height, canvas, { width: w, height: 0 }, { vertical: true });
-        const r = (0, utils_1.parseToNormal)(this.props.size.radius, canvas, { width: w / 2, height: h / 2 }, { layer: true });
+    async draw(ctx, canvas, manager, debug) {
+        const xs = (0, utils_1.parseToNormal)(this.props.x, ctx, canvas);
+        const ys = (0, utils_1.parseToNormal)(this.props.y, ctx, canvas, { width: 0, height: 0 }, { vertical: true });
+        const w = (0, utils_1.parseToNormal)(this.props.size.width, ctx, canvas, { width: 0, height: 0 }, { vertical: false }, manager);
+        const h = (0, utils_1.parseToNormal)(this.props.size.height, ctx, canvas, { width: w, height: 0 }, { vertical: true }, manager);
+        const r = (0, utils_1.parseToNormal)(this.props.size.radius, ctx, canvas, { width: w / 2, height: h / 2 }, { layer: 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);
         if (debug)

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

@@ -1,6 +1,7 @@
 import { BaseLayer } from "./BaseLayer";
 import { IQuadraticLayerProps, IQuadraticLayer, ColorType, ScaleType } from "../../types";
 import { Canvas, SKRSContext2D } from "@napi-rs/canvas";
+import { LayersManager } from "../managers/LayersManager";
 export declare class QuadraticLayer extends BaseLayer<IQuadraticLayerProps> {
     props: IQuadraticLayerProps;
     constructor(props?: IQuadraticLayerProps);
@@ -31,7 +32,7 @@ export declare class QuadraticLayer extends BaseLayer<IQuadraticLayerProps> {
      * @param miterLimit {number} - The `miterLimit` of the stroke.
      */
     setStroke(width: number, cap?: CanvasLineCap, join?: CanvasLineJoin, dash?: number[], dashOffset?: number, miterLimit?: number): this;
-    draw(ctx: SKRSContext2D, canvas: Canvas, debug: boolean): Promise<void>;
+    draw(ctx: SKRSContext2D, canvas: Canvas, manager: LayersManager, debug: boolean): Promise<void>;
     /**
      * @returns {IQuadraticLayer}
      */

package/dist/structures/components/QuadraticLayer.js

@@ -74,13 +74,13 @@ class QuadraticLayer extends BaseLayer_1.BaseLayer {
         };
         return this;
     }
-    async draw(ctx, canvas, debug) {
-        const xs = (0, utils_1.parseToNormal)(this.props.x, canvas);
-        const ys = (0, utils_1.parseToNormal)(this.props.y, canvas, { width: 0, height: 0 }, { vertical: true });
-        const cx = (0, utils_1.parseToNormal)(this.props.controlPoint.x, canvas);
-        const cy = (0, utils_1.parseToNormal)(this.props.controlPoint.y, canvas, { width: 0, height: 0 }, { vertical: true });
-        const xe = (0, utils_1.parseToNormal)(this.props.endPoint.x, canvas);
-        const ye = (0, utils_1.parseToNormal)(this.props.endPoint.y, canvas, { width: 0, height: 0 }, { vertical: true });
+    async draw(ctx, canvas, manager, debug) {
+        const xs = (0, utils_1.parseToNormal)(this.props.x, ctx, canvas);
+        const ys = (0, utils_1.parseToNormal)(this.props.y, ctx, canvas, { width: 0, height: 0 }, { vertical: true });
+        const cx = (0, utils_1.parseToNormal)(this.props.controlPoint.x, ctx, canvas);
+        const cy = (0, utils_1.parseToNormal)(this.props.controlPoint.y, ctx, canvas, { width: 0, height: 0 }, { vertical: true });
+        const xe = (0, utils_1.parseToNormal)(this.props.endPoint.x, ctx, canvas);
+        const ye = (0, utils_1.parseToNormal)(this.props.endPoint.y, ctx, canvas, { width: 0, height: 0 }, { vertical: 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);
         if (debug)

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

@@ -2,6 +2,7 @@ import { BaseLayer } from "./BaseLayer";
 import { FontWeight, LineCap, LineJoin, TextAlign, TextBaseline, TextDirection } from "../../types/enum";
 import { ITextLayer, ITextLayerProps, ScaleType, ColorType } from "../../types";
 import { Canvas, SKRSContext2D } from "@napi-rs/canvas";
+import { LayersManager } from "../managers/LayersManager";
 export declare class TextLayer extends BaseLayer<ITextLayerProps> {
     props: ITextLayerProps;
     constructor(props?: ITextLayerProps);
@@ -60,7 +61,11 @@ export declare class TextLayer extends BaseLayer<ITextLayerProps> {
      * @param filled {boolean} - The `filled` of the layer.
      */
     setFilled(filled: boolean): this;
-    draw(ctx: SKRSContext2D, canvas: Canvas, debug: boolean): Promise<void>;
+    measureText(ctx: SKRSContext2D, canvas: Canvas): {
+        width: number;
+        height: number;
+    };
+    draw(ctx: SKRSContext2D, canvas: Canvas, manager: LayersManager, debug: boolean): Promise<void>;
     private drawText;
     /**
      * @returns {ITextLayer}

package/dist/structures/components/TextLayer.js

@@ -144,11 +144,23 @@ class TextLayer extends BaseLayer_1.BaseLayer {
         this.props.filled = filled;
         return this;
     }
-    async draw(ctx, canvas, debug) {
-        const x = (0, utils_1.parseToNormal)(this.props.x, canvas);
-        const y = (0, utils_1.parseToNormal)(this.props.y, canvas, { width: 0, height: 0 }, { vertical: true });
-        const w = (0, utils_1.parseToNormal)(this.props.multiline?.width, canvas);
-        const h = (0, utils_1.parseToNormal)(this.props.multiline?.height, canvas, { width: w, height: 0 }, { vertical: true });
+    measureText(ctx, canvas) {
+        const w = (0, utils_1.parseToNormal)(this.props.multiline?.width, ctx, canvas);
+        const h = (0, utils_1.parseToNormal)(this.props.multiline?.height, ctx, canvas, { width: w, height: 0 }, { vertical: true });
+        if (this.props.multiline.enabled) {
+            return { width: w, height: h };
+        }
+        else {
+            ctx.font = `${this.props.font.weight} ${this.props.font.size}px ${this.props.font.family}`;
+            let data = ctx.measureText(this.props.text);
+            return { width: data.width, height: this.props.font.size };
+        }
+    }
+    async draw(ctx, canvas, manager, debug) {
+        const x = (0, utils_1.parseToNormal)(this.props.x, ctx, canvas);
+        const y = (0, utils_1.parseToNormal)(this.props.y, ctx, canvas, { width: 0, height: 0 }, { vertical: true });
+        const w = (0, utils_1.parseToNormal)(this.props.multiline?.width, ctx, canvas);
+        const h = (0, utils_1.parseToNormal)(this.props.multiline?.height, ctx, canvas, { width: w, height: 0 }, { vertical: true });
         if (debug)
             LazyUtil_1.LazyLog.log('none', `TextLayer:`, { x, y, w, h });
         ctx.save();

package/dist/structures/managers/RenderManager.js

@@ -23,12 +23,12 @@ class RenderManager {
                 if (layer instanceof Group_1.Group) {
                     for (const subLayer of layer.components) {
                         if (subLayer.visible) {
-                            await subLayer.draw(this.lazyCanvas.ctx, this.lazyCanvas.canvas, this.debug);
+                            await subLayer.draw(this.lazyCanvas.ctx, this.lazyCanvas.canvas, this.lazyCanvas.layers, this.debug);
                         }
                     }
                 }
                 else {
-                    await layer.draw(this.lazyCanvas.ctx, this.lazyCanvas.canvas, this.debug);
+                    await layer.draw(this.lazyCanvas.ctx, this.lazyCanvas.canvas, this.lazyCanvas.layers, this.debug);
                 }
                 this.lazyCanvas.ctx.shadowColor = 'transparent';
             }

package/dist/utils/utils.d.ts

@@ -3,17 +3,18 @@ import { Transform, ScaleType, ColorType, PointNumber } from "../types";
 import { Gradient } from "../structures/helpers/Gradient";
 import { Canvas, SKRSContext2D } from "@napi-rs/canvas";
 import { Pattern } from "../structures/helpers/Pattern";
+import { LayersManager } from "../structures/managers/LayersManager";
 export declare function generateID(type: string): string;
 export declare function isColor(v: ColorType): "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
 export declare function parseHex(v: string): string;
 export declare function parseColor(v: ColorType): string | Pattern | Gradient;
-export declare function parseToNormal(v: ScaleType, canvas: Canvas, layer?: {
+export declare function parseToNormal(v: ScaleType, ctx: SKRSContext2D, canvas: Canvas, layer?: {
     width: number;
     height: number;
 }, options?: {
     vertical?: boolean;
     layer?: boolean;
-}): number;
+}, manager?: LayersManager): number;
 export declare function drawShadow(ctx: SKRSContext2D, shadow: any): void;
 export declare function opacity(ctx: SKRSContext2D, opacity: number): void;
 export declare function filters(ctx: SKRSContext2D, filters: string): void;

package/dist/utils/utils.js

@@ -30,6 +30,7 @@ const LazyUtil_1 = require("./LazyUtil");
 const fs = __importStar(require("fs"));
 const jimp = __importStar(require("jimp"));
 const Pattern_1 = require("../structures/helpers/Pattern");
+const TextLayer_1 = require("../structures/components/TextLayer");
 function generateID(type) {
     return `${type}-${Math.random().toString(36).substr(2, 9)}`;
 }
@@ -37,6 +38,7 @@ exports.generateID = generateID;
 let percentReg = /^(\d+)%$/;
 let pxReg = /^(\d+)px$/;
 let canvasReg = /^(vw|vh|vmin|vmax)$/;
+let linkReg = /^(link-w|link-h)-([A-Za-z0-9_]+)-(\d+)$/;
 let hexReg = /^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/;
 let rgbReg = /^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/;
 let rgbaReg = /^rgba\((\d+),\s*(\d+),\s*(\d+),\s*(0|0?\.\d+|1(\.0)?)\)$/;
@@ -114,12 +116,12 @@ function parseColor(v) {
     }
 }
 exports.parseColor = parseColor;
-function parseToNormal(v, canvas, layer = { width: 0, height: 0 }, options = { vertical: false, layer: false }) {
+function parseToNormal(v, ctx, canvas, layer = { width: 0, height: 0 }, options = { vertical: false, layer: false }, manager) {
     if (typeof v === 'number') {
         return v;
     }
     else if (percentReg.test(v)) {
-        return parseFloat(v) * (options.layer ? (options.vertical ? layer.width : layer.height) : (options.vertical ? canvas.width : canvas.height));
+        return (parseFloat(v) / 100) * (options.layer ? (options.vertical ? layer.width : layer.height) : (options.vertical ? canvas.width : canvas.height));
     }
     else if (pxReg.test(v)) {
         return parseFloat(v);
@@ -138,6 +140,24 @@ function parseToNormal(v, canvas, layer = { width: 0, height: 0 }, options = { v
             return (options.layer ? Math.max(layer.width, layer.height) : Math.max(canvas.width, canvas.height));
         }
     }
+    else if (linkReg.test(v)) {
+        let match = v.match(linkReg);
+        if (!manager)
+            return 0;
+        let layer = manager.get(match[2]);
+        switch (match[1]) {
+            case 'link-w':
+                if (layer instanceof TextLayer_1.TextLayer) {
+                    return layer.measureText(ctx, canvas).width + (parseInt(match[3]) || 0);
+                }
+                break;
+            case 'link-h':
+                if (layer instanceof TextLayer_1.TextLayer) {
+                    return layer.measureText(ctx, canvas).height + (parseInt(match[3]) || 0);
+                }
+                break;
+        }
+    }
     return 0;
 }
 exports.parseToNormal = parseToNormal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nmmty/lazycanvas",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A simple way to interact with @napi-rs/canvas in an advanced way!",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",