diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js index 552f3d3997d..8abc1c23f38 100644 --- a/lib/internal/bootstrap/loaders.js +++ b/lib/internal/bootstrap/loaders.js @@ -58,6 +58,7 @@ const { SafeMap, SafeSet, String, + StringPrototypeSlice, StringPrototypeStartsWith, TypeError, } = primordials; @@ -257,6 +258,20 @@ class BuiltinModule { return !schemelessBlockList.has(id); } + static normalizeRequirableId(id) { + let normalizedId = id; + if (StringPrototypeStartsWith(id, 'node:')) { + normalizedId = StringPrototypeSlice(id, 5); + } + + if (!BuiltinModule.canBeRequiredByUsers(normalizedId) || + (id === normalizedId && !BuiltinModule.canBeRequiredWithoutScheme(normalizedId))) { + return undefined; + } + + return normalizedId; + } + static getSchemeOnlyModuleNames() { return ArrayFrom(schemelessBlockList); } diff --git a/lib/internal/main/mksnapshot.js b/lib/internal/main/mksnapshot.js index 6dee4334fba..c9b36cc9786 100644 --- a/lib/internal/main/mksnapshot.js +++ b/lib/internal/main/mksnapshot.js @@ -7,12 +7,10 @@ const { ObjectSetPrototypeOf, SafeArrayIterator, SafeSet, - StringPrototypeStartsWith, - StringPrototypeSlice, } = primordials; const binding = internalBinding('mksnapshot'); -const { BuiltinModule } = require('internal/bootstrap/loaders'); +const { BuiltinModule: { normalizeRequirableId } } = require('internal/bootstrap/loaders'); const { compileSerializeMain, } = binding; @@ -97,13 +95,8 @@ function supportedInUserSnapshot(id) { } function requireForUserSnapshot(id) { - let normalizedId = id; - if (StringPrototypeStartsWith(id, 'node:')) { - normalizedId = StringPrototypeSlice(id, 5); - } - if (!BuiltinModule.canBeRequiredByUsers(normalizedId) || - (id !== normalizedId && - !BuiltinModule.canBeRequiredWithoutScheme(normalizedId))) { + const normalizedId = normalizeRequirableId(id); + if (!normalizedId) { // eslint-disable-next-line no-restricted-syntax const err = new Error( `Cannot find module '${id}'. `, diff --git a/lib/internal/main/single_executable_application.js b/lib/internal/main/single_executable_application.js index d9604cff720..fad53c1185e 100644 --- a/lib/internal/main/single_executable_application.js +++ b/lib/internal/main/single_executable_application.js @@ -7,6 +7,7 @@ const { getSingleExecutableCode } = internalBinding('sea'); const { emitExperimentalWarning } = require('internal/util'); const { Module, wrapSafe } = require('internal/modules/cjs/loader'); const { codes: { ERR_UNKNOWN_BUILTIN_MODULE } } = require('internal/errors'); +const { BuiltinModule: { normalizeRequirableId } } = require('internal/bootstrap/loaders'); prepareMainThreadExecution(false, true); markBootstrapComplete(); @@ -33,12 +34,13 @@ customModule.paths = Module._nodeModulePaths(customModule.path); const customExports = customModule.exports; -function customRequire(path) { - if (!Module.isBuiltin(path)) { - throw new ERR_UNKNOWN_BUILTIN_MODULE(path); +function customRequire(id) { + const normalizedId = normalizeRequirableId(id); + if (!normalizedId) { + throw new ERR_UNKNOWN_BUILTIN_MODULE(id); } - return require(path); + return require(normalizedId); } customRequire.main = customModule; diff --git a/test/fixtures/sea.js b/test/fixtures/sea.js index efdc32708b9..2cd82c709ea 100644 --- a/test/fixtures/sea.js +++ b/test/fixtures/sea.js @@ -9,8 +9,23 @@ expectWarning('ExperimentalWarning', 'Single executable application is an experimental feature and ' + 'might change at any time'); +// Should be possible to require core modules that optionally require the +// "node:" scheme. const { deepStrictEqual, strictEqual, throws } = require('assert'); -const { dirname } = require('path'); +const { dirname } = require('node:path'); + +// Should be possible to require a core module that requires using the "node:" +// scheme. +{ + const { test } = require('node:test'); + strictEqual(typeof test, 'function'); +} + +// Should not be possible to require a core module without the "node:" scheme if +// it requires using the "node:" scheme. +throws(() => require('test'), { + code: 'ERR_UNKNOWN_BUILTIN_MODULE', +}); deepStrictEqual(process.argv, [process.execPath, process.execPath, '-a', '--b=c', 'd']);