avoid computing a full shape for indirectly invalidated files

src/compiler/builder.ts

@@ -478,14 +478,16 @@ namespace ts {
                 // we need to update the signature to reflect correctness of the signature(which is output d.ts emit) of this file
                 // This ensures that we dont later during incremental builds considering wrong signature.
                 // Eg where this also is needed to ensure that .tsbuildinfo generated by incremental build should be same as if it was first fresh build
+                // But we avoid expensive full shape computation, as using file version as shape is enough for correctness.
                 BuilderState.updateShapeSignature(
                     state,
                     program,
                     sourceFile,
                     Debug.checkDefined(state.currentAffectedFilesSignatures),
                     cancellationToken,
                     computeHash,
-                    state.currentAffectedFilesExportedModulesMap
+                    state.currentAffectedFilesExportedModulesMap,
+                    /* useFileVersionAsSignature */ true
                 );
                 // If not dts emit, nothing more to do
                 if (getEmitDeclarations(state.compilerOptions)) {

src/compiler/builderState.ts

@@ -398,7 +398,7 @@ namespace ts {
         /**
          * Returns if the shape of the signature has changed since last emit
          */
-        export function updateShapeSignature(state: Readonly<BuilderState>, programOfThisState: Program, sourceFile: SourceFile, cacheToUpdateSignature: ESMap<Path, string>, cancellationToken: CancellationToken | undefined, computeHash: ComputeHash, exportedModulesMapCache?: ManyToManyPathMap) {
+        export function updateShapeSignature(state: Readonly<BuilderState>, programOfThisState: Program, sourceFile: SourceFile, cacheToUpdateSignature: ESMap<Path, string>, cancellationToken: CancellationToken | undefined, computeHash: ComputeHash, exportedModulesMapCache?: ManyToManyPathMap, useFileVersionAsSignature: boolean = state.useFileVersionAsSignature) {
             Debug.assert(!!sourceFile);
             Debug.assert(!exportedModulesMapCache || !!state.exportedModulesMap, "Compute visible to outside map only if visibleToOutsideReferencedMap present in the state");
 
@@ -412,7 +412,7 @@ namespace ts {
 
             const prevSignature = info.signature;
             let latestSignature: string | undefined;
-            if (!sourceFile.isDeclarationFile && !state.useFileVersionAsSignature) {
+            if (!sourceFile.isDeclarationFile && !useFileVersionAsSignature) {
                 const emitOutput = getFileEmitOutput(
                     programOfThisState,
                     sourceFile,

src/testRunner/unittests/tscWatch/helpers.ts

@@ -468,6 +468,7 @@ namespace ts.tscWatch {
         if (!builderProgram) return;
         if (builderProgram !== oldProgram?.[1]) {
             const state = builderProgram.getState();
+            const internalState = state as unknown as BuilderState;
             if (state.semanticDiagnosticsPerFile?.size) {
                 baseline.push("Semantic diagnostics in builder refreshed for::");
                 for (const file of program.getSourceFiles()) {
@@ -479,6 +480,24 @@ namespace ts.tscWatch {
             else {
                 baseline.push("No cached semantic diagnostics in the builder::");
             }
+            if (internalState) {
+                baseline.push("");
+                if (internalState.hasCalledUpdateShapeSignature?.size) {
+                    baseline.push("Shape signatures in builder refreshed for::");
+                    internalState.hasCalledUpdateShapeSignature.forEach((path: Path) => {
+                        const info = state.fileInfos.get(path);
+                        if(info?.version === info?.signature || !info?.signature) {
+                            baseline.push(path + " (used version)");
+                        }
+                        else {
+                            baseline.push(path + " (computed .d.ts)");
+                        }
+                    });
+                }
+                else {
+                    baseline.push("No shapes updated in the builder::");
+                }
+            }
             baseline.push("");
             if (!baselineDependencies) return;
             baseline.push("Dependencies for::");

tests/baselines/reference/tsbuild/$publicAPI/initial-build/build-with-custom-transformers.js

@@ -66,6 +66,10 @@ Semantic diagnostics in builder refreshed for::
 /lib/lib.d.ts
 /src/shared/index.ts
 
+Shape signatures in builder refreshed for::
+/lib/lib.d.ts (used version)
+/src/shared/index.ts (used version)
+
 Program root files: ["/src/webpack/index.ts"]
 Program options: {"composite":true,"configFilePath":"/src/webpack/tsconfig.json"}
 Program structureReused: Not
@@ -77,6 +81,10 @@ Semantic diagnostics in builder refreshed for::
 /lib/lib.d.ts
 /src/webpack/index.ts
 
+Shape signatures in builder refreshed for::
+/lib/lib.d.ts (used version)
+/src/webpack/index.ts (used version)
+
 
 //// [/src/shared/index.d.ts]
 export declare function f1(): void;

tests/baselines/reference/tsbuild/emitDeclarationOnly/initial-build/only-dts-output-in-non-circular-imports-project-with-emitDeclarationOnly.js

@@ -344,7 +344,7 @@ export interface A {
 //// [/src/lib/c.d.ts] file written with same contents
 //// [/src/lib/c.d.ts.map] file written with same contents
 //// [/src/tsconfig.tsbuildinfo]
-{"program":{"fileNames":["../lib/lib.d.ts","./src/a.ts","./src/c.ts","./src/b.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":"5380514971-export class B { prop = \"hello\"; }\n\nclass C { }\nexport interface A {\n  b: B; foo: any;\n}\n","signature":"-6995298949-export declare class B {\r\n    prop: string;\r\n}\r\nexport interface A {\r\n    b: B;\r\n    foo: any;\r\n}\r\n"},{"version":"429593025-import { A } from \"./a\";\n\nexport interface C {\n  a: A;\n}\n","signature":"-2697851509-import { A } from \"./a\";\r\nexport interface C {\r\n    a: A;\r\n}\r\n"},{"version":"-2273488249-import { C } from \"./c\";\n\nexport interface B {\n  b: C;\n}\n","signature":"20298635505-import { C } from \"./c\";\r\nexport interface B {\r\n    b: C;\r\n}\r\n"}],"options":{"composite":true,"declaration":true,"declarationMap":true,"emitDeclarationOnly":true,"esModuleInterop":true,"module":1,"outDir":"./lib","rootDir":"./src","sourceMap":true,"strict":true,"target":1},"fileIdsList":[[3],[2]],"referencedMap":[[4,1],[3,2]],"exportedModulesMap":[[4,1],[3,2]],"semanticDiagnosticsPerFile":[1,2,4,3]},"version":"FakeTSVersion"}
+{"program":{"fileNames":["../lib/lib.d.ts","./src/a.ts","./src/c.ts","./src/b.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":"5380514971-export class B { prop = \"hello\"; }\n\nclass C { }\nexport interface A {\n  b: B; foo: any;\n}\n","signature":"-6995298949-export declare class B {\r\n    prop: string;\r\n}\r\nexport interface A {\r\n    b: B;\r\n    foo: any;\r\n}\r\n"},{"version":"429593025-import { A } from \"./a\";\n\nexport interface C {\n  a: A;\n}\n","signature":"-2697851509-import { A } from \"./a\";\r\nexport interface C {\r\n    a: A;\r\n}\r\n"},"-2273488249-import { C } from \"./c\";\n\nexport interface B {\n  b: C;\n}\n"],"options":{"composite":true,"declaration":true,"declarationMap":true,"emitDeclarationOnly":true,"esModuleInterop":true,"module":1,"outDir":"./lib","rootDir":"./src","sourceMap":true,"strict":true,"target":1},"fileIdsList":[[3],[2]],"referencedMap":[[4,1],[3,2]],"exportedModulesMap":[[4,1],[3,2]],"semanticDiagnosticsPerFile":[1,2,4,3]},"version":"FakeTSVersion"}
 
 //// [/src/tsconfig.tsbuildinfo.readable.baseline.txt]
 {
@@ -379,7 +379,7 @@ export interface A {
       },
       "./src/b.ts": {
         "version": "-2273488249-import { C } from \"./c\";\n\nexport interface B {\n  b: C;\n}\n",
-        "signature": "20298635505-import { C } from \"./c\";\r\nexport interface B {\r\n    b: C;\r\n}\r\n"
+        "signature": "-2273488249-import { C } from \"./c\";\n\nexport interface B {\n  b: C;\n}\n"
       }
     },
     "options": {
@@ -419,6 +419,6 @@ export interface A {
     ]
   },
   "version": "FakeTSVersion",
-  "size": 1580
+  "size": 1469
 }