@meonode/canvas 2.0.4 → 3.0.0

package/dist/esm/util/disk.cache.js

@@ -2,12 +2,20 @@ import { createHash } from 'crypto';
 import { promises } from 'fs';
 import { join } from 'path';
 
-const CACHE_DIR = join(process.cwd(), '.cache', 'files');
+let _cacheDir = join(process.cwd(), '.cache', 'files');
 let _dirEnsured = false;
+/**
+ * Override the default disk cache directory.
+ * Must be called before any cache read/write operations.
+ */
+function setDiskCacheDir(dir) {
+    _cacheDir = dir;
+    _dirEnsured = false;
+}
 async function ensureDir() {
     if (_dirEnsured)
         return;
-    await promises.mkdir(CACHE_DIR, { recursive: true });
+    await promises.mkdir(_cacheDir, { recursive: true });
     _dirEnsured = true;
 }
 function hashBuffer(buf) {
@@ -16,7 +24,7 @@ function hashBuffer(buf) {
 async function readDiskCache(key) {
     try {
         await ensureDir();
-        return await promises.readFile(join(CACHE_DIR, key));
+        return await promises.readFile(join(_cacheDir, key));
     }
     catch {
         return null;
@@ -25,7 +33,7 @@ async function readDiskCache(key) {
 async function writeDiskCache(key, data) {
     try {
         await ensureDir();
-        await promises.writeFile(join(CACHE_DIR, key), data);
+        await promises.writeFile(join(_cacheDir, key), data);
     }
     catch {
         // best-effort — cache write failures are non-fatal
@@ -33,10 +41,13 @@ async function writeDiskCache(key, data) {
 }
 async function deleteDiskCache(key) {
     try {
-        await promises.unlink(join(CACHE_DIR, key));
+        await promises.unlink(join(_cacheDir, key));
     }
-    catch {
+    catch (err) {
         // non-fatal — file may not exist if write failed earlier
+        if (err.code !== 'ENOENT') {
+            console.warn(`[disk.cache] Failed to delete cache entry "${key}":`, err.message);
+        }
     }
 }
 /**
@@ -46,10 +57,13 @@ async function deleteDiskCache(key) {
 async function clearDiskCache() {
     _dirEnsured = false;
     try {
-        await promises.rm(CACHE_DIR, { recursive: true, force: true });
+        await promises.rm(_cacheDir, { recursive: true, force: true });
     }
-    catch {
+    catch (err) {
         // non-fatal — directory may not exist
+        if (err.code !== 'ENOENT') {
+            console.warn('[disk.cache] Failed to clear cache directory:', err.message);
+        }
     }
 }
 // Clean up disk cache on process exit to handle crashes mid-render.
@@ -69,4 +83,4 @@ const cleanupOnExit = () => {
 process.on('SIGINT', cleanupOnExit);
 process.on('SIGTERM', cleanupOnExit);
 
-export { clearDiskCache, deleteDiskCache, hashBuffer, readDiskCache, writeDiskCache };
+export { clearDiskCache, deleteDiskCache, hashBuffer, readDiskCache, setDiskCacheDir, writeDiskCache };

package/dist/esm/worker/comlink.pool.d.ts

@@ -1,13 +1,24 @@
-import type { RenderResult } from '../worker/worker.types.js';
+import type { RenderResult } from './worker.types.js';
 import type { RootProps } from '../canvas/canvas.type.js';
 export interface PoolRenderResult extends RenderResult {
     workerIdx: number;
 }
+/** Sentinel embedded in serialized props to mark where a function was extracted. */
+export declare const FN_MARKER = "__comlinkFnId";
 /**
- * Deeply walks an object tree, wraps any function values with Comlink.proxy(),
- * and tracks wrapped proxies for deterministic cleanup.
+ * Deeply walks an object tree, replaces function values with `{ [FN_MARKER]: id }` sentinels,
+ * and collects the original functions in a Map keyed by their assigned id.
+ * Returns the cleaned (function-free) tree that is safe for structured clone.
  */
-export declare function wrapFunctions<T>(obj: T, proxies: Set<unknown>): T;
+export declare function extractFunctions<T>(obj: T, fnMap: Map<number, (...args: unknown[]) => unknown>, nextId: {
+    value: number;
+}): T;
+/**
+ * Deeply walks an object tree received on the worker side, replaces
+ * `{ [FN_MARKER]: id }` sentinels with async functions that delegate
+ * to the main-thread callback proxy.
+ */
+export declare function restoreFunctions<T>(obj: T, callFn: (id: number, ...args: unknown[]) => Promise<unknown>): T;
 /**
  * Pool of Comlink-wrapped worker threads.
  * Manages idle/queue scheduling and proxy lifecycle.

package/dist/esm/worker/comlink.pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comlink.pool.d.ts","sourceRoot":"","sources":["../../../src/worker/comlink.pool.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAa,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,SAAS,EAAE,MAAM,CAAA;CAClB;AAQD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAuBjE;AAED;;;GAGG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,IAAI,CAAe;IAC3B,OAAO,CAAC,KAAK,CAAmB;gBAEpB,IAAI,EAAE,MAAM;IAYxB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,KAAK;YAQC,aAAa;IAWrB,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA0CzD,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAInH,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAIxD,SAAS;CAOV"}
+{"version":3,"file":"comlink.pool.d.ts","sourceRoot":"","sources":["../../../src/worker/comlink.pool.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAa,YAAY,EAAU,MAAM,0BAA0B,CAAA;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,SAAS,EAAE,MAAM,CAAA;CAClB;AASD,oFAAoF;AACpF,eAAO,MAAM,SAAS,kBAAkB,CAAA;AAExC;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,EAAE,MAAM,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,CAAC,CAuB7H;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAuB3G;AAED;;;GAGG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAAe;IAC9B,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,IAAI,CAAe;IAC3B,OAAO,CAAC,KAAK,CAAmB;gBAEpB,IAAI,EAAE,MAAM;IAYxB,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,KAAK;YAQC,aAAa;IAiBrB,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2DzD,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IAInH,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAIxD,SAAS;CAOV"}

package/dist/esm/worker/comlink.pool.js

@@ -5,17 +5,20 @@ import './comlink.setup.js';
 import * as Comlink from 'comlink';
 import nodeEndpoint from 'comlink/dist/esm/node-adapter.mjs';
 
+/** Sentinel embedded in serialized props to mark where a function was extracted. */
+const FN_MARKER = '__comlinkFnId';
 /**
- * Deeply walks an object tree, wraps any function values with Comlink.proxy(),
- * and tracks wrapped proxies for deterministic cleanup.
+ * Deeply walks an object tree, replaces function values with `{ [FN_MARKER]: id }` sentinels,
+ * and collects the original functions in a Map keyed by their assigned id.
+ * Returns the cleaned (function-free) tree that is safe for structured clone.
  */
-function wrapFunctions(obj, proxies) {
+function extractFunctions(obj, fnMap, nextId) {
     if (obj === null || obj === undefined)
         return obj;
     if (typeof obj === 'function') {
-        const wrapped = Comlink.proxy(obj);
-        proxies.add(wrapped);
-        return wrapped;
+        const id = nextId.value++;
+        fnMap.set(id, obj);
+        return { [FN_MARKER]: id };
     }
     if (typeof obj !== 'object')
         return obj;
@@ -27,11 +30,41 @@ function wrapFunctions(obj, proxies) {
     if (ArrayBuffer.isView(obj))
         return obj;
     if (Array.isArray(obj)) {
-        return obj.map(item => wrapFunctions(item, proxies));
+        return obj.map(item => extractFunctions(item, fnMap, nextId));
     }
     const result = {};
     for (const key of Object.keys(obj)) {
-        result[key] = wrapFunctions(obj[key], proxies);
+        result[key] = extractFunctions(obj[key], fnMap, nextId);
+    }
+    return result;
+}
+/**
+ * Deeply walks an object tree received on the worker side, replaces
+ * `{ [FN_MARKER]: id }` sentinels with async functions that delegate
+ * to the main-thread callback proxy.
+ */
+function restoreFunctions(obj, callFn) {
+    if (obj === null || obj === undefined)
+        return obj;
+    if (typeof obj !== 'object')
+        return obj;
+    if (Buffer.isBuffer(obj))
+        return obj;
+    if (obj instanceof ArrayBuffer)
+        return obj;
+    if (ArrayBuffer.isView(obj))
+        return obj;
+    // Check for sentinel
+    if (FN_MARKER in obj) {
+        const id = obj[FN_MARKER];
+        return ((...args) => callFn(id, ...args));
+    }
+    if (Array.isArray(obj)) {
+        return obj.map(item => restoreFunctions(item, callFn));
+    }
+    const result = {};
+    for (const key of Object.keys(obj)) {
+        result[key] = restoreFunctions(obj[key], callFn);
     }
     return result;
 }
@@ -65,12 +98,12 @@ class ComlinkPool {
         while (this.queue.length > 0 && this.idle.length > 0) {
             const task = this.queue.shift();
             const idx = this.idle.pop();
-            void this.executeRender(idx, task.props, task.resolve, task.reject);
+            void this.executeRender(idx, task.props, task.callFn, task.resolve, task.reject);
         }
     }
-    async executeRender(idx, props, resolve, reject) {
+    async executeRender(idx, props, callFn, resolve, reject) {
         try {
-            const result = await this.endpoints[idx].render(props);
+            const result = await this.endpoints[idx].render(props, callFn);
             resolve({ ...result, workerIdx: idx });
         }
         catch (err) {
@@ -81,13 +114,28 @@ class ComlinkPool {
         }
     }
     async render(props) {
-        const proxies = new Set();
-        const wrapped = wrapFunctions(props, proxies);
+        if (this.endpoints.length === 0) {
+            throw new Error('[ComlinkPool] Pool has been terminated');
+        }
+        // Extract functions from props, replacing them with serializable sentinels.
+        // A single Comlink.proxy() callback is created at the top level so Comlink
+        // can correctly transfer it via its proxy transfer handler.
+        const fnMap = new Map();
+        const cleaned = extractFunctions(props, fnMap, { value: 0 });
+        let callFnProxy;
+        if (fnMap.size > 0) {
+            callFnProxy = Comlink.proxy(async (id, ...args) => {
+                const fn = fnMap.get(id);
+                if (!fn)
+                    throw new Error(`[ComlinkPool] Function #${id} not found`);
+                return fn(...args);
+            });
+        }
         const cleanup = () => {
-            for (const p of proxies) {
+            if (callFnProxy) {
                 try {
                     ;
-                    p[Comlink.releaseProxy]?.();
+                    callFnProxy[Comlink.releaseProxy]?.();
                 }
                 catch {
                     // Proxy may already be released
@@ -98,7 +146,7 @@ class ComlinkPool {
         const idx = this.acquire();
         if (idx !== null) {
             try {
-                const result = await this.endpoints[idx].render(wrapped);
+                const result = await this.endpoints[idx].render(cleaned, callFnProxy);
                 return { ...result, workerIdx: idx };
             }
             finally {
@@ -109,7 +157,8 @@ class ComlinkPool {
         // Queued path — cleanup AFTER the queued task completes, not before
         return new Promise((resolve, reject) => {
             this.queue.push({
-                props: wrapped,
+                props: cleaned,
+                callFn: callFnProxy,
                 resolve: result => {
                     cleanup();
                     resolve(result);
@@ -136,4 +185,4 @@ class ComlinkPool {
     }
 }
 
-export { ComlinkPool, wrapFunctions };
+export { ComlinkPool, FN_MARKER, extractFunctions, restoreFunctions };

package/dist/esm/worker/comlink.setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comlink.setup.d.ts","sourceRoot":"","sources":["../../../src/worker/comlink.setup.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAKlC,OAAO,YAAY,MAAM,mCAAmC,CAAA;AA2B5D,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"comlink.setup.d.ts","sourceRoot":"","sources":["../../../src/worker/comlink.setup.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAKlC,OAAO,YAAY,MAAM,mCAAmC,CAAA;AA4B5D,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAA"}

package/dist/esm/worker/comlink.setup.js

@@ -14,7 +14,7 @@ export { default as nodeEndpoint } from 'comlink/dist/esm/node-adapter.mjs';
  */
 function installNodeProxyHandler() {
     Comlink.transferHandlers.set('proxy', {
-        canHandle: (obj) => typeof obj === 'object' && obj !== null && Comlink.proxyMarker in obj,
+        canHandle: (obj) => (typeof obj === 'object' || typeof obj === 'function') && obj !== null && Comlink.proxyMarker in obj,
         serialize: (obj) => {
             const { port1, port2 } = new MessageChannel();
             Comlink.expose(obj, nodeEndpoint(port1));

package/dist/esm/worker/render.worker.js

@@ -1,5 +1,6 @@
 import { parentPort } from 'node:worker_threads';
 import './comlink.setup.js';
+import { restoreFunctions } from './comlink.pool.js';
 import { RootNode } from '../canvas/root.canvas.js';
 import * as Comlink from 'comlink';
 import nodeEndpoint from 'comlink/dist/esm/node-adapter.mjs';
@@ -10,8 +11,9 @@ if (!parentPort) {
 const canvases = new Map();
 let nextCanvasId = 0;
 const api = {
-    async render(props) {
-        const canvas = await new RootNode(props).render();
+    async render(props, callFn) {
+        const resolved = callFn ? restoreFunctions(props, callFn) : props;
+        const canvas = await new RootNode(resolved).render();
         const canvasId = nextCanvasId++;
         canvases.set(canvasId, canvas);
         const result = {

package/dist/esm/worker/worker.types.d.ts

@@ -1,4 +1,5 @@
 import type { RootProps } from '../canvas/canvas.type.js';
+export type CallFn = (id: number, ...args: unknown[]) => Promise<unknown>;
 export interface RenderResult {
     canvasId: number;
     buffer: Buffer;
@@ -6,7 +7,7 @@ export interface RenderResult {
     height: number;
 }
 export interface WorkerAPI {
-    render(props: RootProps): Promise<RenderResult>;
+    render(props: RootProps, callFn?: CallFn): Promise<RenderResult>;
     callOnCanvas(canvasId: number, method: string, args: unknown[]): Promise<Buffer | string | void>;
     releaseCanvas(canvasId: number): void;
 }

package/dist/esm/worker/worker.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker.types.d.ts","sourceRoot":"","sources":["../../../src/worker/worker.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IAC/C,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,CAAA;IAChG,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CACtC"}
+{"version":3,"file":"worker.types.d.ts","sourceRoot":"","sources":["../../../src/worker/worker.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,MAAM,MAAM,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;AAEzE,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;IAChE,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,CAAA;IAChG,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CACtC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meonode/canvas",
-  "version": "2.0.4",
+  "version": "3.0.0",
   "description": "A declarative, component-based library for server-side canvas image generation. Write complex visuals with simple functions, similar to the composition style of @meonode/ui.",
   "keywords": [
     "canvas",
@@ -37,9 +37,10 @@
     }
   },
   "scripts": {
-    "build": "rm -rf ./dist && rollup -c --bundleConfigAsCjs && tsc-alias -p tsconfig.esm.json && tsc-alias -p tsconfig.cjs.json",
-    "test": "node --no-experimental-webstorage --experimental-vm-modules $(yarn bin jest)",
-    "lint": "eslint . --ext .ts,.tsx,.js,.jsx,.mjs --fix",
+    "build": "bun -e \"fs.rmSync('./dist', {recursive:true, force:true})\" && rollup -c --bundleConfigAsCjs && bun scripts/rewrite-dts-aliases.ts",
+    "test": "vitest run --coverage",
+    "typecheck": "tsc --noEmit",
+    "lint": "eslint . --ext .ts,.tsx,.js,.jsx,.mjs --fix && bun run typecheck",
     "format": "prettier --write .",
     "generate:samples": "npx tsx scripts/generate_sample_charts.ts && npx tsx scripts/generate_sample_grids.ts && npx tsx scripts/generate_sample_nested_grids.ts",
     "check:memory": "npx tsx --expose-gc scripts/check_memory.ts",
@@ -47,7 +48,6 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.39.4",
-    "@jest/globals": "^30.3.0",
     "@rollup/plugin-commonjs": "^29.0.2",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-typescript": "^12.3.0",
@@ -56,37 +56,30 @@
     "@semantic-release/gitlab": "^13.3.2",
     "@semantic-release/npm": "^13.1.5",
     "@semantic-release/release-notes-generator": "^14.1.0",
-    "@types/jest": "^30.0.0",
-    "@types/lodash-es": "^4.17.12",
     "@types/node": "^25.5.0",
     "@types/sharp": "^0.32.0",
-    "@types/tinycolor2": "^1.4.6",
     "@typescript-eslint/eslint-plugin": "^8.57.2",
     "@typescript-eslint/parser": "^8.57.2",
+    "@vitest/coverage-v8": "^3.2.4",
     "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-jsdoc": "^62.8.1",
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-unused-imports": "^4.4.1",
     "husky": "^9.1.7",
-    "jest": "^30.3.0",
     "prettier": "^3.8.1",
     "rollup": "^4.60.0",
     "rollup-plugin-tsconfig-paths": "^1.5.2",
-    "semantic-release": "^25.0.3",
-    "ts-jest": "^29.4.6",
-    "tsc-alias": "^1.8.16",
+    "semantic-release": "24.2.9",
     "typescript": "^6.0.2",
-    "typescript-eslint": "^8.57.2"
+    "typescript-eslint": "^8.57.2",
+    "vitest": "^3.2.4"
   },
-  "packageManager": "yarn@4.11.0",
   "dependencies": {
     "comlink": "^4.4.2",
     "file-type": "^22.0.0",
-    "lodash-es": "^4.17.23",
     "sharp": "^0.34.5",
     "skia-canvas": "^3.0.8",
-    "tinycolor2": "^1.6.0",
     "tslib": "^2.8.1",
     "yoga-layout": "^3.2.1"
   },