loro-crdt 1.8.9 → 1.9.0

package/bundler/loro_wasm.js

@@ -1,34 +1,96 @@
-// See https://github.com/loro-dev/loro/issues/440
-// Without this patch, Cloudflare Worker would raise issue like: "Uncaught TypeError: wasm2.__wbindgen_start is not a function"
-import * as wasm from "./loro_wasm_bg.wasm";
-import * as imports from "./loro_wasm_bg.js";
+import * as rawWasm from './loro_wasm_bg.wasm';
+import * as imports from './loro_wasm_bg.js';
 
-if (wasm.__wbindgen_start) {
-  imports.__wbg_set_wasm(wasm);
-  wasm.__wbindgen_start();
-} else if ("Bun" in globalThis) {
-  const { instance } = await WebAssembly.instantiateStreaming(
-    fetch(Bun.pathToFileURL(wasm.default)),
-    {
-      "./loro_wasm_bg.js": imports,
-    },
-  );
-  imports.__wbg_set_wasm(instance.exports);
+// Normalize how bundlers expose the wasm module/exports.
+const toModuleOrExports = (wasm) => {
+  if (!wasm) return wasm;
+  if (wasm instanceof WebAssembly.Module) return wasm;
+  if (typeof wasm === 'object' && 'default' in wasm) {
+    return wasm.default ?? wasm;
+  }
+  // rsbuild doesn't provide a default export when importing wasm.
+  return wasm;
+};
+
+const wasmModuleOrExports = toModuleOrExports(rawWasm);
+
+// Helper: ensure we end up with exports + optionally run externref init.
+const finalize = (exports) => {
+  imports.__wbg_set_wasm(exports);
+  if (typeof imports.__wbindgen_init_externref_table === 'function') {
+    imports.__wbindgen_init_externref_table();
+  }
+  tryStart(imports);
+};
+
+function tryStart(imports) {
+  if (typeof imports.__wbindgen_start === 'function') {
+    // Some bundlers require explicit start invocation.
+    imports.__wbindgen_start();
+  }
+}
 
+if (wasmModuleOrExports && wasmModuleOrExports.__wbindgen_start) {
+  // See https://github.com/loro-dev/loro/issues/440
+  // Without this patch, Cloudflare Worker would raise issue like: "Uncaught TypeError: wasm2.__wbindgen_start is not a function"
+  // Already the initialized exports object (Cloudflare Workers path).
+  finalize(wasmModuleOrExports);
+} else if ('Bun' in globalThis) {
   // Bun's wasm runtime (1.3.0 as of Oct 2025) sometimes reads externref slot 1
   // (reserved for booleans by wasm-bindgen) as the global object, causing APIs
   // like `LoroText.toDelta()` to return cyclic structures. Re-running the
   // wasm-bindgen externref table initializer after instantiation resets the
   // table so booleans stay primitives and avoids the infinite recursion seen in
   // Bun tests during `pnpm release-wasm`.
-  if (typeof imports.__wbindgen_init_externref_table === "function") {
-    imports.__wbindgen_init_externref_table();
+  let instance;
+  if (wasmModuleOrExports instanceof WebAssembly.Module) {
+    ({ instance } = await WebAssembly.instantiate(wasmModuleOrExports, {
+      './loro_wasm_bg.js': imports,
+    }));
+  } else {
+    const url = Bun.pathToFileURL(wasmModuleOrExports);
+    ({ instance } = await WebAssembly.instantiateStreaming(fetch(url), {
+      './loro_wasm_bg.js': imports,
+    }));
   }
+  finalize(instance.exports);
 } else {
-  const wkmod = await import("./loro_wasm_bg.wasm");
-  const instance = new WebAssembly.Instance(wkmod.default, {
-    "./loro_wasm_bg.js": imports,
-  });
-  imports.__wbg_set_wasm(instance.exports);
+  // Browser/node-like bundlers: either we already have exports, or a Module/URL.
+  const wkmod =
+    wasmModuleOrExports instanceof WebAssembly.Module
+      ? wasmModuleOrExports
+      : await import('./loro_wasm_bg.wasm');
+  const module =
+    wkmod instanceof WebAssembly.Module
+      ? wkmod
+      : (wkmod && wkmod.default) || wkmod;
+  let instance;
+  if (module instanceof WebAssembly.Instance) {
+    instance = module;
+  } else if (module instanceof WebAssembly.Module) {
+    instance = await WebAssembly.instantiate(module, {
+      './loro_wasm_bg.js': imports,
+    });
+  } else if (module instanceof ArrayBuffer || ArrayBuffer.isView(module)) {
+    const { instance: inst } = await WebAssembly.instantiate(module, {
+      './loro_wasm_bg.js': imports,
+    });
+    instance = inst;
+  } else if (typeof module === 'string' || module instanceof URL) {
+    const response = await fetch(module);
+    const { instance: inst } = await WebAssembly.instantiateStreaming(
+      response,
+      {
+        './loro_wasm_bg.js': imports,
+      }
+    );
+    instance = inst;
+  } else {
+    console.error('Unsupported wasm import type:', module);
+    throw new Error('Unsupported wasm import type: ' + typeof module);
+  }
+
+  finalize(instance.exports ?? instance);
 }
-export * from "./loro_wasm_bg.js";
+
+export * from './loro_wasm_bg.js';