@takumi-rs/wasm 0.36.2 → 0.38.0

package/package.json

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

package/pkg/takumi_wasm.d.ts

@@ -1,17 +1,35 @@
 /* tslint:disable */
 /* eslint-disable */
-type AnimationOutputFormat = "webp" | "apng";
-/**
- * Proxy type for the ImageOutputFormat enum.
- * This is needed because wasm-bindgen doesn't support cfg macro in enum variants.
- * https://github.com/erwanvivien/fast_qr/pull/41/files
- */
-type ImageOutputFormat = "webp" | "png" | "jpeg";
+export function collectNodeFetchTasks(node: AnyNode): string[];
 
-export interface AnyNode {
-  type: string;
-  [key: string]: any;
-}
+export type AnyNode = { type: string; [key: string]: any };
+
+export type ByteBuf = Uint8Array | ArrayBuffer | Buffer;
+
+export type RenderOptions = {
+  width: number,
+  height: number,
+  format?: "png" | "jpeg" | "webp",
+  quality?: number,
+  fetchedResources?: Map<string, ByteBuf>,
+  drawDebugBorder?: boolean,
+};
+
+export type RenderAnimationOptions = {
+  width: number,
+  height: number,
+  format?: "webp" | "apng",
+  drawDebugBorder?: boolean,
+};
+
+export type FontDetails = {
+  name?: string,
+  data: ByteBuf,
+  weight?: number,
+  style?: "normal" | "italic" | "oblique",
+};
+
+export type Font = FontDetails | ByteBuf;
 
 
 export class AnimationFrameSource {
@@ -19,46 +37,45 @@ export class AnimationFrameSource {
   [Symbol.dispose](): void;
   constructor(node: AnyNode, durationMs: number);
 }
-export class FontInfo {
-  private constructor();
-  free(): void;
-  [Symbol.dispose](): void;
-}
 export class Renderer {
   free(): void;
   [Symbol.dispose](): void;
   constructor();
-  loadFontWithInfo(fontData: FontInfo): void;
-  loadFont(buffer: Uint8Array): void;
+  /**
+   * @deprecated use `loadFont` instead.
+   */
+  loadFontWithInfo(font: Font): void;
+  loadFont(font: Font): void;
   putPersistentImage(src: string, data: Uint8Array): void;
   clearImageStore(): void;
-  render(node: AnyNode, width: number, height: number, format?: ImageOutputFormat | null, quality?: number | null, drawDebugBorder?: boolean | null): Uint8Array;
-  renderAsDataUrl(node: AnyNode, width: number, height: number, format?: ImageOutputFormat | null, quality?: number | null, drawDebugBorder?: boolean | null): string;
-  renderAnimation(frames: AnimationFrameSource[], width: number, height: number, format?: AnimationOutputFormat | null, drawDebugBorder?: boolean | null): Uint8Array;
+  render(node: AnyNode, options: RenderOptions): Uint8Array;
+  renderAsDataUrl(node: AnyNode, options: RenderOptions): string;
+  renderAnimation(frames: AnimationFrameSource[], options: RenderAnimationOptions): Uint8Array;
 }
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
-  readonly __wbg_fontinfo_free: (a: number, b: number) => void;
   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 renderer_loadFontWithInfo: (a: number, b: number) => void;
-  readonly renderer_loadFont: (a: number, b: number, c: number) => void;
+  readonly renderer_loadFont: (a: number, b: any) => void;
   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: number, d: number, e: number, f: number, g: number) => [number, number];
-  readonly renderer_renderAsDataUrl: (a: number, b: any, c: number, d: number, e: number, f: number, g: number) => [number, number];
-  readonly renderer_renderAnimation: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => [number, number];
+  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_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;
   readonly __wbindgen_exn_store: (a: number) => void;
   readonly __externref_table_alloc: () => number;
   readonly __wbindgen_export_4: WebAssembly.Table;
   readonly __wbindgen_free: (a: number, b: number, c: number) => void;
+  readonly __externref_drop_slice: (a: number, b: number) => void;
   readonly __wbindgen_start: () => void;
 }
 

package/pkg/takumi_wasm.js

@@ -182,12 +182,6 @@ function debugString(val) {
     return className;
 }
 
-function _assertClass(instance, klass) {
-    if (!(instance instanceof klass)) {
-        throw new Error(`expected instance of ${klass.name}`);
-    }
-}
-
 function passArray8ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 1, 1) >>> 0;
     getUint8ArrayMemory0().set(arg, ptr / 1);
@@ -205,9 +199,26 @@ function passArrayJsValueToWasm0(array, malloc) {
     return ptr;
 }
 
