@typescript-deploys/pr-build 4.8.0-pr-48784-14 → 4.8.0-pr-49285-2

package/lib/tsserver.js

@@ -100,7 +100,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-insiders.20220527";
+    ts.version = ts.versionMajorMinor + ".0-insiders.20220531";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -5104,6 +5104,11 @@ var ts;
         // Flags that require TypeFlags.Union
         /* @internal */
         ObjectFlags[ObjectFlags["ContainsIntersections"] = 16777216] = "ContainsIntersections";
+        /* @internal */
+        ObjectFlags[ObjectFlags["IsUnknownLikeUnionComputed"] = 33554432] = "IsUnknownLikeUnionComputed";
+        /* @internal */
+        ObjectFlags[ObjectFlags["IsUnknownLikeUnion"] = 67108864] = "IsUnknownLikeUnion";
+        /* @internal */
         // Flags that require TypeFlags.Intersection
         /* @internal */
         ObjectFlags[ObjectFlags["IsNeverIntersectionComputed"] = 16777216] = "IsNeverIntersectionComputed";
@@ -6195,7 +6200,7 @@ var ts;
             };
         }
         function createDirectoryWatcher(dirName, dirPath, fallbackOptions) {
-            var watcher = fsWatch(dirName, 1 /* Directory */, function (_eventName, relativeFileName, modifiedTime) {
+            var watcher = fsWatch(dirName, 1 /* Directory */, function (_eventName, relativeFileName) {
                 // When files are deleted from disk, the triggered "rename" event would have a relativefileName of "undefined"
                 if (!ts.isString(relativeFileName))
                     return;
@@ -6205,7 +6210,7 @@ var ts;
                 if (callbacks) {
                     for (var _i = 0, callbacks_1 = callbacks; _i < callbacks_1.length; _i++) {
                         var fileCallback = callbacks_1[_i];
-                        fileCallback(fileName, FileWatcherEventKind.Changed, modifiedTime);
+                        fileCallback(fileName, FileWatcherEventKind.Changed);
                     }
                 }
             }, 
@@ -6259,7 +6264,7 @@ var ts;
             }
             else {
                 cache.set(path, {
-                    watcher: watchFile(fileName, function (fileName, eventKind, modifiedTime) { return ts.forEach(callbacksCache.get(path), function (cb) { return cb(fileName, eventKind, modifiedTime); }); }, pollingInterval, options),
+                    watcher: watchFile(fileName, function (fileName, eventKind) { return ts.forEach(callbacksCache.get(path), function (cb) { return cb(fileName, eventKind); }); }, pollingInterval, options),
                     refCount: 1
                 });
             }
@@ -6287,7 +6292,7 @@ var ts;
         var newTime = modifiedTime.getTime();
         if (oldTime !== newTime) {
             watchedFile.mtime = modifiedTime;
-            watchedFile.callback(watchedFile.fileName, getFileWatcherEventKind(oldTime, newTime), modifiedTime);
+            watchedFile.callback(watchedFile.fileName, getFileWatcherEventKind(oldTime, newTime));
             return true;
         }
         return false;
@@ -6538,18 +6543,17 @@ var ts;
     })(FileSystemEntryKind = ts.FileSystemEntryKind || (ts.FileSystemEntryKind = {}));
     /*@internal*/
     function createFileWatcherCallback(callback) {
-        return function (_fileName, eventKind, modifiedTime) { return callback(eventKind === FileWatcherEventKind.Changed ? "change" : "rename", "", modifiedTime); };
+        return function (_fileName, eventKind) { return callback(eventKind === FileWatcherEventKind.Changed ? "change" : "rename", ""); };
     }
     ts.createFileWatcherCallback = createFileWatcherCallback;
-    function createFsWatchCallbackForFileWatcherCallback(fileName, callback, getModifiedTime) {
-        return function (eventName, _relativeFileName, modifiedTime) {
+    function createFsWatchCallbackForFileWatcherCallback(fileName, callback, fileExists) {
+        return function (eventName) {
             if (eventName === "rename") {
-                modifiedTime || (modifiedTime = getModifiedTime(fileName) || ts.missingFileModifiedTime);
-                callback(fileName, modifiedTime !== ts.missingFileModifiedTime ? FileWatcherEventKind.Created : FileWatcherEventKind.Deleted, modifiedTime);
+                callback(fileName, fileExists(fileName) ? FileWatcherEventKind.Created : FileWatcherEventKind.Deleted);
             }
             else {
                 // Change
-                callback(fileName, FileWatcherEventKind.Changed, modifiedTime);
+                callback(fileName, FileWatcherEventKind.Changed);
             }
         };
     }
@@ -6573,7 +6577,7 @@ var ts;
     }
     /*@internal*/
     function createSystemWatchFunctions(_a) {
-        var pollingWatchFile = _a.pollingWatchFile, getModifiedTime = _a.getModifiedTime, setTimeout = _a.setTimeout, clearTimeout = _a.clearTimeout, fsWatch = _a.fsWatch, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, getCurrentDirectory = _a.getCurrentDirectory, fsSupportsRecursiveFsWatch = _a.fsSupportsRecursiveFsWatch, directoryExists = _a.directoryExists, getAccessibleSortedChildDirectories = _a.getAccessibleSortedChildDirectories, realpath = _a.realpath, tscWatchFile = _a.tscWatchFile, useNonPollingWatchers = _a.useNonPollingWatchers, tscWatchDirectory = _a.tscWatchDirectory, defaultWatchFileKind = _a.defaultWatchFileKind;
+        var pollingWatchFile = _a.pollingWatchFile, getModifiedTime = _a.getModifiedTime, setTimeout = _a.setTimeout, clearTimeout = _a.clearTimeout, fsWatch = _a.fsWatch, fileExists = _a.fileExists, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, getCurrentDirectory = _a.getCurrentDirectory, fsSupportsRecursiveFsWatch = _a.fsSupportsRecursiveFsWatch, directoryExists = _a.directoryExists, getAccessibleSortedChildDirectories = _a.getAccessibleSortedChildDirectories, realpath = _a.realpath, tscWatchFile = _a.tscWatchFile, useNonPollingWatchers = _a.useNonPollingWatchers, tscWatchDirectory = _a.tscWatchDirectory, defaultWatchFileKind = _a.defaultWatchFileKind;
         var dynamicPollingWatchFile;
         var fixedChunkSizePollingWatchFile;
         var nonPollingWatchFile;
@@ -6595,7 +6599,7 @@ var ts;
                 case ts.WatchFileKind.FixedChunkSizePolling:
                     return ensureFixedChunkSizePollingWatchFile()(fileName, callback, /* pollingInterval */ undefined, /*options*/ undefined);
                 case ts.WatchFileKind.UseFsEvents:
-                    return fsWatch(fileName, 0 /* File */, createFsWatchCallbackForFileWatcherCallback(fileName, callback, getModifiedTime), 
+                    return fsWatch(fileName, 0 /* File */, createFsWatchCallbackForFileWatcherCallback(fileName, callback, fileExists), 
                     /*recursive*/ false, pollingInterval, ts.getFallbackOptions(options));
                 case ts.WatchFileKind.UseFsEventsOnParentDirectory:
                     if (!nonPollingWatchFile) {
@@ -6777,6 +6781,7 @@ var ts;
                 fsWatch: fsWatch,
                 useCaseSensitiveFileNames: useCaseSensitiveFileNames,
                 getCurrentDirectory: getCurrentDirectory,
+                fileExists: fileExists,
                 // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
                 // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
                 fsSupportsRecursiveFsWatch: fsSupportsRecursiveFsWatch,
@@ -7036,7 +7041,7 @@ var ts;
                         // File changed
                         eventKind = FileWatcherEventKind.Changed;
                     }
-                    callback(fileName, eventKind, curr.mtime);
+                    callback(fileName, eventKind);
                 }
             }
             function fsWatch(fileOrDirectory, entryKind, callback, recursive, fallbackPollingInterval, fallbackOptions) {
@@ -7062,10 +7067,10 @@ var ts;
                  * Invoke the callback with rename and update the watcher if not closed
                  * @param createWatcher
                  */
-                function invokeCallbackAndUpdateWatcher(createWatcher, modifiedTime) {
+                function invokeCallbackAndUpdateWatcher(createWatcher) {
                     sysLog("sysLog:: " + fileOrDirectory + ":: Changing watcher to " + (createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing") + "FileSystemEntryWatcher");
                     // Call the callback for current directory
-                    callback("rename", "", modifiedTime);
+                    callback("rename", "");
                     // If watcher is not closed, update it
                     if (watcher) {
                         watcher.close();
@@ -7111,14 +7116,13 @@ var ts;
                 function callbackChangingToMissingFileSystemEntry(event, relativeName) {
                     // because relativeName is not guaranteed to be correct we need to check on each rename with few combinations
                     // Eg on ubuntu while watching app/node_modules the relativeName is "node_modules" which is neither relative nor full path
-                    var modifiedTime = getModifiedTime(fileOrDirectory) || ts.missingFileModifiedTime;
                     return event === "rename" &&
                         (!relativeName ||
                             relativeName === lastDirectoryPart ||
                             (relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator) !== -1 && relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator) === relativeName.length - lastDirectoryPartWithDirectorySeparator.length)) &&
-                        modifiedTime === ts.missingFileModifiedTime ?
-                        invokeCallbackAndUpdateWatcher(watchMissingFileSystemEntry, modifiedTime) :
-                        callback(event, relativeName, modifiedTime);
+                        !fileSystemEntryExists(fileOrDirectory, entryKind) ?
+                        invokeCallbackAndUpdateWatcher(watchMissingFileSystemEntry) :
+                        callback(event, relativeName);
                 }
                 /**
                  * Watch the file or directory using fs.watchFile since fs.watch threw exception
@@ -7132,15 +7136,12 @@ var ts;
                  * and switch to existing file or directory when the missing filesystem entry is created
                  */
                 function watchMissingFileSystemEntry() {
-                    return watchFile(fileOrDirectory, function (_fileName, eventKind, modifiedTime) {
-                        if (eventKind === FileWatcherEventKind.Created) {
-                            modifiedTime || (modifiedTime = getModifiedTime(fileOrDirectory) || ts.missingFileModifiedTime);
-                            if (modifiedTime !== ts.missingFileModifiedTime) {
-                                // Call the callback for current file or directory
-                                // For now it could be callback for the inner directory creation,
-                                // but just return current directory, better than current no-op
-                                invokeCallbackAndUpdateWatcher(watchPresentFileSystemEntry, modifiedTime);
-                            }
+                    return watchFile(fileOrDirectory, function (_fileName, eventKind) {
+                        if (eventKind === FileWatcherEventKind.Created && fileSystemEntryExists(fileOrDirectory, entryKind)) {
+                            // Call the callback for current file or directory
+                            // For now it could be callback for the inner directory creation,
+                            // but just return current directory, better than current no-op
+                            invokeCallbackAndUpdateWatcher(watchPresentFileSystemEntry);
                         }
                     }, fallbackPollingInterval, fallbackOptions);
                 }
@@ -7290,19 +7291,12 @@ var ts;
             }
             function getModifiedTime(path) {
                 var _a;
-                // Since the error thrown by fs.statSync isn't used, we can avoid collecting a stack trace to improve
-                // the CPU time performance.
-                var originalStackTraceLimit = Error.stackTraceLimit;
-                Error.stackTraceLimit = 0;
                 try {
                     return (_a = statSync(path)) === null || _a === void 0 ? void 0 : _a.mtime;
                 }
                 catch (e) {
                     return undefined;
                 }
-                finally {
-                    Error.stackTraceLimit = originalStackTraceLimit;
-                }
             }
             function setModifiedTime(path, time) {
                 try {
@@ -8428,6 +8422,7 @@ var ts;
         Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1: diag(2205, ts.DiagnosticCategory.Error, "Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1_2205", "Construct signatures with no arguments have incompatible return types '{0}' and '{1}'.", /*reportsUnnecessary*/ undefined, /*elidedInCompatabilityPyramid*/ true),
         The_type_modifier_cannot_be_used_on_a_named_import_when_import_type_is_used_on_its_import_statement: diag(2206, ts.DiagnosticCategory.Error, "The_type_modifier_cannot_be_used_on_a_named_import_when_import_type_is_used_on_its_import_statement_2206", "The 'type' modifier cannot be used on a named import when 'import type' is used on its import statement."),
         The_type_modifier_cannot_be_used_on_a_named_export_when_export_type_is_used_on_its_export_statement: diag(2207, ts.DiagnosticCategory.Error, "The_type_modifier_cannot_be_used_on_a_named_export_when_export_type_is_used_on_its_export_statement_2207", "The 'type' modifier cannot be used on a named export when 'export type' is used on its export statement."),
+        This_type_parameter_probably_needs_an_extends_object_constraint: diag(2208, ts.DiagnosticCategory.Error, "This_type_parameter_probably_needs_an_extends_object_constraint_2208", "This type parameter probably needs an `extends object` constraint."),
         The_project_root_is_ambiguous_but_is_required_to_resolve_export_map_entry_0_in_file_1_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2209, ts.DiagnosticCategory.Error, "The_project_root_is_ambiguous_but_is_required_to_resolve_export_map_entry_0_in_file_1_Supply_the_roo_2209", "The project root is ambiguous, but is required to resolve export map entry '{0}' in file '{1}'. Supply the `rootDir` compiler option to disambiguate."),
         The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2210, ts.DiagnosticCategory.Error, "The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_roo_2210", "The project root is ambiguous, but is required to resolve import map entry '{0}' in file '{1}'. Supply the `rootDir` compiler option to disambiguate."),
         Duplicate_identifier_0: diag(2300, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
@@ -9323,8 +9318,8 @@ var ts;
         Cannot_prepend_project_0_because_it_does_not_have_outFile_set: diag(6308, ts.DiagnosticCategory.Error, "Cannot_prepend_project_0_because_it_does_not_have_outFile_set_6308", "Cannot prepend project '{0}' because it does not have 'outFile' set"),
         Output_file_0_from_project_1_does_not_exist: diag(6309, ts.DiagnosticCategory.Error, "Output_file_0_from_project_1_does_not_exist_6309", "Output file '{0}' from project '{1}' does not exist"),
         Referenced_project_0_may_not_disable_emit: diag(6310, ts.DiagnosticCategory.Error, "Referenced_project_0_may_not_disable_emit_6310", "Referenced project '{0}' may not disable emit."),
-        Project_0_is_out_of_date_because_output_1_is_older_than_input_2: diag(6350, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_output_1_is_older_than_input_2_6350", "Project '{0}' is out of date because output '{1}' is older than input '{2}'"),
-        Project_0_is_up_to_date_because_newest_input_1_is_older_than_output_2: diag(6351, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_because_newest_input_1_is_older_than_output_2_6351", "Project '{0}' is up to date because newest input '{1}' is older than output '{2}'"),
+        Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2: diag(6350, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2_6350", "Project '{0}' is out of date because oldest output '{1}' is older than newest input '{2}'"),
+        Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2: diag(6351, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2_6351", "Project '{0}' is up to date because newest input '{1}' is older than oldest output '{2}'"),
         Project_0_is_out_of_date_because_output_file_1_does_not_exist: diag(6352, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_output_file_1_does_not_exist_6352", "Project '{0}' is out of date because output file '{1}' does not exist"),
         Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date: diag(6353, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date_6353", "Project '{0}' is out of date because its dependency '{1}' is out of date"),
         Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies: diag(6354, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies_6354", "Project '{0}' is up to date with .d.ts files from its dependencies"),
@@ -9368,8 +9363,6 @@ var ts;
         Reusing_resolution_of_type_reference_directive_0_from_1_found_in_cache_from_location_2_it_was_successfully_resolved_to_3: diag(6396, ts.DiagnosticCategory.Message, "Reusing_resolution_of_type_reference_directive_0_from_1_found_in_cache_from_location_2_it_was_succes_6396", "Reusing resolution of type reference directive '{0}' from '{1}' found in cache from location '{2}', it was successfully resolved to '{3}'."),
         Reusing_resolution_of_type_reference_directive_0_from_1_found_in_cache_from_location_2_it_was_successfully_resolved_to_3_with_Package_ID_4: diag(6397, ts.DiagnosticCategory.Message, "Reusing_resolution_of_type_reference_directive_0_from_1_found_in_cache_from_location_2_it_was_succes_6397", "Reusing resolution of type reference directive '{0}' from '{1}' found in cache from location '{2}', it was successfully resolved to '{3}' with Package ID '{4}'."),
         Reusing_resolution_of_type_reference_directive_0_from_1_found_in_cache_from_location_2_it_was_not_resolved: diag(6398, ts.DiagnosticCategory.Message, "Reusing_resolution_of_type_reference_directive_0_from_1_found_in_cache_from_location_2_it_was_not_re_6398", "Reusing resolution of type reference directive '{0}' from '{1}' found in cache from location '{2}', it was not resolved."),
-        Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_are_not_emitted: diag(6399, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_are_not_emitted_6399", "Project '{0}' is out of date because buildinfo file '{1}' indicates that some of the changes are not emitted"),
-        Project_0_is_up_to_date_but_needs_update_to_timestamps_of_output_files_that_are_older_than_input_files: diag(6400, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_but_needs_update_to_timestamps_of_output_files_that_are_older_than_input_fil_6400", "Project '{0}' is up to date but needs update to timestamps of output files that are older than input files"),
         The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"),
         The_expected_type_comes_from_this_index_signature: diag(6501, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."),
         The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."),
@@ -20199,10 +20192,6 @@ var ts;
         return optionsHaveChanges(oldOptions, newOptions, ts.affectsEmitOptionDeclarations);
     }
     ts.compilerOptionsAffectEmit = compilerOptionsAffectEmit;
-    function compilerOptionsAffectDeclarationPath(newOptions, oldOptions) {
-        return optionsHaveChanges(oldOptions, newOptions, ts.affectsDeclarationPathOptionDeclarations);
-    }
-    ts.compilerOptionsAffectDeclarationPath = compilerOptionsAffectDeclarationPath;
     function getCompilerOptionValue(options, option) {
         return option.strictFlag ? getStrictOptionValue(options, option.name) : options[option.name];
     }
@@ -39243,7 +39232,6 @@ var ts;
             type: "boolean",
             affectsSemanticDiagnostics: true,
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Watch_and_Build_Modes,
             description: ts.Diagnostics.Have_recompiles_in_projects_that_use_incremental_and_watch_mode_assume_that_changes_within_a_file_will_only_affect_files_directly_depending_on_it,
             defaultValueDescription: false,
@@ -39278,40 +39266,12 @@ var ts;
         affectsSourceFile: true,
         affectsModuleResolution: true,
         affectsEmit: true,
-        affectsMultiFileEmitBuildInfo: true,
         paramType: ts.Diagnostics.VERSION,
         showInSimplifiedHelpView: true,
         category: ts.Diagnostics.Language_and_Environment,
         description: ts.Diagnostics.Set_the_JavaScript_language_version_for_emitted_JavaScript_and_include_compatible_library_declarations,
         defaultValueDescription: 0 /* ES3 */,
     };
-    /*@internal*/
-    ts.moduleOptionDeclaration = {
-        name: "module",
-        shortName: "m",
-        type: new ts.Map(ts.getEntries({
-            none: ts.ModuleKind.None,
-            commonjs: ts.ModuleKind.CommonJS,
-            amd: ts.ModuleKind.AMD,
-            system: ts.ModuleKind.System,
-            umd: ts.ModuleKind.UMD,
-            es6: ts.ModuleKind.ES2015,
-            es2015: ts.ModuleKind.ES2015,
-            es2020: ts.ModuleKind.ES2020,
-            es2022: ts.ModuleKind.ES2022,
-            esnext: ts.ModuleKind.ESNext,
-            node16: ts.ModuleKind.Node16,
-            nodenext: ts.ModuleKind.NodeNext,
-        })),
-        affectsModuleResolution: true,
-        affectsEmit: true,
-        affectsMultiFileEmitBuildInfo: true,
-        paramType: ts.Diagnostics.KIND,
-        showInSimplifiedHelpView: true,
-        category: ts.Diagnostics.Modules,
-        description: ts.Diagnostics.Specify_what_module_code_is_generated,
-        defaultValueDescription: undefined,
-    };
     var commandOptionsWithoutBuild = [
         // CommandLine only options
         {
@@ -39373,14 +39333,37 @@ var ts;
             category: ts.Diagnostics.Command_line_Options,
             affectsSemanticDiagnostics: true,
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             isCommandLineOnly: true,
             description: ts.Diagnostics.Print_names_of_files_that_are_part_of_the_compilation_and_then_stop_processing,
             defaultValueDescription: false,
         },
         // Basic
         ts.targetOptionDeclaration,
-        ts.moduleOptionDeclaration,
+        {
+            name: "module",
+            shortName: "m",
+            type: new ts.Map(ts.getEntries({
+                none: ts.ModuleKind.None,
+                commonjs: ts.ModuleKind.CommonJS,
+                amd: ts.ModuleKind.AMD,
+                system: ts.ModuleKind.System,
+                umd: ts.ModuleKind.UMD,
+                es6: ts.ModuleKind.ES2015,
+                es2015: ts.ModuleKind.ES2015,
+                es2020: ts.ModuleKind.ES2020,
+                es2022: ts.ModuleKind.ES2022,
+                esnext: ts.ModuleKind.ESNext,
+                node16: ts.ModuleKind.Node16,
+                nodenext: ts.ModuleKind.NodeNext,
+            })),
+            affectsModuleResolution: true,
+            affectsEmit: true,
+            paramType: ts.Diagnostics.KIND,
+            showInSimplifiedHelpView: true,
+            category: ts.Diagnostics.Modules,
+            description: ts.Diagnostics.Specify_what_module_code_is_generated,
+            defaultValueDescription: undefined,
+        },
         {
             name: "lib",
             type: "list",
@@ -39417,7 +39400,6 @@ var ts;
             type: jsxOptionMap,
             affectsSourceFile: true,
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             affectsModuleResolution: true,
             paramType: ts.Diagnostics.KIND,
             showInSimplifiedHelpView: true,
@@ -39430,7 +39412,6 @@ var ts;
             shortName: "d",
             type: "boolean",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Emit,
             transpileOptionValue: undefined,
@@ -39441,7 +39422,6 @@ var ts;
             name: "declarationMap",
             type: "boolean",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Emit,
             transpileOptionValue: undefined,
@@ -39452,7 +39432,6 @@ var ts;
             name: "emitDeclarationOnly",
             type: "boolean",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Only_output_d_ts_files_and_not_JavaScript_files,
@@ -39463,7 +39442,6 @@ var ts;
             name: "sourceMap",
             type: "boolean",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Emit,
             defaultValueDescription: false,
@@ -39473,9 +39451,6 @@ var ts;
             name: "outFile",
             type: "string",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
-            affectsDeclarationPath: true,
-            affectsBundleEmitBuildInfo: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
             showInSimplifiedHelpView: true,
@@ -39487,8 +39462,6 @@ var ts;
             name: "outDir",
             type: "string",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
-            affectsDeclarationPath: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             showInSimplifiedHelpView: true,
@@ -39499,8 +39472,6 @@ var ts;
             name: "rootDir",
             type: "string",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
-            affectsDeclarationPath: true,
             isFilePath: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Modules,
@@ -39511,8 +39482,6 @@ var ts;
             name: "composite",
             type: "boolean",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
-            affectsBundleEmitBuildInfo: true,
             isTSConfigOnly: true,
             category: ts.Diagnostics.Projects,
             transpileOptionValue: undefined,
@@ -39523,8 +39492,6 @@ var ts;
             name: "tsBuildInfoFile",
             type: "string",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
-            affectsBundleEmitBuildInfo: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
             category: ts.Diagnostics.Projects,
@@ -39536,7 +39503,6 @@ var ts;
             name: "removeComments",
             type: "boolean",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Emit,
             defaultValueDescription: false,
@@ -39555,7 +39521,6 @@ var ts;
             name: "importHelpers",
             type: "boolean",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Allow_importing_helper_functions_from_tslib_once_per_project_instead_of_including_them_per_file,
             defaultValueDescription: false,
@@ -39569,7 +39534,6 @@ var ts;
             })),
             affectsEmit: true,
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types,
             defaultValueDescription: 0 /* Remove */,
@@ -39578,7 +39542,6 @@ var ts;
             name: "downlevelIteration",
             type: "boolean",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Emit_more_compliant_but_verbose_and_less_performant_JavaScript_for_iteration,
             defaultValueDescription: false,
@@ -39597,9 +39560,6 @@ var ts;
             type: "boolean",
             // Though this affects semantic diagnostics, affectsSemanticDiagnostics is not set here
             // The value of each strictFlag depends on own strictFlag value or this and never accessed directly.
-            // But we need to store `strict` in builf info, even though it won't be examined directly, so that the
-            // flags it controls (e.g. `strictNullChecks`) will be retrieved correctly
-            affectsMultiFileEmitBuildInfo: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Enable_all_strict_type_checking_options,
@@ -39609,7 +39569,6 @@ var ts;
             name: "noImplicitAny",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             strictFlag: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Enable_error_reporting_for_expressions_and_declarations_with_an_implied_any_type,
@@ -39619,7 +39578,6 @@ var ts;
             name: "strictNullChecks",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             strictFlag: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.When_type_checking_take_into_account_null_and_undefined,
@@ -39628,8 +39586,6 @@ var ts;
         {
             name: "strictFunctionTypes",
             type: "boolean",
-            affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             strictFlag: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.When_assigning_functions_check_to_ensure_parameters_and_the_return_values_are_subtype_compatible,
@@ -39638,8 +39594,6 @@ var ts;
         {
             name: "strictBindCallApply",
             type: "boolean",
-            affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             strictFlag: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Check_that_the_arguments_for_bind_call_and_apply_methods_match_the_original_function,
@@ -39649,7 +39603,6 @@ var ts;
             name: "strictPropertyInitialization",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             strictFlag: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Check_for_class_properties_that_are_declared_but_not_set_in_the_constructor,
@@ -39659,7 +39612,6 @@ var ts;
             name: "noImplicitThis",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             strictFlag: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Enable_error_reporting_when_this_is_given_the_type_any,
@@ -39669,7 +39621,6 @@ var ts;
             name: "useUnknownInCatchVariables",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             strictFlag: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Default_catch_clause_variables_as_unknown_instead_of_any,
@@ -39679,8 +39630,6 @@ var ts;
             name: "alwaysStrict",
             type: "boolean",
             affectsSourceFile: true,
-            affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             strictFlag: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Ensure_use_strict_is_always_emitted,
@@ -39691,7 +39640,6 @@ var ts;
             name: "noUnusedLocals",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Enable_error_reporting_when_local_variables_aren_t_read,
             defaultValueDescription: false,
@@ -39700,7 +39648,6 @@ var ts;
             name: "noUnusedParameters",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Raise_an_error_when_a_function_parameter_isn_t_read,
             defaultValueDescription: false,
@@ -39709,7 +39656,6 @@ var ts;
             name: "exactOptionalPropertyTypes",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Interpret_optional_property_types_as_written_rather_than_adding_undefined,
             defaultValueDescription: false,
@@ -39718,7 +39664,6 @@ var ts;
             name: "noImplicitReturns",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Enable_error_reporting_for_codepaths_that_do_not_explicitly_return_in_a_function,
             defaultValueDescription: false,
@@ -39728,7 +39673,6 @@ var ts;
             type: "boolean",
             affectsBindDiagnostics: true,
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Enable_error_reporting_for_fallthrough_cases_in_switch_statements,
             defaultValueDescription: false,
@@ -39737,7 +39681,6 @@ var ts;
             name: "noUncheckedIndexedAccess",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Add_undefined_to_a_type_when_accessed_using_an_index,
             defaultValueDescription: false,
@@ -39746,7 +39689,6 @@ var ts;
             name: "noImplicitOverride",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Ensure_overriding_members_in_derived_classes_are_marked_with_an_override_modifier,
             defaultValueDescription: false,
@@ -39754,8 +39696,6 @@ var ts;
         {
             name: "noPropertyAccessFromIndexSignature",
             type: "boolean",
-            affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             showInSimplifiedHelpView: false,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Enforces_using_indexed_accessors_for_keys_declared_using_an_indexed_type,
@@ -39841,7 +39781,6 @@ var ts;
             name: "allowSyntheticDefaultImports",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Interop_Constraints,
             description: ts.Diagnostics.Allow_import_x_from_y_when_a_module_doesn_t_have_a_default_export,
             defaultValueDescription: ts.Diagnostics.module_system_or_esModuleInterop
@@ -39851,7 +39790,6 @@ var ts;
             type: "boolean",
             affectsSemanticDiagnostics: true,
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Interop_Constraints,
             description: ts.Diagnostics.Emit_additional_JavaScript_to_ease_support_for_importing_CommonJS_modules_This_enables_allowSyntheticDefaultImports_for_type_compatibility,
@@ -39868,7 +39806,6 @@ var ts;
             name: "allowUmdGlobalAccess",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Modules,
             description: ts.Diagnostics.Allow_accessing_UMD_globals_from_modules,
             defaultValueDescription: false,
@@ -39890,7 +39827,6 @@ var ts;
             name: "sourceRoot",
             type: "string",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Specify_the_root_path_for_debuggers_to_find_the_reference_source_code,
@@ -39899,7 +39835,6 @@ var ts;
             name: "mapRoot",
             type: "string",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
@@ -39908,7 +39843,6 @@ var ts;
             name: "inlineSourceMap",
             type: "boolean",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Include_sourcemap_files_inside_the_emitted_JavaScript,
             defaultValueDescription: false,
@@ -39917,7 +39851,6 @@ var ts;
             name: "inlineSources",
             type: "boolean",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Include_source_code_in_the_sourcemaps_inside_the_emitted_JavaScript,
             defaultValueDescription: false,
@@ -39927,7 +39860,6 @@ var ts;
             name: "experimentalDecorators",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Language_and_Environment,
             description: ts.Diagnostics.Enable_experimental_support_for_TC39_stage_2_draft_decorators,
             defaultValueDescription: false,
@@ -39937,7 +39869,6 @@ var ts;
             type: "boolean",
             affectsSemanticDiagnostics: true,
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Language_and_Environment,
             description: ts.Diagnostics.Emit_design_type_metadata_for_decorated_declarations_in_source_files,
             defaultValueDescription: false,
@@ -39962,7 +39893,6 @@ var ts;
             type: "string",
             affectsSemanticDiagnostics: true,
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             affectsModuleResolution: true,
             category: ts.Diagnostics.Language_and_Environment,
             description: ts.Diagnostics.Specify_module_specifier_used_to_import_the_JSX_factory_functions_when_using_jsx_Colon_react_jsx_Asterisk,
@@ -39980,9 +39910,6 @@ var ts;
             name: "out",
             type: "string",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
-            affectsDeclarationPath: true,
-            affectsBundleEmitBuildInfo: true,
             isFilePath: false,
             // for correct behaviour, please use outFile
             category: ts.Diagnostics.Backwards_Compatibility,
@@ -39994,7 +39921,6 @@ var ts;
             name: "reactNamespace",
             type: "string",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Language_and_Environment,
             description: ts.Diagnostics.Specify_the_object_invoked_for_createElement_This_only_applies_when_targeting_react_JSX_emit,
             defaultValueDescription: "`React`",
@@ -40002,8 +39928,6 @@ var ts;
         {
             name: "skipDefaultLibCheck",
             type: "boolean",
-            // We need to store these to determine whether `lib` files need to be rechecked
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Completeness,
             description: ts.Diagnostics.Skip_type_checking_d_ts_files_that_are_included_with_TypeScript,
             defaultValueDescription: false,
@@ -40019,7 +39943,6 @@ var ts;
             name: "emitBOM",
             type: "boolean",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Emit_a_UTF_8_Byte_Order_Mark_BOM_in_the_beginning_of_output_files,
             defaultValueDescription: false,
@@ -40031,7 +39954,6 @@ var ts;
                 lf: 1 /* LineFeed */
             })),
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             paramType: ts.Diagnostics.NEWLINE,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Set_the_newline_character_for_emitting_files,
@@ -40041,7 +39963,6 @@ var ts;
             name: "noErrorTruncation",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Output_Formatting,
             description: ts.Diagnostics.Disable_truncating_types_in_error_messages,
             defaultValueDescription: false,
@@ -40072,7 +39993,6 @@ var ts;
             name: "stripInternal",
             type: "boolean",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Disable_emitting_declarations_that_have_internal_in_their_JSDoc_comments,
             defaultValueDescription: false,
@@ -40113,7 +40033,6 @@ var ts;
             name: "noImplicitUseStrict",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Backwards_Compatibility,
             description: ts.Diagnostics.Disable_adding_use_strict_directives_in_emitted_JavaScript_files,
             defaultValueDescription: false,
@@ -40122,7 +40041,6 @@ var ts;
             name: "noEmitHelpers",
             type: "boolean",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Disable_generating_custom_helper_functions_like_extends_in_compiled_output,
             defaultValueDescription: false,
@@ -40131,7 +40049,6 @@ var ts;
             name: "noEmitOnError",
             type: "boolean",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Emit,
             transpileOptionValue: undefined,
             description: ts.Diagnostics.Disable_emitting_files_if_any_type_checking_errors_are_reported,
@@ -40141,7 +40058,6 @@ var ts;
             name: "preserveConstEnums",
             type: "boolean",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Disable_erasing_const_enum_declarations_in_generated_code,
             defaultValueDescription: false,
@@ -40150,8 +40066,6 @@ var ts;
             name: "declarationDir",
             type: "string",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
-            affectsDeclarationPath: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             category: ts.Diagnostics.Emit,
@@ -40161,8 +40075,6 @@ var ts;
         {
             name: "skipLibCheck",
             type: "boolean",
-            // We need to store these to determine whether `lib` files need to be rechecked
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Completeness,
             description: ts.Diagnostics.Skip_type_checking_all_d_ts_files,
             defaultValueDescription: false,
@@ -40172,7 +40084,6 @@ var ts;
             type: "boolean",
             affectsBindDiagnostics: true,
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Disable_error_reporting_for_unused_labels,
             defaultValueDescription: undefined,
@@ -40182,7 +40093,6 @@ var ts;
             type: "boolean",
             affectsBindDiagnostics: true,
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Disable_error_reporting_for_unreachable_code,
             defaultValueDescription: undefined,
@@ -40191,7 +40101,6 @@ var ts;
             name: "suppressExcessPropertyErrors",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Backwards_Compatibility,
             description: ts.Diagnostics.Disable_reporting_of_excess_property_errors_during_the_creation_of_object_literals,
             defaultValueDescription: false,
@@ -40200,7 +40109,6 @@ var ts;
             name: "suppressImplicitAnyIndexErrors",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Backwards_Compatibility,
             description: ts.Diagnostics.Suppress_noImplicitAny_errors_when_indexing_objects_that_lack_index_signatures,
             defaultValueDescription: false,
@@ -40225,7 +40133,6 @@ var ts;
             name: "noStrictGenericChecks",
             type: "boolean",
             affectsSemanticDiagnostics: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Backwards_Compatibility,
             description: ts.Diagnostics.Disable_strict_checking_of_generic_signatures_in_function_types,
             defaultValueDescription: false,
@@ -40235,7 +40142,6 @@ var ts;
             type: "boolean",
             affectsSemanticDiagnostics: true,
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Language_and_Environment,
             description: ts.Diagnostics.Emit_ECMAScript_standard_compliant_class_fields,
             defaultValueDescription: ts.Diagnostics.true_for_ES2022_and_above_including_ESNext
@@ -40244,7 +40150,6 @@ var ts;
             name: "preserveValueImports",
             type: "boolean",
             affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Preserve_unused_imported_values_in_the_JavaScript_output_that_would_otherwise_be_removed,
             defaultValueDescription: false,
@@ -40288,8 +40193,6 @@ var ts;
     /* @internal */
     ts.affectsEmitOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsEmit; });
     /* @internal */
-    ts.affectsDeclarationPathOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsDeclarationPath; });
-    /* @internal */
     ts.moduleResolutionOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsModuleResolution; });
     /* @internal */
     ts.sourceFileAffectingCompilerOptions = ts.optionDeclarations.filter(function (option) {
@@ -41145,7 +41048,6 @@ var ts;
             return optionDefinition.type;
         }
     }
-    /* @internal */
     function getNameOfCompilerOptionValue(value, customTypeMap) {
         // There is a typeMap associated with this command-line option so use it to map value back to its name
         return ts.forEachEntry(customTypeMap, function (mapValue, key) {
@@ -41154,7 +41056,6 @@ var ts;
             }
         });
     }
-    ts.getNameOfCompilerOptionValue = getNameOfCompilerOptionValue;
     function serializeCompilerOptions(options, pathOptions) {
         return serializeOptionBaseObject(options, getOptionsNameMap(), pathOptions);
     }
@@ -48655,6 +48556,7 @@ var ts;
         var emptyTypeLiteralSymbol = createSymbol(2048 /* TypeLiteral */, "__type" /* Type */);
         emptyTypeLiteralSymbol.members = ts.createSymbolTable();
         var emptyTypeLiteralType = createAnonymousType(emptyTypeLiteralSymbol, emptySymbols, ts.emptyArray, ts.emptyArray, ts.emptyArray);
+        var unknownUnionType = strictNullChecks ? getUnionType([undefinedType, nullType, createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, ts.emptyArray)]) : unknownType;
         var emptyGenericType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, ts.emptyArray);
         emptyGenericType.instantiations = new ts.Map();
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, ts.emptyArray);
@@ -58825,7 +58727,7 @@ var ts;
                         }
                     }
                 }
-                else if (t.flags & 469892092 /* DisjointDomains */) {
+                else if (t.flags & 469892092 /* DisjointDomains */ || isEmptyAnonymousObjectType(t)) {
                     hasDisjointDomainType = true;
                 }
             }
@@ -58837,7 +58739,7 @@ var ts;
                     // intersection operation to reduce the union constraints.
                     for (var _a = 0, types_6 = types; _a < types_6.length; _a++) {
                         var t = types_6[_a];
-                        if (t.flags & 469892092 /* DisjointDomains */) {
+                        if (t.flags & 469892092 /* DisjointDomains */ || isEmptyAnonymousObjectType(t)) {
                             constraints = ts.append(constraints, t);
                         }
                     }
@@ -61386,7 +61288,7 @@ var ts;
             }
             return includes;
         }
-        function removeRedundantPrimitiveTypes(types, includes) {
+        function removeRedundantSupertypes(types, includes) {
             var i = types.length;
             while (i > 0) {
                 i--;
@@ -61394,7 +61296,9 @@ var ts;
                 var remove = t.flags & 4 /* String */ && includes & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) ||
                     t.flags & 8 /* Number */ && includes & 256 /* NumberLiteral */ ||
                     t.flags & 64 /* BigInt */ && includes & 2048 /* BigIntLiteral */ ||
-                    t.flags & 4096 /* ESSymbol */ && includes & 8192 /* UniqueESSymbol */;
+                    t.flags & 4096 /* ESSymbol */ && includes & 8192 /* UniqueESSymbol */ ||
+                    t.flags & 16384 /* Void */ && includes & 32768 /* Undefined */ ||
+                    isEmptyAnonymousObjectType(t) && includes & 470302716 /* DefinitelyNonNullable */;
                 if (remove) {
                     ts.orderedRemoveItemAt(types, i);
                 }
@@ -61516,7 +61420,7 @@ var ts;
         // a type alias of the form "type List<T> = T & { next: List<T> }" cannot be reduced during its declaration.
         // Also, unlike union types, the order of the constituent types is preserved in order that overload resolution
         // for intersections of types with signatures can be deterministic.
-        function getIntersectionType(types, aliasSymbol, aliasTypeArguments) {
+        function getIntersectionType(types, aliasSymbol, aliasTypeArguments, noSupertypeReduction) {
             var typeMembershipMap = new ts.Map();
             var includes = addTypesToIntersection(typeMembershipMap, 0, types);
             var typeSet = ts.arrayFrom(typeMembershipMap.values());
@@ -61553,11 +61457,11 @@ var ts;
             if (includes & 4 /* String */ && includes & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) ||
                 includes & 8 /* Number */ && includes & 256 /* NumberLiteral */ ||
                 includes & 64 /* BigInt */ && includes & 2048 /* BigIntLiteral */ ||
-                includes & 4096 /* ESSymbol */ && includes & 8192 /* UniqueESSymbol */) {
-                removeRedundantPrimitiveTypes(typeSet, includes);
-            }
-            if (includes & 16777216 /* IncludesEmptyObject */ && includes & 524288 /* Object */) {
-                ts.orderedRemoveItemAt(typeSet, ts.findIndex(typeSet, isEmptyAnonymousObjectType));
+                includes & 4096 /* ESSymbol */ && includes & 8192 /* UniqueESSymbol */ ||
+                includes & 16384 /* Void */ && includes & 32768 /* Undefined */ ||
+                includes & 16777216 /* IncludesEmptyObject */ && includes & 470302716 /* DefinitelyNonNullable */) {
+                if (!noSupertypeReduction)
+                    removeRedundantSupertypes(typeSet, includes);
             }
             if (includes & 262144 /* IncludesMissingType */) {
                 typeSet[typeSet.indexOf(undefinedType)] = missingType;
@@ -61596,8 +61500,9 @@ var ts;
                         }
                         var constituents = getCrossProductIntersections(typeSet);
                         // We attach a denormalized origin type when at least one constituent of the cross-product union is an
-                        // intersection (i.e. when the intersection didn't just reduce one or more unions to smaller unions).
-                        var origin = ts.some(constituents, function (t) { return !!(t.flags & 2097152 /* Intersection */); }) ? createOriginUnionOrIntersectionType(2097152 /* Intersection */, typeSet) : undefined;
+                        // intersection (i.e. when the intersection didn't just reduce one or more unions to smaller unions) and
+                        // the denormalized origin has fewer constituents than the union itself.
+                        var origin = ts.some(constituents, function (t) { return !!(t.flags & 2097152 /* Intersection */); }) && getConstituentCountOfTypes(constituents) > getConstituentCountOfTypes(typeSet) ? createOriginUnionOrIntersectionType(2097152 /* Intersection */, typeSet) : undefined;
                         result = getUnionType(constituents, 1 /* Literal */, aliasSymbol, aliasTypeArguments, origin);
                     }
                 }
@@ -61640,11 +61545,21 @@ var ts;
             }
             return intersections;
         }
+        function getConstituentCount(type) {
+            return !(type.flags & 3145728 /* UnionOrIntersection */) || type.aliasSymbol ? 1 :
+                type.flags & 1048576 /* Union */ && type.origin ? getConstituentCount(type.origin) :
+                    getConstituentCountOfTypes(type.types);
+        }
+        function getConstituentCountOfTypes(types) {
+            return ts.reduceLeft(types, function (n, t) { return n + getConstituentCount(t); }, 0);
+        }
         function getTypeFromIntersectionTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
-                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNode), aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol));
+                var types = ts.map(node.types, getTypeFromTypeNode);
+                var noSupertypeReduction = types.length === 2 && !!(types[0].flags & (4 /* String */ | 8 /* Number */ | 64 /* BigInt */)) && types[1] === emptyTypeLiteralType;
+                links.resolvedType = getIntersectionType(types, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol), noSupertypeReduction);
             }
             return links.resolvedType;
         }
