Add string literal completions for package.jsonimports field

src/compiler/moduleNameResolver.ts

@@ -2618,8 +2618,8 @@ function loadModuleFromExports(scope: PackageJsonInfo, extensions: Extensions, s
  mainExport = (scope.contents.packageJsonContent.exports as MapLike<unknown>)["."];
  }
  if (mainExport) {
- const loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, subpath, scope, /*isImports*/ false);
- return loadModuleFromTargetImportOrExport(mainExport, "", /*pattern*/ false, ".");
+ const loadModuleFromTargetExportOrImport = getLoadModuleFromTargetExportOrImport(extensions, state, cache, redirectedReference, subpath, scope, /*isImports*/ false);
+ return loadModuleFromTargetExportOrImport(mainExport, "", /*pattern*/ false, ".");
  }
  }
  else if (allKeysStartWithDot(scope.contents.packageJsonContent.exports as MapLike<unknown>)) {
@@ -2629,7 +2629,7 @@ function loadModuleFromExports(scope: PackageJsonInfo, extensions: Extensions, s
  }
  return toSearchResult(/*value*/ undefined);
  }
- const result = loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, subpath, scope.contents.packageJsonContent.exports, scope, /*isImports*/ false);
+ const result = loadModuleFromExportsOrImports(extensions, state, cache, redirectedReference, subpath, scope.contents.packageJsonContent.exports, scope, /*isImports*/ false);
  if (result) {
  return result;
  }
@@ -2663,7 +2663,7 @@ function loadModuleFromImports(extensions: Extensions, moduleName: string, direc
  return toSearchResult(/*value*/ undefined);
  }
 
- const result = loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, moduleName, scope.contents.packageJsonContent.imports, scope, /*isImports*/ true);
+ const result = loadModuleFromExportsOrImports(extensions, state, cache, redirectedReference, moduleName, scope.contents.packageJsonContent.imports, scope, /*isImports*/ true);
  if (result) {
  return result;
  }
@@ -2693,30 +2693,30 @@ export function comparePatternKeys(a: string, b: string): Comparison {
  return Comparison.EqualTo;
 }
 
-function loadModuleFromImportsOrExports(extensions: Extensions, state: ModuleResolutionState, cache: ModuleResolutionCache | undefined, redirectedReference: ResolvedProjectReference | undefined, moduleName: string, lookupTable: object, scope: PackageJsonInfo, isImports: boolean): SearchResult<Resolved> | undefined {
- const loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
+function loadModuleFromExportsOrImports(extensions: Extensions, state: ModuleResolutionState, cache: ModuleResolutionCache | undefined, redirectedReference: ResolvedProjectReference | undefined, moduleName: string, lookupTable: object, scope: PackageJsonInfo, isImports: boolean): SearchResult<Resolved> | undefined {
+ const loadModuleFromTargetExportOrImport = getLoadModuleFromTargetExportOrImport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
 
  if (!endsWith(moduleName, directorySeparator) && !moduleName.includes("*") && hasProperty(lookupTable, moduleName)) {
- const target = (lookupTable as { [idx: string]: unknown; })[moduleName];
- return loadModuleFromTargetImportOrExport(target, /*subpath*/ "", /*pattern*/ false, moduleName);
+ const target = (lookupTable as MapLike<unknown>)[moduleName];
+ return loadModuleFromTargetExportOrImport(target, /*subpath*/ "", /*pattern*/ false, moduleName);
  }
  const expandingKeys = toSorted(filter(getOwnKeys(lookupTable as MapLike<unknown>), k => hasOneAsterisk(k) || endsWith(k, "/")), comparePatternKeys);
  for (const potentialTarget of expandingKeys) {
  if (state.features & NodeResolutionFeatures.ExportsPatternTrailers && matchesPatternWithTrailer(potentialTarget, moduleName)) {
- const target = (lookupTable as { [idx: string]: unknown; })[potentialTarget];
+ const target = (lookupTable as MapLike<unknown>)[potentialTarget];
  const starPos = potentialTarget.indexOf("*");
  const subpath = moduleName.substring(potentialTarget.substring(0, starPos).length, moduleName.length - (potentialTarget.length - 1 - starPos));
- return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true, potentialTarget);
+ return loadModuleFromTargetExportOrImport(target, subpath, /*pattern*/ true, potentialTarget);
  }
  else if (endsWith(potentialTarget, "*") && startsWith(moduleName, potentialTarget.substring(0, potentialTarget.length - 1))) {
- const target = (lookupTable as { [idx: string]: unknown; })[potentialTarget];
+ const target = (lookupTable as MapLike<unknown>)[potentialTarget];
  const subpath = moduleName.substring(potentialTarget.length - 1);
- return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ true, potentialTarget);
+ return loadModuleFromTargetExportOrImport(target, subpath, /*pattern*/ true, potentialTarget);
  }
  else if (startsWith(moduleName, potentialTarget)) {
- const target = (lookupTable as { [idx: string]: unknown; })[potentialTarget];
+ const target = (lookupTable as MapLike<unknown>)[potentialTarget];
  const subpath = moduleName.substring(potentialTarget.length);
- return loadModuleFromTargetImportOrExport(target, subpath, /*pattern*/ false, potentialTarget);
+ return loadModuleFromTargetExportOrImport(target, subpath, /*pattern*/ false, potentialTarget);
  }
  }
 