-const __wbindgen_enum_AnimationOutputFormat = ["webp", "apng"];
-
-const __wbindgen_enum_ImageOutputFormat = ["webp", "png", "jpeg"];
+function getArrayJsValueFromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    const mem = getDataViewMemory0();
+    const result = [];
+    for (let i = ptr; i < ptr + 4 * len; i += 4) {
+        result.push(wasm.__wbindgen_export_4.get(mem.getUint32(i, true)));
+    }
+    wasm.__externref_drop_slice(ptr, len);
+    return result;
+}
+/**
+ * @param {AnyNode} node
+ * @returns {string[]}
+ */
+export function collectNodeFetchTasks(node) {
+    const ret = wasm.collectNodeFetchTasks(node);
+    var v1 = getArrayJsValueFromWasm0(ret[0], ret[1]).slice();
+    wasm.__wbindgen_free(ret[0], ret[1] * 4, 4);
+    return v1;
+}
 
 const AnimationFrameSourceFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
@@ -246,26 +257,6 @@ export class AnimationFrameSource {
 }
 if (Symbol.dispose) AnimationFrameSource.prototype[Symbol.dispose] = AnimationFrameSource.prototype.free;
 
-const FontInfoFinalization = (typeof FinalizationRegistry === 'undefined')
-    ? { register: () => {}, unregister: () => {} }
-    : new FinalizationRegistry(ptr => wasm.__wbg_fontinfo_free(ptr >>> 0, 1));
-
-export class FontInfo {
-
-    __destroy_into_raw() {
-        const ptr = this.__wbg_ptr;
-        this.__wbg_ptr = 0;
-        FontInfoFinalization.unregister(this);
-        return ptr;
-    }
-
-    free() {
-        const ptr = this.__destroy_into_raw();
-        wasm.__wbg_fontinfo_free(ptr, 0);
-    }
-}
-if (Symbol.dispose) FontInfo.prototype[Symbol.dispose] = FontInfo.prototype.free;
-
 const RendererFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
     : new FinalizationRegistry(ptr => wasm.__wbg_renderer_free(ptr >>> 0, 1));
@@ -290,20 +281,17 @@ export class Renderer {
         return this;
     }
     /**
-     * @param {FontInfo} fontData
+     * @deprecated use `loadFont` instead.
+     * @param {Font} font
      */
