@takumi-rs/wasm 0.28.4 → 0.29.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takumi-rs/wasm",
-  "version": "0.28.4",
+  "version": "0.29.0",
   "scripts": {
     "build": "wasm-pack build --no-pack --release --out-dir pkg --target web"
   },

package/pkg/takumi_wasm.d.ts

@@ -5,11 +5,7 @@
  * This is needed because wasm-bindgen doesn't support cfg macro in enum variants.
  * https://github.com/erwanvivien/fast_qr/pull/41/files
  */
-export enum ImageOutputFormat {
-  WebP = 0,
-  Png = 1,
-  Jpeg = 2,
-}
+type ImageOutputFormat = "webp" | "png" | "jpeg";
 
 export interface AnyNode {
   type: string;
@@ -17,10 +13,15 @@ export interface AnyNode {
 }
 
 
+export class FontInfo {
+  private constructor();
+  free(): void;
+}
 export class Renderer {
   free(): void;
   constructor(debug?: boolean | null);
-  loadFont(font_data: Uint8Array): void;
+  loadFontWithInfo(font_data: FontInfo): void;
+  loadFont(buffer: Uint8Array): void;
   putPersistentImage(src: string, data: Uint8Array): void;
   clearImageStore(): void;
   render(node: AnyNode, width: number, height: number, format?: ImageOutputFormat | null, quality?: number | null): Uint8Array;
@@ -31,8 +32,10 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
+  readonly __wbg_fontinfo_free: (a: number, b: number) => void;
   readonly __wbg_renderer_free: (a: number, b: number) => void;
   readonly renderer_new: (a: number) => number;
+  readonly renderer_loadFontWithInfo: (a: number, b: number) => void;
   readonly renderer_loadFont: (a: number, b: number, c: number) => void;
   readonly renderer_putPersistentImage: (a: number, b: number, c: number, d: number, e: number) => void;
   readonly renderer_clearImageStore: (a: number) => void;

package/pkg/takumi_wasm.js

@@ -1,5 +1,35 @@
 let wasm;
 
+let cachedUint8ArrayMemory0 = null;
+
+function getUint8ArrayMemory0() {
+    if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) {
+        cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer);
+    }
+    return cachedUint8ArrayMemory0;
+}
+
+let cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } );
+
+if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); };
+
+const MAX_SAFARI_DECODE_BYTES = 2146435072;
+let numBytesDecoded = 0;
+function decodeText(ptr, len) {
+    numBytesDecoded += len;
+    if (numBytesDecoded >= MAX_SAFARI_DECODE_BYTES) {
+        cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } );
+        cachedTextDecoder.decode();
+        numBytesDecoded = len;
+    }
+    return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
+}
+
+function getStringFromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return decodeText(ptr, len);
+}
+
 function addToExternrefTable0(obj) {
     const idx = wasm.__externref_table_alloc();
     wasm.__wbindgen_export_2.set(idx, obj);
@@ -95,15 +125,6 @@ function debugString(val) {
 
 let WASM_VECTOR_LEN = 0;
 
-let cachedUint8ArrayMemory0 = null;
-
-function getUint8ArrayMemory0() {
-    if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) {
-        cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer);
-    }
-    return cachedUint8ArrayMemory0;
-}
-
 const cachedTextEncoder = (typeof TextEncoder !== 'undefined' ? new TextEncoder('utf-8') : { encode: () => { throw Error('TextEncoder not available') } } );
 
 const encodeString = (typeof cachedTextEncoder.encodeInto === 'function'
@@ -158,13 +179,10 @@ function passStringToWasm0(arg, malloc, realloc) {
     return ptr;
 }
 
-const cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } );
-
-if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); };
-
-function getStringFromWasm0(ptr, len) {
-    ptr = ptr >>> 0;
-    return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
+function _assertClass(instance, klass) {
+    if (!(instance instanceof klass)) {
+        throw new Error(`expected instance of ${klass.name}`);
+    }
 }
 
 function passArray8ToWasm0(arg, malloc) {
@@ -178,17 +196,27 @@ function getArrayU8FromWasm0(ptr, len) {
     ptr = ptr >>> 0;
     return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
 }
-/**
- * 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
- * @enum {0 | 1 | 2}
- */
-export const ImageOutputFormat = Object.freeze({
-    WebP: 0, "0": "WebP",
-    Png: 1, "1": "Png",
-    Jpeg: 2, "2": "Jpeg",
-});
+
+const __wbindgen_enum_ImageOutputFormat = ["webp", "png", "jpeg"];
+
+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);
+    }
+}
 
 const RendererFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
