Do not calculate signatures if old state is not used

src/compiler/builderState.ts

@@ -45,6 +45,12 @@ namespace ts {
          * Otherwise undefined
          */
         readonly exportedModulesMap: ESMap<Path, BuilderState.ReferencedSet> | undefined;
+
+        /**
+         * true if file version is used as signature
+         * This helps in delaying the calculation of the d.ts hash as version for the file till reasonable time
+         */
+        useFileVersionAsSignature: boolean;
         /**
          * Map of files that have already called update signature.
          * That means hence forth these files are assumed to have
@@ -236,7 +242,8 @@ namespace ts {
                 fileInfos,
                 referencedMap,
                 exportedModulesMap,
-                hasCalledUpdateShapeSignature
+                hasCalledUpdateShapeSignature,
+                useFileVersionAsSignature: !useOldState
             };
         }
 
@@ -258,6 +265,7 @@ namespace ts {
                 referencedMap: state.referencedMap && new Map(state.referencedMap),
                 exportedModulesMap: state.exportedModulesMap && new Map(state.exportedModulesMap),
                 hasCalledUpdateShapeSignature: new Set(state.hasCalledUpdateShapeSignature),
+                useFileVersionAsSignature: state.useFileVersionAsSignature,
             };
         }
 
@@ -317,7 +325,7 @@ namespace ts {
 
             const prevSignature = info.signature;
             let latestSignature: string | undefined;
-            if (!sourceFile.isDeclarationFile) {
+            if (!sourceFile.isDeclarationFile && !state.useFileVersionAsSignature) {
                 const emitOutput = getFileEmitOutput(
                     programOfThisState,
                     sourceFile,

src/testRunner/unittests/tsbuild/inferredTypeFromTransitiveModule.ts

@@ -13,10 +13,16 @@ namespace ts {
             subScenario: "inferred type from transitive module",
             fs: () => projFs,
             commandLineArgs: ["--b", "/src", "--verbose"],
-            incrementalScenarios: [{
-                buildKind: BuildKind.IncrementalDtsChange,
-                modifyFs: changeBarParam,
-            }],
+            incrementalScenarios: [
+                {
+                    buildKind: BuildKind.IncrementalDtsChange,
+                    modifyFs: changeBarParam,
+                },
+                {
+                    buildKind: BuildKind.IncrementalDtsChange,
+                    modifyFs: changeBarParamBack,
+                },
+            ],
         });
 
         verifyTscSerializedIncrementalEdits({
@@ -25,10 +31,16 @@ namespace ts {
             scenario: "inferredTypeFromTransitiveModule",
             commandLineArgs: ["--b", "/src", "--verbose"],
             modifyFs: changeToIsolatedModules,
-            incrementalScenarios: [{
-                buildKind: BuildKind.IncrementalDtsChange,
-                modifyFs: changeBarParam
-            }]
+            incrementalScenarios: [
+                {
+                    buildKind: BuildKind.IncrementalDtsChange,
+                    modifyFs: changeBarParam
+                },
+                {
+                    buildKind: BuildKind.IncrementalDtsChange,
+                    modifyFs: changeBarParamBack,
+                },
+            ]
         });
 
         verifyTscSerializedIncrementalEdits({
@@ -43,6 +55,14 @@ import { default as bar } from './bar';
 bar("hello");`);
             },
             incrementalScenarios: [
+                {
+                    buildKind: BuildKind.IncrementalDtsChange,
+                    modifyFs: changeBarParam
+                },
+                {
+                    buildKind: BuildKind.IncrementalDtsChange,
+                    modifyFs: changeBarParamBack,
+                },
                 {
                     buildKind: BuildKind.IncrementalDtsChange,
                     modifyFs: changeBarParam
@@ -63,4 +83,8 @@ bar("hello");`);
     function changeBarParam(fs: vfs.FileSystem) {
         replaceText(fs, "/src/bar.ts", "param: string", "");
     }
+
+    function changeBarParamBack(fs: vfs.FileSystem) {
+        replaceText(fs, "/src/bar.ts", "foobar()", "foobar(param: string)");
+    }
 }

src/testRunner/unittests/tsbuild/lateBoundSymbol.ts

@@ -5,10 +5,16 @@ namespace ts {
             fs: () => loadProjectFromDisk("tests/projects/lateBoundSymbol"),
             scenario: "lateBoundSymbol",
             commandLineArgs: ["--b", "/src/tsconfig.json", "--verbose"],
-            incrementalScenarios: [{
-                buildKind: BuildKind.IncrementalDtsUnchanged,
-                modifyFs: fs => replaceText(fs, "/src/src/main.ts", "const x = 10;", ""),
-            }]
+            incrementalScenarios: [
+                {
+                    buildKind: BuildKind.IncrementalDtsUnchanged,
+                    modifyFs: fs => replaceText(fs, "/src/src/main.ts", "const x = 10;", ""),
+                },
+                {
+                    buildKind: BuildKind.IncrementalDtsUnchanged,
+                    modifyFs: fs => appendText(fs, "/src/src/main.ts", "const x = 10;"),
+                },
+            ]
         });
     });
 }

src/testRunner/unittests/tsc/incremental.ts

@@ -264,6 +264,11 @@ const a: string = 10;`, "utf-8"),
                     buildKind: BuildKind.IncrementalDtsChange,
                     modifyFs: fs => appendText(fs, `/src/project/src/main.ts`, `something();`),
                 },
+                {
+                    subScenario: "Modify main file again",
+                    buildKind: BuildKind.IncrementalDtsChange,
+                    modifyFs: fs => appendText(fs, `/src/project/src/main.ts`, `something();`),
+                },
                 {
                     subScenario: "Add new file and update main file",
                     buildKind: BuildKind.IncrementalDtsChange,
@@ -288,7 +293,9 @@ const a: string = 10;`, "utf-8"),
             baselinePrograms: true,
         });
 
-        const jsxLibraryContent = `
+        describe("when synthesized imports are added to files", () => {
+            function getJsxLibraryContent() {
+                return `
 export {};
 declare global {
     namespace JSX {
@@ -300,29 +307,31 @@ declare global {
         }
     }
 }`;
+            }
 
-        verifyTsc({
-            scenario: "react-jsx-emit-mode",
-            subScenario: "with no backing types found doesn't crash",
-            fs: () => loadProjectFromFiles({
-                "/src/project/node_modules/react/jsx-runtime.js": "export {}", // js needs to be present so there's a resolution result
-                "/src/project/node_modules/@types/react/index.d.ts": jsxLibraryContent, // doesn't contain a jsx-runtime definition
-                "/src/project/src/index.tsx": `export const App = () => <div propA={true}></div>;`,
-                "/src/project/tsconfig.json": JSON.stringify({ compilerOptions: { module: "commonjs", jsx: "react-jsx", incremental: true, jsxImportSource: "react" } })
-            }),
-            commandLineArgs: ["--p", "src/project"]
-        });
+            verifyTsc({
+                scenario: "react-jsx-emit-mode",
+                subScenario: "with no backing types found doesn't crash",
+                fs: () => loadProjectFromFiles({
+                    "/src/project/node_modules/react/jsx-runtime.js": "export {}", // js needs to be present so there's a resolution result
+                    "/src/project/node_modules/@types/react/index.d.ts": getJsxLibraryContent(), // doesn't contain a jsx-runtime definition
+                    "/src/project/src/index.tsx": `export const App = () => <div propA={true}></div>;`,
+                    "/src/project/tsconfig.json": JSON.stringify({ compilerOptions: { module: "commonjs", jsx: "react-jsx", incremental: true, jsxImportSource: "react" } })
+                }),
+                commandLineArgs: ["--p", "src/project"]
+            });
 
-        verifyTsc({
-            scenario: "react-jsx-emit-mode",
-            subScenario: "with no backing types found doesn't crash under --strict",
-            fs: () => loadProjectFromFiles({
-                "/src/project/node_modules/react/jsx-runtime.js": "export {}", // js needs to be present so there's a resolution result
-                "/src/project/node_modules/@types/react/index.d.ts": jsxLibraryContent, // doesn't contain a jsx-runtime definition
-                "/src/project/src/index.tsx": `export const App = () => <div propA={true}></div>;`,
-                "/src/project/tsconfig.json": JSON.stringify({ compilerOptions: { module: "commonjs", jsx: "react-jsx", incremental: true, jsxImportSource: "react" } })
-            }),
-            commandLineArgs: ["--p", "src/project", "--strict"]
+            verifyTsc({
+                scenario: "react-jsx-emit-mode",
+                subScenario: "with no backing types found doesn't crash under --strict",
+                fs: () => loadProjectFromFiles({
+                    "/src/project/node_modules/react/jsx-runtime.js": "export {}", // js needs to be present so there's a resolution result
+                    "/src/project/node_modules/@types/react/index.d.ts": getJsxLibraryContent(), // doesn't contain a jsx-runtime definition
+                    "/src/project/src/index.tsx": `export const App = () => <div propA={true}></div>;`,
+                    "/src/project/tsconfig.json": JSON.stringify({ compilerOptions: { module: "commonjs", jsx: "react-jsx", incremental: true, jsxImportSource: "react" } })
+                }),
+                commandLineArgs: ["--p", "src/project", "--strict"]
+            });
         });
     });
 }

src/testRunner/unittests/tscWatch/emit.ts

@@ -26,6 +26,11 @@ namespace ts.tscWatch {
                         caption: "Make change in the file",
                         change: sys => sys.writeFile("/a/a.ts", "let x = 11"),
                         timeouts: runQueuedTimeoutCallbacks
+                    },
+                    {
+                        caption: "Make change in the file again",
+                        change: sys => sys.writeFile("/a/a.ts", "let xy = 11"),
+                        timeouts: runQueuedTimeoutCallbacks
                     }
                 ]
             });
@@ -410,6 +415,11 @@ export var x = Foo();`
                     caption: "Append content to f1",
                     change: sys => sys.appendFile("/a/b/f1.ts", "export function foo2() { return 2; }"),
                     timeouts: checkSingleTimeoutQueueLengthAndRun,
+                },
+                {
+                    caption: "Again Append content to f1",
+                    change: sys => sys.appendFile("/a/b/f1.ts", "export function fooN() { return 2; }"),
+                    timeouts: checkSingleTimeoutQueueLengthAndRun,
                 }
             ],
         });

src/testRunner/unittests/tscWatch/emitAndErrorUpdates.ts

@@ -27,6 +27,17 @@ namespace ts.tscWatch {
                 changes,
                 baselineIncremental
             });
+            verifyTscWatch({
+                scenario: "emitAndErrorUpdates",
+                subScenario: `incremental/${subScenario}`,
+                commandLineArgs: ["--w", "--i"],
+                sys: () => createWatchedSystem(
+                    [...files(), configFile(), lib?.() || libFile],
+                    { currentDirectory: currentDirectory || projectRoot }
+                ),
+                changes,
+                baselineIncremental
+            });
         }
 
         function changeCompilerOptions(input: VerifyEmitAndErrorUpdates, additionalOptions: CompilerOptions): File {
@@ -97,6 +108,16 @@ console.log(b.c.d);`
                     subScenario: `deepImportChanges/${subScenario}`,
                     files: () => [aFile, bFile, cFile],
                     changes: [
+                        {
+                            caption: "Rename property d to d2 of class C to initialize signatures",
+                            change: sys => sys.writeFile(cFile.path, cFile.content.replace("d", "d2")),
+                            timeouts: runQueuedTimeoutCallbacks,
+                        },
+                        {
+                            caption: "Rename property d2 to d of class C to revert back to original text",
+                            change: sys => sys.writeFile(cFile.path, cFile.content.replace("d2", "d")),
+                            timeouts: runQueuedTimeoutCallbacks,
+                        },
                         {
                             caption: "Rename property d to d2 of class C",
                             change: sys => sys.writeFile(cFile.path, cFile.content.replace("d", "d2")),
@@ -197,11 +218,21 @@ getPoint().c.x;`
                 subScenario: "file not exporting a deep multilevel import that changes",
                 files: () => [aFile, bFile, cFile, dFile, eFile],
                 changes: [
+                    {
+                        caption: "Rename property x2 to x of interface Coords to initialize signatures",
+                        change: sys => sys.writeFile(aFile.path, aFile.content.replace("x2", "x")),
+                        timeouts: runQueuedTimeoutCallbacks,
+                    },
+                    {
+                        caption: "Rename property x to x2 of interface Coords to revert back to original text",
+                        change: sys => sys.writeFile(aFile.path, aFile.content.replace("x: number", "x2: number")),
+                        timeouts: runQueuedTimeoutCallbacks,
+                    },
                     {
                         caption: "Rename property x2 to x of interface Coords",
                         change: sys => sys.writeFile(aFile.path, aFile.content.replace("x2", "x")),
                         timeouts: runQueuedTimeoutCallbacks,
-                    }
+                    },
                 ]
             });
         });
@@ -260,6 +291,16 @@ export class Data {
                     files: () => [lib1ToolsInterface, lib1ToolsPublic, app, lib2Public, lib1Public, ...files],
                     configFile: () => config,
                     changes: [
+                        {
+                            caption: "Rename property title to title2 of interface ITest to initialize signatures",
+                            change: sys => sys.writeFile(lib1ToolsInterface.path, lib1ToolsInterface.content.replace("title", "title2")),
+                            timeouts: runQueuedTimeoutCallbacks,
+                        },
+                        {
+                            caption: "Rename property title2 to title of interface ITest to revert back to original text",
+                            change: sys => sys.writeFile(lib1ToolsInterface.path, lib1ToolsInterface.content.replace("title2", "title")),
+                            timeouts: runQueuedTimeoutCallbacks,
+                        },
                         {
                             caption: "Rename property title to title2 of interface ITest",
                             change: sys => sys.writeFile(lib1ToolsInterface.path, lib1ToolsInterface.content.replace("title", "title2")),

src/testRunner/unittests/tscWatch/incremental.ts

@@ -164,12 +164,12 @@ namespace ts.tscWatch {
                     });
                     assert.deepEqual(state.fileInfos.get(file1.path as Path), {
                         version: system.createHash(file1.content),
-                        signature: system.createHash(`${file1.content.replace("export ", "export declare ")}\n`),
+                        signature: system.createHash(file1.content),
                         affectsGlobalScope: false,
                     });
                     assert.deepEqual(state.fileInfos.get(file2.path as Path), {
                         version: system.createHash(fileModified.content),
-                        signature: system.createHash("export declare const y: string;\n"),
+                        signature: system.createHash(fileModified.content),
                         affectsGlobalScope: false,
                     });
 

src/testRunner/unittests/tscWatch/programUpdates.ts

@@ -122,6 +122,11 @@ namespace ts.tscWatch {
                 return createWatchedSystem([libFile, commonFile1, commonFile2, configFile]);
             },
             changes: [
+                {
+                    caption: "change file to ensure signatures are updated",
+                    change: sys => sys.appendFile(commonFile2.path, ";let xy = 10;"),
+                    timeouts: checkSingleTimeoutQueueLengthAndRun,
+                },
                 {
                     caption: "delete file2",
                     change: sys => sys.deleteFile(commonFile2.path),
@@ -171,6 +176,11 @@ namespace ts.tscWatch {
                 return createWatchedSystem([libFile, commonFile1, commonFile2, configFile]);
             },
             changes: [
+                {
+                    caption: "change file to ensure signatures are updated",
+                    change: sys => sys.appendFile(commonFile2.path, ";let xy = 10;"),
+                    timeouts: checkSingleTimeoutQueueLengthAndRun,
+                },
                 {
                     caption: "Change config",
                     change: sys => sys.writeFile(configFilePath, `{

src/testRunner/unittests/tsserver/compileOnSave.ts

@@ -951,10 +951,14 @@ function bar() {
                 }
 
                 // Change file1 get affected file list
+                verifyLocalEdit(file1, "hello", "world", /*returnsAllFilesAsAffected*/ !declaration); // Signatures are not initialized before this request
+                verifyLocalEdit(file1, "world", "hello");
                 verifyLocalEdit(file1, "hello", "world");
 
                 // Change file2 get affected file list = will return only file2 if --declaration otherwise all files
                 verifyLocalEdit(file2, "world", "hello", /*returnsAllFilesAsAffected*/ !declaration);
+                verifyLocalEdit(file2, "hello", "world");
+                verifyLocalEdit(file2, "world", "hello");
 
                 function verifyFileSave(file: File) {
                     const response = session.executeCommandSeq<protocol.CompileOnSaveEmitFileRequest>({