@sorisdk/matcher 0.1.2 → 0.1.3

package/README.md

@@ -14,6 +14,11 @@ npm install @sorisdk/matcher
 
 Vite-based apps need `vite-plugin-wasm`.
 
+The default loader is intended to work in both Vite dev/build and Nuxt client production bundles. If you need to override wasm loading explicitly, pass either:
+
+- `loader: () => import("@sorisdk/matcher/generated/core.js")`
+- `wasmModule: await import("@sorisdk/matcher/generated/core.js")`
+
 ## Minimal example
 
 ```ts
@@ -35,6 +40,20 @@ const result = await session.match(new Uint8Array([1, 2, 3]));
 console.log(result.best);
 ```
 
+## Advanced wasm loading
+
+```ts
+import { MatcherSession, initMatcher } from "@sorisdk/matcher";
+
+await initMatcher({
+  loader: () => import("@sorisdk/matcher/generated/core.js")
+});
+
+const session = new MatcherSession({
+  wasmModule: await import("@sorisdk/matcher/generated/core.js")
+});
+```
+
 ## Pack loading
 
 `loadPack(...)` accepts:

package/dist/default-loader.js

@@ -0,0 +1,5 @@
+import * as generatedModule from "./generated/core.js";
+
+export default async function defaultWasmLoader() {
+  return generatedModule;
+}

package/dist/generated/core.js

@@ -1,7 +1,7 @@
 /* @ts-self-types="./core.d.ts" */
-
 import * as wasm from "./core_bg.wasm";
 import { __wbg_set_wasm } from "./core_bg.js";
