@takumi-rs/wasm 0.67.3 → 0.68.1

package/bundlers/node.cjs

@@ -5,6 +5,6 @@ const { join } = require("node:path");
 const wasmPath = join(__dirname, "../pkg/takumi_wasm_bg.wasm");
 const wasmBytes = readFileSync(wasmPath);
 
-wasm.initSync(wasmBytes);
+wasm.initSync({ module: wasmBytes });
 
 module.exports = wasm;

package/bundlers/node.mjs

@@ -9,7 +9,7 @@ const __dirname = dirname(__filename);
 const wasmPath = join(__dirname, "../pkg/takumi_wasm_bg.wasm");
 const wasmBytes = readFileSync(wasmPath);
 
-initSync(wasmBytes);
+initSync({ module: wasmBytes });
 
 export * from "../pkg/takumi_wasm";
 export { default } from "../pkg/takumi_wasm";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takumi-rs/wasm",
-  "version": "0.67.3",
+  "version": "0.68.1",
   "keywords": [
     "image",
     "rendering",

package/pkg/takumi_wasm.cjs

@@ -33,6 +33,7 @@ __export(exports_takumi_wasm, {
   extractResourceUrls: () => extractResourceUrls,
   default: () => __wbg_init,
   collectNodeFetchTasks: () => collectNodeFetchTasks,
+  WasmBuffer: () => WasmBuffer,
   Renderer: () => Renderer
 });
 module.exports = __toCommonJS(exports_takumi_wasm);
@@ -129,13 +130,10 @@ class Renderer {
       var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
       var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
       var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-      var r3 = getDataViewMemory0().getInt32(retptr + 4 * 3, true);
-      if (r3) {
-        throw takeObject(r2);
+      if (r2) {
+        throw takeObject(r1);
       }
-      var v1 = getArrayU8FromWasm0(r0, r1).slice();
-      wasm.__wbindgen_export4(r0, r1 * 1, 1);
-      return v1;
+      return WasmBuffer.__wrap(r0);
     } finally {
       wasm.__wbindgen_add_to_stack_pointer(16);
     }
@@ -149,13 +147,10 @@ class Renderer {
       var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
       var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
       var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-      var r3 = getDataViewMemory0().getInt32(retptr + 4 * 3, true);
-      if (r3) {
-        throw takeObject(r2);
+      if (r2) {
+        throw takeObject(r1);
       }
-      var v2 = getArrayU8FromWasm0(r0, r1).slice();
-      wasm.__wbindgen_export4(r0, r1 * 1, 1);
-      return v2;
+      return WasmBuffer.__wrap(r0);
     } finally {
       wasm.__wbindgen_add_to_stack_pointer(16);
     }
@@ -188,6 +183,36 @@ class Renderer {
 }
 if (Symbol.dispose)
   Renderer.prototype[Symbol.dispose] = Renderer.prototype.free;
+
+class WasmBuffer {
+  static __wrap(ptr) {
+    ptr = ptr >>> 0;
+    const obj = Object.create(WasmBuffer.prototype);
+    obj.__wbg_ptr = ptr;
+    WasmBufferFinalization.register(obj, obj.__wbg_ptr, obj);
+    return obj;
+  }
+  __destroy_into_raw() {
+    const ptr = this.__wbg_ptr;
+    this.__wbg_ptr = 0;
+    WasmBufferFinalization.unregister(this);
+    return ptr;
+  }
+  free() {
+    const ptr = this.__destroy_into_raw();
+    wasm.__wbg_wasmbuffer_free(ptr, 0);
+  }
+  asUint8Array() {
+    const ret = wasm.wasmbuffer_asUint8Array(this.__wbg_ptr);
+    return takeObject(ret);
+  }
+  get byteLength() {
+    const ret = wasm.wasmbuffer_byte_length(this.__wbg_ptr);
+    return ret >>> 0;
+  }
+}
+if (Symbol.dispose)
+  WasmBuffer.prototype[Symbol.dispose] = WasmBuffer.prototype.free;
 function collectNodeFetchTasks(node) {
   try {
     const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
@@ -436,14 +461,18 @@ function __wbg_get_imports() {
       return addHeapObject(ret);
     },
     __wbindgen_cast_0000000000000003: function(arg0, arg1) {
+      const ret = getArrayU8FromWasm0(arg0, arg1);
+      return addHeapObject(ret);
+    },
+    __wbindgen_cast_0000000000000004: function(arg0, arg1) {
       const ret = getStringFromWasm0(arg0, arg1);
       return addHeapObject(ret);
     },
-    __wbindgen_cast_0000000000000004: function(arg0) {
+    __wbindgen_cast_0000000000000005: function(arg0) {
       const ret = BigInt.asUintN(64, arg0);
       return addHeapObject(ret);
     },
-    __wbindgen_cast_0000000000000005: function(arg0, arg1) {
+    __wbindgen_cast_0000000000000006: function(arg0, arg1) {
       var v0 = getArrayJsValueFromWasm0(arg0, arg1).slice();
       wasm.__wbindgen_export4(arg0, arg1 * 4, 4);
       const ret = v0;
@@ -463,6 +492,7 @@ function __wbg_get_imports() {
   };
 }
 var RendererFinalization = typeof FinalizationRegistry === "undefined" ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((ptr) => wasm.__wbg_renderer_free(ptr >>> 0, 1));
+var WasmBufferFinalization = typeof FinalizationRegistry === "undefined" ? { register: () => {}, unregister: () => {} } : new FinalizationRegistry((ptr) => wasm.__wbg_wasmbuffer_free(ptr >>> 0, 1));
 function addHeapObject(obj) {
   if (heap_next === heap.length)
     heap.push(heap.length + 1);

package/pkg/takumi_wasm.d.ts

@@ -126,11 +126,11 @@ export class Renderer {
     /**
      * Renders a node tree into an image buffer.
      */
-    render(node: AnyNode, options?: RenderOptions | null): Uint8Array;
+    render(node: AnyNode, options?: RenderOptions | null): WasmBuffer;
     /**
      * Renders an animation sequence into a buffer.
      */
-    renderAnimation(frames: AnimationFrameSource[], options: RenderAnimationOptions): Uint8Array;
+    renderAnimation(frames: AnimationFrameSource[], options: RenderAnimationOptions): WasmBuffer;
     /**
      * Renders a node tree into a data URL.
      *
@@ -139,6 +139,23 @@ export class Renderer {
     renderAsDataUrl(node: AnyNode, options: RenderOptions): string;
 }
 
+/**
+ * A zero-copy WASM buffer view holder.
+ */
+export class WasmBuffer {
+    private constructor();
+    free(): void;
+    [Symbol.dispose](): void;
+    /**
+     * Returns a Uint8Array view over WASM memory without cloning.
+     */
+    asUint8Array(): Uint8Array;
+    /**
+     * Returns the buffer byte length.
+     */
+    readonly byteLength: number;
+}
+
 /**
  * Collects the fetch task urls from the node.
  * @deprecated Use `extractResourceUrls` instead.
@@ -155,6 +172,7 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 export interface InitOutput {
     readonly memory: WebAssembly.Memory;
     readonly __wbg_renderer_free: (a: number, b: number) => void;
+    readonly __wbg_wasmbuffer_free: (a: number, b: number) => void;
     readonly collectNodeFetchTasks: (a: number, b: number) => void;
     readonly renderer_clearImageStore: (a: number) => void;
     readonly renderer_loadFont: (a: number, b: number, c: number) => void;
@@ -165,6 +183,8 @@ export interface InitOutput {
     readonly renderer_render: (a: number, b: number, c: number, d: number) => void;
     readonly renderer_renderAnimation: (a: number, b: number, c: number, d: number, e: number) => void;
     readonly renderer_renderAsDataUrl: (a: number, b: number, c: number, d: number) => void;
+    readonly wasmbuffer_asUint8Array: (a: number) => number;
+    readonly wasmbuffer_byte_length: (a: number) => number;
     readonly extractResourceUrls: (a: number, b: number) => void;
     readonly __wbindgen_export: (a: number, b: number) => number;
     readonly __wbindgen_export2: (a: number, b: number, c: number, d: number) => number;

package/pkg/takumi_wasm.js

@@ -117,7 +117,7 @@ export class Renderer {
      * Renders a node tree into an image buffer.
      * @param {AnyNode} node
      * @param {RenderOptions | null} [options]
-     * @returns {Uint8Array}
+     * @returns {WasmBuffer}
      */
     render(node, options) {
         try {
@@ -126,13 +126,10 @@ export class Renderer {
             var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
             var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
             var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-            var r3 = getDataViewMemory0().getInt32(retptr + 4 * 3, true);
-            if (r3) {
-                throw takeObject(r2);
+            if (r2) {
+                throw takeObject(r1);
             }
-            var v1 = getArrayU8FromWasm0(r0, r1).slice();
-            wasm.__wbindgen_export4(r0, r1 * 1, 1);
-            return v1;
+            return WasmBuffer.__wrap(r0);
         } finally {
             wasm.__wbindgen_add_to_stack_pointer(16);
         }
@@ -141,7 +138,7 @@ export class Renderer {
      * Renders an animation sequence into a buffer.
      * @param {AnimationFrameSource[]} frames
      * @param {RenderAnimationOptions} options
-     * @returns {Uint8Array}
+     * @returns {WasmBuffer}
      */
     renderAnimation(frames, options) {
         try {
@@ -152,13 +149,10 @@ export class Renderer {
             var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
             var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
             var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
-            var r3 = getDataViewMemory0().getInt32(retptr + 4 * 3, true);
-            if (r3) {
-                throw takeObject(r2);
+            if (r2) {
+                throw takeObject(r1);
             }
-            var v2 = getArrayU8FromWasm0(r0, r1).slice();
-            wasm.__wbindgen_export4(r0, r1 * 1, 1);
-            return v2;
+            return WasmBuffer.__wrap(r0);
         } finally {
             wasm.__wbindgen_add_to_stack_pointer(16);
         }
@@ -198,6 +192,46 @@ export class Renderer {
 }
 if (Symbol.dispose) Renderer.prototype[Symbol.dispose] = Renderer.prototype.free;
 
+/**
+ * A zero-copy WASM buffer view holder.
+ */
+export class WasmBuffer {
+    static __wrap(ptr) {
+        ptr = ptr >>> 0;
+        const obj = Object.create(WasmBuffer.prototype);
+        obj.__wbg_ptr = ptr;
+        WasmBufferFinalization.register(obj, obj.__wbg_ptr, obj);
+        return obj;
+    }
+    __destroy_into_raw() {
+        const ptr = this.__wbg_ptr;
+        this.__wbg_ptr = 0;
+        WasmBufferFinalization.unregister(this);
+        return ptr;
+    }
+    free() {
+        const ptr = this.__destroy_into_raw();
+        wasm.__wbg_wasmbuffer_free(ptr, 0);
+    }
+    /**
+     * Returns a Uint8Array view over WASM memory without cloning.
+     * @returns {Uint8Array}
+     */
+    asUint8Array() {
+        const ret = wasm.wasmbuffer_asUint8Array(this.__wbg_ptr);
+        return takeObject(ret);
+    }
+    /**
+     * Returns the buffer byte length.
+     * @returns {number}
+     */
+    get byteLength() {
+        const ret = wasm.wasmbuffer_byte_length(this.__wbg_ptr);
+        return ret >>> 0;
+    }
+}
+if (Symbol.dispose) WasmBuffer.prototype[Symbol.dispose] = WasmBuffer.prototype.free;
+
 /**
  * Collects the fetch task urls from the node.
  * @deprecated Use `extractResourceUrls` instead.
@@ -455,16 +489,21 @@ function __wbg_get_imports() {
             return addHeapObject(ret);
         },
         __wbindgen_cast_0000000000000003: function(arg0, arg1) {
+            // Cast intrinsic for `Ref(Slice(U8)) -> NamedExternref("Uint8Array")`.
+            const ret = getArrayU8FromWasm0(arg0, arg1);
+            return addHeapObject(ret);
+        },
+        __wbindgen_cast_0000000000000004: function(arg0, arg1) {
             // Cast intrinsic for `Ref(String) -> Externref`.
             const ret = getStringFromWasm0(arg0, arg1);
             return addHeapObject(ret);
         },
-        __wbindgen_cast_0000000000000004: function(arg0) {
+        __wbindgen_cast_0000000000000005: function(arg0) {
             // Cast intrinsic for `U64 -> Externref`.
             const ret = BigInt.asUintN(64, arg0);
             return addHeapObject(ret);
         },
-        __wbindgen_cast_0000000000000005: function(arg0, arg1) {
+        __wbindgen_cast_0000000000000006: function(arg0, arg1) {
             var v0 = getArrayJsValueFromWasm0(arg0, arg1).slice();
             wasm.__wbindgen_export4(arg0, arg1 * 4, 4);
             // Cast intrinsic for `Vector(NamedExternref("AnimationFrameSource")) -> Externref`.
@@ -488,6 +527,9 @@ function __wbg_get_imports() {
 const RendererFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_renderer_free(ptr >>> 0, 1));
+const WasmBufferFinalization = (typeof FinalizationRegistry === 'undefined')
+    ? { register: () => {}, unregister: () => {} }
+    : new FinalizationRegistry(ptr => wasm.__wbg_wasmbuffer_free(ptr >>> 0, 1));
 
 function addHeapObject(obj) {
     if (heap_next === heap.length) heap.push(heap.length + 1);

package/pkg/takumi_wasm_bg.wasm.d.ts

@@ -2,6 +2,7 @@
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
 export const __wbg_renderer_free: (a: number, b: number) => void;
+export const __wbg_wasmbuffer_free: (a: number, b: number) => void;
 export const collectNodeFetchTasks: (a: number, b: number) => void;
 export const renderer_clearImageStore: (a: number) => void;
 export const renderer_loadFont: (a: number, b: number, c: number) => void;
@@ -12,6 +13,8 @@ export const renderer_putPersistentImage: (a: number, b: number, c: number) => v
 export const renderer_render: (a: number, b: number, c: number, d: number) => void;
 export const renderer_renderAnimation: (a: number, b: number, c: number, d: number, e: number) => void;
 export const renderer_renderAsDataUrl: (a: number, b: number, c: number, d: number) => void;
+export const wasmbuffer_asUint8Array: (a: number) => number;
+export const wasmbuffer_byte_length: (a: number) => number;
 export const extractResourceUrls: (a: number, b: number) => void;
 export const __wbindgen_export: (a: number, b: number) => number;
 export const __wbindgen_export2: (a: number, b: number, c: number, d: number) => number;