microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-04-17 01:49:41 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

🤖 Pick PR #63239 (Fix missing lib files in reused pro...) into release-6.0 (#63246)

Browse Source 
Co-authored-by: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
This commit is contained in:
TypeScript Bot
2026-03-13 14:48:14 -07:00
committed by GitHub
parent 35ff23d4b0
commit 9e72ab71b5
32 changed files with 40 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/_tsc.js
View File

@@ -123444,6 +123444,9 @@ function createProgram(_rootNamesOrOptions, _options, _host, _oldProgram, _confi
Debug.assert(newSourceFiles.length === oldProgram.getSourceFiles().length);
for (const newSourceFile of newSourceFiles) {
filesByName.set(newSourceFile.path, newSourceFile);
if (oldProgram.isSourceFileDefaultLibrary(newSourceFile)) {
libFiles.add(newSourceFile.path);
}
}
const oldFilesByNameMap = oldProgram.getFilesByNameMap();
oldFilesByNameMap.forEach((oldFile, path) => {

3
lib/typescript.js
View File

@@ -128318,6 +128318,9 @@ function createProgram(_rootNamesOrOptions, _options, _host, _oldProgram, _confi
Debug.assert(newSourceFiles.length === oldProgram.getSourceFiles().length);
for (const newSourceFile of newSourceFiles) {
filesByName.set(newSourceFile.path, newSourceFile);
if (oldProgram.isSourceFileDefaultLibrary(newSourceFile)) {
libFiles.add(newSourceFile.path);
}
}
const oldFilesByNameMap = oldProgram.getFilesByNameMap();
oldFilesByNameMap.forEach((oldFile, path) => {

3
src/compiler/program.ts
View File

@@ -2555,6 +2555,9 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
Debug.assert(newSourceFiles.length === oldProgram.getSourceFiles().length);
for (const newSourceFile of newSourceFiles) {
filesByName.set(newSourceFile.path, newSourceFile);
if (oldProgram.isSourceFileDefaultLibrary(newSourceFile)) {
libFiles.add(newSourceFile.path);
}
}
const oldFilesByNameMap = oldProgram.getFilesByNameMap();
oldFilesByNameMap.forEach((oldFile, path) => {

29
src/testRunner/unittests/reuseProgramStructure.ts
View File

@@ -769,6 +769,35 @@ describe("unittests:: reuseProgramStructure:: General", () => {
baselineDiagnostics(baselines, program4);
runBaseline("handles file preprocessing dignostics when diagnostics are not queried", baselines);
});
it("isSourceFileDefaultLibrary is preserved after program reuse", () => {
const libFile = { name: "/lib.d.ts", text: SourceText.New("", "", "declare var console: any;") };
const mainFile = { name: "/main.ts", text: SourceText.New("", "", "var x = 1;") };
const files = [libFile, mainFile];
const host = createTestCompilerHost(files, target);
host.getDefaultLibFileName = () => "/lib.d.ts";
const options: ts.CompilerOptions = { target };
const program1 = ts.createProgram(["/main.ts"], options, host) as ProgramWithSourceTexts;
program1.sourceTexts = files;
program1.host = host;
program1.version = 1;
const libSourceFile1 = program1.getSourceFile("/lib.d.ts")!;
assert.isDefined(libSourceFile1, "lib file should exist in program 1");
assert.isTrue(program1.isSourceFileDefaultLibrary(libSourceFile1), "lib file should be a default library in program 1");
// Update main file only (code change) -> should trigger complete structure reuse
mainFile.text = mainFile.text.updateProgram("var x = 2;");
const host2 = createTestCompilerHost(files, target, program1);
host2.getDefaultLibFileName = () => "/lib.d.ts";
const program2 = ts.createProgram(["/main.ts"], options, host2, program1);
const libSourceFile2 = program2.getSourceFile("/lib.d.ts")!;
assert.isDefined(libSourceFile2, "lib file should exist in program 2");
assert.isTrue(program2.isSourceFileDefaultLibrary(libSourceFile2), "lib file should still be a default library in program 2 after reuse");
});
});
describe("unittests:: reuseProgramStructure:: host is optional", () => {

1
tests/baselines/reference/tscWatch/emit/emit-file-content/file-is-deleted-and-created-as-part-of-change.js
View File

@@ -126,6 +126,5 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/username/projects/project/app/file.ts (computed .d.ts)
/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

1
tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-carriageReturn-lineFeed.js
View File

@@ -115,6 +115,5 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/a/app.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

1
tests/baselines/reference/tscWatch/emit/emit-file-content/handles-new-lines-lineFeed.js
View File

@@ -115,6 +115,5 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/a/app.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

1
tests/baselines/reference/tscWatch/emit/emit-for-configured-projects/should-return-all-files-if-a-global-file-changed-shape.js
View File

@@ -189,7 +189,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/a/b/globalfile3.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
/home/src/projects/a/b/modulefile1.ts (computed .d.ts)
/home/src/projects/a/b/file1consumer1.ts (computed .d.ts)
/home/src/projects/a/b/file1consumer2.ts (computed .d.ts)

2
tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-does-not-have-out-or-outFile.js
View File

@@ -142,7 +142,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/a/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
/home/src/projects/a/b.ts (computed .d.ts)
exitCode:: ExitStatus.undefined
@@ -200,7 +199,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/a/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
/home/src/projects/a/b.ts (computed .d.ts)
exitCode:: ExitStatus.undefined

2
tests/baselines/reference/tscWatch/emit/emit-with-outFile-or-out-setting/config-has-out.js
View File

@@ -150,7 +150,6 @@ No cached semantic diagnostics in the builder::
Shape signatures in builder refreshed for::
/home/src/projects/a/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
/home/src/projects/a/b.ts (computed .d.ts)
exitCode:: ExitStatus.undefined
@@ -211,7 +210,6 @@ No cached semantic diagnostics in the builder::
Shape signatures in builder refreshed for::
/home/src/projects/a/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
/home/src/projects/a/b.ts (computed .d.ts)
exitCode:: ExitStatus.undefined

1
tests/baselines/reference/tscWatch/emit/when-module-emit-is-specified-as-node/when-instead-of-filechanged-recursive-directory-watcher-is-invoked.js
View File

@@ -169,7 +169,6 @@ No cached semantic diagnostics in the builder::
Shape signatures in builder refreshed for::
/home/src/projects/a/rootfolder/project/scripts/typescript.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
/home/src/projects/a/rootfolder/project/scripts/javascript.js (computed .d.ts)
exitCode:: ExitStatus.undefined

2
tests/baselines/reference/tscWatch/noEmit/multiFile/dts-errors-with-incremental.js
View File

@@ -258,7 +258,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/project/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined
@@ -547,7 +546,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/project/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

2
tests/baselines/reference/tscWatch/noEmit/multiFile/dts-errors-without-dts-enabled-with-incremental.js
View File

@@ -210,7 +210,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/project/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined
@@ -448,7 +447,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/project/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

2
tests/baselines/reference/tscWatch/noEmit/multiFile/dts-errors-without-dts-enabled.js
View File

@@ -116,7 +116,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/project/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined
@@ -262,7 +261,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/project/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

2
tests/baselines/reference/tscWatch/noEmit/multiFile/dts-errors.js
View File

@@ -129,7 +129,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/project/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined
@@ -295,7 +294,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/project/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

2
tests/baselines/reference/tscWatch/noEmit/multiFile/semantic-errors-with-incremental.js
View File

@@ -229,7 +229,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/project/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined
@@ -486,7 +485,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/project/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

2
tests/baselines/reference/tscWatch/noEmit/multiFile/semantic-errors.js
View File

@@ -121,7 +121,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/project/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined
@@ -272,7 +271,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/home/src/projects/project/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

1
tests/baselines/reference/tscWatch/programUpdates/handle-recreated-files-correctly.js
View File

@@ -153,7 +153,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/user/username/workspace/solution/projects/project/commonfile2.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
/user/username/workspace/solution/projects/project/commonfile1.ts (computed .d.ts)
exitCode:: ExitStatus.undefined

1
tests/baselines/reference/tscWatch/programUpdates/should-reflect-change-in-config-file.js
View File

@@ -152,7 +152,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/user/username/workspace/solution/projects/project/commonfile2.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
/user/username/workspace/solution/projects/project/commonfile1.ts (computed .d.ts)
exitCode:: ExitStatus.undefined

2
tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-default-options.js
View File

@@ -117,7 +117,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/user/username/projects/myproject/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined
@@ -170,6 +169,5 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/user/username/projects/myproject/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

4
tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipDefaultLibCheck.js
View File

@@ -114,12 +114,10 @@ Program files::
/user/username/projects/myproject/a.ts
Semantic diagnostics in builder refreshed for::
/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts
/user/username/projects/myproject/a.ts
Shape signatures in builder refreshed for::
/user/username/projects/myproject/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined
@@ -168,11 +166,9 @@ Program files::
/user/username/projects/myproject/a.ts
Semantic diagnostics in builder refreshed for::
/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts
/user/username/projects/myproject/a.ts
Shape signatures in builder refreshed for::
/user/username/projects/myproject/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

4
tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-module-file-with-global-definitions-changes/with-skipLibCheck.js
View File

@@ -114,12 +114,10 @@ Program files::
/user/username/projects/myproject/a.ts
Semantic diagnostics in builder refreshed for::
/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts
/user/username/projects/myproject/a.ts
Shape signatures in builder refreshed for::
/user/username/projects/myproject/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined
@@ -168,11 +166,9 @@ Program files::
/user/username/projects/myproject/a.ts
Semantic diagnostics in builder refreshed for::
/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts
/user/username/projects/myproject/a.ts
Shape signatures in builder refreshed for::
/user/username/projects/myproject/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

2
tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-default-options.js
View File

@@ -117,7 +117,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/user/username/projects/myproject/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined
@@ -171,6 +170,5 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/user/username/projects/myproject/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

4
tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipDefaultLibCheck.js
View File

@@ -114,12 +114,10 @@ Program files::
/user/username/projects/myproject/a.ts
Semantic diagnostics in builder refreshed for::
/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts
/user/username/projects/myproject/a.ts
Shape signatures in builder refreshed for::
/user/username/projects/myproject/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined
@@ -169,11 +167,9 @@ Program files::
/user/username/projects/myproject/a.ts
Semantic diagnostics in builder refreshed for::
/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts
/user/username/projects/myproject/a.ts
Shape signatures in builder refreshed for::
/user/username/projects/myproject/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

4
tests/baselines/reference/tscWatch/programUpdates/updates-errors-in-lib-file/when-non-module-file-changes/with-skipLibCheck.js
View File

@@ -114,12 +114,10 @@ Program files::
/user/username/projects/myproject/a.ts
Semantic diagnostics in builder refreshed for::
/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts
/user/username/projects/myproject/a.ts
Shape signatures in builder refreshed for::
/user/username/projects/myproject/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined
@@ -169,11 +167,9 @@ Program files::
/user/username/projects/myproject/a.ts
Semantic diagnostics in builder refreshed for::
/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts
/user/username/projects/myproject/a.ts
Shape signatures in builder refreshed for::
/user/username/projects/myproject/a.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

2
tests/baselines/reference/tscWatch/programUpdates/when-skipLibCheck-and-skipDefaultLibCheck-changes.js
View File

@@ -243,6 +243,7 @@ Program files::
/user/username/projects/myproject/b.d.ts
Semantic diagnostics in builder refreshed for::
/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts
No shapes updated in the builder::
@@ -297,6 +298,7 @@ Program files::
/user/username/projects/myproject/b.d.ts
Semantic diagnostics in builder refreshed for::
/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts
No shapes updated in the builder::

1
tests/baselines/reference/tscWatch/watchEnvironment/fsEvent-for-change-is-repeated.js
View File

@@ -126,7 +126,6 @@ main.ts
Shape signatures in builder refreshed for::
/user/username/projects/project/main.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

1
tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-dynamic-priority-polling.js
View File

@@ -708,7 +708,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/a/username/projects/project/typescript.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
exitCode:: ExitStatus.undefined

1
tests/baselines/reference/tscWatch/watchEnvironment/watchFile/using-fixed-chunk-size-polling.js
View File

@@ -194,7 +194,6 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/user/username/projects/project/commonfile1.ts (computed .d.ts)
/home/src/tslibs/ts/lib/lib.es2025.full.d.ts (used version)
/user/username/projects/project/commonfile2.ts (computed .d.ts)
exitCode:: ExitStatus.undefined

1
tests/baselines/reference/tsserver/compileOnSave/configProjects-global-file-shape-changed.js
View File

@@ -345,7 +345,6 @@ Info seq [hh:mm:ss:mss] response:
"projectFileName": "/home/src/workspace/projects/b/tsconfig.json",
"fileNames": [
"/home/src/workspace/projects/b/globalFile3.ts",
"/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts",
"/home/src/workspace/projects/b/moduleFile1.ts",
"/home/src/workspace/projects/b/file1Consumer1.ts",
"/home/src/workspace/projects/b/file1Consumer2.ts",

1
tests/baselines/reference/tsserver/compileOnSave/emit-in-project-with-module.js
View File

@@ -697,7 +697,6 @@ Info seq [hh:mm:ss:mss] response:
"projectFileName": "/user/username/projects/myproject/tsconfig.json",
"fileNames": [
"/user/username/projects/myproject/file2.ts",
"/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts",
"/user/username/projects/myproject/file1.ts",
"/user/username/projects/myproject/file3.ts",
"/user/username/projects/myproject/module.ts"

1
tests/baselines/reference/tsserver/compileOnSave/emit-in-project.js
View File

@@ -659,7 +659,6 @@ Info seq [hh:mm:ss:mss] response:
"projectFileName": "/user/username/projects/myproject/tsconfig.json",
"fileNames": [
"/user/username/projects/myproject/file2.ts",
"/home/src/tslibs/TS/Lib/lib.es2025.full.d.ts",
"/user/username/projects/myproject/file1.ts",
"/user/username/projects/myproject/file3.ts"
],