@@ -64430,6 +64345,17 @@ var ts;
             return !!(ts.getObjectFlags(type) & 16 /* Anonymous */ && (type.members && isEmptyResolvedType(type) ||
                 type.symbol && type.symbol.flags & 2048 /* TypeLiteral */ && getMembersOfSymbol(type.symbol).size === 0));
         }
+        function isUnknownLikeUnionType(type) {
+            if (strictNullChecks && type.flags & 1048576 /* Union */) {
+                if (!(type.objectFlags & 33554432 /* IsUnknownLikeUnionComputed */)) {
+                    var types = type.types;
+                    type.objectFlags |= 33554432 /* IsUnknownLikeUnionComputed */ | (types.length >= 3 && types[0].flags & 32768 /* Undefined */ &&
+                        types[1].flags & 65536 /* Null */ && ts.some(types, isEmptyAnonymousObjectType) ? 67108864 /* IsUnknownLikeUnion */ : 0);
+                }
+                return !!(type.objectFlags & 67108864 /* IsUnknownLikeUnion */);
+            }
+            return false;
+        }
         function isStringIndexSignatureOnlyType(type) {
             return type.flags & 524288 /* Object */ && !isGenericMappedType(type) && getPropertiesOfType(type).length === 0 && getIndexInfosOfType(type).length === 1 && !!getIndexInfoOfType(type, stringType) ||
                 type.flags & 3145728 /* UnionOrIntersection */ && ts.every(type.types, isStringIndexSignatureOnlyType) ||
@@ -64509,7 +64435,7 @@ var ts;
                 return true;
             if (s & 65536 /* Null */ && (!strictNullChecks && !(t & 3145728 /* UnionOrIntersection */) || t & 65536 /* Null */))
                 return true;
-            if (s & 524288 /* Object */ && t & 67108864 /* NonPrimitive */)
+            if (s & 524288 /* Object */ && t & 67108864 /* NonPrimitive */ && !(relation === strictSubtypeRelation && isEmptyAnonymousObjectType(source)))
                 return true;
             if (relation === assignableRelation || relation === comparableRelation) {
                 if (s & 1 /* Any */)
@@ -64519,6 +64445,9 @@ var ts;
                 // bit-flag enum types sometimes look like literal enum types with numeric literal values.
                 if (s & (8 /* Number */ | 256 /* NumberLiteral */) && !(s & 1024 /* EnumLiteral */) && (t & 32 /* Enum */ || relation === assignableRelation && t & 256 /* NumberLiteral */ && t & 1024 /* EnumLiteral */))
                     return true;
+                // Anything is assignable to a union containing undefined, null, and {}
+                if (isUnknownLikeUnionType(target))
+                    return true;
             }
             return false;
         }
@@ -64561,16 +64490,27 @@ var ts;
         function getNormalizedType(type, writing) {
             while (true) {
                 var t = isFreshLiteralType(type) ? type.regularType :
-                    ts.getObjectFlags(type) & 4 /* Reference */ && type.node ? createTypeReference(type.target, getTypeArguments(type)) :
-                        type.flags & 3145728 /* UnionOrIntersection */ ? getReducedType(type) :
+                    ts.getObjectFlags(type) & 4 /* Reference */ ? type.node ? createTypeReference(type.target, getTypeArguments(type)) : getSingleBaseForNonAugmentingSubtype(type) || type :
+                        type.flags & 3145728 /* UnionOrIntersection */ ? getNormalizedUnionOrIntersectionType(type, writing) :
                             type.flags & 33554432 /* Substitution */ ? writing ? type.baseType : type.substitute :
                                 type.flags & 25165824 /* Simplifiable */ ? getSimplifiedType(type, writing) :
                                     type;
-                t = getSingleBaseForNonAugmentingSubtype(t) || t;
                 if (t === type)
-                    break;
+                    return t;
                 type = t;
             }
+        }
+        function getNormalizedUnionOrIntersectionType(type, writing) {
+            var reduced = getReducedType(type);
+            if (reduced !== type) {
+                return reduced;
+            }
+            if (type.flags & 2097152 /* Intersection */) {
+                var normalizedTypes = ts.sameMap(type.types, function (t) { return getNormalizedType(t, writing); });
+                if (normalizedTypes !== type.types) {
+                    return getIntersectionType(normalizedTypes);
+                }
+            }
             return type;
         }
         /**
@@ -65017,6 +64957,7 @@ var ts;
                 return 0 /* False */;
             }
             function reportErrorResults(originalSource, originalTarget, source, target, headMessage) {
+                var _a, _b;
                 var sourceHasBase = !!getSingleBaseForNonAugmentingSubtype(originalSource);
                 var targetHasBase = !!getSingleBaseForNonAugmentingSubtype(originalTarget);
                 source = (originalSource.aliasSymbol || sourceHasBase) ? originalSource : source;
@@ -65057,6 +64998,9 @@ var ts;
                     return;
                 }
                 reportRelationError(headMessage, source, target);
