@nmmty/lazycanvas 0.3.2 → 0.3.4

package/dist/utils/utils.d.ts

@@ -1,5 +1,5 @@
-import { Centring, LayerType, SaveFormat, TextAlign } from "../types/enum";
-import { Transform, ScaleType, ColorType, PointNumber } from "../types";
+import { LayerType, SaveFormat } from "../types/enum";
+import { Transform, ScaleType, ColorType, PointNumber, AnyCentring, AnyTextAlign } from "../types";
 import { Gradient } from "../structures/helpers/Gradient";
 import { Canvas, SKRSContext2D } from "@napi-rs/canvas";
 import { Pattern } from "../structures/helpers/Pattern";
@@ -15,6 +15,26 @@ export declare function parseToNormal(v: ScaleType, ctx: SKRSContext2D, canvas:
     vertical?: boolean;
     layer?: boolean;
 }, manager?: LayersManager): number;
+export declare function parser(ctx: SKRSContext2D, canvas: Canvas, manager?: LayersManager): {
+    parse(v: ScaleType, layer?: {
+        width: number;
+        height: number;
+    }, options?: {
+        vertical?: boolean;
+        layer?: boolean;
+    }): number;
+    parseBatch(values: Record<string, {
+        v: ScaleType;
+        layer?: {
+            width: number;
+            height: number;
+        };
+        options?: {
+            vertical?: boolean;
+            layer?: boolean;
+        };
+    }>): Record<string, 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;
@@ -27,14 +47,14 @@ export declare function transform(ctx: SKRSContext2D, transform: Transform, laye
     type: LayerType;
 }, extra?: {
     text: string;
-    textAlign: TextAlign;
+    textAlign: AnyTextAlign;
     fontSize: number;
     multiline: boolean;
 }): void;
 export declare function saveFile(buffer: any, extension: SaveFormat, name: string): Promise<void>;
 export declare function generateRandomName(): string;
 export declare function isImageUrlValid(src: string): boolean;
