If we are updating dts of any of the file and it affects global scope, everything needs update in signature and dts emit

Fixes #42769

Author: sheetalkamat

src/compiler/builder.ts

@@ -540,18 +540,48 @@ namespace ts {
         return newSignature !== oldSignature;
     }
 
-    function forEachKeyOfExportedModulesMap(state: BuilderProgramState, filePath: Path, fn: (exportedFromPath: Path) => void) {
+    function forEachKeyOfExportedModulesMap<T>(
+        state: BuilderProgramState,
+        filePath: Path,
+        fn: (exportedFromPath: Path) => T | undefined,
+    ): T | undefined {
         // Go through exported modules from cache first
-        state.currentAffectedFilesExportedModulesMap!.getKeys(filePath)?.forEach(fn);
+        let keys = state.currentAffectedFilesExportedModulesMap!.getKeys(filePath);
+        const result = keys && forEachKey(keys, fn);
+        if (result) return result;
+
         // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
-        state.exportedModulesMap!.getKeys(filePath)?.forEach(exportedFromPath =>
+        keys = state.exportedModulesMap!.getKeys(filePath);
+        return keys && forEachKey(keys, exportedFromPath =>
             // If the cache had an updated value, skip
             !state.currentAffectedFilesExportedModulesMap!.hasKey(exportedFromPath) &&
-            !state.currentAffectedFilesExportedModulesMap!.deletedKeys()?.has(exportedFromPath) &&
-            fn(exportedFromPath)
+            !state.currentAffectedFilesExportedModulesMap!.deletedKeys()?.has(exportedFromPath) ?
+                fn(exportedFromPath) :
+                undefined
         );
     }
 
+    function handleDtsMayChangeOfGlobalScope(
+        state: BuilderProgramState,
+        filePath: Path,
+        cancellationToken: CancellationToken | undefined,
+        computeHash: BuilderState.ComputeHash,
+        host: BuilderProgramHost,
+    ): boolean {
+        if (!state.fileInfos.get(filePath)?.affectsGlobalScope) return false;
+        // Every file needs to be handled
+        BuilderState.getAllFilesExcludingDefaultLibraryFile(state, state.program!, /*firstSourceFile*/ undefined)
+            .forEach(file => handleDtsMayChangeOf(
+                state,
+                file.resolvedPath,
+                cancellationToken,
+                computeHash,
+                host,
+            ));
+        removeDiagnosticsOfLibraryFiles(state);
+        return true;
+    }
+
     /**
      * Iterate on referencing modules that export entities from affected file and delete diagnostics and add pending emit
      */
@@ -577,6 +607,7 @@ namespace ts {
                 const currentPath = queue.pop()!;
                 if (!seenFileNamesMap.has(currentPath)) {
                     seenFileNamesMap.set(currentPath, true);
+                    if (handleDtsMayChangeOfGlobalScope(state, currentPath, cancellationToken, computeHash, host)) return;
                     handleDtsMayChangeOf(state, currentPath, cancellationToken, computeHash, host);
                     if (isChangedSignature(state, currentPath)) {
                         const currentSourceFile = Debug.checkDefined(state.program).getSourceFileByPath(currentPath)!;
@@ -590,8 +621,10 @@ namespace ts {
         const seenFileAndExportsOfFile = new Set<string>();
         // Go through exported modules from cache first
         // If exported modules has path, all files referencing file exported from are affected
-        forEachKeyOfExportedModulesMap(state, affectedFile.resolvedPath, exportedFromPath =>
-            state.referencedMap!.getKeys(exportedFromPath)?.forEach(filePath =>
+        forEachKeyOfExportedModulesMap(state, affectedFile.resolvedPath, exportedFromPath => {
+            if (handleDtsMayChangeOfGlobalScope(state, exportedFromPath, cancellationToken, computeHash, host)) return true;
+            const references = state.referencedMap!.getKeys(exportedFromPath);
+            return references && forEachKey(references, filePath =>
                 handleDtsMayChangeOfFileAndExportsOfFile(
                     state,
                     filePath,
@@ -600,12 +633,13 @@ namespace ts {
                     computeHash,
                     host,
                 )
-            )
-        );
+            );
+        });
     }
 
     /**
      * handle dts and semantic diagnostics on file and iterate on anything that exports this file
+     * return true when all work is done and we can exit handling dts emit and semantic diagnostics
      */
     function handleDtsMayChangeOfFileAndExportsOfFile(
         state: BuilderProgramState,
@@ -614,9 +648,10 @@ namespace ts {
         cancellationToken: CancellationToken | undefined,
         computeHash: BuilderState.ComputeHash,
         host: BuilderProgramHost,
-    ): void {
-        if (!tryAddToSet(seenFileAndExportsOfFile, filePath)) return;
+    ): boolean | undefined {
+        if (!tryAddToSet(seenFileAndExportsOfFile, filePath)) return undefined;
 
+        if (handleDtsMayChangeOfGlobalScope(state, filePath, cancellationToken, computeHash, host)) return true;
         handleDtsMayChangeOf(state, filePath, cancellationToken, computeHash, host);
         Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
 
@@ -643,6 +678,7 @@ namespace ts {
                 host,
             )
         );
+        return undefined;
     }
 
     /**

tests/baselines/reference/tsc/incremental/change-to-type-that-gets-used-as-global-through-export-in-another-file-through-indirect-import.js

@@ -168,9 +168,21 @@ export default 2;
 
 Output::
 /lib/tsc -p src/project
-exitCode:: ExitStatus.Success
+src/project/class1.ts:1:7 - error TS2322: Type '1' is not assignable to type '2'.
+
+1 const a: MagicNumber = 1;
+        ~
+
+
+Found 1 error in src/project/class1.ts:1
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 
+//// [/src/project/class1.d.ts]
+declare const a = 2;
+
+
 //// [/src/project/constants.d.ts]
 declare const _default: 2;
 export default _default;
@@ -185,7 +197,7 @@ exports["default"] = 2;
 //// [/src/project/reexport.d.ts] file written with same contents
 //// [/src/project/reexport.js] file written with same contents
 //// [/src/project/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../lib/lib.d.ts","./class1.ts","./constants.ts","./reexport.ts","./types.d.ts"],"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":"4085502068-const a: MagicNumber = 1;\nconsole.log(a);","affectsGlobalScope":true},{"version":"-2659799015-export default 2;","signature":"1573564507-declare const _default: 2;\r\nexport default _default;\r\n"},{"version":"-1476032387-export { default as ConstantNumber } from \"./constants\"","signature":"-1329721329-export { default as ConstantNumber } from \"./constants\";\r\n"},{"version":"2093085814-type MagicNumber = typeof import('./reexport').ConstantNumber","affectsGlobalScope":true}],"options":{"composite":true},"fileIdsList":[[3],[4]],"referencedMap":[[4,1],[5,2]],"exportedModulesMap":[[4,1],[5,2]],"semanticDiagnosticsPerFile":[1,2,3,4,5]},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../lib/lib.d.ts","./class1.ts","./constants.ts","./reexport.ts","./types.d.ts"],"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":"4085502068-const a: MagicNumber = 1;\nconsole.log(a);","affectsGlobalScope":true},{"version":"-2659799015-export default 2;","signature":"1573564507-declare const _default: 2;\r\nexport default _default;\r\n"},{"version":"-1476032387-export { default as ConstantNumber } from \"./constants\"","signature":"-1329721329-export { default as ConstantNumber } from \"./constants\";\r\n"},{"version":"2093085814-type MagicNumber = typeof import('./reexport').ConstantNumber","affectsGlobalScope":true}],"options":{"composite":true},"fileIdsList":[[3],[4]],"referencedMap":[[4,1],[5,2]],"exportedModulesMap":[[4,1],[5,2]],"semanticDiagnosticsPerFile":[1,[2,[{"file":"./class1.ts","start":6,"length":1,"code":2322,"category":1,"messageText":"Type '1' is not assignable to type '2'."}]],3,4,5]},"version":"FakeTSVersion"}
 
 //// [/src/project/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -251,13 +263,25 @@ exports["default"] = 2;
     },
     "semanticDiagnosticsPerFile": [
       "../../lib/lib.d.ts",
-      "./class1.ts",
+      [
+        "./class1.ts",
+        [
+          {
+            "file": "./class1.ts",
+            "start": 6,
+            "length": 1,
+            "code": 2322,
+            "category": 1,
+            "messageText": "Type '1' is not assignable to type '2'."
+          }
+        ]
+      ],
       "./constants.ts",
       "./reexport.ts",
       "./types.d.ts"
     ]
   },
   "version": "FakeTSVersion",
-  "size": 1296
+  "size": 1425
 }
 

tests/baselines/reference/tsc/incremental/change-to-type-that-gets-used-as-global-through-export-in-another-file.js

@@ -127,9 +127,21 @@ export default 2;
 
 Output::
 /lib/tsc -p src/project
-exitCode:: ExitStatus.Success
+src/project/class1.ts:1:7 - error TS2322: Type '1' is not assignable to type '2'.
+
+1 const a: MagicNumber = 1;
+        ~
+
+
+Found 1 error in src/project/class1.ts:1
+
+exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
 
 
+//// [/src/project/class1.d.ts]
+declare const a = 2;
+
+
 //// [/src/project/constants.d.ts]
 declare const _default: 2;
 export default _default;
@@ -142,7 +154,7 @@ exports["default"] = 2;
 
 
 //// [/src/project/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../../lib/lib.d.ts","./class1.ts","./constants.ts","./types.d.ts"],"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":"4085502068-const a: MagicNumber = 1;\nconsole.log(a);","affectsGlobalScope":true},{"version":"-2659799015-export default 2;","signature":"1573564507-declare const _default: 2;\r\nexport default _default;\r\n"},{"version":"-2080821236-type MagicNumber = typeof import('./constants').default","affectsGlobalScope":true}],"options":{"composite":true},"fileIdsList":[[3]],"referencedMap":[[4,1]],"exportedModulesMap":[[4,1]],"semanticDiagnosticsPerFile":[1,2,3,4]},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../../lib/lib.d.ts","./class1.ts","./constants.ts","./types.d.ts"],"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":"4085502068-const a: MagicNumber = 1;\nconsole.log(a);","affectsGlobalScope":true},{"version":"-2659799015-export default 2;","signature":"1573564507-declare const _default: 2;\r\nexport default _default;\r\n"},{"version":"-2080821236-type MagicNumber = typeof import('./constants').default","affectsGlobalScope":true}],"options":{"composite":true},"fileIdsList":[[3]],"referencedMap":[[4,1]],"exportedModulesMap":[[4,1]],"semanticDiagnosticsPerFile":[1,[2,[{"file":"./class1.ts","start":6,"length":1,"code":2322,"category":1,"messageText":"Type '1' is not assignable to type '2'."}]],3,4]},"version":"FakeTSVersion"}
 
 //// [/src/project/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -194,12 +206,24 @@ exports["default"] = 2;
     },
     "semanticDiagnosticsPerFile": [
       "../../lib/lib.d.ts",
-      "./class1.ts",
+      [
+        "./class1.ts",
+        [
+          {
+            "file": "./class1.ts",
+            "start": 6,
+            "length": 1,
+            "code": 2322,
+            "category": 1,
+            "messageText": "Type '1' is not assignable to type '2'."
+          }
+        ]
+      ],
       "./constants.ts",
       "./types.d.ts"
     ]
   },
   "version": "FakeTSVersion",
-  "size": 1084
+  "size": 1213
 }