module: support pattern trailers for imports field

PR-URL: #40041 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Geoffrey Booth <[email protected]>

Author: guybedford

lib/internal/modules/esm/resolve.js

@@ -22,7 +22,6 @@ const{
  StringPrototypeSlice,
  StringPrototypeSplit,
  StringPrototypeStartsWith,
- StringPrototypeSubstr,
 }=primordials;
 constinternalFS=require('internal/fs/utils');
 const{ NativeModule }=require('internal/bootstrap/loaders');
@@ -582,38 +581,49 @@ function packageImportsResolve(name, base, conditions){
 packageJSONUrl=pathToFileURL(packageConfig.pjsonPath);
 constimports=packageConfig.imports;
 if(imports){
-if(ObjectPrototypeHasOwnProperty(imports,name)){
+if(ObjectPrototypeHasOwnProperty(imports,name)&&
+!StringPrototypeIncludes(name,'*')&&
+!StringPrototypeEndsWith(name,'/')){
 constresolved=resolvePackageTarget(
 packageJSONUrl,imports[name],'',name,base,false,true,conditions
 );
 if(resolved!==null)
 return{ resolved,exact: true};
 }else{
 letbestMatch='';
+letbestMatchSubpath;
 constkeys=ObjectGetOwnPropertyNames(imports);
 for(leti=0;i<keys.length;i++){
 constkey=keys[i];
-if(key[key.length-1]==='*'&&
+constpatternIndex=StringPrototypeIndexOf(key,'*');
+if(patternIndex!==-1&&
 StringPrototypeStartsWith(name,
-StringPrototypeSlice(key,0,-1))&&
-name.length>=key.length&&
-key.length>bestMatch.length){
-bestMatch=key;
+StringPrototypeSlice(key,0,
+patternIndex))){
+constpatternTrailer=StringPrototypeSlice(key,patternIndex+1);
+if(name.length>=key.length&&
+StringPrototypeEndsWith(name,patternTrailer)&&
+patternKeyCompare(bestMatch,key)===1&&
+StringPrototypeLastIndexOf(key,'*')===patternIndex){
+bestMatch=key;
+bestMatchSubpath=StringPrototypeSlice(
+name,patternIndex,name.length-patternTrailer.length);
+}
 }elseif(key[key.length-1]==='/'&&
 StringPrototypeStartsWith(name,key)&&
-key.length>bestMatch.length){
+patternKeyCompare(bestMatch,key)===1){
 bestMatch=key;
+bestMatchSubpath=StringPrototypeSlice(name,key.length);
 }
 }
 
 if(bestMatch){
 consttarget=imports[bestMatch];
-constpattern=bestMatch[bestMatch.length-1]==='*';
-constsubpath=StringPrototypeSubstr(name,bestMatch.length-
-(pattern ? 1 : 0));
-constresolved=resolvePackageTarget(
-packageJSONUrl,target,subpath,bestMatch,base,pattern,true,
-conditions);
+constpattern=StringPrototypeIncludes(bestMatch,'*');
+constresolved=resolvePackageTarget(packageJSONUrl,target,
+bestMatchSubpath,bestMatch,
+base,pattern,true,
+conditions);
 if(resolved!==null)
 return{ resolved,exact: pattern};
 }

test/es-module/test-esm-imports.mjs

@@ -20,6 +20,8 @@ const{requireImport, importImport } = importer;
 ['#external',{default: 'asdf'}],
 // External subpath imports
 ['#external/subpath/asdf.js',{default: 'asdf'}],
+// Trailing pattern imports
+['#subpath/asdf.asdf',{default: 'test'}],
 ]);
 
 for(const[validSpecifier,expected]ofinternalImports){

test/fixtures/es-modules/pkgimports/package.json

@@ -6,6 +6,7 @@
 "require": "./requirebranch.js"
  },
 "#subpath/*": "./sub/*",
+"#subpath/*.asdf": "./test.js",
 "#external": "pkgexports/valid-cjs",
 "#external/subpath/*": "pkgexports/sub/*",
 "#external/invalidsubpath/": "pkgexports/sub",