When caching type references cache the tracked symbols so they can be emitted in the d.ts file

Fixes #51548

Author: sheetalkamat

src/compiler/checker.ts

@@ -338,8 +338,8 @@ import {
     hasAccessorModifier,
     hasAmbientModifier,
     hasContextSensitiveParameters,
-    HasDecorators,
     hasDecorators,
+    HasDecorators,
     hasDynamicName,
     hasEffectiveModifier,
     hasEffectiveModifiers,
@@ -348,8 +348,8 @@ import {
     hasExtension,
     HasIllegalDecorators,
     HasIllegalModifiers,
-    HasInitializer,
     hasInitializer,
+    HasInitializer,
     hasJSDocNodes,
     hasJSDocParameterTags,
     hasJsonModuleEmitEnabled,
@@ -873,6 +873,7 @@ import {
     SatisfiesExpression,
     ScriptKind,
     ScriptTarget,
+    SerializedTypeNodeData,
     SetAccessorDeclaration,
     setCommentRange,
     setEmitFlags,
@@ -6554,6 +6555,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 }
                 const cachedResult = links?.serializedTypes?.get(key);
                 if (cachedResult) {
+                    if (context.tracker.trackSymbol) cachedResult.trackedSymbols?.forEach(([symbol, enclosingDeclaration, meaning]) => context.tracker.trackSymbol!(symbol, enclosingDeclaration, meaning));
                     if (cachedResult.truncating) {
                         context.truncating = true;
                     }
@@ -6570,15 +6572,22 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     context.symbolDepth!.set(id, depth + 1);
                 }
                 context.visitedTypes.add(typeId);
+                const existingTracked = context.tracker.trackSymbol?.bind(context.tracker);
+                let trackedSymbols: [symbol: Symbol, enclosingDeclaration: Node | undefined, meaning: SymbolFlags][] | undefined;
+                context.tracker.trackSymbol = existingTracked ? (symbol, enclosingDeclaration, meaning) => {
+                    (trackedSymbols ??= []).push([symbol, enclosingDeclaration, meaning]);
+                    return existingTracked?.(symbol, enclosingDeclaration, meaning);
+                } : existingTracked;
                 const startLength = context.approximateLength;
-                const result = transform(type);
+                const result = transform(type) as unknown as SerializedTypeNodeData;
                 const addedLength = context.approximateLength - startLength;
                 if (!context.reportedDiagnostic && !context.encounteredError) {
                     if (context.truncating) {
-                        (result as any).truncating = true;
+                        result.truncating = true;
                     }
-                    (result as any).addedLength = addedLength;
-                    links?.serializedTypes?.set(key, result as TypeNode as TypeNode & {truncating?: boolean, addedLength: number});
+                    result.addedLength = addedLength;
+                    if (trackedSymbols) result.trackedSymbols = trackedSymbols;
+                    links?.serializedTypes?.set(key, result);
                 }
                 context.visitedTypes.delete(typeId);
                 if (id) {

src/compiler/types.ts

@@ -5660,6 +5660,13 @@ export const enum NodeCheckFlags {
     InCheckIdentifier                        = 1 << 24,
 }
 
+/**@internal*/
+export interface SerializedTypeNodeData extends TypeNode {
+    truncating?: boolean;
+    addedLength: number;
+    trackedSymbols: readonly [symbol: Symbol, enclosingDeclaration: Node | undefined, meaning: SymbolFlags][] | undefined;
+}
+
 /** @internal */
 export interface NodeLinks {
     flags: NodeCheckFlags;              // Set of flags specific to Node
@@ -5687,7 +5694,7 @@ export interface NodeLinks {
     isExhaustive?: boolean | 0;         // Is node an exhaustive switch statement (0 indicates in-process resolution)
     skipDirectInference?: true;         // Flag set by the API `getContextualType` call on a node when `Completions` is passed to force the checker to skip making inferences to a node's type
     declarationRequiresScopeChange?: boolean; // Set by `useOuterVariableScopeInParameter` in checker when downlevel emit would change the name resolution scope inside of a parameter.
-    serializedTypes?: Map<string, TypeNode & {truncating?: boolean, addedLength: number}>; // Collection of types serialized at this location
+    serializedTypes?: Map<string, SerializedTypeNodeData>; // Collection of types serialized at this location
 }
 
 export const enum TypeFlags {

tests/baselines/reference/tsc/incremental/generates-typerefs-correctly-discrepancies.js

@@ -226,6 +226,7 @@ export const bug: W.Wrap<{
     n: B.Box<number>;
 }>;
 export const something: 1;
+import * as B from "./box.js";
 import * as W from "./wrap.js";
 
 
@@ -255,7 +256,7 @@ exports.something = 1;
 
 
 //// [/src/project/outDir/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../../lib/lib.d.ts","../src/box.ts","../src/wrap.ts","../src/bug.js"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-14267342128-export interface Box<T> {\n    unbox(): T\n}\n","signature":"-3708762094-export interface Box<T> {\r\n    unbox(): T;\r\n}\r\n"},{"version":"-7208318765-export type Wrap<C> = {\n    [K in keyof C]: { wrapped: C[K] }\n}\n","signature":"-1963209831-export type Wrap<C> = {\r\n    [K in keyof C]: {\r\n        wrapped: C[K];\r\n    };\r\n};\r\n"},{"version":"-25729561895-import * as B from \"./box.js\"\nimport * as W from \"./wrap.js\"\n\n/**\n * @template {object} C\n * @param {C} source\n * @returns {W.Wrap<C>}\n */\nconst wrap = source => {\nthrow source\n}\n\n/**\n * @returns {B.Box<number>}\n */\nconst box = (n = 0) => ({ unbox: () => n })\n\nexport const bug = wrap({ n: box(1) });\nexport const something = 1;","signature":"-18323848036-export const bug: W.Wrap<{\r\n    n: B.Box<number>;\r\n}>;\r\nexport const something: 1;\r\nimport * as B from \"./box.js\";\r\nimport * as W from \"./wrap.js\";\r\n"}],"options":{"composite":true,"outDir":"./"},"fileIdsList":[[2,3]],"referencedMap":[[4,1]],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,2,4,3],"emitSignatures":[[4,"-5518966042-export const bug: W.Wrap<{\r\n    n: B.Box<number>;\r\n}>;\r\nexport const something: 1;\r\nimport * as W from \"./wrap.js\";\r\n"]],"latestChangedDtsFile":"./src/bug.d.ts"},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../../lib/lib.d.ts","../src/box.ts","../src/wrap.ts","../src/bug.js"],"fileInfos":[{"version":"3858781397-/// <reference no-default-lib=\"true\"/>\ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array<T> { length: number; [n: number]: T; }\ninterface ReadonlyArray<T> {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-14267342128-export interface Box<T> {\n    unbox(): T\n}\n","signature":"-3708762094-export interface Box<T> {\r\n    unbox(): T;\r\n}\r\n"},{"version":"-7208318765-export type Wrap<C> = {\n    [K in keyof C]: { wrapped: C[K] }\n}\n","signature":"-1963209831-export type Wrap<C> = {\r\n    [K in keyof C]: {\r\n        wrapped: C[K];\r\n    };\r\n};\r\n"},{"version":"-25729561895-import * as B from \"./box.js\"\nimport * as W from \"./wrap.js\"\n\n/**\n * @template {object} C\n * @param {C} source\n * @returns {W.Wrap<C>}\n */\nconst wrap = source => {\nthrow source\n}\n\n/**\n * @returns {B.Box<number>}\n */\nconst box = (n = 0) => ({ unbox: () => n })\n\nexport const bug = wrap({ n: box(1) });\nexport const something = 1;","signature":"-18323848036-export const bug: W.Wrap<{\r\n    n: B.Box<number>;\r\n}>;\r\nexport const something: 1;\r\nimport * as B from \"./box.js\";\r\nimport * as W from \"./wrap.js\";\r\n"}],"options":{"composite":true,"outDir":"./"},"fileIdsList":[[2,3]],"referencedMap":[[4,1]],"exportedModulesMap":[],"semanticDiagnosticsPerFile":[1,2,4,3],"latestChangedDtsFile":"./src/bug.d.ts"},"version":"FakeTSVersion"}
 
 //// [/src/project/outDir/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -324,15 +325,9 @@ exports.something = 1;
       "../src/bug.js",
       "../src/wrap.ts"
     ],
-    "emitSignatures": [
-      [
-        "../src/bug.js",
-        "-5518966042-export const bug: W.Wrap<{\r\n    n: B.Box<number>;\r\n}>;\r\nexport const something: 1;\r\nimport * as W from \"./wrap.js\";\r\n"
-      ]
-    ],
     "latestChangedDtsFile": "./src/bug.d.ts"
   },
   "version": "FakeTSVersion",
-  "size": 1918
+  "size": 1751
 }