Skip to content

module: derive builtinModules from enabled builtin set #65418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sjungwon03 wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −15
Open

module: derive builtinModules from enabled builtin set #65418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion lib/internal/bootstrap/realm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,16 @@ class BuiltinModule {

static getAllBuiltinModuleIds() {
const allBuiltins = ArrayFrom(canBeRequiredByUsersWithoutSchemeList);
ArrayPrototypePushApply(allBuiltins, ArrayFrom(schemelessBlockList, (x) => `node:${x}`));
ArrayPrototypePushApply(
allBuiltins,
ArrayPrototypeMap(
ArrayPrototypeFilter(
ArrayFrom(schemelessBlockList),
(id) => canBeRequiredByUsersList.has(id),
),
(id) => 'node:' + id,
),
);
return allBuiltins;
}

Expand Down
15 changes: 1 addition & 14 deletions lib/internal/modules/cjs/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,20 +492,7 @@ Module.isBuiltin = BuiltinModule.isBuiltin;
function initializeCJS() {
// This need to be done at runtime in case --expose-internals is set.

let modules = Module.builtinModules = BuiltinModule.getAllBuiltinModuleIds();
if (!getOptionValue('--experimental-dtls')) {
modules = modules.filter((i) => i !== 'node:dtls');
}
if (!getOptionValue('--experimental-quic')) {
modules = modules.filter((i) => i !== 'node:quic');
}
if (!getOptionValue('--experimental-ffi')) {
modules = modules.filter((i) => i !== 'node:ffi');
}
if (!getOptionValue('--experimental-vfs')) {
modules = modules.filter((i) => i !== 'node:vfs');
}
Module.builtinModules = ObjectFreeze(modules);
Module.builtinModules = ObjectFreeze(BuiltinModule.getAllBuiltinModuleIds());

initializeCjsConditions();

Expand Down
35 changes: 35 additions & 0 deletions test/parallel/test-module-builtin-experimental.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
'use strict';

const common = require('../common');
const { spawnSyncAndAssert } = require('../common/child_process');

const experimentalBuiltins = [
['dtls', '--experimental-dtls', common.hasDtls],
['ffi', '--experimental-ffi', common.hasFFI],
['quic', '--experimental-quic', common.hasQuic],
['vfs', '--experimental-vfs', true],
].filter(([, , available]) => available);

for (const [id, flag] of experimentalBuiltins) {
const builtin = `node:${id}`;

spawnSyncAndAssert(process.execPath, [
'-e', `const m = require('node:module'); if (m.builtinModules.includes('${builtin}')) process.exit(1); try { require('${builtin}'); } catch (e) { if (e.code === 'ERR_UNKNOWN_BUILTIN_MODULE') process.exit(0); } process.exit(1);`,
], { status: 0 });

spawnSyncAndAssert(process.execPath, [
flag,
'-e', `const m = require('node:module'); if (!m.builtinModules.includes('${builtin}')) process.exit(1); require('${builtin}');`,
], { status: 0 });
}

const schemeOnlyBuiltins = ['node:test', 'node:sea'];
if (common.hasSQLite) {
schemeOnlyBuiltins.push('node:sqlite');
}

for (const id of schemeOnlyBuiltins) {
spawnSyncAndAssert(process.execPath, [
'-e', `const m = require('node:module'); if (!m.builtinModules.includes('${id}')) process.exit(1); require('${id}');`,
], { status: 0 });
}
Loading