-export declare function centring(centring: Centring, type: LayerType, width: number, height: number, x: number, y: number): {
+export declare function centring(centring: AnyCentring, type: LayerType, width: number, height: number, x: number, y: number): {
     x: number;
     y: number;
 };

package/dist/utils/utils.js

@@ -23,14 +23,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBoundingBoxBezier = exports.centring = exports.isImageUrlValid = exports.generateRandomName = exports.saveFile = exports.transform = exports.parseFillStyle = exports.filters = exports.opacity = exports.drawShadow = exports.parseToNormal = exports.parseColor = exports.parseHex = exports.isColor = exports.generateID = void 0;
+exports.getBoundingBoxBezier = exports.centring = exports.isImageUrlValid = exports.generateRandomName = exports.saveFile = exports.transform = exports.parseFillStyle = exports.filters = exports.opacity = exports.drawShadow = exports.parser = exports.parseToNormal = exports.parseColor = exports.parseHex = exports.isColor = exports.generateID = void 0;
 const enum_1 = require("../types/enum");
 const Gradient_1 = require("../structures/helpers/Gradient");
 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");
+const Link_1 = require("../structures/helpers/Link");
+const Group_1 = require("../structures/components/Group");
+const LineLayer_1 = require("../structures/components/LineLayer");
+const BezierLayer_1 = require("../structures/components/BezierLayer");
+const QuadraticLayer_1 = require("../structures/components/QuadraticLayer");
 function generateID(type) {
     return `${type}-${Math.random().toString(36).substr(2, 9)}`;
 }
@@ -38,7 +42,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 linkReg = /^(link-w|link-h|link-x|link-y)-([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)?)\)$/;
@@ -120,47 +124,157 @@ function parseToNormal(v, ctx, canvas, layer = { width: 0, height: 0 }, options
     if (typeof v === 'number') {
         return v;
     }
-    else if (percentReg.test(v)) {
-        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);
-    }
-    else if (canvasReg.test(v)) {
-        if (v === 'vw') {
-            return (options.layer ? layer.width : canvas.width);
+    else if (typeof v === 'string') {
+        if (percentReg.test(v)) {
+            return (parseFloat(v) / 100) * (options.layer ? (options.vertical ? layer.width : layer.height) : (options.vertical ? canvas.width : canvas.height));
         }
-        else if (v === 'vh') {
-            return (options.layer ? layer.height : canvas.height);
+        else if (pxReg.test(v)) {
+            return parseFloat(v);
         }
-        else if (v === 'vmin') {
-            return (options.layer ? Math.max(layer.width, layer.height) : Math.min(canvas.width, canvas.height));
+        else if (canvasReg.test(v)) {
+            if (v === 'vw') {
+                return (options.layer ? layer.width : canvas.width);
+            }
+            else if (v === 'vh') {
+                return (options.layer ? layer.height : canvas.height);
+            }
+            else if (v === 'vmin') {
+                return (options.layer ? Math.max(layer.width, layer.height) : Math.min(canvas.width, canvas.height));
+            }
+            else if (v === 'vmax') {
+                return (options.layer ? Math.max(layer.width, layer.height) : Math.max(canvas.width, canvas.height));
+            }
         }
-        else if (v === 'vmax') {
-            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 anyLayer = manager.get(match[2]);
+            const parcer = parser(ctx, canvas, manager);
+            switch (match[1]) {
+                case 'link-w':
+                    if (anyLayer && !(anyLayer instanceof Group_1.Group)) {
+                        if (anyLayer instanceof LineLayer_1.LineLayer || anyLayer instanceof BezierLayer_1.BezierLayer || anyLayer instanceof QuadraticLayer_1.QuadraticLayer) {
+                            return anyLayer.getBoundingBox(ctx, canvas, manager).width + (parseInt(match[3]) || 0);
+                        }
+                        else {
+                            return (parcer.parse(anyLayer.props.size.width) || 0) + (parseInt(match[3]) || 0);
+                        }
+                    }
+                    else {
+                        return 0;
+                    }
+                    break;
+                case 'link-h':
+                    if (anyLayer && !(anyLayer instanceof Group_1.Group)) {
+                        if (anyLayer instanceof LineLayer_1.LineLayer || anyLayer instanceof BezierLayer_1.BezierLayer || anyLayer instanceof QuadraticLayer_1.QuadraticLayer) {
+                            return anyLayer.getBoundingBox(ctx, canvas, manager).height + (parseInt(match[3]) || 0);
+                        }
+                        else {
+                            return (parcer.parse(anyLayer.props.size.height, LazyUtil_1.defaultArg.wh(parcer.parse(anyLayer.props.size.width)), LazyUtil_1.defaultArg.vl(true)) || 0) + (parseInt(match[3]) || 0);
+                        }
+                    }
+                    else {
+                        return 0;
+                    }
+                    break;
+                case 'link-x':
+                    if (anyLayer && !(anyLayer instanceof Group_1.Group)) {
+                        return (parcer.parse(anyLayer.props.x) || 0) + (parseInt(match[3]) || 0);
+                    }
+                    else {
+                        return 0;
+                    }
+                    break;
+                case 'link-y':
+                    if (anyLayer && !(anyLayer instanceof Group_1.Group)) {
+                        return (parcer.parse(anyLayer.props.y, LazyUtil_1.defaultArg.wh(), LazyUtil_1.defaultArg.vl(true)) || 0) + (parseInt(match[3]) || 0);
+                    }
+                    else {
+                        return 0;
+                    }
+                    break;
+            }
         }
     }
-    else if (linkReg.test(v)) {
-        let match = v.match(linkReg);
+    else if (v instanceof Link_1.Link) {
         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);
+        let anyLayer = manager.get(v.source);
+        const parcer = parser(ctx, canvas, manager);
+        switch (v.type) {
+            case enum_1.LinkType.Width:
+            case 'width':
+                if (anyLayer && !(anyLayer instanceof Group_1.Group)) {
+                    if (anyLayer instanceof LineLayer_1.LineLayer || anyLayer instanceof BezierLayer_1.BezierLayer || anyLayer instanceof QuadraticLayer_1.QuadraticLayer) {
+                        return anyLayer.getBoundingBox(ctx, canvas, manager).width + (parcer.parse(v.additionalSpacing, LazyUtil_1.defaultArg.wh(layer.width, layer.height), LazyUtil_1.defaultArg.vl(options.vertical, options.layer)) || 0);
+                    }
+                    else {
+                        return (parcer.parse(anyLayer.props.size.width) || 0) + (parcer.parse(v.additionalSpacing, LazyUtil_1.defaultArg.wh(layer.width, layer.height), LazyUtil_1.defaultArg.vl(options.vertical, options.layer)) || 0);
+                    }
+                }
+                else {
+                    return 0;
                 }
                 break;
-            case 'link-h':
-                if (layer instanceof TextLayer_1.TextLayer) {
-                    return layer.measureText(ctx, canvas).height + (parseInt(match[3]) || 0);
+            case enum_1.LinkType.Height:
+            case 'height':
+                if (anyLayer && !(anyLayer instanceof Group_1.Group)) {
+                    if (anyLayer instanceof LineLayer_1.LineLayer || anyLayer instanceof BezierLayer_1.BezierLayer || anyLayer instanceof QuadraticLayer_1.QuadraticLayer) {
+                        return anyLayer.getBoundingBox(ctx, canvas, manager).height + (parcer.parse(v.additionalSpacing, LazyUtil_1.defaultArg.wh(layer.width, layer.height), LazyUtil_1.defaultArg.vl(options.vertical, options.layer)) || 0);
+                    }
+                    else {
+                        return (parcer.parse(anyLayer.props.size.height, LazyUtil_1.defaultArg.wh(parcer.parse(anyLayer.props.size.width)), LazyUtil_1.defaultArg.vl(true)) || 0) + (parcer.parse(v.additionalSpacing, LazyUtil_1.defaultArg.wh(layer.width, layer.height), LazyUtil_1.defaultArg.vl(options.vertical, options.layer)) || 0);
+                    }
+                }
+                else {
+                    return 0;
                 }
                 break;
+            case enum_1.LinkType.X:
+            case 'x':
+                if (anyLayer && !(anyLayer instanceof Group_1.Group)) {
+                    return (parcer.parse(anyLayer.props.x) || 0) + (parcer.parse(v.additionalSpacing, LazyUtil_1.defaultArg.wh(layer.width, layer.height), LazyUtil_1.defaultArg.vl(options.vertical, options.layer)) || 0);
+                }
+                else {
+                    return 0;
+                }
+                break;
+            case enum_1.LinkType.Y:
+            case 'y':
+                if (anyLayer && !(anyLayer instanceof Group_1.Group)) {
+                    return (parcer.parse(anyLayer.props.y) || 0) + (parcer.parse(v.additionalSpacing, LazyUtil_1.defaultArg.wh(layer.width, layer.height), LazyUtil_1.defaultArg.vl(options.vertical, options.layer)) || 0);
+                }
+                else {
+                    return 0;
+                }
+                break;
+            default:
+                return 0;
         }
     }
+    else {
+        return 0;
+    }
     return 0;
 }
 exports.parseToNormal = parseToNormal;
+function parser(ctx, canvas, manager) {
+    return {
+        parse(v, layer = LazyUtil_1.defaultArg.wh(), options = LazyUtil_1.defaultArg.vl()) {
+            return parseToNormal(v, ctx, canvas, layer, options, manager);
+        },
+        parseBatch(values) {
+            const result = {};
+            for (const key in values) {
+                const { v, layer, options } = values[key];
+                result[key] = parseToNormal(v, ctx, canvas, layer ?? LazyUtil_1.defaultArg.wh(), options ?? LazyUtil_1.defaultArg.vl(), manager);
+            }
+            return result;
+        }
+    };
+}
+exports.parser = parser;
 function drawShadow(ctx, shadow) {
     if (shadow) {
         ctx.shadowColor = shadow.color;
@@ -269,6 +383,7 @@ exports.isImageUrlValid = isImageUrlValid;
 function centring(centring, type, width, height, x, y) {
     switch (centring) {
         case enum_1.Centring.Center:
+        case "center":
             switch (type) {
                 case enum_1.LayerType.Image:
                 case enum_1.LayerType.Morph:
@@ -278,6 +393,7 @@ function centring(centring, type, width, height, x, y) {
             }
             return { x, y };
         case enum_1.Centring.CenterBottom:
+        case "center-bottom":
             switch (type) {
                 case enum_1.LayerType.Image:
                 case enum_1.LayerType.Morph:
@@ -286,6 +402,7 @@ function centring(centring, type, width, height, x, y) {
             }
             return { x, y };
         case enum_1.Centring.CenterTop:
+        case "center-top":
             switch (type) {
                 case enum_1.LayerType.Image:
                 case enum_1.LayerType.Morph:
@@ -295,6 +412,7 @@ function centring(centring, type, width, height, x, y) {
             }
             return { x, y };
         case enum_1.Centring.Start:
+        case "start":
             switch (type) {
                 case enum_1.LayerType.Image:
                 case enum_1.LayerType.Morph:
@@ -303,8 +421,10 @@ function centring(centring, type, width, height, x, y) {
             }
             return { x, y };
         case enum_1.Centring.StartBottom:
+        case "start-bottom":
             return { x, y };
         case enum_1.Centring.StartTop:
+        case "start-top":
             switch (type) {
                 case enum_1.LayerType.Image:
                 case enum_1.LayerType.Morph:
@@ -313,6 +433,7 @@ function centring(centring, type, width, height, x, y) {
             }
             return { x, y };
         case enum_1.Centring.End:
+        case "end":
             switch (type) {
                 case enum_1.LayerType.Image:
                 case enum_1.LayerType.Morph:
@@ -322,6 +443,7 @@ function centring(centring, type, width, height, x, y) {
             }
             return { x, y };
         case enum_1.Centring.EndBottom:
+        case "end-bottom":
             switch (type) {
                 case enum_1.LayerType.Image:
                 case enum_1.LayerType.Morph:
@@ -330,6 +452,7 @@ function centring(centring, type, width, height, x, y) {
             }
             return { x, y };
         case enum_1.Centring.EndTop:
+        case "end-top":
             switch (type) {
                 case enum_1.LayerType.Image:
                 case enum_1.LayerType.Morph:
@@ -339,6 +462,7 @@ function centring(centring, type, width, height, x, y) {
             }
             return { x, y };
         case enum_1.Centring.None:
+        case "none":
             return { x, y };
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nmmty/lazycanvas",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "A simple way to interact with @napi-rs/canvas in an advanced way!",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -10,6 +10,7 @@
     "logo": "tsc ./test/logo.ts && node ./test/logo.js",
     "text": "tsc ./test/text.ts && node ./test/text.js",
     "doc": "tsx docgen.ts",
+    "font": "tsc ./scripts/font-gen.ts && node ./scripts/font-gen.js",
     "build": "tsc"
   },
   "repository": {
@@ -30,12 +31,13 @@
   },
   "homepage": "https://github.com/NMMTY/LazyCanvas#readme",
   "dependencies": {
-    "@napi-rs/canvas": "^0.1.65",
+    "@napi-rs/canvas": "^0.1.68",
     "jimp": "0.22.12",
     "path": "^0.12.7",
     "svgson": "^5.3.1"
   },
   "devDependencies": {
+    "@hitomihiumi/colors.ts": "^1.0.3",
     "@hitomihiumi/micro-docgen": "^0.3.0",
     "@types/jimp": "^0.2.28",
     "@types/node": "^22.10.2",