pr feedback

Author: guybedford

lib/internal/modules/esm/translators.js

@@ -511,22 +511,23 @@ translators.set('wasm', async function(url, source) {
     throw err;
   }
 
-  const wasmImports = WebAssembly.Module.imports(compiled);
-  const wasmGlobalImports = ArrayPrototypeFilter(wasmImports, ({ kind }) => kind === 'global');
-
-  const wasmExports = WebAssembly.Module.exports(compiled);
-  const wasmGlobalExports = new SafeSet(ArrayPrototypeMap(
-    ArrayPrototypeFilter(wasmExports, ({ kind }) => kind === 'global'),
-    ({ name }) => name,
-  ));
+  const importsList = new SafeSet();
+  const wasmGlobalImports = [];
+  for (const impt of WebAssembly.Module.imports(compiled)) {
+    if (impt.kind === 'global') ArrayPrototypePush(wasmGlobalImports, impt);
+    importsList.add(impt.module);
+  }
 
-  const importsList = new SafeSet(ArrayPrototypeMap(wasmImports, ({ module }) => module));
-  const exportsList = ArrayPrototypeMap(wasmExports, ({ name }) => name);
+  const exportsList = new SafeSet();
+  const wasmGlobalExports = new SafeSet();
+  for (const expt of WebAssembly.Module.exports(compiled)) {
+    if (expt.kind === 'global') ArrayPrototypePush(wasmGlobalExports, expt.name);
+    exportsList.add(expt.name);
+  }
 
-  const createDynamicModule = require(
-    'internal/modules/esm/create_dynamic_module');
+  const createDynamicModule = require('internal/modules/esm/create_dynamic_module');
 
-  const { module } = createDynamicModule([...importsList], exportsList, url, (reflect) => {
+  const { module } = createDynamicModule(importsList, exportsList, url, (reflect) => {
     for (const impt of importsList) {
       const importNs = reflect.imports[impt];
       const wasmInstance = wasmInstances.get(importNs);
@@ -544,18 +545,17 @@ translators.set('wasm', async function(url, source) {
       }
     }
     // In cycles importing unexecuted Wasm, wasmInstance will be undefined, which will fail during
-    // instantiation, since all bindings will be in TDZ.
+    // instantiation, since all bindings will be in the Temporal Deadzone (TDZ).
     const { exports } = new WebAssembly.Instance(compiled, reflect.imports);
     wasmInstances.set(module.getNamespace(), exports);
     for (const expt of exportsList) {
       let val = exports[expt];
       // Unwrap WebAssembly.Global for JS bindings
       if (wasmGlobalExports.has(expt)) {
-        // v128 doesn't support ToJsValue() -> undefined (ideally should stay in TDZ)
         try {
           val = val.value;
         } catch {
-          val = undefined;
+          // v128 doesn't support ToJsValue() -> undefined (ideally should stay in TDZ)
           continue;
         }
       }