Add string literal completions for package.json imports field
#57718
Conversation
| @@ -6288,6 6290,21 @@ export function getPossibleOriginalInputExtensionForExtension(path: string) { | |||
| [Extension.Tsx, Extension.Ts, Extension.Jsx, Extension.Js]; | |||
| } | |||
|
|
|||
| /** @internal */ | |||
| export function getPossibleOriginalInputPathWithoutChangingExt( | |||
There was a problem hiding this comment.
this is kinda a reverse of getOutputPathWithoutChangingExt:
TypeScript/src/compiler/emitter.ts
Lines 542 to 554 in 3fca8c8
| } | ||
| if (!seenPackageScope) { | ||
| const packageFile = combinePaths(ancestor, "package.json"); | ||
| if (seenPackageScope = tryFileExists(host, packageFile)) { |
There was a problem hiding this comment.
TODO: this has to be heavily deduplicated with the existing branch that handles exports
| @@ -938,10 951,41 @@ function getCompletionEntriesForNonRelativeModules( | |||
| } | |||
| } | |||
| if (!foundGlobal) { | |||
| let seenPackageScope = false; | |||
There was a problem hiding this comment.
TODO: add a test case that will show that it's needed
src/services/stringCompletions.ts
Outdated
| @@ -1072,9 1153,11 @@ function getModulesForPathsPattern( | |||
|
|
|||
| const normalizedSuffix = normalizePath(parsed.suffix); | |||
| const declarationExtension = normalizedSuffix && getDeclarationEmitExtensionForPath("_" normalizedSuffix); | |||
| const matchingSuffixes = declarationExtension ? [changeExtension(normalizedSuffix, declarationExtension), normalizedSuffix] : [normalizedSuffix]; | |||
| const inputExtension = isImports && normalizedSuffix ? getPossibleOriginalInputExtensionForExtension("_" normalizedSuffix) : undefined; | |||
There was a problem hiding this comment.
All of the logic in this function assumes the same extensions between potential inputs and outputs and stuff. This can impact the used globs but I think it's largely fine right now - unless somebody would come up with a compelling test case that should work differently.
|
@andrewbranch I opened this as a draft because there are some minor cleanups to be done here. I'd appreciate an early review here though - in case there is something fundamentally wrong with this. |
There was a problem hiding this comment.
I need more test cases like this but with a pattern. Atm, I didn't add any special logic for declarationDir - this "exact" match works solely based on the fact that it's exact. It doesn't even need to check if the corresponding file exists on the disk or not so it doesn't perform any output->input mapping etc. This has to be fixed.
|
@Andarist did you still want to pursue this? We're looking to get this done in the TS 5.7 timeframe. |
|
@DanielRosenwasser yes, it would be great if @andrewbranch could give this a quick look to check if im not doing anything overly wrong so I dont spend too much time on cleaning up things that will turn out to be wrong in the end ;p |
|
@andrewbranch thanks for the review! I’ll try to clean this up asap |
…letions # Conflicts: # src/compiler/utilities.ts # src/services/stringCompletions.ts
Andarist
force-pushed
the
pkg-json-imports-completions
branch
from
06559e9
to
22b6148
Compare
|
The TypeScript team hasn't accepted the linked issue #52460. If you can get it accepted, this PR will have a better chance of being reviewed. |
|
I have been busy the last 2 weeks, I've done some progress on this in the past days but I hope to get everything done till the end of this week 🤞 |
closes #52460
closes #57680
closes #57777
Currently, this only has tests based on #55015 but I still have to add more