tweaks

Author: gfx

src/utils/utf8-wasm-binary.ts

@@ -1,4 +1,24 @@
-// Auto-generated by wasm/build.sh - do not edit manually
+// Auto-generated by wasm/build.sh - DO NOT EDIT MANUALLY
 // Source: wasm/utf8.wat
 
-export const wasmBinary = "AGFzbQEAAAABNQhedwFgAW8Bf2ADb2QAfwF/YANkAH9/AWRvYAJvfwF/YAJ/ZAABf2ABfwFkAGADZAB/fwFvAl8DDndhc206anMtc3RyaW5nBmxlbmd0aAABDndhc206anMtc3RyaW5nEWludG9DaGFyQ29kZUFycmF5AAIOd2FzbTpqcy1zdHJpbmcRZnJvbUNoYXJDb2RlQXJyYXkAAwMGBQEEBQYHBQMBAAEHVAYGbWVtb3J5AgAJdXRmOENvdW50AAMKdXRmOEVuY29kZQAEEXV0ZjhEZWNvZGVUb0FycmF5AAUKYWxsb2NBcnJheQAGDWFycmF5VG9TdHJpbmcABwqZBgWEAQIEfwFkACAAEAAiBEUEQEEADwsgACAE+wcAIgVBABABGgNAIAEgBE9FBEAgBSAB+w0AIgNBgAFJBH8gAkEBagUgA0GAEEkEfyACQQJqBSADQf+3A00gA0GAsANPcQR/IAFBAWohASACQQRqBSACQQNqCwsLIQIgAUEBaiEBDAELCyACC7wCAgR/AWQAIAEhAiAAEAAiBUUEQEEADwsgACAF+wcAIgZBABABGgNAIAQgBU9FBEAgBiAE+w0AIgNBgAFJBH8gAiADOgAAIAJBAWoFIANBgBBJBH8gAiADQQZ2QcABcjoAACACQQFqIANBP3FBgAFyOgAAIAJBAmoFIANB/7cDTSADQYCwA09xBH8gAiADQQp0IAYgBEEBaiIE+w0AakGAuP8aayIDQRJ2QfABcjoAACACQQFqIANBDHZBP3FBgAFyOgAAIAJBAmogA0EGdkE/cUGAAXI6AAAgAkEDaiADQT9xQYABcjoAACACQQRqBSACIANBDHZB4AFyOgAAIAJBAWogA0EGdkE/cUGAAXI6AAAgAkECaiADQT9xQYABcjoAACACQQNqCwsLIQIgBEEBaiEEDAELCyACIAFrC78CAQN/A0AgACACSwRAIAItAAAiBEGAAXFFBEAgASADIAT7DgAgA0EBaiEDIAJBAWohAgwCCyAEQeABcUHAAUYEQCABIAMgAkEBai0AAEE/cSAEQR9xQQZ0cvsOACADQQFqIQMgAkECaiECDAILIARB8AFxQeABRgRAIAEgAyACQQJqLQAAQT9xIARBD3FBDHQgAkEBai0AAEE/cUEGdHJy+w4AIANBAWohAyACQQNqIQIMAgsgBEH4AXFB8AFGBEAgASADIAJBA2otAABBP3EgBEEHcUESdCACQQFqLQAAQT9xQQx0ciACQQJqLQAAQT9xQQZ0cnJBgIAEayIEQQp2QYCwA3L7DgAgASADQQFqIgMgBEH/B3FBgLgDcvsOACADQQFqIQMgAkEEaiECDAIFIAJBAWohAgwCCwALCyADCwcAIAD7BwALCgAgACABIAIQAgs=";
+export const wasmBinary = `
+AGFzbQEAAAABNQhedwFgAW8Bf2ADb2QAfwF/YANkAH9/AWRvYAJvfwF/YAJ/ZAABf2ABfwFkAGADZA
+B/fwFvAl8DDndhc206anMtc3RyaW5nBmxlbmd0aAABDndhc206anMtc3RyaW5nEWludG9DaGFyQ29k
+ZUFycmF5AAIOd2FzbTpqcy1zdHJpbmcRZnJvbUNoYXJDb2RlQXJyYXkAAwMGBQEEBQYHBQMBAAEHVA
+YGbWVtb3J5AgAJdXRmOENvdW50AAMKdXRmOEVuY29kZQAEEXV0ZjhEZWNvZGVUb0FycmF5AAUKYWxs
+b2NBcnJheQAGDWFycmF5VG9TdHJpbmcABwqZBgWEAQIEfwFkACAAEAAiBEUEQEEADwsgACAE+wcAIg
+VBABABGgNAIAEgBE9FBEAgBSAB+w0AIgNBgAFJBH8gAkEBagUgA0GAEEkEfyACQQJqBSADQf+3A00g
+A0GAsANPcQR/IAFBAWohASACQQRqBSACQQNqCwsLIQIgAUEBaiEBDAELCyACC7wCAgR/AWQAIAEhAi
+AAEAAiBUUEQEEADwsgACAF+wcAIgZBABABGgNAIAQgBU9FBEAgBiAE+w0AIgNBgAFJBH8gAiADOgAA
+IAJBAWoFIANBgBBJBH8gAiADQQZ2QcABcjoAACACQQFqIANBP3FBgAFyOgAAIAJBAmoFIANB/7cDTS
+ADQYCwA09xBH8gAiADQQp0IAYgBEEBaiIE+w0AakGAuP8aayIDQRJ2QfABcjoAACACQQFqIANBDHZB
+P3FBgAFyOgAAIAJBAmogA0EGdkE/cUGAAXI6AAAgAkEDaiADQT9xQYABcjoAACACQQRqBSACIANBDH
+ZB4AFyOgAAIAJBAWogA0EGdkE/cUGAAXI6AAAgAkECaiADQT9xQYABcjoAACACQQNqCwsLIQIgBEEB
+aiEEDAELCyACIAFrC78CAQN/A0AgACACSwRAIAItAAAiBEGAAXFFBEAgASADIAT7DgAgA0EBaiEDIA
+JBAWohAgwCCyAEQeABcUHAAUYEQCABIAMgAkEBai0AAEE/cSAEQR9xQQZ0cvsOACADQQFqIQMgAkEC
+aiECDAILIARB8AFxQeABRgRAIAEgAyACQQJqLQAAQT9xIARBD3FBDHQgAkEBai0AAEE/cUEGdHJy+w
+4AIANBAWohAyACQQNqIQIMAgsgBEH4AXFB8AFGBEAgASADIAJBA2otAABBP3EgBEEHcUESdCACQQFq
+LQAAQT9xQQx0ciACQQJqLQAAQT9xQQZ0cnJBgIAEayIEQQp2QYCwA3L7DgAgASADQQFqIgMgBEH/B3
+FBgLgDcvsOACADQQFqIQMgAkEEaiECDAIFIAJBAWohAgwCCwALCyADCwcAIAD7BwALCgAgACABIAIQ
+Ags=
+`;