+                if (strictNullChecks && source.flags & 8650752 /* TypeVariable */ && ((_b = (_a = source.symbol) === null || _a === void 0 ? void 0 : _a.declarations) === null || _b === void 0 ? void 0 : _b[0]) && !getConstraintOfType(source) && isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864 /* NonPrimitive */))) {
+                    associateRelatedInfo(ts.createDiagnosticForNode(source.symbol.declarations[0], ts.Diagnostics.This_type_parameter_probably_needs_an_extends_object_constraint));
+                }
             }
             function traceUnionsOrIntersectionsTooLarge(source, target) {
                 if (!ts.tracing) {
@@ -65843,13 +65787,6 @@ var ts;
                     // IndexedAccess comparisons are handled above in the `targetFlags & TypeFlage.IndexedAccess` branch
                     if (!(sourceFlags & 8388608 /* IndexedAccess */ && targetFlags & 8388608 /* IndexedAccess */)) {
                         var constraint = getConstraintOfType(source) || unknownType;
-                        if (!getConstraintOfType(source) || (sourceFlags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
-                            // A type variable with no constraint is not related to the non-primitive object type.
-                            if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864 /* NonPrimitive */), 3 /* Both */)) {
-                                resetErrorInfo(saveErrorInfo);
-                                return result;
-                            }
-                        }
                         // hi-speed no-this-instantiation check (less accurate, but avoids costly `this`-instantiation when the constraint will suffice), see #28231 for report on why this is needed
                         if (result = isRelatedTo(constraint, target, 1 /* Source */, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState)) {
                             resetErrorInfo(saveErrorInfo);
@@ -67323,9 +67260,11 @@ var ts;
                 return getSupertypeOrUnion(types);
             }
             var primaryTypes = ts.filter(types, function (t) { return !(t.flags & 98304 /* Nullable */); });
-            return primaryTypes.length ?
-                getNullableType(getSupertypeOrUnion(primaryTypes), getFalsyFlagsOfTypes(types) & 98304 /* Nullable */) :
-                getUnionType(types, 2 /* Subtype */);
+            if (primaryTypes.length) {
+                var supertypeOrUnion = getSupertypeOrUnion(primaryTypes);
+                return primaryTypes === types ? supertypeOrUnion : getUnionType(__spreadArray([supertypeOrUnion], ts.filter(types, function (t) { return !!(t.flags & 98304 /* Nullable */); }), true));
+            }
+            return getUnionType(types, 2 /* Subtype */);
         }
         // Return the leftmost type for which no type to the right is a subtype.
         function getCommonSubtype(types) {
@@ -67524,12 +67463,13 @@ var ts;
         // flags for the string, number, boolean, "", 0, false, void, undefined, or null types respectively. Returns
         // no flags for all other types (including non-falsy literal types).
         function getFalsyFlags(type) {
-            return type.flags & 1048576 /* Union */ ? getFalsyFlagsOfTypes(type.types) :
-                type.flags & 128 /* StringLiteral */ ? type.value === "" ? 128 /* StringLiteral */ : 0 :
-                    type.flags & 256 /* NumberLiteral */ ? type.value === 0 ? 256 /* NumberLiteral */ : 0 :
-                        type.flags & 2048 /* BigIntLiteral */ ? isZeroBigInt(type) ? 2048 /* BigIntLiteral */ : 0 :
-                            type.flags & 512 /* BooleanLiteral */ ? (type === falseType || type === regularFalseType) ? 512 /* BooleanLiteral */ : 0 :
-                                type.flags & 117724 /* PossiblyFalsy */;
+            var t = type.flags & 2097152 /* Intersection */ ? getBaseConstraintOrType(type) : type;
+            return t.flags & 1048576 /* Union */ ? getFalsyFlagsOfTypes(t.types) :
+                t.flags & 128 /* StringLiteral */ ? t.value === "" ? 128 /* StringLiteral */ : 0 :
+                    t.flags & 256 /* NumberLiteral */ ? t.value === 0 ? 256 /* NumberLiteral */ : 0 :
+                        t.flags & 2048 /* BigIntLiteral */ ? isZeroBigInt(t) ? 2048 /* BigIntLiteral */ : 0 :
+                            t.flags & 512 /* BooleanLiteral */ ? (t === falseType || t === regularFalseType) ? 512 /* BooleanLiteral */ : 0 :
+                                t.flags & 117724 /* PossiblyFalsy */;
         }
         function removeDefinitelyFalsyTypes(type) {
             return getFalsyFlags(type) & 117632 /* DefinitelyFalsy */ ?
@@ -67569,20 +67509,22 @@ var ts;
             return type.flags & 32768 /* Undefined */ ? type : getUnionType([type, isProperty ? missingType : undefinedType]);
         }
         function getGlobalNonNullableTypeInstantiation(type) {
-            // First reduce away any constituents that are assignable to 'undefined' or 'null'. This not only eliminates
-            // 'undefined' and 'null', but also higher-order types such as a type parameter 'U extends undefined | null'
-            // that isn't eliminated by a NonNullable<T> instantiation.
-            var reducedType = getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
             if (!deferredGlobalNonNullableTypeAlias) {
                 deferredGlobalNonNullableTypeAlias = getGlobalSymbol("NonNullable", 524288 /* TypeAlias */, /*diagnostic*/ undefined) || unknownSymbol;
             }
-            // If the NonNullable<T> type is available, return an instantiation. Otherwise just return the reduced type.
             return deferredGlobalNonNullableTypeAlias !== unknownSymbol ?
-                getTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [reducedType]) :
-                reducedType;
+                getTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [type]) :
+                getIntersectionType([type, emptyObjectType]);
         }
         function getNonNullableType(type) {
-            return strictNullChecks ? getGlobalNonNullableTypeInstantiation(type) : type;
+            if (strictNullChecks) {
+                // First reduce away any constituents that are assignable to 'undefined' or 'null'. This not only eliminates
+                // 'undefined' and 'null', but also higher-order types such as a type parameter 'U extends undefined | null'
+                // that isn't eliminated by a NonNullable<T> instantiation.
+                var reducedType = getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
+                return maybeTypeOfKind(reducedType, 465829888 /* Instantiable */) ? getGlobalNonNullableTypeInstantiation(reducedType) : reducedType;
+            }
+            return type;
         }
         function addOptionalTypeMarker(type) {
             return strictNullChecks ? getUnionType([type, optionalType]) : type;
@@ -69690,6 +69632,24 @@ var ts;
         function getTypeWithFacts(type, include) {
             return filterType(type, function (t) { return (getTypeFacts(t) & include) !== 0; });
         }
+        function getIntersectionWithFacts(type, facts) {
+            var reduced = recombineUnknownType(getTypeWithFacts(strictNullChecks && type.flags & 2 /* Unknown */ ? unknownUnionType : type, facts));
+            if (strictNullChecks) {
+                switch (facts) {
+                    case 524288 /* NEUndefined */:
+                        return mapType(reduced, function (t) { return getTypeFacts(t) & 65536 /* EQUndefined */ ? getIntersectionType([t, getTypeFacts(t) & 131072 /* EQNull */ && !maybeTypeOfKind(reduced, 65536 /* Null */) ? getUnionType([emptyObjectType, nullType]) : emptyObjectType]) : t; });
+                    case 1048576 /* NENull */:
+                        return mapType(reduced, function (t) { return getTypeFacts(t) & 131072 /* EQNull */ ? getIntersectionType([t, getTypeFacts(t) & 65536 /* EQUndefined */ && !maybeTypeOfKind(reduced, 32768 /* Undefined */) ? getUnionType([emptyObjectType, undefinedType]) : emptyObjectType]) : t; });
+                    case 2097152 /* NEUndefinedOrNull */:
+                    case 4194304 /* Truthy */:
+                        return mapType(reduced, function (t) { return getTypeFacts(t) & 262144 /* EQUndefinedOrNull */ ? getGlobalNonNullableTypeInstantiation(t) : t; });
+                }
+            }
+            return reduced;
+        }
+        function recombineUnknownType(type) {
+            return type === unknownUnionType ? unknownType : type;
+        }
         function getTypeWithDefault(type, defaultExpression) {
             return defaultExpression ?
                 getUnionType([getNonUndefinedType(type), getTypeOfExpression(defaultExpression)]) :
@@ -70747,7 +70707,7 @@ var ts;
                 if (isEvolvingArrayTypeList(types)) {
                     return getEvolvingArrayType(getUnionType(ts.map(types, getElementTypeOfEvolvingArrayType)));
                 }
-                var result = getUnionType(ts.sameMap(types, finalizeEvolvingArrayType), subtypeReduction);
+                var result = recombineUnknownType(getUnionType(ts.sameMap(types, finalizeEvolvingArrayType), subtypeReduction));
                 if (result !== declaredType && result.flags & declaredType.flags & 1048576 /* Union */ && ts.arraysEqual(result.types, declaredType.types)) {
                     return declaredType;
                 }
@@ -70849,8 +70809,7 @@ var ts;
             }
             function narrowTypeByTruthiness(type, expr, assumeTrue) {
                 if (isMatchingReference(reference, expr)) {
-                    return type.flags & 2 /* Unknown */ && assumeTrue ? nonNullUnknownType :
-                        getTypeWithFacts(type, assumeTrue ? 4194304 /* Truthy */ : 8388608 /* Falsy */);
+                    return getIntersectionWithFacts(type, assumeTrue ? 4194304 /* Truthy */ : 8388608 /* Falsy */);
                 }
                 if (strictNullChecks && assumeTrue && optionalChainContainsReference(expr, reference)) {
                     type = getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
@@ -71003,9 +70962,6 @@ var ts;
                     assumeTrue = !assumeTrue;
                 }
                 var valueType = getTypeOfExpression(value);
-                if (assumeTrue && (type.flags & 2 /* Unknown */) && (operator === 34 /* EqualsEqualsToken */ || operator === 35 /* ExclamationEqualsToken */) && (valueType.flags & 65536 /* Null */)) {
-                    return getUnionType([nullType, undefinedType]);
-                }
                 if ((type.flags & 2 /* Unknown */) && assumeTrue && (operator === 36 /* EqualsEqualsEqualsToken */ || operator === 37 /* ExclamationEqualsEqualsToken */)) {
                     if (valueType.flags & (131068 /* Primitive */ | 67108864 /* NonPrimitive */)) {
                         return valueType;
@@ -71025,7 +70981,7 @@ var ts;
                         valueType.flags & 65536 /* Null */ ?
                             assumeTrue ? 131072 /* EQNull */ : 1048576 /* NENull */ :
                             assumeTrue ? 65536 /* EQUndefined */ : 524288 /* NEUndefined */;
-                    return type.flags & 2 /* Unknown */ && facts & (1048576 /* NENull */ | 2097152 /* NEUndefinedOrNull */) ? nonNullUnknownType : getTypeWithFacts(type, facts);
+                    return getIntersectionWithFacts(type, facts);
                 }
                 if (assumeTrue) {
                     var filterFn = operator === 34 /* EqualsEqualsToken */ ?
@@ -71053,17 +71009,11 @@ var ts;
                 if (type.flags & 1 /* Any */ && literal.text === "function") {
                     return type;
                 }
-                if (assumeTrue && type.flags & 2 /* Unknown */ && literal.text === "object") {
-                    // The non-null unknown type is used to track whether a previous narrowing operation has removed the null type
-                    // from the unknown type. For example, the expression `x && typeof x === 'object'` first narrows x to the non-null
-                    // unknown type, and then narrows that to the non-primitive type.
-                    return type === nonNullUnknownType ? nonPrimitiveType : getUnionType([nonPrimitiveType, nullType]);
-                }
                 var facts = assumeTrue ?
                     typeofEQFacts.get(literal.text) || 128 /* TypeofEQHostObject */ :
                     typeofNEFacts.get(literal.text) || 32768 /* TypeofNEHostObject */;
                 var impliedType = getImpliedTypeFromTypeofGuard(type, literal.text);
-                return getTypeWithFacts(assumeTrue && impliedType ? mapType(type, narrowUnionMemberByTypeof(impliedType)) : type, facts);
+                return getTypeWithFacts(assumeTrue && impliedType ? narrowTypeByImpliedType(type, impliedType) : type, facts);
             }
             function narrowTypeBySwitchOptionalChainContainment(type, switchStatement, clauseStart, clauseEnd, clauseCheck) {
                 var everyClauseChecks = clauseStart !== clauseEnd && ts.every(getSwitchClauseTypes(switchStatement).slice(clauseStart, clauseEnd), clauseCheck);
@@ -71112,10 +71062,10 @@ var ts;
             }
             function getImpliedTypeFromTypeofGuard(type, text) {
                 switch (text) {
+                    case "object":
+                        return type.flags & 1 /* Any */ ? type : getUnionType([nullType, nonPrimitiveType]);
                     case "function":
                         return type.flags & 1 /* Any */ ? type : globalFunctionType;
-                    case "object":
-                        return type.flags & 2 /* Unknown */ ? getUnionType([nonPrimitiveType, nullType]) : type;
                     default:
                         return typeofTypesByName.get(text);
                 }
@@ -71126,22 +71076,27 @@ var ts;
             // the guard. For example: narrowing `{} | undefined` by `"boolean"` should produce the type `boolean`, not
             // the filtered type `{}`. For this reason we narrow constituents of the union individually, in addition to
             // filtering by type-facts.
-            function narrowUnionMemberByTypeof(candidate) {
-                return function (type) {
-                    if (isTypeSubtypeOf(type, candidate)) {
-                        return type;
-                    }
-                    if (isTypeSubtypeOf(candidate, type)) {
-                        return candidate;
+            function narrowTypeByImpliedType(type, candidate) {
+                if (type.flags & 3 /* AnyOrUnknown */) {
+                    return candidate;
+                }
+                return mapType(type, function (t) {
+                    if (isTypeRelatedTo(t, candidate, strictSubtypeRelation)) {
+                        return t;
                     }
-                    if (type.flags & 465829888 /* Instantiable */) {
-                        var constraint = getBaseConstraintOfType(type) || anyType;
-                        if (isTypeSubtypeOf(candidate, constraint)) {
-                            return getIntersectionType([type, candidate]);
+                    return mapType(candidate, function (c) {
+                        if (!areTypesComparable(t, c)) {
+                            return neverType;
                         }
-                    }
-                    return type;
-                };
+                        if (c.flags & 131068 /* Primitive */ && t.flags & 524288 /* Object */ && !isEmptyAnonymousObjectType(t)) {
+                            return isTypeSubtypeOf(c, t) ? c : neverType;
+                        }
+                        if (c === globalFunctionType && isTypeSubtypeOf(c, t)) {
+                            return c;
+                        }
+                        return getIntersectionType([t, c]);
+                    });
+                });
             }
             function narrowBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
                 var switchWitnesses = getSwitchClauseTypeOfWitnesses(switchStatement, /*retainDefault*/ true);
@@ -71200,7 +71155,7 @@ var ts;
                   because it is caught in the first clause.
                 */
                 var impliedType = getTypeWithFacts(getUnionType(clauseWitnesses.map(function (text) { return getImpliedTypeFromTypeofGuard(type, text) || type; })), switchFacts);
-                return getTypeWithFacts(mapType(type, narrowUnionMemberByTypeof(impliedType)), switchFacts);
+                return getTypeWithFacts(narrowTypeByImpliedType(type, impliedType), switchFacts);
             }
             function isMatchingConstructorReference(expr) {
                 return (ts.isPropertyAccessExpression(expr) && ts.idText(expr.name) === "constructor" ||
@@ -71504,7 +71459,9 @@ var ts;
                     !(someType(type, isGenericTypeWithoutNullableConstraint) && isGenericIndexType(getTypeOfExpression(parent.argumentExpression)));
         }
         function isGenericTypeWithUnionConstraint(type) {
-            return !!(type.flags & 465829888 /* Instantiable */ && getBaseConstraintOrType(type).flags & (98304 /* Nullable */ | 1048576 /* Union */));
+            return type.flags & 2097152 /* Intersection */ ?
+                ts.some(type.types, isGenericTypeWithUnionConstraint) :
+                !!(type.flags & 465829888 /* Instantiable */ && getBaseConstraintOrType(type).flags & (98304 /* Nullable */ | 1048576 /* Union */));
         }
         function isGenericTypeWithoutNullableConstraint(type) {
             return !!(type.flags & 465829888 /* Instantiable */ && !maybeTypeOfKind(getBaseConstraintOrType(type), 98304 /* Nullable */));
@@ -71532,7 +71489,7 @@ var ts;
             var substituteConstraints = !(checkMode && checkMode & 2 /* Inferential */) &&
                 someType(type, isGenericTypeWithUnionConstraint) &&
                 (isConstraintPosition(type, reference) || hasContextualTypeWithNoGenericTypes(reference, checkMode));
-            return substituteConstraints ? mapType(type, function (t) { return t.flags & 465829888 /* Instantiable */ ? getBaseConstraintOrType(t) : t; }) : type;
+            return substituteConstraints ? mapType(type, getBaseConstraintOrType) : type;
         }
         function isExportOrExportExpression(location) {
             return !!ts.findAncestor(location, function (n) {
@@ -82632,7 +82589,7 @@ var ts;
             // For a binding pattern, validate the initializer and exit
             if (ts.isBindingPattern(node.name)) {
                 var needCheckInitializer = node.initializer && node.parent.parent.kind !== 243 /* ForInStatement */;
-                var needCheckWidenedType = node.name.elements.length === 0;
+                var needCheckWidenedType = !ts.some(node.name.elements, ts.not(ts.isOmittedExpression));
                 if (needCheckInitializer || needCheckWidenedType) {
                     // Don't validate for-in initializer as it is already an error
                     var widenedType = getWidenedTypeForVariableLikeDeclaration(node);
@@ -110380,8 +110337,7 @@ var ts;
                 return;
             }
             var version = ts.version; // Extracted into a const so the form is stable between namespace and module
-            var buildInfo = { bundle: bundle, program: program, version: version };
-            ts.writeFile(host, emitterDiagnostics, buildInfoPath, getBuildInfoText(buildInfo), /*writeByteOrderMark*/ false, /*sourceFiles*/ undefined, { buildInfo: buildInfo });
+            ts.writeFile(host, emitterDiagnostics, buildInfoPath, getBuildInfoText({ bundle: bundle, program: program, version: version }), /*writeByteOrderMark*/ false);
         }
         function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo) {
             if (!sourceFileOrBundle || emitOnlyDtsFiles || !jsFilePath) {
@@ -110535,18 +110491,13 @@ var ts;
                 if (sourceMapFilePath) {
                     var sourceMap = sourceMapGenerator.toString();
                     ts.writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap, /*writeByteOrderMark*/ false, sourceFiles);
-                    if (printer.bundleFileInfo)
-                        printer.bundleFileInfo.mapHash = ts.BuilderState.computeSignature(sourceMap, ts.maybeBind(host, host.createHash));
                 }
             }
             else {
                 writer.writeLine();
             }
             // Write the output file
-            var text = writer.getText();
-            ts.writeFile(host, emitterDiagnostics, jsFilePath, text, !!compilerOptions.emitBOM, sourceFiles, { sourceMapUrlPos: sourceMapUrlPos });
-            if (printer.bundleFileInfo)
-                printer.bundleFileInfo.hash = ts.BuilderState.computeSignature(text, ts.maybeBind(host, host.createHash));
+            ts.writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), !!compilerOptions.emitBOM, sourceFiles, { sourceMapUrlPos: sourceMapUrlPos });
             // Reset state
             writer.clear();
         }
@@ -110689,54 +110640,34 @@ var ts;
     }
     /*@internal*/
     function emitUsingBuildInfo(config, host, getCommandLine, customTransformers) {
-        var createHash = ts.maybeBind(host, host.createHash);
         var _a = getOutputPathsForBundle(config.options, /*forceDtsPaths*/ false), buildInfoPath = _a.buildInfoPath, jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath;
-        var buildInfo;
-        if (host.getBuildInfo) {
-            var hostBuildInfo = host.getBuildInfo(buildInfoPath, config.options.configFilePath);
-            if (!hostBuildInfo)
-                return buildInfoPath;
-            buildInfo = hostBuildInfo;
-        }
-        else {
-            var buildInfoText = host.readFile(buildInfoPath);
-            if (!buildInfoText)
-                return buildInfoPath;
-            buildInfo = getBuildInfo(buildInfoText);
-        }
-        if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationFilePath && !buildInfo.bundle.dts))
+        var buildInfoText = host.readFile(ts.Debug.checkDefined(buildInfoPath));
+        if (!buildInfoText)
             return buildInfoPath;
         var jsFileText = host.readFile(ts.Debug.checkDefined(jsFilePath));
         if (!jsFileText)
             return jsFilePath;
-        if (ts.BuilderState.computeSignature(jsFileText, createHash) !== buildInfo.bundle.js.hash)
-            return jsFilePath;
         var sourceMapText = sourceMapFilePath && host.readFile(sourceMapFilePath);
         // error if no source map or for now if inline sourcemap
         if ((sourceMapFilePath && !sourceMapText) || config.options.inlineSourceMap)
             return sourceMapFilePath || "inline sourcemap decoding";
-        if (sourceMapFilePath && ts.BuilderState.computeSignature(sourceMapText, createHash) !== buildInfo.bundle.js.mapHash)
-            return sourceMapFilePath;
         // read declaration text
         var declarationText = declarationFilePath && host.readFile(declarationFilePath);
         if (declarationFilePath && !declarationText)
             return declarationFilePath;
-        if (declarationFilePath && ts.BuilderState.computeSignature(declarationText, createHash) !== buildInfo.bundle.dts.hash)
-            return declarationFilePath;
         var declarationMapText = declarationMapPath && host.readFile(declarationMapPath);
         // error if no source map or for now if inline sourcemap
         if ((declarationMapPath && !declarationMapText) || config.options.inlineSourceMap)
             return declarationMapPath || "inline sourcemap decoding";
-        if (declarationMapPath && ts.BuilderState.computeSignature(declarationMapText, createHash) !== buildInfo.bundle.dts.mapHash)
-            return declarationMapPath;
+        var buildInfo = getBuildInfo(buildInfoText);
+        if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationText && !buildInfo.bundle.dts))
+            return buildInfoPath;
         var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
         var ownPrependInput = ts.createInputFiles(jsFileText, declarationText, sourceMapFilePath, sourceMapText, declarationMapPath, declarationMapText, jsFilePath, declarationFilePath, buildInfoPath, buildInfo, 
         /*onlyOwnText*/ true);
         var outputFiles = [];
         var prependNodes = ts.createPrependNodes(config.projectReferences, getCommandLine, function (f) { return host.readFile(f); });
         var sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle, buildInfoDirectory, host);
-        var changedDtsText;
-        var changedDtsData;
         var emitHost = {
             getPrependNodes: ts.memoize(function () { return __spreadArray(__spreadArray([], prependNodes, true), [ownPrependInput], false); }),
             getCanonicalFileName: host.getCanonicalFileName,
@@ -110752,7 +110683,7 @@ var ts;
             getResolvedProjectReferenceToRedirect: ts.returnUndefined,
             getProjectReferenceRedirect: ts.returnUndefined,
             isSourceOfProjectReferenceRedirect: ts.returnFalse,
-            writeFile: function (name, text, writeByteOrderMark, _onError, _sourceFiles, data) {
+            writeFile: function (name, text, writeByteOrderMark) {
                 switch (name) {
                     case jsFilePath:
                         if (jsFileText === text)
@@ -110763,13 +110694,8 @@ var ts;
                             return;
                         break;
                     case buildInfoPath:
-                        var newBuildInfo = data.buildInfo;
+                        var newBuildInfo = getBuildInfo(text);
                         newBuildInfo.program = buildInfo.program;
-                        if (newBuildInfo.program && changedDtsText !== undefined && config.options.composite) {
-                            // Update the output signature
-                            newBuildInfo.program.outSignature = ts.computeSignature(changedDtsText, changedDtsData, createHash);
-                            newBuildInfo.program.dtsChangeTime = ts.getCurrentTime(host).getTime();
-                        }
                         // Update sourceFileInfo
                         var _a = buildInfo.bundle, js = _a.js, dts = _a.dts, sourceFiles = _a.sourceFiles;
                         newBuildInfo.bundle.js.sources = js.sources;
@@ -110777,13 +110703,11 @@ var ts;
                             newBuildInfo.bundle.dts.sources = dts.sources;
                         }
                         newBuildInfo.bundle.sourceFiles = sourceFiles;
-                        outputFiles.push({ name: name, text: getBuildInfoText(newBuildInfo), writeByteOrderMark: writeByteOrderMark, buildInfo: newBuildInfo });
+                        outputFiles.push({ name: name, text: getBuildInfoText(newBuildInfo), writeByteOrderMark: writeByteOrderMark });
                         return;
                     case declarationFilePath:
                         if (declarationText === text)
                             return;
-                        changedDtsText = text;
-                        changedDtsData = data;
                         break;
                     case declarationMapPath:
                         if (declarationMapText === text)
@@ -110802,7 +110726,6 @@ var ts;
             getSourceFileFromReference: ts.returnUndefined,
             redirectTargetsMap: ts.createMultiMap(),
             getFileIncludeReasons: ts.notImplemented,
-            createHash: createHash,
         };
         emitFiles(ts.notImplementedResolver, emitHost, 
         /*targetSourceFile*/ undefined, ts.getTransformers(config.options, customTransformers));
@@ -115887,10 +115810,12 @@ var ts;
     }
     ts.createCompilerHost = createCompilerHost;
     /*@internal*/
+    // TODO(shkamat): update this after reworking ts build API
     function createCompilerHostWorker(options, setParentNodes, system) {
         if (system === void 0) { system = ts.sys; }
         var existingDirectories = new ts.Map();
         var getCanonicalFileName = ts.createGetCanonicalFileName(system.useCaseSensitiveFileNames);
+        var computeHash = ts.maybeBind(system, system.createHash) || ts.generateDjb2Hash;
         function getSourceFile(fileName, languageVersionOrOptions, onError) {
             var text;
             try {
@@ -115923,7 +115848,7 @@ var ts;
                 // NOTE: If patchWriteFileEnsuringDirectory has been called,
                 // the system.writeFile will do its own directory creation and
                 // the ensureDirectoriesExist call will always be redundant.
-                ts.writeFileEnsuringDirectories(fileName, data, writeByteOrderMark, function (path, data, writeByteOrderMark) { return system.writeFile(path, data, writeByteOrderMark); }, function (path) { return (compilerHost.createDirectory || system.createDirectory)(path); }, function (path) { return directoryExists(path); });
+                ts.writeFileEnsuringDirectories(fileName, data, writeByteOrderMark, function (path, data, writeByteOrderMark) { return writeFileWorker(path, data, writeByteOrderMark); }, function (path) { return (compilerHost.createDirectory || system.createDirectory)(path); }, function (path) { return directoryExists(path); });
                 ts.performance.mark("afterIOWrite");
                 ts.performance.measure("I/O Write", "beforeIOWrite", "afterIOWrite");
             }
@@ -115933,6 +115858,35 @@ var ts;
                 }
             }
         }
+        var outputFingerprints;
+        function writeFileWorker(fileName, data, writeByteOrderMark) {
+            if (!ts.isWatchSet(options) || !system.getModifiedTime) {
+                system.writeFile(fileName, data, writeByteOrderMark);
+                return;
+            }
+            if (!outputFingerprints) {
+                outputFingerprints = new ts.Map();
+            }
+            var hash = computeHash(data);
+            var mtimeBefore = system.getModifiedTime(fileName);
+            if (mtimeBefore) {
+                var fingerprint = outputFingerprints.get(fileName);
+                // If output has not been changed, and the file has no external modification
+                if (fingerprint &&
+                    fingerprint.byteOrderMark === writeByteOrderMark &&
+                    fingerprint.hash === hash &&
+                    fingerprint.mtime.getTime() === mtimeBefore.getTime()) {
+                    return;
+                }
+            }
+            system.writeFile(fileName, data, writeByteOrderMark);
+            var mtimeAfter = system.getModifiedTime(fileName) || ts.missingFileModifiedTime;
+            outputFingerprints.set(fileName, {
+                hash: hash,
+                byteOrderMark: writeByteOrderMark,
+                mtime: mtimeAfter
+            });
+        }
         function getDefaultLibLocation() {
             return ts.getDirectoryPath(ts.normalizePath(system.getExecutingFilePath()));
         }
@@ -117522,7 +117476,6 @@ var ts;
                 getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); },
                 redirectTargetsMap: redirectTargetsMap,
                 getFileIncludeReasons: program.getFileIncludeReasons,
