Skip to content

Commit e740b61

Browse files
committed
repl: add auto‑completion for node:‑prefixed require(…) calls
Refs: #37178
1 parent 4f61960 commit e740b61

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

lib/repl.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ let _builtinLibs = ArrayPrototypeFilter(
126126
CJSModule.builtinModules,
127127
(e) => !StringPrototypeStartsWith(e, '_') && !StringPrototypeIncludes(e, '/')
128128
);
129+
const nodeSchemeBuiltinLibs = ArrayPrototypeMap(
130+
_builtinLibs, (lib) => `node:${lib}`);
129131
const domain = require('domain');
130132
let debug = require('internal/util/debuglog').debuglog('repl', (fn) => {
131133
debug = fn;
@@ -1105,7 +1107,7 @@ REPLServer.prototype.setPrompt = function setPrompt(prompt) {
11051107
ReflectApply(Interface.prototype.setPrompt, this, [prompt]);
11061108
};
11071109

1108-
const requireRE = /\brequire\s*\(\s*['"`](([\w@./-]+\/)?(?:[\w@./-]*))(?![^'"`])$/;
1110+
const requireRE = /\brequire\s*\(\s*['"`](([\w@./:-]+\/)?(?:[\w@./:-]*))(?![^'"`])$/;
11091111
const fsAutoCompleteRE = /fs(?:\.promises)?\.\s*[a-z][a-zA-Z]+\(\s*["'](.*)/;
11101112
const simpleExpressionRE =
11111113
/(?:[a-zA-Z_$](?:\w|\$)*\??\.)*[a-zA-Z_$](?:\w|\$)*\??\.?$/;
@@ -1267,7 +1269,7 @@ function complete(line, callback) {
12671269
}
12681270

12691271
if (!subdir) {
1270-
ArrayPrototypePush(completionGroups, _builtinLibs);
1272+
ArrayPrototypePush(completionGroups, _builtinLibs, nodeSchemeBuiltinLibs);
12711273
}
12721274
} else if (RegExpPrototypeTest(fsAutoCompleteRE, line) &&
12731275
this.allowBlockingCompletions) {

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ const assert = require('assert');
3131
const path = require('path');
3232
const fixtures = require('../common/fixtures');
3333
const { builtinModules } = require('module');
34+
const publicModules = builtinModules.filter(
35+
(lib) => !lib.startsWith('_') && !lib.includes('/'),
36+
);
37+
3438
const hasInspector = process.features.inspector;
3539

3640
if (!common.isMainThread)
@@ -239,9 +243,9 @@ putIn.run(['.clear']);
239243

240244
testMe.complete('require(\'', common.mustCall(function(error, data) {
241245
assert.strictEqual(error, null);
242-
builtinModules.forEach((lib) => {
246+
publicModules.forEach((lib) => {
243247
assert(
244-
data[0].includes(lib) || lib.startsWith('_') || lib.includes('/'),
248+
data[0].includes(lib) && data[0].includes(`node:${lib}`),
245249
`${lib} not found`
246250
);
247251
});
@@ -258,6 +262,10 @@ testMe.complete("require\t( 'n", common.mustCall(function(error, data) {
258262
assert.strictEqual(error, null);
259263
assert.strictEqual(data.length, 2);
260264
assert.strictEqual(data[1], 'n');
265+
// require(...) completions include `node:`-prefixed modules:
266+
publicModules.forEach((lib, index) =>
267+
assert.strictEqual(data[0][index], `node:${lib}`));
268+
assert.strictEqual(data[0][publicModules.length], '');
261269
// There is only one Node.js module that starts with n:
262270
assert.strictEqual(data[0][0], 'net');
263271
assert.strictEqual(data[0][1], '');

0 commit comments

Comments
 (0)