repl: fix and extend require/import tab complete

PR-URL: #40216
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: Mesteery

lib/repl.js

@@ -125,7 +125,7 @@ const { Console } = require('console');
 constCJSModule=require('internal/modules/cjs/loader').Module;
 let_builtinLibs=ArrayPrototypeFilter(
 CJSModule.builtinModules,
-(e)=>!StringPrototypeStartsWith(e,'_')&&!StringPrototypeIncludes(e,'/')
+(e)=>!StringPrototypeStartsWith(e,'_'),
 );
 constnodeSchemeBuiltinLibs=ArrayPrototypeMap(
 _builtinLibs,(lib)=>`node:${lib}`);
@@ -1287,135 +1287,133 @@ function complete(line, callback) {
 if(completeOn.length){
 filter=completeOn;
 }
-}elseif(RegExpPrototypeTest(requireRE,line)&&
-this.allowBlockingCompletions){
+}elseif(RegExpPrototypeTest(requireRE,line)){
 // require('...<Tab>')
-constextensions=ObjectKeys(this.context.require.extensions);
-constindexes=ArrayPrototypeMap(extensions,
-(extension)=>`index${extension}`);
-ArrayPrototypePush(indexes,'package.json','index');
-
 constmatch=StringPrototypeMatch(line,requireRE);
 completeOn=match[1];
-constsubdir=match[2]||'';
 filter=completeOn;
-group=[];
-letpaths=[];
-
-if(completeOn==='.'){
-group=['./','../'];
-}elseif(completeOn==='..'){
-group=['../'];
-}elseif(RegExpPrototypeTest(/^\.\.?\//,completeOn)){
-paths=[process.cwd()];
-}else{
-paths=ArrayPrototypeConcat(module.paths,CJSModule.globalPaths);
-}
+if(this.allowBlockingCompletions){
+constsubdir=match[2]||'';
+constextensions=ObjectKeys(this.context.require.extensions);
+constindexes=ArrayPrototypeMap(extensions,
+(extension)=>`index${extension}`);
+ArrayPrototypePush(indexes,'package.json','index');
+
+group=[];
+letpaths=[];
+
+if(completeOn==='.'){
+group=['./','../'];
+}elseif(completeOn==='..'){
+group=['../'];
+}elseif(RegExpPrototypeTest(/^\.\.?\//,completeOn)){
+paths=[process.cwd()];
+}else{
+paths=ArrayPrototypeConcat(module.paths,CJSModule.globalPaths);
+}
 
-ArrayPrototypeForEach(paths,(dir)=>{
-dir=path.resolve(dir,subdir);
-constdirents=gracefulReaddir(dir,{withFileTypes: true})||[];
-ArrayPrototypeForEach(dirents,(dirent)=>{
-if(RegExpPrototypeTest(versionedFileNamesRe,dirent.name)||
-dirent.name==='.npm'){
-// Exclude versioned names that 'npm' installs.
-return;
-}
-constextension=path.extname(dirent.name);
-constbase=StringPrototypeSlice(dirent.name,0,-extension.length);
-if(!dirent.isDirectory()){
-if(StringPrototypeIncludes(extensions,extension)&&
-(!subdir||base!=='index')){
-ArrayPrototypePush(group,`${subdir}${base}`);
+ArrayPrototypeForEach(paths,(dir)=>{
+dir=path.resolve(dir,subdir);
+constdirents=gracefulReaddir(dir,{withFileTypes: true})||[];
+ArrayPrototypeForEach(dirents,(dirent)=>{
+if(RegExpPrototypeTest(versionedFileNamesRe,dirent.name)||
+dirent.name==='.npm'){
+// Exclude versioned names that 'npm' installs.
+return;
 }
-return;
-}
-ArrayPrototypePush(group,`${subdir}${dirent.name}/`);
-constabsolute=path.resolve(dir,dirent.name);
-if(ArrayPrototypeSome(
-gracefulReaddir(absolute)||[],
-(subfile)=>ArrayPrototypeIncludes(indexes,subfile)
-)){
-ArrayPrototypePush(group,`${subdir}${dirent.name}`);
-}
+constextension=path.extname(dirent.name);
+constbase=StringPrototypeSlice(dirent.name,0,-extension.length);
+if(!dirent.isDirectory()){
+if(StringPrototypeIncludes(extensions,extension)&&
+(!subdir||base!=='index')){
+ArrayPrototypePush(group,`${subdir}${base}`);
+}
+return;
+}
+ArrayPrototypePush(group,`${subdir}${dirent.name}/`);
+constabsolute=path.resolve(dir,dirent.name);
+if(ArrayPrototypeSome(
+gracefulReaddir(absolute)||[],
+(subfile)=>ArrayPrototypeIncludes(indexes,subfile)
+)){
+ArrayPrototypePush(group,`${subdir}${dirent.name}`);
+}
+});
 });
-});
-if(group.length){
-ArrayPrototypePush(completionGroups,group);
+if(group.length){
+ArrayPrototypePush(completionGroups,group);
+}
 }
 
-if(!subdir){
-ArrayPrototypePush(completionGroups,_builtinLibs,nodeSchemeBuiltinLibs);
-}
-}elseif(RegExpPrototypeTest(importRE,line)&&
-this.allowBlockingCompletions){
+ArrayPrototypePush(completionGroups,_builtinLibs,nodeSchemeBuiltinLibs);
+}elseif(RegExpPrototypeTest(importRE,line)){
 // import('...<Tab>')
-// File extensions that can be imported:
-constextensions=ObjectKeys(
-getOptionValue('--experimental-specifier-resolution')==='node' ?
-legacyExtensionFormatMap :
-extensionFormatMap);
-
-// Only used when loading bare module specifiers from `node_modules`:
-constindexes=ArrayPrototypeMap(extensions,(ext)=>`index${ext}`);
-ArrayPrototypePush(indexes,'package.json');
-
 constmatch=StringPrototypeMatch(line,importRE);
 completeOn=match[1];
-constsubdir=match[2]||'';
 filter=completeOn;
-group=[];
-letpaths=[];
-if(completeOn==='.'){
-group=['./','../'];
-}elseif(completeOn==='..'){
-group=['../'];
-}elseif(RegExpPrototypeTest(/^\.\.?\//,completeOn)){
-paths=[process.cwd()];
-}else{
-paths=ArrayPrototypeSlice(module.paths);
-}
+if(this.allowBlockingCompletions){
+constsubdir=match[2]||'';
+// File extensions that can be imported:
+constextensions=ObjectKeys(
+getOptionValue('--experimental-specifier-resolution')==='node' ?
+legacyExtensionFormatMap :
+extensionFormatMap);
+
+// Only used when loading bare module specifiers from `node_modules`:
+constindexes=ArrayPrototypeMap(extensions,(ext)=>`index${ext}`);
+ArrayPrototypePush(indexes,'package.json');
+
+group=[];
+letpaths=[];
+if(completeOn==='.'){
+group=['./','../'];
+}elseif(completeOn==='..'){
+group=['../'];
+}elseif(RegExpPrototypeTest(/^\.\.?\//,completeOn)){
+paths=[process.cwd()];
+}else{
+paths=ArrayPrototypeSlice(module.paths);
+}
 
-ArrayPrototypeForEach(paths,(dir)=>{
-dir=path.resolve(dir,subdir);
-constisInNodeModules=path.basename(dir)==='node_modules';
-constdirents=gracefulReaddir(dir,{withFileTypes: true})||[];
-ArrayPrototypeForEach(dirents,(dirent)=>{
-const{ name }=dirent;
-if(RegExpPrototypeTest(versionedFileNamesRe,name)||
-name==='.npm'){
-// Exclude versioned names that 'npm' installs.
-return;
-}
+ArrayPrototypeForEach(paths,(dir)=>{
+dir=path.resolve(dir,subdir);
+constisInNodeModules=path.basename(dir)==='node_modules';
+constdirents=gracefulReaddir(dir,{withFileTypes: true})||[];
+ArrayPrototypeForEach(dirents,(dirent)=>{
+const{ name }=dirent;
+if(RegExpPrototypeTest(versionedFileNamesRe,name)||
+name==='.npm'){
+// Exclude versioned names that 'npm' installs.
+return;
+}
 
-if(!dirent.isDirectory()){
-constextension=path.extname(name);
-if(StringPrototypeIncludes(extensions,extension)){
-ArrayPrototypePush(group,`${subdir}${name}`);
+if(!dirent.isDirectory()){
+constextension=path.extname(name);
+if(StringPrototypeIncludes(extensions,extension)){
+ArrayPrototypePush(group,`${subdir}${name}`);
+}
+return;
 }
-return;
-}
 
-ArrayPrototypePush(group,`${subdir}${name}/`);
-if(!subdir&&isInNodeModules){
-constabsolute=path.resolve(dir,name);
-constsubfiles=gracefulReaddir(absolute)||[];
-if(ArrayPrototypeSome(subfiles,(subfile)=>{
-returnArrayPrototypeIncludes(indexes,subfile);
-})){
-ArrayPrototypePush(group,`${subdir}${name}`);
+ArrayPrototypePush(group,`${subdir}${name}/`);
+if(!subdir&&isInNodeModules){
+constabsolute=path.resolve(dir,name);
+constsubfiles=gracefulReaddir(absolute)||[];
+if(ArrayPrototypeSome(subfiles,(subfile)=>{
+returnArrayPrototypeIncludes(indexes,subfile);
+})){
+ArrayPrototypePush(group,`${subdir}${name}`);
+}
 }
-}
+});
 });
-});
 
-if(group.length){
-ArrayPrototypePush(completionGroups,group);
+if(group.length){
+ArrayPrototypePush(completionGroups,group);
+}
 }
 
-if(!subdir){
-ArrayPrototypePush(completionGroups,_builtinLibs,nodeSchemeBuiltinLibs);
-}
+ArrayPrototypePush(completionGroups,_builtinLibs,nodeSchemeBuiltinLibs);
 }elseif(RegExpPrototypeTest(fsAutoCompleteRE,line)&&
 this.allowBlockingCompletions){
 ({0: completionGroups,1: completeOn}=completeFSFunctions(line));

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

@@ -5,9 +5,7 @@ const ArrayStream = require('../common/arraystream');
 constfixtures=require('../common/fixtures');
 constassert=require('assert');
 const{ builtinModules }=require('module');
-constpublicModules=builtinModules.filter(
-(lib)=>!lib.startsWith('_')&&!lib.includes('/'),
-);
+constpublicModules=builtinModules.filter((lib)=>!lib.startsWith('_'));
 
 if(!common.isMainThread)
 common.skip('process.chdir is not available in Workers');

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

@@ -31,9 +31,7 @@ const assert = require('assert');
 constpath=require('path');
 constfixtures=require('../common/fixtures');
 const{ builtinModules }=require('module');
-constpublicModules=builtinModules.filter(
-(lib)=>!lib.startsWith('_')&&!lib.includes('/'),
-);
+constpublicModules=builtinModules.filter((lib)=>!lib.startsWith('_'));
 
 consthasInspector=process.features.inspector;