Switch program to store name to ResolvedTypeReferenceDirective

Author: sheetalkamat

src/compiler/checker.ts

@@ -38212,11 +38212,11 @@ namespace ts {
             if (resolvedTypeReferenceDirectives) {
                 // populate reverse mapping: file path -> type reference directive that was resolved to this file
                 fileToDirective = new Map<string, string>();
-                resolvedTypeReferenceDirectives.forEach((resolvedDirective, key) => {
-                    if (!resolvedDirective || !resolvedDirective.resolvedFileName) {
+                resolvedTypeReferenceDirectives.forEach(({ resolvedTypeReferenceDirective }, key) => {
+                    if (!resolvedTypeReferenceDirective || !resolvedTypeReferenceDirective.resolvedFileName) {
                         return;
                     }
-                    const file = host.getSourceFile(resolvedDirective.resolvedFileName);
+                    const file = host.getSourceFile(resolvedTypeReferenceDirective.resolvedFileName);
                     if (file) {
                         // Add the transitive closure of path references loaded by this file (as long as they are not)
                         // part of an existing type reference.

src/compiler/program.ts

@@ -729,7 +729,7 @@ namespace ts {
         const cachedBindAndCheckDiagnosticsForFile: DiagnosticCache<Diagnostic> = {};
         const cachedDeclarationDiagnosticsForFile: DiagnosticCache<DiagnosticWithLocation> = {};
 
-        let resolvedTypeReferenceDirectives = new Map<string, ResolvedTypeReferenceDirective | undefined>();
+        let resolvedTypeReferenceDirectives = new Map<string, ResolvedTypeReferenceDirectiveWithFailedLookupLocations>();
         let perFileModuleResolutions = new Map<Path, ESMap<string, ResolvedModuleWithFailedLookupLocations>>();
         let perFileTypeReferenceResolutions = new Map<Path, ESMap<string, ResolvedTypeReferenceDirectiveWithFailedLookupLocations>>();
         let perFileModuleResolutionsUsingOldProgram = new Map<Path, ESMap<string, ResolvedModuleWithFailedLookupLocations>>();
@@ -2828,16 +2828,17 @@ namespace ts {
 
         function processTypeReferenceDirective(
             typeReferenceDirective: string,
-            { resolvedTypeReferenceDirective }: ResolvedTypeReferenceDirectiveWithFailedLookupLocations,
+            resolved: ResolvedTypeReferenceDirectiveWithFailedLookupLocations,
             refFile?: RefFile
         ): void {
 
             // If we already found this library as a primary reference - nothing to do
             const previousResolution = resolvedTypeReferenceDirectives.get(typeReferenceDirective);
-            if (previousResolution && previousResolution.primary) {
+            if (previousResolution?.resolvedTypeReferenceDirective?.primary) {
                 return;
             }
             let saveResolution = true;
+            const { resolvedTypeReferenceDirective } = resolved;
             if (resolvedTypeReferenceDirective) {
                 if (resolvedTypeReferenceDirective.isExternalLibraryImport) currentNodeModulesDepth++;
 
@@ -2848,11 +2849,11 @@ namespace ts {
                 else {
                     // If we already resolved to this file, it must have been a secondary reference. Check file contents
                     // for sameness and possibly issue an error
-                    if (previousResolution) {
+                    if (previousResolution?.resolvedTypeReferenceDirective) {
                         // Don't bother reading the file again if it's the same file.
-                        if (resolvedTypeReferenceDirective.resolvedFileName !== previousResolution.resolvedFileName) {
+                        if (resolvedTypeReferenceDirective.resolvedFileName !== previousResolution.resolvedTypeReferenceDirective.resolvedFileName) {
                             const otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName!);
-                            const existingFile = getSourceFile(previousResolution.resolvedFileName!)!;
+                            const existingFile = getSourceFile(previousResolution.resolvedTypeReferenceDirective.resolvedFileName!)!;
                             if (otherFileText !== existingFile.text) {
                                 // Try looking up ref for original file
                                 const refs = !refFile ? refFileMap && refFileMap.get(existingFile.path) : undefined;
@@ -2864,14 +2865,14 @@ namespace ts {
                                             Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict,
                                             typeReferenceDirective,
                                             resolvedTypeReferenceDirective.resolvedFileName,
-                                            previousResolution.resolvedFileName
+                                            previousResolution.resolvedTypeReferenceDirective.resolvedFileName
                                         ) :
                                         createRefFileDiagnostic(
                                             refFile,
                                             Diagnostics.Conflicting_definitions_for_0_found_at_1_and_2_Consider_installing_a_specific_version_of_this_library_to_resolve_the_conflict,
                                             typeReferenceDirective,
                                             resolvedTypeReferenceDirective.resolvedFileName,
-                                            previousResolution.resolvedFileName
+                                            previousResolution.resolvedTypeReferenceDirective.resolvedFileName
                                         )
                                 );
                             }
@@ -2896,7 +2897,7 @@ namespace ts {
             }
 
             if (saveResolution) {
-                resolvedTypeReferenceDirectives.set(typeReferenceDirective, resolvedTypeReferenceDirective);
+                resolvedTypeReferenceDirectives.set(typeReferenceDirective, resolved);
             }
         }
 

src/compiler/types.ts

@@ -3769,7 +3769,7 @@ namespace ts {
         getRelationCacheSizes(): { assignable: number, identity: number, subtype: number, strictSubtype: number };
 
         /* @internal */ getFileProcessingDiagnostics(): DiagnosticCollection;
-        /* @internal */ getResolvedTypeReferenceDirectives(): ESMap<string, ResolvedTypeReferenceDirective | undefined>;
+        /* @internal */ getResolvedTypeReferenceDirectives(): ESMap<string, ResolvedTypeReferenceDirectiveWithFailedLookupLocations>;
         isSourceFileFromExternalLibrary(file: SourceFile): boolean;
         isSourceFileDefaultLibrary(file: SourceFile): boolean;
 
@@ -3906,7 +3906,7 @@ namespace ts {
 
         getSourceFiles(): readonly SourceFile[];
         getSourceFile(fileName: string): SourceFile | undefined;
-        getResolvedTypeReferenceDirectives(): ReadonlyESMap<string, ResolvedTypeReferenceDirective | undefined>;
+        getResolvedTypeReferenceDirectives(): ReadonlyESMap<string, ResolvedTypeReferenceDirectiveWithFailedLookupLocations>;
         getProjectReferenceRedirect(fileName: string): string | undefined;
         isSourceOfProjectReferenceRedirect(fileName: string): boolean;
 

src/services/goToDefinition.ts

@@ -124,7 +124,7 @@ namespace ts.GoToDefinition {
         const typeReferenceDirective = findReferenceInPosition(sourceFile.typeReferenceDirectives, position);
         if (typeReferenceDirective) {
             const reference = program.getResolvedTypeReferenceDirectives().get(typeReferenceDirective.fileName);
-            const file = reference && program.getSourceFile(reference.resolvedFileName!); // TODO:GH#18217
+            const file = reference?.resolvedTypeReferenceDirective && program.getSourceFile(reference.resolvedTypeReferenceDirective.resolvedFileName!); // TODO:GH#18217
             return file && { fileName: typeReferenceDirective.fileName, file };
         }
 

src/services/importTracker.ts

@@ -352,7 +352,7 @@ namespace ts.FindAllReferences {
                 }
                 for (const ref of referencingFile.typeReferenceDirectives) {
                     const referenced = program.getResolvedTypeReferenceDirectives().get(ref.fileName);
-                    if (referenced !== undefined && referenced.resolvedFileName === (searchSourceFile as SourceFile).fileName) {
+                    if (referenced?.resolvedTypeReferenceDirective?.resolvedFileName === (searchSourceFile as SourceFile).fileName) {
                         refs.push({ kind: "reference", referencingFile, ref });
                     }
                 }