typescript 5.7.0-dev.20241031 → 5.7.0-dev.20241101

package/lib/_tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.7";
-var version = `${versionMajorMinor}.0-dev.20241031`;
+var version = `${versionMajorMinor}.0-dev.20241101`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -40955,7 +40955,7 @@ function loadModuleFromExports(scope, extensions, subpath, state, cache, redirec
       mainExport = scope.contents.packageJsonContent.exports["."];
     }
     if (mainExport) {
-      const loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(
+      const loadModuleFromTargetExportOrImport = getLoadModuleFromTargetExportOrImport(
         extensions,
         state,
         cache,
@@ -40965,7 +40965,7 @@ function loadModuleFromExports(scope, extensions, subpath, state, cache, redirec
         /*isImports*/
         false
       );
-      return loadModuleFromTargetImportOrExport(
+      return loadModuleFromTargetExportOrImport(
         mainExport,
         "",
         /*pattern*/
@@ -40983,7 +40983,7 @@ function loadModuleFromExports(scope, extensions, subpath, state, cache, redirec
         void 0
       );
     }
-    const result = loadModuleFromImportsOrExports(
+    const result = loadModuleFromExportsOrImports(
       extensions,
       state,
       cache,
@@ -41037,7 +41037,7 @@ function loadModuleFromImports(extensions, moduleName, directory, state, cache,
       void 0
     );
   }
-  const result = loadModuleFromImportsOrExports(
+  const result = loadModuleFromExportsOrImports(
     extensions,
     state,
     cache,
@@ -41072,11 +41072,11 @@ function comparePatternKeys(a, b) {
   if (b.length > a.length) return 1 /* GreaterThan */;
   return 0 /* EqualTo */;
 }
-function loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, moduleName, lookupTable, scope, isImports) {
-  const loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
+function loadModuleFromExportsOrImports(extensions, state, cache, redirectedReference, moduleName, lookupTable, scope, isImports) {
+  const loadModuleFromTargetExportOrImport = getLoadModuleFromTargetExportOrImport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
   if (!endsWith(moduleName, directorySeparator) && !moduleName.includes("*") && hasProperty(lookupTable, moduleName)) {
     const target = lookupTable[moduleName];
-    return loadModuleFromTargetImportOrExport(
+    return loadModuleFromTargetExportOrImport(
       target,
       /*subpath*/
       "",
@@ -41091,7 +41091,7 @@ function loadModuleFromImportsOrExports(extensions, state, cache, redirectedRefe
       const target = lookupTable[potentialTarget];
       const starPos = potentialTarget.indexOf("*");
       const subpath = moduleName.substring(potentialTarget.substring(0, starPos).length, moduleName.length - (potentialTarget.length - 1 - starPos));
-      return loadModuleFromTargetImportOrExport(
+      return loadModuleFromTargetExportOrImport(
         target,
         subpath,
         /*pattern*/
@@ -41101,7 +41101,7 @@ function loadModuleFromImportsOrExports(extensions, state, cache, redirectedRefe
     } else if (endsWith(potentialTarget, "*") && startsWith(moduleName, potentialTarget.substring(0, potentialTarget.length - 1))) {
       const target = lookupTable[potentialTarget];
       const subpath = moduleName.substring(potentialTarget.length - 1);
-      return loadModuleFromTargetImportOrExport(
+      return loadModuleFromTargetExportOrImport(
         target,
         subpath,
         /*pattern*/
@@ -41111,7 +41111,7 @@ function loadModuleFromImportsOrExports(extensions, state, cache, redirectedRefe
     } else if (startsWith(moduleName, potentialTarget)) {
       const target = lookupTable[potentialTarget];
       const subpath = moduleName.substring(potentialTarget.length);
-      return loadModuleFromTargetImportOrExport(
+      return loadModuleFromTargetExportOrImport(
         target,
         subpath,
         /*pattern*/
@@ -41131,9 +41131,9 @@ function hasOneAsterisk(patternKey) {
   const firstStar = patternKey.indexOf("*");
   return firstStar !== -1 && firstStar === patternKey.lastIndexOf("*");
 }
-function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports) {
-  return loadModuleFromTargetImportOrExport;
-  function loadModuleFromTargetImportOrExport(target, subpath, pattern, key) {
+function getLoadModuleFromTargetExportOrImport(extensions, state, cache, redirectedReference, moduleName, scope, isImports) {
+  return loadModuleFromTargetExportOrImport;
+  function loadModuleFromTargetExportOrImport(target, subpath, pattern, key) {
     if (typeof target === "string") {
       if (!pattern && subpath.length > 0 && !endsWith(target, "/")) {
         if (state.traceEnabled) {
@@ -41223,7 +41223,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
           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[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);
@@ -41248,7 +41248,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
           );
         }
         for (const elem of target) {
-          const result = loadModuleFromTargetImportOrExport(elem, subpath, pattern, key);
+          const result = loadModuleFromTargetExportOrImport(elem, subpath, pattern, key);
           if (result) {
             return result;
           }
@@ -49690,7 +49690,7 @@ function createTypeChecker(host) {
     const links = getSymbolLinks(symbol);
     const cache = links.accessibleChainCache || (links.accessibleChainCache = /* @__PURE__ */ new Map());
     const firstRelevantLocation = forEachSymbolTableInScope(enclosingDeclaration, (_, __, ___, node) => node);
-    const key = `${useOnlyExternalAliasing ? 0 : 1}|${firstRelevantLocation && getNodeId(firstRelevantLocation)}|${meaning}`;
+    const key = `${useOnlyExternalAliasing ? 0 : 1}|${firstRelevantLocation ? getNodeId(firstRelevantLocation) : 0}|${meaning}`;
     if (cache.has(key)) {
       return cache.get(key);
     }
@@ -55256,7 +55256,6 @@ function createTypeChecker(host) {
       const flags = 4 /* Property */ | (e.initializer ? 16777216 /* Optional */ : 0);
       const symbol = createSymbol(flags, text);
       symbol.links.type = getTypeFromBindingElement(e, includePatternInType, reportErrors2);
-      symbol.links.bindingElement = e;
       members.set(symbol.escapedName, symbol);
     });
     const result = createAnonymousType(
@@ -77661,7 +77660,7 @@ function createTypeChecker(host) {
     });
   }
   function checkIfExpressionRefinesParameter(func, expr, param, initType) {
-    const antecedent = expr.flowNode || expr.parent.kind === 253 /* ReturnStatement */ && expr.parent.flowNode || createFlowNode(
+    const antecedent = canHaveFlowNode(expr) && expr.flowNode || expr.parent.kind === 253 /* ReturnStatement */ && expr.parent.flowNode || createFlowNode(
       2 /* Start */,
       /*node*/
       void 0,

package/lib/typescript.js

@@ -945,6 +945,7 @@ __export(typescript_exports, {
   getPositionOfLineAndCharacter: () => getPositionOfLineAndCharacter,
   getPossibleGenericSignatures: () => getPossibleGenericSignatures,
   getPossibleOriginalInputExtensionForExtension: () => getPossibleOriginalInputExtensionForExtension,
+  getPossibleOriginalInputPathWithoutChangingExt: () => getPossibleOriginalInputPathWithoutChangingExt,
   getPossibleTypeArgumentsInfo: () => getPossibleTypeArgumentsInfo,
   getPreEmitDiagnostics: () => getPreEmitDiagnostics,
   getPrecedingNonSpaceCharacterPosition: () => getPrecedingNonSpaceCharacterPosition,
@@ -2277,7 +2278,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.7";
-var version = `${versionMajorMinor}.0-dev.20241031`;
+var version = `${versionMajorMinor}.0-dev.20241101`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -20204,6 +20205,12 @@ function getDeclarationEmitExtensionForPath(path) {
 function getPossibleOriginalInputExtensionForExtension(path) {
   return fileExtensionIsOneOf(path, [".d.mts" /* Dmts */, ".mjs" /* Mjs */, ".mts" /* Mts */]) ? [".mts" /* Mts */, ".mjs" /* Mjs */] : fileExtensionIsOneOf(path, [".d.cts" /* Dcts */, ".cjs" /* Cjs */, ".cts" /* Cts */]) ? [".cts" /* Cts */, ".cjs" /* Cjs */] : fileExtensionIsOneOf(path, [`.d.json.ts`]) ? [".json" /* Json */] : [".tsx" /* Tsx */, ".ts" /* Ts */, ".jsx" /* Jsx */, ".js" /* Js */];
 }
+function getPossibleOriginalInputPathWithoutChangingExt(filePath, ignoreCase, outputDir, getCommonSourceDirectory2) {
+  return outputDir ? resolvePath(
+    getCommonSourceDirectory2(),
+    getRelativePathFromDirectory(outputDir, filePath, ignoreCase)
+  ) : filePath;
+}
 function getPathsBasePath(options, host) {
   var _a;
   if (!options.paths) return void 0;
@@ -45433,7 +45440,7 @@ function loadModuleFromExports(scope, extensions, subpath, state, cache, redirec
       mainExport = scope.contents.packageJsonContent.exports["."];
     }
     if (mainExport) {
-      const loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(
+      const loadModuleFromTargetExportOrImport = getLoadModuleFromTargetExportOrImport(
         extensions,
         state,
         cache,
@@ -45443,7 +45450,7 @@ function loadModuleFromExports(scope, extensions, subpath, state, cache, redirec
         /*isImports*/
         false
       );
-      return loadModuleFromTargetImportOrExport(
+      return loadModuleFromTargetExportOrImport(
         mainExport,
         "",
         /*pattern*/
@@ -45461,7 +45468,7 @@ function loadModuleFromExports(scope, extensions, subpath, state, cache, redirec
         void 0
       );
     }
-    const result = loadModuleFromImportsOrExports(
+    const result = loadModuleFromExportsOrImports(
       extensions,
       state,
       cache,
@@ -45515,7 +45522,7 @@ function loadModuleFromImports(extensions, moduleName, directory, state, cache,
       void 0
     );
   }
-  const result = loadModuleFromImportsOrExports(
+  const result = loadModuleFromExportsOrImports(
     extensions,
     state,
     cache,
@@ -45550,11 +45557,11 @@ function comparePatternKeys(a, b) {
   if (b.length > a.length) return 1 /* GreaterThan */;
   return 0 /* EqualTo */;
 }
-function loadModuleFromImportsOrExports(extensions, state, cache, redirectedReference, moduleName, lookupTable, scope, isImports) {
-  const loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
+function loadModuleFromExportsOrImports(extensions, state, cache, redirectedReference, moduleName, lookupTable, scope, isImports) {
+  const loadModuleFromTargetExportOrImport = getLoadModuleFromTargetExportOrImport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
   if (!endsWith(moduleName, directorySeparator) && !moduleName.includes("*") && hasProperty(lookupTable, moduleName)) {
     const target = lookupTable[moduleName];
-    return loadModuleFromTargetImportOrExport(
+    return loadModuleFromTargetExportOrImport(
       target,
       /*subpath*/
       "",
@@ -45569,7 +45576,7 @@ function loadModuleFromImportsOrExports(extensions, state, cache, redirectedRefe
       const target = lookupTable[potentialTarget];
       const starPos = potentialTarget.indexOf("*");
       const subpath = moduleName.substring(potentialTarget.substring(0, starPos).length, moduleName.length - (potentialTarget.length - 1 - starPos));
-      return loadModuleFromTargetImportOrExport(
+      return loadModuleFromTargetExportOrImport(
         target,
         subpath,
         /*pattern*/
@@ -45579,7 +45586,7 @@ function loadModuleFromImportsOrExports(extensions, state, cache, redirectedRefe
     } else if (endsWith(potentialTarget, "*") && startsWith(moduleName, potentialTarget.substring(0, potentialTarget.length - 1))) {
       const target = lookupTable[potentialTarget];
       const subpath = moduleName.substring(potentialTarget.length - 1);
-      return loadModuleFromTargetImportOrExport(
+      return loadModuleFromTargetExportOrImport(
         target,
         subpath,
         /*pattern*/
@@ -45589,7 +45596,7 @@ function loadModuleFromImportsOrExports(extensions, state, cache, redirectedRefe
     } else if (startsWith(moduleName, potentialTarget)) {
       const target = lookupTable[potentialTarget];
       const subpath = moduleName.substring(potentialTarget.length);
-      return loadModuleFromTargetImportOrExport(
+      return loadModuleFromTargetExportOrImport(
         target,
         subpath,
         /*pattern*/
@@ -45609,9 +45616,9 @@ function hasOneAsterisk(patternKey) {
   const firstStar = patternKey.indexOf("*");
   return firstStar !== -1 && firstStar === patternKey.lastIndexOf("*");
 }
-function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports) {
-  return loadModuleFromTargetImportOrExport;
-  function loadModuleFromTargetImportOrExport(target, subpath, pattern, key) {
+function getLoadModuleFromTargetExportOrImport(extensions, state, cache, redirectedReference, moduleName, scope, isImports) {
+  return loadModuleFromTargetExportOrImport;
+  function loadModuleFromTargetExportOrImport(target, subpath, pattern, key) {
     if (typeof target === "string") {
       if (!pattern && subpath.length > 0 && !endsWith(target, "/")) {
         if (state.traceEnabled) {
@@ -45701,7 +45708,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
           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[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);
@@ -45726,7 +45733,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
           );
         }
         for (const elem of target) {
-          const result = loadModuleFromTargetImportOrExport(elem, subpath, pattern, key);
+          const result = loadModuleFromTargetExportOrImport(elem, subpath, pattern, key);
           if (result) {
             return result;
           }
@@ -54286,7 +54293,7 @@ function createTypeChecker(host) {
     const links = getSymbolLinks(symbol);
     const cache = links.accessibleChainCache || (links.accessibleChainCache = /* @__PURE__ */ new Map());
     const firstRelevantLocation = forEachSymbolTableInScope(enclosingDeclaration, (_, __, ___, node) => node);
-    const key = `${useOnlyExternalAliasing ? 0 : 1}|${firstRelevantLocation && getNodeId(firstRelevantLocation)}|${meaning}`;
+    const key = `${useOnlyExternalAliasing ? 0 : 1}|${firstRelevantLocation ? getNodeId(firstRelevantLocation) : 0}|${meaning}`;
     if (cache.has(key)) {
       return cache.get(key);
     }
@@ -59852,7 +59859,6 @@ function createTypeChecker(host) {
       const flags = 4 /* Property */ | (e.initializer ? 16777216 /* Optional */ : 0);
       const symbol = createSymbol(flags, text);
       symbol.links.type = getTypeFromBindingElement(e, includePatternInType, reportErrors2);
-      symbol.links.bindingElement = e;
       members.set(symbol.escapedName, symbol);
     });
     const result = createAnonymousType(
@@ -82257,7 +82263,7 @@ function createTypeChecker(host) {
     });
   }
   function checkIfExpressionRefinesParameter(func, expr, param, initType) {
-    const antecedent = expr.flowNode || expr.parent.kind === 253 /* ReturnStatement */ && expr.parent.flowNode || createFlowNode(
+    const antecedent = canHaveFlowNode(expr) && expr.flowNode || expr.parent.kind === 253 /* ReturnStatement */ && expr.parent.flowNode || createFlowNode(
       2 /* Start */,
       /*node*/
       void 0,
@@ -140731,6 +140737,7 @@ var ExportKind = /* @__PURE__ */ ((ExportKind3) => {
   ExportKind3[ExportKind3["Default"] = 1] = "Default";
   ExportKind3[ExportKind3["ExportEquals"] = 2] = "ExportEquals";
   ExportKind3[ExportKind3["UMD"] = 3] = "UMD";
+  ExportKind3[ExportKind3["Module"] = 4] = "Module";
   return ExportKind3;
 })(ExportKind || {});
 function createCacheableExportInfoMap(host) {
@@ -146701,6 +146708,9 @@ function addTargetFileImports(oldFile, importsToCopy, targetFileImportsFromOldFi
     const targetSymbol = skipAlias(symbol, checker);
     if (checker.isUnknownSymbol(targetSymbol)) {
       importAdder.addVerbatimImport(Debug.checkDefined(declaration ?? findAncestor((_a = symbol.declarations) == null ? void 0 : _a[0], isAnyImportOrRequireStatement)));
+    } else if (targetSymbol.parent === void 0) {
+      Debug.assert(declaration !== void 0, "expected module symbol to have a declaration");
+      importAdder.addImportForModuleSymbol(symbol, isValidTypeOnlyUseSite, declaration);
     } else {
       importAdder.addImportFromExportedSymbol(targetSymbol, isValidTypeOnlyUseSite, declaration);
     }
@@ -156919,7 +156929,7 @@ function createImportAdderWorker(sourceFile, program, useAutoImportProvider, pre
   const removeExisting = /* @__PURE__ */ new Set();
   const verbatimImports = /* @__PURE__ */ new Set();
   const newImports = /* @__PURE__ */ new Map();
-  return { addImportFromDiagnostic, addImportFromExportedSymbol, writeFixes, hasFixes, addImportForUnresolvedIdentifier, addImportForNonExistentExport, removeExistingImport, addVerbatimImport };
+  return { addImportFromDiagnostic, addImportFromExportedSymbol, addImportForModuleSymbol, writeFixes, hasFixes, addImportForUnresolvedIdentifier, addImportForNonExistentExport, removeExistingImport, addVerbatimImport };
   function addVerbatimImport(declaration) {
     verbatimImports.add(declaration);
   }
@@ -156935,7 +156945,7 @@ function createImportAdderWorker(sourceFile, program, useAutoImportProvider, pre
   }
   function addImportFromExportedSymbol(exportedSymbol, isValidTypeOnlyUseSite, referenceImport) {
     var _a, _b;
-    const moduleSymbol = Debug.checkDefined(exportedSymbol.parent);
+    const moduleSymbol = Debug.checkDefined(exportedSymbol.parent, "Expected exported symbol to have module symbol as parent");
     const symbolName2 = getNameForExportedSymbol(exportedSymbol, getEmitScriptTarget(compilerOptions));
     const checker = program.getTypeChecker();
     const symbol = checker.getMergedSymbol(skipAlias(exportedSymbol, checker));
@@ -156985,6 +156995,75 @@ function createImportAdderWorker(sourceFile, program, useAutoImportProvider, pre
       addImport({ fix, symbolName: localName ?? symbolName2, errorIdentifierText: void 0 });
     }
   }
+  function addImportForModuleSymbol(symbolAlias, isValidTypeOnlyUseSite, referenceImport) {
+    var _a, _b, _c;
+    const checker = program.getTypeChecker();
+    const moduleSymbol = checker.getAliasedSymbol(symbolAlias);
+    Debug.assert(moduleSymbol.flags & 1536 /* Module */, "Expected symbol to be a module");
+    const moduleSpecifierResolutionHost = createModuleSpecifierResolutionHost(program, host);
+    const moduleSpecifierResult = ts_moduleSpecifiers_exports.getModuleSpecifiersWithCacheInfo(
+      moduleSymbol,
+      checker,
+      compilerOptions,
+      sourceFile,
+      moduleSpecifierResolutionHost,
+      preferences,
+      /*options*/
+      void 0,
+      /*forAutoImport*/
+      true
+    );
+    const useRequire = shouldUseRequire(sourceFile, program);
+    let addAsTypeOnly = getAddAsTypeOnly(
+      isValidTypeOnlyUseSite,
+      /*isForNewImportDeclaration*/
+      true,
+      /*symbol*/
+      void 0,
+      symbolAlias.flags,
+      program.getTypeChecker(),
+      compilerOptions
+    );
+    addAsTypeOnly = addAsTypeOnly === 1 /* Allowed */ && isTypeOnlyImportDeclaration(referenceImport) ? 2 /* Required */ : 1 /* Allowed */;
+    const importKind = isImportDeclaration(referenceImport) ? isDefaultImport(referenceImport) ? 1 /* Default */ : 2 /* Namespace */ : isImportSpecifier(referenceImport) ? 0 /* Named */ : isImportClause(referenceImport) && !!referenceImport.name ? 1 /* Default */ : 2 /* Namespace */;
+    const exportInfo = [{
+      symbol: symbolAlias,
+      moduleSymbol,
+      moduleFileName: (_c = (_b = (_a = moduleSymbol.declarations) == null ? void 0 : _a[0]) == null ? void 0 : _b.getSourceFile()) == null ? void 0 : _c.fileName,
+      exportKind: 4 /* Module */,
+      targetFlags: symbolAlias.flags,
+      isFromPackageJson: false
+    }];
+    const existingFix = getImportFixForSymbol(
+      sourceFile,
+      exportInfo,
+      program,
+      /*position*/
+      void 0,
+      !!isValidTypeOnlyUseSite,
+      useRequire,
+      host,
+      preferences
+    );
+    let fix;
+    if (existingFix && importKind !== 2 /* Namespace */) {
+      fix = {
+        ...existingFix,
+        addAsTypeOnly,
+        importKind
+      };
+    } else {
+      fix = {
+        kind: 3 /* AddNew */,
+        moduleSpecifierKind: existingFix !== void 0 ? existingFix.moduleSpecifierKind : moduleSpecifierResult.kind,
+        moduleSpecifier: existingFix !== void 0 ? existingFix.moduleSpecifier : first(moduleSpecifierResult.moduleSpecifiers),
+        importKind,
+        addAsTypeOnly,
+        useRequire
+      };
+    }
+    addImport({ fix, symbolName: symbolAlias.name, errorIdentifierText: void 0 });
+  }
   function addImportForNonExistentExport(exportName, exportingFileName, exportKind, exportedMeanings, isImportUsageValidAsTypeOnly) {
     const exportingSourceFile = program.getSourceFile(exportingFileName);
     const useRequire = shouldUseRequire(sourceFile, program);
@@ -157433,7 +157512,8 @@ function getAllExportInfoForSymbol(importingFile, symbol, symbolName2, moduleSym
   const moduleSourceFile = isFileExcluded && mergedModuleSymbol.declarations && getDeclarationOfKind(mergedModuleSymbol, 307 /* SourceFile */);
   const moduleSymbolExcluded = moduleSourceFile && isFileExcluded(moduleSourceFile);
   return getExportInfoMap(importingFile, host, program, preferences, cancellationToken).search(importingFile.path, preferCapitalized, (name) => name === symbolName2, (info) => {
-    if (getChecker(info[0].isFromPackageJson).getMergedSymbol(skipAlias(info[0].symbol, getChecker(info[0].isFromPackageJson))) === symbol && (moduleSymbolExcluded || info.some((i) => i.moduleSymbol === moduleSymbol || i.symbol.parent === moduleSymbol))) {
+    const checker = getChecker(info[0].isFromPackageJson);
+    if (checker.getMergedSymbol(skipAlias(info[0].symbol, checker)) === symbol && (moduleSymbolExcluded || info.some((i) => checker.getMergedSymbol(i.moduleSymbol) === moduleSymbol || i.symbol.parent === moduleSymbol))) {
       return info;
     }
   });
@@ -157862,6 +157942,8 @@ function getImportKind(importingFile, exportKind, program, forceImportKeyword) {
       return getExportEqualsImportKind(importingFile, program.getCompilerOptions(), !!forceImportKeyword);
     case 3 /* UMD */:
       return getUmdImportKind(importingFile, program, !!forceImportKeyword);
+    case 4 /* Module */:
+      return 2 /* Namespace */;
     default:
       return Debug.assertNever(exportKind);
   }
@@ -169387,7 +169469,7 @@ function createNameAndKindSet() {
 }
 function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program, log, preferences, includeSymbol) {
   if (isInReferenceComment(sourceFile, position)) {
-    const entries = getTripleSlashReferenceCompletion(sourceFile, position, program, host);
+    const entries = getTripleSlashReferenceCompletion(sourceFile, position, program, host, createModuleSpecifierResolutionHost(program, host));
     return entries && convertPathCompletions(entries);
   }
   if (isInString(sourceFile, position, contextToken)) {
@@ -169731,8 +169813,9 @@ function getStringLiteralCompletionsFromModuleNamesWorker(sourceFile, node, prog
   const scriptDirectory = getDirectoryPath(scriptPath);
   const compilerOptions = program.getCompilerOptions();
   const typeChecker = program.getTypeChecker();
+  const moduleSpecifierResolutionHost = createModuleSpecifierResolutionHost(program, host);
   const extensionOptions = getExtensionOptions(compilerOptions, 1 /* ModuleSpecifier */, sourceFile, typeChecker, preferences, mode);
-  return isPathRelativeToScript(literalValue) || !compilerOptions.baseUrl && !compilerOptions.paths && (isRootedDiskPath(literalValue) || isUrl(literalValue)) ? getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, program, host, scriptPath, extensionOptions) : getCompletionEntriesForNonRelativeModules(literalValue, scriptDirectory, mode, program, host, extensionOptions);
+  return isPathRelativeToScript(literalValue) || !compilerOptions.baseUrl && !compilerOptions.paths && (isRootedDiskPath(literalValue) || isUrl(literalValue)) ? getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, program, host, moduleSpecifierResolutionHost, scriptPath, extensionOptions) : getCompletionEntriesForNonRelativeModules(literalValue, scriptDirectory, mode, program, host, moduleSpecifierResolutionHost, extensionOptions);
 }
 function getExtensionOptions(compilerOptions, referenceKind, importingSourceFile, typeChecker, preferences, resolutionMode) {
   return {
@@ -169743,7 +169826,7 @@ function getExtensionOptions(compilerOptions, referenceKind, importingSourceFile
     resolutionMode
   };
 }
-function getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, program, host, scriptPath, extensionOptions) {
+function getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, program, host, moduleSpecifierResolutionHost, scriptPath, extensionOptions) {
   const compilerOptions = program.getCompilerOptions();
   if (compilerOptions.rootDirs) {
     return getCompletionEntriesForDirectoryFragmentWithRootDirs(
@@ -169753,6 +169836,7 @@ function getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, p
       extensionOptions,
       program,
       host,
+      moduleSpecifierResolutionHost,
       scriptPath
     );
   } else {
@@ -169762,6 +169846,7 @@ function getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, p
       extensionOptions,
       program,
       host,
+      moduleSpecifierResolutionHost,
       /*moduleSpecifierIsRelative*/
       true,
       scriptPath
@@ -169787,7 +169872,7 @@ function getBaseDirectoriesFromRootDirs(rootDirs, basePath, scriptDirectory, ign
     compareStringsCaseSensitive
   );
 }
-function getCompletionEntriesForDirectoryFragmentWithRootDirs(rootDirs, fragment, scriptDirectory, extensionOptions, program, host, exclude) {
+function getCompletionEntriesForDirectoryFragmentWithRootDirs(rootDirs, fragment, scriptDirectory, extensionOptions, program, host, moduleSpecifierResolutionHost, exclude) {
   const compilerOptions = program.getCompilerOptions();
   const basePath = compilerOptions.project || host.getCurrentDirectory();
   const ignoreCase = !(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames());
@@ -169799,6 +169884,7 @@ function getCompletionEntriesForDirectoryFragmentWithRootDirs(rootDirs, fragment
       extensionOptions,
       program,
       host,
+      moduleSpecifierResolutionHost,
       /*moduleSpecifierIsRelative*/
       true,
       exclude
@@ -169806,7 +169892,7 @@ function getCompletionEntriesForDirectoryFragmentWithRootDirs(rootDirs, fragment
     (itemA, itemB) => itemA.name === itemB.name && itemA.kind === itemB.kind && itemA.extension === itemB.extension
   );
 }
-function getCompletionEntriesForDirectoryFragment(fragment, scriptDirectory, extensionOptions, program, host, moduleSpecifierIsRelative, exclude, result = createNameAndKindSet()) {
+function getCompletionEntriesForDirectoryFragment(fragment, scriptDirectory, extensionOptions, program, host, moduleSpecifierResolutionHost, moduleSpecifierIsRelative, exclude, result = createNameAndKindSet()) {
   var _a;
   if (fragment === void 0) {
     fragment = "";
@@ -169831,7 +169917,7 @@ function getCompletionEntriesForDirectoryFragment(fragment, scriptDirectory, ext
         if (versionPaths) {
           const packageDirectory = getDirectoryPath(packageJsonPath);
           const pathInPackage = absolutePath.slice(ensureTrailingDirectorySeparator(packageDirectory).length);
-          if (addCompletionEntriesFromPaths(result, pathInPackage, packageDirectory, extensionOptions, program, host, versionPaths)) {
+          if (addCompletionEntriesFromPaths(result, pathInPackage, packageDirectory, extensionOptions, program, host, moduleSpecifierResolutionHost, versionPaths)) {
             return result;
           }
         }
@@ -169859,7 +169945,7 @@ function getCompletionEntriesForDirectoryFragment(fragment, scriptDirectory, ext
         getBaseFileName(filePath),
         program,
         extensionOptions,
-        /*isExportsWildcard*/
+        /*isExportsOrImportsWildcard*/
         false
       );
       result.add(nameAndKind(name, "script" /* scriptElement */, extension));
@@ -169876,7 +169962,7 @@ function getCompletionEntriesForDirectoryFragment(fragment, scriptDirectory, ext
   }
   return result;
 }
-function getFilenameWithExtensionOption(name, program, extensionOptions, isExportsWildcard) {
+function getFilenameWithExtensionOption(name, program, extensionOptions, isExportsOrImportsWildcard) {
   const nonJsResult = ts_moduleSpecifiers_exports.tryGetRealFileNameForNonJsDeclarationFileName(name);
   if (nonJsResult) {
     return { name: nonJsResult, extension: tryGetExtensionFromPath2(nonJsResult) };
@@ -169890,7 +169976,7 @@ function getFilenameWithExtensionOption(name, program, extensionOptions, isExpor
     program.getCompilerOptions(),
     extensionOptions.importingSourceFile
   ).getAllowedEndingsInPreferredOrder(extensionOptions.resolutionMode);
-  if (isExportsWildcard) {
+  if (isExportsOrImportsWildcard) {
     allowedEndings = allowedEndings.filter((e) => e !== 0 /* Minimal */ && e !== 1 /* Index */);
   }
   if (allowedEndings[0] === 3 /* TsExtension */) {
@@ -169900,13 +169986,13 @@ function getFilenameWithExtensionOption(name, program, extensionOptions, isExpor
     const outputExtension2 = ts_moduleSpecifiers_exports.tryGetJSExtensionForFile(name, program.getCompilerOptions());
     return outputExtension2 ? { name: changeExtension(name, outputExtension2), extension: outputExtension2 } : { name, extension: tryGetExtensionFromPath2(name) };
   }
-  if (!isExportsWildcard && (allowedEndings[0] === 0 /* Minimal */ || allowedEndings[0] === 1 /* Index */) && fileExtensionIsOneOf(name, [".js" /* Js */, ".jsx" /* Jsx */, ".ts" /* Ts */, ".tsx" /* Tsx */, ".d.ts" /* Dts */])) {
+  if (!isExportsOrImportsWildcard && (allowedEndings[0] === 0 /* Minimal */ || allowedEndings[0] === 1 /* Index */) && fileExtensionIsOneOf(name, [".js" /* Js */, ".jsx" /* Jsx */, ".ts" /* Ts */, ".tsx" /* Tsx */, ".d.ts" /* Dts */])) {
     return { name: removeFileExtension(name), extension: tryGetExtensionFromPath2(name) };
   }
   const outputExtension = ts_moduleSpecifiers_exports.tryGetJSExtensionForFile(name, program.getCompilerOptions());
   return outputExtension ? { name: changeExtension(name, outputExtension), extension: outputExtension } : { name, extension: tryGetExtensionFromPath2(name) };
 }
-function addCompletionEntriesFromPaths(result, fragment, baseDirectory, extensionOptions, program, host, paths) {
+function addCompletionEntriesFromPaths(result, fragment, baseDirectory, extensionOptions, program, host, moduleSpecifierResolutionHost, paths) {
   const getPatternsForKey = (key) => paths[key];
   const comparePaths2 = (a, b) => {
     const patternA = tryParsePattern(a);
@@ -169915,40 +170001,43 @@ function addCompletionEntriesFromPaths(result, fragment, baseDirectory, extensio
     const lengthB = typeof patternB === "object" ? patternB.prefix.length : b.length;
     return compareValues(lengthB, lengthA);
   };
-  return addCompletionEntriesFromPathsOrExports(
+  return addCompletionEntriesFromPathsOrExportsOrImports(
     result,
     /*isExports*/
     false,
+    /*isImports*/
+    false,
     fragment,
     baseDirectory,
     extensionOptions,
     program,
     host,
+    moduleSpecifierResolutionHost,
     getOwnKeys(paths),
     getPatternsForKey,
     comparePaths2
   );
 }
-function addCompletionEntriesFromPathsOrExports(result, isExports, fragment, baseDirectory, extensionOptions, program, host, keys, getPatternsForKey, comparePaths2) {
+function addCompletionEntriesFromPathsOrExportsOrImports(result, isExports, isImports, fragment, baseDirectory, extensionOptions, program, host, moduleSpecifierResolutionHost, keys, getPatternsForKey, comparePaths2) {
   let pathResults = [];
   let matchedPath;
   for (const key of keys) {
     if (key === ".") continue;
-    const keyWithoutLeadingDotSlash = key.replace(/^\.\//, "");
+    const keyWithoutLeadingDotSlash = key.replace(/^\.\//, "") + ((isExports || isImports) && endsWith(key, "/") ? "*" : "");
     const patterns = getPatternsForKey(key);
     if (patterns) {
       const pathPattern = tryParsePattern(keyWithoutLeadingDotSlash);
       if (!pathPattern) continue;
       const isMatch = typeof pathPattern === "object" && isPatternMatch(pathPattern, fragment);
-      const isLongestMatch = isMatch && (matchedPath === void 0 || comparePaths2(key, matchedPath) === -1 /* LessThan */);
+      const isLongestMatch = isMatch && (matchedPath === void 0 || comparePaths2(keyWithoutLeadingDotSlash, matchedPath) === -1 /* LessThan */);
       if (isLongestMatch) {
-        matchedPath = key;
+        matchedPath = keyWithoutLeadingDotSlash;
         pathResults = pathResults.filter((r) => !r.matchedPattern);
       }
-      if (typeof pathPattern === "string" || matchedPath === void 0 || comparePaths2(key, matchedPath) !== 1 /* GreaterThan */) {
+      if (typeof pathPattern === "string" || matchedPath === void 0 || comparePaths2(keyWithoutLeadingDotSlash, matchedPath) !== 1 /* GreaterThan */) {
         pathResults.push({
           matchedPattern: isMatch,
-          results: getCompletionsForPathMapping(keyWithoutLeadingDotSlash, patterns, fragment, baseDirectory, extensionOptions, isExports && isMatch, program, host).map(({ name, kind, extension }) => nameAndKind(name, kind, extension))
+          results: getCompletionsForPathMapping(keyWithoutLeadingDotSlash, patterns, fragment, baseDirectory, extensionOptions, isExports, isImports, program, host, moduleSpecifierResolutionHost).map(({ name, kind, extension }) => nameAndKind(name, kind, extension))
         });
       }
     }
@@ -169956,7 +170045,7 @@ function addCompletionEntriesFromPathsOrExports(result, isExports, fragment, bas
   pathResults.forEach((pathResult) => pathResult.results.forEach((r) => result.add(r)));
   return matchedPath !== void 0;
 }
-function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, mode, program, host, extensionOptions) {
+function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, mode, program, host, moduleSpecifierResolutionHost, extensionOptions) {
   const typeChecker = program.getTypeChecker();
   const compilerOptions = program.getCompilerOptions();
   const { baseUrl, paths } = compilerOptions;
@@ -169970,6 +170059,7 @@ function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, mode, p
       extensionOptions,
       program,
       host,
+      moduleSpecifierResolutionHost,
       /*moduleSpecifierIsRelative*/
       false,
       /*exclude*/
@@ -169979,7 +170069,7 @@ function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, mode, p
   }
   if (paths) {
     const absolute = getPathsBasePath(compilerOptions, host);
-    addCompletionEntriesFromPaths(result, fragment, absolute, extensionOptions, program, host, paths);
+    addCompletionEntriesFromPaths(result, fragment, absolute, extensionOptions, program, host, moduleSpecifierResolutionHost, paths);
   }
   const fragmentDirectory = getFragmentDirectory(fragment);
   for (const ambientName of getAmbientModuleCompletions(fragment, fragmentDirectory, typeChecker)) {
@@ -169990,7 +170080,7 @@ function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, mode, p
       void 0
     ));
   }
-  getCompletionEntriesFromTypings(host, program, scriptPath, fragmentDirectory, extensionOptions, result);
+  getCompletionEntriesFromTypings(program, host, moduleSpecifierResolutionHost, scriptPath, fragmentDirectory, extensionOptions, result);
   if (moduleResolutionUsesNodeModules(moduleResolution)) {
     let foundGlobal = false;
     if (fragmentDirectory === void 0) {
@@ -170008,6 +170098,26 @@ function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, mode, p
       }
     }
     if (!foundGlobal) {
+      const resolvePackageJsonExports = getResolvePackageJsonExports(compilerOptions);
+      const resolvePackageJsonImports = getResolvePackageJsonImports(compilerOptions);
+      let seenPackageScope = false;
+      const importsLookup = (directory) => {
+        if (resolvePackageJsonImports && !seenPackageScope) {
+          const packageFile = combinePaths(directory, "package.json");
+          if (seenPackageScope = tryFileExists(host, packageFile)) {
+            const packageJson = readJson(packageFile, host);
+            exportsOrImportsLookup(
+              packageJson.imports,
+              fragment,
+              directory,
+              /*isExports*/
+              false,
+              /*isImports*/
+              true
+            );
+          }
+        }
+      };
       let ancestorLookup = (ancestor) => {
         const nodeModules = combinePaths(ancestor, "node_modules");
         if (tryDirectoryExists(host, nodeModules)) {
@@ -170017,6 +170127,7 @@ function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, mode, p
             extensionOptions,
             program,
             host,
+            moduleSpecifierResolutionHost,
             /*moduleSpecifierIsRelative*/
             false,
             /*exclude*/
@@ -170024,58 +170135,77 @@ function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, mode, p
             result
           );
         }
+        importsLookup(ancestor);
       };
-      if (fragmentDirectory && getResolvePackageJsonExports(compilerOptions)) {
-        const nodeModulesDirectoryLookup = ancestorLookup;
+      if (fragmentDirectory && resolvePackageJsonExports) {
+        const nodeModulesDirectoryOrImportsLookup = ancestorLookup;
         ancestorLookup = (ancestor) => {
           const components = getPathComponents(fragment);
           components.shift();
           let packagePath = components.shift();
           if (!packagePath) {
-            return nodeModulesDirectoryLookup(ancestor);
+            return nodeModulesDirectoryOrImportsLookup(ancestor);
           }
           if (startsWith(packagePath, "@")) {
             const subName = components.shift();
             if (!subName) {
-              return nodeModulesDirectoryLookup(ancestor);
+              return nodeModulesDirectoryOrImportsLookup(ancestor);
             }
             packagePath = combinePaths(packagePath, subName);
           }
+          if (resolvePackageJsonImports && startsWith(packagePath, "#")) {
+            return importsLookup(ancestor);
+          }
           const packageDirectory = combinePaths(ancestor, "node_modules", packagePath);
           const packageFile = combinePaths(packageDirectory, "package.json");
           if (tryFileExists(host, packageFile)) {
             const packageJson = readJson(packageFile, host);
-            const exports2 = packageJson.exports;
-            if (exports2) {
-              if (typeof exports2 !== "object" || exports2 === null) {
-                return;
-              }
-              const keys = getOwnKeys(exports2);
-              const fragmentSubpath = components.join("/") + (components.length && hasTrailingDirectorySeparator(fragment) ? "/" : "");
-              const conditions = getConditions(compilerOptions, mode);
-              addCompletionEntriesFromPathsOrExports(
-                result,
-                /*isExports*/
-                true,
-                fragmentSubpath,
-                packageDirectory,
-                extensionOptions,
-                program,
-                host,
-                keys,
-                (key) => singleElementArray(getPatternFromFirstMatchingCondition(exports2[key], conditions)),
-                comparePatternKeys
-              );
-              return;
-            }
+            const fragmentSubpath = components.join("/") + (components.length && hasTrailingDirectorySeparator(fragment) ? "/" : "");
+            exportsOrImportsLookup(
+              packageJson.exports,
+              fragmentSubpath,
+              packageDirectory,
+              /*isExports*/
+              true,
+              /*isImports*/
+              false
+            );
+            return;
           }
-          return nodeModulesDirectoryLookup(ancestor);
+          return nodeModulesDirectoryOrImportsLookup(ancestor);
         };
       }
       forEachAncestorDirectoryStoppingAtGlobalCache(host, scriptPath, ancestorLookup);
     }
   }
   return arrayFrom(result.values());
+  function exportsOrImportsLookup(lookupTable, fragment2, baseDirectory, isExports, isImports) {
+    if (typeof lookupTable !== "object" || lookupTable === null) {
+      return;
+    }
+    const keys = getOwnKeys(lookupTable);
+    const conditions = getConditions(compilerOptions, mode);
+    addCompletionEntriesFromPathsOrExportsOrImports(
+      result,
+      isExports,
+      isImports,
+      fragment2,
+      baseDirectory,
+      extensionOptions,
+      program,
+      host,
+      moduleSpecifierResolutionHost,
+      keys,
+      (key) => {
+        const pattern = getPatternFromFirstMatchingCondition(lookupTable[key], conditions);
+        if (pattern === void 0) {
+          return void 0;
+        }
+        return singleElementArray(endsWith(key, "/") && endsWith(pattern, "/") ? pattern + "*" : pattern);
+      },
+      comparePatternKeys
+    );
+  }
 }
 function getPatternFromFirstMatchingCondition(target, conditions) {
   if (typeof target === "string") {
@@ -170093,25 +170223,28 @@ function getPatternFromFirstMatchingCondition(target, conditions) {
 function getFragmentDirectory(fragment) {
   return containsSlash(fragment) ? hasTrailingDirectorySeparator(fragment) ? fragment : getDirectoryPath(fragment) : void 0;
 }
-function getCompletionsForPathMapping(path, patterns, fragment, packageDirectory, extensionOptions, isExportsWildcard, program, host) {
-  if (!endsWith(path, "*")) {
-    return !path.includes("*") ? justPathMappingName(path, "script" /* scriptElement */) : emptyArray;
+function getCompletionsForPathMapping(path, patterns, fragment, packageDirectory, extensionOptions, isExports, isImports, program, host, moduleSpecifierResolutionHost) {
+  const parsedPath = tryParsePattern(path);
+  if (!parsedPath) {
+    return emptyArray;
   }
-  const pathPrefix = path.slice(0, path.length - 1);
-  const remainingFragment = tryRemovePrefix(fragment, pathPrefix);
+  if (typeof parsedPath === "string") {
+    return justPathMappingName(path, "script" /* scriptElement */);
+  }
+  const remainingFragment = tryRemovePrefix(fragment, parsedPath.prefix);
   if (remainingFragment === void 0) {
-    const starIsFullPathComponent = path[path.length - 2] === "/";
-    return starIsFullPathComponent ? justPathMappingName(pathPrefix, "directory" /* directory */) : flatMap(patterns, (pattern) => {
+    const starIsFullPathComponent = endsWith(path, "/*");
+    return starIsFullPathComponent ? justPathMappingName(parsedPath.prefix, "directory" /* directory */) : flatMap(patterns, (pattern) => {
       var _a;
-      return (_a = getModulesForPathsPattern("", packageDirectory, pattern, extensionOptions, isExportsWildcard, program, host)) == null ? void 0 : _a.map(({ name, ...rest }) => ({ name: pathPrefix + name, ...rest }));
+      return (_a = getModulesForPathsPattern("", packageDirectory, pattern, extensionOptions, isExports, isImports, program, host, moduleSpecifierResolutionHost)) == null ? void 0 : _a.map(({ name, ...rest }) => ({ name: parsedPath.prefix + name + parsedPath.suffix, ...rest }));
     });
   }
-  return flatMap(patterns, (pattern) => getModulesForPathsPattern(remainingFragment, packageDirectory, pattern, extensionOptions, isExportsWildcard, program, host));
+  return flatMap(patterns, (pattern) => getModulesForPathsPattern(remainingFragment, packageDirectory, pattern, extensionOptions, isExports, isImports, program, host, moduleSpecifierResolutionHost));
   function justPathMappingName(name, kind) {
     return startsWith(name, fragment) ? [{ name: removeTrailingDirectorySeparator(name), kind, extension: void 0 }] : emptyArray;
   }
 }
-function getModulesForPathsPattern(fragment, packageDirectory, pattern, extensionOptions, isExportsWildcard, program, host) {
+function getModulesForPathsPattern(fragment, packageDirectory, pattern, extensionOptions, isExports, isImports, program, host, moduleSpecifierResolutionHost) {
   if (!host.readDirectory) {
     return void 0;
   }
@@ -170124,35 +170257,67 @@ function getModulesForPathsPattern(fragment, packageDirectory, pattern, extensio
   const normalizedPrefixBase = hasTrailingDirectorySeparator(parsed.prefix) ? "" : getBaseFileName(normalizedPrefix);
   const fragmentHasPath = containsSlash(fragment);
   const fragmentDirectory = fragmentHasPath ? hasTrailingDirectorySeparator(fragment) ? fragment : getDirectoryPath(fragment) : void 0;
+  const getCommonSourceDirectory2 = () => moduleSpecifierResolutionHost.getCommonSourceDirectory();
+  const ignoreCase = !hostUsesCaseSensitiveFileNames(moduleSpecifierResolutionHost);
+  const outDir = program.getCompilerOptions().outDir;
+  const declarationDir = program.getCompilerOptions().declarationDir;
   const expandedPrefixDirectory = fragmentHasPath ? combinePaths(normalizedPrefixDirectory, normalizedPrefixBase + fragmentDirectory) : normalizedPrefixDirectory;
+  const baseDirectory = normalizePath(combinePaths(packageDirectory, expandedPrefixDirectory));
+  const possibleInputBaseDirectoryForOutDir = isImports && outDir && getPossibleOriginalInputPathWithoutChangingExt(baseDirectory, ignoreCase, outDir, getCommonSourceDirectory2);
+  const possibleInputBaseDirectoryForDeclarationDir = isImports && declarationDir && getPossibleOriginalInputPathWithoutChangingExt(baseDirectory, ignoreCase, declarationDir, getCommonSourceDirectory2);
   const normalizedSuffix = normalizePath(parsed.suffix);
   const declarationExtension = normalizedSuffix && getDeclarationEmitExtensionForPath("_" + normalizedSuffix);
-  const matchingSuffixes = declarationExtension ? [changeExtension(normalizedSuffix, declarationExtension), normalizedSuffix] : [normalizedSuffix];
-  const baseDirectory = normalizePath(combinePaths(packageDirectory, expandedPrefixDirectory));
-  const completePrefix = fragmentHasPath ? baseDirectory : ensureTrailingDirectorySeparator(baseDirectory) + normalizedPrefixBase;
+  const inputExtension = normalizedSuffix ? getPossibleOriginalInputExtensionForExtension("_" + normalizedSuffix) : void 0;
+  const matchingSuffixes = [
+    declarationExtension && changeExtension(normalizedSuffix, declarationExtension),
+    ...inputExtension ? inputExtension.map((ext) => changeExtension(normalizedSuffix, ext)) : [],
+    normalizedSuffix
+  ].filter(isString);
   const includeGlobs = normalizedSuffix ? matchingSuffixes.map((suffix) => "**/*" + suffix) : ["./*"];
-  const matches = mapDefined(tryReadDirectory(
-    host,
-    baseDirectory,
-    extensionOptions.extensionsToSearch,
-    /*exclude*/
-    void 0,
-    includeGlobs
-  ), (match) => {
-    const trimmedWithPattern = trimPrefixAndSuffix(match);
-    if (trimmedWithPattern) {
-      if (containsSlash(trimmedWithPattern)) {
-        return directoryResult(getPathComponents(removeLeadingDirectorySeparator(trimmedWithPattern))[1]);
-      }
-      const { name, extension } = getFilenameWithExtensionOption(trimmedWithPattern, program, extensionOptions, isExportsWildcard);
-      return nameAndKind(name, "script" /* scriptElement */, extension);
+  const isExportsOrImportsWildcard = (isExports || isImports) && endsWith(pattern, "/*");
+  let matches = getMatchesWithPrefix(baseDirectory);
+  if (possibleInputBaseDirectoryForOutDir) {
+    matches = concatenate(matches, getMatchesWithPrefix(possibleInputBaseDirectoryForOutDir));
+  }
+  if (possibleInputBaseDirectoryForDeclarationDir) {
+    matches = concatenate(matches, getMatchesWithPrefix(possibleInputBaseDirectoryForDeclarationDir));
+  }
+  if (!normalizedSuffix) {
+    matches = concatenate(matches, getDirectoryMatches(baseDirectory));
+    if (possibleInputBaseDirectoryForOutDir) {
+      matches = concatenate(matches, getDirectoryMatches(possibleInputBaseDirectoryForOutDir));
     }
-  });
-  const directories = normalizedSuffix ? emptyArray : mapDefined(tryGetDirectories(host, baseDirectory), (dir) => dir === "node_modules" ? void 0 : directoryResult(dir));
-  return [...matches, ...directories];
-  function trimPrefixAndSuffix(path) {
+    if (possibleInputBaseDirectoryForDeclarationDir) {
+      matches = concatenate(matches, getDirectoryMatches(possibleInputBaseDirectoryForDeclarationDir));
+    }
+  }
+  return matches;
+  function getMatchesWithPrefix(directory) {
+    const completePrefix = fragmentHasPath ? directory : ensureTrailingDirectorySeparator(directory) + normalizedPrefixBase;
+    return mapDefined(tryReadDirectory(
+      host,
+      directory,
+      extensionOptions.extensionsToSearch,
+      /*exclude*/
+      void 0,
+      includeGlobs
+    ), (match) => {
+      const trimmedWithPattern = trimPrefixAndSuffix(match, completePrefix);
+      if (trimmedWithPattern) {
+        if (containsSlash(trimmedWithPattern)) {
+          return directoryResult(getPathComponents(removeLeadingDirectorySeparator(trimmedWithPattern))[1]);
+        }
+        const { name, extension } = getFilenameWithExtensionOption(trimmedWithPattern, program, extensionOptions, isExportsOrImportsWildcard);
+        return nameAndKind(name, "script" /* scriptElement */, extension);
+      }
+    });
+  }
+  function getDirectoryMatches(directoryName) {
+    return mapDefined(tryGetDirectories(host, directoryName), (dir) => dir === "node_modules" ? void 0 : directoryResult(dir));
+  }
+  function trimPrefixAndSuffix(path, prefix) {
     return firstDefined(matchingSuffixes, (suffix) => {
-      const inner = withoutStartAndEnd(normalizePath(path), completePrefix, suffix);
+      const inner = withoutStartAndEnd(normalizePath(path), prefix, suffix);
       return inner === void 0 ? void 0 : removeLeadingDirectorySeparator(inner);
     });
   }
@@ -170172,7 +170337,7 @@ function getAmbientModuleCompletions(fragment, fragmentDirectory, checker) {
   }
   return nonRelativeModuleNames;
 }
-function getTripleSlashReferenceCompletion(sourceFile, position, program, host) {
+function getTripleSlashReferenceCompletion(sourceFile, position, program, host, moduleSpecifierResolutionHost) {
   const compilerOptions = program.getCompilerOptions();
   const token = getTokenAtPosition(sourceFile, position);
   const commentRanges = getLeadingCommentRanges(sourceFile.text, token.pos);
@@ -170193,13 +170358,14 @@ function getTripleSlashReferenceCompletion(sourceFile, position, program, host)
     getExtensionOptions(compilerOptions, 0 /* Filename */, sourceFile),
     program,
     host,
+    moduleSpecifierResolutionHost,
     /*moduleSpecifierIsRelative*/
     true,
     sourceFile.path
-  ) : kind === "types" ? getCompletionEntriesFromTypings(host, program, scriptPath, getFragmentDirectory(toComplete), getExtensionOptions(compilerOptions, 1 /* ModuleSpecifier */, sourceFile)) : Debug.fail();
+  ) : kind === "types" ? getCompletionEntriesFromTypings(program, host, moduleSpecifierResolutionHost, scriptPath, getFragmentDirectory(toComplete), getExtensionOptions(compilerOptions, 1 /* ModuleSpecifier */, sourceFile)) : Debug.fail();
   return addReplacementSpans(toComplete, range.pos + prefix.length, arrayFrom(names.values()));
 }
-function getCompletionEntriesFromTypings(host, program, scriptPath, fragmentDirectory, extensionOptions, result = createNameAndKindSet()) {
+function getCompletionEntriesFromTypings(program, host, moduleSpecifierResolutionHost, scriptPath, fragmentDirectory, extensionOptions, result = createNameAndKindSet()) {
   const options = program.getCompilerOptions();
   const seen = /* @__PURE__ */ new Map();
   const typeRoots = tryAndIgnoreErrors(() => getEffectiveTypeRoots(options, host)) || emptyArray;
@@ -170236,6 +170402,7 @@ function getCompletionEntriesFromTypings(host, program, scriptPath, fragmentDire
             extensionOptions,
             program,
             host,
+            moduleSpecifierResolutionHost,
             /*moduleSpecifierIsRelative*/
             false,
             /*exclude*/
@@ -182434,6 +182601,7 @@ __export(ts_exports2, {
   getPositionOfLineAndCharacter: () => getPositionOfLineAndCharacter,
   getPossibleGenericSignatures: () => getPossibleGenericSignatures,
   getPossibleOriginalInputExtensionForExtension: () => getPossibleOriginalInputExtensionForExtension,
+  getPossibleOriginalInputPathWithoutChangingExt: () => getPossibleOriginalInputPathWithoutChangingExt,
   getPossibleTypeArgumentsInfo: () => getPossibleTypeArgumentsInfo,
   getPreEmitDiagnostics: () => getPreEmitDiagnostics,
   getPrecedingNonSpaceCharacterPosition: () => getPrecedingNonSpaceCharacterPosition,
@@ -197179,6 +197347,7 @@ if (typeof console !== "undefined") {
   getPositionOfLineAndCharacter,
   getPossibleGenericSignatures,
   getPossibleOriginalInputExtensionForExtension,
+  getPossibleOriginalInputPathWithoutChangingExt,
   getPossibleTypeArgumentsInfo,
   getPreEmitDiagnostics,
   getPrecedingNonSpaceCharacterPosition,

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.7.0-dev.20241031",
+    "version": "5.7.0-dev.20241101",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -116,5 +116,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "da15ef2841076f40d2b278cdaedc47e45fde32ec"
+    "gitHead": "3e6171833e6d8481626b56a7de09ea03092fadf2"
 }