@@ -2736,9 +2736,9 @@ function hasOneAsterisk(patternKey: string): boolean {
 /**
  * Gets the self-recursive function specialized to retrieving the targeted import/export element for the given resolution configuration
  */
-function getLoadModuleFromTargetImportOrExport(extensions: Extensions, state: ModuleResolutionState, cache: ModuleResolutionCache | undefined, redirectedReference: ResolvedProjectReference | undefined, moduleName: string, scope: PackageJsonInfo, isImports: boolean) {
- return loadModuleFromTargetImportOrExport;
- function loadModuleFromTargetImportOrExport(target: unknown, subpath: string, pattern: boolean, key: string): SearchResult<Resolved> | undefined {
+function getLoadModuleFromTargetExportOrImport(extensions: Extensions, state: ModuleResolutionState, cache: ModuleResolutionCache | undefined, redirectedReference: ResolvedProjectReference | undefined, moduleName: string, scope: PackageJsonInfo, isImports: boolean) {
+ return loadModuleFromTargetExportOrImport;
+ function loadModuleFromTargetExportOrImport(target: unknown, subpath: string, pattern: boolean, key: string): SearchResult<Resolved> | undefined {
  if (typeof target === "string") {
  if (!pattern && subpath.length > 0 && !endsWith(target, "/")) {
  if (state.traceEnabled) {
@@ -2801,7 +2801,7 @@ function getLoadModuleFromTargetImportOrExport(extensions: Extensions, state: Mo
  if (condition === "default" || state.conditions.includes(condition) || isApplicableVersionedTypesKey(state.conditions, condition)) {
  traceIfEnabled(state, Diagnostics.Matched_0_condition_1, isImports ? "imports" : "exports", condition);
  const subTarget = (target as MapLike<unknown>)[condition];
- const result = loadModuleFromTargetImportOrExport(subTarget, subpath, pattern, key);
+ const result = loadModuleFromTargetExportOrImport(subTarget, subpath, pattern, key);
  if (result) {
  traceIfEnabled(state, Diagnostics.Resolved_under_condition_0, condition);
  traceIfEnabled(state, Diagnostics.Exiting_conditional_exports);
@@ -2826,7 +2826,7 @@ function getLoadModuleFromTargetImportOrExport(extensions: Extensions, state: Mo
  return toSearchResult(/*value*/ undefined);
  }
  for (const elem of target) {
- const result = loadModuleFromTargetImportOrExport(elem, subpath, pattern, key);
+ const result = loadModuleFromTargetExportOrImport(elem, subpath, pattern, key);
  if (result) {
  return result;
  }

src/compiler/utilities.ts

@@ -201,6 +201,7 @@ import {
  getParseTreeNode,
  getPathComponents,
  getPathFromPathComponents,
+ getRelativePathFromDirectory,
  getRelativePathToDirectoryOrUrl,
  getResolutionModeOverride,
  getRootLength,
@@ -496,6 +497,7 @@ import {
  ResolvedModuleWithFailedLookupLocations,
  ResolvedTypeReferenceDirective,
  ResolvedTypeReferenceDirectiveWithFailedLookupLocations,
+ resolvePath,
  returnFalse,
  ReturnStatement,
  returnUndefined,
@@ -6493,6 +6495,21 @@ export function getPossibleOriginalInputExtensionForExtension(path: string): Ext
  [Extension.Tsx, Extension.Ts, Extension.Jsx, Extension.Js];
 }
 
+/** @internal */
+export function getPossibleOriginalInputPathWithoutChangingExt(
+ filePath: string,
+ ignoreCase: boolean,
+ outputDir: string | undefined,
+ getCommonSourceDirectory: () => string,
+): string {
+ return outputDir ?
+ resolvePath(
+ getCommonSourceDirectory(),
+ getRelativePathFromDirectory(outputDir, filePath, ignoreCase),
+ ) :
+ filePath;
+}
+
 /**
  * Returns 'undefined' if and only if 'options.paths' is undefined.
  *

src/harness/vfsUtil.ts

@@ -1148,7 +1148,7 @@ export class FileSystem {
  for (const key of Object.keys(files)) {
  const value = normalizeFileSetEntry(files[key]);
  const path = dirname ? vpath.resolve(dirname, key) : key;
- vpath.validate(path, vpath.ValidationFlags.Absolute);
+ vpath.validate(path, vpath.ValidationFlags.Absolute | vpath.ValidationFlags.AllowWildcard);
 
  // eslint-disable-next-line no-restricted-syntax
  if (value === null || value === undefined || value instanceof Rmdir || value instanceof Unlink) {