@meonode/canvas 2.0.2 → 2.0.4

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

@@ -0,0 +1,164 @@
+'use strict';
+
+var node_worker_threads = require('node:worker_threads');
+var node_url = require('node:url');
+var path = require('node:path');
+require('./comlink.setup.js');
+var Comlink = require('comlink');
+var nodeEndpoint = require('comlink/dist/esm/node-adapter.mjs');
+
+var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
+function _interopNamespaceDefault(e) {
+    var n = Object.create(null);
+    if (e) {
+        Object.keys(e).forEach(function (k) {
+            if (k !== 'default') {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        });
+    }
+    n.default = e;
+    return Object.freeze(n);
+}
+
+var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
+var Comlink__namespace = /*#__PURE__*/_interopNamespaceDefault(Comlink);
+
+/**
+ * Deeply walks an object tree, wraps any function values with Comlink.proxy(),
+ * and tracks wrapped proxies for deterministic cleanup.
+ */
+function wrapFunctions(obj, proxies) {
+    if (obj === null || obj === undefined)
+        return obj;
+    if (typeof obj === 'function') {
+        const wrapped = Comlink__namespace.proxy(obj);
+        proxies.add(wrapped);
+        return wrapped;
+    }
+    if (typeof obj !== 'object')
+        return obj;
+    // Preserve binary data types — don't walk into them
+    if (Buffer.isBuffer(obj))
+        return obj;
+    if (obj instanceof ArrayBuffer)
+        return obj;
+    if (ArrayBuffer.isView(obj))
+        return obj;
+    if (Array.isArray(obj)) {
+        return obj.map(item => wrapFunctions(item, proxies));
+    }
+    const result = {};
+    for (const key of Object.keys(obj)) {
+        result[key] = wrapFunctions(obj[key], proxies);
+    }
+    return result;
+}
+/**
+ * Pool of Comlink-wrapped worker threads.
+ * Manages idle/queue scheduling and proxy lifecycle.
+ */
+class ComlinkPool {
+    workers = [];
+    endpoints = [];
+    idle = [];
+    queue = [];
+    constructor(size) {
+        const workerFile = path__namespace.join(path__namespace.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('worker/comlink.pool.js', document.baseURI).href)))), '../worker/render.worker.js');
+        for (let i = 0; i < size; i++) {
+            const worker = new node_worker_threads.Worker(workerFile);
+            const endpoint = Comlink__namespace.wrap(nodeEndpoint(worker));
+            this.workers.push(worker);
+            this.endpoints.push(endpoint);
+            this.idle.push(i);
+        }
+    }
+    acquire() {
+        return this.idle.pop() ?? null;
+    }
+    release(idx) {
+        this.idle.push(idx);
+        this.drain();
+    }
+    drain() {
+        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);
+        }
+    }
+    async executeRender(idx, props, resolve, reject) {
+        try {
+            const result = await this.endpoints[idx].render(props);
+            resolve({ ...result, workerIdx: idx });
+        }
+        catch (err) {
+            reject(err instanceof Error ? err : new Error(String(err)));
+        }
+        finally {
+            this.release(idx);
+        }
+    }
+    async render(props) {
+        const proxies = new Set();
+        const wrapped = wrapFunctions(props, proxies);
+        const cleanup = () => {
+            for (const p of proxies) {
+                try {
+                    ;
+                    p[Comlink__namespace.releaseProxy]?.();
+                }
+                catch {
+                    // Proxy may already be released
+                }
+            }
+        };
+        // Direct path — idle worker available
+        const idx = this.acquire();
+        if (idx !== null) {
+            try {
+                const result = await this.endpoints[idx].render(wrapped);
+                return { ...result, workerIdx: idx };
+            }
+            finally {
+                this.release(idx);
+                cleanup();
+            }
+        }
+        // Queued path — cleanup AFTER the queued task completes, not before
+        return new Promise((resolve, reject) => {
+            this.queue.push({
+                props: wrapped,
+                resolve: result => {
+                    cleanup();
+                    resolve(result);
+                },
+                reject: err => {
+                    cleanup();
+                    reject(err);
+                },
+            });
+        });
+    }
+    callOnCanvas(workerIdx, canvasId, method, args) {
+        return this.endpoints[workerIdx].callOnCanvas(canvasId, method, args);
+    }
+    releaseCanvas(workerIdx, canvasId) {
+        this.endpoints[workerIdx].releaseCanvas(canvasId);
+    }
+    terminate() {
+        this.workers.forEach(w => w.terminate());
+        this.workers = [];
+        this.endpoints = [];
+        this.idle = [];
+        this.queue = [];
+    }
+}
+
+exports.ComlinkPool = ComlinkPool;
+exports.wrapFunctions = wrapFunctions;
+//# sourceMappingURL=comlink.pool.js.map

