@takumi-rs/wasm 0.69.5 → 0.70.0

package/package.json

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

package/pkg/takumi_wasm.cjs

@@ -43,7 +43,6 @@ __export(exports_takumi_wasm, {
   extractResourceUrls: () => extractResourceUrls,
   default: () => __wbg_init,
   collectNodeFetchTasks: () => collectNodeFetchTasks,
-  WasmBuffer: () => WasmBuffer,
   Renderer: () => Renderer
 });
 module.exports = __toCommonJS(exports_takumi_wasm);
@@ -98,19 +97,23 @@ class Renderer {
   }
   render(node, options) {
     const ret = wasm.renderer_render(this.__wbg_ptr, node, isLikeNone(options) ? 0 : addToExternrefTable0(options));
-    if (ret[2]) {
-      throw takeFromExternrefTable0(ret[1]);
+    if (ret[3]) {
+      throw takeFromExternrefTable0(ret[2]);
     }
-    return WasmBuffer.__wrap(ret[0]);
+    var v1 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
+    wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
+    return v1;
   }
   renderAnimation(frames, options) {
     const ptr0 = passArrayJsValueToWasm0(frames, wasm.__wbindgen_malloc);
     const len0 = WASM_VECTOR_LEN;
     const ret = wasm.renderer_renderAnimation(this.__wbg_ptr, ptr0, len0, options);
-    if (ret[2]) {
-      throw takeFromExternrefTable0(ret[1]);
+    if (ret[3]) {
+      throw takeFromExternrefTable0(ret[2]);
     }
-    return WasmBuffer.__wrap(ret[0]);
+    var v2 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
+    wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
+    return v2;
   }
   renderAsDataUrl(node, options) {
     let deferred2_0;
@@ -134,36 +137,6 @@ 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 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) {
   const ret = wasm.collectNodeFetchTasks(node);
   if (ret[3]) {
@@ -398,18 +371,14 @@ function __wbg_get_imports() {
       return ret;
     },
     __wbindgen_cast_0000000000000003: function(arg0, arg1) {
-      const ret = getArrayU8FromWasm0(arg0, arg1);
-      return ret;
-    },
-    __wbindgen_cast_0000000000000004: function(arg0, arg1) {
       const ret = getStringFromWasm0(arg0, arg1);
       return ret;
     },
-    __wbindgen_cast_0000000000000005: function(arg0) {
+    __wbindgen_cast_0000000000000004: function(arg0) {
       const ret = BigInt.asUintN(64, arg0);
       return ret;
     },
-    __wbindgen_cast_0000000000000006: function(arg0, arg1) {
+    __wbindgen_cast_0000000000000005: function(arg0, arg1) {
       var v0 = getArrayJsValueFromWasm0(arg0, arg1).slice();
       wasm.__wbindgen_free(arg0, arg1 * 4, 4);
       const ret = v0;
@@ -431,7 +400,6 @@ 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 addToExternrefTable0(obj) {
   const idx = wasm.__externref_table_alloc();
   wasm.__wbindgen_externrefs.set(idx, obj);

package/pkg/takumi_wasm.d.ts

@@ -130,11 +130,11 @@ export class Renderer {
     /**
      * Renders a node tree into an image buffer.
      */
-    render(node: AnyNode, options?: RenderOptions | null): WasmBuffer;
+    render(node: AnyNode, options?: RenderOptions | null): Uint8Array;
     /**
      * Renders an animation sequence into a buffer.
      */
-    renderAnimation(frames: AnimationFrameSource[], options: RenderAnimationOptions): WasmBuffer;
+    renderAnimation(frames: AnimationFrameSource[], options: RenderAnimationOptions): Uint8Array;
     /**
      * Renders a node tree into a data URL.
      *
@@ -143,23 +143,6 @@ 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.
@@ -176,7 +159,6 @@ 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: any) => [number, number, number, number];
     readonly renderer_clearImageStore: (a: number) => void;
     readonly renderer_loadFont: (a: number, b: any) => [number, number];
@@ -184,11 +166,9 @@ export interface InitOutput {
     readonly renderer_measure: (a: number, b: any, c: number) => [number, number, number];
     readonly renderer_new: (a: number) => [number, number, number];
     readonly renderer_putPersistentImage: (a: number, b: any) => [number, number];
-    readonly renderer_render: (a: number, b: any, c: number) => [number, number, number];
-    readonly renderer_renderAnimation: (a: number, b: number, c: number, d: any) => [number, number, number];
+    readonly renderer_render: (a: number, b: any, c: number) => [number, number, number, number];
+    readonly renderer_renderAnimation: (a: number, b: number, c: number, d: any) => [number, number, number, number];
     readonly renderer_renderAsDataUrl: (a: number, b: any, c: any) => [number, number, number, number];
-    readonly wasmbuffer_asUint8Array: (a: number) => any;
-    readonly wasmbuffer_byte_length: (a: number) => number;
     readonly extractResourceUrls: (a: any) => [number, number, number, number];
     readonly __wbindgen_malloc: (a: number, b: number) => number;
     readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;

package/pkg/takumi_wasm.js

@@ -80,29 +80,33 @@ export class Renderer {
      * Renders a node tree into an image buffer.
      * @param {AnyNode} node
      * @param {RenderOptions | null} [options]
-     * @returns {WasmBuffer}
+     * @returns {Uint8Array}
      */
     render(node, options) {
         const ret = wasm.renderer_render(this.__wbg_ptr, node, isLikeNone(options) ? 0 : addToExternrefTable0(options));
-        if (ret[2]) {
-            throw takeFromExternrefTable0(ret[1]);
+        if (ret[3]) {
+            throw takeFromExternrefTable0(ret[2]);
         }
-        return WasmBuffer.__wrap(ret[0]);
+        var v1 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
+        return v1;
     }
     /**
      * Renders an animation sequence into a buffer.
      * @param {AnimationFrameSource[]} frames
      * @param {RenderAnimationOptions} options
-     * @returns {WasmBuffer}
+     * @returns {Uint8Array}
      */
     renderAnimation(frames, options) {
         const ptr0 = passArrayJsValueToWasm0(frames, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
         const ret = wasm.renderer_renderAnimation(this.__wbg_ptr, ptr0, len0, options);
-        if (ret[2]) {
-            throw takeFromExternrefTable0(ret[1]);
+        if (ret[3]) {
+            throw takeFromExternrefTable0(ret[2]);
         }
-        return WasmBuffer.__wrap(ret[0]);
+        var v2 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
+        return v2;
     }
     /**
      * Renders a node tree into a data URL.
@@ -133,46 +137,6 @@ 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 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.
@@ -416,21 +380,16 @@ function __wbg_get_imports() {
             return ret;
         },
         __wbindgen_cast_0000000000000003: function(arg0, arg1) {
-            // Cast intrinsic for `Ref(Slice(U8)) -> NamedExternref("Uint8Array")`.
-            const ret = getArrayU8FromWasm0(arg0, arg1);
-            return ret;
-        },
-        __wbindgen_cast_0000000000000004: function(arg0, arg1) {
             // Cast intrinsic for `Ref(String) -> Externref`.
             const ret = getStringFromWasm0(arg0, arg1);
             return ret;
         },
-        __wbindgen_cast_0000000000000005: function(arg0) {
+        __wbindgen_cast_0000000000000004: function(arg0) {
             // Cast intrinsic for `U64 -> Externref`.
             const ret = BigInt.asUintN(64, arg0);
             return ret;
         },
-        __wbindgen_cast_0000000000000006: function(arg0, arg1) {
+        __wbindgen_cast_0000000000000005: function(arg0, arg1) {
             var v0 = getArrayJsValueFromWasm0(arg0, arg1).slice();
             wasm.__wbindgen_free(arg0, arg1 * 4, 4);
             // Cast intrinsic for `Vector(NamedExternref("AnimationFrameSource")) -> Externref`.
@@ -456,9 +415,6 @@ 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 addToExternrefTable0(obj) {
     const idx = wasm.__externref_table_alloc();

package/pkg/takumi_wasm_bg.wasm.d.ts

@@ -2,7 +2,6 @@
 /* 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: any) => [number, number, number, number];
 export const renderer_clearImageStore: (a: number) => void;
 export const renderer_loadFont: (a: number, b: any) => [number, number];
@@ -10,11 +9,9 @@ export const renderer_loadFontWithInfo: (a: number, b: any) => [number, number];
 export const renderer_measure: (a: number, b: any, c: number) => [number, number, number];
 export const renderer_new: (a: number) => [number, number, number];
 export const renderer_putPersistentImage: (a: number, b: any) => [number, number];
-export const renderer_render: (a: number, b: any, c: number) => [number, number, number];
-export const renderer_renderAnimation: (a: number, b: number, c: number, d: any) => [number, number, number];
+export const renderer_render: (a: number, b: any, c: number) => [number, number, number, number];
+export const renderer_renderAnimation: (a: number, b: number, c: number, d: any) => [number, number, number, number];
 export const renderer_renderAsDataUrl: (a: number, b: any, c: any) => [number, number, number, number];
-export const wasmbuffer_asUint8Array: (a: number) => any;
-export const wasmbuffer_byte_length: (a: number) => number;
 export const extractResourceUrls: (a: any) => [number, number, number, number];
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;