Revert "module: add prefix-only modules to module.builtinModules"

This reverts commit 414c5ed.

doc/api/module.md

@@ -21,17 +21,15 @@ added:
   - v9.3.0
   - v8.10.0
   - v6.13.0
-changes:
-  - version: REPLACEME
-    pr-url: https://github.com/nodejs/node/pull/56185
-    description: The list now also contains prefix-only modules.
 -->
 
 * {string\[]}
 
 A list of the names of all modules provided by Node.js. Can be used to verify
 if a module is maintained by a third party or not.
 
+Note: the list doesn't contain [prefix-only modules][] like `node:test`.
+
 `module` in this context isn't the same object that's provided
 by the [module wrapper][]. To access it, require the `Module` module:
 
@@ -1726,6 +1724,7 @@ returned object contains the following keys:
 [load hook]: #loadurl-context-nextload
 [module compile cache]: #module-compile-cache
 [module wrapper]: modules.md#the-module-wrapper
+[prefix-only modules]: modules.md#built-in-modules-with-mandatory-node-prefix
 [realm]: https://tc39.es/ecma262/#realm
 [resolve hook]: #resolvespecifier-context-nextresolve
 [source map include directives]: https://sourcemaps.info/spec.html#h.lmz475t4mvbx

doc/api/modules.md

@@ -517,7 +517,7 @@ Some built-in modules are always preferentially loaded if their identifier is
 passed to `require()`. For instance, `require('http')` will always
 return the built-in HTTP module, even if there is a file by that name. The list
 of built-in modules that can be loaded without using the `node:` prefix is exposed
-in [`module.builtinModules`][], listed without the prefix.
+as [`module.builtinModules`][].
 
 ### Built-in modules with mandatory `node:` prefix
 
@@ -531,8 +531,6 @@ taken the name. Currently the built-in modules that requires the `node:` prefix
 * [`node:test`][]
 * [`node:test/reporters`][]
 
-The list of these modules is exposed in [`module.builtinModules`][], including the prefix.
-
 ## Cycles
 
 <!--type=misc-->

lib/internal/bootstrap/realm.js

@@ -54,7 +54,6 @@ const {
   ArrayPrototypeIncludes,
   ArrayPrototypeMap,
   ArrayPrototypePush,
-  ArrayPrototypePushApply,
   ArrayPrototypeSlice,
   Error,
   ObjectDefineProperty,
@@ -321,14 +320,12 @@ class BuiltinModule {
     );
   }
 
