vm: rename vm.Module to vm.SourceTextModule

At the last TC39 meeting, a new type of Module Records backed by
JavaScript source called Dynamic Module Records was discussed, and
it is now at Stage 1. Regardless of whether that proposal makes it
all the way into the spec, SourceTextModule is indeed a more
descriptive and accurate name for what this class represents.

PR-URL: https://github.com/nodejs/node/pull/22007
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Jan Krems <jan.krems@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Yuta Hiroto <hello@hiroppy.me>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: John-David Dalton <john.david.dalton@gmail.com>
Reviewed-By: Bradley Farias <bradley.meck@gmail.com>

8 files changed, 48 insertions, 46 deletions

diff --git a/test/parallel/test-util-inspect-namespace.js b/test/parallel/test-util-inspect-namespace.js
index e73f475cff..f2b6e57178 100644
--- a/test/parallel/test-util-inspect-namespace.js
+++ b/test/parallel/test-util-inspect-namespace.js
@@ -5,11 +5,11 @@
 require('../common');
 const assert = require('assert');
 
-const { Module } = require('vm');
+const { SourceTextModule } = require('vm');
 const { inspect } = require('util');
 
 (async () => {
-  const m = new Module('export const a = 1; export var b = 2');
+  const m = new SourceTextModule('export const a = 1; export var b = 2');
   await m.link(() => 0);
   m.instantiate();
   assert.strictEqual(
diff --git a/test/parallel/test-util-types.js b/test/parallel/test-util-types.js
index 59a9dcceb5..740ac7f472 100644
--- a/test/parallel/test-util-types.js
+++ b/test/parallel/test-util-types.js
@@ -126,7 +126,7 @@ for (const [ value, _method ] of [
 }
 
 (async () => {
-  const m = new vm.Module('');
+  const m = new vm.SourceTextModule('');
   await m.link(() => 0);
   m.instantiate();
   await m.evaluate();
diff --git a/test/parallel/test-vm-module-basic.js b/test/parallel/test-vm-module-basic.js
index 1f699ddf5b..ffe376ccc2 100644
--- a/test/parallel/test-vm-module-basic.js
+++ b/test/parallel/test-vm-module-basic.js
@@ -4,7 +4,7 @@
 
 const common = require('../common');
 const assert = require('assert');
-const { Module, createContext } = require('vm');
+const { SourceTextModule, createContext } = require('vm');
 
 (async function test1() {
   const context = createContext({
@@ -12,7 +12,7 @@ const { Module, createContext } = require('vm');
     baz: undefined,
     typeofProcess: undefined,
   });
-  const m = new Module(
+  const m = new SourceTextModule(
     'baz = foo; typeofProcess = typeof process; typeof Object;',
     { context }
   );
@@ -32,7 +32,7 @@ const { Module, createContext } = require('vm');
 }());
 
 (async () => {
-  const m = new Module(
+  const m = new SourceTextModule(
     'global.vmResult = "foo"; Object.prototype.toString.call(process);'
   );
   await m.link(common.mustNotCall());
@@ -44,7 +44,7 @@ const { Module, createContext } = require('vm');
 })();
 
 (async () => {
-  const m = new Module('while (true) {}');
+  const m = new SourceTextModule('while (true) {}');
   await m.link(common.mustNotCall());
   m.instantiate();
   await m.evaluate({ timeout: 500 })
diff --git a/test/parallel/test-vm-module-dynamic-import.js b/test/parallel/test-vm-module-dynamic-import.js
index bb45337cf1..35c57d8b3e 100644
--- a/test/parallel/test-vm-module-dynamic-import.js
+++ b/test/parallel/test-vm-module-dynamic-import.js
@@ -5,12 +5,12 @@
 const common = require('../common');
 
 const assert = require('assert');
-const { Module, createContext } = require('vm');
+const { SourceTextModule, createContext } = require('vm');
 
 const finished = common.mustCall();
 
 (async function() {
-  const m = new Module('import("foo")', { context: createContext() });
+  const m = new SourceTextModule('import("foo")', { context: createContext() });
   await m.link(common.mustNotCall());
   m.instantiate();
   const { result } = await m.evaluate();
diff --git a/test/parallel/test-vm-module-errors.js b/test/parallel/test-vm-module-errors.js
index 720f28525b..6803e0d86b 100644
--- a/test/parallel/test-vm-module-errors.js
+++ b/test/parallel/test-vm-module-errors.js
@@ -6,7 +6,7 @@ const common = require('../common');
 
 const assert = require('assert');
 
-const { Module, createContext } = require('vm');
+const { SourceTextModule, createContext } = require('vm');
 
 async function expectsRejection(fn, settings) {
   const validateError = common.expectsError(settings);
@@ -29,14 +29,14 @@ async function expectsRejection(fn, settings) {
 }
 
 async function createEmptyLinkedModule() {
-  const m = new Module('');
+  const m = new SourceTextModule('');
   await m.link(common.mustNotCall());
   return m;
 }
 
 async function checkArgType() {
   common.expectsError(() => {
-    new Module();
+    new SourceTextModule();
   }, {
     code: 'ERR_INVALID_ARG_TYPE',
     type: TypeError
@@ -46,7 +46,7 @@ async function checkArgType() {
     0, 1, null, true, 'str', () => {}, { url: 0 }, Symbol.iterator
   ]) {
     common.expectsError(() => {
-      new Module('', invalidOptions);
+      new SourceTextModule('', invalidOptions);
     }, {
       code: 'ERR_INVALID_ARG_TYPE',
       type: TypeError
@@ -57,7 +57,7 @@ async function checkArgType() {
     0, 1, undefined, null, true, 'str', {}, Symbol.iterator
   ]) {
     await expectsRejection(async () => {
-      const m = new Module('');
+      const m = new SourceTextModule('');
       await m.link(invalidLinker);
     }, {
       code: 'ERR_INVALID_ARG_TYPE',
@@ -69,7 +69,7 @@ async function checkArgType() {
 // Check methods/properties can only be used under a specific state.
 async function checkModuleState() {
   await expectsRejection(async () => {
-    const m = new Module('');
+    const m = new SourceTextModule('');
     await m.link(common.mustNotCall());
     assert.strictEqual(m.linkingStatus, 'linked');
     await m.link(common.mustNotCall());
@@ -78,7 +78,7 @@ async function checkModuleState() {
   });
 
   await expectsRejection(async () => {
-    const m = new Module('');
+    const m = new SourceTextModule('');
     m.link(common.mustNotCall());
     assert.strictEqual(m.linkingStatus, 'linking');
     await m.link(common.mustNotCall());
@@ -87,14 +87,14 @@ async function checkModuleState() {
   });
 
   common.expectsError(() => {
-    const m = new Module('');
+    const m = new SourceTextModule('');
     m.instantiate();
   }, {
     code: 'ERR_VM_MODULE_NOT_LINKED'
   });
 
   await expectsRejection(async () => {
-    const m = new Module('import "foo";');
+    const m = new SourceTextModule('import "foo";');
     try {
       await m.link(common.mustCall(() => ({})));
     } catch (err) {
@@ -107,7 +107,7 @@ async function checkModuleState() {
   });
 
   {
-    const m = new Module('import "foo";');
+    const m = new SourceTextModule('import "foo";');
     await m.link(common.mustCall(async (specifier, module) => {
       assert.strictEqual(module, m);
       assert.strictEqual(specifier, 'foo');
@@ -117,14 +117,14 @@ async function checkModuleState() {
       }, {
         code: 'ERR_VM_MODULE_NOT_LINKED'
       });
-      return new Module('');
+      return new SourceTextModule('');
     }));
     m.instantiate();
     await m.evaluate();
   }
 
   await expectsRejection(async () => {
-    const m = new Module('');
+    const m = new SourceTextModule('');
     await m.evaluate();
   }, {
     code: 'ERR_VM_MODULE_STATUS',
@@ -140,7 +140,7 @@ async function checkModuleState() {
   });
 
   common.expectsError(() => {
-    const m = new Module('');
+    const m = new SourceTextModule('');
     m.error;
   }, {
     code: 'ERR_VM_MODULE_STATUS',
@@ -158,7 +158,7 @@ async function checkModuleState() {
   });
 
   common.expectsError(() => {
-    const m = new Module('');
+    const m = new SourceTextModule('');
     m.namespace;
   }, {
     code: 'ERR_VM_MODULE_STATUS',
@@ -177,7 +177,7 @@ async function checkModuleState() {
 // Check link() fails when the returned module is not valid.
 async function checkLinking() {
   await expectsRejection(async () => {
-    const m = new Module('import "foo";');
+    const m = new SourceTextModule('import "foo";');
     try {
       await m.link(common.mustCall(() => ({})));
     } catch (err) {
@@ -191,9 +191,9 @@ async function checkLinking() {
 
   await expectsRejection(async () => {
     const c = createContext({ a: 1 });
-    const foo = new Module('', { context: c });
+    const foo = new SourceTextModule('', { context: c });
     await foo.link(common.mustNotCall());
-    const bar = new Module('import "foo";');
+    const bar = new SourceTextModule('import "foo";');
     try {
       await bar.link(common.mustCall(() => foo));
     } catch (err) {
@@ -206,7 +206,7 @@ async function checkLinking() {
   });
 
   await expectsRejection(async () => {
-    const erroredModule = new Module('import "foo";');
+    const erroredModule = new SourceTextModule('import "foo";');
     try {
       await erroredModule.link(common.mustCall(() => ({})));
     } catch (err) {
@@ -215,7 +215,7 @@ async function checkLinking() {
       assert.strictEqual(erroredModule.linkingStatus, 'errored');
     }
 
-    const rootModule = new Module('import "errored";');
+    const rootModule = new SourceTextModule('import "errored";');
     await rootModule.link(common.mustCall(() => erroredModule));
   }, {
     code: 'ERR_VM_MODULE_LINKING_ERRORED'
@@ -225,8 +225,8 @@ async function checkLinking() {
 // Check the JavaScript engine deals with exceptions correctly
 async function checkExecution() {
   await (async () => {
-    const m = new Module('import { nonexistent } from "module";');
-    await m.link(common.mustCall(() => new Module('')));
+    const m = new SourceTextModule('import { nonexistent } from "module";');
+    await m.link(common.mustCall(() => new SourceTextModule('')));
 
     // There is no code for this exception since it is thrown by the JavaScript
     // engine.
@@ -236,7 +236,7 @@ async function checkExecution() {
   })();
 
   await (async () => {
-    const m = new Module('throw new Error();');
+    const m = new SourceTextModule('throw new Error();');
     await m.link(common.mustNotCall());
     m.instantiate();
     const evaluatePromise = m.evaluate();
diff --git a/test/parallel/test-vm-module-import-meta.js b/test/parallel/test-vm-module-import-meta.js
index 5e97f1ac54..f7bc82f9b2 100644
--- a/test/parallel/test-vm-module-import-meta.js
+++ b/test/parallel/test-vm-module-import-meta.js
@@ -4,10 +4,10 @@
 
 const common = require('../common');
 const assert = require('assert');
-const { Module } = require('vm');
+const { SourceTextModule } = require('vm');
 
 async function testBasic() {
-  const m = new Module('import.meta;', {
+  const m = new SourceTextModule('import.meta;', {
     initializeImportMeta: common.mustCall((meta, module) => {
       assert.strictEqual(module, m);
       meta.prop = 42;
@@ -27,7 +27,7 @@ async function testInvalid() {
     null, {}, 0, Symbol.iterator, [], 'string', false
   ]) {
     common.expectsError(() => {
-      new Module('', {
+      new SourceTextModule('', {
         initializeImportMeta: invalidValue
       });
     }, {
diff --git a/test/parallel/test-vm-module-link.js b/test/parallel/test-vm-module-link.js
index ead6721bd4..20518c4054 100644
--- a/test/parallel/test-vm-module-link.js
+++ b/test/parallel/test-vm-module-link.js
@@ -7,13 +7,13 @@ const common = require('../common');
 const assert = require('assert');
 const { URL } = require('url');
 
-const { Module } = require('vm');
+const { SourceTextModule } = require('vm');
 
 async function simple() {
-  const foo = new Module('export default 5;');
+  const foo = new SourceTextModule('export default 5;');
   await foo.link(common.mustNotCall());
 
-  const bar = new Module('import five from "foo"; five');
+  const bar = new SourceTextModule('import five from "foo"; five');
 
   assert.deepStrictEqual(bar.dependencySpecifiers, ['foo']);
 
@@ -29,11 +29,11 @@ async function simple() {
 }
 
 async function depth() {
-  const foo = new Module('export default 5');
+  const foo = new SourceTextModule('export default 5');
   await foo.link(common.mustNotCall());
 
   async function getProxy(parentName, parentModule) {
-    const mod = new Module(`
+    const mod = new SourceTextModule(`
       import ${parentName} from '${parentName}';
       export default ${parentName};
     `);
@@ -56,12 +56,12 @@ async function depth() {
 }
 
 async function circular() {
-  const foo = new Module(`
+  const foo = new SourceTextModule(`
     import getFoo from 'bar';
     export let foo = 42;
     export default getFoo();
   `);
-  const bar = new Module(`
+  const bar = new SourceTextModule(`
     import { foo } from 'foo';
     export default function getFoo() {
       return foo;
@@ -109,12 +109,14 @@ async function circular2() {
     `
   };
   const moduleMap = new Map();
-  const rootModule = new Module(sourceMap.root, { url: 'vm:root' });
+  const rootModule = new SourceTextModule(sourceMap.root, { url: 'vm:root' });
   async function link(specifier, referencingModule) {
     if (moduleMap.has(specifier)) {
       return moduleMap.get(specifier);
     }
-    const mod = new Module(sourceMap[specifier], { url: new URL(specifier, 'file:///').href });
+    const mod = new SourceTextModule(sourceMap[specifier], {
+      url: new URL(specifier, 'file:///').href,
+    });
     moduleMap.set(specifier, mod);
     return mod;
   }
diff --git a/test/parallel/test-vm-module-reevaluate.js b/test/parallel/test-vm-module-reevaluate.js
index e08ab73450..c3914f362f 100644
--- a/test/parallel/test-vm-module-reevaluate.js
+++ b/test/parallel/test-vm-module-reevaluate.js
@@ -6,13 +6,13 @@ const common = require('../common');
 
 const assert = require('assert');
 
-const { Module } = require('vm');
+const { SourceTextModule } = require('vm');
 
 const finished = common.mustCall();
 
 (async function main() {
   {
-    const m = new Module('1');
+    const m = new SourceTextModule('1');
     await m.link(common.mustNotCall());
     m.instantiate();
     assert.strictEqual((await m.evaluate()).result, 1);
@@ -21,7 +21,7 @@ const finished = common.mustCall();
   }
 
   {
-    const m = new Module('throw new Error()');
+    const m = new SourceTextModule('throw new Error()');
     await m.link(common.mustNotCall());
     m.instantiate();