@takumi-rs/wasm 0.40.1 → 0.41.0

package/package.json

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

package/pkg/takumi_wasm.d.ts

@@ -40,17 +40,17 @@ export class AnimationFrameSource {
 export class Renderer {
   free(): void;
   [Symbol.dispose](): void;
-  constructor();
+  renderAnimation(frames: AnimationFrameSource[], options: RenderAnimationOptions): Uint8Array;
+  clearImageStore(): void;
+  renderAsDataUrl(node: AnyNode, options: RenderOptions): string;
   /**
    * @deprecated use `loadFont` instead.
    */
   loadFontWithInfo(font: Font): void;
-  loadFont(font: Font): void;
   putPersistentImage(src: string, data: Uint8Array): void;
-  clearImageStore(): void;
+  constructor();
   render(node: AnyNode, options: RenderOptions): Uint8Array;
-  renderAsDataUrl(node: AnyNode, options: RenderOptions): string;
-  renderAnimation(frames: AnimationFrameSource[], options: RenderAnimationOptions): Uint8Array;
+  loadFont(font: Font): void;
 }
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
@@ -58,16 +58,16 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
   readonly __wbg_animationframesource_free: (a: number, b: number) => void;
-  readonly animationframesource_new: (a: any, b: number) => number;
   readonly __wbg_renderer_free: (a: number, b: number) => void;
-  readonly renderer_new: () => number;
+  readonly animationframesource_new: (a: any, b: number) => number;
+  readonly collectNodeFetchTasks: (a: any) => [number, number];
+  readonly renderer_clearImageStore: (a: number) => void;
   readonly renderer_loadFont: (a: number, b: any) => void;
+  readonly renderer_new: () => number;
   readonly renderer_putPersistentImage: (a: number, b: number, c: number, d: number, e: number) => void;
-  readonly renderer_clearImageStore: (a: number) => void;
   readonly renderer_render: (a: number, b: any, c: any) => [number, number];
-  readonly renderer_renderAsDataUrl: (a: number, b: any, c: any) => [number, number];
   readonly renderer_renderAnimation: (a: number, b: number, c: number, d: any) => [number, number];
-  readonly collectNodeFetchTasks: (a: any) => [number, number];
+  readonly renderer_renderAsDataUrl: (a: number, b: any, c: any) => [number, number];
   readonly renderer_loadFontWithInfo: (a: number, b: any) => void;
   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

@@ -182,23 +182,6 @@ function getArrayU8FromWasm0(ptr, len) {
     return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
 }
 
-function passArray8ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 1, 1) >>> 0;
-    getUint8ArrayMemory0().set(arg, ptr / 1);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
-
-function passArrayJsValueToWasm0(array, malloc) {
-    const ptr = malloc(array.length * 4, 4) >>> 0;
-    for (let i = 0; i < array.length; i++) {
-        const add = addToExternrefTable0(array[i]);
-        getDataViewMemory0().setUint32(ptr + 4 * i, add, true);
-    }
-    WASM_VECTOR_LEN = array.length;
-    return ptr;
-}
-
 function getArrayJsValueFromWasm0(ptr, len) {
     ptr = ptr >>> 0;
     const mem = getDataViewMemory0();
@@ -220,6 +203,23 @@ export function collectNodeFetchTasks(node) {
     return v1;
 }
 
+function passArrayJsValueToWasm0(array, malloc) {
+    const ptr = malloc(array.length * 4, 4) >>> 0;
+    for (let i = 0; i < array.length; i++) {
+        const add = addToExternrefTable0(array[i]);
+        getDataViewMemory0().setUint32(ptr + 4 * i, add, true);
+    }
+    WASM_VECTOR_LEN = array.length;
+    return ptr;
+}
+
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1, 1) >>> 0;
+    getUint8ArrayMemory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
 const AnimationFrameSourceFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_animationframesource_free(ptr >>> 0, 1));
@@ -274,24 +274,45 @@ export class Renderer {
         const ptr = this.__destroy_into_raw();
         wasm.__wbg_renderer_free(ptr, 0);
     }
-    constructor() {
-        const ret = wasm.renderer_new();
-        this.__wbg_ptr = ret >>> 0;
-        RendererFinalization.register(this, this.__wbg_ptr, this);
-        return this;
+    /**
+     * @param {AnimationFrameSource[]} frames
+     * @param {RenderAnimationOptions} options
+     * @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);
+        var v2 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
+        return v2;
+    }
+    clearImageStore() {
+        wasm.renderer_clearImageStore(this.__wbg_ptr);
     }
     /**
-     * @deprecated use `loadFont` instead.
-     * @param {Font} font
+     * @param {AnyNode} node
+     * @param {RenderOptions} options
+     * @returns {string}
      */
-    loadFontWithInfo(font) {
-        wasm.renderer_loadFontWithInfo(this.__wbg_ptr, font);
+    renderAsDataUrl(node, options) {
+        let deferred1_0;
+        let deferred1_1;
+        try {
+            const ret = wasm.renderer_renderAsDataUrl(this.__wbg_ptr, node, options);
+            deferred1_0 = ret[0];
+            deferred1_1 = ret[1];
+            return getStringFromWasm0(ret[0], ret[1]);
+        } finally {
+            wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
+        }
     }
     /**
+     * @deprecated use `loadFont` instead.
      * @param {Font} font
      */
-    loadFont(font) {
-        wasm.renderer_loadFont(this.__wbg_ptr, font);
+    loadFontWithInfo(font) {
+        wasm.renderer_loadFontWithInfo(this.__wbg_ptr, font);
     }
     /**
      * @param {string} src
@@ -304,8 +325,11 @@ export class Renderer {
         const len1 = WASM_VECTOR_LEN;
         wasm.renderer_putPersistentImage(this.__wbg_ptr, ptr0, len0, ptr1, len1);
     }
-    clearImageStore() {
-        wasm.renderer_clearImageStore(this.__wbg_ptr);
+    constructor() {
+        const ret = wasm.renderer_new();
+        this.__wbg_ptr = ret >>> 0;
+        RendererFinalization.register(this, this.__wbg_ptr, this);
+        return this;
     }
     /**
      * @param {AnyNode} node
@@ -319,34 +343,10 @@ export class Renderer {
         return v1;
     }
     /**
-     * @param {AnyNode} node
-     * @param {RenderOptions} options
-     * @returns {string}
-     */
-    renderAsDataUrl(node, options) {
-        let deferred1_0;
-        let deferred1_1;
-        try {
-            const ret = wasm.renderer_renderAsDataUrl(this.__wbg_ptr, node, options);
-            deferred1_0 = ret[0];
-            deferred1_1 = ret[1];
-            return getStringFromWasm0(ret[0], ret[1]);
-        } finally {
-            wasm.__wbindgen_free(deferred1_0, deferred1_1, 1);
-        }
-    }
-    /**
-     * @param {AnimationFrameSource[]} frames
-     * @param {RenderAnimationOptions} options
-     * @returns {Uint8Array}
+     * @param {Font} font
      */
-    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);
-        var v2 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
-        wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
-        return v2;
+    loadFont(font) {
+        wasm.renderer_loadFont(this.__wbg_ptr, font);
     }
 }
 if (Symbol.dispose) Renderer.prototype[Symbol.dispose] = Renderer.prototype.free;

package/pkg/takumi_wasm_bg.wasm.d.ts

@@ -2,16 +2,16 @@
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
 export const __wbg_animationframesource_free: (a: number, b: number) => void;
-export const animationframesource_new: (a: any, b: number) => number;
 export const __wbg_renderer_free: (a: number, b: number) => void;
-export const renderer_new: () => number;
+export const animationframesource_new: (a: any, b: number) => number;
+export const collectNodeFetchTasks: (a: any) => [number, number];
+export const renderer_clearImageStore: (a: number) => void;
 export const renderer_loadFont: (a: number, b: any) => void;
+export const renderer_new: () => number;
 export const renderer_putPersistentImage: (a: number, b: number, c: number, d: number, e: number) => void;
-export const renderer_clearImageStore: (a: number) => void;
 export const renderer_render: (a: number, b: any, c: any) => [number, number];
-export const renderer_renderAsDataUrl: (a: number, b: any, c: any) => [number, number];
 export const renderer_renderAnimation: (a: number, b: number, c: number, d: any) => [number, number];
-export const collectNodeFetchTasks: (a: any) => [number, number];
+export const renderer_renderAsDataUrl: (a: number, b: any, c: any) => [number, number];
 export const renderer_loadFontWithInfo: (a: number, b: any) => void;
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;