Wasm config support

Author: tolyo

@types/core/di/ng-module/ng-module.d.ts

@@ -128,13 +128,36 @@ export class NgModule {
    */
   controller(name: string, ctlFn: ng.Injectable<any>): NgModule;
   /**
-   * Register a named worker that will be instantiated via $provide.
+   * Register a named WebAssembly module that will be instantiated via $provide.
+   *
+   * @param {string} name - The injectable name used to access the instantiated WebAssembly module.
+   *
+   * @param {string} src - URL of the `.wasm` file to fetch and instantiate.
+   *
+   * @param {Object<string, any>} [imports] WebAssembly import object, passed to `WebAssembly.instantiate` or  `WebAssembly.instantiateStreaming`.
+   *
+   * @param {Object<string, any>} [opts] - Configuration object.
+   *
+   *   Supported keys:
+   *   - **raw**: `boolean`
+   *       - `false` (default): the injectable resolves to `instance.exports`
+   *         (ideal for plain WASM modules).
+   *       - `true`: the injectable resolves to the full instantiation result:
+   *         `{ instance, exports, module }`
+   *         (required for runtimes such as Go, Emscripten, wasm-bindgen, etc).
    *
-   * @param {string} name
-   * @param {string} src
    * @returns {NgModule}
    */
-  wasm(name: string, src: string): NgModule;
+  wasm(
+    name: string,
+    src: string,
+    imports?: {
+      [x: string]: any;
+    },
+    opts?: {
+      [x: string]: any;
+    },
+  ): NgModule;
   /**
    * Register a named worker that will be instantiated via $provide.
    *

@types/shared/utils.d.ts

@@ -570,11 +570,16 @@ export function wait(t?: number): Promise<void>;
  */
 export function startsWith(str: string, search: string): boolean;
 /**
- * Loads and instantiates a WebAssembly module
- *
- * @param {string} src - URL to the wasm file
- * @returns {Promise<Object>} - Resolves to wasm exports
- */
-export function instantiateWasm(src: string): Promise<any>;
+ * Loads and instantiates a WebAssembly module.
+ * Tries streaming first, then falls back.
+ */
+export function instantiateWasm(
+  src: any,
+  imports?: {},
+): Promise<{
+  instance: WebAssembly.Instance;
+  exports: WebAssembly.Exports;
+  module: WebAssembly.Module;
+}>;
 export const isProxySymbol: unique symbol;
 export const ngAttrPrefixes: string[];

src/core/di/ng-module/ng-module.js

@@ -236,21 +236,39 @@ export class NgModule {
   }
 
   /**
-   * Register a named worker that will be instantiated via $provide.
+   * Register a named WebAssembly module that will be instantiated via $provide.
+   *
+   * @param {string} name - The injectable name used to access the instantiated WebAssembly module.
+   *
+   * @param {string} src - URL of the `.wasm` file to fetch and instantiate.
+   *
+   * @param {Object<string, any>} [imports] WebAssembly import object, passed to `WebAssembly.instantiate` or  `WebAssembly.instantiateStreaming`.
+   *
+   * @param {Object<string, any>} [opts] - Configuration object.
+   *
+   *   Supported keys:
+   *   - **raw**: `boolean`
+   *       - `false` (default): the injectable resolves to `instance.exports`
+   *         (ideal for plain WASM modules).
+   *       - `true`: the injectable resolves to the full instantiation result:
+   *         `{ instance, exports, module }`
+   *         (required for runtimes such as Go, Emscripten, wasm-bindgen, etc).
    *
-   * @param {string} name
-   * @param {string} src
    * @returns {NgModule}
    */
-  wasm(name, src) {
+  wasm(name, src, imports = {}, opts = {}) {
+    const raw = !!opts.raw;
+
     this.invokeQueue.push([
       $t.$provide,
       "provider",
       [
         name,
         function () {
-          this.$get = function () {
-            return instantiateWasm(src);
+          this.$get = () => {
+            return instantiateWasm(src, imports).then((result) =>
+              raw ? result : result.exports,
+            );
           };
         },
       ],

src/directive/wasm/wasm.js

@@ -6,7 +6,9 @@ import { instantiateWasm } from "../../shared/utils.js";
 export function ngWasmDirective() {
   return {
     async link($scope, _, $attrs) {
-      $scope.$target[$attrs.as || "wasm"] = await instantiateWasm($attrs.src);
+      $scope.$target[$attrs.as || "wasm"] = (
+        await instantiateWasm($attrs.src)
+      ).exports;
     },
   };
 }

src/shared/utils.js

@@ -1258,19 +1258,25 @@ export function startsWith(str, search) {
 }
 
 /**
- * Loads and instantiates a WebAssembly module
- *
- * @param {string} src - URL to the wasm file
- * @returns {Promise<Object>} - Resolves to wasm exports
+ * Loads and instantiates a WebAssembly module.
+ * Tries streaming first, then falls back.
  */
-export async function instantiateWasm(src) {
+export async function instantiateWasm(src, imports = {}) {
+  const res = await fetch(src);
+  if (!res.ok) throw new Error("fetch failed");
+
   try {
-    const r = await fetch(src);
-    if (!r.ok) throw new Error(`${r}`);
-    const bytes = await r.arrayBuffer();
-    const { instance } = await WebAssembly.instantiate(bytes);
-    return instance.exports;
-  } catch (e) {
-    throw new Error(e);
+    const { instance, module } = await WebAssembly.instantiateStreaming(
+      res.clone(),
+      imports,
+    );
+    return { instance, exports: instance.exports, module };
+  } catch {
+    /* empty */
   }
+
+  const bytes = await res.arrayBuffer();
+  const { instance, module } = await WebAssembly.instantiate(bytes, imports);
+
+  return { instance, exports: instance.exports, module };
 }