-    loadFontWithInfo(fontData) {
-        _assertClass(fontData, FontInfo);
-        var ptr0 = fontData.__destroy_into_raw();
-        wasm.renderer_loadFontWithInfo(this.__wbg_ptr, ptr0);
+    loadFontWithInfo(font) {
+        wasm.renderer_loadFontWithInfo(this.__wbg_ptr, font);
     }
     /**
-     * @param {Uint8Array} buffer
+     * @param {Font} font
      */
-    loadFont(buffer) {
-        const ptr0 = passArray8ToWasm0(buffer, wasm.__wbindgen_malloc);
-        const len0 = WASM_VECTOR_LEN;
-        wasm.renderer_loadFont(this.__wbg_ptr, ptr0, len0);
+    loadFont(font) {
+        wasm.renderer_loadFont(this.__wbg_ptr, font);
     }
     /**
      * @param {string} src
@@ -321,33 +309,25 @@ export class Renderer {
     }
     /**
      * @param {AnyNode} node
-     * @param {number} width
-     * @param {number} height
-     * @param {ImageOutputFormat | null} [format]
-     * @param {number | null} [quality]
-     * @param {boolean | null} [drawDebugBorder]
+     * @param {RenderOptions} options
      * @returns {Uint8Array}
      */
-    render(node, width, height, format, quality, drawDebugBorder) {
-        const ret = wasm.renderer_render(this.__wbg_ptr, node, width, height, isLikeNone(format) ? 4 : ((__wbindgen_enum_ImageOutputFormat.indexOf(format) + 1 || 4) - 1), isLikeNone(quality) ? 0xFFFFFF : quality, isLikeNone(drawDebugBorder) ? 0xFFFFFF : drawDebugBorder ? 1 : 0);
+    render(node, options) {
+        const ret = wasm.renderer_render(this.__wbg_ptr, node, options);
         var v1 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
         wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
         return v1;
     }
     /**
      * @param {AnyNode} node
-     * @param {number} width
-     * @param {number} height
-     * @param {ImageOutputFormat | null} [format]
-     * @param {number | null} [quality]
-     * @param {boolean | null} [drawDebugBorder]
+     * @param {RenderOptions} options
      * @returns {string}
      */
-    renderAsDataUrl(node, width, height, format, quality, drawDebugBorder) {
+    renderAsDataUrl(node, options) {
         let deferred1_0;
         let deferred1_1;
         try {
-            const ret = wasm.renderer_renderAsDataUrl(this.__wbg_ptr, node, width, height, isLikeNone(format) ? 4 : ((__wbindgen_enum_ImageOutputFormat.indexOf(format) + 1 || 4) - 1), isLikeNone(quality) ? 0xFFFFFF : quality, isLikeNone(drawDebugBorder) ? 0xFFFFFF : drawDebugBorder ? 1 : 0);
+            const ret = wasm.renderer_renderAsDataUrl(this.__wbg_ptr, node, options);
             deferred1_0 = ret[0];
             deferred1_1 = ret[1];
             return getStringFromWasm0(ret[0], ret[1]);
@@ -357,16 +337,13 @@ export class Renderer {
     }
     /**
      * @param {AnimationFrameSource[]} frames
-     * @param {number} width
-     * @param {number} height
-     * @param {AnimationOutputFormat | null} [format]
-     * @param {boolean | null} [drawDebugBorder]
+     * @param {RenderAnimationOptions} options
      * @returns {Uint8Array}
      */
-    renderAnimation(frames, width, height, format, drawDebugBorder) {
+    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, width, height, isLikeNone(format) ? 3 : ((__wbindgen_enum_AnimationOutputFormat.indexOf(format) + 1 || 3) - 1), isLikeNone(drawDebugBorder) ? 0xFFFFFF : drawDebugBorder ? 1 : 0);
+        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;
@@ -416,6 +393,10 @@ function __wbg_get_imports() {
         const ret = Error(getStringFromWasm0(arg0, arg1));
         return ret;
     };
+    imports.wbg.__wbg_Number_998bea33bd87c3e0 = function(arg0) {
+        const ret = Number(arg0);
+        return ret;
+    };
     imports.wbg.__wbg_String_8f0eb39a4a4c2f66 = function(arg0, arg1) {
         const ret = String(arg1);
         const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -439,6 +420,17 @@ function __wbg_get_imports() {
         const ret = Object.entries(arg0);
         return ret;
     };
+    imports.wbg.__wbg_error_a49d63f573cdc73c = function(arg0, arg1) {
+        let deferred0_0;
+        let deferred0_1;
+        try {
+            deferred0_0 = arg0;
+            deferred0_1 = arg1;
+            console.error(getStringFromWasm0(arg0, arg1));
+        } finally {
+            wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
+        }
+    };
     imports.wbg.__wbg_get_0da715ceaecea5c8 = function(arg0, arg1) {
         const ret = arg0[arg1 >>> 0];
         return ret;
@@ -447,6 +439,10 @@ function __wbg_get_imports() {
         const ret = Reflect.get(arg0, arg1);
         return ret;
     }, arguments) };
+    imports.wbg.__wbg_getwithrefkey_1dc361bd10053bfe = function(arg0, arg1) {
+        const ret = arg0[arg1];
+        return ret;
+    };
     imports.wbg.__wbg_instanceof_ArrayBuffer_67f3012529f6a2dd = function(arg0) {
         let result;
         try {
@@ -551,6 +547,14 @@ function __wbg_get_imports() {
         const ret = typeof(val) === 'object' && val !== null;
         return ret;
     };
+    imports.wbg.__wbg_wbindgenisstring_d4fa939789f003b0 = function(arg0) {
+        const ret = typeof(arg0) === 'string';
+        return ret;
+    };
+    imports.wbg.__wbg_wbindgenisundefined_c4b71d073b92f3c5 = function(arg0) {
+        const ret = arg0 === undefined;
+        return ret;
+    };
     imports.wbg.__wbg_wbindgenjsvaleq_e6f2ad59ccae1b58 = function(arg0, arg1) {
         const ret = arg0 === arg1;
         return ret;
@@ -576,6 +580,11 @@ function __wbg_get_imports() {
     imports.wbg.__wbg_wbindgenthrow_451ec1a8469d7eb6 = function(arg0, arg1) {
         throw new Error(getStringFromWasm0(arg0, arg1));
     };
+    imports.wbg.__wbindgen_cast_2241b6af4c4b2941 = function(arg0, arg1) {
+        // Cast intrinsic for `Ref(String) -> Externref`.
+        const ret = getStringFromWasm0(arg0, arg1);
+        return ret;
+    };
     imports.wbg.__wbindgen_cast_4625c577ab2ec9ee = function(arg0) {
         // Cast intrinsic for `U64 -> Externref`.
         const ret = BigInt.asUintN(64, arg0);

package/pkg/takumi_wasm_bg.wasm.d.ts

@@ -1,22 +1,23 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export const __wbg_fontinfo_free: (a: number, b: number) => void;
 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 renderer_loadFontWithInfo: (a: number, b: number) => void;
-export const renderer_loadFont: (a: number, b: number, c: number) => void;
+export const renderer_loadFont: (a: number, b: any) => void;
 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: number, d: number, e: number, f: number, g: number) => [number, number];
-export const renderer_renderAsDataUrl: (a: number, b: any, c: number, d: number, e: number, f: number, g: number) => [number, number];
-export const renderer_renderAnimation: (a: number, b: number, c: number, d: number, e: number, f: number, g: number) => [number, number];
+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_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;
 export const __wbindgen_exn_store: (a: number) => void;
 export const __externref_table_alloc: () => number;
 export const __wbindgen_export_4: WebAssembly.Table;
 export const __wbindgen_free: (a: number, b: number, c: number) => void;
+export const __externref_drop_slice: (a: number, b: number) => void;
 export const __wbindgen_start: () => void;