Unverified Commit 614f105b authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

allow incremental type checking to use caching (#24992)

emit must be called on build program to leverage caching

While the the current way of calling incremental typescript seem to work, it actually doesn't use caching correct. A difference is only notice-able on larger code bases...
parent f97b82a2
...@@ -43,11 +43,13 @@ export async function runTypeCheck( ...@@ -43,11 +43,13 @@ export async function runTypeCheck(
noEmit: true, noEmit: true,
} }
let program: import('typescript').Program let program:
| import('typescript').Program
| import('typescript').BuilderProgram
let incremental = false let incremental = false
if (options.incremental && cacheDir) { if (options.incremental && cacheDir) {
incremental = true incremental = true
const builderProgram = ts.createIncrementalProgram({ program = ts.createIncrementalProgram({
rootNames: effectiveConfiguration.fileNames, rootNames: effectiveConfiguration.fileNames,
options: { options: {
...options, ...options,
...@@ -55,7 +57,6 @@ export async function runTypeCheck( ...@@ -55,7 +57,6 @@ export async function runTypeCheck(
tsBuildInfoFile: path.join(cacheDir, '.tsbuildinfo'), tsBuildInfoFile: path.join(cacheDir, '.tsbuildinfo'),
}, },
}) })
program = builderProgram.getProgram()
} else { } else {
program = ts.createProgram(effectiveConfiguration.fileNames, options) program = ts.createProgram(effectiveConfiguration.fileNames, options)
} }
...@@ -73,7 +74,7 @@ export async function runTypeCheck( ...@@ -73,7 +74,7 @@ export async function runTypeCheck(
// //
const regexIgnoredFile = /[\\/]__(?:tests|mocks)__[\\/]|(?<=[\\/.])(?:spec|test)\.[^\\/]+$/ const regexIgnoredFile = /[\\/]__(?:tests|mocks)__[\\/]|(?<=[\\/.])(?:spec|test)\.[^\\/]+$/
const allDiagnostics = ts const allDiagnostics = ts
.getPreEmitDiagnostics(program) .getPreEmitDiagnostics(program as import('typescript').Program)
.concat(result.diagnostics) .concat(result.diagnostics)
.filter((d) => !(d.file && regexIgnoredFile.test(d.file.fileName))) .filter((d) => !(d.file && regexIgnoredFile.test(d.file.fileName)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment