@takumi-rs/wasm 0.63.2 → 0.64.0

package/package.json

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

package/pkg/takumi_wasm.d.ts

@@ -26,7 +26,7 @@ export type RenderOptions = {
     /**
      * The resources fetched externally. You should collect the fetch tasks first using `extractResourceUrls` and then pass the resources here.
      */
-    fetchedResources?: Map<string, ByteBuf>,
+    fetchedResources?: ImageSource[],
     /**
      * Whether to draw debug borders.
      */
@@ -52,6 +52,11 @@ export type FontDetails = {
     style?: "normal" | "italic" | "oblique",
 };
 
+export type ImageSource = {
+    src: string,
+    data: ByteBuf,
+};
+
 export type Font = FontDetails | ByteBuf;
 
 
@@ -72,7 +77,7 @@ export class Renderer {
      */
     loadFontWithInfo(font: Font): void;
     constructor();
-    putPersistentImage(src: string, data: Uint8Array): void;
+    putPersistentImage(data: ImageSource): void;
     render(node: AnyNode, options?: RenderOptions | null): Uint8Array;
     renderAnimation(frames: AnimationFrameSource[], options: RenderAnimationOptions): Uint8Array;
     renderAsDataUrl(node: AnyNode, options: RenderOptions): string;
@@ -101,7 +106,7 @@ export interface InitOutput {
     readonly renderer_loadFont: (a: number, b: number, c: number) => void;
     readonly renderer_loadFontWithInfo: (a: number, b: number, c: number) => void;
     readonly renderer_new: () => number;
-    readonly renderer_putPersistentImage: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
+    readonly renderer_putPersistentImage: (a: number, b: number, c: number) => void;
     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;

package/pkg/takumi_wasm.js

@@ -84,17 +84,12 @@ export class Renderer {
         return this;
     }
     /**
-     * @param {string} src
-     * @param {Uint8Array} data
+     * @param {ImageSource} data
      */
-    putPersistentImage(src, data) {
+    putPersistentImage(data) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-            const ptr0 = passStringToWasm0(src, wasm.__wbindgen_export, wasm.__wbindgen_export2);
-            const len0 = WASM_VECTOR_LEN;
-            const ptr1 = passArray8ToWasm0(data, wasm.__wbindgen_export);
-            const len1 = WASM_VECTOR_LEN;
-            wasm.renderer_putPersistentImage(retptr, this.__wbg_ptr, ptr0, len0, ptr1, len1);
+            wasm.renderer_putPersistentImage(retptr, this.__wbg_ptr, addHeapObject(data));
             var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
             var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
             if (r1) {
@@ -591,13 +586,6 @@ function isLikeNone(x) {
     return x === undefined || x === null;
 }
 
-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;
     const mem = getDataViewMemory0();

package/pkg/takumi_wasm_bg.wasm.d.ts

@@ -9,7 +9,7 @@ export const renderer_clearImageStore: (a: number) => void;
 export const renderer_loadFont: (a: number, b: number, c: number) => void;
 export const renderer_loadFontWithInfo: (a: number, b: number, c: number) => void;
 export const renderer_new: () => number;
-export const renderer_putPersistentImage: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
+export const renderer_putPersistentImage: (a: number, b: number, c: number) => void;
 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;