+
 __wbg_set_wasm(wasm);
 wasm.__wbindgen_start();
 export {

package/dist/generated/core_bg.js

@@ -149,11 +149,11 @@ if (Symbol.dispose) WasmMatcherEngine.prototype[Symbol.dispose] = WasmMatcherEng
 export function init_matcher_wasm() {
     wasm.init_matcher_wasm();
 }
-export function __wbg_Error_2e59b1b37a9a34c3(arg0, arg1) {
+export function __wbg_Error_960c155d3d49e4c2(arg0, arg1) {
     const ret = Error(getStringFromWasm0(arg0, arg1));
     return ret;
 }
-export function __wbg_Number_e6ffdb596c888833(arg0) {
+export function __wbg_Number_32bf70a599af1d4b(arg0) {
     const ret = Number(arg0);
     return ret;
 }
@@ -164,46 +164,46 @@ export function __wbg_String_8564e559799eccda(arg0, arg1) {
     getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
     getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
 }
-export function __wbg___wbindgen_boolean_get_a86c216575a75c30(arg0) {
+export function __wbg___wbindgen_boolean_get_6ea149f0a8dcc5ff(arg0) {
     const v = arg0;
     const ret = typeof(v) === 'boolean' ? v : undefined;
     return isLikeNone(ret) ? 0xFFFFFF : ret ? 1 : 0;
 }
-export function __wbg___wbindgen_debug_string_dd5d2d07ce9e6c57(arg0, arg1) {
+export function __wbg___wbindgen_debug_string_ab4b34d23d6778bd(arg0, arg1) {
     const ret = debugString(arg1);
     const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
     const len1 = WASM_VECTOR_LEN;
     getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
     getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
 }
-export function __wbg___wbindgen_in_4bd7a57e54337366(arg0, arg1) {
+export function __wbg___wbindgen_in_a5d8b22e52b24dd1(arg0, arg1) {
     const ret = arg0 in arg1;
     return ret;
 }
-export function __wbg___wbindgen_is_null_344c8750a8525473(arg0) {
+export function __wbg___wbindgen_is_null_52ff4ec04186736f(arg0) {
     const ret = arg0 === null;
     return ret;
 }
-export function __wbg___wbindgen_is_object_40c5a80572e8f9d3(arg0) {
+export function __wbg___wbindgen_is_object_63322ec0cd6ea4ef(arg0) {
     const val = arg0;
     const ret = typeof(val) === 'object' && val !== null;
     return ret;
 }
-export function __wbg___wbindgen_is_undefined_c0cca72b82b86f4d(arg0) {
+export function __wbg___wbindgen_is_undefined_29a43b4d42920abd(arg0) {
     const ret = arg0 === undefined;
     return ret;
 }
-export function __wbg___wbindgen_jsval_loose_eq_3a72ae764d46d944(arg0, arg1) {
+export function __wbg___wbindgen_jsval_loose_eq_cac3565e89b4134c(arg0, arg1) {
     const ret = arg0 == arg1;
     return ret;
 }
-export function __wbg___wbindgen_number_get_7579aab02a8a620c(arg0, arg1) {
+export function __wbg___wbindgen_number_get_c7f42aed0525c451(arg0, arg1) {
     const obj = arg1;
     const ret = typeof(obj) === 'number' ? obj : undefined;
     getDataViewMemory0().setFloat64(arg0 + 8 * 1, isLikeNone(ret) ? 0 : ret, true);
     getDataViewMemory0().setInt32(arg0 + 4 * 0, !isLikeNone(ret), true);
 }
-export function __wbg___wbindgen_string_get_914df97fcfa788f2(arg0, arg1) {
+export function __wbg___wbindgen_string_get_7ed5322991caaec5(arg0, arg1) {
     const obj = arg1;
     const ret = typeof(obj) === 'string' ? obj : undefined;
     var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -211,7 +211,7 @@ export function __wbg___wbindgen_string_get_914df97fcfa788f2(arg0, arg1) {
     getDataViewMemory0().setInt32(arg0 + 4 * 1, len1, true);
     getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
 }
-export function __wbg___wbindgen_throw_81fc77679af83bc6(arg0, arg1) {
+export function __wbg___wbindgen_throw_6b64449b9b9ed33c(arg0, arg1) {
     throw new Error(getStringFromWasm0(arg0, arg1));
 }
 export function __wbg_error_a6fa202b58aa1cd3(arg0, arg1) {
@@ -229,7 +229,7 @@ export function __wbg_get_with_ref_key_6412cf3094599694(arg0, arg1) {
     const ret = arg0[arg1];
     return ret;
 }
-export function __wbg_instanceof_ArrayBuffer_ff7c1337a5e3b33a(arg0) {
+export function __wbg_instanceof_ArrayBuffer_7c8433c6ed14ffe3(arg0) {
     let result;
     try {
         result = arg0 instanceof ArrayBuffer;
@@ -239,7 +239,7 @@ export function __wbg_instanceof_ArrayBuffer_ff7c1337a5e3b33a(arg0) {
     const ret = result;
     return ret;
 }
-export function __wbg_instanceof_Uint8Array_4b8da683deb25d72(arg0) {
+export function __wbg_instanceof_Uint8Array_152ba1f289edcf3f(arg0) {
     let result;
     try {
         result = arg0 instanceof Uint8Array;
@@ -249,43 +249,43 @@ export function __wbg_instanceof_Uint8Array_4b8da683deb25d72(arg0) {
     const ret = result;
     return ret;
 }
-export function __wbg_isSafeInteger_ea83862ba994770c(arg0) {
+export function __wbg_isSafeInteger_4fc213d1989d6d2a(arg0) {
     const ret = Number.isSafeInteger(arg0);
     return ret;
 }
-export function __wbg_length_0c32cb8543c8e4c8(arg0) {
+export function __wbg_length_9f1775224cf1d815(arg0) {
     const ret = arg0.length;
     return ret;
 }
-export function __wbg_new_227d7c05414eb861() {
-    const ret = new Error();
+export function __wbg_new_0c7403db6e782f19(arg0) {
+    const ret = new Uint8Array(arg0);
     return ret;
 }
-export function __wbg_new_4f9fafbb3909af72() {
-    const ret = new Object();
+export function __wbg_new_227d7c05414eb861() {
+    const ret = new Error();
     return ret;
 }
-export function __wbg_new_a560378ea1240b14(arg0) {
-    const ret = new Uint8Array(arg0);
+export function __wbg_new_682678e2f47e32bc() {
+    const ret = new Array();
     return ret;
 }
-export function __wbg_new_f3c9df4f38f3f798() {
-    const ret = new Array();
+export function __wbg_new_aa8d0fa9762c29bd() {
+    const ret = new Object();
     return ret;
 }
-export function __wbg_now_88621c9c9a4f3ffc() {
+export function __wbg_now_a9b7df1cbee90986() {
     const ret = Date.now();
     return ret;
 }
-export function __wbg_prototypesetcall_3e05eb9545565046(arg0, arg1, arg2) {
+export function __wbg_prototypesetcall_a6b02eb00b0f4ce2(arg0, arg1, arg2) {
     Uint8Array.prototype.set.call(getArrayU8FromWasm0(arg0, arg1), arg2);
 }
+export function __wbg_set_3bf1de9fab0cd644(arg0, arg1, arg2) {
+    arg0[arg1 >>> 0] = arg2;
+}
 export function __wbg_set_6be42768c690e380(arg0, arg1, arg2) {
     arg0[arg1] = arg2;
 }
-export function __wbg_set_6c60b2e8ad0e9383(arg0, arg1, arg2) {
-    arg0[arg1 >>> 0] = arg2;
-}
 export function __wbg_stack_3b0d974bbf31e44f(arg0, arg1) {
     const ret = arg1.stack;
     const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);

package/dist/index.js

@@ -289,11 +289,8 @@ function getCallable(obj, names) {
   return null;
 }
 var defaultLoader = async () => {
-  const generatedModuleUrl = new URL("./generated/core.js", import.meta.url);
-  return import(
-    /* @vite-ignore */
-    generatedModuleUrl.href
-  );
+  const loaderModule = await import("./default-loader.js");
+  return loaderModule.default();
 };
 var INTERNAL_DUPLICATE_MATCH_FLAG = "__matcherDuplicate";
 var WrappedDatabase = class {
@@ -380,15 +377,18 @@ var WrappedMatcher = class {
     if (!raw) {
       return null;
     }
-    if (typeof raw === "object" && raw !== null && raw.duplicate === true && raw.best) {
-      const normalized = normalizeResult(raw.best);
-      Object.defineProperty(normalized, INTERNAL_DUPLICATE_MATCH_FLAG, {
-        value: true,
-        enumerable: false,
-        configurable: false,
-        writable: false
-      });
-      return normalized;
+    if (typeof raw === "object" && raw !== null) {
+      const duplicateResult = raw;
+      if (duplicateResult.duplicate === true && duplicateResult.best) {
+        const normalized = normalizeResult(duplicateResult.best);
+        Object.defineProperty(normalized, INTERNAL_DUPLICATE_MATCH_FLAG, {
+          value: true,
+          enumerable: false,
+          configurable: false,
+          writable: false
+        });
+        return normalized;
+      }
     }
     return normalizeResult(raw);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sorisdk/matcher",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Browser WASM SDK for audio fingerprint matching",
   "type": "module",
   "main": "./dist/index.js",
@@ -40,7 +40,7 @@
   "scripts": {
     "build:wasm": "node ../../scripts/build-wasm-package.mjs matcher",
     "build:assets": "node ./scripts/copy-assets.mjs",
-    "build": "tsup src/index.ts --format esm --dts && pnpm run build:wasm && pnpm run build:assets",
+    "build": "tsup src/index.ts --format esm --dts && pnpm run build:wasm && pnpm run build:assets && node ../../scripts/write-default-loader.mjs packages/matcher ./generated/core.js",
     "test": "vitest run",
     "test:watch": "vitest"
   }