esm: unflag --experimental-wasm-modules

PR-URL: nodejs#57038
Reviewed-By: Yagiz Nizipli <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Stephen Belanger <[email protected]>
Reviewed-By: Geoffrey Booth <[email protected]>
Reviewed-By: Chengzhong Wu <[email protected]>

Author: guybedford

doc/api/cli.md

@@ -36,8 +36,7 @@ If a file is found, its path will be passed to the
   point to be loaded with ECMAScript module loader, such as `--import` or
   [`--experimental-default-type=module`][].
 * The file has an `.mjs` extension.
-* The file has an `.mjs` or `.wasm` (with `--experimental-wasm-modules`)
-  extension.
+* The file has an `.mjs` or `.wasm` extension.
 * The file does not have a `.cjs` extension, and the nearest parent
   `package.json` file contains a top-level [`"type"`][] field with a value of
   `"module"`.
@@ -49,8 +48,7 @@ Otherwise, the file is loaded using the CommonJS module loader. See
 
 When loading, the [ES module loader][Modules loaders] loads the program
 entry point, the `node` command will accept as input only files with `.js`,
-`.mjs`, or `.cjs` extensions; with `.wasm` extensions when
-[`--experimental-wasm-modules`][] is enabled; and with no extension when
+`.mjs`, `.cjs` or `.wasm` extensions; and with no extension when
 [`--experimental-default-type=module`][] is passed.
 
 ## Options
@@ -1219,14 +1217,6 @@ changes:
 
 Enable experimental WebAssembly System Interface (WASI) support.
 
-### `--experimental-wasm-modules`
-
-<!-- YAML
-added: v12.3.0
--->
-
-Enable experimental WebAssembly module support.
-
 ### `--experimental-webstorage`
 
 <!-- YAML
@@ -3338,7 +3328,6 @@ one is included in the list below.
 * `--experimental-transform-types`
 * `--experimental-vm-modules`
 * `--experimental-wasi-unstable-preview1`
-* `--experimental-wasm-modules`
 * `--experimental-webstorage`
 * `--force-context-aware`
 * `--force-fips`
@@ -3908,7 +3897,6 @@ node --stack-trace-limit=12 -p -e "Error.stackTraceLimit" # prints 12
 [`--env-file`]: #--env-fileconfig
 [`--experimental-default-type=module`]: #--experimental-default-typetype
 [`--experimental-sea-config`]: single-executable-applications.md#generating-single-executable-preparation-blobs
-[`--experimental-wasm-modules`]: #--experimental-wasm-modules
 [`--heap-prof-dir`]: #--heap-prof-dir
 [`--import`]: #--importmodule
 [`--no-experimental-strip-types`]: #--no-experimental-strip-types

doc/api/esm.md

@@ -639,10 +639,24 @@ imported from the same path.
 
 ## Wasm modules
 
+<!-- YAML
+changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/57038
+    description: Wasm modules no longer require the `--experimental-wasm-modules` flag.
+-->
+
+Importing both WebAssembly module instances and WebAssembly source phase
+imports is supported.
+
+This integration is in line with the
+[ES Module Integration Proposal for WebAssembly][].
+
+## Wasm modules
+
 > Stability: 1 - Experimental
 
-Importing WebAssembly modules is supported under the
-`--experimental-wasm-modules` flag, allowing any `.wasm` files to be
+Importing WebAssembly modules is supported allowing any `.wasm` files to be
 imported as normal modules while also supporting their module imports.
 
 This integration is in line with the
@@ -658,7 +672,7 @@ console.log(M);
 executed under:
 
 ```bash
-node --experimental-wasm-modules index.mjs
+node index.mjs
 ```
 
 would provide the exports interface for the instantiation of `module.wasm`.
@@ -1020,7 +1034,7 @@ _isImports_, _conditions_)
 >    1. Return _"commonjs"_.
 > 4. If _url_ ends in _".json"_, then
 >    1. Return _"json"_.