-  static getSchemeOnlyModuleNames() {
-    return ArrayFrom(schemelessBlockList);
+  static getCanBeRequiredByUsersWithoutSchemeList() {
+    return ArrayFrom(canBeRequiredByUsersWithoutSchemeList);
   }
 
-  static getAllBuiltinModuleIds() {
-    const allBuiltins = ArrayFrom(canBeRequiredByUsersWithoutSchemeList);
-    ArrayPrototypePushApply(allBuiltins, ArrayFrom(schemelessBlockList, (x) => `node:${x}`));
-    return allBuiltins;
+  static getSchemeOnlyModuleNames() {
+    return ArrayFrom(schemelessBlockList);
   }
 
   // Used by user-land module loaders to compile and load builtins.

lib/internal/main/worker_thread.js

@@ -48,8 +48,8 @@ const { setupMainThreadPort } = require('internal/worker/messaging');
 
 const {
   onGlobalUncaughtException,
-  evalTypeScript,
-  evalTypeScriptModuleEntryPoint,
+  evalScript,
+  evalModuleEntryPoint,
 } = require('internal/process/execution');
 
 let debug = require('internal/util/debuglog').debuglog('worker', (fn) => {
@@ -166,13 +166,13 @@ port.on('message', (message) => {
           value: filename,
         });
         ArrayPrototypeSplice(process.argv, 1, 0, name);
-        evalTypeScript(name, filename);
+        evalScript(name, filename);
         break;
       }
 
       // eslint-disable-next-line no-fallthrough
       case 'module': {
-        PromisePrototypeThen(evalTypeScriptModuleEntryPoint(filename), undefined, (e) => {
+        PromisePrototypeThen(evalModuleEntryPoint(filename), undefined, (e) => {
           workerOnGlobalUncaughtException(e, true);
         });
         break;

lib/internal/modules/cjs/loader.js

@@ -434,8 +434,8 @@ Module.isBuiltin = BuiltinModule.isBuiltin;
  */
 function initializeCJS() {
   // This need to be done at runtime in case --expose-internals is set.
-
-  Module.builtinModules = ObjectFreeze(BuiltinModule.getAllBuiltinModuleIds());
+  const builtinModules = BuiltinModule.getCanBeRequiredByUsersWithoutSchemeList();
+  Module.builtinModules = ObjectFreeze(builtinModules);
 
   initializeCjsConditions();
 

lib/repl.js

@@ -131,7 +131,7 @@ const { shouldColorize } = require('internal/util/colors');
 const CJSModule = require('internal/modules/cjs/loader').Module;
 let _builtinLibs = ArrayPrototypeFilter(
   CJSModule.builtinModules,
-  (e) => e[0] !== '_' && !StringPrototypeStartsWith(e, 'node:'),
+  (e) => e[0] !== '_',
 );
 const nodeSchemeBuiltinLibs = ArrayPrototypeMap(
   _builtinLibs, (lib) => `node:${lib}`);

test/parallel/test-internal-module-require.js

@@ -87,9 +87,6 @@ if (process.argv[2] === 'child') {
         });
       } else {
         require(id);
-        if (!id.startsWith('node:')) {
-          require(`node:${id}`);
-        }
         publicModules.add(id);
       }
     }

test/parallel/test-process-get-builtin.mjs

@@ -41,19 +41,15 @@ for (const id of publicBuiltins) {
 }
 // Check that import(id).default returns the same thing as process.getBuiltinModule(id).
 for (const id of publicBuiltins) {
-  if (!id.startsWith('node:')) {
-    const imported = await import(`node:${id}`);
-    assert.strictEqual(process.getBuiltinModule(id), imported.default);
-  }
+  const imported = await import(`node:${id}`);
+  assert.strictEqual(process.getBuiltinModule(id), imported.default);
 }
 
 // publicBuiltins does not include 'test' which requires the node: prefix.
 const ids = publicBuiltins.add('test');
 // Check that import(id).default returns the same thing as process.getBuiltinModule(id).
 for (const id of ids) {
-  if (!id.startsWith('node:')) {
-    const prefixed = `node:${id}`;
-    const imported = await import(prefixed);
-    assert.strictEqual(process.getBuiltinModule(prefixed), imported.default);
-  }
+  const prefixed = `node:${id}`;
+  const imported = await import(prefixed);
+  assert.strictEqual(process.getBuiltinModule(prefixed), imported.default);
 }

test/parallel/test-repl-tab-complete-import.js

@@ -5,7 +5,7 @@ const ArrayStream = require('../common/arraystream');
 const fixtures = require('../common/fixtures');
 const assert = require('assert');
 const { builtinModules } = require('module');
-const publicUnprefixedModules = builtinModules.filter((lib) => !lib.startsWith('_') && !lib.startsWith('node:'));
+const publicModules = builtinModules.filter((lib) => !lib.startsWith('_'));
 
 if (!common.isMainThread)
   common.skip('process.chdir is not available in Workers');
@@ -31,7 +31,7 @@ testMe._domain.on('error', assert.ifError);
 // Tab complete provides built in libs for import()
 testMe.complete('import(\'', common.mustCall((error, data) => {
   assert.strictEqual(error, null);
-  publicUnprefixedModules.forEach((lib) => {
+  publicModules.forEach((lib) => {
     assert(
       data[0].includes(lib) && data[0].includes(`node:${lib}`),
       `${lib} not found`,
@@ -55,7 +55,7 @@ testMe.complete("import\t( 'n", common.mustCall((error, data) => {
   // import(...) completions include `node:` URL modules:
   let lastIndex = -1;
 
-  publicUnprefixedModules.forEach((lib, index) => {
+  publicModules.forEach((lib, index) => {
     lastIndex = completions.indexOf(`node:${lib}`);
     assert.notStrictEqual(lastIndex, -1);
   });

test/parallel/test-repl-tab-complete.js

@@ -275,7 +275,7 @@ testMe.complete('require(\'', common.mustCall(function(error, data) {
   assert.strictEqual(error, null);
   publicModules.forEach((lib) => {
     assert(
-      data[0].includes(lib) && (lib.startsWith('node:') || data[0].includes(`node:${lib}`)),
+      data[0].includes(lib) && data[0].includes(`node:${lib}`),
       `${lib} not found`
     );
   });
@@ -295,7 +295,7 @@ testMe.complete("require\t( 'n", common.mustCall(function(error, data) {
   // require(...) completions include `node:`-prefixed modules:
   let lastIndex = -1;
 
-  publicModules.filter((lib) => !lib.startsWith('node:')).forEach((lib, index) => {
+  publicModules.forEach((lib, index) => {
     lastIndex = data[0].indexOf(`node:${lib}`);
     assert.notStrictEqual(lastIndex, -1);
   });

test/parallel/test-require-resolve.js

@@ -61,9 +61,10 @@ require(fixtures.path('resolve-paths', 'default', 'verify-paths.js'));
   // builtinModules.
   builtinModules.forEach((mod) => {
     assert.strictEqual(require.resolve.paths(mod), null);
-    if (!mod.startsWith('node:')) {
-      assert.strictEqual(require.resolve.paths(`node:${mod}`), null);
-    }
+  });
+
+  builtinModules.forEach((mod) => {
+    assert.strictEqual(require.resolve.paths(`node:${mod}`), null);
   });
 
   // node_modules.