package/dist/cjs/worker/comlink.pool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"comlink.pool.js","sources":["../../../../src/worker/comlink.pool.ts"],"sourcesContent":["import { Worker } from 'node:worker_threads'\nimport { fileURLToPath } from 'node:url'\nimport * as path from 'node:path'\nimport { Comlink, nodeEndpoint } from '@/worker/comlink.setup.js'\nimport type { Remote } from 'comlink'\nimport type { WorkerAPI, RenderResult } from '@/worker/worker.types.js'\nimport type { RootProps } from '@/canvas/canvas.type.js'\n\nexport interface PoolRenderResult extends RenderResult {\n  workerIdx: number\n}\n\ninterface QueuedTask {\n  props: RootProps\n  resolve: (result: PoolRenderResult) => void\n  reject: (err: Error) => void\n}\n\n/**\n * Deeply walks an object tree, wraps any function values with Comlink.proxy(),\n * and tracks wrapped proxies for deterministic cleanup.\n */\nexport function wrapFunctions<T>(obj: T, proxies: Set<unknown>): T {\n  if (obj === null || obj === undefined) return obj\n  if (typeof obj === 'function') {\n    const wrapped = Comlink.proxy(obj)\n    proxies.add(wrapped)\n    return wrapped as unknown as T\n  }\n  if (typeof obj !== 'object') return obj\n\n  // Preserve binary data types — don't walk into them\n  if (Buffer.isBuffer(obj)) return obj\n  if (obj instanceof ArrayBuffer) return obj\n  if (ArrayBuffer.isView(obj)) return obj\n\n  if (Array.isArray(obj)) {\n    return obj.map(item => wrapFunctions(item, proxies)) as unknown as T\n  }\n\n  const result: Record<string, unknown> = {}\n  for (const key of Object.keys(obj as Record<string, unknown>)) {\n    result[key] = wrapFunctions((obj as Record<string, unknown>)[key], proxies)\n  }\n  return result as T\n}\n\n/**\n * Pool of Comlink-wrapped worker threads.\n * Manages idle/queue scheduling and proxy lifecycle.\n */\nexport class ComlinkPool {\n  private workers: Worker[] = []\n  private endpoints: Remote<WorkerAPI>[] = []\n  private idle: number[] = []\n  private queue: QueuedTask[] = []\n\n  constructor(size: number) {\n    const workerFile = path.join(path.dirname(fileURLToPath(import.meta.url)), '../worker/render.worker.js')\n\n    for (let i = 0; i < size; i++) {\n      const worker = new Worker(workerFile)\n      const endpoint = Comlink.wrap<WorkerAPI>(nodeEndpoint(worker))\n      this.workers.push(worker)\n      this.endpoints.push(endpoint)\n      this.idle.push(i)\n    }\n  }\n\n  private acquire(): number | null {\n    return this.idle.pop() ?? null\n  }\n\n  private release(idx: number) {\n    this.idle.push(idx)\n    this.drain()\n  }\n\n  private drain() {\n    while (this.queue.length > 0 && this.idle.length > 0) {\n      const task = this.queue.shift()!\n      const idx = this.idle.pop()!\n      void this.executeRender(idx, task.props, task.resolve, task.reject)\n    }\n  }\n\n  private async executeRender(idx: number, props: RootProps, resolve: (result: PoolRenderResult) => void, reject: (err: Error) => void) {\n    try {\n      const result = await this.endpoints[idx].render(props)\n      resolve({ ...result, workerIdx: idx })\n    } catch (err) {\n      reject(err instanceof Error ? err : new Error(String(err)))\n    } finally {\n      this.release(idx)\n    }\n  }\n\n  async render(props: RootProps): Promise<PoolRenderResult> {\n    const proxies = new Set<unknown>()\n    const wrapped = wrapFunctions(props, proxies)\n\n    const cleanup = () => {\n      for (const p of proxies) {\n        try {\n          ;(p as any)[Comlink.releaseProxy]?.()\n        } catch {\n          // Proxy may already be released\n        }\n      }\n    }\n\n    // Direct path — idle worker available\n    const idx = this.acquire()\n    if (idx !== null) {\n      try {\n        const result = await this.endpoints[idx].render(wrapped)\n        return { ...result, workerIdx: idx }\n      } finally {\n        this.release(idx)\n        cleanup()\n      }\n    }\n\n    // Queued path — cleanup AFTER the queued task completes, not before\n    return new Promise<PoolRenderResult>((resolve, reject) => {\n      this.queue.push({\n        props: wrapped,\n        resolve: result => {\n          cleanup()\n          resolve(result)\n        },\n        reject: err => {\n          cleanup()\n          reject(err)\n        },\n      })\n    })\n  }\n\n  callOnCanvas(workerIdx: number, canvasId: number, method: string, args: unknown[]): Promise<Buffer | string | void> {\n    return this.endpoints[workerIdx].callOnCanvas(canvasId, method, args) as Promise<Buffer | string | void>\n  }\n\n  releaseCanvas(workerIdx: number, canvasId: number): void {\n    this.endpoints[workerIdx].releaseCanvas(canvasId)\n  }\n\n  terminate() {\n    this.workers.forEach(w => w.terminate())\n    this.workers = []\n    this.endpoints = []\n    this.idle = []\n    this.queue = []\n  }\n}\n"],"names":["Comlink","path","fileURLToPath","Worker"],"mappings":"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"}