-> 5. If `--experimental-wasm-modules` is enabled and _url_ ends in
+> 5. If _url_ ends in
 >    _".wasm"_, then
 >    1. Return _"wasm"_.
 > 6. Let _packageURL_ be the result of **LOOKUP\_PACKAGE\_SCOPE**(_url_).
@@ -1035,9 +1049,8 @@ _isImports_, _conditions_)
 >        1. Return _"module"_.
 >     3. Return _"commonjs"_.
 > 11. If _url_ does not have any extension, then
->     1. If _packageType_ is _"module"_ and `--experimental-wasm-modules` is
->        enabled and the file at _url_ contains the header for a WebAssembly
->        module, then
+>     1. If _packageType_ is _"module"_ and the file at _url_ contains the
+>        header for a WebAssembly module, then
 >        1. Return _"wasm"_.
 >     2. If _packageType_ is not **null**, then
 >        1. Return _packageType_.

doc/node-config-schema.json

@@ -186,9 +186,6 @@
         "experimental-vm-modules": {
           "type": "boolean"
         },
-        "experimental-wasm-modules": {
-          "type": "boolean"
-        },
         "experimental-websocket": {
           "type": "boolean"
         },

doc/node.1

@@ -234,9 +234,6 @@ Enable experimental ES module support in VM module.
 Enable experimental WebAssembly System Interface support. This
 flag is no longer required as WASI is enabled by default.
 .
-.It Fl -experimental-wasm-modules
-Enable experimental WebAssembly module support.
-.
 .It Fl -force-context-aware
 Disable loading native addons that are not context-aware.
 .

lib/internal/modules/esm/formats.js

@@ -9,20 +9,15 @@ const { getValidatedPath } = require('internal/fs/utils');
 const fsBindings = internalBinding('fs');
 const { internal: internalConstants } = internalBinding('constants');
 
-const experimentalWasmModules = getOptionValue('--experimental-wasm-modules');
-
 const extensionFormatMap = {
   '__proto__': null,
   '.cjs': 'commonjs',
   '.js': 'module',
   '.json': 'json',
   '.mjs': 'module',
+  '.wasm': 'wasm',
 };
 
-if (experimentalWasmModules) {
-  extensionFormatMap['.wasm'] = 'wasm';
-}
-
 if (getOptionValue('--experimental-strip-types')) {
   extensionFormatMap['.ts'] = 'module-typescript';
   extensionFormatMap['.mts'] = 'module-typescript';
@@ -41,7 +36,7 @@ function mimeToFormat(mime) {
     ) !== null
   ) { return 'module'; }
   if (mime === 'application/json') { return 'json'; }
-  if (experimentalWasmModules && mime === 'application/wasm') { return 'wasm'; }
+  if (mime === 'application/wasm') { return 'wasm'; }
   return null;
 }
 