-                createHash: ts.maybeBind(host, host.createHash),
             };
         }
         function writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data) {
@@ -119636,9 +119589,13 @@ var ts;
         function createManyToManyPathMap() {
             function create(forward, reverse, deleted) {
                 var map = {
+                    clone: function () { return create(new ts.Map(forward), new ts.Map(reverse), deleted && new ts.Set(deleted)); },
+                    forEach: function (fn) { return forward.forEach(fn); },
                     getKeys: function (v) { return reverse.get(v); },
                     getValues: function (k) { return forward.get(k); },
+                    hasKey: function (k) { return forward.has(k); },
                     keys: function () { return forward.keys(); },
+                    deletedKeys: function () { return deleted; },
                     deleteKey: function (k) {
                         (deleted || (deleted = new ts.Set())).add(k);
                         var set = forward.get(k);
@@ -119665,6 +119622,11 @@ var ts;
                         });
                         return map;
                     },
+                    clear: function () {
+                        forward.clear();
+                        reverse.clear();
+                        deleted === null || deleted === void 0 ? void 0 : deleted.clear();
+                    }
                 };
                 return map;
             }
@@ -119792,21 +119754,18 @@ var ts;
          * Creates the state of file references and signature for the new program from oldState if it is safe
          */
         function create(newProgram, getCanonicalFileName, oldState, disableUseFileVersionAsSignature) {
-            var _a, _b, _c;
             var fileInfos = new ts.Map();
             var referencedMap = newProgram.getCompilerOptions().module !== ts.ModuleKind.None ? createManyToManyPathMap() : undefined;
             var exportedModulesMap = referencedMap ? createManyToManyPathMap() : undefined;
+            var hasCalledUpdateShapeSignature = new ts.Set();
             var useOldState = canReuseOldState(referencedMap, oldState);
             // Ensure source files have parent pointers set
             newProgram.getTypeChecker();
             // Create the reference map, and set the file infos
-            for (var _i = 0, _d = newProgram.getSourceFiles(); _i < _d.length; _i++) {
-                var sourceFile = _d[_i];
+            for (var _i = 0, _a = newProgram.getSourceFiles(); _i < _a.length; _i++) {
+                var sourceFile = _a[_i];
                 var version_2 = ts.Debug.checkDefined(sourceFile.version, "Program intended to be used with Builder should have source files with versions set");
-                var oldUncommitedSignature = useOldState ? (_a = oldState.oldSignatures) === null || _a === void 0 ? void 0 : _a.get(sourceFile.resolvedPath) : undefined;
-                var signature = oldUncommitedSignature === undefined ?
-                    useOldState ? (_b = oldState.fileInfos.get(sourceFile.resolvedPath)) === null || _b === void 0 ? void 0 : _b.signature : undefined :
-                    oldUncommitedSignature || undefined;
+                var oldInfo = useOldState ? oldState.fileInfos.get(sourceFile.resolvedPath) : undefined;
                 if (referencedMap) {
                     var newReferences = getReferencedFiles(newProgram, sourceFile, getCanonicalFileName);
                     if (newReferences) {
@@ -119814,26 +119773,19 @@ var ts;
                     }
                     // Copy old visible to outside files map
                     if (useOldState) {
-                        var oldUncommitedExportedModules = (_c = oldState.oldExportedModulesMap) === null || _c === void 0 ? void 0 : _c.get(sourceFile.resolvedPath);
-                        var exportedModules = oldUncommitedExportedModules === undefined ?
-                            oldState.exportedModulesMap.getValues(sourceFile.resolvedPath) :
-                            oldUncommitedExportedModules || undefined;
+                        var exportedModules = oldState.exportedModulesMap.getValues(sourceFile.resolvedPath);
                         if (exportedModules) {
                             exportedModulesMap.set(sourceFile.resolvedPath, exportedModules);
                         }
                     }
                 }
-                fileInfos.set(sourceFile.resolvedPath, {
-                    version: version_2,
-                    signature: signature,
-                    affectsGlobalScope: isFileAffectingGlobalScope(sourceFile) || undefined,
-                    impliedFormat: sourceFile.impliedNodeFormat
-                });
+                fileInfos.set(sourceFile.resolvedPath, { version: version_2, signature: oldInfo && oldInfo.signature, affectsGlobalScope: isFileAffectingGlobalScope(sourceFile) || undefined, impliedFormat: sourceFile.impliedNodeFormat });
             }
             return {
                 fileInfos: fileInfos,
                 referencedMap: referencedMap,
                 exportedModulesMap: exportedModulesMap,
+                hasCalledUpdateShapeSignature: hasCalledUpdateShapeSignature,
                 useFileVersionAsSignature: !disableUseFileVersionAsSignature && !useOldState
             };
         }
@@ -119847,42 +119799,71 @@ var ts;
         }
         BuilderState.releaseCache = releaseCache;
         /**
-         * Gets the files affected by the path from the program
+         * Creates a clone of the state
          */