package/dist/cjs/worker/comlink.setup.d.ts

@@ -0,0 +1,4 @@
+import * as Comlink from 'comlink';
+import nodeEndpoint from 'comlink/dist/esm/node-adapter.mjs';
+export { Comlink, nodeEndpoint };
+//# sourceMappingURL=comlink.setup.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,53 @@
+'use strict';
+
+var Comlink = require('comlink');
+var node_worker_threads = require('node:worker_threads');
+var nodeEndpoint = require('comlink/dist/esm/node-adapter.mjs');
+
+function _interopNamespaceDefault(e) {
+    var n = Object.create(null);
+    if (e) {
+        Object.keys(e).forEach(function (k) {
+            if (k !== 'default') {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        });
+    }
+    n.default = e;
+    return Object.freeze(n);
+}
+
+var Comlink__namespace = /*#__PURE__*/_interopNamespaceDefault(Comlink);
+
+// src/worker/comlink.setup.ts
+/**
+ * Fix Comlink.proxy() for Node.js worker_threads (issue #313).
+ * The built-in proxy transfer handler uses browser MessageChannel.
+ * This override uses Node's MessageChannel instead.
+ *
+ * Must be called on BOTH main thread and worker before any Comlink usage.
+ */
+function installNodeProxyHandler() {
+    Comlink__namespace.transferHandlers.set('proxy', {
+        canHandle: (obj) => typeof obj === 'object' && obj !== null && Comlink__namespace.proxyMarker in obj,
+        serialize: (obj) => {
+            const { port1, port2 } = new node_worker_threads.MessageChannel();
+            Comlink__namespace.expose(obj, nodeEndpoint(port1));
+            return [port2, [port2]];
+        },
+        deserialize: (port) => {
+            port.start?.();
+            return Comlink__namespace.wrap(nodeEndpoint(port));
+        },
+    });
+}
+// Install immediately on import
+installNodeProxyHandler();
+
+exports.Comlink = Comlink__namespace;
+exports.nodeEndpoint = nodeEndpoint;
+//# sourceMappingURL=comlink.setup.js.map

package/dist/cjs/worker/comlink.setup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"comlink.setup.js","sources":["../../../../src/worker/comlink.setup.ts"],"sourcesContent":["// src/worker/comlink.setup.ts\nimport * as Comlink from 'comlink'\nimport { MessageChannel } from 'node:worker_threads'\n\n// Use deep import path — Comlink has no `exports` field (issue #508)\n// @ts-expect-error — Comlink's node-adapter has no type declarations at this path\nimport nodeEndpoint from 'comlink/dist/esm/node-adapter.mjs'\n\n/**\n * Fix Comlink.proxy() for Node.js worker_threads (issue #313).\n * The built-in proxy transfer handler uses browser MessageChannel.\n * This override uses Node's MessageChannel instead.\n *\n * Must be called on BOTH main thread and worker before any Comlink usage.\n */\nfunction installNodeProxyHandler() {\n  Comlink.transferHandlers.set('proxy', {\n    canHandle: (obj: unknown): obj is { [Comlink.proxyMarker]: true } => typeof obj === 'object' && obj !== null && Comlink.proxyMarker in obj,\n    serialize: (obj: unknown) => {\n      const { port1, port2 } = new MessageChannel()\n      Comlink.expose(obj, nodeEndpoint(port1))\n      return [port2, [port2]]\n    },\n    deserialize: (port: MessagePort) => {\n      ;(port as any).start?.()\n      return Comlink.wrap(nodeEndpoint(port))\n    },\n  })\n}\n\n// Install immediately on import\ninstallNodeProxyHandler()\n\nexport { Comlink, nodeEndpoint }\n"],"names":["Comlink","MessageChannel"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAQA;;;;;;AAMG;AACH,SAAS,uBAAuB,GAAA;AAC9B,IAAAA,kBAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE;AACpC,QAAA,SAAS,EAAE,CAAC,GAAY,KAA6C,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAIA,kBAAO,CAAC,WAAW,IAAI,GAAG;AAC1I,QAAA,SAAS,EAAE,CAAC,GAAY,KAAI;YAC1B,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAIC,kCAAc,EAAE;YAC7CD,kBAAO,CAAC,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;AACxC,YAAA,OAAO,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;AACD,QAAA,WAAW,EAAE,CAAC,IAAiB,KAAI;AAC/B,YAAA,IAAY,CAAC,KAAK,IAAI;YACxB,OAAOA,kBAAO,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;AACF,KAAA,CAAC;AACJ;AAEA;AACA,uBAAuB,EAAE;;;;;"}

package/dist/cjs/worker/render.worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"render.worker.d.ts","sourceRoot":"","sources":["../../../src/worker/render.worker.ts"],"names":[],"mappings":""}

package/dist/cjs/worker/render.worker.js

@@ -1,73 +1,70 @@
 'use strict';
 
-var worker_threads = require('worker_threads');
+var node_worker_threads = require('node:worker_threads');
+require('./comlink.setup.js');
 var root_canvas = require('../canvas/root.canvas.js');
+var Comlink = require('comlink');
+var nodeEndpoint = require('comlink/dist/esm/node-adapter.mjs');
 
-/**
- * Worker thread entry point for off-main-thread canvas rendering.
- *
- * Message protocol (main → worker):
- *   { type: 'render', taskId, props }                      — render and keep Canvas alive
- *   { type: 'call',   taskId, canvasId, method, args }     — call a method on a live Canvas
- *   { type: 'release', canvasId }                          — free Canvas from memory
- *
- * Responses (worker → main):
- *   WorkerRenderResponse  — render complete (includes pre-encoded PNG buffer)
- *   WorkerCallResponse    — method call result
- *   WorkerErrorResponse   — any failure
- */
-if (!worker_threads.parentPort) {
+function _interopNamespaceDefault(e) {
+    var n = Object.create(null);
+    if (e) {
+        Object.keys(e).forEach(function (k) {
+            if (k !== 'default') {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        });
+    }
+    n.default = e;
+    return Object.freeze(n);
+}
+
+var Comlink__namespace = /*#__PURE__*/_interopNamespaceDefault(Comlink);
+
+if (!node_worker_threads.parentPort) {
     throw new Error('[render.worker] Must be run as a worker thread');
 }
 const canvases = new Map();
 let nextCanvasId = 0;
-function reply(msg) {
-    worker_threads.parentPort.postMessage(msg);
-}
-worker_threads.parentPort.on('message', async (msg) => {
-    if (msg.type === 'render') {
-        try {
-            const canvas = await new root_canvas.RootNode(msg.props).render();
-            const canvasId = nextCanvasId++;
-            canvases.set(canvasId, canvas);
-            reply({ taskId: msg.taskId, canvasId, buffer: canvas.toBufferSync('png'), width: canvas.width, height: canvas.height });
-        }
-        catch (err) {
-            reply({ taskId: msg.taskId, error: String(err) });
-        }
-    }
-    else if (msg.type === 'call') {
-        const canvas = canvases.get(msg.canvasId);
+const api = {
+    async render(props) {
+        const canvas = await new root_canvas.RootNode(props).render();
+        const canvasId = nextCanvasId++;
+        canvases.set(canvasId, canvas);
+        const result = {
+            canvasId,
+            buffer: canvas.toBufferSync('png'),
+            width: canvas.width,
+            height: canvas.height,
+        };
+        return result;
+    },
+    async callOnCanvas(canvasId, method, args) {
+        const canvas = canvases.get(canvasId);
         if (!canvas) {
-            reply({ taskId: msg.taskId, error: `[render.worker] Canvas ${msg.canvasId} not found` });
-            return;
-        }
-        try {
-            let result;
-            switch (msg.method) {
-                case 'toBuffer':
-                    result = await canvas.toBuffer(...msg.args);
-                    break;
-                case 'toURL':
-                    result = await canvas.toURL(...msg.args);
-                    break;
-                case 'toFile':
-                    result = await canvas.toFile(...msg.args);
-                    break;
-                case 'toSharp':
-                    // Sharp instances can't be transferred across threads — serialize to buffer
-                    result = await canvas.toSharp(...msg.args).toBuffer();
-                    break;
-            }
-            reply({ taskId: msg.taskId, result });
+            throw new Error(`[render.worker] Canvas ${canvasId} not found`);
         }
-        catch (err) {
-            reply({ taskId: msg.taskId, error: String(err) });
+        switch (method) {
+            case 'toBuffer':
+                return canvas.toBuffer(...args);
+            case 'toURL':
+                return canvas.toURL(...args);
+            case 'toFile':
+                await canvas.toFile(...args);
+                return;
+            case 'toSharp':
+                return await canvas.toSharp(...args).toBuffer();
+            default:
+                throw new Error(`[render.worker] Unknown method: ${method}`);
         }
-    }
-    else {
-        // type === 'release'
-        canvases.delete(msg.canvasId);
-    }
-});
+    },
+    releaseCanvas(canvasId) {
+        canvases.delete(canvasId);
+    },
+};
+Comlink__namespace.expose(api, nodeEndpoint(node_worker_threads.parentPort));
 //# sourceMappingURL=render.worker.js.map

package/dist/cjs/worker/render.worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"render.worker.js","sources":["../../../../../src/worker/render.worker.ts"],"sourcesContent":["/**\n * Worker thread entry point for off-main-thread canvas rendering.\n *\n * Message protocol (main → worker):\n *   { type: 'render', taskId, props }                      — render and keep Canvas alive\n *   { type: 'call',   taskId, canvasId, method, args }     — call a method on a live Canvas\n *   { type: 'release', canvasId }                          — free Canvas from memory\n *\n * Responses (worker → main):\n *   WorkerRenderResponse  — render complete (includes pre-encoded PNG buffer)\n *   WorkerCallResponse    — method call result\n *   WorkerErrorResponse   — any failure\n */\nimport { parentPort } from 'worker_threads'\nimport { RootNode } from '@/canvas/root.canvas.js'\nimport type { Canvas } from 'skia-canvas'\nimport type { WorkerRequest, WorkerRenderResponse, WorkerCallResponse, WorkerErrorResponse } from '@/worker/worker.types.js'\n\nif (!parentPort) {\n  throw new Error('[render.worker] Must be run as a worker thread')\n}\n\nconst canvases = new Map<number, Canvas>()\nlet nextCanvasId = 0\n\nfunction reply(msg: WorkerRenderResponse | WorkerCallResponse | WorkerErrorResponse) {\n  parentPort!.postMessage(msg)\n}\n\nparentPort.on('message', async (msg: WorkerRequest) => {\n  if (msg.type === 'render') {\n    try {\n      const canvas = await new RootNode(msg.props).render()\n      const canvasId = nextCanvasId++\n      canvases.set(canvasId, canvas)\n      reply({ taskId: msg.taskId, canvasId, buffer: canvas.toBufferSync('png'), width: canvas.width, height: canvas.height })\n    } catch (err) {\n      reply({ taskId: msg.taskId, error: String(err) })\n    }\n  } else if (msg.type === 'call') {\n    const canvas = canvases.get(msg.canvasId)\n    if (!canvas) {\n      reply({ taskId: msg.taskId, error: `[render.worker] Canvas ${msg.canvasId} not found` })\n      return\n    }\n    try {\n      let result: Buffer | string | void\n      switch (msg.method) {\n        case 'toBuffer':\n          result = await canvas.toBuffer(...msg.args)\n          break\n        case 'toURL':\n          result = await canvas.toURL(...msg.args)\n          break\n        case 'toFile':\n          result = await canvas.toFile(...msg.args)\n          break\n        case 'toSharp':\n          // Sharp instances can't be transferred across threads — serialize to buffer\n          result = await canvas.toSharp(...msg.args).toBuffer()\n          break\n      }\n      reply({ taskId: msg.taskId, result })\n    } catch (err) {\n      reply({ taskId: msg.taskId, error: String(err) })\n    }\n  } else {\n    // type === 'release'\n    canvases.delete(msg.canvasId)\n  }\n})\n"],"names":["parentPort","RootNode"],"mappings":";;;;;AAAA;;;;;;;;;;;;AAYG;AAMH,IAAI,CAACA,yBAAU,EAAE;AACf,IAAA,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC;AACnE;AAEA,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB;AAC1C,IAAI,YAAY,GAAG,CAAC;AAEpB,SAAS,KAAK,CAAC,GAAoE,EAAA;AACjF,IAAAA,yBAAW,CAAC,WAAW,CAAC,GAAG,CAAC;AAC9B;AAEAA,yBAAU,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,GAAkB,KAAI;AACpD,IAAA,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE;AACzB,QAAA,IAAI;AACF,YAAA,MAAM,MAAM,GAAG,MAAM,IAAIC,oBAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;AACrD,YAAA,MAAM,QAAQ,GAAG,YAAY,EAAE;AAC/B,YAAA,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC;AAC9B,YAAA,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;QACzH;QAAE,OAAO,GAAG,EAAE;AACZ,YAAA,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QACnD;IACF;AAAO,SAAA,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE;QAC9B,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC;QACzC,IAAI,CAAC,MAAM,EAAE;AACX,YAAA,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,0BAA0B,GAAG,CAAC,QAAQ,CAAA,UAAA,CAAY,EAAE,CAAC;YACxF;QACF;AACA,QAAA,IAAI;AACF,YAAA,IAAI,MAA8B;AAClC,YAAA,QAAQ,GAAG,CAAC,MAAM;AAChB,gBAAA,KAAK,UAAU;oBACb,MAAM,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC;oBAC3C;AACF,gBAAA,KAAK,OAAO;oBACV,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC;oBACxC;AACF,gBAAA,KAAK,QAAQ;oBACX,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC;oBACzC;AACF,gBAAA,KAAK,SAAS;;AAEZ,oBAAA,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE;oBACrD;;YAEJ,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;QACvC;QAAE,OAAO,GAAG,EAAE;AACZ,YAAA,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QACnD;IACF;SAAO;;AAEL,QAAA,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC/B;AACF,CAAC,CAAC;;"}
+{"version":3,"file":"render.worker.js","sources":["../../../../src/worker/render.worker.ts"],"sourcesContent":["import { parentPort } from 'node:worker_threads'\nimport { Comlink, nodeEndpoint } from '@/worker/comlink.setup.js'\nimport { RootNode } from '@/canvas/root.canvas.js'\nimport type { Canvas } from 'skia-canvas'\nimport type { WorkerAPI, RenderResult } from '@/worker/worker.types.js'\n\nif (!parentPort) {\n  throw new Error('[render.worker] Must be run as a worker thread')\n}\n\nconst canvases = new Map<number, Canvas>()\nlet nextCanvasId = 0\n\nconst api: WorkerAPI = {\n  async render(props) {\n    const canvas = await new RootNode(props).render()\n    const canvasId = nextCanvasId++\n    canvases.set(canvasId, canvas)\n    const result: RenderResult = {\n      canvasId,\n      buffer: canvas.toBufferSync('png'),\n      width: canvas.width,\n      height: canvas.height,\n    }\n    return result\n  },\n\n  async callOnCanvas(canvasId, method, args) {\n    const canvas = canvases.get(canvasId)\n    if (!canvas) {\n      throw new Error(`[render.worker] Canvas ${canvasId} not found`)\n    }\n    switch (method) {\n      case 'toBuffer':\n        return canvas.toBuffer(...(args as [any, any?]))\n      case 'toURL':\n        return canvas.toURL(...(args as [any, any?]))\n      case 'toFile':\n        await canvas.toFile(...(args as [string, any?]))\n        return\n      case 'toSharp':\n        return await canvas.toSharp(...(args as [any?])).toBuffer()\n      default:\n        throw new Error(`[render.worker] Unknown method: ${method}`)\n    }\n  },\n\n  releaseCanvas(canvasId) {\n    canvases.delete(canvasId)\n  },\n}\n\nComlink.expose(api, nodeEndpoint(parentPort))\n"],"names":["parentPort","RootNode","Comlink"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,IAAI,CAACA,8BAAU,EAAE;AACf,IAAA,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC;AACnE;AAEA,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB;AAC1C,IAAI,YAAY,GAAG,CAAC;AAEpB,MAAM,GAAG,GAAc;IACrB,MAAM,MAAM,CAAC,KAAK,EAAA;QAChB,MAAM,MAAM,GAAG,MAAM,IAAIC,oBAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;AACjD,QAAA,MAAM,QAAQ,GAAG,YAAY,EAAE;AAC/B,QAAA,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC;AAC9B,QAAA,MAAM,MAAM,GAAiB;YAC3B,QAAQ;AACR,YAAA,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC;YAClC,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB;AACD,QAAA,OAAO,MAAM;IACf,CAAC;AAED,IAAA,MAAM,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAA;QACvC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC;QACrC,IAAI,CAAC,MAAM,EAAE;AACX,YAAA,MAAM,IAAI,KAAK,CAAC,0BAA0B,QAAQ,CAAA,UAAA,CAAY,CAAC;QACjE;QACA,QAAQ,MAAM;AACZ,YAAA,KAAK,UAAU;AACb,gBAAA,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAI,IAAoB,CAAC;AAClD,YAAA,KAAK,OAAO;AACV,gBAAA,OAAO,MAAM,CAAC,KAAK,CAAC,GAAI,IAAoB,CAAC;AAC/C,YAAA,KAAK,QAAQ;AACX,gBAAA,MAAM,MAAM,CAAC,MAAM,CAAC,GAAI,IAAuB,CAAC;gBAChD;AACF,YAAA,KAAK,SAAS;gBACZ,OAAO,MAAM,MAAM,CAAC,OAAO,CAAC,GAAI,IAAe,CAAC,CAAC,QAAQ,EAAE;AAC7D,YAAA;AACE,gBAAA,MAAM,IAAI,KAAK,CAAC,mCAAmC,MAAM,CAAA,CAAE,CAAC;;IAElE,CAAC;AAED,IAAA,aAAa,CAAC,QAAQ,EAAA;AACpB,QAAA,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;IAC3B,CAAC;CACF;AAEDC,kBAAO,CAAC,MAAM,CAAC,GAAG,EAAE,YAAY,CAACF,8BAAU,CAAC,CAAC;;"}

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

@@ -0,0 +1,13 @@
+import type { RootProps } from '../canvas/canvas.type.js';
+export interface RenderResult {
+    canvasId: number;
+    buffer: Buffer;
+    width: number;
+    height: number;
+}
+export interface WorkerAPI {
+    render(props: RootProps): Promise<RenderResult>;
+    callOnCanvas(canvasId: number, method: string, args: unknown[]): Promise<Buffer | string | void>;
+    releaseCanvas(canvasId: number): void;
+}
+//# sourceMappingURL=worker.types.d.ts.map

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

@@ -0,0 +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"}

package/dist/esm/{src/canvas → canvas}/canvas.helper.d.ts

@@ -1,6 +1,6 @@
 import type { CanvasRenderingContext2D } from 'skia-canvas';
 import * as YogaTypes from 'yoga-layout';
-import type { BoxProps, RootProps } from '../canvas/canvas.type.js';
+import type { BoxProps } from '../canvas/canvas.type.js';
 export declare const drawBorders: ({ ctx, node, x, y, width, height, radii, borderColor, borderStyle, }: {
     ctx: CanvasRenderingContext2D;
     node: YogaTypes.Node;
@@ -52,23 +52,4 @@ export declare const parseBorderRadius: (radiusProp: BoxProps["borderRadius"]) =
  * @returns The parsed number, or 0 if the value is not a number or a valid percentage.
  */
 export declare function parsePercentage(value: number | string | undefined, base: number): number;
-/**
- * Pre-processes a RootProps descriptor tree on the main thread before postMessage.
- * Executes function props against available data, stores results as serializable fields,
- * then strips remaining functions as a safety net.
- */
-export declare class WorkerPreProcessor {
-    private static readonly CHART_COLORS;
-    static process(props: RootProps): RootProps;
-    private static processDescriptor;
-    private static processChartDescriptor;
-    /**
-     * Converts a BoxNode instance or CanvasElement to a CanvasElement.
-     * Public API functions (Box(), Text(), etc.) already return CanvasElements,
-     * but if someone returns an actual class instance, we convert it via initialProps.
-     */
-    private static nodeToDescriptor;
-    private static generateColor;
-    static stripNonSerializable<T>(obj: T): T;
-}
 //# sourceMappingURL=canvas.helper.d.ts.map

package/dist/esm/canvas/canvas.helper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"canvas.helper.d.ts","sourceRoot":"","sources":["../../../src/canvas/canvas.helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AAC3D,OAAO,KAAK,SAAS,MAAM,aAAa,CAAA;AAExC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAEvD,eAAO,MAAM,WAAW,GAAI,sEAUzB;IACD,GAAG,EAAE,wBAAwB,CAAA;IAC7B,IAAI,EAAE,SAAS,CAAC,IAAI,CAAA;IACpB,CAAC,EAAE,MAAM,CAAA;IACT,CAAC,EAAE,MAAM,CAAA;IACT,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE;QACL,OAAO,EAAE,MAAM,CAAA;QACf,QAAQ,EAAE,MAAM,CAAA;QAChB,UAAU,EAAE,MAAM,CAAA;QAClB,WAAW,EAAE,MAAM,CAAA;KACpB,CAAA;IACD,WAAW,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;IACpC,WAAW,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAA;CACrC,SA8IA,CAAA;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,mBAAmB,GAC9B,KAAK,wBAAwB,EAC7B,GAAG,MAAM,EACT,GAAG,MAAM,EACT,OAAO,MAAM,EACb,QAAQ,MAAM,EACd,OAAO;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,SAoCtF,CAAA;AAED;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAC5B,YAAY,QAAQ,CAAC,cAAc,CAAC,KACnC;IACD,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;CAYnB,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAQxF"}