1+ import {
2+ getModuleSpecifierPreferences ,
3+ } from "../compiler/moduleSpecifiers" ;
14import {
25 addToSeen ,
36 altDirectorySeparator ,
@@ -52,7 +55,6 @@ import {
5255 getEffectiveTypeRoots ,
5356 getEmitModuleResolutionKind ,
5457 getLeadingCommentRanges ,
55- getModuleSpecifierEndingPreference ,
5658 getOwnKeys ,
5759 getPackageJsonTypesVersionsPaths ,
5860 getPathComponents ,
@@ -744,7 +746,7 @@ function getCompletionEntriesForDirectoryFragment(
744746 continue ;
745747 }
746748
747- const { name, extension } = getFilenameWithExtensionOption ( getBaseFileName ( filePath ) , host . getCompilationSettings ( ) , extensionOptions ) ;
749+ const { name, extension } = getFilenameWithExtensionOption ( getBaseFileName ( filePath ) , host . getCompilationSettings ( ) , extensionOptions , /*isExportsWildcard*/ false ) ;
748750 result . add ( nameAndKind ( name , ScriptElementKind . scriptElement , extension ) ) ;
749751 }
750752 }
@@ -764,7 +766,7 @@ function getCompletionEntriesForDirectoryFragment(
764766 return result ;
765767}
766768
767- function getFilenameWithExtensionOption ( name : string , compilerOptions : CompilerOptions , extensionOptions : ExtensionOptions ) : { name : string ; extension : Extension | undefined ; } {
769+ function getFilenameWithExtensionOption ( name : string , compilerOptions : CompilerOptions , extensionOptions : ExtensionOptions , isExportsWildcard : boolean ) : { name : string ; extension : Extension | undefined ; } {
768770 const nonJsResult = moduleSpecifiers . tryGetRealFileNameForNonJsDeclarationFileName ( name ) ;
769771 if ( nonJsResult ) {
770772 return { name : nonJsResult , extension : tryGetExtensionFromPath ( nonJsResult ) } ;
@@ -773,8 +775,19 @@ function getFilenameWithExtensionOption(name: string, compilerOptions: CompilerO
773775 return { name, extension : tryGetExtensionFromPath ( name ) } ;
774776 }
775777
776- const endingPreference = getModuleSpecifierEndingPreference ( extensionOptions . endingPreference , extensionOptions . resolutionMode , compilerOptions , extensionOptions . importingSourceFile ) ;
777- if ( endingPreference === ModuleSpecifierEnding . TsExtension ) {
778+ let allowedEndings = getModuleSpecifierPreferences (
779+ { importModuleSpecifierEnding : extensionOptions . endingPreference } ,
780+ compilerOptions ,
781+ extensionOptions . importingSourceFile ,
782+ ) . getAllowedEndingsInPreferredOrder ( extensionOptions . resolutionMode ) ;
783+
784+ if ( isExportsWildcard ) {
785+ // If we're completing `import {} from "foo/|"` and subpaths are available via `"exports": { "./*": "./src/*" }`,
786+ // the completion must be a (potentially extension-swapped) file name. Dropping extensions and index files is not allowed.
787+ allowedEndings = allowedEndings . filter ( e => e !== ModuleSpecifierEnding . Minimal && e !== ModuleSpecifierEnding . Index ) ;
788+ }
789+
790+ if ( allowedEndings [ 0 ] === ModuleSpecifierEnding . TsExtension ) {
778791 if ( fileExtensionIsOneOf ( name , supportedTSImplementationExtensions ) ) {
779792 return { name, extension : tryGetExtensionFromPath ( name ) } ;
780793 }
@@ -785,7 +798,8 @@ function getFilenameWithExtensionOption(name: string, compilerOptions: CompilerO
785798 }
786799
787800 if (
788- ( endingPreference === ModuleSpecifierEnding . Minimal || endingPreference === ModuleSpecifierEnding . Index ) &&
801+ ! isExportsWildcard &&
802+ ( allowedEndings [ 0 ] === ModuleSpecifierEnding . Minimal || allowedEndings [ 0 ] === ModuleSpecifierEnding . Index ) &&
789803 fileExtensionIsOneOf ( name , [ Extension . Js , Extension . Jsx , Extension . Ts , Extension . Tsx , Extension . Dts ] )
790804 ) {
791805 return { name : removeFileExtension ( name ) , extension : tryGetExtensionFromPath ( name ) } ;
@@ -814,12 +828,13 @@ function addCompletionEntriesFromPaths(
814828 const lengthB = typeof patternB === "object" ? patternB . prefix . length : b . length ;
815829 return compareValues ( lengthB , lengthA ) ;
816830 } ;
817- return addCompletionEntriesFromPathsOrExports ( result , fragment , baseDirectory , extensionOptions , host , getOwnKeys ( paths ) , getPatternsForKey , comparePaths ) ;
831+ return addCompletionEntriesFromPathsOrExports ( result , /*isExports*/ false , fragment , baseDirectory , extensionOptions , host , getOwnKeys ( paths ) , getPatternsForKey , comparePaths ) ;
818832}
819833
820834/** @returns whether `fragment` was a match for any `paths` (which should indicate whether any other path completions should be offered) */
821835function addCompletionEntriesFromPathsOrExports (
822836 result : NameAndKindSet ,
837+ isExports : boolean ,
823838 fragment : string ,
824839 baseDirectory : string ,
825840 extensionOptions : ExtensionOptions ,
@@ -857,7 +872,7 @@ function addCompletionEntriesFromPathsOrExports(
857872 if ( typeof pathPattern === "string" || matchedPath === undefined || comparePaths ( key , matchedPath ) !== Comparison . GreaterThan ) {
858873 pathResults . push ( {
859874 matchedPattern : isMatch ,
860- results : getCompletionsForPathMapping ( keyWithoutLeadingDotSlash , patterns , fragment , baseDirectory , extensionOptions , host )
875+ results : getCompletionsForPathMapping ( keyWithoutLeadingDotSlash , patterns , fragment , baseDirectory , extensionOptions , isExports && isMatch , host )
861876 . map ( ( { name, kind, extension } ) => nameAndKind ( name , kind , extension ) ) ,
862877 } ) ;
863878 }
@@ -956,6 +971,7 @@ function getCompletionEntriesForNonRelativeModules(
956971 const conditions = getConditions ( compilerOptions , mode ) ;
957972 addCompletionEntriesFromPathsOrExports (
958973 result ,
974+ /*isExports*/ true ,
959975 fragmentSubpath ,
960976 packageDirectory ,
961977 extensionOptions ,
@@ -1001,6 +1017,7 @@ function getCompletionsForPathMapping(
10011017 fragment : string ,
10021018 packageDirectory : string ,
10031019 extensionOptions : ExtensionOptions ,
1020+ isExportsWildcard : boolean ,
10041021 host : LanguageServiceHost ,
10051022) : readonly NameAndKind [ ] {
10061023 if ( ! endsWith ( path , "*" ) ) {
@@ -1012,9 +1029,9 @@ function getCompletionsForPathMapping(
10121029 const remainingFragment = tryRemovePrefix ( fragment , pathPrefix ) ;
10131030 if ( remainingFragment === undefined ) {
10141031 const starIsFullPathComponent = path [ path . length - 2 ] === "/" ;
1015- return starIsFullPathComponent ? justPathMappingName ( pathPrefix , ScriptElementKind . directory ) : flatMap ( patterns , pattern => getModulesForPathsPattern ( "" , packageDirectory , pattern , extensionOptions , host ) ?. map ( ( { name, ...rest } ) => ( { name : pathPrefix + name , ...rest } ) ) ) ;
1032+ return starIsFullPathComponent ? justPathMappingName ( pathPrefix , ScriptElementKind . directory ) : flatMap ( patterns , pattern => getModulesForPathsPattern ( "" , packageDirectory , pattern , extensionOptions , isExportsWildcard , host ) ?. map ( ( { name, ...rest } ) => ( { name : pathPrefix + name , ...rest } ) ) ) ;
10161033 }
1017- return flatMap ( patterns , pattern => getModulesForPathsPattern ( remainingFragment , packageDirectory , pattern , extensionOptions , host ) ) ;
1034+ return flatMap ( patterns , pattern => getModulesForPathsPattern ( remainingFragment , packageDirectory , pattern , extensionOptions , isExportsWildcard , host ) ) ;
10181035
10191036 function justPathMappingName ( name : string , kind : ScriptElementKind . directory | ScriptElementKind . scriptElement ) : readonly NameAndKind [ ] {
10201037 return startsWith ( name , fragment ) ? [ { name : removeTrailingDirectorySeparator ( name ) , kind, extension : undefined } ] : emptyArray ;
@@ -1026,6 +1043,7 @@ function getModulesForPathsPattern(
10261043 packageDirectory : string ,
10271044 pattern : string ,
10281045 extensionOptions : ExtensionOptions ,
1046+ isExportsWildcard : boolean ,
10291047 host : LanguageServiceHost ,
10301048) : readonly NameAndKind [ ] | undefined {
10311049 if ( ! host . readDirectory ) {
@@ -1074,7 +1092,7 @@ function getModulesForPathsPattern(
10741092 if ( containsSlash ( trimmedWithPattern ) ) {
10751093 return directoryResult ( getPathComponents ( removeLeadingDirectorySeparator ( trimmedWithPattern ) ) [ 1 ] ) ;
10761094 }
1077- const { name, extension } = getFilenameWithExtensionOption ( trimmedWithPattern , host . getCompilationSettings ( ) , extensionOptions ) ;
1095+ const { name, extension } = getFilenameWithExtensionOption ( trimmedWithPattern , host . getCompilationSettings ( ) , extensionOptions , isExportsWildcard ) ;
10781096 return nameAndKind ( name , ScriptElementKind . scriptElement , extension ) ;
10791097 }
10801098 } ) ;
0 commit comments