-        function getFilesAffectedBy(state, programOfThisState, path, cancellationToken, computeHash) {
+        function clone(state) {
             var _a, _b;
-            var result = getFilesAffectedByWithOldState(state, programOfThisState, path, cancellationToken, computeHash);
-            (_a = state.oldSignatures) === null || _a === void 0 ? void 0 : _a.clear();
-            (_b = state.oldExportedModulesMap) === null || _b === void 0 ? void 0 : _b.clear();
-            return result;
+            // Dont need to backup allFiles info since its cache anyway
+            return {
+                fileInfos: new ts.Map(state.fileInfos),
+                referencedMap: (_a = state.referencedMap) === null || _a === void 0 ? void 0 : _a.clone(),
+                exportedModulesMap: (_b = state.exportedModulesMap) === null || _b === void 0 ? void 0 : _b.clone(),
+                hasCalledUpdateShapeSignature: new ts.Set(state.hasCalledUpdateShapeSignature),
+                useFileVersionAsSignature: state.useFileVersionAsSignature,
+            };
         }
-        BuilderState.getFilesAffectedBy = getFilesAffectedBy;
-        function getFilesAffectedByWithOldState(state, programOfThisState, path, cancellationToken, computeHash) {
+        BuilderState.clone = clone;
+        /**
+         * Gets the files affected by the path from the program
+         */
+        function getFilesAffectedBy(state, programOfThisState, path, cancellationToken, computeHash, cacheToUpdateSignature, exportedModulesMapCache) {
+            // Since the operation could be cancelled, the signatures are always stored in the cache
+            // They will be committed once it is safe to use them
+            // eg when calling this api from tsserver, if there is no cancellation of the operation
+            // In the other cases the affected files signatures are committed only after the iteration through the result is complete
+            var signatureCache = cacheToUpdateSignature || new ts.Map();
             var sourceFile = programOfThisState.getSourceFileByPath(path);
             if (!sourceFile) {
                 return ts.emptyArray;
             }
-            if (!updateShapeSignature(state, programOfThisState, sourceFile, cancellationToken, computeHash)) {
+            if (!updateShapeSignature(state, programOfThisState, sourceFile, signatureCache, cancellationToken, computeHash, exportedModulesMapCache)) {
                 return [sourceFile];
             }
-            return (state.referencedMap ? getFilesAffectedByUpdatedShapeWhenModuleEmit : getFilesAffectedByUpdatedShapeWhenNonModuleEmit)(state, programOfThisState, sourceFile, cancellationToken, computeHash);
+            var result = (state.referencedMap ? getFilesAffectedByUpdatedShapeWhenModuleEmit : getFilesAffectedByUpdatedShapeWhenNonModuleEmit)(state, programOfThisState, sourceFile, signatureCache, cancellationToken, computeHash, exportedModulesMapCache);
+            if (!cacheToUpdateSignature) {
+                // Commit all the signatures in the signature cache
+                updateSignaturesFromCache(state, signatureCache);
+            }
+            return result;
         }
-        BuilderState.getFilesAffectedByWithOldState = getFilesAffectedByWithOldState;
+        BuilderState.getFilesAffectedBy = getFilesAffectedBy;
+        /**
+         * Updates the signatures from the cache into state's fileinfo signatures
+         * This should be called whenever it is safe to commit the state of the builder
+         */
+        function updateSignaturesFromCache(state, signatureCache) {
+            signatureCache.forEach(function (signature, path) { return updateSignatureOfFile(state, signature, path); });
+        }
+        BuilderState.updateSignaturesFromCache = updateSignaturesFromCache;
         function updateSignatureOfFile(state, signature, path) {
             state.fileInfos.get(path).signature = signature;
-            (state.hasCalledUpdateShapeSignature || (state.hasCalledUpdateShapeSignature = new ts.Set())).add(path);
+            state.hasCalledUpdateShapeSignature.add(path);
         }
         BuilderState.updateSignatureOfFile = updateSignatureOfFile;
         /**
          * Returns if the shape of the signature has changed since last emit
          */
-        function updateShapeSignature(state, programOfThisState, sourceFile, cancellationToken, computeHash, useFileVersionAsSignature) {
-            var _a;
+        function updateShapeSignature(state, programOfThisState, sourceFile, cacheToUpdateSignature, cancellationToken, computeHash, exportedModulesMapCache, useFileVersionAsSignature) {
             if (useFileVersionAsSignature === void 0) { useFileVersionAsSignature = state.useFileVersionAsSignature; }
+            ts.Debug.assert(!!sourceFile);
+            ts.Debug.assert(!exportedModulesMapCache || !!state.exportedModulesMap, "Compute visible to outside map only if visibleToOutsideReferencedMap present in the state");
             // If we have cached the result for this file, that means hence forth we should assume file shape is uptodate
-            if ((_a = state.hasCalledUpdateShapeSignature) === null || _a === void 0 ? void 0 : _a.has(sourceFile.resolvedPath))
+            if (state.hasCalledUpdateShapeSignature.has(sourceFile.resolvedPath) || cacheToUpdateSignature.has(sourceFile.resolvedPath)) {
                 return false;
+            }
             var info = state.fileInfos.get(sourceFile.resolvedPath);
+            if (!info)
+                return ts.Debug.fail();
             var prevSignature = info.signature;
             var latestSignature;
             if (!sourceFile.isDeclarationFile && !useFileVersionAsSignature) {
@@ -119893,55 +119874,45 @@ var ts;
                 var firstDts_1 = ts.firstOrUndefined(emitOutput_1.outputFiles);
                 if (firstDts_1) {
                     ts.Debug.assert(ts.isDeclarationFileName(firstDts_1.name), "File extension for signature expected to be dts", function () { return "Found: " + ts.getAnyExtensionFromPath(firstDts_1.name) + " for " + firstDts_1.name + ":: All output files: " + JSON.stringify(emitOutput_1.outputFiles.map(function (f) { return f.name; })); });
-                    latestSignature = computeSignature(firstDts_1.text, computeHash);
-                    if (latestSignature !== prevSignature) {
-                        updateExportedModules(state, sourceFile, emitOutput_1.exportedModulesFromDeclarationEmit);
+                    latestSignature = (computeHash || ts.generateDjb2Hash)(firstDts_1.text);
+                    if (exportedModulesMapCache && latestSignature !== prevSignature) {
+                        updateExportedModules(sourceFile, emitOutput_1.exportedModulesFromDeclarationEmit, exportedModulesMapCache);
                     }
                 }
             }
             // Default is to use file version as signature
             if (latestSignature === undefined) {
                 latestSignature = sourceFile.version;
-                if (state.exportedModulesMap && latestSignature !== prevSignature) {
-                    (state.oldExportedModulesMap || (state.oldExportedModulesMap = new ts.Map())).set(sourceFile.resolvedPath, state.exportedModulesMap.getValues(sourceFile.resolvedPath) || false);
+                if (exportedModulesMapCache && latestSignature !== prevSignature) {
                     // All the references in this file are exported
                     var references = state.referencedMap ? state.referencedMap.getValues(sourceFile.resolvedPath) : undefined;
                     if (references) {
-                        state.exportedModulesMap.set(sourceFile.resolvedPath, references);
+                        exportedModulesMapCache.set(sourceFile.resolvedPath, references);
                     }
                     else {
-                        state.exportedModulesMap.deleteKey(sourceFile.resolvedPath);
+                        exportedModulesMapCache.deleteKey(sourceFile.resolvedPath);
                     }
                 }
             }
-            (state.oldSignatures || (state.oldSignatures = new ts.Map())).set(sourceFile.resolvedPath, prevSignature || false);
-            (state.hasCalledUpdateShapeSignature || (state.hasCalledUpdateShapeSignature = new ts.Set())).add(sourceFile.resolvedPath);
-            info.signature = latestSignature;
+            cacheToUpdateSignature.set(sourceFile.resolvedPath, latestSignature);
             return latestSignature !== prevSignature;
         }
         BuilderState.updateShapeSignature = updateShapeSignature;
-        function computeSignature(text, computeHash) {
-            return (computeHash || ts.generateDjb2Hash)(text);
-        }
-        BuilderState.computeSignature = computeSignature;
         /**
          * Coverts the declaration emit result into exported modules map
          */
-        function updateExportedModules(state, sourceFile, exportedModulesFromDeclarationEmit) {
-            if (!state.exportedModulesMap)
-                return;
-            (state.oldExportedModulesMap || (state.oldExportedModulesMap = new ts.Map())).set(sourceFile.resolvedPath, state.exportedModulesMap.getValues(sourceFile.resolvedPath) || false);
+        function updateExportedModules(sourceFile, exportedModulesFromDeclarationEmit, exportedModulesMapCache) {
             if (!exportedModulesFromDeclarationEmit) {
-                state.exportedModulesMap.deleteKey(sourceFile.resolvedPath);
+                exportedModulesMapCache.deleteKey(sourceFile.resolvedPath);
                 return;
             }
             var exportedModules;
             exportedModulesFromDeclarationEmit.forEach(function (symbol) { return addExportedModule(getReferencedFilesFromImportedModuleSymbol(symbol)); });
             if (exportedModules) {
-                state.exportedModulesMap.set(sourceFile.resolvedPath, exportedModules);
+                exportedModulesMapCache.set(sourceFile.resolvedPath, exportedModules);
             }
             else {
-                state.exportedModulesMap.deleteKey(sourceFile.resolvedPath);
+                exportedModulesMapCache.deleteKey(sourceFile.resolvedPath);
             }
             function addExportedModule(exportedModulePaths) {
                 if (exportedModulePaths === null || exportedModulePaths === void 0 ? void 0 : exportedModulePaths.length) {
@@ -119953,6 +119924,19 @@ var ts;
             }
         }
         BuilderState.updateExportedModules = updateExportedModules;
+        /**
+         * Updates the exported modules from cache into state's exported modules map
+         * This should be called whenever it is safe to commit the state of the builder
+         */
+        function updateExportedFilesMapFromCache(state, exportedModulesMapCache) {
+            var _a;
+            if (exportedModulesMapCache) {
+                ts.Debug.assert(!!state.exportedModulesMap);
+                (_a = exportedModulesMapCache.deletedKeys()) === null || _a === void 0 ? void 0 : _a.forEach(function (path) { return state.exportedModulesMap.deleteKey(path); });
+                exportedModulesMapCache.forEach(function (exportedModules, path) { return state.exportedModulesMap.set(path, exportedModules); });
+            }
+        }
+        BuilderState.updateExportedFilesMapFromCache = updateExportedFilesMapFromCache;
         /**
          * Get all the dependencies of the sourceFile
          */
@@ -120073,7 +120057,7 @@ var ts;
         /**
          * When program emits modular code, gets the files affected by the sourceFile whose shape has changed
          */
-        function getFilesAffectedByUpdatedShapeWhenModuleEmit(state, programOfThisState, sourceFileWithUpdatedShape, cancellationToken, computeHash) {
+        function getFilesAffectedByUpdatedShapeWhenModuleEmit(state, programOfThisState, sourceFileWithUpdatedShape, cacheToUpdateSignature, cancellationToken, computeHash, exportedModulesMapCache) {
             if (isFileAffectingGlobalScope(sourceFileWithUpdatedShape)) {
                 return getAllFilesExcludingDefaultLibraryFile(state, programOfThisState, sourceFileWithUpdatedShape);
             }
@@ -120093,7 +120077,7 @@ var ts;
                 if (!seenFileNamesMap.has(currentPath)) {
                     var currentSourceFile = programOfThisState.getSourceFileByPath(currentPath);
                     seenFileNamesMap.set(currentPath, currentSourceFile);
-                    if (currentSourceFile && updateShapeSignature(state, programOfThisState, currentSourceFile, cancellationToken, computeHash)) {
+                    if (currentSourceFile && updateShapeSignature(state, programOfThisState, currentSourceFile, cacheToUpdateSignature, cancellationToken, computeHash, exportedModulesMapCache)) {
                         queue.push.apply(queue, getReferencedByPaths(state, currentSourceFile.resolvedPath));
                     }
                 }
@@ -120119,33 +120103,32 @@ var ts;
      * Create the state so that we can iterate on changedFiles/affected files
      */
     function createBuilderProgramState(newProgram, getCanonicalFileName, oldState, disableUseFileVersionAsSignature) {
-        var _a, _b;
         var state = ts.BuilderState.create(newProgram, getCanonicalFileName, oldState, disableUseFileVersionAsSignature);
         state.program = newProgram;
         var compilerOptions = newProgram.getCompilerOptions();
         state.compilerOptions = compilerOptions;
-        var outFilePath = ts.outFile(compilerOptions);
         // With --out or --outFile, any change affects all semantic diagnostics so no need to cache them
-        if (!outFilePath) {
+        if (!ts.outFile(compilerOptions)) {
             state.semanticDiagnosticsPerFile = new ts.Map();
         }
-        else if (compilerOptions.composite && (oldState === null || oldState === void 0 ? void 0 : oldState.outSignature) && outFilePath === ts.outFile(oldState === null || oldState === void 0 ? void 0 : oldState.compilerOptions)) {
-            state.outSignature = oldState === null || oldState === void 0 ? void 0 : oldState.outSignature;
-        }
         state.changedFilesSet = new ts.Set();
-        state.dtsChangeTime = compilerOptions.composite ? oldState === null || oldState === void 0 ? void 0 : oldState.dtsChangeTime : undefined;
         var useOldState = ts.BuilderState.canReuseOldState(state.referencedMap, oldState);
         var oldCompilerOptions = useOldState ? oldState.compilerOptions : undefined;
         var canCopySemanticDiagnostics = useOldState && oldState.semanticDiagnosticsPerFile && !!state.semanticDiagnosticsPerFile &&
             !ts.compilerOptionsAffectSemanticDiagnostics(compilerOptions, oldCompilerOptions);
-        var canCopyEmitSignatures = compilerOptions.composite &&
-            (oldState === null || oldState === void 0 ? void 0 : oldState.emitSignatures) &&
-            !outFilePath &&
-            !ts.compilerOptionsAffectDeclarationPath(compilerOptions, oldCompilerOptions);
         if (useOldState) {
+            // Verify the sanity of old state
+            if (!oldState.currentChangedFilePath) {
+                var affectedSignatures = oldState.currentAffectedFilesSignatures;
+                ts.Debug.assert(!oldState.affectedFiles && (!affectedSignatures || !affectedSignatures.size), "Cannot reuse if only few affected files of currentChangedFile were iterated");
+            }
+            var changedFilesSet = oldState.changedFilesSet;
+            if (canCopySemanticDiagnostics) {
+                ts.Debug.assert(!changedFilesSet || !ts.forEachKey(changedFilesSet, function (path) { return oldState.semanticDiagnosticsPerFile.has(path); }), "Semantic diagnostics shouldnt be available for changed files");
+            }
             // Copy old state's changed files set
-            (_a = oldState.changedFilesSet) === null || _a === void 0 ? void 0 : _a.forEach(function (value) { return state.changedFilesSet.add(value); });
-            if (!outFilePath && oldState.affectedFilesPendingEmit) {
+            changedFilesSet === null || changedFilesSet === void 0 ? void 0 : changedFilesSet.forEach(function (value) { return state.changedFilesSet.add(value); });
+            if (!ts.outFile(compilerOptions) && oldState.affectedFilesPendingEmit) {
                 state.affectedFilesPendingEmit = oldState.affectedFilesPendingEmit.slice();
                 state.affectedFilesPendingEmitKind = oldState.affectedFilesPendingEmitKind && new ts.Map(oldState.affectedFilesPendingEmitKind);
                 state.affectedFilesPendingEmitIndex = oldState.affectedFilesPendingEmitIndex;
@@ -120166,8 +120149,6 @@ var ts;
                 !(oldInfo = oldState.fileInfos.get(sourceFilePath)) ||
                 // versions dont match
                 oldInfo.version !== info.version ||
-                // Implied formats dont match
-                oldInfo.impliedFormat !== info.impliedFormat ||
                 // Referenced files changed
                 !hasSameKeys(newReferences = referencedMap && referencedMap.getValues(sourceFilePath), oldReferencedMap && oldReferencedMap.getValues(sourceFilePath)) ||
                 // Referenced file was deleted in the new program
@@ -120191,25 +120172,27 @@ var ts;
                     state.semanticDiagnosticsFromOldState.add(sourceFilePath);
                 }
             }
-            if (canCopyEmitSignatures) {
-                var oldEmitSignature = oldState.emitSignatures.get(sourceFilePath);
-                if (oldEmitSignature)
-                    (state.emitSignatures || (state.emitSignatures = new ts.Map())).set(sourceFilePath, oldEmitSignature);
-            }
         });
         // If the global file is removed, add all files as changed
         if (useOldState && ts.forEachEntry(oldState.fileInfos, function (info, sourceFilePath) { return info.affectsGlobalScope && !state.fileInfos.has(sourceFilePath); })) {
             ts.BuilderState.getAllFilesExcludingDefaultLibraryFile(state, newProgram, /*firstSourceFile*/ undefined)
                 .forEach(function (file) { return state.changedFilesSet.add(file.resolvedPath); });
         }
-        else if (oldCompilerOptions && !outFilePath && ts.compilerOptionsAffectEmit(compilerOptions, oldCompilerOptions)) {
+        else if (oldCompilerOptions && !ts.outFile(compilerOptions) && ts.compilerOptionsAffectEmit(compilerOptions, oldCompilerOptions)) {
             // Add all files to affectedFilesPendingEmit since emit changed
             newProgram.getSourceFiles().forEach(function (f) { return addToAffectedFilesPendingEmit(state, f.resolvedPath, 1 /* Full */); });
             ts.Debug.assert(!state.seenAffectedFiles || !state.seenAffectedFiles.size);
             state.seenAffectedFiles = state.seenAffectedFiles || new ts.Set();
         }
-        // Since old states change files set is copied, any additional change means we would need to emit build info
-        state.buildInfoEmitPending = !useOldState || state.changedFilesSet.size !== (((_b = oldState.changedFilesSet) === null || _b === void 0 ? void 0 : _b.size) || 0);
+        if (useOldState) {
+            // Any time the interpretation of a source file changes, mark it as changed
+            ts.forEachEntry(oldState.fileInfos, function (info, sourceFilePath) {
+                if (state.fileInfos.has(sourceFilePath) && state.fileInfos.get(sourceFilePath).impliedFormat !== info.impliedFormat) {
+                    state.changedFilesSet.add(sourceFilePath);
+                }
+            });
+        }
+        state.buildInfoEmitPending = !!state.changedFilesSet.size;
         return state;
     }
     function convertToDiagnostics(diagnostics, newProgram, getCanonicalFileName) {
@@ -120245,35 +120228,30 @@ var ts;
         ts.BuilderState.releaseCache(state);
         state.program = undefined;
     }
-    function backupEmitBuilderProgramState(state) {
-        var outFilePath = ts.outFile(state.compilerOptions);
-        // Only in --out changeFileSet is kept around till emit
-        ts.Debug.assert(!state.changedFilesSet.size || outFilePath);
-        return {
-            affectedFilesPendingEmit: state.affectedFilesPendingEmit && state.affectedFilesPendingEmit.slice(),
-            affectedFilesPendingEmitKind: state.affectedFilesPendingEmitKind && new ts.Map(state.affectedFilesPendingEmitKind),
-            affectedFilesPendingEmitIndex: state.affectedFilesPendingEmitIndex,
-            seenEmittedFiles: state.seenEmittedFiles && new ts.Map(state.seenEmittedFiles),
-            programEmitComplete: state.programEmitComplete,
-            emitSignatures: state.emitSignatures && new ts.Map(state.emitSignatures),
-            outSignature: state.outSignature,
-            dtsChangeTime: state.dtsChangeTime,
-            hasChangedEmitSignature: state.hasChangedEmitSignature,
-            changedFilesSet: outFilePath ? new ts.Set(state.changedFilesSet) : undefined,
-        };
-    }
-    function restoreEmitBuilderProgramState(state, backupEmitState) {
-        state.affectedFilesPendingEmit = backupEmitState.affectedFilesPendingEmit;
-        state.affectedFilesPendingEmitKind = backupEmitState.affectedFilesPendingEmitKind;
-        state.affectedFilesPendingEmitIndex = backupEmitState.affectedFilesPendingEmitIndex;
-        state.seenEmittedFiles = backupEmitState.seenEmittedFiles;
-        state.programEmitComplete = backupEmitState.programEmitComplete;
-        state.emitSignatures = backupEmitState.emitSignatures;
-        state.outSignature = backupEmitState.outSignature;
-        state.dtsChangeTime = backupEmitState.dtsChangeTime;
-        state.hasChangedEmitSignature = backupEmitState.hasChangedEmitSignature;
-        if (backupEmitState.changedFilesSet)
-            state.changedFilesSet = backupEmitState.changedFilesSet;
+    /**
+     * Creates a clone of the state
+     */
+    function cloneBuilderProgramState(state) {
+        var _a;
+        var newState = ts.BuilderState.clone(state);
+        newState.semanticDiagnosticsPerFile = state.semanticDiagnosticsPerFile && new ts.Map(state.semanticDiagnosticsPerFile);
+        newState.changedFilesSet = new ts.Set(state.changedFilesSet);
+        newState.affectedFiles = state.affectedFiles;
+        newState.affectedFilesIndex = state.affectedFilesIndex;
+        newState.currentChangedFilePath = state.currentChangedFilePath;
+        newState.currentAffectedFilesSignatures = state.currentAffectedFilesSignatures && new ts.Map(state.currentAffectedFilesSignatures);
+        newState.currentAffectedFilesExportedModulesMap = (_a = state.currentAffectedFilesExportedModulesMap) === null || _a === void 0 ? void 0 : _a.clone();
+        newState.seenAffectedFiles = state.seenAffectedFiles && new ts.Set(state.seenAffectedFiles);
+        newState.cleanedDiagnosticsOfLibFiles = state.cleanedDiagnosticsOfLibFiles;
+        newState.semanticDiagnosticsFromOldState = state.semanticDiagnosticsFromOldState && new ts.Set(state.semanticDiagnosticsFromOldState);
+        newState.program = state.program;
+        newState.compilerOptions = state.compilerOptions;
+        newState.affectedFilesPendingEmit = state.affectedFilesPendingEmit && state.affectedFilesPendingEmit.slice();
+        newState.affectedFilesPendingEmitKind = state.affectedFilesPendingEmitKind && new ts.Map(state.affectedFilesPendingEmitKind);
+        newState.affectedFilesPendingEmitIndex = state.affectedFilesPendingEmitIndex;
+        newState.seenEmittedFiles = state.seenEmittedFiles && new ts.Map(state.seenEmittedFiles);
+        newState.programEmitComplete = state.programEmitComplete;
+        return newState;
     }
     /**
      * Verifies that source file is ok to be used in calls that arent handled by next
@@ -120288,7 +120266,7 @@ var ts;
      * eg. if during diagnostics check cancellation token ends up cancelling the request, the affected file should be retained
      */
     function getNextAffectedFile(state, cancellationToken, computeHash, host) {
-        var _a, _b;
+        var _a;
         while (true) {
             var affectedFiles = state.affectedFiles;
             if (affectedFiles) {
@@ -120308,8 +120286,10 @@ var ts;
                 state.changedFilesSet.delete(state.currentChangedFilePath);
                 state.currentChangedFilePath = undefined;
                 // Commit the changes in file signature
-                (_a = state.oldSignatures) === null || _a === void 0 ? void 0 : _a.clear();
-                (_b = state.oldExportedModulesMap) === null || _b === void 0 ? void 0 : _b.clear();
+                ts.BuilderState.updateSignaturesFromCache(state, state.currentAffectedFilesSignatures);
+                state.currentAffectedFilesSignatures.clear();
+                ts.BuilderState.updateExportedFilesMapFromCache(state, state.currentAffectedFilesExportedModulesMap);
+                (_a = state.currentAffectedFilesExportedModulesMap) === null || _a === void 0 ? void 0 : _a.clear();
                 state.affectedFiles = undefined;
             }
             // Get next changed file
@@ -120327,7 +120307,12 @@ var ts;
                 return program;
             }
             // Get next batch of affected files
-            state.affectedFiles = ts.BuilderState.getFilesAffectedByWithOldState(state, program, nextKey.value, cancellationToken, computeHash);
+            if (!state.currentAffectedFilesSignatures)
+                state.currentAffectedFilesSignatures = new ts.Map();
+            if (state.exportedModulesMap) {
+                state.currentAffectedFilesExportedModulesMap || (state.currentAffectedFilesExportedModulesMap = ts.BuilderState.createManyToManyPathMap());
+            }
+            state.affectedFiles = ts.BuilderState.getFilesAffectedBy(state, program, nextKey.value, cancellationToken, computeHash, state.currentAffectedFilesSignatures, state.currentAffectedFilesExportedModulesMap);
             state.currentChangedFilePath = nextKey.value;
             state.affectedFilesIndex = 0;
             if (!state.seenAffectedFiles)
@@ -120379,6 +120364,7 @@ var ts;
      *  This is because even though js emit doesnt change, dts emit / type used can change resulting in need for dts emit and js change
      */
     function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash, host) {
+        var _a;
         removeSemanticDiagnosticsOf(state, affectedFile.resolvedPath);
         // If affected files is everything except default library, then nothing more to do
         if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles) {
@@ -120386,9 +120372,10 @@ var ts;
             // When a change affects the global scope, all files are considered to be affected without updating their signature
             // That means when affected file is handled, its signature can be out of date
             // To avoid this, ensure that we update the signature for any affected file in this scenario.
-            ts.BuilderState.updateShapeSignature(state, ts.Debug.checkDefined(state.program), affectedFile, cancellationToken, computeHash);
+            ts.BuilderState.updateShapeSignature(state, ts.Debug.checkDefined(state.program), affectedFile, ts.Debug.checkDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap);
             return;
         }
+        ts.Debug.assert(state.hasCalledUpdateShapeSignature.has(affectedFile.resolvedPath) || ((_a = state.currentAffectedFilesSignatures) === null || _a === void 0 ? void 0 : _a.has(affectedFile.resolvedPath)), "Signature not updated for affected file: " + affectedFile.fileName);
         if (state.compilerOptions.assumeChangesOnlyAffectDirectDependencies)
             return;
         handleDtsMayChangeOfReferencingExportOfAffectedFile(state, affectedFile, cancellationToken, computeHash, host);
@@ -120408,7 +120395,7 @@ var ts;
                 // 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.
-                ts.BuilderState.updateShapeSignature(state, program, sourceFile, cancellationToken, computeHash, !host.disableUseFileVersionAsSignature);
+                ts.BuilderState.updateShapeSignature(state, program, sourceFile, ts.Debug.checkDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap, !host.disableUseFileVersionAsSignature);
                 // If not dts emit, nothing more to do
                 if (ts.getEmitDeclarations(state.compilerOptions)) {
                     addToAffectedFilesPendingEmit(state, path, 0 /* DtsOnly */);
@@ -120429,10 +120416,27 @@ var ts;
         return !state.semanticDiagnosticsFromOldState.size;
     }
     function isChangedSignature(state, path) {
-        var oldSignature = ts.Debug.checkDefined(state.oldSignatures).get(path) || undefined;
-        var newSignature = ts.Debug.checkDefined(state.fileInfos.get(path)).signature;
+        var newSignature = ts.Debug.checkDefined(state.currentAffectedFilesSignatures).get(path);
+        var oldSignature = ts.Debug.checkDefined(state.fileInfos.get(path)).signature;
         return newSignature !== oldSignature;
     }
+    function forEachKeyOfExportedModulesMap(state, filePath, fn) {
+        // Go through exported modules from cache first
+        var keys = state.currentAffectedFilesExportedModulesMap.getKeys(filePath);
+        var result = keys && ts.forEachKey(keys, fn);
+        if (result)
+            return result;
+        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
+        keys = state.exportedModulesMap.getKeys(filePath);
+        return keys && ts.forEachKey(keys, function (exportedFromPath) {
+            var _a;
+            // If the cache had an updated value, skip
+            return !state.currentAffectedFilesExportedModulesMap.hasKey(exportedFromPath) &&
+                !((_a = state.currentAffectedFilesExportedModulesMap.deletedKeys()) === null || _a === void 0 ? void 0 : _a.has(exportedFromPath)) ?
+                fn(exportedFromPath) :
+                undefined;
+        });
+    }
     function handleDtsMayChangeOfGlobalScope(state, filePath, cancellationToken, computeHash, host) {
         var _a;
         if (!((_a = state.fileInfos.get(filePath)) === null || _a === void 0 ? void 0 : _a.affectsGlobalScope))
@@ -120447,7 +120451,6 @@ var ts;
      * Iterate on referencing modules that export entities from affected file and delete diagnostics and add pending emit
      */
     function handleDtsMayChangeOfReferencingExportOfAffectedFile(state, affectedFile, cancellationToken, computeHash, host) {
-        var _a;
         // If there was change in signature (dts output) for the changed file,
         // then only we need to handle pending file emit
         if (!state.exportedModulesMap || !state.changedFilesSet.has(affectedFile.resolvedPath))
@@ -120474,10 +120477,11 @@ var ts;
                 }
             }
         }
+        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
         var seenFileAndExportsOfFile = new ts.Set();
         // Go through exported modules from cache first
         // If exported modules has path, all files referencing file exported from are affected
-        (_a = state.exportedModulesMap.getKeys(affectedFile.resolvedPath)) === null || _a === void 0 ? void 0 : _a.forEach(function (exportedFromPath) {
+        forEachKeyOfExportedModulesMap(state, affectedFile.resolvedPath, function (exportedFromPath) {
             if (handleDtsMayChangeOfGlobalScope(state, exportedFromPath, cancellationToken, computeHash, host))
                 return true;
             var references = state.referencedMap.getKeys(exportedFromPath);
@@ -120491,18 +120495,19 @@ var ts;
      * return true when all work is done and we can exit handling dts emit and semantic diagnostics
      */
     function handleDtsMayChangeOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, cancellationToken, computeHash, host) {
-        var _a, _b;
+        var _a;
         if (!ts.tryAddToSet(seenFileAndExportsOfFile, filePath))
             return undefined;
         if (handleDtsMayChangeOfGlobalScope(state, filePath, cancellationToken, computeHash, host))
             return true;
         handleDtsMayChangeOf(state, filePath, cancellationToken, computeHash, host);
+        ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
         // If exported modules has path, all files referencing file exported from are affected
-        (_a = state.exportedModulesMap.getKeys(filePath)) === null || _a === void 0 ? void 0 : _a.forEach(function (exportedFromPath) {
+        forEachKeyOfExportedModulesMap(state, filePath, function (exportedFromPath) {
             return handleDtsMayChangeOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, cancellationToken, computeHash, host);
         });
         // Remove diagnostics of files that import this file (without going to exports of referencing files)
-        (_b = state.referencedMap.getKeys(filePath)) === null || _b === void 0 ? void 0 : _b.forEach(function (referencingFilePath) {
+        (_a = state.referencedMap.getKeys(filePath)) === null || _a === void 0 ? void 0 : _a.forEach(function (referencingFilePath) {
             return !seenFileAndExportsOfFile.has(referencingFilePath) && // Not already removed diagnostic file
                 handleDtsMayChangeOf(// Dont add to seen since this is not yet done with the export removal
                 state, referencingFilePath, cancellationToken, computeHash, host);
@@ -120523,13 +120528,12 @@ var ts;
         }
         else {
             state.seenAffectedFiles.add(affected.resolvedPath);
-            // Change in changeSet/affectedFilesPendingEmit, buildInfo needs to be emitted
-            state.buildInfoEmitPending = true;
             if (emitKind !== undefined) {
                 (state.seenEmittedFiles || (state.seenEmittedFiles = new ts.Map())).set(affected.resolvedPath, emitKind);
             }
             if (isPendingEmit) {
                 state.affectedFilesPendingEmitIndex++;
+                state.buildInfoEmitPending = true;
             }
             else {
                 state.affectedFilesIndex++;
@@ -120577,61 +120581,25 @@ var ts;
         }
         return ts.filterSemanticDiagnostics(diagnostics, state.compilerOptions);
     }
-    function isProgramBundleEmitBuildInfo(info) {
-        return !!ts.outFile(info.options || {});
-    }
-    ts.isProgramBundleEmitBuildInfo = isProgramBundleEmitBuildInfo;
     /**
      * Gets the program information to be emitted in buildInfo so that we can use it to create new program
      */
-    function getProgramBuildInfo(state, getCanonicalFileName, host) {
-        var outFilePath = ts.outFile(state.compilerOptions);
-        if (outFilePath && !state.compilerOptions.composite)
-            return;
+    function getProgramBuildInfo(state, getCanonicalFileName) {
+        if (ts.outFile(state.compilerOptions))
+            return undefined;
         var currentDirectory = ts.Debug.checkDefined(state.program).getCurrentDirectory();
         var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(ts.getTsBuildInfoEmitOutputFilePath(state.compilerOptions), currentDirectory));
-        state.dtsChangeTime = state.hasChangedEmitSignature ? ts.getCurrentTime(host).getTime() : state.dtsChangeTime;
-        if (outFilePath) {
-            var fileNames_1 = [];
-            var fileInfos_1 = [];
-            state.program.getRootFileNames().forEach(function (f) {
-                var sourceFile = state.program.getSourceFile(f);
-                if (!sourceFile)
-                    return;
-                fileNames_1.push(relativeToBuildInfo(sourceFile.resolvedPath));
-                fileInfos_1.push(sourceFile.version);
-            });
-            var result_15 = {
-                fileNames: fileNames_1,
-                fileInfos: fileInfos_1,
-                options: convertToProgramBuildInfoCompilerOptions(state.compilerOptions, "affectsBundleEmitBuildInfo"),
-                outSignature: state.outSignature,
-                dtsChangeTime: state.dtsChangeTime,
-            };
-            return result_15;
-        }
         var fileNames = [];
         var fileNameToFileId = new ts.Map();
         var fileIdsList;
         var fileNamesToFileIdListId;
-        var emitSignatures;
         var fileInfos = ts.arrayFrom(state.fileInfos.entries(), function (_a) {
-            var _b, _c;
             var key = _a[0], value = _a[1];
             // Ensure fileId
             var fileId = toFileId(key);
             ts.Debug.assert(fileNames[fileId - 1] === relativeToBuildInfo(key));
-            var oldSignature = (_b = state.oldSignatures) === null || _b === void 0 ? void 0 : _b.get(key);
-            var actualSignature = oldSignature !== undefined ? oldSignature || undefined : value.signature;
-            if (state.compilerOptions.composite) {
-                var file = state.program.getSourceFileByPath(key);
-                if (!ts.isJsonSourceFile(file) && ts.sourceFileMayBeEmitted(file, state.program)) {
-                    var emitSignature = (_c = state.emitSignatures) === null || _c === void 0 ? void 0 : _c.get(key);
-                    if (emitSignature !== actualSignature) {
-                        (emitSignatures || (emitSignatures = [])).push(emitSignature === undefined ? fileId : [fileId, emitSignature]);
-                    }
-                }
-            }
+            var signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key);
+            var actualSignature = signature !== null && signature !== void 0 ? signature : value.signature;
             return value.version === actualSignature ?
                 value.affectsGlobalScope || value.impliedFormat ?
                     // If file version is same as signature, dont serialize signature
@@ -120639,11 +120607,11 @@ var ts;
                     // If file info only contains version and signature and both are same we can just write string
                     value.version :
                 actualSignature !== undefined ? // If signature is not same as version, encode signature in the fileInfo
-                    oldSignature === undefined ?
+                    signature === undefined ?
                         // If we havent computed signature, use fileInfo as is
                         value :
                         // Serialize fileInfo with new updated signature
-                        { version: value.version, signature: actualSignature, affectsGlobalScope: value.affectsGlobalScope, impliedFormat: value.impliedFormat } :
+                        { version: value.version, signature: signature, affectsGlobalScope: value.affectsGlobalScope, impliedFormat: value.impliedFormat } :
                     // Signature of the FileInfo is undefined, serialize it as false
                     { version: value.version, signature: false, affectsGlobalScope: value.affectsGlobalScope, impliedFormat: value.impliedFormat };
         });
@@ -120658,13 +120626,17 @@ var ts;
         if (state.exportedModulesMap) {
             exportedModulesMap = ts.mapDefined(ts.arrayFrom(state.exportedModulesMap.keys()).sort(ts.compareStringsCaseSensitive), function (key) {
                 var _a;
-                var oldValue = (_a = state.oldExportedModulesMap) === null || _a === void 0 ? void 0 : _a.get(key);
+                if (state.currentAffectedFilesExportedModulesMap) {
+                    if ((_a = state.currentAffectedFilesExportedModulesMap.deletedKeys()) === null || _a === void 0 ? void 0 : _a.has(key)) {
+                        return undefined;
+                    }
+                    var newValue = state.currentAffectedFilesExportedModulesMap.getValues(key);
+                    if (newValue) {
+                        return [toFileId(key), toFileIdListId(newValue)];
+                    }
+                }
                 // Not in temporary cache, use existing value
-                if (oldValue === undefined)
-                    return [toFileId(key), toFileIdListId(state.exportedModulesMap.getValues(key))];
-                if (oldValue)
-                    return [toFileId(key), toFileIdListId(oldValue)];
-                return undefined;
+                return [toFileId(key), toFileIdListId(state.exportedModulesMap.getValues(key))];
             });
         }
         var semanticDiagnosticsPerFile;
@@ -120675,7 +120647,9 @@ var ts;
                 (semanticDiagnosticsPerFile || (semanticDiagnosticsPerFile = [])).push(value.length ?
                     [
                         toFileId(key),
-                        convertToReusableDiagnostics(value, relativeToBuildInfo)
+                        state.hasReusableDiagnostic ?
+                            value :
+                            convertToReusableDiagnostics(value, relativeToBuildInfo)
                     ] :
                     toFileId(key));
             }
@@ -120690,27 +120664,16 @@ var ts;
                 }
             }
         }
-        var changeFileSet;
-        if (state.changedFilesSet.size) {
-            for (var _d = 0, _e = ts.arrayFrom(state.changedFilesSet.keys()).sort(ts.compareStringsCaseSensitive); _d < _e.length; _d++) {
-                var path = _e[_d];
-                (changeFileSet || (changeFileSet = [])).push(toFileId(path));
-            }
-        }
-        var result = {
+        return {
             fileNames: fileNames,
             fileInfos: fileInfos,
-            options: convertToProgramBuildInfoCompilerOptions(state.compilerOptions, "affectsMultiFileEmitBuildInfo"),
+            options: convertToProgramBuildInfoCompilerOptions(state.compilerOptions, relativeToBuildInfoEnsuringAbsolutePath),
             fileIdsList: fileIdsList,
             referencedMap: referencedMap,
             exportedModulesMap: exportedModulesMap,
             semanticDiagnosticsPerFile: semanticDiagnosticsPerFile,
             affectedFilesPendingEmit: affectedFilesPendingEmit,
-            changeFileSet: changeFileSet,
-            emitSignatures: emitSignatures,
-            dtsChangeTime: state.dtsChangeTime,
         };
-        return result;
         function relativeToBuildInfoEnsuringAbsolutePath(path) {
             return relativeToBuildInfo(ts.getNormalizedAbsolutePath(path, currentDirectory));
         }
@@ -120735,18 +120698,24 @@ var ts;
             }
             return fileIdListId;
         }
-        function convertToProgramBuildInfoCompilerOptions(options, optionKey) {
-            var result;
-            var optionsNameMap = ts.getOptionsNameMap().optionsNameMap;
-            for (var _i = 0, _a = ts.getOwnKeys(options).sort(ts.compareStringsCaseSensitive); _i < _a.length; _i++) {
-                var name = _a[_i];
-                var optionInfo = optionsNameMap.get(name.toLowerCase());
-                if (optionInfo === null || optionInfo === void 0 ? void 0 : optionInfo[optionKey]) {
-                    (result || (result = {}))[name] = convertToReusableCompilerOptionValue(optionInfo, options[name], relativeToBuildInfoEnsuringAbsolutePath);
-                }
+    }
+    function convertToProgramBuildInfoCompilerOptions(options, relativeToBuildInfo) {
+        var result;
+        var optionsNameMap = ts.getOptionsNameMap().optionsNameMap;
+        for (var _i = 0, _a = ts.getOwnKeys(options).sort(ts.compareStringsCaseSensitive); _i < _a.length; _i++) {
+            var name = _a[_i];
+            var optionKey = name.toLowerCase();
+            var optionInfo = optionsNameMap.get(optionKey);
+            if ((optionInfo === null || optionInfo === void 0 ? void 0 : optionInfo.affectsEmit) || (optionInfo === null || optionInfo === void 0 ? void 0 : optionInfo.affectsSemanticDiagnostics) ||
+                // We need to store `strict`, even though it won't be examined directly, so that the
+                // flags it controls (e.g. `strictNullChecks`) will be retrieved correctly from the buildinfo
+                optionKey === "strict" ||
+                // We need to store these to determine whether `lib` files need to be rechecked.
+                optionKey === "skiplibcheck" || optionKey === "skipdefaultlibcheck") {
+                (result || (result = {}))[name] = convertToReusableCompilerOptionValue(optionInfo, options[name], relativeToBuildInfo);
             }
-            return result;
         }
+        return result;
     }
     function convertToReusableCompilerOptionValue(option, value, relativeToBuildInfo) {
         if (option) {
@@ -120820,10 +120789,6 @@ var ts;
         return { host: host, newProgram: newProgram, oldProgram: oldProgram, configFileParsingDiagnostics: configFileParsingDiagnostics || ts.emptyArray };
     }
     ts.getBuilderCreationParameters = getBuilderCreationParameters;
-    function computeSignature(text, data, computeHash) {
-        return ts.BuilderState.computeSignature((data === null || data === void 0 ? void 0 : data.sourceMapUrlPos) !== undefined ? text.substring(0, data.sourceMapUrlPos) : text, computeHash);
-    }
-    ts.computeSignature = computeSignature;
     function createBuilderProgram(kind, _a) {
         var newProgram = _a.newProgram, host = _a.host, oldProgram = _a.oldProgram, configFileParsingDiagnostics = _a.configFileParsingDiagnostics;
         // Return same program if underlying program doesnt change
@@ -120842,8 +120807,8 @@ var ts;
          */
         var computeHash = ts.maybeBind(host, host.createHash);
         var state = createBuilderProgramState(newProgram, getCanonicalFileName, oldState, host.disableUseFileVersionAsSignature);
-        var backupEmitState;
-        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state, getCanonicalFileName, host); };
+        var backupState;
+        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state, getCanonicalFileName); };
         // To ensure that we arent storing any references to old program or new program without state
         newProgram = undefined; // TODO: GH#18217
         oldProgram = undefined;
@@ -120851,20 +120816,20 @@ var ts;
         var getState = function () { return state; };
         var builderProgram = createRedirectedBuilderProgram(getState, configFileParsingDiagnostics);
         builderProgram.getState = getState;
-        builderProgram.backupEmitState = function () {
-            ts.Debug.assert(backupEmitState === undefined);
-            backupEmitState = backupEmitBuilderProgramState(state);
+        builderProgram.backupState = function () {
+            ts.Debug.assert(backupState === undefined);
+            backupState = cloneBuilderProgramState(state);
         };
-        builderProgram.restoreEmitState = function () {
-            restoreEmitBuilderProgramState(state, ts.Debug.checkDefined(backupEmitState));
-            backupEmitState = undefined;
+        builderProgram.restoreState = function () {
+            state = ts.Debug.checkDefined(backupState);
+            backupState = undefined;
         };
         builderProgram.getAllDependencies = function (sourceFile) { return ts.BuilderState.getAllDependencies(state, ts.Debug.checkDefined(state.program), sourceFile); };
         builderProgram.getSemanticDiagnostics = getSemanticDiagnostics;
         builderProgram.emit = emit;
         builderProgram.releaseProgram = function () {
             releaseCache(state);
-            backupEmitState = undefined;
+            backupState = undefined;
         };
         if (kind === BuilderProgramKind.SemanticDiagnosticsBuilderProgram) {
             builderProgram.getSemanticDiagnosticsOfNextAffectedFile = getSemanticDiagnosticsOfNextAffectedFile;
@@ -120923,59 +120888,35 @@ var ts;
             return toAffectedFileEmitResult(state, 
             // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
             // Otherwise just affected file
-            ts.Debug.checkDefined(state.program).emit(affected === state.program ? undefined : affected, ts.getEmitDeclarations(state.compilerOptions) ?
-                getWriteFileCallback(writeFile, customTransformers) :
+            ts.Debug.checkDefined(state.program).emit(affected === state.program ? undefined : affected, affected !== state.program && ts.getEmitDeclarations(state.compilerOptions) && !customTransformers ?
+                getWriteFileUpdatingSignatureCallback(writeFile) :
                 writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles || emitKind === 0 /* DtsOnly */, customTransformers), affected, emitKind, isPendingEmitFile);
         }
-        function getWriteFileCallback(writeFile, customTransformers) {
+        function getWriteFileUpdatingSignatureCallback(writeFile) {
             return function (fileName, text, writeByteOrderMark, onError, sourceFiles, data) {
-                var _a, _b, _c;
+                var _a;
                 if (ts.isDeclarationFileName(fileName)) {
-                    if (!ts.outFile(state.compilerOptions)) {
-                        ts.Debug.assert((sourceFiles === null || sourceFiles === void 0 ? void 0 : sourceFiles.length) === 1);
-                        var newSignature = void 0;
-                        if (!customTransformers) {
-                            var file = sourceFiles[0];
-                            var info = state.fileInfos.get(file.resolvedPath);
-                            if (info.signature === file.version) {
-                                newSignature = computeSignature(text, data, computeHash);
-                                if (newSignature !== file.version) { // Update it
-                                    if (host.storeFilesChangingSignatureDuringEmit)
-                                        (state.filesChangingSignature || (state.filesChangingSignature = new ts.Set())).add(file.resolvedPath);
-                                    if (state.exportedModulesMap)
-                                        ts.BuilderState.updateExportedModules(state, file, file.exportedModulesFromDeclarationEmit);
-                                    if (state.affectedFiles) {
-                                        // Keep old signature so we know what to undo if cancellation happens
-                                        var existing = (_a = state.oldSignatures) === null || _a === void 0 ? void 0 : _a.get(file.resolvedPath);
-                                        if (existing === undefined)
-                                            (state.oldSignatures || (state.oldSignatures = new ts.Map())).set(file.resolvedPath, info.signature || false);
-                                        info.signature = newSignature;
-                                    }
-                                    else {
-                                        // These are directly commited
-                                        info.signature = newSignature;
-                                        (_b = state.oldExportedModulesMap) === null || _b === void 0 ? void 0 : _b.clear();
-                                    }
-                                }
+                    ts.Debug.assert((sourceFiles === null || sourceFiles === void 0 ? void 0 : sourceFiles.length) === 1);
+                    var file = sourceFiles[0];
+                    var info = state.fileInfos.get(file.resolvedPath);
+                    var signature = ((_a = state.currentAffectedFilesSignatures) === null || _a === void 0 ? void 0 : _a.get(file.resolvedPath)) || info.signature;
+                    if (signature === file.version) {
+                        var newSignature = (computeHash || ts.generateDjb2Hash)((data === null || data === void 0 ? void 0 : data.sourceMapUrlPos) !== undefined ? text.substring(0, data.sourceMapUrlPos) : text);
+                        if (newSignature !== file.version) { // Update it
+                            if (host.storeFilesChangingSignatureDuringEmit)
+                                (state.filesChangingSignature || (state.filesChangingSignature = new ts.Set())).add(file.resolvedPath);
+                            if (state.exportedModulesMap)
+                                ts.BuilderState.updateExportedModules(file, file.exportedModulesFromDeclarationEmit, state.currentAffectedFilesExportedModulesMap || (state.currentAffectedFilesExportedModulesMap = ts.BuilderState.createManyToManyPathMap()));
+                            if (state.affectedFiles && state.affectedFilesIndex < state.affectedFiles.length) {
+                                state.currentAffectedFilesSignatures.set(file.resolvedPath, newSignature);
                             }
-                        }
-                        if (state.compilerOptions.composite) {
-                            var filePath = sourceFiles[0].resolvedPath;
-                            var oldSignature = (_c = state.emitSignatures) === null || _c === void 0 ? void 0 : _c.get(filePath);
-                            newSignature || (newSignature = computeSignature(text, data, computeHash));
-                            if (newSignature !== oldSignature) {
-                                (state.emitSignatures || (state.emitSignatures = new ts.Map())).set(filePath, newSignature);
-                                state.hasChangedEmitSignature = true;
+                            else {
+                                info.signature = newSignature;
+                                if (state.exportedModulesMap)
+                                    ts.BuilderState.updateExportedFilesMapFromCache(state, state.currentAffectedFilesExportedModulesMap);
                             }
                         }
                     }
-                    else if (state.compilerOptions.composite) {
-                        var newSignature = computeSignature(text, data, computeHash);
-                        if (newSignature !== state.outSignature) {
-                            state.outSignature = newSignature;
-                            state.hasChangedEmitSignature = true;
-                        }
-                    }
                 }
                 if (writeFile)
                     writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data);
@@ -121040,8 +120981,8 @@ var ts;
                     }
                 }
             }
-            return ts.Debug.checkDefined(state.program).emit(targetSourceFile, ts.getEmitDeclarations(state.compilerOptions) ?
-                getWriteFileCallback(writeFile, customTransformers) :
+            return ts.Debug.checkDefined(state.program).emit(targetSourceFile, !ts.outFile(state.compilerOptions) && ts.getEmitDeclarations(state.compilerOptions) && !customTransformers ?
+                getWriteFileUpdatingSignatureCallback(writeFile) :
                 writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         }
         /**
@@ -121130,58 +121071,29 @@ var ts;
                 { version: fileInfo.version, signature: fileInfo.signature === false ? undefined : fileInfo.version, affectsGlobalScope: fileInfo.affectsGlobalScope, impliedFormat: fileInfo.impliedFormat };
     }
     ts.toBuilderStateFileInfo = toBuilderStateFileInfo;
-    function createBuilderProgramUsingProgramBuildInfo(program, buildInfoPath, host) {
-        var _a, _b, _c, _d;
+    function createBuildProgramUsingProgramBuildInfo(program, buildInfoPath, host) {
+        var _a;
         var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
         var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
-        var state;
-        var filePaths;
-        var filePathsSetList;
-        if (isProgramBundleEmitBuildInfo(program)) {
-            state = {
-                fileInfos: new ts.Map(),
-                compilerOptions: program.options ? ts.convertToOptionsWithAbsolutePaths(program.options, toAbsolutePath) : {},
-                dtsChangeTime: program.dtsChangeTime,
-                outSignature: program.outSignature,
-            };
-        }
-        else {
-            filePaths = (_a = program.fileNames) === null || _a === void 0 ? void 0 : _a.map(toPath);
-            filePathsSetList = (_b = program.fileIdsList) === null || _b === void 0 ? void 0 : _b.map(function (fileIds) { return new ts.Set(fileIds.map(toFilePath)); });
-            var fileInfos_2 = new ts.Map();
-            var emitSignatures_1 = ((_c = program.options) === null || _c === void 0 ? void 0 : _c.composite) && !ts.outFile(program.options) ? new ts.Map() : undefined;
-            program.fileInfos.forEach(function (fileInfo, index) {
-                var path = toFilePath(index + 1);
-                var stateFileInfo = toBuilderStateFileInfo(fileInfo);
-                fileInfos_2.set(path, stateFileInfo);
-                if (emitSignatures_1 && stateFileInfo.signature)
-                    emitSignatures_1.set(path, stateFileInfo.signature);
-            });
-            (_d = program.emitSignatures) === null || _d === void 0 ? void 0 : _d.forEach(function (value) {
-                if (ts.isNumber(value))
-                    emitSignatures_1.delete(toFilePath(value));
-                else
-                    emitSignatures_1.set(toFilePath(value[0]), value[1]);
-            });
-            state = {
-                fileInfos: fileInfos_2,
-                compilerOptions: program.options ? ts.convertToOptionsWithAbsolutePaths(program.options, toAbsolutePath) : {},
-                referencedMap: toManyToManyPathMap(program.referencedMap),
-                exportedModulesMap: toManyToManyPathMap(program.exportedModulesMap),
-                semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && ts.arrayToMap(program.semanticDiagnosticsPerFile, function (value) { return toFilePath(ts.isNumber(value) ? value : value[0]); }, function (value) { return ts.isNumber(value) ? ts.emptyArray : value[1]; }),
-                hasReusableDiagnostic: true,
-                affectedFilesPendingEmit: ts.map(program.affectedFilesPendingEmit, function (value) { return toFilePath(value[0]); }),
-                affectedFilesPendingEmitKind: program.affectedFilesPendingEmit && ts.arrayToMap(program.affectedFilesPendingEmit, function (value) { return toFilePath(value[0]); }, function (value) { return value[1]; }),
-                affectedFilesPendingEmitIndex: program.affectedFilesPendingEmit && 0,
-                changedFilesSet: new ts.Set(ts.map(program.changeFileSet, toFilePath)),
-                dtsChangeTime: program.dtsChangeTime,
-                emitSignatures: (emitSignatures_1 === null || emitSignatures_1 === void 0 ? void 0 : emitSignatures_1.size) ? emitSignatures_1 : undefined,
-            };
-        }
+        var filePaths = program.fileNames.map(toPath);
+        var filePathsSetList = (_a = program.fileIdsList) === null || _a === void 0 ? void 0 : _a.map(function (fileIds) { return new ts.Set(fileIds.map(toFilePath)); });
+        var fileInfos = new ts.Map();
+        program.fileInfos.forEach(function (fileInfo, index) { return fileInfos.set(toFilePath(index + 1), toBuilderStateFileInfo(fileInfo)); });
+        var state = {
+            fileInfos: fileInfos,
+            compilerOptions: program.options ? ts.convertToOptionsWithAbsolutePaths(program.options, toAbsolutePath) : {},
+            referencedMap: toManyToManyPathMap(program.referencedMap),
+            exportedModulesMap: toManyToManyPathMap(program.exportedModulesMap),
+            semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && ts.arrayToMap(program.semanticDiagnosticsPerFile, function (value) { return toFilePath(ts.isNumber(value) ? value : value[0]); }, function (value) { return ts.isNumber(value) ? ts.emptyArray : value[1]; }),
+            hasReusableDiagnostic: true,
+            affectedFilesPendingEmit: ts.map(program.affectedFilesPendingEmit, function (value) { return toFilePath(value[0]); }),
+            affectedFilesPendingEmitKind: program.affectedFilesPendingEmit && ts.arrayToMap(program.affectedFilesPendingEmit, function (value) { return toFilePath(value[0]); }, function (value) { return value[1]; }),
+            affectedFilesPendingEmitIndex: program.affectedFilesPendingEmit && 0,
+        };
         return {
             getState: function () { return state; },
-            backupEmitState: ts.noop,
-            restoreEmitState: ts.noop,
+            backupState: ts.noop,
+            restoreState: ts.noop,
             getProgram: ts.notImplemented,
             getProgramOrUndefined: ts.returnUndefined,
             releaseProgram: ts.noop,
@@ -121226,24 +121138,12 @@ var ts;
             return map;
         }
     }
-    ts.createBuilderProgramUsingProgramBuildInfo = createBuilderProgramUsingProgramBuildInfo;
-    function getBuildInfoFileVersionMap(program, buildInfoPath, host) {
-        var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
-        var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
-        var fileInfos = new ts.Map();
-        program.fileInfos.forEach(function (fileInfo, index) {
-            var path = ts.toPath(program.fileNames[index], buildInfoDirectory, getCanonicalFileName);
-            var version = ts.isString(fileInfo) ? fileInfo : fileInfo.version; // eslint-disable-line @typescript-eslint/no-unnecessary-type-assertion
-            fileInfos.set(path, version);
-        });
-        return fileInfos;
-    }
-    ts.getBuildInfoFileVersionMap = getBuildInfoFileVersionMap;
+    ts.createBuildProgramUsingProgramBuildInfo = createBuildProgramUsingProgramBuildInfo;
     function createRedirectedBuilderProgram(getState, configFileParsingDiagnostics) {
         return {
             getState: ts.notImplemented,
-            backupEmitState: ts.noop,
-            restoreEmitState: ts.noop,
+            backupState: ts.noop,
+            restoreState: ts.noop,
             getProgram: getProgram,
             getProgramOrUndefined: function () { return getState().program; },
             releaseProgram: function () { return getState().program = undefined; },
@@ -122359,9 +122259,9 @@ var ts;
             if (!preferSymlinks) {
                 // Symlinks inside ignored paths are already filtered out of the symlink cache,
                 // so we only need to remove them from the realpath filenames.
-                var result_16 = ts.forEach(targets, function (p) { return !(shouldFilterIgnoredPaths && ts.containsIgnoredPath(p)) && cb(p, referenceRedirect === p); });
-                if (result_16)
-                    return result_16;
+                var result_15 = ts.forEach(targets, function (p) { return !(shouldFilterIgnoredPaths && ts.containsIgnoredPath(p)) && cb(p, referenceRedirect === p); });
+                if (result_15)
+                    return result_15;
             }
             var symlinkedDirectories = (_a = host.getSymlinkCache) === null || _a === void 0 ? void 0 : _a.call(host).getSymlinkedDirectoriesByRealpath();
             var fullImportedFileName = ts.getNormalizedAbsolutePath(importedFileName, cwd);
@@ -122381,10 +122281,10 @@ var ts;
                     for (var _i = 0, symlinkDirectories_1 = symlinkDirectories; _i < symlinkDirectories_1.length; _i++) {
                         var symlinkDirectory = symlinkDirectories_1[_i];
                         var option = ts.resolvePath(symlinkDirectory, relative);
-                        var result_17 = cb(option, target === referenceRedirect);
+                        var result_16 = cb(option, target === referenceRedirect);
                         shouldFilterIgnoredPaths = true; // We found a non-ignored path in symlinks, so we can reject ignored-path realpaths
-                        if (result_17)
-                            return result_17;
+                        if (result_16)
+                            return result_16;
                     }
                 });
             });
@@ -123294,7 +123194,6 @@ var ts;
             readDirectory: ts.maybeBind(host, host.readDirectory),
             disableUseFileVersionAsSignature: host.disableUseFileVersionAsSignature,
             storeFilesChangingSignatureDuringEmit: host.storeFilesChangingSignatureDuringEmit,
-            now: ts.maybeBind(host, host.now),
         };
         function writeFile(fileName, text, writeByteOrderMark, onError) {
             try {
@@ -123355,7 +123254,6 @@ var ts;
             createProgram: createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram,
             disableUseFileVersionAsSignature: system.disableUseFileVersionAsSignature,
             storeFilesChangingSignatureDuringEmit: system.storeFilesChangingSignatureDuringEmit,
-            now: ts.maybeBind(system, system.now),
         };
     }
     ts.createProgramHost = createProgramHost;
@@ -123423,26 +123321,20 @@ var ts;
 var ts;
 (function (ts) {
     function readBuilderProgram(compilerOptions, host) {
+        if (ts.outFile(compilerOptions))
+            return undefined;
         var buildInfoPath = ts.getTsBuildInfoEmitOutputFilePath(compilerOptions);
         if (!buildInfoPath)
             return undefined;
-        var buildInfo;
-        if (host.getBuildInfo) {
-            buildInfo = host.getBuildInfo(buildInfoPath, compilerOptions.configFilePath);
-            if (!buildInfo)
-                return undefined;
-        }
-        else {
-            var content = host.readFile(buildInfoPath);
-            if (!content)
-                return undefined;
-            buildInfo = ts.getBuildInfo(content);
-        }
+        var content = host.readFile(buildInfoPath);
+        if (!content)
+            return undefined;
+        var buildInfo = ts.getBuildInfo(content);
         if (buildInfo.version !== ts.version)
             return undefined;
         if (!buildInfo.program)
             return undefined;
-        return ts.createBuilderProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, host);
+        return ts.createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, host);
     }
     ts.readBuilderProgram = readBuilderProgram;
     function createIncrementalCompilerHost(options, system) {
@@ -123451,7 +123343,6 @@ var ts;
         host.createHash = ts.maybeBind(system, system.createHash);
         host.disableUseFileVersionAsSignature = system.disableUseFileVersionAsSignature;
         host.storeFilesChangingSignatureDuringEmit = system.storeFilesChangingSignatureDuringEmit;
-        host.now = ts.maybeBind(system, system.now);
         ts.setGetSourceFileAsHashVersioned(host, system);
         ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName); });
         return host;
@@ -124187,17 +124078,14 @@ var ts;
         UpToDateStatusType[UpToDateStatusType["OutputMissing"] = 4] = "OutputMissing";
         UpToDateStatusType[UpToDateStatusType["OutOfDateWithSelf"] = 5] = "OutOfDateWithSelf";
         UpToDateStatusType[UpToDateStatusType["OutOfDateWithUpstream"] = 6] = "OutOfDateWithUpstream";
-        UpToDateStatusType[UpToDateStatusType["OutOfDateBuildInfo"] = 7] = "OutOfDateBuildInfo";
-        UpToDateStatusType[UpToDateStatusType["UpstreamOutOfDate"] = 8] = "UpstreamOutOfDate";
-        UpToDateStatusType[UpToDateStatusType["UpstreamBlocked"] = 9] = "UpstreamBlocked";
-        UpToDateStatusType[UpToDateStatusType["ComputingUpstream"] = 10] = "ComputingUpstream";
-        UpToDateStatusType[UpToDateStatusType["TsVersionOutputOfDate"] = 11] = "TsVersionOutputOfDate";
-        UpToDateStatusType[UpToDateStatusType["UpToDateWithInputFileText"] = 12] = "UpToDateWithInputFileText";
+        UpToDateStatusType[UpToDateStatusType["UpstreamOutOfDate"] = 7] = "UpstreamOutOfDate";
+        UpToDateStatusType[UpToDateStatusType["UpstreamBlocked"] = 8] = "UpstreamBlocked";
+        UpToDateStatusType[UpToDateStatusType["ComputingUpstream"] = 9] = "ComputingUpstream";
+        UpToDateStatusType[UpToDateStatusType["TsVersionOutputOfDate"] = 10] = "TsVersionOutputOfDate";
         /**
          * Projects with no outputs (i.e. "solution" files)
          */
-        UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 13] = "ContainerOnly";
-        UpToDateStatusType[UpToDateStatusType["ForceBuild"] = 14] = "ForceBuild";
+        UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 11] = "ContainerOnly";
     })(UpToDateStatusType = ts.UpToDateStatusType || (ts.UpToDateStatusType = {}));
     function resolveConfigFileProjectName(project) {
         if (ts.fileExtensionIs(project, ".json" /* Json */)) {
@@ -124242,11 +124130,9 @@ var ts;
     function getOrCreateValueMapFromConfigFileMap(configFileMap, resolved) {
         return getOrCreateValueFromConfigFileMap(configFileMap, resolved, function () { return new ts.Map(); });
     }
-    /*@internal*/
-    function getCurrentTime(host) {
-        return host.now ? host.now() : new Date();
+    function newer(date1, date2) {
+        return date2 > date1 ? date2 : date1;
     }
-    ts.getCurrentTime = getCurrentTime;
     /*@internal*/
     function isCircularBuildOrder(buildOrder) {
         return !!buildOrder && !!buildOrder.buildOrder;
@@ -124336,7 +124222,6 @@ var ts;
                 return ts.loadWithTypeDirectiveCache(ts.Debug.checkEachDefined(typeReferenceDirectiveNames), containingFile, redirectedReference, containingFileMode, loader_4);
             };
         }
-        compilerHost.getBuildInfo = function (fileName, configFilePath) { return getBuildInfo(state, fileName, toResolvedConfigFilePath(state, configFilePath), /*modifiedTime*/ undefined); };
         var _a = ts.createWatchFactory(hostWithWatch, options), watchFile = _a.watchFile, watchDirectory = _a.watchDirectory, writeLog = _a.writeLog;
         var state = {
             host: host,
@@ -124353,9 +124238,8 @@ var ts;
             resolvedConfigFilePaths: new ts.Map(),
             configFileCache: new ts.Map(),
             projectStatus: new ts.Map(),
+            buildInfoChecked: new ts.Map(),
             extendedConfigCache: new ts.Map(),
-            buildInfoCache: new ts.Map(),
-            outputTimeStamps: new ts.Map(),
             builderPrograms: new ts.Map(),
             diagnostics: new ts.Map(),
             projectPendingBuild: new ts.Map(),
@@ -124378,7 +124262,6 @@ var ts;
             allWatchedConfigFiles: new ts.Map(),
             allWatchedExtendedConfigFiles: new ts.Map(),
             allWatchedPackageJsonFiles: new ts.Map(),
-            filesWatched: new ts.Map(),
             lastCachedPackageJsonLookups: new ts.Map(),
             timerToBuildInvalidatedProject: undefined,
             reportFileChangeDetected: false,
@@ -124489,12 +124372,11 @@ var ts;
         // Config file cache
         ts.mutateMapSkippingNewValues(state.configFileCache, currentProjects, noopOnDelete);
         ts.mutateMapSkippingNewValues(state.projectStatus, currentProjects, noopOnDelete);
+        ts.mutateMapSkippingNewValues(state.buildInfoChecked, currentProjects, noopOnDelete);
         ts.mutateMapSkippingNewValues(state.builderPrograms, currentProjects, noopOnDelete);
         ts.mutateMapSkippingNewValues(state.diagnostics, currentProjects, noopOnDelete);
         ts.mutateMapSkippingNewValues(state.projectPendingBuild, currentProjects, noopOnDelete);
         ts.mutateMapSkippingNewValues(state.projectErrorsReported, currentProjects, noopOnDelete);
-        ts.mutateMapSkippingNewValues(state.buildInfoCache, currentProjects, noopOnDelete);
-        ts.mutateMapSkippingNewValues(state.outputTimeStamps, currentProjects, noopOnDelete);
         // Remove watches for the program no longer in the solution
         if (state.watch) {
             ts.mutateMapSkippingNewValues(state.allWatchedConfigFiles, currentProjects, { onDeleteValue: ts.closeFileWatcher });
@@ -124791,21 +124673,21 @@ var ts;
         }
         function emit(writeFileCallback, cancellationToken, customTransformers) {
             var _a;
-            var _b, _c, _d;
+            var _b, _c;
             ts.Debug.assertIsDefined(program);
             ts.Debug.assert(step === BuildStep.Emit);
             // Before emitting lets backup state, so we can revert it back if there are declaration errors to handle emit and declaration errors correctly
-            program.backupEmitState();
+            program.backupState();
             var declDiagnostics;
             var reportDeclarationDiagnostics = function (d) { return (declDiagnostics || (declDiagnostics = [])).push(d); };
             var outputFiles = [];
             var emitResult = ts.emitFilesAndReportErrors(program, reportDeclarationDiagnostics, 
             /*write*/ undefined, 
-            /*reportSummary*/ undefined, function (name, text, writeByteOrderMark, _onError, _sourceFiles, data) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark, buildInfo: data === null || data === void 0 ? void 0 : data.buildInfo }); }, cancellationToken, 
+            /*reportSummary*/ undefined, function (name, text, writeByteOrderMark) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); }, cancellationToken, 
             /*emitOnlyDts*/ false, customTransformers || ((_c = (_b = state.host).getCustomTransformers) === null || _c === void 0 ? void 0 : _c.call(_b, project))).emitResult;
             // Don't emit .d.ts if there are decl file errors
             if (declDiagnostics) {
-                program.restoreEmitState();
+                program.restoreState();
                 (_a = buildErrors(state, projectPath, program, config, declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file"), buildResult = _a.buildResult, step = _a.step);
                 return {
                     emitSkipped: true,
@@ -124815,46 +124697,40 @@ var ts;
             // Actual Emit
             var host = state.host, compilerHost = state.compilerHost;
             var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
-            var existingBuildInfo = ((_d = state.buildInfoCache.get(projectPath)) === null || _d === void 0 ? void 0 : _d.buildInfo) || undefined;
+            var newestDeclarationFileContentChangedTime = minimumDate;
+            var anyDtsChanged = false;
             var emitterDiagnostics = ts.createDiagnosticCollection();
             var emittedOutputs = new ts.Map();
-            var options = program.getCompilerOptions();
-            var isIncremental = ts.isIncrementalCompilation(options);
-            var outputTimeStampMap;
-            var now;
             ts.solutionPerformance.mark("beforeOutputFilesWrite");
             outputFiles.forEach(function (_a) {
-                var _b, _c;
-                var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark, buildInfo = _a.buildInfo;
-                var path = toPath(state, name);
-                emittedOutputs.set(toPath(state, name), name);
-                if (buildInfo) {
-                    setBuildInfo(state, buildInfo, projectPath, options);
-                    if (((_b = buildInfo.program) === null || _b === void 0 ? void 0 : _b.dtsChangeTime) !== ((_c = existingBuildInfo === null || existingBuildInfo === void 0 ? void 0 : existingBuildInfo.program) === null || _c === void 0 ? void 0 : _c.dtsChangeTime)) {
+                var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
+                var priorChangeTime;
+                if (!anyDtsChanged && ts.isDeclarationFileName(name)) {
+                    // Check for unchanged .d.ts files
+                    if (host.fileExists(name) && state.readFileWithCache(name) === text) {
+                        priorChangeTime = host.getModifiedTime(name);
+                    }
+                    else {
                         resultFlags &= ~BuildResultFlags.DeclarationOutputUnchanged;
+                        anyDtsChanged = true;
                     }
                 }
+                emittedOutputs.set(toPath(state, name), name);
                 ts.writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
-                if (!isIncremental && state.watch) {
-                    (outputTimeStampMap || (outputTimeStampMap = getOutputTimeStampMap(state, projectPath))).set(path, now || (now = getCurrentTime(state.host)));
+                if (priorChangeTime !== undefined) {
+                    newestDeclarationFileContentChangedTime = newer(priorChangeTime, newestDeclarationFileContentChangedTime);
                 }
             });
             ts.solutionPerformance.mark("afterOutputFilesWrite");
             ts.solutionPerformance.measure("OutputFilesWrite", "beforeOutputFilesWrite", "afterOutputFilesWrite");
-            finishEmit(emitterDiagnostics, emittedOutputs, outputFiles.length ? outputFiles[0].name : ts.getFirstProjectOutput(config, !host.useCaseSensitiveFileNames()), resultFlags);
+            finishEmit(emitterDiagnostics, emittedOutputs, newestDeclarationFileContentChangedTime, 
+            /*newestDeclarationFileContentChangedTimeIsMaximumDate*/ anyDtsChanged, outputFiles.length ? outputFiles[0].name : ts.getFirstProjectOutput(config, !host.useCaseSensitiveFileNames()), resultFlags);
             return emitResult;
         }
         function emitBuildInfo(writeFileCallback, cancellationToken) {
             ts.Debug.assertIsDefined(program);
             ts.Debug.assert(step === BuildStep.EmitBuildInfo);
-            var emitResult = program.emitBuildInfo(function (name, text, writeByteOrderMark, onError, sourceFiles, data) {
-                if (data === null || data === void 0 ? void 0 : data.buildInfo)
-                    setBuildInfo(state, data.buildInfo, projectPath, program.getCompilerOptions());
-                if (writeFileCallback)
-                    writeFileCallback(name, text, writeByteOrderMark, onError, sourceFiles, data);
-                else
-                    state.compilerHost.writeFile(name, text, writeByteOrderMark, onError, sourceFiles, data);
-            }, cancellationToken);
+            var emitResult = program.emitBuildInfo(writeFileCallback, cancellationToken);
             if (emitResult.diagnostics.length) {
                 reportErrors(state, emitResult.diagnostics);
                 state.diagnostics.set(projectPath, __spreadArray(__spreadArray([], state.diagnostics.get(projectPath), true), emitResult.diagnostics, true));
@@ -124867,7 +124743,7 @@ var ts;
             step = BuildStep.QueueReferencingProjects;
             return emitResult;
         }
-        function finishEmit(emitterDiagnostics, emittedOutputs, oldestOutputFileName, resultFlags) {
+        function finishEmit(emitterDiagnostics, emittedOutputs, priorNewestUpdateTime, newestDeclarationFileContentChangedTimeIsMaximumDate, oldestOutputFileName, resultFlags) {
             var _a;
             var emitDiagnostics = emitterDiagnostics.getDiagnostics();
             if (emitDiagnostics.length) {
@@ -124878,11 +124754,13 @@ var ts;
                 emittedOutputs.forEach(function (name) { return listEmittedFile(state, config, name); });
             }
             // Update time stamps for rest of the outputs
-            updateOutputTimestampsWorker(state, config, projectPath, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
+            var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(state, config, priorNewestUpdateTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
             state.diagnostics.delete(projectPath);
             state.projectStatus.set(projectPath, {
                 type: ts.UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: getDtsChangeTime(state, config.options, projectPath),
+                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTimeIsMaximumDate ?
+                    maximumDate :
+                    newestDeclarationFileContentChangedTime,
                 oldestOutputFileName: oldestOutputFileName
             });
             afterProgramDone(state, program, config);
@@ -124917,21 +124795,13 @@ var ts;
             ts.Debug.assert(!!outputFiles.length);
             var emitterDiagnostics = ts.createDiagnosticCollection();
             var emittedOutputs = new ts.Map();
-            var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
-            var existingBuildInfo = state.buildInfoCache.get(projectPath).buildInfo;
             outputFiles.forEach(function (_a) {
-                var _b, _c;
-                var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark, buildInfo = _a.buildInfo;
+                var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
                 emittedOutputs.set(toPath(state, name), name);
-                if (buildInfo) {
-                    setBuildInfo(state, buildInfo, projectPath, config.options);
-                    if (((_b = buildInfo.program) === null || _b === void 0 ? void 0 : _b.dtsChangeTime) !== ((_c = existingBuildInfo.program) === null || _c === void 0 ? void 0 : _c.dtsChangeTime)) {
-                        resultFlags &= ~BuildResultFlags.DeclarationOutputUnchanged;
-                    }
-                }
                 ts.writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
             });
-            var emitDiagnostics = finishEmit(emitterDiagnostics, emittedOutputs, outputFiles[0].name, resultFlags);
+            var emitDiagnostics = finishEmit(emitterDiagnostics, emittedOutputs, minimumDate, 
+            /*newestDeclarationFileContentChangedTimeIsMaximumDate*/ false, outputFiles[0].name, BuildResultFlags.DeclarationOutputUnchanged);
             return { emitSkipped: false, diagnostics: emitDiagnostics };
         }
         function executeSteps(till, cancellationToken, writeFile, customTransformers) {
@@ -125037,7 +124907,7 @@ var ts;
                     }
                     continue;
                 }
-                if (status.type === ts.UpToDateStatusType.UpToDateWithUpstreamTypes || status.type === ts.UpToDateStatusType.UpToDateWithInputFileText) {
+                if (status.type === ts.UpToDateStatusType.UpToDateWithUpstreamTypes) {
                     reportAndStoreErrors(state, projectPath, ts.getConfigFileParsingDiagnostics(config));
                     return {
                         kind: InvalidatedProjectKind.UpdateOutputFileStamps,
@@ -125123,7 +124993,7 @@ var ts;
         state.projectCompilerOptions = state.baseCompilerOptions;
     }
     function buildErrors(state, resolvedPath, program, config, diagnostics, buildResult, errorType) {
-        var canEmitBuildInfo = program && !ts.outFile(program.getCompilerOptions());
+        var canEmitBuildInfo = !(buildResult & BuildResultFlags.SyntaxErrors) && program && !ts.outFile(program.getCompilerOptions());
         reportAndStoreErrors(state, resolvedPath, diagnostics);
         state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
         if (canEmitBuildInfo)
@@ -125131,101 +125001,9 @@ var ts;
         afterProgramDone(state, program, config);
         return { buildResult: buildResult, step: BuildStep.QueueReferencingProjects };
     }
-    function isFileWatcherWithModifiedTime(value) {
-        return !!value.watcher;
-    }
-    function getModifiedTime(state, fileName) {
-        var path = toPath(state, fileName);
-        var existing = state.filesWatched.get(path);
-        if (state.watch && !!existing) {
-            if (!isFileWatcherWithModifiedTime(existing))
-                return existing;
-            if (existing.modifiedTime)
-                return existing.modifiedTime;
-        }
-        var result = ts.getModifiedTime(state.host, fileName);
-        if (state.watch) {
-            if (existing)
-                existing.modifiedTime = result;
-            else
-                state.filesWatched.set(path, result);
-        }
-        return result;
-    }
-    function watchFile(state, file, callback, pollingInterval, options, watchType, project) {
-        var path = toPath(state, file);
-        var existing = state.filesWatched.get(path);
-        if (existing && isFileWatcherWithModifiedTime(existing)) {
-            existing.callbacks.push(callback);
-        }
-        else {
-            var watcher = state.watchFile(file, function (fileName, eventKind, modifiedTime) {
-                var existing = ts.Debug.checkDefined(state.filesWatched.get(path));
-                ts.Debug.assert(isFileWatcherWithModifiedTime(existing));
-                existing.modifiedTime = modifiedTime;
-                existing.callbacks.forEach(function (cb) { return cb(fileName, eventKind, modifiedTime); });
-            }, pollingInterval, options, watchType, project);
-            state.filesWatched.set(path, { callbacks: [callback], watcher: watcher, modifiedTime: existing });
-        }
-        return {
-            close: function () {
-                var existing = ts.Debug.checkDefined(state.filesWatched.get(path));
-                ts.Debug.assert(isFileWatcherWithModifiedTime(existing));
-                if (existing.callbacks.length === 1) {
-                    state.filesWatched.delete(path);
-                    ts.closeFileWatcherOf(existing);
-                }
-                else {
-                    ts.unorderedRemoveItem(existing.callbacks, callback);
-                }
-            }
-        };
-    }
-    function getOutputTimeStampMap(state, resolvedConfigFilePath) {
-        if (!state.watch)
-            return undefined;
-        var result = state.outputTimeStamps.get(resolvedConfigFilePath);
-        if (!result)
-            state.outputTimeStamps.set(resolvedConfigFilePath, result = new ts.Map());
-        return result;
-    }
-    function setBuildInfo(state, buildInfo, resolvedConfigPath, options) {
-        var buildInfoPath = ts.getTsBuildInfoEmitOutputFilePath(options);
-        var existing = getBuildInfoCacheEntry(state, buildInfoPath, resolvedConfigPath);
-        if (existing) {
-            existing.buildInfo = buildInfo;
-            existing.modifiedTime = getCurrentTime(state.host);
-        }
-        else {
-            state.buildInfoCache.set(resolvedConfigPath, { path: toPath(state, buildInfoPath), buildInfo: buildInfo, modifiedTime: getCurrentTime(state.host) });
-        }
-    }
-    function getBuildInfoCacheEntry(state, buildInfoPath, resolvedConfigPath) {
-        var path = toPath(state, buildInfoPath);
-        var existing = state.buildInfoCache.get(resolvedConfigPath);
-        return (existing === null || existing === void 0 ? void 0 : existing.path) === path ? existing : undefined;
-    }
-    function getBuildInfo(state, buildInfoPath, resolvedConfigPath, modifiedTime) {
-        var path = toPath(state, buildInfoPath);
-        var existing = state.buildInfoCache.get(resolvedConfigPath);
-        if (existing !== undefined && existing.path === path) {
-            return existing.buildInfo || undefined;
-        }
-        ts.solutionPerformance.mark("beforeGetBuildInfo");
-        ts.solutionPerformance.mark("beforeBuildInfoRead");
-        var value = state.readFileWithCache(buildInfoPath);
-        ts.solutionPerformance.mark("afterBuildInfoRead");
-        ts.solutionPerformance.measure("BuildInfoRead", "beforeBuildInfoRead", "afterBuildInfoRead");
-        var buildInfo = value ? ts.getBuildInfo(value) : undefined;
-        ts.Debug.assert(modifiedTime || !buildInfo);
-        state.buildInfoCache.set(resolvedConfigPath, { path: path, buildInfo: buildInfo || false, modifiedTime: modifiedTime || ts.missingFileModifiedTime });
-        ts.solutionPerformance.mark("afterGetBuildInfo");
-        ts.solutionPerformance.measure("GetBuildInfo", "beforeGetBuildInfo", "afterGetBuildInfo");
-        return buildInfo;
-    }
     function checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName) {
         // Check tsconfig time
-        var tsconfigTime = getModifiedTime(state, configFile);
+        var tsconfigTime = ts.getModifiedTime(state.host, configFile);
         if (oldestOutputFileTime < tsconfigTime) {
             return {
                 type: ts.UpToDateStatusType.OutOfDateWithSelf,
@@ -125235,24 +125013,88 @@ var ts;
         }
     }
     function getUpToDateStatusWorker(state, project, resolvedPath) {
-        var _a, _b, _c;
+        var force = !!state.options.force;
+        var newestInputFileName = undefined;
+        var newestInputFileTime = minimumDate;
+        var host = state.host;
+        // Get timestamps of input files
+        for (var _i = 0, _a = project.fileNames; _i < _a.length; _i++) {
+            var inputFile = _a[_i];
+            if (!host.fileExists(inputFile)) {
+                return {
+                    type: ts.UpToDateStatusType.Unbuildable,
+                    reason: inputFile + " does not exist"
+                };
+            }
+            if (!force) {
+                var inputTime = ts.getModifiedTime(host, inputFile);
+                if (inputTime > newestInputFileTime) {
+                    newestInputFileName = inputFile;
+                    newestInputFileTime = inputTime;
+                }
+            }
+        }
         // Container if no files are specified in the project
         if (!project.fileNames.length && !ts.canJsonReportNoInputFiles(project.raw)) {
             return {
                 type: ts.UpToDateStatusType.ContainerOnly
             };
         }
-        // Fast check to see if reference projects are buildable
-        var referenceStatuses;
-        var force = !!state.options.force;
+        // Collect the expected outputs of this project
+        var outputs = ts.getAllProjectOutputs(project, !host.useCaseSensitiveFileNames());
+        // Now see if all outputs are newer than the newest input
+        var oldestOutputFileName = "(none)";
+        var oldestOutputFileTime = maximumDate;
+        var newestOutputFileName = "(none)";
+        var newestOutputFileTime = minimumDate;
+        var missingOutputFileName;
+        var newestDeclarationFileContentChangedTime = minimumDate;
+        var isOutOfDateWithInputs = false;
+        if (!force) {
+            for (var _b = 0, outputs_1 = outputs; _b < outputs_1.length; _b++) {
+                var output = outputs_1[_b];
+                // Output is missing; can stop checking
+                // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
+                if (!host.fileExists(output)) {
+                    missingOutputFileName = output;
+                    break;
+                }
+                var outputTime = ts.getModifiedTime(host, output);
+                if (outputTime < oldestOutputFileTime) {
+                    oldestOutputFileTime = outputTime;
+                    oldestOutputFileName = output;
+                }
+                // If an output is older than the newest input, we can stop checking
+                // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
+                if (outputTime < newestInputFileTime) {
+                    isOutOfDateWithInputs = true;
+                    break;
+                }
+                if (outputTime > newestOutputFileTime) {
+                    newestOutputFileTime = outputTime;
+                    newestOutputFileName = output;
+                }
+                // Keep track of when the most recent time a .d.ts file was changed.
+                // In addition to file timestamps, we also keep track of when a .d.ts file
+                // had its file touched but not had its contents changed - this allows us
+                // to skip a downstream typecheck
+                if (ts.isDeclarationFileName(output)) {
+                    var outputModifiedTime = ts.getModifiedTime(host, output);
+                    newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
+                }
+            }
+        }
+        var pseudoUpToDate = false;
+        var usesPrepend = false;
+        var upstreamChangedProject;
         if (project.projectReferences) {
             state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.ComputingUpstream });
-            for (var _i = 0, _d = project.projectReferences; _i < _d.length; _i++) {
-                var ref = _d[_i];
+            for (var _c = 0, _d = project.projectReferences; _c < _d.length; _c++) {
+                var ref = _d[_c];
+                usesPrepend = usesPrepend || !!(ref.prepend);
                 var resolvedRef = ts.resolveProjectReferencePath(ref);
                 var resolvedRefPath = toResolvedConfigFilePath(state, resolvedRef);
-                var resolvedConfig = parseConfigFile(state, resolvedRef, resolvedRefPath);
-                var refStatus = getUpToDateStatus(state, resolvedConfig, resolvedRefPath);
+                var refStatus = getUpToDateStatus(state, parseConfigFile(state, resolvedRef, resolvedRefPath), resolvedRefPath);
                 // Its a circular reference ignore the status of this project
                 if (refStatus.type === ts.UpToDateStatusType.ComputingUpstream ||
                     refStatus.type === ts.UpToDateStatusType.ContainerOnly) { // Container only ignore this project
@@ -125274,188 +125116,78 @@ var ts;
                         upstreamProjectName: ref.path
                     };
                 }
-                if (!force)
-                    (referenceStatuses || (referenceStatuses = [])).push({ ref: ref, refStatus: refStatus, resolvedRefPath: resolvedRefPath, resolvedConfig: resolvedConfig });
-            }
-        }
-        if (force)
-            return { type: ts.UpToDateStatusType.ForceBuild };
-        // Check buildinfo first
-        var host = state.host;
-        var buildInfoPath = ts.getTsBuildInfoEmitOutputFilePath(project.options);
-        var oldestOutputFileName = "(none)";
-        var oldestOutputFileTime = maximumDate;
-        var buildInfoTime;
-        var buildInfoProgram;
-        var buildInfoVersionMap;
-        var newestDeclarationFileContentChangedTime;
-        if (buildInfoPath) {
-            var buildInfoCacheEntry_1 = getBuildInfoCacheEntry(state, buildInfoPath, resolvedPath);
-            buildInfoTime = (buildInfoCacheEntry_1 === null || buildInfoCacheEntry_1 === void 0 ? void 0 : buildInfoCacheEntry_1.modifiedTime) || ts.getModifiedTime(host, buildInfoPath);
-            if (buildInfoTime === ts.missingFileModifiedTime) {
-                if (!buildInfoCacheEntry_1) {
-                    state.buildInfoCache.set(resolvedPath, {
-                        path: toPath(state, buildInfoPath),
-                        buildInfo: false,
-                        modifiedTime: buildInfoTime
-                    });
-                }
-                return {
-                    type: ts.UpToDateStatusType.OutputMissing,
-                    missingOutputFileName: buildInfoPath
-                };
-            }
-            var buildInfo = ts.Debug.checkDefined(getBuildInfo(state, buildInfoPath, resolvedPath, buildInfoTime));
-            if ((buildInfo.bundle || buildInfo.program) && buildInfo.version !== ts.version) {
-                return {
-                    type: ts.UpToDateStatusType.TsVersionOutputOfDate,
-                    version: buildInfo.version
-                };
-            }
-            if (buildInfo.program) {
-                if (((_a = buildInfo.program.changeFileSet) === null || _a === void 0 ? void 0 : _a.length) ||
-                    (!project.options.noEmit && ((_b = buildInfo.program.affectedFilesPendingEmit) === null || _b === void 0 ? void 0 : _b.length))) {
+                // Check oldest output file name only if there is no missing output file name
+                // (a check we will have skipped if this is a forced build)
+                if (!force && !missingOutputFileName) {
+                    // If the upstream project's newest file is older than our oldest output, we
+                    // can't be out of date because of it
+                    if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
+                        continue;
+                    }
+                    // If the upstream project has only change .d.ts files, and we've built
+                    // *after* those files, then we're "psuedo up to date" and eligible for a fast rebuild
+                    if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
+                        pseudoUpToDate = true;
+                        upstreamChangedProject = ref.path;
+                        continue;
+                    }
+                    // We have an output older than an upstream output - we are out of date
+                    ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
                     return {
-                        type: ts.UpToDateStatusType.OutOfDateBuildInfo,
-                        buildInfoFile: buildInfoPath
+                        type: ts.UpToDateStatusType.OutOfDateWithUpstream,
+                        outOfDateOutputFileName: oldestOutputFileName,
+                        newerProjectName: ref.path
                     };
                 }
-                buildInfoProgram = buildInfo.program;
             }
-            oldestOutputFileTime = buildInfoTime;
-            oldestOutputFileName = buildInfoPath;
-            newestDeclarationFileContentChangedTime = ((_c = buildInfo.program) === null || _c === void 0 ? void 0 : _c.dtsChangeTime) ? new Date(buildInfo.program.dtsChangeTime) : undefined;
         }
-        // Check input files
-        var newestInputFileName = undefined;
-        var newestInputFileTime = minimumDate;
-        var pseudoInputUptodate = false;
-        // Get timestamps of input files
-        for (var _e = 0, _f = project.fileNames; _e < _f.length; _e++) {
-            var inputFile = _f[_e];
-            var inputTime = getModifiedTime(state, inputFile);
-            if (inputTime === ts.missingFileModifiedTime) {
-                return {
-                    type: ts.UpToDateStatusType.Unbuildable,
-                    reason: inputFile + " does not exist"
-                };
-            }
-            // If an buildInfo is older than the newest input, we can stop checking
-            if (buildInfoTime && buildInfoTime < inputTime) {
-                var version_3 = void 0;
-                var currentVersion = void 0;
-                if (buildInfoProgram) {
-                    // Read files and see if they are same, read is anyways cached
-                    if (!buildInfoVersionMap)
-                        buildInfoVersionMap = ts.getBuildInfoFileVersionMap(buildInfoProgram, buildInfoPath, host);
-                    version_3 = buildInfoVersionMap.get(toPath(state, inputFile));
-                    var text = version_3 ? state.readFileWithCache(inputFile) : undefined;
-                    currentVersion = text && (host.createHash || ts.generateDjb2Hash)(text);
-                    if (version_3 && version_3 === currentVersion)
-                        pseudoInputUptodate = true;
-                }
-                if (!version_3 || version_3 !== currentVersion) {
-                    return {
-                        type: ts.UpToDateStatusType.OutOfDateWithSelf,
-                        outOfDateOutputFileName: buildInfoPath,
-                        newerInputFileName: inputFile
-                    };
-                }
-            }
-            if (inputTime > newestInputFileTime) {
-                newestInputFileName = inputFile;
-                newestInputFileTime = inputTime;
-            }
+        if (missingOutputFileName !== undefined) {
+            return {
+                type: ts.UpToDateStatusType.OutputMissing,
+                missingOutputFileName: missingOutputFileName
+            };
         }
-        // Now see if all outputs are newer than the newest input
-        // Dont check output timestamps if we have buildinfo telling us output is uptodate
-        if (!buildInfoPath) {
-            // Collect the expected outputs of this project
-            var outputs = ts.getAllProjectOutputs(project, !host.useCaseSensitiveFileNames());
-            var outputTimeStampMap = getOutputTimeStampMap(state, resolvedPath);
-            for (var _g = 0, outputs_1 = outputs; _g < outputs_1.length; _g++) {
-                var output = outputs_1[_g];
-                var path = toPath(state, output);
-                // Output is missing; can stop checking
-                var outputTime = outputTimeStampMap === null || outputTimeStampMap === void 0 ? void 0 : outputTimeStampMap.get(path);
-                if (!outputTime) {
-                    outputTime = ts.getModifiedTime(state.host, output);
-                    outputTimeStampMap === null || outputTimeStampMap === void 0 ? void 0 : outputTimeStampMap.set(path, outputTime);
-                }
-                if (outputTime === ts.missingFileModifiedTime) {
-                    return {
-                        type: ts.UpToDateStatusType.OutputMissing,
-                        missingOutputFileName: output
-                    };
-                }
-                if (outputTime < oldestOutputFileTime) {
-                    oldestOutputFileTime = outputTime;
-                    oldestOutputFileName = output;
-                }
-                // If an output is older than the newest input, we can stop checking
-                if (outputTime < newestInputFileTime) {
-                    return {
-                        type: ts.UpToDateStatusType.OutOfDateWithSelf,
-                        outOfDateOutputFileName: oldestOutputFileName,
-                        newerInputFileName: newestInputFileName
-                    };
-                }
-            }
+        if (isOutOfDateWithInputs) {
+            return {
+                type: ts.UpToDateStatusType.OutOfDateWithSelf,
+                outOfDateOutputFileName: oldestOutputFileName,
+                newerInputFileName: newestInputFileName
+            };
         }
-        var seenRefs = buildInfoPath ? new ts.Set() : undefined;
-        var buildInfoCacheEntry = state.buildInfoCache.get(resolvedPath);
-        seenRefs === null || seenRefs === void 0 ? void 0 : seenRefs.add(resolvedPath);
-        var pseudoUpToDate = false;
-        var usesPrepend = false;
-        var upstreamChangedProject;
-        if (referenceStatuses) {
-            for (var _h = 0, referenceStatuses_1 = referenceStatuses; _h < referenceStatuses_1.length; _h++) {
-                var _j = referenceStatuses_1[_h], ref = _j.ref, refStatus = _j.refStatus, resolvedConfig = _j.resolvedConfig, resolvedRefPath = _j.resolvedRefPath;
-                usesPrepend = usesPrepend || !!(ref.prepend);
-                // If the upstream project's newest file is older than our oldest output, we
-                // can't be out of date because of it
-                if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
-                    continue;
-                }
-                // Check if tsbuildinfo path is shared, then we need to rebuild
-                if (buildInfoCacheEntry && hasSameBuildInfo(state, buildInfoCacheEntry, seenRefs, resolvedConfig, resolvedRefPath)) {
+        else {
+            // Check tsconfig time
+            var configStatus = checkConfigFileUpToDateStatus(state, project.options.configFilePath, oldestOutputFileTime, oldestOutputFileName);
+            if (configStatus)
+                return configStatus;
+            // Check extended config time
+            var extendedConfigStatus = ts.forEach(project.options.configFile.extendedSourceFiles || ts.emptyArray, function (configFile) { return checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName); });
+            if (extendedConfigStatus)
+                return extendedConfigStatus;
+            // Check package file time
+            var dependentPackageFileStatus = ts.forEach(state.lastCachedPackageJsonLookups.get(resolvedPath) || ts.emptyArray, function (_a) {
+                var path = _a[0];
+                return checkConfigFileUpToDateStatus(state, path, oldestOutputFileTime, oldestOutputFileName);
+            });
+            if (dependentPackageFileStatus)
+                return dependentPackageFileStatus;
+        }
+        if (!force && !state.buildInfoChecked.has(resolvedPath)) {
+            state.buildInfoChecked.set(resolvedPath, true);
+            var buildInfoPath = ts.getTsBuildInfoEmitOutputFilePath(project.options);
+            if (buildInfoPath) {
+                ts.solutionPerformance.mark("beforeBuildInfoRead");
+                var value = state.readFileWithCache(buildInfoPath);
+                ts.solutionPerformance.mark("afterBuildInfoRead");
+                ts.solutionPerformance.measure("BuildInfoRead", "beforeBuildInfoRead", "afterBuildInfoRead");
+                var buildInfo = value && ts.getBuildInfo(value);
+                if (buildInfo && (buildInfo.bundle || buildInfo.program) && buildInfo.version !== ts.version) {
                     return {
-                        type: ts.UpToDateStatusType.OutOfDateWithUpstream,
-                        outOfDateOutputFileName: buildInfoPath,
-                        newerProjectName: ref.path
+                        type: ts.UpToDateStatusType.TsVersionOutputOfDate,
+                        version: buildInfo.version
                     };
                 }
-                // If the upstream project has only change .d.ts files, and we've built
-                // *after* those files, then we're "psuedo up to date" and eligible for a fast rebuild
-                if (refStatus.newestDeclarationFileContentChangedTime && refStatus.newestDeclarationFileContentChangedTime <= oldestOutputFileTime) {
-                    pseudoUpToDate = true;
-                    upstreamChangedProject = ref.path;
-                    continue;
-                }
-                // We have an output older than an upstream output - we are out of date
-                ts.Debug.assert(oldestOutputFileName !== undefined, "Should have an oldest output filename here");
-                return {
-                    type: ts.UpToDateStatusType.OutOfDateWithUpstream,
-                    outOfDateOutputFileName: oldestOutputFileName,
-                    newerProjectName: ref.path
-                };
             }
         }
-        // Check tsconfig time
-        var configStatus = checkConfigFileUpToDateStatus(state, project.options.configFilePath, oldestOutputFileTime, oldestOutputFileName);
-        if (configStatus)
-            return configStatus;
-        // Check extended config time
-        var extendedConfigStatus = ts.forEach(project.options.configFile.extendedSourceFiles || ts.emptyArray, function (configFile) { return checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName); });
-        if (extendedConfigStatus)
-            return extendedConfigStatus;
-        // Check package file time
-        var dependentPackageFileStatus = ts.forEach(state.lastCachedPackageJsonLookups.get(resolvedPath) || ts.emptyArray, function (_a) {
-            var path = _a[0];
-            return checkConfigFileUpToDateStatus(state, path, oldestOutputFileTime, oldestOutputFileName);
-        });
-        if (dependentPackageFileStatus)
-            return dependentPackageFileStatus;
         if (usesPrepend && pseudoUpToDate) {
             return {
                 type: ts.UpToDateStatusType.OutOfDateWithPrepend,
@@ -125465,37 +125197,15 @@ var ts;
         }
         // Up to date
         return {
-            type: pseudoUpToDate ?
-                ts.UpToDateStatusType.UpToDateWithUpstreamTypes :
-                pseudoInputUptodate ?
-                    ts.UpToDateStatusType.UpToDateWithInputFileText :
-                    ts.UpToDateStatusType.UpToDate,
+            type: pseudoUpToDate ? ts.UpToDateStatusType.UpToDateWithUpstreamTypes : ts.UpToDateStatusType.UpToDate,
             newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTime,
             newestInputFileTime: newestInputFileTime,
+            newestOutputFileTime: newestOutputFileTime,
             newestInputFileName: newestInputFileName,
+            newestOutputFileName: newestOutputFileName,
             oldestOutputFileName: oldestOutputFileName
         };
     }
-    function hasSameBuildInfo(state, buildInfoCacheEntry, seenRefs, resolvedConfig, resolvedRefPath) {
-        if (seenRefs.has(resolvedRefPath))
-            return false;
-        seenRefs.add(resolvedRefPath);
-        var refBuildInfo = state.buildInfoCache.get(resolvedRefPath);
-        if (refBuildInfo.path === buildInfoCacheEntry.path)
-            return true;
-        if (resolvedConfig.projectReferences) {
-            // Check references
-            for (var _i = 0, _a = resolvedConfig.projectReferences; _i < _a.length; _i++) {
-                var ref = _a[_i];
-                var resolvedRef = ts.resolveProjectReferencePath(ref);
-                var resolvedRefPath_1 = toResolvedConfigFilePath(state, resolvedRef);
-                var resolvedConfig_1 = parseConfigFile(state, resolvedRef, resolvedRefPath_1);
-                if (hasSameBuildInfo(state, buildInfoCacheEntry, seenRefs, resolvedConfig_1, resolvedRefPath_1))
-                    return true;
-            }
-        }
-        return false;
-    }
     function getUpToDateStatus(state, project, resolvedPath) {
         if (project === undefined) {
             return { type: ts.UpToDateStatusType.Unbuildable, reason: "File deleted mid-build" };
@@ -125511,69 +125221,42 @@ var ts;
         state.projectStatus.set(resolvedPath, actual);
         return actual;
     }
-    function updateOutputTimestampsWorker(state, proj, projectPath, verboseMessage, skipOutputs) {
+    function updateOutputTimestampsWorker(state, proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
         if (proj.options.noEmit)
-            return;
-        var now;
+            return priorNewestUpdateTime;
         ts.solutionPerformance.mark("beforeUpdateOutputTimestamps");
-        var buildInfoPath = ts.getTsBuildInfoEmitOutputFilePath(proj.options);
-        if (buildInfoPath) {
-            if (!(skipOutputs === null || skipOutputs === void 0 ? void 0 : skipOutputs.has(toPath(state, buildInfoPath)))) {
-                if (!!state.options.verbose)
+        var host = state.host;
+        var outputs = ts.getAllProjectOutputs(proj, !host.useCaseSensitiveFileNames());
+        if (!skipOutputs || outputs.length !== skipOutputs.size) {
+            var reportVerbose = !!state.options.verbose;
+            var now = host.now ? host.now() : new Date();
+            for (var _i = 0, outputs_2 = outputs; _i < outputs_2.length; _i++) {
+                var file = outputs_2[_i];
+                if (skipOutputs && skipOutputs.has(toPath(state, file))) {
+                    continue;
+                }
+                if (reportVerbose) {
+                    reportVerbose = false;
                     reportStatus(state, verboseMessage, proj.options.configFilePath);
-                state.host.setModifiedTime(buildInfoPath, now = getCurrentTime(state.host));
-                getBuildInfoCacheEntry(state, buildInfoPath, projectPath).modifiedTime = now;
-            }
-            state.outputTimeStamps.delete(projectPath);
-        }
-        else {
-            var host = state.host;
-            var outputs = ts.getAllProjectOutputs(proj, !host.useCaseSensitiveFileNames());
-            var outputTimeStampMap_1 = getOutputTimeStampMap(state, projectPath);
-            var modifiedOutputs_1 = outputTimeStampMap_1 ? new ts.Set() : undefined;
-            if (!skipOutputs || outputs.length !== skipOutputs.size) {
-                var reportVerbose = !!state.options.verbose;
-                for (var _i = 0, outputs_2 = outputs; _i < outputs_2.length; _i++) {
-                    var file = outputs_2[_i];
-                    var path = toPath(state, file);
-                    if (skipOutputs === null || skipOutputs === void 0 ? void 0 : skipOutputs.has(path))
-                        continue;
-                    if (reportVerbose) {
-                        reportVerbose = false;
-                        reportStatus(state, verboseMessage, proj.options.configFilePath);
-                    }
-                    host.setModifiedTime(file, now || (now = getCurrentTime(state.host)));
-                    if (outputTimeStampMap_1) {
-                        outputTimeStampMap_1.set(path, now);
-                        modifiedOutputs_1.add(path);
-                    }
                 }
+                if (ts.isDeclarationFileName(file)) {
+                    priorNewestUpdateTime = newer(priorNewestUpdateTime, ts.getModifiedTime(host, file));
+                }
+                host.setModifiedTime(file, now);
             }
-            // Clear out timestamps not in output list any more
-            outputTimeStampMap_1 === null || outputTimeStampMap_1 === void 0 ? void 0 : outputTimeStampMap_1.forEach(function (_value, key) {
-                if (!(skipOutputs === null || skipOutputs === void 0 ? void 0 : skipOutputs.has(key)) && !modifiedOutputs_1.has(key))
-                    outputTimeStampMap_1.delete(key);
-            });
         }
         ts.solutionPerformance.mark("afterUpdateOutputTimestamps");
         ts.solutionPerformance.measure("UpdateOutputTimestamps", "beforeUpdateOutputTimestamps", "afterUpdateOutputTimestamps");
-    }
-    function getDtsChangeTime(state, options, resolvedConfigPath) {
-        var _a;
-        if (!options.composite)
-            return undefined;
-        var buildInfoPath = ts.getTsBuildInfoEmitOutputFilePath(options);
-        var buildInfo = getBuildInfo(state, buildInfoPath, resolvedConfigPath, /*modifiedTime*/ undefined);
-        return ((_a = buildInfo === null || buildInfo === void 0 ? void 0 : buildInfo.program) === null || _a === void 0 ? void 0 : _a.dtsChangeTime) ? new Date(buildInfo.program.dtsChangeTime) : undefined;
+        return priorNewestUpdateTime;
     }
     function updateOutputTimestamps(state, proj, resolvedPath) {
         if (state.options.dry) {
             return reportStatus(state, ts.Diagnostics.A_non_dry_build_would_update_timestamps_for_output_of_project_0, proj.options.configFilePath);
         }
-        updateOutputTimestampsWorker(state, proj, resolvedPath, ts.Diagnostics.Updating_output_timestamps_of_project_0);
+        var priorNewestUpdateTime = updateOutputTimestampsWorker(state, proj, minimumDate, ts.Diagnostics.Updating_output_timestamps_of_project_0);
         state.projectStatus.set(resolvedPath, {
             type: ts.UpToDateStatusType.UpToDate,
-            newestDeclarationFileContentChangedTime: getDtsChangeTime(state, proj.options, resolvedPath),
+            newestDeclarationFileContentChangedTime: priorNewestUpdateTime,
             oldestOutputFileName: ts.getFirstProjectOutput(proj, !state.host.useCaseSensitiveFileNames())
         });
     }
@@ -125619,7 +125302,6 @@ var ts;
                                 break;
                             }
                         // falls through
-                        case ts.UpToDateStatusType.UpToDateWithInputFileText:
                         case ts.UpToDateStatusType.UpToDateWithUpstreamTypes:
                         case ts.UpToDateStatusType.OutOfDateWithPrepend:
                             if (!(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
@@ -125804,10 +125486,12 @@ var ts;
     function watchConfigFile(state, resolved, resolvedPath, parsed) {
         if (!state.watch || state.allWatchedConfigFiles.has(resolvedPath))
             return;
-        state.allWatchedConfigFiles.set(resolvedPath, watchFile(state, resolved, function () { return invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Full); }, ts.PollingInterval.High, parsed === null || parsed === void 0 ? void 0 : parsed.watchOptions, ts.WatchType.ConfigFile, resolved));
+        state.allWatchedConfigFiles.set(resolvedPath, state.watchFile(resolved, function () {
+            invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Full);
+        }, ts.PollingInterval.High, parsed === null || parsed === void 0 ? void 0 : parsed.watchOptions, ts.WatchType.ConfigFile, resolved));
     }
     function watchExtendedConfigFiles(state, resolvedPath, parsed) {
-        ts.updateSharedExtendedConfigFileWatcher(resolvedPath, parsed === null || parsed === void 0 ? void 0 : parsed.options, state.allWatchedExtendedConfigFiles, function (extendedConfigFileName, extendedConfigFilePath) { return watchFile(state, extendedConfigFileName, function () {
+        ts.updateSharedExtendedConfigFileWatcher(resolvedPath, parsed === null || parsed === void 0 ? void 0 : parsed.options, state.allWatchedExtendedConfigFiles, function (extendedConfigFileName, extendedConfigFilePath) { return state.watchFile(extendedConfigFileName, function () {
             var _a;
             return (_a = state.allWatchedExtendedConfigFiles.get(extendedConfigFilePath)) === null || _a === void 0 ? void 0 : _a.projects.forEach(function (projectConfigFilePath) {
                 return invalidateProjectAndScheduleBuilds(state, projectConfigFilePath, ts.ConfigFileProgramReloadLevel.Full);
@@ -125839,7 +125523,7 @@ var ts;
         if (!state.watch)
             return;
         ts.mutateMap(getOrCreateValueMapFromConfigFileMap(state.allWatchedInputFiles, resolvedPath), ts.arrayToMap(parsed.fileNames, function (fileName) { return toPath(state, fileName); }), {
-            createNewValue: function (_path, input) { return watchFile(state, input, function () { return invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.Low, parsed === null || parsed === void 0 ? void 0 : parsed.watchOptions, ts.WatchType.SourceFile, resolved); },
+            createNewValue: function (_path, input) { return state.watchFile(input, function () { return invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.Low, parsed === null || parsed === void 0 ? void 0 : parsed.watchOptions, ts.WatchType.SourceFile, resolved); },
             onDeleteValue: ts.closeFileWatcher,
         });
     }
@@ -125847,7 +125531,7 @@ var ts;
         if (!state.watch || !state.lastCachedPackageJsonLookups)
             return;
         ts.mutateMap(getOrCreateValueMapFromConfigFileMap(state.allWatchedPackageJsonFiles, resolvedPath), new ts.Map(state.lastCachedPackageJsonLookups.get(resolvedPath)), {
-            createNewValue: function (path, _input) { return watchFile(state, path, function () { return invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.High, parsed === null || parsed === void 0 ? void 0 : parsed.watchOptions, ts.WatchType.PackageJson, resolved); },
+            createNewValue: function (path, _input) { return state.watchFile(path, function () { return invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.None); }, ts.PollingInterval.High, parsed === null || parsed === void 0 ? void 0 : parsed.watchOptions, ts.WatchType.PackageJson, resolved); },
             onDeleteValue: ts.closeFileWatcher,
         });
     }
@@ -125980,18 +125664,19 @@ var ts;
         }
     }
     function reportUpToDateStatus(state, configFileName, status) {
+        if (state.options.force && (status.type === ts.UpToDateStatusType.UpToDate || status.type === ts.UpToDateStatusType.UpToDateWithUpstreamTypes)) {
+            return reportStatus(state, ts.Diagnostics.Project_0_is_being_forcibly_rebuilt, relName(state, configFileName));
+        }
         switch (status.type) {
             case ts.UpToDateStatusType.OutOfDateWithSelf:
-                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_1_is_older_than_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerInputFileName));
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerInputFileName));
             case ts.UpToDateStatusType.OutOfDateWithUpstream:
-                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_1_is_older_than_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerProjectName));
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerProjectName));
             case ts.UpToDateStatusType.OutputMissing:
                 return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, relName(state, configFileName), relName(state, status.missingOutputFileName));
-            case ts.UpToDateStatusType.OutOfDateBuildInfo:
-                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_are_not_emitted, relName(state, configFileName), relName(state, status.buildInfoFile));
             case ts.UpToDateStatusType.UpToDate:
                 if (status.newestInputFileTime !== undefined) {
-                    return reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_output_2, relName(state, configFileName), relName(state, status.newestInputFileName || ""), relName(state, status.oldestOutputFileName || ""));
+                    return reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date_because_newest_input_1_is_older_than_oldest_output_2, relName(state, configFileName), relName(state, status.newestInputFileName || ""), relName(state, status.oldestOutputFileName || ""));
                 }
                 // Don't report anything for "up to date because it was already built" -- too verbose
                 break;
@@ -125999,8 +125684,6 @@ var ts;
                 return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_of_its_dependency_1_has_changed, relName(state, configFileName), relName(state, status.newerProjectName));
             case ts.UpToDateStatusType.UpToDateWithUpstreamTypes:
                 return reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date_with_d_ts_files_from_its_dependencies, relName(state, configFileName));
-            case ts.UpToDateStatusType.UpToDateWithInputFileText:
-                return reportStatus(state, ts.Diagnostics.Project_0_is_up_to_date_but_needs_update_to_timestamps_of_output_files_that_are_older_than_input_files, relName(state, configFileName));
             case ts.UpToDateStatusType.UpstreamOutOfDate:
                 return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_its_dependency_1_is_out_of_date, relName(state, configFileName), relName(state, status.upstreamProjectName));
             case ts.UpToDateStatusType.UpstreamBlocked:
@@ -126011,8 +125694,6 @@ var ts;
                 return reportStatus(state, ts.Diagnostics.Failed_to_parse_file_0_Colon_1, relName(state, configFileName), status.reason);
             case ts.UpToDateStatusType.TsVersionOutputOfDate:
                 return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_for_it_was_generated_with_version_1_that_differs_with_current_version_2, relName(state, configFileName), status.version, ts.version);
-            case ts.UpToDateStatusType.ForceBuild:
-                return reportStatus(state, ts.Diagnostics.Project_0_is_being_forcibly_rebuilt, relName(state, configFileName));
             case ts.UpToDateStatusType.ContainerOnly:
             // Don't report status on "solution" projects
             // falls through