@typescript-deploys/pr-build 5.3.0-pr-52972-6 → 5.3.0-pr-55820-7

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-insiders.20230920`;
+var version = `${versionMajorMinor}.0-insiders.20230921`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -7689,7 +7689,7 @@ var Diagnostics = {
   Could_not_convert_to_arrow_function: diag(95151, 3 /* Message */, "Could_not_convert_to_arrow_function_95151", "Could not convert to arrow function"),
   Could_not_convert_to_named_function: diag(95152, 3 /* Message */, "Could_not_convert_to_named_function_95152", "Could not convert to named function"),
   Could_not_convert_to_anonymous_function: diag(95153, 3 /* Message */, "Could_not_convert_to_anonymous_function_95153", "Could not convert to anonymous function"),
-  Can_only_convert_string_concatenation: diag(95154, 3 /* Message */, "Can_only_convert_string_concatenation_95154", "Can only convert string concatenation"),
+  Can_only_convert_string_concatenations_and_string_literals: diag(95154, 3 /* Message */, "Can_only_convert_string_concatenations_and_string_literals_95154", "Can only convert string concatenations and string literals"),
   Selection_is_not_a_valid_statement_or_statements: diag(95155, 3 /* Message */, "Selection_is_not_a_valid_statement_or_statements_95155", "Selection is not a valid statement or statements"),
   Add_missing_function_declaration_0: diag(95156, 3 /* Message */, "Add_missing_function_declaration_0_95156", "Add missing function declaration '{0}'"),
   Add_all_missing_function_declarations: diag(95157, 3 /* Message */, "Add_all_missing_function_declarations_95157", "Add all missing function declarations"),
@@ -11431,22 +11431,6 @@ function usingSingleLineStringWriter(action) {
 function getFullWidth(node) {
   return node.end - node.pos;
 }
-function getResolvedModule(sourceFile, moduleNameText, mode) {
-  var _a, _b;
-  return (_b = (_a = sourceFile == null ? void 0 : sourceFile.resolvedModules) == null ? void 0 : _a.get(moduleNameText, mode)) == null ? void 0 : _b.resolvedModule;
-}
-function setResolvedModule(sourceFile, moduleNameText, resolvedModule, mode) {
-  if (!sourceFile.resolvedModules) {
-    sourceFile.resolvedModules = createModeAwareCache();
-  }
-  sourceFile.resolvedModules.set(moduleNameText, mode, resolvedModule);
-}
-function setResolvedTypeReferenceDirective(sourceFile, typeReferenceDirectiveName, resolvedTypeReferenceDirective, mode) {
-  if (!sourceFile.resolvedTypeReferenceDirectiveNames) {
-    sourceFile.resolvedTypeReferenceDirectiveNames = createModeAwareCache();
-  }
-  sourceFile.resolvedTypeReferenceDirectiveNames.set(typeReferenceDirectiveName, mode, resolvedTypeReferenceDirective);
-}
 function projectReferenceIsEqualTo(oldRef, newRef) {
   return oldRef.path === newRef.path && !oldRef.prepend === !newRef.prepend && !oldRef.circular === !newRef.circular;
 }
@@ -11454,8 +11438,8 @@ function moduleResolutionIsEqualTo(oldResolution, newResolution) {
   return oldResolution === newResolution || oldResolution.resolvedModule === newResolution.resolvedModule || !!oldResolution.resolvedModule && !!newResolution.resolvedModule && oldResolution.resolvedModule.isExternalLibraryImport === newResolution.resolvedModule.isExternalLibraryImport && oldResolution.resolvedModule.extension === newResolution.resolvedModule.extension && oldResolution.resolvedModule.resolvedFileName === newResolution.resolvedModule.resolvedFileName && oldResolution.resolvedModule.originalPath === newResolution.resolvedModule.originalPath && packageIdIsEqual(oldResolution.resolvedModule.packageId, newResolution.resolvedModule.packageId) && oldResolution.node10Result === newResolution.node10Result;
 }
 function createModuleNotFoundChain(sourceFile, host, moduleReference, mode, packageName) {
-  var _a, _b;
-  const node10Result = (_b = (_a = sourceFile.resolvedModules) == null ? void 0 : _a.get(moduleReference, mode)) == null ? void 0 : _b.node10Result;
+  var _a, _b, _c;
+  const node10Result = (_c = (_b = (_a = host.resolvedModules) == null ? void 0 : _a.get(sourceFile.path)) == null ? void 0 : _b.get(moduleReference, mode)) == null ? void 0 : _c.node10Result;
   const result = node10Result ? chainDiagnosticMessages(
     /*details*/
     void 0,
@@ -16470,14 +16454,11 @@ function createSymlinkCache(cwd, getCanonicalFileName) {
         (symlinkedDirectories || (symlinkedDirectories = /* @__PURE__ */ new Map())).set(symlinkPath, real);
       }
     },
-    setSymlinksFromResolutions(files, typeReferenceDirectives) {
-      var _a, _b;
+    setSymlinksFromResolutions(resolvedModules, resolvedTypeReferenceDirectiveNames, typeReferenceDirectives) {
       Debug.assert(!hasProcessedResolutions);
       hasProcessedResolutions = true;
-      for (const file of files) {
-        (_a = file.resolvedModules) == null ? void 0 : _a.forEach((resolution) => processResolution(this, resolution.resolvedModule));
-        (_b = file.resolvedTypeReferenceDirectiveNames) == null ? void 0 : _b.forEach((resolution) => processResolution(this, resolution.resolvedTypeReferenceDirective));
-      }
+      resolvedModules == null ? void 0 : resolvedModules.forEach((cache) => cache.forEach((resolution) => processResolution(this, resolution.resolvedModule)));
+      resolvedTypeReferenceDirectiveNames == null ? void 0 : resolvedTypeReferenceDirectiveNames.forEach((cache) => cache.forEach((resolution) => processResolution(this, resolution.resolvedTypeReferenceDirective)));
       typeReferenceDirectives.forEach((resolution) => processResolution(this, resolution.resolvedTypeReferenceDirective));
     },
     hasProcessedResolutions: () => hasProcessedResolutions
@@ -21462,7 +21443,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.imports = void 0;
     node.moduleAugmentations = void 0;
     node.ambientModuleNames = void 0;
-    node.resolvedModules = void 0;
     node.classifiableNames = void 0;
     node.impliedNodeFormat = void 0;
     return node;
@@ -34091,6 +34071,7 @@ var moduleOptionDeclaration = {
     node16: 100 /* Node16 */,
     nodenext: 199 /* NodeNext */
   })),
+  affectsSourceFile: true,
   affectsModuleResolution: true,
   affectsEmit: true,
   affectsBuildInfo: true,
@@ -34527,6 +34508,7 @@ var commandOptionsWithoutBuild = [
       bundler: 100 /* Bundler */
     })),
     deprecatedKeys: /* @__PURE__ */ new Set(["node"]),
+    affectsSourceFile: true,
     affectsModuleResolution: true,
     paramType: Diagnostics.STRATEGY,
     category: Diagnostics.Modules,
@@ -35069,6 +35051,7 @@ var commandOptionsWithoutBuild = [
       legacy: 1 /* Legacy */,
       force: 3 /* Force */
     })),
+    affectsSourceFile: true,
     affectsModuleResolution: true,
     description: Diagnostics.Control_what_method_is_used_to_detect_module_format_JS_files,
     category: Diagnostics.Language_and_Environment,
@@ -35088,7 +35071,7 @@ var semanticDiagnosticsOptionDeclarations = optionDeclarations.filter((option) =
 var affectsEmitOptionDeclarations = optionDeclarations.filter((option) => !!option.affectsEmit);
 var affectsDeclarationPathOptionDeclarations = optionDeclarations.filter((option) => !!option.affectsDeclarationPath);
 var moduleResolutionOptionDeclarations = optionDeclarations.filter((option) => !!option.affectsModuleResolution);
-var sourceFileAffectingCompilerOptions = optionDeclarations.filter((option) => !!option.affectsSourceFile || !!option.affectsModuleResolution || !!option.affectsBindDiagnostics);
+var sourceFileAffectingCompilerOptions = optionDeclarations.filter((option) => !!option.affectsSourceFile || !!option.affectsBindDiagnostics);
 var optionsAffectingProgramStructure = optionDeclarations.filter((option) => !!option.affectsProgramStructure);
 var transpileOptionValueCompilerOptions = optionDeclarations.filter((option) => hasProperty(option, "transpileOptionValue"));
 var optionsForBuild = [
@@ -37463,15 +37446,6 @@ function createModeAwareCache() {
     return result;
   }
 }
-function zipToModeAwareCache(file, keys, values, nameAndModeGetter) {
-  Debug.assert(keys.length === values.length);
-  const map2 = createModeAwareCache();
-  for (let i = 0; i < keys.length; ++i) {
-    const entry = keys[i];
-    map2.set(nameAndModeGetter.getName(entry), nameAndModeGetter.getMode(entry, file), values[i]);
-  }
-  return map2;
-}
 function getOriginalOrResolvedModuleFileName(result) {
   return result.resolvedModule && (result.resolvedModule.originalPath || result.resolvedModule.resolvedFileName);
 }
@@ -46313,7 +46287,7 @@ function createTypeChecker(host) {
     return isStringLiteralLike(moduleReferenceExpression) ? resolveExternalModule(location, moduleReferenceExpression.text, moduleNotFoundError, moduleReferenceExpression, isForAugmentation) : void 0;
   }
   function resolveExternalModule(location, moduleReference, moduleNotFoundError, errorNode, isForAugmentation = false) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
     if (startsWith(moduleReference, "@types/")) {
       const diag2 = Diagnostics.Cannot_import_type_declaration_files_Consider_importing_0_instead_of_1;
       const withoutAtTypePrefix = removePrefix(moduleReference, "@types/");
@@ -46331,7 +46305,7 @@ function createTypeChecker(host) {
     const contextSpecifier = isStringLiteralLike(location) ? location : ((_a = findAncestor(location, isImportCall)) == null ? void 0 : _a.arguments[0]) || ((_b = findAncestor(location, isImportDeclaration)) == null ? void 0 : _b.moduleSpecifier) || ((_c = findAncestor(location, isExternalModuleImportEqualsDeclaration)) == null ? void 0 : _c.moduleReference.expression) || ((_d = findAncestor(location, isExportDeclaration)) == null ? void 0 : _d.moduleSpecifier) || ((_e = isModuleDeclaration(location) ? location : location.parent && isModuleDeclaration(location.parent) && location.parent.name === location ? location.parent : void 0) == null ? void 0 : _e.name) || ((_f = isLiteralImportTypeNode(location) ? location : void 0) == null ? void 0 : _f.argument.literal);
     const mode = contextSpecifier && isStringLiteralLike(contextSpecifier) ? getModeForUsageLocation(currentSourceFile, contextSpecifier) : currentSourceFile.impliedNodeFormat;
     const moduleResolutionKind = getEmitModuleResolutionKind(compilerOptions);
-    const resolvedModule = getResolvedModule(currentSourceFile, moduleReference, mode);
+    const resolvedModule = (_i = (_h = (_g = host.resolvedModules) == null ? void 0 : _g.get(currentSourceFile.path)) == null ? void 0 : _h.get(moduleReference, mode)) == null ? void 0 : _i.resolvedModule;
     const resolutionDiagnostic = resolvedModule && getResolutionDiagnostic(compilerOptions, resolvedModule, currentSourceFile);
     const sourceFile = resolvedModule && (!resolutionDiagnostic || resolutionDiagnostic === Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set) && host.getSourceFile(resolvedModule.resolvedFileName);
     if (sourceFile) {
@@ -46339,7 +46313,7 @@ function createTypeChecker(host) {
         error(errorNode, resolutionDiagnostic, moduleReference, resolvedModule.resolvedFileName);
       }
       if (resolvedModule.resolvedUsingTsExtension && isDeclarationFileName(moduleReference)) {
-        const importOrExport = ((_g = findAncestor(location, isImportDeclaration)) == null ? void 0 : _g.importClause) || findAncestor(location, or(isImportEqualsDeclaration, isExportDeclaration));
+        const importOrExport = ((_j = findAncestor(location, isImportDeclaration)) == null ? void 0 : _j.importClause) || findAncestor(location, or(isImportEqualsDeclaration, isExportDeclaration));
         if (importOrExport && !importOrExport.isTypeOnly || findAncestor(location, isImportCall)) {
           error(
             errorNode,
@@ -46348,7 +46322,7 @@ function createTypeChecker(host) {
           );
         }
       } else if (resolvedModule.resolvedUsingTsExtension && !shouldAllowImportingTsExtension(compilerOptions, currentSourceFile.fileName)) {
-        const importOrExport = ((_h = findAncestor(location, isImportDeclaration)) == null ? void 0 : _h.importClause) || findAncestor(location, or(isImportEqualsDeclaration, isExportDeclaration));
+        const importOrExport = ((_k = findAncestor(location, isImportDeclaration)) == null ? void 0 : _k.importClause) || findAncestor(location, or(isImportEqualsDeclaration, isExportDeclaration));
         if (!((importOrExport == null ? void 0 : importOrExport.isTypeOnly) || findAncestor(location, isImportTypeNode))) {
           const tsExtension = Debug.checkDefined(tryExtractTSExtension(moduleReference));
           error(errorNode, Diagnostics.An_import_path_can_only_end_with_a_0_extension_when_allowImportingTsExtensions_is_enabled, tsExtension);
@@ -46369,7 +46343,7 @@ function createTypeChecker(host) {
         if (moduleResolutionKind === 3 /* Node16 */ || moduleResolutionKind === 99 /* NodeNext */) {
           const isSyncImport = currentSourceFile.impliedNodeFormat === 1 /* CommonJS */ && !findAncestor(location, isImportCall) || !!findAncestor(location, isImportEqualsDeclaration);
           const overrideClauseHost = findAncestor(location, (l) => isImportTypeNode(l) || isExportDeclaration(l) || isImportDeclaration(l));
-          const overrideClause = overrideClauseHost && isImportTypeNode(overrideClauseHost) ? (_i = overrideClauseHost.assertions) == null ? void 0 : _i.assertClause : overrideClauseHost == null ? void 0 : overrideClauseHost.assertClause;
+          const overrideClause = overrideClauseHost && isImportTypeNode(overrideClauseHost) ? (_l = overrideClauseHost.assertions) == null ? void 0 : _l.assertClause : overrideClauseHost == null ? void 0 : overrideClauseHost.assertClause;
           if (isSyncImport && sourceFile.impliedNodeFormat === 99 /* ESNext */ && !getResolutionModeOverrideForClause(overrideClause)) {
             if (findAncestor(location, isImportEqualsDeclaration)) {
               error(errorNode, Diagnostics.Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_cannot_be_imported_with_require_Use_an_ECMAScript_import_instead, moduleReference);
@@ -46476,7 +46450,7 @@ function createTypeChecker(host) {
           error(errorNode, Diagnostics.Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension, moduleReference);
         } else if (mode === 99 /* ESNext */ && resolutionIsNode16OrNext && isExtensionlessRelativePathImport) {
           const absoluteRef = getNormalizedAbsolutePath(moduleReference, getDirectoryPath(currentSourceFile.path));
-          const suggestedExt = (_j = suggestedExtensions.find(([actualExt, _importExt]) => host.fileExists(absoluteRef + actualExt))) == null ? void 0 : _j[1];
+          const suggestedExt = (_m = suggestedExtensions.find(([actualExt, _importExt]) => host.fileExists(absoluteRef + actualExt))) == null ? void 0 : _m[1];
           if (suggestedExt) {
             error(errorNode, Diagnostics.Relative_import_paths_need_explicit_file_extensions_in_ECMAScript_imports_when_moduleResolution_is_node16_or_nodenext_Did_you_mean_0, moduleReference + suggestedExt);
           } else {
@@ -47775,7 +47749,7 @@ function createTypeChecker(host) {
           }
           return factory.createInferTypeNode(typeParameterToDeclarationWithConstraint(type, context, constraintNode));
         }
-        if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && type.flags & 262144 /* TypeParameter */ && !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration)) {
+        if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && type.flags & 262144 /* TypeParameter */) {
           const name2 = typeParameterToName(type, context);
           context.approximateLength += idText(name2).length;
           return factory.createTypeReferenceNode(
@@ -48541,36 +48515,65 @@ function createTypeChecker(host) {
         true
       )[0];
       let cleanup;
-      if (context.enclosingDeclaration && signature.declaration && signature.declaration !== context.enclosingDeclaration && !isInJSFile(signature.declaration) && some(expandedParams)) {
-        const existingFakeScope = getNodeLinks(context.enclosingDeclaration).fakeScopeForSignatureDeclaration ? context.enclosingDeclaration : void 0;
-        Debug.assertOptionalNode(existingFakeScope, isBlock);
-        const locals = (existingFakeScope == null ? void 0 : existingFakeScope.locals) ?? createSymbolTable();
-        let newLocals;
-        for (const param of expandedParams) {
-          if (!locals.has(param.escapedName)) {
-            newLocals = append(newLocals, param.escapedName);
-            locals.set(param.escapedName, param);
-          }
-        }
-        if (newLocals) {
-          let removeNewLocals2 = function() {
+      if (context.enclosingDeclaration && signature.declaration && signature.declaration !== context.enclosingDeclaration && !isInJSFile(signature.declaration) && (some(expandedParams) || some(signature.typeParameters))) {
+        let pushFakeScope2 = function(kind2, addAll) {
+          Debug.assert(context.enclosingDeclaration);
+          let existingFakeScope;
+          if (getNodeLinks(context.enclosingDeclaration).fakeScopeForSignatureDeclaration === kind2) {
+            existingFakeScope = context.enclosingDeclaration;
+          } else if (context.enclosingDeclaration.parent && getNodeLinks(context.enclosingDeclaration.parent).fakeScopeForSignatureDeclaration === kind2) {
+            existingFakeScope = context.enclosingDeclaration.parent;
+          }
+          Debug.assertOptionalNode(existingFakeScope, isBlock);
+          const locals = (existingFakeScope == null ? void 0 : existingFakeScope.locals) ?? createSymbolTable();
+          let newLocals;
+          addAll((name, symbol) => {
+            if (!locals.has(name)) {
+              newLocals = append(newLocals, name);
+              locals.set(name, symbol);
+            }
+          });
+          if (!newLocals)
+            return;
+          const oldCleanup = cleanup;
+          function undo() {
             forEach(newLocals, (s) => locals.delete(s));
-          };
-          var removeNewLocals = removeNewLocals2;
+            oldCleanup == null ? void 0 : oldCleanup();
+          }
           if (existingFakeScope) {
-            cleanup = removeNewLocals2;
+            cleanup = undo;
           } else {
             const fakeScope = parseNodeFactory.createBlock(emptyArray);
-            getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = true;
+            getNodeLinks(fakeScope).fakeScopeForSignatureDeclaration = kind2;
             fakeScope.locals = locals;
             const saveEnclosingDeclaration = context.enclosingDeclaration;
             setParent(fakeScope, saveEnclosingDeclaration);
             context.enclosingDeclaration = fakeScope;
             cleanup = () => {
               context.enclosingDeclaration = saveEnclosingDeclaration;
-              removeNewLocals2();
+              undo();
             };
           }
+        };
+        var pushFakeScope = pushFakeScope2;
+        pushFakeScope2(
+          "params",
+          (add) => {
+            for (const param of expandedParams) {
+              add(param.escapedName, param);
+            }
+          }
+        );
+        if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */) {
+          pushFakeScope2(
+            "typeParams",
+            (add) => {
+              for (const typeParam of signature.typeParameters ?? emptyArray) {
+                const typeParamName = typeParameterToName(typeParam, context).escapedText;
+                add(typeParamName, typeParam.symbol);
+              }
+            }
+          );
         }
       }
       const parameters = (some(expandedParams, (p) => p !== expandedParams[expandedParams.length - 1] && !!(getCheckFlags(p) & 32768 /* RestParameter */)) ? signature.parameters : expandedParams).map((parameter) => symbolToParameterDeclaration(parameter, context, kind === 176 /* Constructor */, options == null ? void 0 : options.privateSymbolVisitor, options == null ? void 0 : options.bundledImports));
@@ -49114,7 +49117,7 @@ function createTypeChecker(host) {
         return identifier;
       }
     }
-    function typeParameterShadowsNameInScope(escapedName, context, type) {
+    function typeParameterShadowsOtherTypeParameterInScope(escapedName, context, type) {
       const result = resolveName(
         context.enclosingDeclaration,
         escapedName,
@@ -49125,11 +49128,8 @@ function createTypeChecker(host) {
         /*isUse*/
         false
       );
-      if (result) {
-        if (result.flags & 262144 /* TypeParameter */ && result === type.symbol) {
-          return false;
-        }
-        return true;
+      if (result && result.flags & 262144 /* TypeParameter */) {
+        return result !== type.symbol;
       }
       return false;
     }
@@ -49155,7 +49155,7 @@ function createTypeChecker(host) {
         const rawtext = result.escapedText;
         let i = ((_a = context.typeParameterNamesByTextNextNameCount) == null ? void 0 : _a.get(rawtext)) || 0;
         let text = rawtext;
-        while (((_b = context.typeParameterNamesByText) == null ? void 0 : _b.has(text)) || typeParameterShadowsNameInScope(text, context, type)) {
+        while (((_b = context.typeParameterNamesByText) == null ? void 0 : _b.has(text)) || typeParameterShadowsOtherTypeParameterInScope(text, context, type)) {
           i++;
           text = `${rawtext}_${i}`;
         }
@@ -49166,7 +49166,7 @@ function createTypeChecker(host) {
         }
         (context.typeParameterNamesByTextNextNameCount || (context.typeParameterNamesByTextNextNameCount = /* @__PURE__ */ new Map())).set(rawtext, i);
         (context.typeParameterNames || (context.typeParameterNames = /* @__PURE__ */ new Map())).set(getTypeId(type), result);
-        (context.typeParameterNamesByText || (context.typeParameterNamesByText = /* @__PURE__ */ new Set())).add(rawtext);
+        (context.typeParameterNamesByText || (context.typeParameterNamesByText = /* @__PURE__ */ new Set())).add(text);
       }
       return result;
     }
@@ -49311,7 +49311,10 @@ function createTypeChecker(host) {
       return !(getObjectFlags(type) & 4 /* Reference */) || !isTypeReferenceNode(existing) || length(existing.typeArguments) >= getMinTypeArgumentCount(type.target.typeParameters);
     }
     function getEnclosingDeclarationIgnoringFakeScope(enclosingDeclaration) {
-      return getNodeLinks(enclosingDeclaration).fakeScopeForSignatureDeclaration ? enclosingDeclaration.parent : enclosingDeclaration;
+      while (getNodeLinks(enclosingDeclaration).fakeScopeForSignatureDeclaration) {
+        enclosingDeclaration = enclosingDeclaration.parent;
+      }
+      return enclosingDeclaration;
     }
     function serializeTypeForDeclaration(context, type, symbol, enclosingDeclaration, includePrivateSymbol, bundled) {
       if (!isErrorType(type) && enclosingDeclaration) {
@@ -49391,7 +49394,7 @@ function createTypeChecker(host) {
         }
         if (isIdentifier(node)) {
           const type = getDeclaredTypeOfSymbol(sym);
-          const name = sym.flags & 262144 /* TypeParameter */ && !isTypeSymbolAccessible(type.symbol, context.enclosingDeclaration) ? typeParameterToName(type, context) : factory.cloneNode(node);
+          const name = sym.flags & 262144 /* TypeParameter */ ? typeParameterToName(type, context) : factory.cloneNode(node);
           name.symbol = sym;
           return { introducesError, node: setEmitFlags(setOriginalNode(name, node), 16777216 /* NoAsciiEscaping */) };
         }
@@ -53234,7 +53237,28 @@ function createTypeChecker(host) {
           }
         }
       }
-      links[resolutionKind] = combineSymbolTables(earlySymbols, lateSymbols) || emptySymbols;
+      let resolved = combineSymbolTables(earlySymbols, lateSymbols);
+      if (symbol.flags & 33554432 /* Transient */ && links.cjsExportMerged && symbol.declarations) {
+        for (const decl of symbol.declarations) {
+          const original = getSymbolLinks(decl.symbol)[resolutionKind];
+          if (!resolved) {
+            resolved = original;
+            continue;
+          }
+          if (!original)
+            continue;
+          original.forEach((s, name) => {
+            const existing = resolved.get(name);
+            if (!existing)
+              resolved.set(name, s);
+            else if (existing === s)
+              return;
+            else
+              resolved.set(name, mergeSymbol(existing, s));
+          });
+        }
+      }
+      links[resolutionKind] = resolved || emptySymbols;
     }
     return links[resolutionKind];
   }
@@ -64060,13 +64084,10 @@ function createTypeChecker(host) {
         if (sourceNameType && targetNameType)
           inferFromTypes(sourceNameType, targetNameType);
       }
-      if (getObjectFlags(target) & 32 /* Mapped */) {
-        const mappedType = target;
-        if (!getNameTypeFromMappedType(mappedType) || isFilteringMappedType(mappedType)) {
-          const constraintType = getConstraintTypeFromMappedType(mappedType);
-          if (inferToMappedType(source, mappedType, constraintType)) {
-            return;
-          }
+      if (getObjectFlags(target) & 32 /* Mapped */ && !target.declaration.nameType) {
+        const constraintType = getConstraintTypeFromMappedType(target);
+        if (inferToMappedType(source, target, constraintType)) {
+          return;
         }
       }
       if (!typesDefinitelyUnrelated(source, target)) {
@@ -115398,15 +115419,15 @@ function isReferencedFile(reason) {
 function isReferenceFileLocation(location) {
   return location.pos !== void 0;
 }
-function getReferencedFileLocation(getSourceFileByPath, ref) {
-  var _a, _b, _c, _d, _e, _f;
-  const file = Debug.checkDefined(getSourceFileByPath(ref.file));
+function getReferencedFileLocation(program, ref) {
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  const file = Debug.checkDefined(program.getSourceFileByPath(ref.file));
   const { kind, index } = ref;
   let pos, end, packageId, resolutionMode;
   switch (kind) {
     case 3 /* Import */:
       const importLiteral = getModuleNameStringLiteralAt(file, index);
-      packageId = (_c = (_b = (_a = file.resolvedModules) == null ? void 0 : _a.get(importLiteral.text, getModeForResolutionAtIndex(file, index))) == null ? void 0 : _b.resolvedModule) == null ? void 0 : _c.packageId;
+      packageId = (_d = (_c = (_b = (_a = program.resolvedModules) == null ? void 0 : _a.get(file.path)) == null ? void 0 : _b.get(importLiteral.text, getModeForResolutionAtIndex(file, index))) == null ? void 0 : _c.resolvedModule) == null ? void 0 : _d.packageId;
       if (importLiteral.pos === -1)
         return { file, packageId, text: importLiteral.text };
       pos = skipTrivia(file.text, importLiteral.pos);
@@ -115417,7 +115438,7 @@ function getReferencedFileLocation(getSourceFileByPath, ref) {
       break;
     case 5 /* TypeReferenceDirective */:
       ({ pos, end, resolutionMode } = file.typeReferenceDirectives[index]);
-      packageId = (_f = (_e = (_d = file.resolvedTypeReferenceDirectiveNames) == null ? void 0 : _d.get(toFileNameLowerCase(file.typeReferenceDirectives[index].fileName), resolutionMode || file.impliedNodeFormat)) == null ? void 0 : _e.resolvedTypeReferenceDirective) == null ? void 0 : _f.packageId;
+      packageId = (_h = (_g = (_f = (_e = program.resolvedTypeReferenceDirectiveNames) == null ? void 0 : _e.get(file.path)) == null ? void 0 : _f.get(toFileNameLowerCase(file.typeReferenceDirectives[index].fileName), resolutionMode || file.impliedNodeFormat)) == null ? void 0 : _g.resolvedTypeReferenceDirective) == null ? void 0 : _h.packageId;
       break;
     case 7 /* LibReferenceDirective */:
       ({ pos, end } = file.libReferenceDirectives[index]);
@@ -115631,6 +115652,10 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   let automaticTypeDirectiveResolutions;
   let resolvedLibReferences;
   let resolvedLibProcessing;
+  let resolvedModules;
+  let resolvedModulesProcessing;
+  let resolvedTypeReferenceDirectiveNames;
+  let resolvedTypeReferenceDirectiveNamesProcessing;
   let packageMap;
   const maxNodeModuleJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 0;
   let currentNodeModulesDepth = 0;
@@ -115895,6 +115920,8 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   }
   oldProgram = void 0;
   resolvedLibProcessing = void 0;
+  resolvedModulesProcessing = void 0;
+  resolvedTypeReferenceDirectiveNamesProcessing = void 0;
   const program = {
     getRootFileNames: () => rootNames,
     getSourceFile,
@@ -115936,6 +115963,8 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     sourceFileToPackageName,
     redirectTargetsMap,
     usesUriStyleNodeCoreModules,
+    resolvedModules,
+    resolvedTypeReferenceDirectiveNames,
     resolvedLibReferences,
     getCurrentPackagesMap: () => packageMap,
     typesPackageExists,
@@ -115967,7 +115996,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       case 1 /* FilePreprocessingFileExplainingDiagnostic */:
         return programDiagnostics.add(createDiagnosticExplainingFile(diagnostic.file && getSourceFileByPath(diagnostic.file), diagnostic.fileProcessingReason, diagnostic.diagnostic, diagnostic.args || emptyArray));
       case 0 /* FilePreprocessingReferencedDiagnostic */:
-        const { file, pos, end } = getReferencedFileLocation(getSourceFileByPath, diagnostic.reason);
+        const { file, pos, end } = getReferencedFileLocation(program, diagnostic.reason);
         return programDiagnostics.add(createFileDiagnostic(file, Debug.checkDefined(pos), Debug.checkDefined(end) - pos, diagnostic.diagnostic, ...diagnostic.args || emptyArray));
       case 2 /* ResolutionDiagnostics */:
         return diagnostic.diagnostics.forEach((d) => programDiagnostics.add(d));
@@ -115984,14 +116013,15 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     if (packageMap)
       return packageMap;
     packageMap = /* @__PURE__ */ new Map();
-    files.forEach((sf) => {
-      if (!sf.resolvedModules)
-        return;
-      sf.resolvedModules.forEach(({ resolvedModule }) => {
-        if (resolvedModule == null ? void 0 : resolvedModule.packageId)
-          packageMap.set(resolvedModule.packageId.name, resolvedModule.extension === ".d.ts" /* Dts */ || !!packageMap.get(resolvedModule.packageId.name));
-      });
-    });
+    files.forEach(
+      (sf) => {
+        var _a2;
+        return (_a2 = resolvedModules == null ? void 0 : resolvedModules.get(sf.path)) == null ? void 0 : _a2.forEach(({ resolvedModule }) => {
+          if (resolvedModule == null ? void 0 : resolvedModule.packageId)
+            packageMap.set(resolvedModule.packageId.name, resolvedModule.extension === ".d.ts" /* Dts */ || !!packageMap.get(resolvedModule.packageId.name));
+        });
+      }
+    );
     return packageMap;
   }
   function typesPackageExists(packageName) {
@@ -116123,7 +116153,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     return classifiableNames;
   }
   function resolveModuleNamesReusingOldState(moduleNames, file) {
-    var _a2;
+    var _a2, _b2;
     if (structureIsReused === 0 /* Not */ && !file.ambientModuleNames.length) {
       return resolveModuleNamesWorker(
         moduleNames,
@@ -116132,24 +116162,16 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         void 0
       );
     }
-    const oldSourceFile = oldProgram && oldProgram.getSourceFile(file.fileName);
-    if (oldSourceFile !== file && file.resolvedModules) {
-      const result2 = [];
-      for (const moduleName of moduleNames) {
-        const resolvedModule = file.resolvedModules.get(moduleName.text, getModeForUsageLocation(file, moduleName));
-        result2.push(resolvedModule);
-      }
-      return result2;
-    }
     let unknownModuleNames;
     let result;
     let reusedNames;
     const predictedToResolveToAmbientModuleMarker = emptyResolution;
+    const oldSourceFile = oldProgram && oldProgram.getSourceFile(file.fileName);
     for (let i = 0; i < moduleNames.length; i++) {
       const moduleName = moduleNames[i];
-      if (file === oldSourceFile && !hasInvalidatedResolutions(oldSourceFile.path)) {
+      if (file === oldSourceFile && !hasInvalidatedResolutions(file.path)) {
         const mode = getModeForUsageLocation(file, moduleName);
-        const oldResolution = (_a2 = oldSourceFile.resolvedModules) == null ? void 0 : _a2.get(moduleName.text, mode);
+        const oldResolution = (_b2 = (_a2 = oldProgram == null ? void 0 : oldProgram.resolvedModules) == null ? void 0 : _a2.get(file.path)) == null ? void 0 : _b2.get(moduleName.text, mode);
         if (oldResolution == null ? void 0 : oldResolution.resolvedModule) {
           if (isTraceEnabled(options, host)) {
             trace(
@@ -116196,7 +116218,8 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     Debug.assert(j === resolutions.length);
     return result;
     function moduleNameResolvesToAmbientModuleInNonModifiedFile(moduleName) {
-      const resolutionToFile = getResolvedModule(oldSourceFile, moduleName.text, getModeForUsageLocation(file, moduleName));
+      var _a3, _b3, _c2;
+      const resolutionToFile = (_c2 = (_b3 = (_a3 = oldProgram == null ? void 0 : oldProgram.resolvedModules) == null ? void 0 : _a3.get(file.path)) == null ? void 0 : _b3.get(moduleName.text, getModeForUsageLocation(file, moduleName))) == null ? void 0 : _c2.resolvedModule;
       const resolvedFile = resolutionToFile && oldProgram.getSourceFile(resolutionToFile.resolvedFileName);
       if (resolutionToFile && resolvedFile) {
         return false;
@@ -116212,7 +116235,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     }
   }
   function resolveTypeReferenceDirectiveNamesReusingOldState(typeDirectiveNames, containingFile) {
-    var _a2;
+    var _a2, _b2;
     if (structureIsReused === 0 /* Not */) {
       return resolveTypeReferenceDirectiveNamesWorker(
         typeDirectiveNames,
@@ -116221,28 +116244,18 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         void 0
       );
     }
-    const oldSourceFile = !isString(containingFile) ? oldProgram && oldProgram.getSourceFile(containingFile.fileName) : void 0;
-    if (!isString(containingFile)) {
-      if (oldSourceFile !== containingFile && containingFile.resolvedTypeReferenceDirectiveNames) {
-        const result2 = [];
-        for (const typeDirectiveName of typeDirectiveNames) {
-          const resolvedTypeReferenceDirective = containingFile.resolvedTypeReferenceDirectiveNames.get(getTypeReferenceResolutionName(typeDirectiveName), getModeForFileReference(typeDirectiveName, containingFile.impliedNodeFormat));
-          result2.push(resolvedTypeReferenceDirective);
-        }
-        return result2;
-      }
-    }
     let unknownTypeReferenceDirectiveNames;
     let result;
     let reusedNames;
     const containingSourceFile = !isString(containingFile) ? containingFile : void 0;
-    const canReuseResolutions = !isString(containingFile) ? containingFile === oldSourceFile && !hasInvalidatedResolutions(oldSourceFile.path) : !hasInvalidatedResolutions(toPath3(containingFile));
+    const oldSourceFile = !isString(containingFile) ? oldProgram && oldProgram.getSourceFile(containingFile.fileName) : void 0;
+    const canReuseResolutions = !isString(containingFile) ? containingFile === oldSourceFile && !hasInvalidatedResolutions(containingFile.path) : !hasInvalidatedResolutions(toPath3(containingFile));
     for (let i = 0; i < typeDirectiveNames.length; i++) {
       const entry = typeDirectiveNames[i];
       if (canReuseResolutions) {
         const typeDirectiveName = getTypeReferenceResolutionName(entry);
         const mode = getModeForFileReference(entry, containingSourceFile == null ? void 0 : containingSourceFile.impliedNodeFormat);
-        const oldResolution = (_a2 = !isString(containingFile) ? oldSourceFile == null ? void 0 : oldSourceFile.resolvedTypeReferenceDirectiveNames : oldProgram == null ? void 0 : oldProgram.getAutomaticTypeDirectiveResolutions()) == null ? void 0 : _a2.get(typeDirectiveName, mode);
+        const oldResolution = (_b2 = !isString(containingFile) ? (_a2 = oldProgram == null ? void 0 : oldProgram.resolvedTypeReferenceDirectiveNames) == null ? void 0 : _a2.get(containingFile.path) : oldProgram == null ? void 0 : oldProgram.getAutomaticTypeDirectiveResolutions()) == null ? void 0 : _b2.get(typeDirectiveName, mode);
         if (oldResolution == null ? void 0 : oldResolution.resolvedTypeReferenceDirective) {
           if (isTraceEnabled(options, host)) {
             trace(
@@ -116302,7 +116315,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     );
   }
   function tryReuseStructureFromOldProgram() {
-    var _a2;
+    var _a2, _b2, _c2;
     if (!oldProgram) {
       return 0 /* Not */;
     }
@@ -116404,42 +116417,37 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
             structureIsReused = 1 /* SafeModules */;
           }
         }
-        modifiedSourceFiles.push({ oldFile: oldSourceFile, newFile: newSourceFile });
+        modifiedSourceFiles.push(newSourceFile);
       } else if (hasInvalidatedResolutions(oldSourceFile.path)) {
         structureIsReused = 1 /* SafeModules */;
-        modifiedSourceFiles.push({ oldFile: oldSourceFile, newFile: newSourceFile });
+        modifiedSourceFiles.push(newSourceFile);
+      } else {
+        for (const moduleName of oldSourceFile.ambientModuleNames) {
+          ambientModuleNameToUnmodifiedFileName.set(moduleName, oldSourceFile.fileName);
+        }
       }
       newSourceFiles.push(newSourceFile);
     }
     if (structureIsReused !== 2 /* Completely */) {
       return structureIsReused;
     }
-    const modifiedFiles = modifiedSourceFiles.map((f) => f.oldFile);
-    for (const oldFile of oldSourceFiles) {
-      if (!contains(modifiedFiles, oldFile)) {
-        for (const moduleName of oldFile.ambientModuleNames) {
-          ambientModuleNameToUnmodifiedFileName.set(moduleName, oldFile.fileName);
-        }
-      }
-    }
-    for (const { oldFile: oldSourceFile, newFile: newSourceFile } of modifiedSourceFiles) {
+    for (const newSourceFile of modifiedSourceFiles) {
       const moduleNames = getModuleNames(newSourceFile);
       const resolutions = resolveModuleNamesReusingOldState(moduleNames, newSourceFile);
-      const resolutionsChanged = hasChangesInResolutions(moduleNames, newSourceFile, resolutions, oldSourceFile.resolvedModules, moduleResolutionIsEqualTo, moduleResolutionNameAndModeGetter);
-      if (resolutionsChanged) {
+      (resolvedModulesProcessing ?? (resolvedModulesProcessing = /* @__PURE__ */ new Map())).set(newSourceFile.path, resolutions);
+      const oldResolutions = (_b2 = oldProgram.resolvedModules) == null ? void 0 : _b2.get(newSourceFile.path);
+      const resolutionsChanged = hasChangesInResolutions(moduleNames, newSourceFile, resolutions, oldResolutions, moduleResolutionIsEqualTo, moduleResolutionNameAndModeGetter);
+      if (resolutionsChanged)
         structureIsReused = 1 /* SafeModules */;
-        newSourceFile.resolvedModules = zipToModeAwareCache(newSourceFile, moduleNames, resolutions, moduleResolutionNameAndModeGetter);
-      } else {
-        newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
-      }
       const typesReferenceDirectives = newSourceFile.typeReferenceDirectives;
       const typeReferenceResolutions = resolveTypeReferenceDirectiveNamesReusingOldState(typesReferenceDirectives, newSourceFile);
-      const typeReferenceResolutionsChanged = hasChangesInResolutions(typesReferenceDirectives, newSourceFile, typeReferenceResolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, typeDirectiveIsEqualTo, typeReferenceResolutionNameAndModeGetter);
+      (resolvedTypeReferenceDirectiveNamesProcessing ?? (resolvedTypeReferenceDirectiveNamesProcessing = /* @__PURE__ */ new Map())).set(newSourceFile.path, typeReferenceResolutions);
+      const oldTypeResolutions = (_c2 = oldProgram.resolvedTypeReferenceDirectiveNames) == null ? void 0 : _c2.get(newSourceFile.path);
+      const typeReferenceResolutionsChanged = hasChangesInResolutions(typesReferenceDirectives, newSourceFile, typeReferenceResolutions, oldTypeResolutions, typeDirectiveIsEqualTo, typeReferenceResolutionNameAndModeGetter);
       if (typeReferenceResolutionsChanged) {
         structureIsReused = 1 /* SafeModules */;
-        newSourceFile.resolvedTypeReferenceDirectiveNames = zipToModeAwareCache(newSourceFile, typesReferenceDirectives, typeReferenceResolutions, typeReferenceResolutionNameAndModeGetter);
-      } else {
-        newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
+      } else if (oldTypeResolutions) {
+        (resolvedTypeReferenceDirectiveNamesProcessing ?? (resolvedTypeReferenceDirectiveNamesProcessing = /* @__PURE__ */ new Map())).set(newSourceFile.path, oldTypeResolutions);
       }
     }
     if (structureIsReused !== 2 /* Completely */) {
@@ -116487,6 +116495,8 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     sourceFileToPackageName = oldProgram.sourceFileToPackageName;
     redirectTargetsMap = oldProgram.redirectTargetsMap;
     usesUriStyleNodeCoreModules = oldProgram.usesUriStyleNodeCoreModules;
+    resolvedModules = oldProgram.resolvedModules;
+    resolvedTypeReferenceDirectiveNames = oldProgram.resolvedTypeReferenceDirectiveNames;
     resolvedLibReferences = oldProgram.resolvedLibReferences;
     packageMap = oldProgram.getCurrentPackagesMap();
     return 2 /* Completely */;
@@ -117532,16 +117542,16 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   }
   function processTypeReferenceDirectives(file) {
     const typeDirectives = file.typeReferenceDirectives;
-    if (!typeDirectives.length) {
-      file.resolvedTypeReferenceDirectiveNames = void 0;
+    if (!typeDirectives.length)
       return;
-    }
-    const resolutions = resolveTypeReferenceDirectiveNamesReusingOldState(typeDirectives, file);
+    const resolutions = (resolvedTypeReferenceDirectiveNamesProcessing == null ? void 0 : resolvedTypeReferenceDirectiveNamesProcessing.get(file.path)) || resolveTypeReferenceDirectiveNamesReusingOldState(typeDirectives, file);
+    const resolutionsInFile = createModeAwareCache();
+    (resolvedTypeReferenceDirectiveNames ?? (resolvedTypeReferenceDirectiveNames = /* @__PURE__ */ new Map())).set(file.path, resolutionsInFile);
     for (let index = 0; index < typeDirectives.length; index++) {
       const ref = file.typeReferenceDirectives[index];
       const resolvedTypeReferenceDirective = resolutions[index];
       const fileName = toFileNameLowerCase(ref.fileName);
-      setResolvedTypeReferenceDirective(file, fileName, resolvedTypeReferenceDirective, getModeForFileReference(ref, file.impliedNodeFormat));
+      resolutionsInFile.set(fileName, getModeForFileReference(ref, file.impliedNodeFormat), resolvedTypeReferenceDirective);
       const mode = ref.resolutionMode || file.impliedNodeFormat;
       if (mode && getEmitModuleResolutionKind(options) !== 3 /* Node16 */ && getEmitModuleResolutionKind(options) !== 99 /* NodeNext */) {
         (fileProcessingDiagnostics ?? (fileProcessingDiagnostics = [])).push({
@@ -117705,14 +117715,16 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     collectExternalModuleReferences(file);
     if (file.imports.length || file.moduleAugmentations.length) {
       const moduleNames = getModuleNames(file);
-      const resolutions = resolveModuleNamesReusingOldState(moduleNames, file);
+      const resolutions = (resolvedModulesProcessing == null ? void 0 : resolvedModulesProcessing.get(file.path)) || resolveModuleNamesReusingOldState(moduleNames, file);
       Debug.assert(resolutions.length === moduleNames.length);
       const optionsForFile = (useSourceOfProjectReferenceRedirect ? (_a2 = getRedirectReferenceForResolution(file)) == null ? void 0 : _a2.commandLine.options : void 0) || options;
+      const resolutionsInFile = createModeAwareCache();
+      (resolvedModules ?? (resolvedModules = /* @__PURE__ */ new Map())).set(file.path, resolutionsInFile);
       for (let index = 0; index < moduleNames.length; index++) {
         const resolution = resolutions[index].resolvedModule;
         const moduleName = moduleNames[index].text;
         const mode = getModeForUsageLocation(file, moduleNames[index]);
-        setResolvedModule(file, moduleName, resolutions[index], mode);
+        resolutionsInFile.set(moduleName, mode, resolutions[index]);
         addResolutionDiagnosticsFromResolutionOrCache(file, moduleName, resolutions[index], mode);
         if (!resolution) {
           continue;
@@ -117743,8 +117755,6 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
           currentNodeModulesDepth--;
         }
       }
-    } else {
-      file.resolvedModules = void 0;
     }
   }
   function checkSourceFilesBelongToPath(sourceFiles, rootDirectory) {
@@ -118259,7 +118269,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       processReason(fileProcessingReason);
     if (locationReason && (fileIncludeReasons == null ? void 0 : fileIncludeReasons.length) === 1)
       fileIncludeReasons = void 0;
-    const location = locationReason && getReferencedFileLocation(getSourceFileByPath, locationReason);
+    const location = locationReason && getReferencedFileLocation(program, locationReason);
     const fileIncludeReasonDetails = fileIncludeReasons && chainDiagnosticMessages(fileIncludeReasons, Diagnostics.The_file_is_in_the_program_because_Colon);
     const redirectInfo = file && explainIfFileIsRedirectAndImpliedFormat(file);
     const chain = chainDiagnosticMessages(redirectInfo ? fileIncludeReasonDetails ? [fileIncludeReasonDetails, ...redirectInfo] : redirectInfo : fileIncludeReasonDetails, diagnostic, ...args || emptyArray);
@@ -118295,7 +118305,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
   }
   function fileIncludeReasonToRelatedInformation(reason) {
     if (isReferencedFile(reason)) {
-      const referenceLocation = getReferencedFileLocation(getSourceFileByPath, reason);
+      const referenceLocation = getReferencedFileLocation(program, reason);
       let message2;
       switch (reason.kind) {
         case 3 /* Import */:
@@ -118584,8 +118594,8 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     if (!symlinks) {
       symlinks = createSymlinkCache(currentDirectory, getCanonicalFileName);
     }
-    if (files && automaticTypeDirectiveResolutions && !symlinks.hasProcessedResolutions()) {
-      symlinks.setSymlinksFromResolutions(files, automaticTypeDirectiveResolutions);
+    if (files && !symlinks.hasProcessedResolutions()) {
+      symlinks.setSymlinksFromResolutions(resolvedModules, resolvedTypeReferenceDirectiveNames, automaticTypeDirectiveResolutions);
     }
     return symlinks;
   }
@@ -118939,6 +118949,7 @@ var BuilderState;
     return toPath(program.getProjectReferenceRedirect(fileName) || fileName, sourceFileDirectory, getCanonicalFileName);
   }
   function getReferencedFiles(program, sourceFile, getCanonicalFileName) {
+    var _a;
     let referencedFiles;
     if (sourceFile.imports && sourceFile.imports.length > 0) {
       const checker = program.getTypeChecker();
@@ -118954,8 +118965,9 @@ var BuilderState;
         addReferencedFile(referencedPath);
       }
     }
-    if (sourceFile.resolvedTypeReferenceDirectiveNames) {
-      sourceFile.resolvedTypeReferenceDirectiveNames.forEach(({ resolvedTypeReferenceDirective }) => {
+    const resolvedTypeReferenceDirectiveNames = (_a = program.resolvedTypeReferenceDirectiveNames) == null ? void 0 : _a.get(sourceFile.path);
+    if (resolvedTypeReferenceDirectiveNames) {
+      resolvedTypeReferenceDirectiveNames.forEach(({ resolvedTypeReferenceDirective }) => {
         if (!resolvedTypeReferenceDirective) {
           return;
         }
@@ -120751,7 +120763,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     clear: clear2,
     onChangesAffectModuleResolution
   };
-  function getResolvedModule2(resolution) {
+  function getResolvedModule(resolution) {
     return resolution.resolvedModule;
   }
   function getResolvedTypeReferenceDirective(resolution) {
@@ -120830,7 +120842,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         stopWatchFailedLookupLocationOfResolution(
           resolution,
           resolutionHost.toPath(getInferredLibraryNameResolveFrom(newProgram.getCompilerOptions(), getCurrentDirectory(), libFileName)),
-          getResolvedModule2
+          getResolvedModule
         );
         resolvedLibraries.delete(libFileName);
       }
@@ -121055,7 +121067,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         redirectedReference,
         options
       ),
-      getResolutionWithResolvedFileName: getResolvedModule2,
+      getResolutionWithResolvedFileName: getResolvedModule,
       shouldRetryResolution: (resolution) => !resolution.resolvedModule || !resolutionExtensionIsTSOrJson(resolution.resolvedModule.extension),
       logChanges: logChangesWhenResolvingModule,
       deferWatchingNonRelativeResolution: true
@@ -121074,17 +121086,17 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         libraryName,
         resolution,
         path,
-        getResolvedModule2,
+        getResolvedModule,
         /*deferWatchingNonRelativeResolution*/
         false
       );
       resolvedLibraries.set(libFileName, resolution);
       if (existingResolution) {
-        stopWatchFailedLookupLocationOfResolution(existingResolution, path, getResolvedModule2);
+        stopWatchFailedLookupLocationOfResolution(existingResolution, path, getResolvedModule);
       }
     } else {
       if (isTraceEnabled(options, host)) {
-        const resolved = getResolvedModule2(resolution);
+        const resolved = getResolvedModule(resolution);
         trace(
           host,
           (resolved == null ? void 0 : resolved.resolvedFileName) ? resolved.packageId ? Diagnostics.Reusing_resolution_of_module_0_from_1_of_old_program_it_was_successfully_resolved_to_2_with_Package_ID_3 : Diagnostics.Reusing_resolution_of_module_0_from_1_of_old_program_it_was_successfully_resolved_to_2 : Diagnostics.Reusing_resolution_of_module_0_from_1_of_old_program_it_was_not_resolved,
@@ -121361,7 +121373,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     resolvedProjectReference.commandLine.fileNames.forEach((f) => removeResolutionsOfFile(resolutionHost.toPath(f)));
   }
   function removeResolutionsOfFile(filePath) {
-    removeResolutionsOfFileFromCache(resolvedModuleNames, filePath, getResolvedModule2);
+    removeResolutionsOfFileFromCache(resolvedModuleNames, filePath, getResolvedModule);
     removeResolutionsOfFileFromCache(resolvedTypeReferenceDirectives, filePath, getResolvedTypeReferenceDirective);
   }
   function invalidateResolutions(resolutions, canInvalidate) {
@@ -121788,7 +121800,7 @@ function fileIncludeReasonToDiagnostics(program, reason, fileNameConvertor) {
   var _a, _b;
   const options = program.getCompilerOptions();
   if (isReferencedFile(reason)) {
-    const referenceLocation = getReferencedFileLocation((path) => program.getSourceFileByPath(path), reason);
+    const referenceLocation = getReferencedFileLocation(program, reason);
     const referenceText = isReferenceFileLocation(referenceLocation) ? referenceLocation.file.text.substring(referenceLocation.pos, referenceLocation.end) : `"${referenceLocation.text}"`;
     let message;
     Debug.assert(isReferenceFileLocation(referenceLocation) || reason.kind === 3 /* Import */, "Only synthetic references are imports");