@@ -217,10 +245,18 @@ export class Renderer {
         return this;
     }
     /**
-     * @param {Uint8Array} font_data
+     * @param {FontInfo} font_data
      */
-    loadFont(font_data) {
-        const ptr0 = passArray8ToWasm0(font_data, wasm.__wbindgen_malloc);
+    loadFontWithInfo(font_data) {
+        _assertClass(font_data, FontInfo);
+        var ptr0 = font_data.__destroy_into_raw();
+        wasm.renderer_loadFontWithInfo(this.__wbg_ptr, ptr0);
+    }
+    /**
+     * @param {Uint8Array} buffer
+     */
+    loadFont(buffer) {
+        const ptr0 = passArray8ToWasm0(buffer, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
         wasm.renderer_loadFont(this.__wbg_ptr, ptr0, len0);
     }
@@ -247,7 +283,7 @@ export class Renderer {
      * @returns {Uint8Array}
      */
     render(node, width, height, format, quality) {
-        const ret = wasm.renderer_render(this.__wbg_ptr, node, width, height, isLikeNone(format) ? 3 : format, isLikeNone(quality) ? 0xFFFFFF : quality);
+        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);
         var v1 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
         wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
         return v1;
@@ -264,7 +300,7 @@ export class Renderer {
         let deferred1_0;
         let deferred1_1;
         try {
-            const ret = wasm.renderer_renderAsDataUrl(this.__wbg_ptr, node, width, height, isLikeNone(format) ? 3 : format, isLikeNone(quality) ? 0xFFFFFF : quality);
+            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);
             deferred1_0 = ret[0];
             deferred1_1 = ret[1];
             return getStringFromWasm0(ret[0], ret[1]);
@@ -274,6 +310,8 @@ export class Renderer {
     }
 }
 
+const EXPECTED_RESPONSE_TYPES = new Set(['basic', 'cors', 'default']);
+
 async function __wbg_load(module, imports) {
     if (typeof Response === 'function' && module instanceof Response) {
         if (typeof WebAssembly.instantiateStreaming === 'function') {
@@ -281,7 +319,9 @@ async function __wbg_load(module, imports) {
                 return await WebAssembly.instantiateStreaming(module, imports);
 
             } catch (e) {
-                if (module.headers.get('Content-Type') != 'application/wasm') {
+                const validResponse = module.ok && EXPECTED_RESPONSE_TYPES.has(module.type);
+
+                if (validResponse && module.headers.get('Content-Type') !== 'application/wasm') {
                     console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve Wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
 
                 } else {
@@ -308,31 +348,35 @@ async function __wbg_load(module, imports) {
 function __wbg_get_imports() {
     const imports = {};
     imports.wbg = {};
-    imports.wbg.__wbg_buffer_609cc3eee51ed158 = function(arg0) {
+    imports.wbg.__wbg_Error_0497d5bdba9362e5 = function(arg0, arg1) {
+        const ret = Error(getStringFromWasm0(arg0, arg1));
+        return ret;
+    };
+    imports.wbg.__wbg_buffer_a1a27a0dfa70165d = function(arg0) {
         const ret = arg0.buffer;
         return ret;
     };
-    imports.wbg.__wbg_call_672a4d21634d4a24 = function() { return handleError(function (arg0, arg1) {
+    imports.wbg.__wbg_call_fbe8be8bf6436ce5 = function() { return handleError(function (arg0, arg1) {
         const ret = arg0.call(arg1);
         return ret;
     }, arguments) };
-    imports.wbg.__wbg_done_769e5ede4b31c67b = function(arg0) {
+    imports.wbg.__wbg_done_4d01f352bade43b7 = function(arg0) {
         const ret = arg0.done;
         return ret;
     };
-    imports.wbg.__wbg_entries_3265d4158b33e5dc = function(arg0) {
+    imports.wbg.__wbg_entries_41651c850143b957 = function(arg0) {
         const ret = Object.entries(arg0);
         return ret;
     };
-    imports.wbg.__wbg_get_67b2ba62fc30de12 = function() { return handleError(function (arg0, arg1) {
+    imports.wbg.__wbg_get_92470be87867c2e5 = function() { return handleError(function (arg0, arg1) {
         const ret = Reflect.get(arg0, arg1);
         return ret;
     }, arguments) };
-    imports.wbg.__wbg_get_b9b93047fe3cf45b = function(arg0, arg1) {
+    imports.wbg.__wbg_get_a131a44bd1eb6979 = function(arg0, arg1) {
         const ret = arg0[arg1 >>> 0];
         return ret;
     };
-    imports.wbg.__wbg_instanceof_ArrayBuffer_e14585432e3737fc = function(arg0) {
+    imports.wbg.__wbg_instanceof_ArrayBuffer_a8b6f580b363f2bc = function(arg0) {
         let result;
         try {
             result = arg0 instanceof ArrayBuffer;
@@ -342,7 +386,7 @@ function __wbg_get_imports() {
         const ret = result;
         return ret;
     };
-    imports.wbg.__wbg_instanceof_Map_f3469ce2244d2430 = function(arg0) {
+    imports.wbg.__wbg_instanceof_Map_80cc65041c96417a = function(arg0) {
         let result;
         try {
             result = arg0 instanceof Map;
@@ -352,7 +396,7 @@ function __wbg_get_imports() {
         const ret = result;
         return ret;
     };
-    imports.wbg.__wbg_instanceof_Uint8Array_17156bcf118086a9 = function(arg0) {
+    imports.wbg.__wbg_instanceof_Uint8Array_ca460677bc155827 = function(arg0) {
         let result;
         try {
             result = arg0 instanceof Uint8Array;
@@ -362,42 +406,42 @@ function __wbg_get_imports() {
         const ret = result;
         return ret;
     };
-    imports.wbg.__wbg_isArray_a1eab7e0d067391b = function(arg0) {
+    imports.wbg.__wbg_isArray_5f090bed72bd4f89 = function(arg0) {
         const ret = Array.isArray(arg0);
         return ret;
     };
-    imports.wbg.__wbg_isSafeInteger_343e2beeeece1bb0 = function(arg0) {
+    imports.wbg.__wbg_isSafeInteger_90d7c4674047d684 = function(arg0) {
         const ret = Number.isSafeInteger(arg0);
         return ret;
     };
-    imports.wbg.__wbg_iterator_9a24c88df860dc65 = function() {
+    imports.wbg.__wbg_iterator_4068add5b2aef7a6 = function() {
         const ret = Symbol.iterator;
         return ret;
     };
-    imports.wbg.__wbg_length_a446193dc22c12f8 = function(arg0) {
+    imports.wbg.__wbg_length_ab6d22b5ead75c72 = function(arg0) {
         const ret = arg0.length;
         return ret;
     };
-    imports.wbg.__wbg_length_e2d2a49132c1b256 = function(arg0) {
+    imports.wbg.__wbg_length_f00ec12454a5d9fd = function(arg0) {
         const ret = arg0.length;
         return ret;
     };
-    imports.wbg.__wbg_new_a12002a7f91c75be = function(arg0) {
+    imports.wbg.__wbg_new_e52b3efaaa774f96 = function(arg0) {
         const ret = new Uint8Array(arg0);
         return ret;
     };
-    imports.wbg.__wbg_next_25feadfc0913fea9 = function(arg0) {
+    imports.wbg.__wbg_next_8bb824d217961b5d = function(arg0) {
         const ret = arg0.next;
         return ret;
     };
-    imports.wbg.__wbg_next_6574e1a8a62d1055 = function() { return handleError(function (arg0) {
+    imports.wbg.__wbg_next_e2da48d8fff7439a = function() { return handleError(function (arg0) {
         const ret = arg0.next();
         return ret;
     }, arguments) };
-    imports.wbg.__wbg_set_65595bdd868b3009 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbg_set_fe4e79d1ed3b0e9b = function(arg0, arg1, arg2) {
         arg0.set(arg1, arg2 >>> 0);
     };
-    imports.wbg.__wbg_value_cd1ffa7b1ab794f1 = function(arg0) {
+    imports.wbg.__wbg_value_17b896954e14f896 = function(arg0) {
         const ret = arg0.value;
         return ret;
     };
@@ -427,10 +471,6 @@ function __wbg_get_imports() {
         getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
         getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
     };
-    imports.wbg.__wbindgen_error_new = function(arg0, arg1) {
-        const ret = new Error(getStringFromWasm0(arg0, arg1));
-        return ret;
-    };
     imports.wbg.__wbindgen_in = function(arg0, arg1) {
         const ret = arg0 in arg1;
         return ret;

package/pkg/takumi_wasm_bg.wasm.d.ts

@@ -1,8 +1,10 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
+export const __wbg_fontinfo_free: (a: number, b: number) => void;
 export const __wbg_renderer_free: (a: number, b: number) => void;
 export const renderer_new: (a: number) => number;
+export const renderer_loadFontWithInfo: (a: number, b: number) => void;
 export const renderer_loadFont: (a: number, b: number, c: number) => void;
 export const renderer_putPersistentImage: (a: number, b: number, c: number, d: number, e: number) => void;
 export const renderer_clearImageStore: (a: number) => void;