src/utils/utf8-wasm.ts

@@ -40,7 +40,7 @@ const WASM_MODE = getWasmMode();
 // GC array type (opaque reference)
 type I16Array = object;
 
-interface WasmExports {
+interface WasmExports extends WebAssembly.Exports {
   memory: WebAssembly.Memory;
   utf8Count(str: string): number;
   utf8Encode(str: string, offset: number): number;
@@ -65,11 +65,7 @@ function base64ToBytes(base64: string): Uint8Array {
   return new Uint8Array(Buffer.from(base64, "base64"));
 }
 
-function tryInitWasm(): void {
-  if (wasmInstance !== null || wasmInitError !== null) {
-    return; // Already initialized or failed
-  }
-
+function tryInitializeWasmInstance(): void {
   if (WASM_MODE === "never") {
     wasmInitError = new Error("MSGPACK_WASM=never: wasm disabled");
     return;
@@ -85,35 +81,28 @@ function tryInitWasm(): void {
     // Requires js-string builtins support (Node.js 24+ / Chrome 130+ / Firefox 134+)
     const module: WebAssembly.Module = new (WebAssembly.Module as any)(bytes, { builtins: ["js-string"] });
     const instance = new WebAssembly.Instance(module);
-    wasmInstance = instance.exports as unknown as WasmExports;
+    wasmInstance = instance.exports as WasmExports;
   } catch (e) {
     wasmInitError = e instanceof Error ? e : new Error(String(e));
 
     if (WASM_MODE === "force") {
-      throw new Error(`MSGPACK_WASM=force but wasm failed to load: ${wasmInitError.message}`);
+      throw new Error(`MSGPACK_WASM=force but wasm failed to load: ${wasmInitError.message}`, { cause: wasmInitError });
     }
   }
 }
 
-// Initialize on module load
-tryInitWasm();
+tryInitializeWasmInstance();
 
 /**
  * Whether wasm is available and initialized.
  */
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
 export const WASM_AVAILABLE = wasmInstance !== null;
 
-/**
- * Get the wasm initialization error, if any.
- */
 export function getWasmError(): Error | null {
   return wasmInitError;
 }
 
-/**
- * Get the raw wasm exports for advanced usage.
- */
 export function getWasmExports(): WasmExports | null {
   return wasmInstance;
 }
@@ -122,39 +111,32 @@ export function getWasmExports(): WasmExports | null {
  * Count UTF-8 byte length of a string.
  */
 export function utf8CountWasm(str: string): number {
-  if (wasmInstance === null) {
-    throw new Error("wasm not initialized");
-  }
-  return wasmInstance.utf8Count(str);
+  return wasmInstance!.utf8Count(str);
 }
 
 /**
  * Encode string to UTF-8 bytes in the provided buffer.
  * Returns the number of bytes written.
  */
 export function utf8EncodeWasm(str: string, output: Uint8Array, outputOffset: number): number {
-  if (wasmInstance === null) {
-    throw new Error("wasm not initialized");
-  }
-
   // Estimate max byte length without a full pass over the string.
   // Each UTF-16 code unit can produce at most 3 UTF-8 bytes (BMP chars).
   // Surrogate pairs (2 code units) produce 4 bytes, so 3 bytes/code unit is safe.
   const maxByteLength = str.length * 3;
 
   // Ensure wasm memory is large enough
   const requiredPages = Math.ceil(maxByteLength / 65536);
-  const currentPages = wasmInstance.memory.buffer.byteLength / 65536;
+  const currentPages = wasmInstance!.memory.buffer.byteLength / 65536;
 
   if (requiredPages > currentPages) {
-    wasmInstance.memory.grow(requiredPages - currentPages);
+    wasmInstance!.memory.grow(requiredPages - currentPages);
   }
 
   // Encode to wasm memory (uses intoCharCodeArray for bulk char extraction)
-  const bytesWritten = wasmInstance.utf8Encode(str, 0);
+  const bytesWritten = wasmInstance!.utf8Encode(str, 0);
 
   // Copy from wasm memory to output buffer
-  const wasmBytes = new Uint8Array(wasmInstance.memory.buffer, 0, bytesWritten);
+  const wasmBytes = new Uint8Array(wasmInstance!.memory.buffer, 0, bytesWritten);
   output.set(wasmBytes, outputOffset);
 
   return bytesWritten;
@@ -165,33 +147,29 @@ export function utf8EncodeWasm(str: string, output: Uint8Array, outputOffset: nu
  * Uses GC arrays with fromCharCodeArray for efficient string creation.
  */
 export function utf8DecodeWasm(bytes: Uint8Array, inputOffset: number, byteLength: number): string {
-  if (wasmInstance === null) {
-    throw new Error("wasm not initialized");
-  }
-
   // Handle empty input
   if (byteLength === 0) {
     return "";
   }
 
   // Ensure wasm memory is large enough for UTF-8 input
   const requiredPages = Math.ceil(byteLength / 65536);
-  const currentPages = wasmInstance.memory.buffer.byteLength / 65536;
+  const currentPages = wasmInstance!.memory.buffer.byteLength / 65536;
 
   if (requiredPages > currentPages) {
-    wasmInstance.memory.grow(requiredPages - currentPages);
+    wasmInstance!.memory.grow(requiredPages - currentPages);
   }
 
   // Copy UTF-8 bytes to wasm linear memory at offset 0
-  const wasmBytes = new Uint8Array(wasmInstance.memory.buffer, 0, byteLength);
+  const wasmBytes = new Uint8Array(wasmInstance!.memory.buffer, 0, byteLength);
   wasmBytes.set(bytes.subarray(inputOffset, inputOffset + byteLength));
 
   // Allocate GC array for UTF-16 output (max size = byteLength for ASCII)
-  const arr = wasmInstance.allocArray(byteLength);
+  const arr = wasmInstance!.allocArray(byteLength);
 
   // Decode UTF-8 to UTF-16 in GC array
-  const codeUnits = wasmInstance.utf8DecodeToArray(byteLength, arr);
+  const codeUnits = wasmInstance!.utf8DecodeToArray(byteLength, arr);
 
   // Create string directly from GC array using fromCharCodeArray
-  return wasmInstance.arrayToString(arr, 0, codeUnits);
+  return wasmInstance!.arrayToString(arr, 0, codeUnits);
 }

wasm/build.sh

@@ -12,15 +12,15 @@ wasm-opt --enable-gc --enable-strings --enable-reference-types -O4 utf8.wasm -o
 mv tmp.wasm utf8.wasm
 
 echo "Generating base64 TypeScript module..."
-cat > ../src/utils/utf8-wasm-binary.ts << 'HEADER'
-// Auto-generated by wasm/build.sh - do not edit manually
-// Source: wasm/utf8.wat
 
-HEADER
-
-echo -n "export const wasmBinary = \"" >> ../src/utils/utf8-wasm-binary.ts
-base64 -i utf8.wasm | tr -d '\n' >> ../src/utils/utf8-wasm-binary.ts
-echo "\";" >> ../src/utils/utf8-wasm-binary.ts
+{
+  echo "// Auto-generated by wasm/build.sh - DO NOT EDIT MANUALLY"
+  echo "// Source: wasm/utf8.wat"
+  echo ""
+  echo "export const wasmBinary = \`"
+  base64 -b 78 -i utf8.wasm
+  echo "\`;"
+} > ../src/utils/utf8-wasm-binary.ts
 
 echo "Done! Generated:"
 echo "  - wasm/utf8.wasm ($(wc -c < utf8.wasm | tr -d ' ') bytes)"