From 4dce23b88f40820a68fa88da2a773e9c628e36d6 Mon Sep 17 00:00:00 2001 From: John Favret <64748847+johnfav03@users.noreply.github.com> Date: Mon, 10 Aug 2026 13:16:56 -0500 Subject: [PATCH 1/2] Add repro for dependency path replacement overhead --- internal/execute/tsctests/sys.go | 4 + internal/execute/tsctests/tsc_test.go | 44 ++ ...ncy-version-change-moves-resolved-paths.js | 710 ++++++++++++++++++ 3 files changed, 758 insertions(+) create mode 100644 testdata/baselines/reference/tsc/incremental/pnpm-dependency-version-change-moves-resolved-paths.js diff --git a/internal/execute/tsctests/sys.go b/internal/execute/tsctests/sys.go index 2d75a36d4ca..ab9bbfcf9e0 100644 --- a/internal/execute/tsctests/sys.go +++ b/internal/execute/tsctests/sys.go @@ -586,6 +586,10 @@ func (s *TestSys) appendFile(path string, text string) { s.writeFileNoError(path, content+text) } +func (s *TestSys) symlinkNoError(path string, target string) { + s.mapFs().AddSymlink(strings.TrimPrefix(path, "/"), strings.TrimPrefix(target, "/")) +} + func (s *TestSys) prependFile(path string, text string) { content := s.readFileNoError(path) s.writeFileNoError(path, text+content) diff --git a/internal/execute/tsctests/tsc_test.go b/internal/execute/tsctests/tsc_test.go index 29cba7ba4e2..0c88fac539a 100644 --- a/internal/execute/tsctests/tsc_test.go +++ b/internal/execute/tsctests/tsc_test.go @@ -2219,6 +2219,50 @@ func TestTscIncremental(t *testing.T) { }, commandLineArgs: []string{"--noEmit"}, }, + func() *tscInput { + depDts := "export declare function value(): number;\nexport declare function other(): string;\n" + files := FileMap{ + "/home/src/workspaces/project/tsconfig.json": stringtestutil.Dedent(` + { + "compilerOptions": { + "incremental": true, + "module": "esnext", + "moduleResolution": "bundler", + "strict": true, + "noEmit": true, + }, + "include": ["src/**/*.ts"], + }`), + "/home/src/workspaces/project/node_modules/.pnpm/dep@1.0.0/node_modules/dep/package.json": `{ "name": "dep", "version": "1.0.0", "types": "index.d.ts" }`, + "/home/src/workspaces/project/node_modules/.pnpm/dep@1.0.0/node_modules/dep/index.d.ts": depDts, + "/home/src/workspaces/project/node_modules/.pnpm/dep@2.0.0/node_modules/dep/package.json": `{ "name": "dep", "version": "2.0.0", "types": "index.d.ts" }`, + "/home/src/workspaces/project/node_modules/.pnpm/dep@2.0.0/node_modules/dep/index.d.ts": depDts, + "/home/src/workspaces/project/node_modules/dep": vfstest.Symlink("/home/src/workspaces/project/node_modules/.pnpm/dep@1.0.0/node_modules/dep"), + "/home/src/workspaces/project/src/shared.ts": "export { value } from \"dep\";\n", + } + for i := range 12 { + files[fmt.Sprintf("/home/src/workspaces/project/src/route%d.ts", i)] = fmt.Sprintf("import { value } from \"./shared\";\nexport const r%d: number = value();\n", i) + } + return &tscInput{ + subScenario: "pnpm dependency version change moves resolved paths", + files: files, + commandLineArgs: []string{ + "--noEmit", + }, + edits: []*tscEdit{ + { + caption: "pnpm dependency version bump repoints node_modules/dep symlink", + edit: func(sys *TestSys) { + sys.symlinkNoError( + "/home/src/workspaces/project/node_modules/dep", + "/home/src/workspaces/project/node_modules/.pnpm/dep@2.0.0/node_modules/dep", + ) + }, + }, + noChange, + }, + } + }(), } for _, test := range testCases { diff --git a/testdata/baselines/reference/tsc/incremental/pnpm-dependency-version-change-moves-resolved-paths.js b/testdata/baselines/reference/tsc/incremental/pnpm-dependency-version-change-moves-resolved-paths.js new file mode 100644 index 00000000000..789df719819 --- /dev/null +++ b/testdata/baselines/reference/tsc/incremental/pnpm-dependency-version-change-moves-resolved-paths.js @@ -0,0 +1,710 @@ +currentDirectory::/home/src/workspaces/project +useCaseSensitiveFileNames::true +Input:: +//// [/home/src/workspaces/project/node_modules/.pnpm/dep@1.0.0/node_modules/dep/index.d.ts] *new* +export declare function value(): number; +export declare function other(): string; + +//// [/home/src/workspaces/project/node_modules/.pnpm/dep@1.0.0/node_modules/dep/package.json] *new* +{ "name": "dep", "version": "1.0.0", "types": "index.d.ts" } +//// [/home/src/workspaces/project/node_modules/.pnpm/dep@2.0.0/node_modules/dep/index.d.ts] *new* +export declare function value(): number; +export declare function other(): string; + +//// [/home/src/workspaces/project/node_modules/.pnpm/dep@2.0.0/node_modules/dep/package.json] *new* +{ "name": "dep", "version": "2.0.0", "types": "index.d.ts" } +//// [/home/src/workspaces/project/node_modules/dep] -> /home/src/workspaces/project/node_modules/.pnpm/dep@1.0.0/node_modules/dep *new* +//// [/home/src/workspaces/project/src/route0.ts] *new* +import { value } from "./shared"; +export const r0: number = value(); + +//// [/home/src/workspaces/project/src/route1.ts] *new* +import { value } from "./shared"; +export const r1: number = value(); + +//// [/home/src/workspaces/project/src/route10.ts] *new* +import { value } from "./shared"; +export const r10: number = value(); + +//// [/home/src/workspaces/project/src/route11.ts] *new* +import { value } from "./shared"; +export const r11: number = value(); + +//// [/home/src/workspaces/project/src/route2.ts] *new* +import { value } from "./shared"; +export const r2: number = value(); + +//// [/home/src/workspaces/project/src/route3.ts] *new* +import { value } from "./shared"; +export const r3: number = value(); + +//// [/home/src/workspaces/project/src/route4.ts] *new* +import { value } from "./shared"; +export const r4: number = value(); + +//// [/home/src/workspaces/project/src/route5.ts] *new* +import { value } from "./shared"; +export const r5: number = value(); + +//// [/home/src/workspaces/project/src/route6.ts] *new* +import { value } from "./shared"; +export const r6: number = value(); + +//// [/home/src/workspaces/project/src/route7.ts] *new* +import { value } from "./shared"; +export const r7: number = value(); + +//// [/home/src/workspaces/project/src/route8.ts] *new* +import { value } from "./shared"; +export const r8: number = value(); + +//// [/home/src/workspaces/project/src/route9.ts] *new* +import { value } from "./shared"; +export const r9: number = value(); + +//// [/home/src/workspaces/project/src/shared.ts] *new* +export { value } from "dep"; + +//// [/home/src/workspaces/project/tsconfig.json] *new* +{ + "compilerOptions": { + "incremental": true, + "module": "esnext", + "moduleResolution": "bundler", + "strict": true, + "noEmit": true, + }, + "include": ["src/**/*.ts"], +} + +tsgo --noEmit +ExitStatus:: Success +Output:: +//// [/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts] *Lib* +/// +interface Boolean {} +interface Function {} +interface CallableFunction {} +interface NewableFunction {} +interface IArguments {} +interface Number { toExponential: any; } +interface Object {} +interface RegExp {} +interface String { charAt: any; } +interface Array { length: number; [n: number]: T; } +interface ReadonlyArray {} +interface SymbolConstructor { + (desc?: string | number): symbol; + for(name: string): symbol; + readonly toStringTag: symbol; +} +declare var Symbol: SymbolConstructor; +interface Symbol { + readonly [Symbol.toStringTag]: string; +} +declare const console: { log(msg: any): void; }; +//// [/home/src/workspaces/project/tsconfig.tsbuildinfo] *new* +{"version":"FakeTSVersion","root":[[3,15]],"packageJsons":["./node_modules/.pnpm/dep@1.0.0/node_modules/dep/package.json"],"fileNames":["lib.es2025.full.d.ts","./node_modules/.pnpm/dep@1.0.0/node_modules/dep/index.d.ts","./src/shared.ts","./src/route0.ts","./src/route1.ts","./src/route10.ts","./src/route11.ts","./src/route2.ts","./src/route3.ts","./src/route4.ts","./src/route5.ts","./src/route6.ts","./src/route7.ts","./src/route8.ts","./src/route9.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"ad2894a2ed059494de0d2a936fc203af-export declare function value(): number;\nexport declare function other(): string;\n","72efd51a0841b29d44444b0c071c9dfd-export { value } from \"dep\";\n","643e2357762975a68e62450d2a141ed7-import { value } from \"./shared\";\nexport const r0: number = value();\n","e70e0f57d1482b0aa84294501d5fc901-import { value } from \"./shared\";\nexport const r1: number = value();\n","8b70baa8a8e3f7fe4a640b6d0e75bbf5-import { value } from \"./shared\";\nexport const r10: number = value();\n","0e2481ead9651bcd9f25f1820a3846cb-import { value } from \"./shared\";\nexport const r11: number = value();\n","45ec354de757bb084c982f43e57d9364-import { value } from \"./shared\";\nexport const r2: number = value();\n","ea27de969e3a4e3331fff8b5cdd62b37-import { value } from \"./shared\";\nexport const r3: number = value();\n","02bd2af513f08ee5c874cbb56ca9ac52-import { value } from \"./shared\";\nexport const r4: number = value();\n","04a9b25767a947555005619663c77e2f-import { value } from \"./shared\";\nexport const r5: number = value();\n","4984282c908ecbe067f619d668810b58-import { value } from \"./shared\";\nexport const r6: number = value();\n","19c07f9bda4fea693b022ded99656b8a-import { value } from \"./shared\";\nexport const r7: number = value();\n","e3b98729cdd5987e8a8b76c24214bb96-import { value } from \"./shared\";\nexport const r8: number = value();\n","3c249c1ddc90a1a70a1e9dd2d1d0f004-import { value } from \"./shared\";\nexport const r9: number = value();\n"],"fileIdsList":[[3],[2]],"options":{"module":99,"strict":true},"referencedMap":[[4,1],[5,1],[6,1],[7,1],[8,1],[9,1],[10,1],[11,1],[12,1],[13,1],[14,1],[15,1],[3,2]],"affectedFilesPendingEmit":[4,5,6,7,8,9,10,11,12,13,14,15,3]} +//// [/home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt] *new* +{ + "version": "FakeTSVersion", + "root": [ + { + "files": [ + "./src/shared.ts", + "./src/route0.ts", + "./src/route1.ts", + "./src/route10.ts", + "./src/route11.ts", + "./src/route2.ts", + "./src/route3.ts", + "./src/route4.ts", + "./src/route5.ts", + "./src/route6.ts", + "./src/route7.ts", + "./src/route8.ts", + "./src/route9.ts" + ], + "original": [ + 3, + 15 + ] + } + ], + "packageJsons": [ + "./node_modules/.pnpm/dep@1.0.0/node_modules/dep/package.json" + ], + "fileNames": [ + "lib.es2025.full.d.ts", + "./node_modules/.pnpm/dep@1.0.0/node_modules/dep/index.d.ts", + "./src/shared.ts", + "./src/route0.ts", + "./src/route1.ts", + "./src/route10.ts", + "./src/route11.ts", + "./src/route2.ts", + "./src/route3.ts", + "./src/route4.ts", + "./src/route5.ts", + "./src/route6.ts", + "./src/route7.ts", + "./src/route8.ts", + "./src/route9.ts" + ], + "fileInfos": [ + { + "fileName": "lib.es2025.full.d.ts", + "version": "8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };", + "signature": "8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };", + "affectsGlobalScope": true, + "impliedNodeFormat": "CommonJS", + "original": { + "version": "8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };", + "affectsGlobalScope": true, + "impliedNodeFormat": 1 + } + }, + { + "fileName": "./node_modules/.pnpm/dep@1.0.0/node_modules/dep/index.d.ts", + "version": "ad2894a2ed059494de0d2a936fc203af-export declare function value(): number;\nexport declare function other(): string;\n", + "signature": "ad2894a2ed059494de0d2a936fc203af-export declare function value(): number;\nexport declare function other(): string;\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/shared.ts", + "version": "72efd51a0841b29d44444b0c071c9dfd-export { value } from \"dep\";\n", + "signature": "72efd51a0841b29d44444b0c071c9dfd-export { value } from \"dep\";\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route0.ts", + "version": "643e2357762975a68e62450d2a141ed7-import { value } from \"./shared\";\nexport const r0: number = value();\n", + "signature": "643e2357762975a68e62450d2a141ed7-import { value } from \"./shared\";\nexport const r0: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route1.ts", + "version": "e70e0f57d1482b0aa84294501d5fc901-import { value } from \"./shared\";\nexport const r1: number = value();\n", + "signature": "e70e0f57d1482b0aa84294501d5fc901-import { value } from \"./shared\";\nexport const r1: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route10.ts", + "version": "8b70baa8a8e3f7fe4a640b6d0e75bbf5-import { value } from \"./shared\";\nexport const r10: number = value();\n", + "signature": "8b70baa8a8e3f7fe4a640b6d0e75bbf5-import { value } from \"./shared\";\nexport const r10: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route11.ts", + "version": "0e2481ead9651bcd9f25f1820a3846cb-import { value } from \"./shared\";\nexport const r11: number = value();\n", + "signature": "0e2481ead9651bcd9f25f1820a3846cb-import { value } from \"./shared\";\nexport const r11: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route2.ts", + "version": "45ec354de757bb084c982f43e57d9364-import { value } from \"./shared\";\nexport const r2: number = value();\n", + "signature": "45ec354de757bb084c982f43e57d9364-import { value } from \"./shared\";\nexport const r2: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route3.ts", + "version": "ea27de969e3a4e3331fff8b5cdd62b37-import { value } from \"./shared\";\nexport const r3: number = value();\n", + "signature": "ea27de969e3a4e3331fff8b5cdd62b37-import { value } from \"./shared\";\nexport const r3: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route4.ts", + "version": "02bd2af513f08ee5c874cbb56ca9ac52-import { value } from \"./shared\";\nexport const r4: number = value();\n", + "signature": "02bd2af513f08ee5c874cbb56ca9ac52-import { value } from \"./shared\";\nexport const r4: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route5.ts", + "version": "04a9b25767a947555005619663c77e2f-import { value } from \"./shared\";\nexport const r5: number = value();\n", + "signature": "04a9b25767a947555005619663c77e2f-import { value } from \"./shared\";\nexport const r5: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route6.ts", + "version": "4984282c908ecbe067f619d668810b58-import { value } from \"./shared\";\nexport const r6: number = value();\n", + "signature": "4984282c908ecbe067f619d668810b58-import { value } from \"./shared\";\nexport const r6: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route7.ts", + "version": "19c07f9bda4fea693b022ded99656b8a-import { value } from \"./shared\";\nexport const r7: number = value();\n", + "signature": "19c07f9bda4fea693b022ded99656b8a-import { value } from \"./shared\";\nexport const r7: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route8.ts", + "version": "e3b98729cdd5987e8a8b76c24214bb96-import { value } from \"./shared\";\nexport const r8: number = value();\n", + "signature": "e3b98729cdd5987e8a8b76c24214bb96-import { value } from \"./shared\";\nexport const r8: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route9.ts", + "version": "3c249c1ddc90a1a70a1e9dd2d1d0f004-import { value } from \"./shared\";\nexport const r9: number = value();\n", + "signature": "3c249c1ddc90a1a70a1e9dd2d1d0f004-import { value } from \"./shared\";\nexport const r9: number = value();\n", + "impliedNodeFormat": "CommonJS" + } + ], + "fileIdsList": [ + [ + "./src/shared.ts" + ], + [ + "./node_modules/.pnpm/dep@1.0.0/node_modules/dep/index.d.ts" + ] + ], + "options": { + "module": 99, + "strict": true + }, + "referencedMap": { + "./src/route0.ts": [ + "./src/shared.ts" + ], + "./src/route1.ts": [ + "./src/shared.ts" + ], + "./src/route10.ts": [ + "./src/shared.ts" + ], + "./src/route11.ts": [ + "./src/shared.ts" + ], + "./src/route2.ts": [ + "./src/shared.ts" + ], + "./src/route3.ts": [ + "./src/shared.ts" + ], + "./src/route4.ts": [ + "./src/shared.ts" + ], + "./src/route5.ts": [ + "./src/shared.ts" + ], + "./src/route6.ts": [ + "./src/shared.ts" + ], + "./src/route7.ts": [ + "./src/shared.ts" + ], + "./src/route8.ts": [ + "./src/shared.ts" + ], + "./src/route9.ts": [ + "./src/shared.ts" + ], + "./src/shared.ts": [ + "./node_modules/.pnpm/dep@1.0.0/node_modules/dep/index.d.ts" + ] + }, + "affectedFilesPendingEmit": [ + [ + "./src/route0.ts", + "Js", + 4 + ], + [ + "./src/route1.ts", + "Js", + 5 + ], + [ + "./src/route10.ts", + "Js", + 6 + ], + [ + "./src/route11.ts", + "Js", + 7 + ], + [ + "./src/route2.ts", + "Js", + 8 + ], + [ + "./src/route3.ts", + "Js", + 9 + ], + [ + "./src/route4.ts", + "Js", + 10 + ], + [ + "./src/route5.ts", + "Js", + 11 + ], + [ + "./src/route6.ts", + "Js", + 12 + ], + [ + "./src/route7.ts", + "Js", + 13 + ], + [ + "./src/route8.ts", + "Js", + 14 + ], + [ + "./src/route9.ts", + "Js", + 15 + ], + [ + "./src/shared.ts", + "Js", + 3 + ] + ], + "size": 2964 +} + +tsconfig.json:: +SemanticDiagnostics:: +*refresh* /home/src/tslibs/TS/Lib/lib.es2025.full.d.ts +*refresh* /home/src/workspaces/project/node_modules/.pnpm/dep@1.0.0/node_modules/dep/index.d.ts +*refresh* /home/src/workspaces/project/src/shared.ts +*refresh* /home/src/workspaces/project/src/route0.ts +*refresh* /home/src/workspaces/project/src/route1.ts +*refresh* /home/src/workspaces/project/src/route10.ts +*refresh* /home/src/workspaces/project/src/route11.ts +*refresh* /home/src/workspaces/project/src/route2.ts +*refresh* /home/src/workspaces/project/src/route3.ts +*refresh* /home/src/workspaces/project/src/route4.ts +*refresh* /home/src/workspaces/project/src/route5.ts +*refresh* /home/src/workspaces/project/src/route6.ts +*refresh* /home/src/workspaces/project/src/route7.ts +*refresh* /home/src/workspaces/project/src/route8.ts +*refresh* /home/src/workspaces/project/src/route9.ts +Signatures:: + + +Edit [0]:: pnpm dependency version bump repoints node_modules/dep symlink + +tsgo --noEmit +ExitStatus:: Success +Output:: +//// [/home/src/workspaces/project/tsconfig.tsbuildinfo] *modified* +{"version":"FakeTSVersion","root":[[3,15]],"packageJsons":["./node_modules/.pnpm/dep@2.0.0/node_modules/dep/package.json"],"fileNames":["lib.es2025.full.d.ts","./node_modules/.pnpm/dep@2.0.0/node_modules/dep/index.d.ts","./src/shared.ts","./src/route0.ts","./src/route1.ts","./src/route10.ts","./src/route11.ts","./src/route2.ts","./src/route3.ts","./src/route4.ts","./src/route5.ts","./src/route6.ts","./src/route7.ts","./src/route8.ts","./src/route9.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"ad2894a2ed059494de0d2a936fc203af-export declare function value(): number;\nexport declare function other(): string;\n","72efd51a0841b29d44444b0c071c9dfd-export { value } from \"dep\";\n","643e2357762975a68e62450d2a141ed7-import { value } from \"./shared\";\nexport const r0: number = value();\n","e70e0f57d1482b0aa84294501d5fc901-import { value } from \"./shared\";\nexport const r1: number = value();\n","8b70baa8a8e3f7fe4a640b6d0e75bbf5-import { value } from \"./shared\";\nexport const r10: number = value();\n","0e2481ead9651bcd9f25f1820a3846cb-import { value } from \"./shared\";\nexport const r11: number = value();\n","45ec354de757bb084c982f43e57d9364-import { value } from \"./shared\";\nexport const r2: number = value();\n","ea27de969e3a4e3331fff8b5cdd62b37-import { value } from \"./shared\";\nexport const r3: number = value();\n","02bd2af513f08ee5c874cbb56ca9ac52-import { value } from \"./shared\";\nexport const r4: number = value();\n","04a9b25767a947555005619663c77e2f-import { value } from \"./shared\";\nexport const r5: number = value();\n","4984282c908ecbe067f619d668810b58-import { value } from \"./shared\";\nexport const r6: number = value();\n","19c07f9bda4fea693b022ded99656b8a-import { value } from \"./shared\";\nexport const r7: number = value();\n","e3b98729cdd5987e8a8b76c24214bb96-import { value } from \"./shared\";\nexport const r8: number = value();\n","3c249c1ddc90a1a70a1e9dd2d1d0f004-import { value } from \"./shared\";\nexport const r9: number = value();\n"],"fileIdsList":[[3],[2]],"options":{"module":99,"strict":true},"referencedMap":[[4,1],[5,1],[6,1],[7,1],[8,1],[9,1],[10,1],[11,1],[12,1],[13,1],[14,1],[15,1],[3,2]],"affectedFilesPendingEmit":[4,5,6,7,8,9,10,11,12,13,14,15,3]} +//// [/home/src/workspaces/project/tsconfig.tsbuildinfo.readable.baseline.txt] *modified* +{ + "version": "FakeTSVersion", + "root": [ + { + "files": [ + "./src/shared.ts", + "./src/route0.ts", + "./src/route1.ts", + "./src/route10.ts", + "./src/route11.ts", + "./src/route2.ts", + "./src/route3.ts", + "./src/route4.ts", + "./src/route5.ts", + "./src/route6.ts", + "./src/route7.ts", + "./src/route8.ts", + "./src/route9.ts" + ], + "original": [ + 3, + 15 + ] + } + ], + "packageJsons": [ + "./node_modules/.pnpm/dep@2.0.0/node_modules/dep/package.json" + ], + "fileNames": [ + "lib.es2025.full.d.ts", + "./node_modules/.pnpm/dep@2.0.0/node_modules/dep/index.d.ts", + "./src/shared.ts", + "./src/route0.ts", + "./src/route1.ts", + "./src/route10.ts", + "./src/route11.ts", + "./src/route2.ts", + "./src/route3.ts", + "./src/route4.ts", + "./src/route5.ts", + "./src/route6.ts", + "./src/route7.ts", + "./src/route8.ts", + "./src/route9.ts" + ], + "fileInfos": [ + { + "fileName": "lib.es2025.full.d.ts", + "version": "8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };", + "signature": "8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };", + "affectsGlobalScope": true, + "impliedNodeFormat": "CommonJS", + "original": { + "version": "8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };", + "affectsGlobalScope": true, + "impliedNodeFormat": 1 + } + }, + { + "fileName": "./node_modules/.pnpm/dep@2.0.0/node_modules/dep/index.d.ts", + "version": "ad2894a2ed059494de0d2a936fc203af-export declare function value(): number;\nexport declare function other(): string;\n", + "signature": "ad2894a2ed059494de0d2a936fc203af-export declare function value(): number;\nexport declare function other(): string;\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/shared.ts", + "version": "72efd51a0841b29d44444b0c071c9dfd-export { value } from \"dep\";\n", + "signature": "72efd51a0841b29d44444b0c071c9dfd-export { value } from \"dep\";\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route0.ts", + "version": "643e2357762975a68e62450d2a141ed7-import { value } from \"./shared\";\nexport const r0: number = value();\n", + "signature": "643e2357762975a68e62450d2a141ed7-import { value } from \"./shared\";\nexport const r0: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route1.ts", + "version": "e70e0f57d1482b0aa84294501d5fc901-import { value } from \"./shared\";\nexport const r1: number = value();\n", + "signature": "e70e0f57d1482b0aa84294501d5fc901-import { value } from \"./shared\";\nexport const r1: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route10.ts", + "version": "8b70baa8a8e3f7fe4a640b6d0e75bbf5-import { value } from \"./shared\";\nexport const r10: number = value();\n", + "signature": "8b70baa8a8e3f7fe4a640b6d0e75bbf5-import { value } from \"./shared\";\nexport const r10: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route11.ts", + "version": "0e2481ead9651bcd9f25f1820a3846cb-import { value } from \"./shared\";\nexport const r11: number = value();\n", + "signature": "0e2481ead9651bcd9f25f1820a3846cb-import { value } from \"./shared\";\nexport const r11: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route2.ts", + "version": "45ec354de757bb084c982f43e57d9364-import { value } from \"./shared\";\nexport const r2: number = value();\n", + "signature": "45ec354de757bb084c982f43e57d9364-import { value } from \"./shared\";\nexport const r2: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route3.ts", + "version": "ea27de969e3a4e3331fff8b5cdd62b37-import { value } from \"./shared\";\nexport const r3: number = value();\n", + "signature": "ea27de969e3a4e3331fff8b5cdd62b37-import { value } from \"./shared\";\nexport const r3: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route4.ts", + "version": "02bd2af513f08ee5c874cbb56ca9ac52-import { value } from \"./shared\";\nexport const r4: number = value();\n", + "signature": "02bd2af513f08ee5c874cbb56ca9ac52-import { value } from \"./shared\";\nexport const r4: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route5.ts", + "version": "04a9b25767a947555005619663c77e2f-import { value } from \"./shared\";\nexport const r5: number = value();\n", + "signature": "04a9b25767a947555005619663c77e2f-import { value } from \"./shared\";\nexport const r5: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route6.ts", + "version": "4984282c908ecbe067f619d668810b58-import { value } from \"./shared\";\nexport const r6: number = value();\n", + "signature": "4984282c908ecbe067f619d668810b58-import { value } from \"./shared\";\nexport const r6: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route7.ts", + "version": "19c07f9bda4fea693b022ded99656b8a-import { value } from \"./shared\";\nexport const r7: number = value();\n", + "signature": "19c07f9bda4fea693b022ded99656b8a-import { value } from \"./shared\";\nexport const r7: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route8.ts", + "version": "e3b98729cdd5987e8a8b76c24214bb96-import { value } from \"./shared\";\nexport const r8: number = value();\n", + "signature": "e3b98729cdd5987e8a8b76c24214bb96-import { value } from \"./shared\";\nexport const r8: number = value();\n", + "impliedNodeFormat": "CommonJS" + }, + { + "fileName": "./src/route9.ts", + "version": "3c249c1ddc90a1a70a1e9dd2d1d0f004-import { value } from \"./shared\";\nexport const r9: number = value();\n", + "signature": "3c249c1ddc90a1a70a1e9dd2d1d0f004-import { value } from \"./shared\";\nexport const r9: number = value();\n", + "impliedNodeFormat": "CommonJS" + } + ], + "fileIdsList": [ + [ + "./src/shared.ts" + ], + [ + "./node_modules/.pnpm/dep@2.0.0/node_modules/dep/index.d.ts" + ] + ], + "options": { + "module": 99, + "strict": true + }, + "referencedMap": { + "./src/route0.ts": [ + "./src/shared.ts" + ], + "./src/route1.ts": [ + "./src/shared.ts" + ], + "./src/route10.ts": [ + "./src/shared.ts" + ], + "./src/route11.ts": [ + "./src/shared.ts" + ], + "./src/route2.ts": [ + "./src/shared.ts" + ], + "./src/route3.ts": [ + "./src/shared.ts" + ], + "./src/route4.ts": [ + "./src/shared.ts" + ], + "./src/route5.ts": [ + "./src/shared.ts" + ], + "./src/route6.ts": [ + "./src/shared.ts" + ], + "./src/route7.ts": [ + "./src/shared.ts" + ], + "./src/route8.ts": [ + "./src/shared.ts" + ], + "./src/route9.ts": [ + "./src/shared.ts" + ], + "./src/shared.ts": [ + "./node_modules/.pnpm/dep@2.0.0/node_modules/dep/index.d.ts" + ] + }, + "affectedFilesPendingEmit": [ + [ + "./src/route0.ts", + "Js", + 4 + ], + [ + "./src/route1.ts", + "Js", + 5 + ], + [ + "./src/route10.ts", + "Js", + 6 + ], + [ + "./src/route11.ts", + "Js", + 7 + ], + [ + "./src/route2.ts", + "Js", + 8 + ], + [ + "./src/route3.ts", + "Js", + 9 + ], + [ + "./src/route4.ts", + "Js", + 10 + ], + [ + "./src/route5.ts", + "Js", + 11 + ], + [ + "./src/route6.ts", + "Js", + 12 + ], + [ + "./src/route7.ts", + "Js", + 13 + ], + [ + "./src/route8.ts", + "Js", + 14 + ], + [ + "./src/route9.ts", + "Js", + 15 + ], + [ + "./src/shared.ts", + "Js", + 3 + ] + ], + "size": 2964 +} + +tsconfig.json:: +SemanticDiagnostics:: +*refresh* /home/src/workspaces/project/node_modules/.pnpm/dep@2.0.0/node_modules/dep/index.d.ts +*refresh* /home/src/workspaces/project/src/shared.ts +*refresh* /home/src/workspaces/project/src/route0.ts +*refresh* /home/src/workspaces/project/src/route1.ts +*refresh* /home/src/workspaces/project/src/route10.ts +*refresh* /home/src/workspaces/project/src/route11.ts +*refresh* /home/src/workspaces/project/src/route2.ts +*refresh* /home/src/workspaces/project/src/route3.ts +*refresh* /home/src/workspaces/project/src/route4.ts +*refresh* /home/src/workspaces/project/src/route5.ts +*refresh* /home/src/workspaces/project/src/route6.ts +*refresh* /home/src/workspaces/project/src/route7.ts +*refresh* /home/src/workspaces/project/src/route8.ts +*refresh* /home/src/workspaces/project/src/route9.ts +Signatures:: +(used version) /home/src/workspaces/project/node_modules/.pnpm/dep@2.0.0/node_modules/dep/index.d.ts +(computed .d.ts) /home/src/workspaces/project/src/shared.ts +(used version) /home/src/workspaces/project/src/route0.ts +(used version) /home/src/workspaces/project/src/route1.ts +(used version) /home/src/workspaces/project/src/route10.ts +(used version) /home/src/workspaces/project/src/route11.ts +(used version) /home/src/workspaces/project/src/route2.ts +(used version) /home/src/workspaces/project/src/route3.ts +(used version) /home/src/workspaces/project/src/route4.ts +(used version) /home/src/workspaces/project/src/route5.ts +(used version) /home/src/workspaces/project/src/route6.ts +(used version) /home/src/workspaces/project/src/route7.ts +(used version) /home/src/workspaces/project/src/route8.ts +(used version) /home/src/workspaces/project/src/route9.ts + + +Edit [1]:: no change + +tsgo --noEmit +ExitStatus:: Success +Output:: + +tsconfig.json:: +SemanticDiagnostics:: +Signatures:: From a8d48ffbd48cdc9eb5425d56e692e23b41c8a814 Mon Sep 17 00:00:00 2001 From: John Favret <64748847+johnfav03@users.noreply.github.com> Date: Mon, 10 Aug 2026 13:18:43 -0500 Subject: [PATCH 2/2] Drop incremental state after widespread reference replacement --- .../execute/incremental/programtosnapshot.go | 127 ++++++++++++++++-- ...ncy-version-change-moves-resolved-paths.js | 15 +-- 2 files changed, 118 insertions(+), 24 deletions(-) diff --git a/internal/execute/incremental/programtosnapshot.go b/internal/execute/incremental/programtosnapshot.go index 44b9b4cbc65..c3cb13d207a 100644 --- a/internal/execute/incremental/programtosnapshot.go +++ b/internal/execute/incremental/programtosnapshot.go @@ -2,6 +2,7 @@ package incremental import ( "context" + "sync/atomic" "github.com/microsoft/typescript-go/internal/ast" "github.com/microsoft/typescript-go/internal/binder" @@ -87,6 +88,8 @@ func (t *toProgramSnapshot) computeProgramFileChanges() { t.snapshot.options.SkipDefaultLibCheck.IsTrue() == t.oldProgram.snapshot.options.SkipDefaultLibCheck.IsTrue() files := t.program.GetSourceFiles() + var structuralChanges atomic.Int32 + var referenceReplacementFiles collections.SyncSet[tspath.Path] wg := core.NewWorkGroup(t.program.SingleThreaded()) for _, file := range files { wg.Queue(func() { @@ -99,23 +102,37 @@ func (t *toProgramSnapshot) computeProgramFileChanges() { t.snapshot.referencedMap.storeReferences(file.Path(), newReferences) } if t.oldProgram != nil { + countable := !t.program.IsSourceFileDefaultLibrary(file.Path()) if oldFileInfo, ok := t.oldProgram.snapshot.fileInfos.Load(file.Path()); ok { signature = oldFileInfo.signature if oldFileInfo.version != version || oldFileInfo.affectsGlobalScope != affectsGlobalScope || oldFileInfo.impliedNodeFormat != impliedNodeFormat { t.snapshot.addFileToChangeSet(file.Path()) - } else if oldReferences, _ := t.oldProgram.snapshot.referencedMap.getReferences(file.Path()); !newReferences.Equals(oldReferences) { - // Referenced files changed - t.snapshot.addFileToChangeSet(file.Path()) - } else if newReferences != nil { - for refPath := range newReferences.Keys() { - if t.program.GetSourceFileByPath(refPath) == nil { - if _, ok := t.oldProgram.snapshot.fileInfos.Load(refPath); ok { - // Referenced file was deleted in the new program - t.snapshot.addFileToChangeSet(file.Path()) - break + if countable { + structuralChanges.Add(1) + } + } else { + referencesChanged := false + oldReferences, _ := t.oldProgram.snapshot.referencedMap.getReferences(file.Path()) + if !newReferences.Equals(oldReferences) { + // Referenced files changed + referencesChanged = true + } else if newReferences != nil { + for refPath := range newReferences.Keys() { + if t.program.GetSourceFileByPath(refPath) == nil { + if _, ok := t.oldProgram.snapshot.fileInfos.Load(refPath); ok { + // Referenced file was deleted in the new program + referencesChanged = true + break + } } } } + if referencesChanged { + t.snapshot.addFileToChangeSet(file.Path()) + if countable && t.referencesWereReplaced(oldReferences, newReferences) { + referenceReplacementFiles.Add(file.Path()) + } + } } } else { t.snapshot.addFileToChangeSet(file.Path()) @@ -152,6 +169,96 @@ func (t *toProgramSnapshot) computeProgramFileChanges() { }) } wg.RunAndWait() + + t.maybeDropIncrementalState(int(structuralChanges.Load()), &referenceReplacementFiles) +} + +func (t *toProgramSnapshot) referencesWereReplaced(oldReferences *collections.Set[tspath.Path], newReferences *collections.Set[tspath.Path]) bool { + hasRemovedReference := false + for path := range oldReferences.Keys() { + if !newReferences.Has(path) && t.program.GetSourceFileByPath(path) == nil { + hasRemovedReference = true + break + } + } + if !hasRemovedReference { + return false + } + for path := range newReferences.Keys() { + if !oldReferences.Has(path) { + if _, ok := t.oldProgram.snapshot.fileInfos.Load(path); !ok { + return true + } + } + } + return false +} + +const minAffectedFilesToDropIncrementalState = 8 + +func (t *toProgramSnapshot) maybeDropIncrementalState(structuralChanges int, referenceReplacementFiles *collections.SyncSet[tspath.Path]) { + if t.oldProgram == nil || t.snapshot.options.Composite.IsTrue() { + return + } + if structuralChanges != 0 || referenceReplacementFiles.Size() == 0 { + return + } + + checkedFileCount := 0 + for _, file := range t.program.GetSourceFiles() { + if !t.program.SkipTypeChecking(file, true) { + checkedFileCount++ + } + } + + seen := collections.Set[tspath.Path]{} + queue := make([]tspath.Path, 0, referenceReplacementFiles.Size()) + referenceReplacementFiles.Range(func(path tspath.Path) bool { + queue = append(queue, path) + return true + }) + affectedCheckedFileCount := 0 + for len(queue) != 0 { + path := queue[len(queue)-1] + queue = queue[:len(queue)-1] + if !seen.AddIfAbsent(path) { + continue + } + if file := t.program.GetSourceFileByPath(path); file != nil && !t.program.SkipTypeChecking(file, true) { + affectedCheckedFileCount++ + } + for referencedBy := range t.snapshot.referencedMap.getReferencedBy(path) { + queue = append(queue, referencedBy) + } + } + + // Reconciliation computes shape signatures for affected files before checking them. Once a + // sizable majority of the checked program is affected, rebuilding cold is the cheaper bound. + if affectedCheckedFileCount < minAffectedFilesToDropIncrementalState || + affectedCheckedFileCount*2 < checkedFileCount { + return + } + t.rebuildSnapshotAsCold() +} + +func (t *toProgramSnapshot) rebuildSnapshotAsCold() { + s := t.snapshot + s.changedFilesSet = collections.SyncSet[tspath.Path]{} + s.semanticDiagnosticsPerFile = collections.SyncMap[tspath.Path, *DiagnosticsOrBuildInfoDiagnosticsWithFileName]{} + s.emitDiagnosticsPerFile = collections.SyncMap[tspath.Path, *DiagnosticsOrBuildInfoDiagnosticsWithFileName]{} + s.emitSignatures = collections.SyncMap[tspath.Path, *emitSignature]{} + s.affectedFilesPendingEmit = collections.SyncMap[tspath.Path, FileEmitKind]{} + s.latestChangedDtsFile = "" + emitKind := GetFileEmitKind(s.options) + s.fileInfos.Range(func(path tspath.Path, info *FileInfo) bool { + // A cold build stores the file version as the signature and queues every file for emit. + info.signature = info.version + s.affectedFilesPendingEmit.Store(path, emitKind) + return true + }) + s.buildInfoEmitPending.Store(true) + t.globalFileRemoved = false + t.oldProgram = nil } func (t *toProgramSnapshot) handleFileDelete() { diff --git a/testdata/baselines/reference/tsc/incremental/pnpm-dependency-version-change-moves-resolved-paths.js b/testdata/baselines/reference/tsc/incremental/pnpm-dependency-version-change-moves-resolved-paths.js index 789df719819..2d26ce9c961 100644 --- a/testdata/baselines/reference/tsc/incremental/pnpm-dependency-version-change-moves-resolved-paths.js +++ b/testdata/baselines/reference/tsc/incremental/pnpm-dependency-version-change-moves-resolved-paths.js @@ -668,6 +668,7 @@ Output:: tsconfig.json:: SemanticDiagnostics:: +*refresh* /home/src/tslibs/TS/Lib/lib.es2025.full.d.ts *refresh* /home/src/workspaces/project/node_modules/.pnpm/dep@2.0.0/node_modules/dep/index.d.ts *refresh* /home/src/workspaces/project/src/shared.ts *refresh* /home/src/workspaces/project/src/route0.ts @@ -683,20 +684,6 @@ SemanticDiagnostics:: *refresh* /home/src/workspaces/project/src/route8.ts *refresh* /home/src/workspaces/project/src/route9.ts Signatures:: -(used version) /home/src/workspaces/project/node_modules/.pnpm/dep@2.0.0/node_modules/dep/index.d.ts -(computed .d.ts) /home/src/workspaces/project/src/shared.ts -(used version) /home/src/workspaces/project/src/route0.ts -(used version) /home/src/workspaces/project/src/route1.ts -(used version) /home/src/workspaces/project/src/route10.ts -(used version) /home/src/workspaces/project/src/route11.ts -(used version) /home/src/workspaces/project/src/route2.ts -(used version) /home/src/workspaces/project/src/route3.ts -(used version) /home/src/workspaces/project/src/route4.ts -(used version) /home/src/workspaces/project/src/route5.ts -(used version) /home/src/workspaces/project/src/route6.ts -(used version) /home/src/workspaces/project/src/route7.ts -(used version) /home/src/workspaces/project/src/route8.ts -(used version) /home/src/workspaces/project/src/route9.ts Edit [1]:: no change