@@ -52,7 +47,6 @@ function mimeToFormat(mime) {
  * @param {URL} url
  */
 function getFormatOfExtensionlessFile(url) {
-  if (!experimentalWasmModules) { return 'module'; }
   const path = getValidatedPath(url);
   switch (fsBindings.getFormatOfExtensionlessFile(path)) {
     case internalConstants.EXTENSIONLESS_FORMAT_WASM:

lib/internal/modules/esm/translators.js

@@ -432,8 +432,6 @@ translators.set('json', function jsonStrategy(url, source) {
  */
 const wasmInstances = new SafeWeakMap();
 translators.set('wasm', async function(url, source) {
-  emitExperimentalWarning('Importing WebAssembly modules');
-
   assertBufferSource(source, false, 'load');
 
   debug(`Translating WASMModule ${url}`);
@@ -470,6 +468,7 @@ translators.set('wasm', async function(url, source) {
   const createDynamicModule = require('internal/modules/esm/create_dynamic_module');
 
   const { module } = createDynamicModule([...importsList], [...exportsList], url, (reflect) => {
+    emitExperimentalWarning('Importing WebAssembly module instances');
     for (const impt of importsList) {
       const importNs = reflect.imports[impt];
       const wasmInstance = wasmInstances.get(importNs);

src/node_options.cc

@@ -479,10 +479,7 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             kAllowedInEnvvar);
   AddAlias("--loader", "--experimental-loader");
   AddOption("--experimental-modules", "", NoOp{}, kAllowedInEnvvar);
-  AddOption("--experimental-wasm-modules",
-            "experimental ES Module support for webassembly modules",
-            &EnvironmentOptions::experimental_wasm_modules,
-            kAllowedInEnvvar);
+  AddOption("--experimental-wasm-modules", "", NoOp{}, kAllowedInEnvvar);
   AddOption("--experimental-import-meta-resolve",
             "experimental ES Module import.meta.resolve() parentURL support",
             &EnvironmentOptions::experimental_import_meta_resolve,

src/node_options.h

@@ -130,7 +130,6 @@ class EnvironmentOptions : public Options {
   bool experimental_global_customevent = true;
   bool experimental_global_navigator = true;
   bool experimental_global_web_crypto = true;
-  bool experimental_wasm_modules = false;
   bool experimental_import_meta_resolve = false;
   std::string input_type;  // Value of --input-type
   std::string type;        // Value of --experimental-default-type

test/es-module/test-esm-wasm.mjs

@@ -9,7 +9,6 @@ describe('ESM: WASM modules', { concurrency: !process.env.TEST_PARALLEL }, () =>
   it('should load exports', async () => {
     const { code, stderr, stdout } = await spawnPromisified(execPath, [
       '--no-warnings',
-      '--experimental-wasm-modules',
       '--input-type=module',
       '--eval',
       [
@@ -32,7 +31,6 @@ describe('ESM: WASM modules', { concurrency: !process.env.TEST_PARALLEL }, () =>
   it('should not allow code injection through export names', async () => {
     const { code, stderr, stdout } = await spawnPromisified(execPath, [
       '--no-warnings',
-      '--experimental-wasm-modules',
       '--input-type=module',
       '--eval',
       `import * as wasmExports from ${JSON.stringify(fixtures.fileURL('es-modules/export-name-code-injection.wasm'))};`,
@@ -46,7 +44,6 @@ describe('ESM: WASM modules', { concurrency: !process.env.TEST_PARALLEL }, () =>
   it('should allow non-identifier export names', async () => {
     const { code, stderr, stdout } = await spawnPromisified(execPath, [
       '--no-warnings',
-      '--experimental-wasm-modules',
       '--input-type=module',
       '--eval',
       [
@@ -64,7 +61,6 @@ describe('ESM: WASM modules', { concurrency: !process.env.TEST_PARALLEL }, () =>
   it('should properly handle all WebAssembly global types', async () => {
     const { code, stderr, stdout } = await spawnPromisified(execPath, [
       '--no-warnings',
-      '--experimental-wasm-modules',
       '--input-type=module',
       '--eval',
       [
@@ -211,7 +207,6 @@ describe('ESM: WASM modules', { concurrency: !process.env.TEST_PARALLEL }, () =>
   it('should properly escape import names as well', async () => {
     const { code, stderr, stdout } = await spawnPromisified(execPath, [
       '--no-warnings',
-      '--experimental-wasm-modules',
       '--input-type=module',
       '--eval',
       [
@@ -226,22 +221,20 @@ describe('ESM: WASM modules', { concurrency: !process.env.TEST_PARALLEL }, () =>
     strictEqual(code, 0);
   });
 
-  it('should emit experimental warning', async () => {
+  it('should emit experimental warning for module instances', async () => {
     const { code, signal, stderr } = await spawnPromisified(execPath, [
-      '--experimental-wasm-modules',
       fixtures.path('es-modules/wasm-modules.mjs'),
     ]);
 
     strictEqual(code, 0);
     strictEqual(signal, null);
     match(stderr, /ExperimentalWarning/);
-    match(stderr, /WebAssembly/);
+    match(stderr, /Importing WebAssembly module instances/);
   });
 
   it('should support top-level execution', async () => {
     const { code, stderr, stdout } = await spawnPromisified(execPath, [
       '--no-warnings',
-      '--experimental-wasm-modules',
       fixtures.path('es-modules/top-level-wasm.wasm'),
     ]);
 
@@ -254,7 +247,6 @@ describe('ESM: WASM modules', { concurrency: !process.env.TEST_PARALLEL }, () =>
   it.skip('should support static source phase imports', async () => {
     const { code, stderr, stdout } = await spawnPromisified(execPath, [
       '--no-warnings',
-      '--experimental-wasm-modules',
       '--input-type=module',
       '--eval',
       [
@@ -276,7 +268,6 @@ describe('ESM: WASM modules', { concurrency: !process.env.TEST_PARALLEL }, () =>
   it.skip('should support dynamic source phase imports', async () => {
     const { code, stderr, stdout } = await spawnPromisified(execPath, [
       '--no-warnings',
-      '--experimental-wasm-modules',
       '--input-type=module',
       '--eval',
       [
@@ -299,7 +290,6 @@ describe('ESM: WASM modules', { concurrency: !process.env.TEST_PARALLEL }, () =>
   it.skip('should not execute source phase imports', async () => {
     const { code, stderr, stdout } = await spawnPromisified(execPath, [
       '--no-warnings',
-      '--experimental-wasm-modules',
       '--input-type=module',
       '--eval',
       [
@@ -319,7 +309,6 @@ describe('ESM: WASM modules', { concurrency: !process.env.TEST_PARALLEL }, () =>
   it.skip('should not execute dynamic source phase imports', async () => {
     const { code, stderr, stdout } = await spawnPromisified(execPath, [
       '--no-warnings',
-      '--experimental-wasm-modules',
       '--input-type=module',
       '--eval',
       `await import.source(${JSON.stringify(fixtures.fileURL('es-modules/unimportable.wasm'))})`,
@@ -335,7 +324,6 @@ describe('ESM: WASM modules', { concurrency: !process.env.TEST_PARALLEL }, () =>
     const fileUrl = fixtures.fileURL('es-modules/wasm-source-phase.js');
     const { code, stderr, stdout } = await spawnPromisified(execPath, [
       '--no-warnings',
-      '--experimental-wasm-modules',
       '--input-type=module',
       '--eval',
       [
@@ -358,7 +346,6 @@ describe('ESM: WASM modules', { concurrency: !process.env.TEST_PARALLEL }, () =>
     const fileUrl = fixtures.fileURL('es-modules/wasm-source-phase.js');
     const { code, stderr, stdout } = await spawnPromisified(execPath, [
       '--no-warnings',
-      '--experimental-wasm-modules',
       '--input-type=module',
       '--eval',
       `import source nosource from ${JSON.stringify(fileUrl)};`,
@@ -373,7 +360,6 @@ describe('ESM: WASM modules', { concurrency: !process.env.TEST_PARALLEL }, () =>
   it.skip('should throw for vm source phase static import', async () => {
     const { code, stderr, stdout } = await spawnPromisified(execPath, [
       '--no-warnings',
-      '--experimental-wasm-modules',
       '--experimental-vm-modules',
       '--input-type=module',
       '--eval',
@@ -393,7 +379,6 @@ describe('ESM: WASM modules', { concurrency: !process.env.TEST_PARALLEL }, () =>
   it.skip('should throw for vm source phase dynamic import', async () => {
     const { code, stderr, stdout } = await spawnPromisified(execPath, [
       '--no-warnings',
-      '--experimental-wasm-modules',
       '--experimental-vm-modules',
       '--input-type=module',
       '--eval',

test/module-hooks/test-module-hooks-import-wasm.mjs

@@ -1,6 +1,5 @@
-// Flags: --no-experimental-wasm-modules
 // This tests that module.registerHooks() can be used to support unknown formats, like
-// import(wasm) (without --experimental-wasm-modules).
+// import(wasm)
 import '../common/index.mjs';
 
 import assert from 'node:assert';