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

package/lib/tsserverlibrary.js

@@ -294,7 +294,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.20220531";
+    ts.version = ts.versionMajorMinor + ".0-insiders.20220601";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -3717,6 +3717,7 @@ var ts;
         var marks = new ts.Map();
         var counts = new ts.Map();
         var durations = new ts.Map();
+        var durationMarks = new ts.Set();
         return {
             createTimerIf: createTimerIf,
             createTimer: createTimer,
@@ -3725,6 +3726,7 @@ var ts;
             getCount: getCount,
             getDuration: getDuration,
             forEachMeasure: forEachMeasure,
+            forEachCount: forEachCount,
             isEnabled: isEnabled,
             enable: enable,
             disable: disable,
@@ -3779,6 +3781,7 @@ var ts;
         function measure(measureName, startMarkName, endMarkName) {
             var _a, _b;
             if (enabled) {
+                durationMarks.add(startMarkName).add(endMarkName);
                 var end = (_a = marks.get(endMarkName)) !== null && _a !== void 0 ? _a : ts.timestamp();
                 var start = (_b = marks.get(startMarkName)) !== null && _b !== void 0 ? _b : timeorigin;
                 var previousDuration = durations.get(measureName) || 0;
@@ -3810,6 +3813,14 @@ var ts;
         function forEachMeasure(cb) {
             durations.forEach(function (duration, measureName) { return cb(measureName, duration); });
         }
+        /**
+         * Iterate over each count which is not duration mark, performing some action
+         *
+         * @param cb The action to perform for each measure
+         */
+        function forEachCount(cb) {
+            counts.forEach(function (count, countName) { return !durationMarks.has(countName) && cb(countName, count); });
+        }
         /**
          * Indicates whether the performance API is enabled.
          */
@@ -6394,7 +6405,7 @@ var ts;
             };
         }
         function createDirectoryWatcher(dirName, dirPath, fallbackOptions) {
-            var watcher = fsWatch(dirName, 1 /* Directory */, function (_eventName, relativeFileName) {
+            var watcher = fsWatch(dirName, 1 /* Directory */, function (_eventName, relativeFileName, modifiedTime) {
                 // When files are deleted from disk, the triggered "rename" event would have a relativefileName of "undefined"
                 if (!ts.isString(relativeFileName))
                     return;
@@ -6404,7 +6415,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);
+                        fileCallback(fileName, FileWatcherEventKind.Changed, modifiedTime);
                     }
                 }
             }, 
@@ -6458,7 +6469,7 @@ var ts;
             }
             else {
                 cache.set(path, {
-                    watcher: watchFile(fileName, function (fileName, eventKind) { return ts.forEach(callbacksCache.get(path), function (cb) { return cb(fileName, eventKind); }); }, pollingInterval, options),
+                    watcher: watchFile(fileName, function (fileName, eventKind, modifiedTime) { return ts.forEach(callbacksCache.get(path), function (cb) { return cb(fileName, eventKind, modifiedTime); }); }, pollingInterval, options),
                     refCount: 1
                 });
             }
@@ -6486,7 +6497,7 @@ var ts;
         var newTime = modifiedTime.getTime();
         if (oldTime !== newTime) {
             watchedFile.mtime = modifiedTime;
-            watchedFile.callback(watchedFile.fileName, getFileWatcherEventKind(oldTime, newTime));
+            watchedFile.callback(watchedFile.fileName, getFileWatcherEventKind(oldTime, newTime), modifiedTime);
             return true;
         }
         return false;
@@ -6737,17 +6748,18 @@ var ts;
     })(FileSystemEntryKind = ts.FileSystemEntryKind || (ts.FileSystemEntryKind = {}));
     /*@internal*/
     function createFileWatcherCallback(callback) {
-        return function (_fileName, eventKind) { return callback(eventKind === FileWatcherEventKind.Changed ? "change" : "rename", ""); };
+        return function (_fileName, eventKind, modifiedTime) { return callback(eventKind === FileWatcherEventKind.Changed ? "change" : "rename", "", modifiedTime); };
     }
     ts.createFileWatcherCallback = createFileWatcherCallback;
-    function createFsWatchCallbackForFileWatcherCallback(fileName, callback, fileExists) {
-        return function (eventName) {
+    function createFsWatchCallbackForFileWatcherCallback(fileName, callback, getModifiedTime) {
+        return function (eventName, _relativeFileName, modifiedTime) {
             if (eventName === "rename") {
-                callback(fileName, fileExists(fileName) ? FileWatcherEventKind.Created : FileWatcherEventKind.Deleted);
+                modifiedTime || (modifiedTime = getModifiedTime(fileName) || ts.missingFileModifiedTime);
+                callback(fileName, modifiedTime !== ts.missingFileModifiedTime ? FileWatcherEventKind.Created : FileWatcherEventKind.Deleted, modifiedTime);
             }
             else {
                 // Change
-                callback(fileName, FileWatcherEventKind.Changed);
+                callback(fileName, FileWatcherEventKind.Changed, modifiedTime);
             }
         };
     }
@@ -6771,7 +6783,7 @@ var ts;
     }
     /*@internal*/
     function createSystemWatchFunctions(_a) {
-        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 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 dynamicPollingWatchFile;
         var fixedChunkSizePollingWatchFile;
         var nonPollingWatchFile;
@@ -6793,7 +6805,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, fileExists), 
+                    return fsWatch(fileName, 0 /* File */, createFsWatchCallbackForFileWatcherCallback(fileName, callback, getModifiedTime), 
                     /*recursive*/ false, pollingInterval, ts.getFallbackOptions(options));
                 case ts.WatchFileKind.UseFsEventsOnParentDirectory:
                     if (!nonPollingWatchFile) {
@@ -6975,7 +6987,6 @@ 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,
@@ -7235,7 +7246,7 @@ var ts;
                         // File changed
                         eventKind = FileWatcherEventKind.Changed;
                     }
-                    callback(fileName, eventKind);
+                    callback(fileName, eventKind, curr.mtime);
                 }
             }
             function fsWatch(fileOrDirectory, entryKind, callback, recursive, fallbackPollingInterval, fallbackOptions) {
@@ -7261,10 +7272,10 @@ var ts;
                  * Invoke the callback with rename and update the watcher if not closed
                  * @param createWatcher
                  */
-                function invokeCallbackAndUpdateWatcher(createWatcher) {
+                function invokeCallbackAndUpdateWatcher(createWatcher, modifiedTime) {
                     sysLog("sysLog:: " + fileOrDirectory + ":: Changing watcher to " + (createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing") + "FileSystemEntryWatcher");
                     // Call the callback for current directory
-                    callback("rename", "");
+                    callback("rename", "", modifiedTime);
                     // If watcher is not closed, update it
                     if (watcher) {
                         watcher.close();
@@ -7310,13 +7321,14 @@ 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)) &&
-                        !fileSystemEntryExists(fileOrDirectory, entryKind) ?
-                        invokeCallbackAndUpdateWatcher(watchMissingFileSystemEntry) :
-                        callback(event, relativeName);
+                        modifiedTime === ts.missingFileModifiedTime ?
+                        invokeCallbackAndUpdateWatcher(watchMissingFileSystemEntry, modifiedTime) :
+                        callback(event, relativeName, modifiedTime);
                 }
                 /**
                  * Watch the file or directory using fs.watchFile since fs.watch threw exception
@@ -7330,12 +7342,15 @@ var ts;
                  * and switch to existing file or directory when the missing filesystem entry is created
                  */
                 function watchMissingFileSystemEntry() {
-                    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);
+                    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);
+                            }
                         }
                     }, fallbackPollingInterval, fallbackOptions);
                 }
@@ -7485,12 +7500,19 @@ 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 {
@@ -9102,6 +9124,7 @@ var ts;
         Import_assertion_values_must_be_string_literal_expressions: diag(2837, ts.DiagnosticCategory.Error, "Import_assertion_values_must_be_string_literal_expressions_2837", "Import assertion values must be string literal expressions."),
         All_declarations_of_0_must_have_identical_constraints: diag(2838, ts.DiagnosticCategory.Error, "All_declarations_of_0_must_have_identical_constraints_2838", "All declarations of '{0}' must have identical constraints."),
         This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value: diag(2839, ts.DiagnosticCategory.Error, "This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value_2839", "This condition will always return '{0}' since JavaScript compares objects by reference, not value."),
+        An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_classes: diag(2840, ts.DiagnosticCategory.Error, "An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_clas_2840", "An interface cannot extend a primitive type like '{0}'; an interface can only extend named types and classes"),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -9512,8 +9535,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_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_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_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"),
@@ -9544,7 +9567,7 @@ var ts;
         Project_0_can_t_be_built_because_its_dependency_1_was_not_built: diag(6383, ts.DiagnosticCategory.Message, "Project_0_can_t_be_built_because_its_dependency_1_was_not_built_6383", "Project '{0}' can't be built because its dependency '{1}' was not built"),
         Have_recompiles_in_incremental_and_watch_assume_that_changes_within_a_file_will_only_affect_files_directly_depending_on_it: diag(6384, ts.DiagnosticCategory.Message, "Have_recompiles_in_incremental_and_watch_assume_that_changes_within_a_file_will_only_affect_files_di_6384", "Have recompiles in '--incremental' and '--watch' assume that changes within a file will only affect files directly depending on it."),
         _0_is_deprecated: diag(6385, ts.DiagnosticCategory.Suggestion, "_0_is_deprecated_6385", "'{0}' is deprecated.", /*reportsUnnecessary*/ undefined, /*elidedInCompatabilityPyramid*/ undefined, /*reportsDeprecated*/ true),
-        Performance_timings_for_diagnostics_or_extendedDiagnostics_are_not_available_in_this_session_A_native_implementation_of_the_Web_Performance_API_could_not_be_found: diag(6386, ts.DiagnosticCategory.Message, "Performance_timings_for_diagnostics_or_extendedDiagnostics_are_not_available_in_this_session_A_nativ_6386", "Performance timings for '--diagnostics' or '--extendedDiagnostics' are not available in this session. A native implementation of the Web Performance API could not be found."),
+        Performance_timings_for_diagnostics_or_extendedDiagnostics_or_solutionDiagnostics_are_not_available_in_this_session_A_native_implementation_of_the_Web_Performance_API_could_not_be_found: diag(6386, ts.DiagnosticCategory.Message, "Performance_timings_for_diagnostics_or_extendedDiagnostics_or_solutionDiagnostics_are_not_available__6386", "Performance timings for '--diagnostics' or '--extendedDiagnostics' or '--solutionDiagnostics' are not available in this session. A native implementation of the Web Performance API could not be found."),
         The_signature_0_of_1_is_deprecated: diag(6387, ts.DiagnosticCategory.Suggestion, "The_signature_0_of_1_is_deprecated_6387", "The signature '{0}' of '{1}' is deprecated.", /*reportsUnnecessary*/ undefined, /*elidedInCompatabilityPyramid*/ undefined, /*reportsDeprecated*/ true),
         Project_0_is_being_forcibly_rebuilt: diag(6388, ts.DiagnosticCategory.Message, "Project_0_is_being_forcibly_rebuilt_6388", "Project '{0}' is being forcibly rebuilt"),
         Reusing_resolution_of_module_0_from_1_of_old_program_it_was_not_resolved: diag(6389, ts.DiagnosticCategory.Message, "Reusing_resolution_of_module_0_from_1_of_old_program_it_was_not_resolved_6389", "Reusing resolution of module '{0}' from '{1}' of old program, it was not resolved."),
@@ -9557,6 +9580,8 @@ 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."),
@@ -9678,6 +9703,7 @@ var ts;
         Specify_how_the_TypeScript_watch_mode_works: diag(6715, ts.DiagnosticCategory.Message, "Specify_how_the_TypeScript_watch_mode_works_6715", "Specify how the TypeScript watch mode works."),
         Require_undeclared_properties_from_index_signatures_to_use_element_accesses: diag(6717, ts.DiagnosticCategory.Message, "Require_undeclared_properties_from_index_signatures_to_use_element_accesses_6717", "Require undeclared properties from index signatures to use element accesses."),
         Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types: diag(6718, ts.DiagnosticCategory.Message, "Specify_emit_Slashchecking_behavior_for_imports_that_are_only_used_for_types_6718", "Specify emit/checking behavior for imports that are only used for types."),
+        Output_more_detailed_solution_performance_information_after_building: diag(6719, ts.DiagnosticCategory.Message, "Output_more_detailed_solution_performance_information_after_building_6719", "Output more detailed solution performance information after building."),
         Default_catch_clause_variables_as_unknown_instead_of_any: diag(6803, ts.DiagnosticCategory.Message, "Default_catch_clause_variables_as_unknown_instead_of_any_6803", "Default catch clause variables as 'unknown' instead of 'any'."),
         one_of_Colon: diag(6900, ts.DiagnosticCategory.Message, "one_of_Colon_6900", "one of:"),
         one_or_more_Colon: diag(6901, ts.DiagnosticCategory.Message, "one_or_more_Colon_6901", "one or more:"),
@@ -20386,6 +20412,10 @@ 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];
     }
@@ -39426,6 +39456,7 @@ 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,
@@ -39460,12 +39491,40 @@ 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
         {
@@ -39527,37 +39586,14 @@ 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,
-        {
-            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,
-        },
+        ts.moduleOptionDeclaration,
         {
             name: "lib",
             type: "list",
@@ -39594,6 +39630,7 @@ var ts;
             type: jsxOptionMap,
             affectsSourceFile: true,
             affectsEmit: true,
+            affectsMultiFileEmitBuildInfo: true,
             affectsModuleResolution: true,
             paramType: ts.Diagnostics.KIND,
             showInSimplifiedHelpView: true,
@@ -39606,6 +39643,7 @@ var ts;
             shortName: "d",
             type: "boolean",
             affectsEmit: true,
+            affectsMultiFileEmitBuildInfo: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Emit,
             transpileOptionValue: undefined,
@@ -39616,6 +39654,7 @@ var ts;
             name: "declarationMap",
             type: "boolean",
             affectsEmit: true,
+            affectsMultiFileEmitBuildInfo: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Emit,
             transpileOptionValue: undefined,
@@ -39626,6 +39665,7 @@ 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,
@@ -39636,6 +39676,7 @@ var ts;
             name: "sourceMap",
             type: "boolean",
             affectsEmit: true,
+            affectsMultiFileEmitBuildInfo: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Emit,
             defaultValueDescription: false,
@@ -39645,6 +39686,9 @@ var ts;
             name: "outFile",
             type: "string",
             affectsEmit: true,
+            affectsMultiFileEmitBuildInfo: true,
+            affectsDeclarationPath: true,
+            affectsBundleEmitBuildInfo: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
             showInSimplifiedHelpView: true,
@@ -39656,6 +39700,8 @@ var ts;
             name: "outDir",
             type: "string",
             affectsEmit: true,
+            affectsMultiFileEmitBuildInfo: true,
+            affectsDeclarationPath: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             showInSimplifiedHelpView: true,
@@ -39666,6 +39712,8 @@ var ts;
             name: "rootDir",
             type: "string",
             affectsEmit: true,
+            affectsMultiFileEmitBuildInfo: true,
+            affectsDeclarationPath: true,
             isFilePath: true,
             paramType: ts.Diagnostics.LOCATION,
             category: ts.Diagnostics.Modules,
@@ -39676,6 +39724,8 @@ var ts;
             name: "composite",
             type: "boolean",
             affectsEmit: true,
+            affectsMultiFileEmitBuildInfo: true,
+            affectsBundleEmitBuildInfo: true,
             isTSConfigOnly: true,
             category: ts.Diagnostics.Projects,
             transpileOptionValue: undefined,
@@ -39686,6 +39736,8 @@ var ts;
             name: "tsBuildInfoFile",
             type: "string",
             affectsEmit: true,
+            affectsMultiFileEmitBuildInfo: true,
+            affectsBundleEmitBuildInfo: true,
             isFilePath: true,
             paramType: ts.Diagnostics.FILE,
             category: ts.Diagnostics.Projects,
@@ -39697,6 +39749,7 @@ var ts;
             name: "removeComments",
             type: "boolean",
             affectsEmit: true,
+            affectsMultiFileEmitBuildInfo: true,
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Emit,
             defaultValueDescription: false,
@@ -39715,6 +39768,7 @@ 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,
@@ -39728,6 +39782,7 @@ 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 */,
@@ -39736,6 +39791,7 @@ 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,
@@ -39754,6 +39810,9 @@ 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,
@@ -39763,6 +39822,7 @@ 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,
@@ -39772,6 +39832,7 @@ 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,
@@ -39780,6 +39841,8 @@ 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,
@@ -39788,6 +39851,8 @@ 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,
@@ -39797,6 +39862,7 @@ 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,
@@ -39806,6 +39872,7 @@ 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,
@@ -39815,6 +39882,7 @@ 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,
@@ -39824,6 +39892,8 @@ 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,
@@ -39834,6 +39904,7 @@ 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,
@@ -39842,6 +39913,7 @@ 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,
@@ -39850,6 +39922,7 @@ 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,
@@ -39858,6 +39931,7 @@ 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,
@@ -39867,6 +39941,7 @@ 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,
@@ -39875,6 +39950,7 @@ 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,
@@ -39883,6 +39959,7 @@ 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,
@@ -39890,6 +39967,8 @@ 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,
@@ -39975,6 +40054,7 @@ 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
@@ -39984,6 +40064,7 @@ 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,
@@ -40000,6 +40081,7 @@ 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,
@@ -40021,6 +40103,7 @@ 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,
@@ -40029,6 +40112,7 @@ 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,
@@ -40037,6 +40121,7 @@ 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,
@@ -40045,6 +40130,7 @@ 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,
@@ -40054,6 +40140,7 @@ 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,
@@ -40063,6 +40150,7 @@ 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,
@@ -40087,6 +40175,7 @@ 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,
@@ -40104,6 +40193,9 @@ 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,
@@ -40115,6 +40207,7 @@ 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`",
@@ -40122,6 +40215,8 @@ 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,
@@ -40137,6 +40232,7 @@ 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,
@@ -40148,6 +40244,7 @@ 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,
@@ -40157,6 +40254,7 @@ 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,
@@ -40187,6 +40285,7 @@ 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,
@@ -40227,6 +40326,7 @@ 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,
@@ -40235,6 +40335,7 @@ 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,
@@ -40243,6 +40344,7 @@ 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,
@@ -40252,6 +40354,7 @@ 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,
@@ -40260,6 +40363,8 @@ var ts;
             name: "declarationDir",
             type: "string",
             affectsEmit: true,
+            affectsMultiFileEmitBuildInfo: true,
+            affectsDeclarationPath: true,
             isFilePath: true,
             paramType: ts.Diagnostics.DIRECTORY,
             category: ts.Diagnostics.Emit,
@@ -40269,6 +40374,8 @@ 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,
@@ -40278,6 +40385,7 @@ 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,
@@ -40287,6 +40395,7 @@ 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,
@@ -40295,6 +40404,7 @@ 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,
@@ -40303,6 +40413,7 @@ 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,
@@ -40327,6 +40438,7 @@ 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,
@@ -40336,6 +40448,7 @@ 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
@@ -40344,6 +40457,7 @@ 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,
@@ -40387,6 +40501,8 @@ 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) {
@@ -40431,7 +40547,14 @@ var ts;
             description: ts.Diagnostics.Delete_the_outputs_of_all_projects,
             type: "boolean",
             defaultValueDescription: false,
-        }
+        },
+        {
+            name: "solutionDiagnostics",
+            type: "boolean",
+            category: ts.Diagnostics.Compiler_Diagnostics,
+            description: ts.Diagnostics.Output_more_detailed_solution_performance_information_after_building,
+            defaultValueDescription: false,
+        },
     ];
     /* @internal */
     ts.buildOpts = __spreadArray(__spreadArray([], ts.commonOptionsWithBuild, true), ts.optionsForBuild, true);
@@ -41242,6 +41365,7 @@ 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) {
@@ -41250,6 +41374,7 @@ var ts;
             }
         });
     }
+    ts.getNameOfCompilerOptionValue = getNameOfCompilerOptionValue;
     function serializeCompilerOptions(options, pathOptions) {
         return serializeOptionBaseObject(options, getOptionsNameMap(), pathOptions);
     }
@@ -44371,8 +44496,8 @@ var ts;
             var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
                 loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths);
             if (!pathAndExtension && packageInfo
-                && packageInfo.packageJsonContent.exports === undefined
-                && packageInfo.packageJsonContent.main === undefined
+                // eslint-disable-next-line no-null/no-null
+                && (packageInfo.packageJsonContent.exports === undefined || packageInfo.packageJsonContent.exports === null)
                 && state.features & NodeResolutionFeatures.EsmMode) {
                 // EsmMode disables index lookup in `loadNodeModuleFromDirectoryWorker` generally, however non-relative package resolutions still assume
                 // a default `index.js` entrypoint if no `main` or `exports` are present
@@ -48037,7 +48162,10 @@ var ts;
         TypeFacts[TypeFacts["NEUndefinedOrNull"] = 2097152] = "NEUndefinedOrNull";
         TypeFacts[TypeFacts["Truthy"] = 4194304] = "Truthy";
         TypeFacts[TypeFacts["Falsy"] = 8388608] = "Falsy";
-        TypeFacts[TypeFacts["All"] = 16777215] = "All";
+        TypeFacts[TypeFacts["IsUndefined"] = 16777216] = "IsUndefined";
+        TypeFacts[TypeFacts["IsNull"] = 33554432] = "IsNull";
+        TypeFacts[TypeFacts["IsUndefinedOrNull"] = 50331648] = "IsUndefinedOrNull";
+        TypeFacts[TypeFacts["All"] = 134217727] = "All";
         // The following members encode facts about particular kinds of types for use in the getTypeFacts function.
         // The presence of a particular fact means that the given test is true for some (and possibly all) values
         // of that kind of type.
@@ -48079,14 +48207,16 @@ var ts;
         TypeFacts[TypeFacts["ObjectFacts"] = 16736160] = "ObjectFacts";
         TypeFacts[TypeFacts["FunctionStrictFacts"] = 7880640] = "FunctionStrictFacts";
         TypeFacts[TypeFacts["FunctionFacts"] = 16728000] = "FunctionFacts";
-        TypeFacts[TypeFacts["UndefinedFacts"] = 9830144] = "UndefinedFacts";
-        TypeFacts[TypeFacts["NullFacts"] = 9363232] = "NullFacts";
-        TypeFacts[TypeFacts["EmptyObjectStrictFacts"] = 16318463] = "EmptyObjectStrictFacts";
+        TypeFacts[TypeFacts["VoidFacts"] = 9830144] = "VoidFacts";
+        TypeFacts[TypeFacts["UndefinedFacts"] = 26607360] = "UndefinedFacts";
+        TypeFacts[TypeFacts["NullFacts"] = 42917664] = "NullFacts";
+        TypeFacts[TypeFacts["EmptyObjectStrictFacts"] = 83427327] = "EmptyObjectStrictFacts";
+        TypeFacts[TypeFacts["EmptyObjectFacts"] = 83886079] = "EmptyObjectFacts";
+        TypeFacts[TypeFacts["UnknownFacts"] = 83886079] = "UnknownFacts";
         TypeFacts[TypeFacts["AllTypeofNE"] = 556800] = "AllTypeofNE";
-        TypeFacts[TypeFacts["EmptyObjectFacts"] = 16777215] = "EmptyObjectFacts";
         // Masks
         TypeFacts[TypeFacts["OrFactsMask"] = 8256] = "OrFactsMask";
-        TypeFacts[TypeFacts["AndFactsMask"] = 16768959] = "AndFactsMask";
+        TypeFacts[TypeFacts["AndFactsMask"] = 134209471] = "AndFactsMask";
     })(TypeFacts || (TypeFacts = {}));
     var typeofEQFacts = new ts.Map(ts.getEntries({
         string: 1 /* TypeofEQString */,
@@ -50250,7 +50380,12 @@ var ts;
         function checkAndReportErrorForUsingTypeAsValue(errorLocation, name, meaning) {
             if (meaning & (111551 /* Value */ & ~1024 /* NamespaceModule */)) {
                 if (isPrimitiveTypeName(name)) {
-                    error(errorLocation, ts.Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here, ts.unescapeLeadingUnderscores(name));
+                    if (isExtendedByInterface(errorLocation)) {
+                        error(errorLocation, ts.Diagnostics.An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_classes, ts.unescapeLeadingUnderscores(name));
+                    }
+                    else {
+                        error(errorLocation, ts.Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here, ts.unescapeLeadingUnderscores(name));
+                    }
                     return true;
                 }
                 var symbol = resolveSymbol(resolveName(errorLocation, name, 788968 /* Type */ & ~111551 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ false));
@@ -50270,6 +50405,16 @@ var ts;
             }
             return false;
         }
+        function isExtendedByInterface(node) {
+            var grandparent = node.parent.parent;
+            var parentOfGrandparent = grandparent.parent;
+            if (grandparent && parentOfGrandparent) {
+                var isExtending = ts.isHeritageClause(grandparent) && grandparent.token === 94 /* ExtendsKeyword */;
+                var isInterface = ts.isInterfaceDeclaration(parentOfGrandparent);
+                return isExtending && isInterface;
+            }
+            return false;
+        }
         function maybeMappedType(node, symbol) {
             var container = ts.findAncestor(node.parent, function (n) {
                 return ts.isComputedPropertyName(n) || ts.isPropertySignature(n) ? false : ts.isTypeLiteralNode(n) || "quit";
@@ -53110,7 +53255,7 @@ var ts;
                     anyType : getNonMissingTypeOfSymbol(propertySymbol);
                 var saveEnclosingDeclaration = context.enclosingDeclaration;
                 context.enclosingDeclaration = undefined;
-                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 4096 /* Late */ && isLateBoundName(propertySymbol.escapedName)) {
+                if (context.tracker.trackSymbol && isLateBoundName(propertySymbol.escapedName)) {
                     if (propertySymbol.declarations) {
                         var decl = ts.first(propertySymbol.declarations);
                         if (hasLateBindableName(decl)) {
@@ -54794,7 +54939,7 @@ var ts;
                         ? getBaseConstructorTypeOfClass(staticType)
                         : anyType;
                     var heritageClauses = __spreadArray(__spreadArray([], !ts.length(baseTypes) ? [] : [ts.factory.createHeritageClause(94 /* ExtendsKeyword */, ts.map(baseTypes, function (b) { return serializeBaseType(b, staticBaseType, localName); }))], true), !ts.length(implementsExpressions) ? [] : [ts.factory.createHeritageClause(117 /* ImplementsKeyword */, implementsExpressions)], true);
-                    var symbolProps = getNonInterhitedProperties(classType, baseTypes, getPropertiesOfType(classType));
+                    var symbolProps = getNonInheritedProperties(classType, baseTypes, getPropertiesOfType(classType));
                     var publicSymbolProps = ts.filter(symbolProps, function (s) {
                         // `valueDeclaration` could be undefined if inherited from
                         // a union/intersection base type, but inherited properties
@@ -55932,7 +56077,7 @@ var ts;
             if (ts.getEffectiveTypeAnnotationNode(ts.walkUpBindingElementsAndPatterns(declaration))) {
                 // In strict null checking mode, if a default value of a non-undefined type is specified, remove
                 // undefined from the final type.
-                return strictNullChecks && !(getFalsyFlags(checkDeclarationInitializer(declaration, 0 /* Normal */)) & 32768 /* Undefined */) ? getNonUndefinedType(type) : type;
+                return strictNullChecks && !(getTypeFacts(checkDeclarationInitializer(declaration, 0 /* Normal */)) & 16777216 /* IsUndefined */) ? getNonUndefinedType(type) : type;
             }
             return widenTypeInferredFromInitializer(declaration, getUnionType([getNonUndefinedType(type), checkDeclarationInitializer(declaration, 0 /* Normal */)], 2 /* Subtype */));
         }
@@ -59135,7 +59280,7 @@ var ts;
             var objectType;
             return !!(type.flags & 8388608 /* IndexedAccess */ && ts.getObjectFlags(objectType = type.objectType) & 32 /* Mapped */ &&
                 !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) &&
-                !objectType.declaration.questionToken && !objectType.declaration.nameType);
+                !(getMappedTypeModifiers(objectType) & 8 /* ExcludeOptional */) && !objectType.declaration.nameType);
         }
         /**
          * For a type parameter, return the base constraint of the type parameter. For the string, number,
@@ -64427,7 +64572,7 @@ var ts;
                     var sourceSig = checkMode & 3 /* Callback */ ? undefined : getSingleCallSignature(getNonNullableType(sourceType));
                     var targetSig = checkMode & 3 /* Callback */ ? undefined : getSingleCallSignature(getNonNullableType(targetType));
                     var callbacks = sourceSig && targetSig && !getTypePredicateOfSignature(sourceSig) && !getTypePredicateOfSignature(targetSig) &&
-                        (getFalsyFlags(sourceType) & 98304 /* Nullable */) === (getFalsyFlags(targetType) & 98304 /* Nullable */);
+                        (getTypeFacts(sourceType) & 50331648 /* IsUndefinedOrNull */) === (getTypeFacts(targetType) & 50331648 /* IsUndefinedOrNull */);
                     var related = callbacks ?
                         compareSignaturesRelated(targetSig, sourceSig, (checkMode & 8 /* StrictArity */) | (strictVariance ? 2 /* StrictCallback */ : 1 /* BivariantCallback */), reportErrors, errorReporter, incompatibleErrorReporter, compareTypes, reportUnreliableMarkers) :
                         !(checkMode & 3 /* Callback */) && !strictVariance && compareTypes(sourceType, targetType, /*reportErrors*/ false) || compareTypes(targetType, sourceType, reportErrors);
@@ -67645,30 +67790,8 @@ var ts;
             var value = _a.value;
             return value.base10Value === "0";
         }
-        function getFalsyFlagsOfTypes(types) {
-            var result = 0;
-            for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
-                var t = types_14[_i];
-                result |= getFalsyFlags(t);
-            }
-            return result;
-        }
-        // Returns the String, Number, Boolean, StringLiteral, NumberLiteral, BooleanLiteral, Void, Undefined, or Null
-        // 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) {
-            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 */ ?
-                filterType(type, function (t) { return !(getFalsyFlags(t) & 117632 /* DefinitelyFalsy */); }) :
-                type;
+            return filterType(type, function (t) { return !!(getTypeFacts(t) & 4194304 /* Truthy */); });
         }
         function extractDefinitelyFalsyTypes(type) {
             return mapType(type, getDefinitelyFalsyPartOfType);
@@ -67711,14 +67834,7 @@ var ts;
                 getIntersectionType([type, emptyObjectType]);
         }
         function getNonNullableType(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;
+            return strictNullChecks ? getAdjustedTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */) : type;
         }
         function addOptionalTypeMarker(type) {
             return strictNullChecks ? getUnionType([type, optionalType]) : type;
@@ -68862,8 +68978,8 @@ var ts;
             }
             function getSingleTypeVariableFromIntersectionTypes(types) {
                 var typeVariable;
-                for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
-                    var type = types_15[_i];
+                for (var _i = 0, types_14 = types; _i < types_14.length; _i++) {
+                    var type = types_14[_i];
                     var t = type.flags & 2097152 /* Intersection */ && ts.find(type.types, function (t) { return !!getInferenceInfoForType(t); });
                     if (!t || typeVariable && t !== typeVariable) {
                         return undefined;
@@ -69616,8 +69732,8 @@ var ts;
                     }
                 }
             };
-            for (var _i = 0, types_16 = types; _i < types_16.length; _i++) {
-                var type = types_16[_i];
+            for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
+                var type = types_15[_i];
                 var state_9 = _loop_24(type);
                 if (typeof state_9 === "object")
                     return state_9.value;
@@ -69732,14 +69848,16 @@ var ts;
             return !!(resolved.callSignatures.length || resolved.constructSignatures.length ||
                 resolved.members.get("bind") && isTypeSubtypeOf(type, globalFunctionType));
         }
-        function getTypeFacts(type, ignoreObjects) {
-            if (ignoreObjects === void 0) { ignoreObjects = false; }
+        function getTypeFacts(type) {
+            if (type.flags & (2097152 /* Intersection */ | 465829888 /* Instantiable */)) {
+                type = getBaseConstraintOfType(type) || unknownType;
+            }
             var flags = type.flags;
-            if (flags & 4 /* String */) {
+            if (flags & (4 /* String */ | 268435456 /* StringMapping */)) {
                 return strictNullChecks ? 16317953 /* StringStrictFacts */ : 16776705 /* StringFacts */;
             }
-            if (flags & 128 /* StringLiteral */) {
-                var isEmpty = type.value === "";
+            if (flags & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */)) {
+                var isEmpty = flags & 128 /* StringLiteral */ && type.value === "";
                 return strictNullChecks ?
                     isEmpty ? 12123649 /* EmptyStringStrictFacts */ : 7929345 /* NonEmptyStringStrictFacts */ :
                     isEmpty ? 12582401 /* EmptyStringFacts */ : 16776705 /* NonEmptyStringFacts */;
@@ -69771,20 +69889,20 @@ var ts;
                     (type === falseType || type === regularFalseType) ? 12580616 /* FalseFacts */ : 16774920 /* TrueFacts */;
             }
             if (flags & 524288 /* Object */) {
-                if (ignoreObjects) {
-                    return 16768959 /* AndFactsMask */; // This is the identity element for computing type facts of intersection.
-                }
                 return ts.getObjectFlags(type) & 16 /* Anonymous */ && isEmptyObjectType(type) ?
-                    strictNullChecks ? 16318463 /* EmptyObjectStrictFacts */ : 16777215 /* EmptyObjectFacts */ :
+                    strictNullChecks ? 83427327 /* EmptyObjectStrictFacts */ : 83886079 /* EmptyObjectFacts */ :
                     isFunctionObjectType(type) ?
                         strictNullChecks ? 7880640 /* FunctionStrictFacts */ : 16728000 /* FunctionFacts */ :
                         strictNullChecks ? 7888800 /* ObjectStrictFacts */ : 16736160 /* ObjectFacts */;
             }
-            if (flags & (16384 /* Void */ | 32768 /* Undefined */)) {
-                return 9830144 /* UndefinedFacts */;
+            if (flags & 16384 /* Void */) {
+                return 9830144 /* VoidFacts */;
+            }
+            if (flags & 32768 /* Undefined */) {
+                return 26607360 /* UndefinedFacts */;
             }
             if (flags & 65536 /* Null */) {
-                return 9363232 /* NullFacts */;
+                return 42917664 /* NullFacts */;
             }
             if (flags & 12288 /* ESSymbolLike */) {
                 return strictNullChecks ? 7925520 /* SymbolStrictFacts */ : 16772880 /* SymbolFacts */;
@@ -69795,38 +69913,39 @@ var ts;
             if (flags & 131072 /* Never */) {
                 return 0 /* None */;
             }
-            if (flags & 465829888 /* Instantiable */) {
-                return !isPatternLiteralType(type) ? getTypeFacts(getBaseConstraintOfType(type) || unknownType, ignoreObjects) :
-                    strictNullChecks ? 7929345 /* NonEmptyStringStrictFacts */ : 16776705 /* NonEmptyStringFacts */;
-            }
             if (flags & 1048576 /* Union */) {
-                return ts.reduceLeft(type.types, function (facts, t) { return facts | getTypeFacts(t, ignoreObjects); }, 0 /* None */);
+                return ts.reduceLeft(type.types, function (facts, t) { return facts | getTypeFacts(t); }, 0 /* None */);
             }
             if (flags & 2097152 /* Intersection */) {
-                // When an intersection contains a primitive type we ignore object type constituents as they are
-                // presumably type tags. For example, in string & { __kind__: "name" } we ignore the object type.
-                ignoreObjects || (ignoreObjects = maybeTypeOfKind(type, 131068 /* Primitive */));
-                return getIntersectionTypeFacts(type, ignoreObjects);
+                return getIntersectionTypeFacts(type);
             }
-            return 16777215 /* All */;
+            return 83886079 /* UnknownFacts */;
         }
-        function getIntersectionTypeFacts(type, ignoreObjects) {
+        function getIntersectionTypeFacts(type) {
+            // When an intersection contains a primitive type we ignore object type constituents as they are
+            // presumably type tags. For example, in string & { __kind__: "name" } we ignore the object type.
+            var ignoreObjects = maybeTypeOfKind(type, 131068 /* Primitive */);
             // When computing the type facts of an intersection type, certain type facts are computed as `and`
             // and others are computed as `or`.
             var oredFacts = 0 /* None */;
-            var andedFacts = 16777215 /* All */;
+            var andedFacts = 134217727 /* All */;
             for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
                 var t = _a[_i];
-                var f = getTypeFacts(t, ignoreObjects);
-                oredFacts |= f;
-                andedFacts &= f;
+                if (!(ignoreObjects && t.flags & 524288 /* Object */)) {
+                    var f = getTypeFacts(t);
+                    oredFacts |= f;
+                    andedFacts &= f;
+                }
             }
-            return oredFacts & 8256 /* OrFactsMask */ | andedFacts & 16768959 /* AndFactsMask */;
+            return oredFacts & 8256 /* OrFactsMask */ | andedFacts & 134209471 /* AndFactsMask */;
         }
         function getTypeWithFacts(type, include) {
             return filterType(type, function (t) { return (getTypeFacts(t) & include) !== 0; });
         }
-        function getIntersectionWithFacts(type, facts) {
+        // This function is similar to getTypeWithFacts, except that in strictNullChecks mode it replaces type
+        // unknown with the union {} | null | undefined (and reduces that accordingly), and it intersects remaining
+        // instantiable types with {}, {} | null, or {} | undefined in order to remove null and/or undefined.
+        function getAdjustedTypeWithFacts(type, facts) {
             var reduced = recombineUnknownType(getTypeWithFacts(strictNullChecks && type.flags & 2 /* Unknown */ ? unknownUnionType : type, facts));
             if (strictNullChecks) {
                 switch (facts) {
@@ -70092,8 +70211,8 @@ var ts;
             var types = origin && origin.flags & 1048576 /* Union */ ? origin.types : type.types;
             var mappedTypes;
             var changed = false;
-            for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
-                var t = types_17[_i];
+            for (var _i = 0, types_16 = types; _i < types_16.length; _i++) {
+                var t = types_16[_i];
                 var mapped = t.flags & 1048576 /* Union */ ? mapType(t, mapper, noReductions) : mapper(t);
                 changed || (changed = t !== mapped);
                 if (mapped) {
@@ -70179,8 +70298,8 @@ var ts;
         }
         function isEvolvingArrayTypeList(types) {
             var hasEvolvingArrayType = false;
-            for (var _i = 0, types_18 = types; _i < types_18.length; _i++) {
-                var t = types_18[_i];
+            for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
+                var t = types_17[_i];
                 if (!(t.flags & 131072 /* Never */)) {
                     if (!(ts.getObjectFlags(t) & 256 /* EvolvingArray */)) {
                         return false;
@@ -71003,10 +71122,10 @@ var ts;
             }
             function narrowTypeByTruthiness(type, expr, assumeTrue) {
                 if (isMatchingReference(reference, expr)) {
-                    return getIntersectionWithFacts(type, assumeTrue ? 4194304 /* Truthy */ : 8388608 /* Falsy */);
+                    return getAdjustedTypeWithFacts(type, assumeTrue ? 4194304 /* Truthy */ : 8388608 /* Falsy */);
                 }
                 if (strictNullChecks && assumeTrue && optionalChainContainsReference(expr, reference)) {
-                    type = getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
+                    type = getAdjustedTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
                 }
                 var access = getDiscriminantPropertyAccess(expr, type);
                 if (access) {
@@ -71146,7 +71265,7 @@ var ts;
                 // Note that we include any and unknown in the exclusion test because their domain includes null and undefined.
                 var removeNullable = equalsOperator !== assumeTrue && everyType(valueType, function (t) { return !!(t.flags & nullableFlags); }) ||
                     equalsOperator === assumeTrue && everyType(valueType, function (t) { return !(t.flags & (3 /* AnyOrUnknown */ | nullableFlags)); });
-                return removeNullable ? getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */) : type;
+                return removeNullable ? getAdjustedTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */) : type;
             }
             function narrowTypeByEquality(type, operator, value, assumeTrue) {
                 if (type.flags & 1 /* Any */) {
@@ -71175,7 +71294,7 @@ var ts;
                         valueType.flags & 65536 /* Null */ ?
                             assumeTrue ? 131072 /* EQNull */ : 1048576 /* NENull */ :
                             assumeTrue ? 65536 /* EQUndefined */ : 524288 /* NEUndefined */;
-                    return getIntersectionWithFacts(type, facts);
+                    return getAdjustedTypeWithFacts(type, facts);
                 }
                 if (assumeTrue) {
                     var filterFn = operator === 34 /* EqualsEqualsToken */ ?
@@ -71196,7 +71315,7 @@ var ts;
                 var target = getReferenceCandidate(typeOfExpr.expression);
                 if (!isMatchingReference(reference, target)) {
                     if (strictNullChecks && optionalChainContainsReference(target, reference) && assumeTrue === (literal.text !== "undefined")) {
-                        return getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
+                        return getAdjustedTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
                     }
                     return type;
                 }
@@ -71400,7 +71519,7 @@ var ts;
                 var left = getReferenceCandidate(expr.left);
                 if (!isMatchingReference(reference, left)) {
                     if (assumeTrue && strictNullChecks && optionalChainContainsReference(left, reference)) {
-                        return getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
+                        return getAdjustedTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
                     }
                     return type;
                 }
@@ -71488,7 +71607,7 @@ var ts;
                         }
                         if (strictNullChecks && assumeTrue && optionalChainContainsReference(predicateArgument, reference) &&
                             !(getTypeFacts(predicate.type) & 65536 /* EQUndefined */)) {
-                            type = getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
+                            type = getAdjustedTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
                         }
                         var access = getDiscriminantPropertyAccess(predicateArgument, type);
                         if (access) {
@@ -71545,7 +71664,7 @@ var ts;
             }
             function narrowTypeByOptionality(type, expr, assumePresent) {
                 if (isMatchingReference(reference, expr)) {
-                    return getTypeWithFacts(type, assumePresent ? 2097152 /* NEUndefinedOrNull */ : 262144 /* EQUndefinedOrNull */);
+                    return getAdjustedTypeWithFacts(type, assumePresent ? 2097152 /* NEUndefinedOrNull */ : 262144 /* EQUndefinedOrNull */);
                 }
                 var access = getDiscriminantPropertyAccess(expr, type);
                 if (access) {
@@ -71631,8 +71750,8 @@ var ts;
                 var annotationIncludesUndefined = strictNullChecks &&
                     declaration.kind === 164 /* Parameter */ &&
                     declaration.initializer &&
-                    getFalsyFlags(declaredType) & 32768 /* Undefined */ &&
-                    !(getFalsyFlags(checkExpression(declaration.initializer)) & 32768 /* Undefined */);
+                    getTypeFacts(declaredType) & 16777216 /* IsUndefined */ &&
+                    !(getTypeFacts(checkExpression(declaration.initializer)) & 16777216 /* IsUndefined */);
                 popTypeResolution();
                 return annotationIncludesUndefined ? getTypeWithFacts(declaredType, 524288 /* NEUndefined */) : declaredType;
             }
@@ -71960,7 +72079,7 @@ var ts;
                     return convertAutoToAny(flowType);
                 }
             }
-            else if (!assumeInitialized && !(getFalsyFlags(type) & 32768 /* Undefined */) && getFalsyFlags(flowType) & 32768 /* Undefined */) {
+            else if (!assumeInitialized && !(getTypeFacts(type) & 16777216 /* IsUndefined */) && getTypeFacts(flowType) & 16777216 /* IsUndefined */) {
                 error(node, ts.Diagnostics.Variable_0_is_used_before_being_assigned, symbolToString(symbol));
                 // Return the declared type to reduce follow-on errors
                 return type;
@@ -73489,8 +73608,8 @@ var ts;
             }
             var signatureList;
             var types = type.types;
-            for (var _i = 0, types_19 = types; _i < types_19.length; _i++) {
-                var current = types_19[_i];
+            for (var _i = 0, types_18 = types; _i < types_18.length; _i++) {
+                var current = types_18[_i];
                 var signature = getContextualCallSignature(current, node);
                 if (signature) {
                     if (!signatureList) {
@@ -74652,19 +74771,19 @@ var ts;
             return checkNonNullType(checkExpression(node), node);
         }
         function isNullableType(type) {
-            return !!((strictNullChecks ? getFalsyFlags(type) : type.flags) & 98304 /* Nullable */);
+            return !!(getTypeFacts(type) & 50331648 /* IsUndefinedOrNull */);
         }
         function getNonNullableTypeIfNeeded(type) {
             return isNullableType(type) ? getNonNullableType(type) : type;
         }
-        function reportObjectPossiblyNullOrUndefinedError(node, flags) {
-            error(node, flags & 32768 /* Undefined */ ? flags & 65536 /* Null */ ?
+        function reportObjectPossiblyNullOrUndefinedError(node, facts) {
+            error(node, facts & 16777216 /* IsUndefined */ ? facts & 33554432 /* IsNull */ ?
                 ts.Diagnostics.Object_is_possibly_null_or_undefined :
                 ts.Diagnostics.Object_is_possibly_undefined :
                 ts.Diagnostics.Object_is_possibly_null);
         }
-        function reportCannotInvokePossiblyNullOrUndefinedError(node, flags) {
-            error(node, flags & 32768 /* Undefined */ ? flags & 65536 /* Null */ ?
+        function reportCannotInvokePossiblyNullOrUndefinedError(node, facts) {
+            error(node, facts & 16777216 /* IsUndefined */ ? facts & 33554432 /* IsNull */ ?
                 ts.Diagnostics.Cannot_invoke_an_object_which_is_possibly_null_or_undefined :
                 ts.Diagnostics.Cannot_invoke_an_object_which_is_possibly_undefined :
                 ts.Diagnostics.Cannot_invoke_an_object_which_is_possibly_null);
@@ -74674,9 +74793,9 @@ var ts;
                 error(node, ts.Diagnostics.Object_is_of_type_unknown);
                 return errorType;
             }
-            var kind = (strictNullChecks ? getFalsyFlags(type) : type.flags) & 98304 /* Nullable */;
-            if (kind) {
-                reportError(node, kind);
+            var facts = getTypeFacts(type);
+            if (facts & 50331648 /* IsUndefinedOrNull */) {
+                reportError(node, facts);
                 var t = getNonNullableType(type);
                 return t.flags & (98304 /* Nullable */ | 131072 /* Never */) ? errorType : t;
             }
@@ -74971,7 +75090,7 @@ var ts;
                 assumeUninitialized = true;
             }
             var flowType = getFlowTypeOfReference(node, propType, assumeUninitialized ? getOptionalType(propType) : propType);
-            if (assumeUninitialized && !(getFalsyFlags(propType) & 32768 /* Undefined */) && getFalsyFlags(flowType) & 32768 /* Undefined */) {
+            if (assumeUninitialized && !(getTypeFacts(propType) & 16777216 /* IsUndefined */) && getTypeFacts(flowType) & 16777216 /* IsUndefined */) {
                 error(errorNode, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop)); // TODO: GH#18217
                 // Return the declared type to reduce follow-on errors
                 return propType;
@@ -76887,8 +77006,8 @@ var ts;
             if (apparentType.flags & 1048576 /* Union */) {
                 var types = apparentType.types;
                 var hasSignatures = false;
-                for (var _i = 0, types_20 = types; _i < types_20.length; _i++) {
-                    var constituent = types_20[_i];
+                for (var _i = 0, types_19 = types; _i < types_19.length; _i++) {
+                    var constituent = types_19[_i];
                     var signatures = getSignaturesOfType(constituent, kind);
                     if (signatures.length !== 0) {
                         hasSignatures = true;
@@ -78579,7 +78698,7 @@ var ts;
             var type = getTypeOfSymbol(symbol);
             if (strictNullChecks &&
                 !(type.flags & (3 /* AnyOrUnknown */ | 131072 /* Never */)) &&
-                !(exactOptionalPropertyTypes ? symbol.flags & 16777216 /* Optional */ : getFalsyFlags(type) & 32768 /* Undefined */)) {
+                !(exactOptionalPropertyTypes ? symbol.flags & 16777216 /* Optional */ : getTypeFacts(type) & 16777216 /* IsUndefined */)) {
                 error(expr, ts.Diagnostics.The_operand_of_a_delete_operator_must_be_optional);
             }
         }
@@ -78747,8 +78866,8 @@ var ts;
             }
             if (type.flags & 3145728 /* UnionOrIntersection */) {
                 var types = type.types;
-                for (var _i = 0, types_21 = types; _i < types_21.length; _i++) {
-                    var t = types_21[_i];
+                for (var _i = 0, types_20 = types; _i < types_20.length; _i++) {
+                    var t = types_20[_i];
                     if (maybeTypeOfKind(t, kind)) {
                         return true;
                     }
@@ -78975,7 +79094,7 @@ var ts;
                     // In strict null checking mode, if a default value of a non-undefined type is specified, remove
                     // undefined from the final type.
                     if (strictNullChecks &&
-                        !(getFalsyFlags(checkExpression(prop.objectAssignmentInitializer)) & 32768 /* Undefined */)) {
+                        !(getTypeFacts(checkExpression(prop.objectAssignmentInitializer)) & 16777216 /* IsUndefined */)) {
                         sourceType = getTypeWithFacts(sourceType, 524288 /* NEUndefined */);
                     }
                     checkBinaryLikeExpression(prop.name, prop.equalsToken, prop.objectAssignmentInitializer, checkMode);
@@ -79375,7 +79494,7 @@ var ts;
                 case 56 /* BarBarToken */:
                 case 75 /* BarBarEqualsToken */: {
                     var resultType_3 = getTypeFacts(leftType) & 8388608 /* Falsy */ ?
-                        getUnionType([removeDefinitelyFalsyTypes(leftType), rightType], 2 /* Subtype */) :
+                        getUnionType([getNonNullableType(removeDefinitelyFalsyTypes(leftType)), rightType], 2 /* Subtype */) :
                         leftType;
                     if (operator === 75 /* BarBarEqualsToken */) {
                         checkAssignmentOperator(rightType);
@@ -81916,8 +82035,8 @@ var ts;
         }
         function getEntityNameForDecoratorMetadataFromTypeList(types) {
             var commonEntityName;
-            for (var _i = 0, types_22 = types; _i < types_22.length; _i++) {
-                var typeNode = types_22[_i];
+            for (var _i = 0, types_21 = types; _i < types_21.length; _i++) {
+                var typeNode = types_21[_i];
                 while (typeNode.kind === 191 /* ParenthesizedType */ || typeNode.kind === 197 /* NamedTupleMember */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
@@ -82936,7 +83055,7 @@ var ts;
                     return;
                 var type = checkTruthinessExpression(location);
                 var isPropertyExpressionCast = ts.isPropertyAccessExpression(location) && isTypeAssertion(location.expression);
-                if (getFalsyFlags(type) || isPropertyExpressionCast)
+                if (!(getTypeFacts(type) & 4194304 /* Truthy */) || isPropertyExpressionCast)
                     return;
                 // While it technically should be invalid for any known-truthy value
                 // to be tested, we de-scope to functions and Promises unreferenced in
@@ -84622,18 +84741,17 @@ var ts;
             // but not by other kinds of members.
             // Base class instance member variables and accessors can be overridden by
             // derived class instance member variables and accessors, but not by other kinds of members.
-            var _a, _b;
+            var _a, _b, _c, _d;
             // NOTE: assignability is checked in checkClassDeclaration
             var baseProperties = getPropertiesOfType(baseType);
-            basePropertyCheck: for (var _i = 0, baseProperties_1 = baseProperties; _i < baseProperties_1.length; _i++) {
-                var baseProperty = baseProperties_1[_i];
+            var _loop_33 = function (baseProperty) {
                 var base = getTargetSymbol(baseProperty);
                 if (base.flags & 4194304 /* Prototype */) {
-                    continue;
+                    return "continue";
                 }
                 var baseSymbol = getPropertyOfObjectType(type, base.escapedName);
                 if (!baseSymbol) {
-                    continue;
+                    return "continue";
                 }
                 var derived = getTargetSymbol(baseSymbol);
                 var baseDeclarationFlags = ts.getDeclarationModifierFlagsFromSymbol(base);
@@ -84651,14 +84769,14 @@ var ts;
                         // Searches other base types for a declaration that would satisfy the inherited abstract member.
                         // (The class may have more than one base type via declaration merging with an interface with the
                         // same name.)
-                        for (var _c = 0, _d = getBaseTypes(type); _c < _d.length; _c++) {
-                            var otherBaseType = _d[_c];
+                        for (var _e = 0, _f = getBaseTypes(type); _e < _f.length; _e++) {
+                            var otherBaseType = _f[_e];
                             if (otherBaseType === baseType)
                                 continue;
                             var baseSymbol_1 = getPropertyOfObjectType(otherBaseType, base.escapedName);
                             var derivedElsewhere = baseSymbol_1 && getTargetSymbol(baseSymbol_1);
                             if (derivedElsewhere && derivedElsewhere !== base) {
-                                continue basePropertyCheck;
+                                return "continue-basePropertyCheck";
                             }
                         }
                         if (derivedClassDecl.kind === 226 /* ClassExpression */) {
@@ -84673,20 +84791,19 @@ var ts;
                     // derived overrides base.
                     var derivedDeclarationFlags = ts.getDeclarationModifierFlagsFromSymbol(derived);
                     if (baseDeclarationFlags & 8 /* Private */ || derivedDeclarationFlags & 8 /* Private */) {
-                        // either base or derived property is private - not override, skip it
-                        continue;
+                        return "continue";
                     }
                     var errorMessage = void 0;
                     var basePropertyFlags = base.flags & 98308 /* PropertyOrAccessor */;
                     var derivedPropertyFlags = derived.flags & 98308 /* PropertyOrAccessor */;
                     if (basePropertyFlags && derivedPropertyFlags) {
                         // property/accessor is overridden with property/accessor
-                        if (baseDeclarationFlags & 128 /* Abstract */ && !(base.valueDeclaration && ts.isPropertyDeclaration(base.valueDeclaration) && base.valueDeclaration.initializer)
-                            || base.valueDeclaration && base.valueDeclaration.parent.kind === 258 /* InterfaceDeclaration */
+                        if ((ts.getCheckFlags(base) & 6 /* Synthetic */
+                            ? (_a = base.declarations) === null || _a === void 0 ? void 0 : _a.some(function (d) { return isPropertyAbstractOrInterface(d, baseDeclarationFlags); })
+                            : (_b = base.declarations) === null || _b === void 0 ? void 0 : _b.every(function (d) { return isPropertyAbstractOrInterface(d, baseDeclarationFlags); }))
+                            || ts.getCheckFlags(base) & 262144 /* Mapped */
                             || derived.valueDeclaration && ts.isBinaryExpression(derived.valueDeclaration)) {
-                            // when the base property is abstract or from an interface, base/derived flags don't need to match
-                            // same when the derived property is from an assignment
-                            continue;
+                            return "continue";
                         }
                         var overriddenInstanceProperty = basePropertyFlags !== 4 /* Property */ && derivedPropertyFlags === 4 /* Property */;
                         var overriddenInstanceAccessor = basePropertyFlags === 4 /* Property */ && derivedPropertyFlags !== 4 /* Property */;
@@ -84697,12 +84814,12 @@ var ts;
                             error(ts.getNameOfDeclaration(derived.valueDeclaration) || derived.valueDeclaration, errorMessage_1, symbolToString(base), typeToString(baseType), typeToString(type));
                         }
                         else if (useDefineForClassFields) {
-                            var uninitialized = (_a = derived.declarations) === null || _a === void 0 ? void 0 : _a.find(function (d) { return d.kind === 167 /* PropertyDeclaration */ && !d.initializer; });
+                            var uninitialized = (_c = derived.declarations) === null || _c === void 0 ? void 0 : _c.find(function (d) { return d.kind === 167 /* PropertyDeclaration */ && !d.initializer; });
                             if (uninitialized
                                 && !(derived.flags & 33554432 /* Transient */)
                                 && !(baseDeclarationFlags & 128 /* Abstract */)
                                 && !(derivedDeclarationFlags & 128 /* Abstract */)
-                                && !((_b = derived.declarations) === null || _b === void 0 ? void 0 : _b.some(function (d) { return !!(d.flags & 16777216 /* Ambient */); }))) {
+                                && !((_d = derived.declarations) === null || _d === void 0 ? void 0 : _d.some(function (d) { return !!(d.flags & 16777216 /* Ambient */); }))) {
                                 var constructor = findConstructorDeclaration(ts.getClassLikeDeclarationOfSymbol(type.symbol));
                                 var propName = uninitialized.name;
                                 if (uninitialized.exclamationToken
@@ -84715,13 +84832,11 @@ var ts;
                                 }
                             }
                         }
-                        // correct case
-                        continue;
+                        return "continue";
                     }
                     else if (isPrototypeProperty(base)) {
                         if (isPrototypeProperty(derived) || derived.flags & 4 /* Property */) {
-                            // method is overridden with method or property -- correct case
-                            continue;
+                            return "continue";
                         }
                         else {
                             ts.Debug.assert(!!(derived.flags & 98304 /* Accessor */));
@@ -84736,9 +84851,20 @@ var ts;
                     }
                     error(ts.getNameOfDeclaration(derived.valueDeclaration) || derived.valueDeclaration, errorMessage, typeToString(baseType), symbolToString(base), typeToString(type));
                 }
+            };
+            basePropertyCheck: for (var _i = 0, baseProperties_1 = baseProperties; _i < baseProperties_1.length; _i++) {
+                var baseProperty = baseProperties_1[_i];
+                var state_10 = _loop_33(baseProperty);
+                switch (state_10) {
+                    case "continue-basePropertyCheck": continue basePropertyCheck;
+                }
             }
         }
-        function getNonInterhitedProperties(type, baseTypes, properties) {
+        function isPropertyAbstractOrInterface(declaration, baseDeclarationFlags) {
+            return baseDeclarationFlags & 128 /* Abstract */ && (!ts.isPropertyDeclaration(declaration) || !declaration.initializer)
+                || ts.isInterfaceDeclaration(declaration.parent);
+        }
+        function getNonInheritedProperties(type, baseTypes, properties) {
             if (!ts.length(baseTypes)) {
                 return properties;
             }
@@ -84807,7 +84933,7 @@ var ts;
                     var propName = member.name;
                     if (ts.isIdentifier(propName) || ts.isPrivateIdentifier(propName) || ts.isComputedPropertyName(propName)) {
                         var type = getTypeOfSymbol(getSymbolOfNode(member));
-                        if (!(type.flags & 3 /* AnyOrUnknown */ || getFalsyFlags(type) & 32768 /* Undefined */)) {
+                        if (!(type.flags & 3 /* AnyOrUnknown */ || getTypeFacts(type) & 16777216 /* IsUndefined */)) {
                             if (!constructor || !isPropertyInitializedInConstructor(propName, type, constructor)) {
                                 error(member.name, ts.Diagnostics.Property_0_has_no_initializer_and_is_not_definitely_assigned_in_the_constructor, ts.declarationNameToString(propName));
                             }
@@ -84832,7 +84958,7 @@ var ts;
                     ts.setParent(reference, staticBlock);
                     reference.flowNode = staticBlock.returnFlowNode;
                     var flowType = getFlowTypeOfReference(reference, propType, getOptionalType(propType));
-                    if (!(getFalsyFlags(flowType) & 32768 /* Undefined */)) {
+                    if (!(getTypeFacts(flowType) & 16777216 /* IsUndefined */)) {
                         return true;
                     }
                 }
@@ -84847,7 +84973,7 @@ var ts;
             ts.setParent(reference, constructor);
             reference.flowNode = constructor.returnFlowNode;
             var flowType = getFlowTypeOfReference(reference, propType, getOptionalType(propType));
-            return !(getFalsyFlags(flowType) & 32768 /* Undefined */);
+            return !(getTypeFacts(flowType) & 16777216 /* IsUndefined */);
         }
         function checkInterfaceDeclaration(node) {
             // Grammar checking
@@ -93135,8 +93261,8 @@ var ts;
             // Note when updating logic here also update getEntityNameForDecoratorMetadata
             // so that aliases can be marked as referenced
             var serializedUnion;
-            for (var _i = 0, types_23 = types; _i < types_23.length; _i++) {
-                var typeNode = types_23[_i];
+            for (var _i = 0, types_22 = types; _i < types_22.length; _i++) {
+                var typeNode = types_22[_i];
                 while (typeNode.kind === 191 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
@@ -110531,7 +110657,8 @@ var ts;
                 return;
             }
             var version = ts.version; // Extracted into a const so the form is stable between namespace and module
-            ts.writeFile(host, emitterDiagnostics, buildInfoPath, getBuildInfoText({ bundle: bundle, program: program, version: version }), /*writeByteOrderMark*/ false);
+            var buildInfo = { bundle: bundle, program: program, version: version };
+            ts.writeFile(host, emitterDiagnostics, buildInfoPath, getBuildInfoText(buildInfo), /*writeByteOrderMark*/ false, /*sourceFiles*/ undefined, { buildInfo: buildInfo });
         }
         function emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo) {
             if (!sourceFileOrBundle || emitOnlyDtsFiles || !jsFilePath) {
@@ -110553,7 +110680,7 @@ var ts;
                 sourceMap: compilerOptions.sourceMap,
                 inlineSourceMap: compilerOptions.inlineSourceMap,
                 inlineSources: compilerOptions.inlineSources,
-                extendedDiagnostics: compilerOptions.extendedDiagnostics,
+                extendedDiagnostics: compilerOptions.extendedDiagnostics || compilerOptions.solutionDiagnostics,
                 writeBundleFileInfo: !!bundleBuildInfo,
                 relativeToBuildInfo: relativeToBuildInfo
             };
@@ -110605,7 +110732,7 @@ var ts;
                 target: compilerOptions.target,
                 sourceMap: compilerOptions.sourceMap,
                 inlineSourceMap: compilerOptions.inlineSourceMap,
-                extendedDiagnostics: compilerOptions.extendedDiagnostics,
+                extendedDiagnostics: compilerOptions.extendedDiagnostics || compilerOptions.solutionDiagnostics,
                 onlyPrintJsDocStyle: true,
                 writeBundleFileInfo: !!bundleBuildInfo,
                 recordInternalSection: !!bundleBuildInfo,
@@ -110627,7 +110754,7 @@ var ts;
                     sourceMap: !forceDtsEmit && compilerOptions.declarationMap,
                     sourceRoot: compilerOptions.sourceRoot,
                     mapRoot: compilerOptions.mapRoot,
-                    extendedDiagnostics: compilerOptions.extendedDiagnostics,
+                    extendedDiagnostics: compilerOptions.extendedDiagnostics || compilerOptions.solutionDiagnostics,
                     // Explicitly do not passthru either `inline` option
                 });
                 if (forceDtsEmit && declarationTransform.transformed[0].kind === 305 /* SourceFile */) {
@@ -110685,13 +110812,18 @@ 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
-            ts.writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), !!compilerOptions.emitBOM, sourceFiles, { sourceMapUrlPos: sourceMapUrlPos });
+            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));
             // Reset state
             writer.clear();
         }
@@ -110834,34 +110966,54 @@ 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 buildInfoText = host.readFile(ts.Debug.checkDefined(buildInfoPath));
-        if (!buildInfoText)
+        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))
             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";
-        var buildInfo = getBuildInfo(buildInfoText);
-        if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationText && !buildInfo.bundle.dts))
-            return buildInfoPath;
+        if (declarationMapPath && ts.BuilderState.computeSignature(declarationMapText, createHash) !== buildInfo.bundle.dts.mapHash)
+            return declarationMapPath;
         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,
@@ -110877,7 +111029,7 @@ var ts;
             getResolvedProjectReferenceToRedirect: ts.returnUndefined,
             getProjectReferenceRedirect: ts.returnUndefined,
             isSourceOfProjectReferenceRedirect: ts.returnFalse,
-            writeFile: function (name, text, writeByteOrderMark) {
+            writeFile: function (name, text, writeByteOrderMark, _onError, _sourceFiles, data) {
                 switch (name) {
                     case jsFilePath:
                         if (jsFileText === text)
@@ -110888,8 +111040,13 @@ var ts;
                             return;
                         break;
                     case buildInfoPath:
-                        var newBuildInfo = getBuildInfo(text);
+                        var newBuildInfo = data.buildInfo;
                         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;
@@ -110897,11 +111054,13 @@ var ts;
                             newBuildInfo.bundle.dts.sources = dts.sources;
                         }
                         newBuildInfo.bundle.sourceFiles = sourceFiles;
-                        outputFiles.push({ name: name, text: getBuildInfoText(newBuildInfo), writeByteOrderMark: writeByteOrderMark });
+                        outputFiles.push({ name: name, text: getBuildInfoText(newBuildInfo), writeByteOrderMark: writeByteOrderMark, buildInfo: newBuildInfo });
                         return;
                     case declarationFilePath:
                         if (declarationText === text)
                             return;
+                        changedDtsText = text;
+                        changedDtsData = data;
                         break;
                     case declarationMapPath:
                         if (declarationMapText === text)
@@ -110920,6 +111079,7 @@ var ts;
             getSourceFileFromReference: ts.returnUndefined,
             redirectTargetsMap: ts.createMultiMap(),
             getFileIncludeReasons: ts.notImplemented,
+            createHash: createHash,
         };
         emitFiles(ts.notImplementedResolver, emitHost, 
         /*targetSourceFile*/ undefined, ts.getTransformers(config.options, customTransformers));
@@ -113751,8 +113911,8 @@ var ts;
                     bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "reference" /* Reference */, data: directive.fileName });
                 writeLine();
             }
-            for (var _d = 0, types_24 = types; _d < types_24.length; _d++) {
-                var directive = types_24[_d];
+            for (var _d = 0, types_23 = types; _d < types_23.length; _d++) {
+                var directive = types_23[_d];
                 var pos = writer.getTextPos();
                 var resolutionMode = directive.resolutionMode && directive.resolutionMode !== (currentSourceFile === null || currentSourceFile === void 0 ? void 0 : currentSourceFile.impliedNodeFormat)
                     ? "resolution-mode=\"" + (directive.resolutionMode === ts.ModuleKind.ESNext ? "import" : "require") + "\""
@@ -116004,12 +116164,10 @@ 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 {
@@ -116042,7 +116200,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 writeFileWorker(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 system.writeFile(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");
             }
@@ -116052,35 +116210,6 @@ 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()));
         }
@@ -117670,6 +117799,7 @@ 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) {
@@ -119783,13 +119913,9 @@ 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);
@@ -119816,11 +119942,6 @@ var ts;
                         });
                         return map;
                     },
-                    clear: function () {
-                        forward.clear();
-                        reverse.clear();
-                        deleted === null || deleted === void 0 ? void 0 : deleted.clear();
-                    }
                 };
                 return map;
             }
@@ -119948,18 +120069,21 @@ 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, _a = newProgram.getSourceFiles(); _i < _a.length; _i++) {
-                var sourceFile = _a[_i];
+            for (var _i = 0, _d = newProgram.getSourceFiles(); _i < _d.length; _i++) {
+                var sourceFile = _d[_i];
                 var version_2 = ts.Debug.checkDefined(sourceFile.version, "Program intended to be used with Builder should have source files with versions set");
-                var oldInfo = useOldState ? oldState.fileInfos.get(sourceFile.resolvedPath) : undefined;
+                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;
                 if (referencedMap) {
                     var newReferences = getReferencedFiles(newProgram, sourceFile, getCanonicalFileName);
                     if (newReferences) {
@@ -119967,19 +120091,26 @@ var ts;
                     }
                     // Copy old visible to outside files map
                     if (useOldState) {
-                        var exportedModules = oldState.exportedModulesMap.getValues(sourceFile.resolvedPath);
+                        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;
                         if (exportedModules) {
                             exportedModulesMap.set(sourceFile.resolvedPath, exportedModules);
                         }
                     }
                 }
-                fileInfos.set(sourceFile.resolvedPath, { version: version_2, signature: oldInfo && oldInfo.signature, affectsGlobalScope: isFileAffectingGlobalScope(sourceFile) || undefined, impliedFormat: sourceFile.impliedNodeFormat });
+                fileInfos.set(sourceFile.resolvedPath, {
+                    version: version_2,
+                    signature: signature,
+                    affectsGlobalScope: isFileAffectingGlobalScope(sourceFile) || undefined,
+                    impliedFormat: sourceFile.impliedNodeFormat
+                });
             }
             return {
                 fileInfos: fileInfos,
                 referencedMap: referencedMap,
                 exportedModulesMap: exportedModulesMap,
-                hasCalledUpdateShapeSignature: hasCalledUpdateShapeSignature,
                 useFileVersionAsSignature: !disableUseFileVersionAsSignature && !useOldState
             };
         }
@@ -119993,71 +120124,42 @@ var ts;
         }
         BuilderState.releaseCache = releaseCache;
         /**
-         * Creates a clone of the state
+         * Gets the files affected by the path from the program
          */
-        function clone(state) {
+        function getFilesAffectedBy(state, programOfThisState, path, cancellationToken, computeHash) {
             var _a, _b;
-            // 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,
-            };
+            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;
         }
-        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();
+        BuilderState.getFilesAffectedBy = getFilesAffectedBy;
+        function getFilesAffectedByWithOldState(state, programOfThisState, path, cancellationToken, computeHash) {
             var sourceFile = programOfThisState.getSourceFileByPath(path);
             if (!sourceFile) {
                 return ts.emptyArray;
             }
-            if (!updateShapeSignature(state, programOfThisState, sourceFile, signatureCache, cancellationToken, computeHash, exportedModulesMapCache)) {
+            if (!updateShapeSignature(state, programOfThisState, sourceFile, cancellationToken, computeHash)) {
                 return [sourceFile];
             }
-            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;
+            return (state.referencedMap ? getFilesAffectedByUpdatedShapeWhenModuleEmit : getFilesAffectedByUpdatedShapeWhenNonModuleEmit)(state, programOfThisState, sourceFile, cancellationToken, computeHash);
         }
-        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;
+        BuilderState.getFilesAffectedByWithOldState = getFilesAffectedByWithOldState;
         function updateSignatureOfFile(state, signature, path) {
             state.fileInfos.get(path).signature = signature;
-            state.hasCalledUpdateShapeSignature.add(path);
+            (state.hasCalledUpdateShapeSignature || (state.hasCalledUpdateShapeSignature = new ts.Set())).add(path);
         }
         BuilderState.updateSignatureOfFile = updateSignatureOfFile;
         /**
          * Returns if the shape of the signature has changed since last emit
          */
-        function updateShapeSignature(state, programOfThisState, sourceFile, cacheToUpdateSignature, cancellationToken, computeHash, exportedModulesMapCache, useFileVersionAsSignature) {
+        function updateShapeSignature(state, programOfThisState, sourceFile, cancellationToken, computeHash, useFileVersionAsSignature) {
+            var _a;
             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 (state.hasCalledUpdateShapeSignature.has(sourceFile.resolvedPath) || cacheToUpdateSignature.has(sourceFile.resolvedPath)) {
+            if ((_a = state.hasCalledUpdateShapeSignature) === null || _a === void 0 ? void 0 : _a.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) {
@@ -120068,45 +120170,55 @@ 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 = (computeHash || ts.generateDjb2Hash)(firstDts_1.text);
-                    if (exportedModulesMapCache && latestSignature !== prevSignature) {
-                        updateExportedModules(sourceFile, emitOutput_1.exportedModulesFromDeclarationEmit, exportedModulesMapCache);
+                    latestSignature = computeSignature(firstDts_1.text, computeHash);
+                    if (latestSignature !== prevSignature) {
+                        updateExportedModules(state, sourceFile, emitOutput_1.exportedModulesFromDeclarationEmit);
                     }
                 }
             }
             // Default is to use file version as signature
             if (latestSignature === undefined) {
                 latestSignature = sourceFile.version;
-                if (exportedModulesMapCache && latestSignature !== prevSignature) {
+                if (state.exportedModulesMap && latestSignature !== prevSignature) {
+                    (state.oldExportedModulesMap || (state.oldExportedModulesMap = new ts.Map())).set(sourceFile.resolvedPath, state.exportedModulesMap.getValues(sourceFile.resolvedPath) || false);
                     // All the references in this file are exported
                     var references = state.referencedMap ? state.referencedMap.getValues(sourceFile.resolvedPath) : undefined;
                     if (references) {
-                        exportedModulesMapCache.set(sourceFile.resolvedPath, references);
+                        state.exportedModulesMap.set(sourceFile.resolvedPath, references);
                     }
                     else {
-                        exportedModulesMapCache.deleteKey(sourceFile.resolvedPath);
+                        state.exportedModulesMap.deleteKey(sourceFile.resolvedPath);
                     }
                 }
             }
-            cacheToUpdateSignature.set(sourceFile.resolvedPath, latestSignature);
+            (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;
             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(sourceFile, exportedModulesFromDeclarationEmit, exportedModulesMapCache) {
+        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);
             if (!exportedModulesFromDeclarationEmit) {
-                exportedModulesMapCache.deleteKey(sourceFile.resolvedPath);
+                state.exportedModulesMap.deleteKey(sourceFile.resolvedPath);
                 return;
             }
             var exportedModules;
             exportedModulesFromDeclarationEmit.forEach(function (symbol) { return addExportedModule(getReferencedFilesFromImportedModuleSymbol(symbol)); });
             if (exportedModules) {
-                exportedModulesMapCache.set(sourceFile.resolvedPath, exportedModules);
+                state.exportedModulesMap.set(sourceFile.resolvedPath, exportedModules);
             }
             else {
-                exportedModulesMapCache.deleteKey(sourceFile.resolvedPath);
+                state.exportedModulesMap.deleteKey(sourceFile.resolvedPath);
             }
             function addExportedModule(exportedModulePaths) {
                 if (exportedModulePaths === null || exportedModulePaths === void 0 ? void 0 : exportedModulePaths.length) {
@@ -120118,19 +120230,6 @@ 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
          */
@@ -120251,7 +120350,7 @@ var ts;
         /**
          * When program emits modular code, gets the files affected by the sourceFile whose shape has changed
          */
-        function getFilesAffectedByUpdatedShapeWhenModuleEmit(state, programOfThisState, sourceFileWithUpdatedShape, cacheToUpdateSignature, cancellationToken, computeHash, exportedModulesMapCache) {
+        function getFilesAffectedByUpdatedShapeWhenModuleEmit(state, programOfThisState, sourceFileWithUpdatedShape, cancellationToken, computeHash) {
             if (isFileAffectingGlobalScope(sourceFileWithUpdatedShape)) {
                 return getAllFilesExcludingDefaultLibraryFile(state, programOfThisState, sourceFileWithUpdatedShape);
             }
@@ -120271,7 +120370,7 @@ var ts;
                 if (!seenFileNamesMap.has(currentPath)) {
                     var currentSourceFile = programOfThisState.getSourceFileByPath(currentPath);
                     seenFileNamesMap.set(currentPath, currentSourceFile);
-                    if (currentSourceFile && updateShapeSignature(state, programOfThisState, currentSourceFile, cacheToUpdateSignature, cancellationToken, computeHash, exportedModulesMapCache)) {
+                    if (currentSourceFile && updateShapeSignature(state, programOfThisState, currentSourceFile, cancellationToken, computeHash)) {
                         queue.push.apply(queue, getReferencedByPaths(state, currentSourceFile.resolvedPath));
                     }
                 }
@@ -120297,32 +120396,33 @@ 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 (!ts.outFile(compilerOptions)) {
+        if (!outFilePath) {
             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
-            changedFilesSet === null || changedFilesSet === void 0 ? void 0 : changedFilesSet.forEach(function (value) { return state.changedFilesSet.add(value); });
-            if (!ts.outFile(compilerOptions) && oldState.affectedFilesPendingEmit) {
+            (_a = oldState.changedFilesSet) === null || _a === void 0 ? void 0 : _a.forEach(function (value) { return state.changedFilesSet.add(value); });
+            if (!outFilePath && oldState.affectedFilesPendingEmit) {
                 state.affectedFilesPendingEmit = oldState.affectedFilesPendingEmit.slice();
                 state.affectedFilesPendingEmitKind = oldState.affectedFilesPendingEmitKind && new ts.Map(oldState.affectedFilesPendingEmitKind);
                 state.affectedFilesPendingEmitIndex = oldState.affectedFilesPendingEmitIndex;
@@ -120343,6 +120443,8 @@ 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
@@ -120366,27 +120468,25 @@ 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 && !ts.outFile(compilerOptions) && ts.compilerOptionsAffectEmit(compilerOptions, oldCompilerOptions)) {
+        else if (oldCompilerOptions && !outFilePath && 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();
         }
-        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;
+        // 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);
         return state;
     }
     function convertToDiagnostics(diagnostics, newProgram, getCanonicalFileName) {
@@ -120422,30 +120522,35 @@ var ts;
         ts.BuilderState.releaseCache(state);
         state.program = undefined;
     }
-    /**
-     * 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;
+    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;
     }
     /**
      * Verifies that source file is ok to be used in calls that arent handled by next
@@ -120460,7 +120565,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;
+        var _a, _b;
         while (true) {
             var affectedFiles = state.affectedFiles;
             if (affectedFiles) {
@@ -120480,10 +120585,8 @@ var ts;
                 state.changedFilesSet.delete(state.currentChangedFilePath);
                 state.currentChangedFilePath = undefined;
                 // Commit the changes in file signature
-                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();
+                (_a = state.oldSignatures) === null || _a === void 0 ? void 0 : _a.clear();
+                (_b = state.oldExportedModulesMap) === null || _b === void 0 ? void 0 : _b.clear();
                 state.affectedFiles = undefined;
             }
             // Get next changed file
@@ -120501,12 +120604,7 @@ var ts;
                 return program;
             }
             // Get next batch of affected files
-            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.affectedFiles = ts.BuilderState.getFilesAffectedByWithOldState(state, program, nextKey.value, cancellationToken, computeHash);
             state.currentChangedFilePath = nextKey.value;
             state.affectedFilesIndex = 0;
             if (!state.seenAffectedFiles)
@@ -120558,7 +120656,6 @@ 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) {
@@ -120566,10 +120663,9 @@ 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, ts.Debug.checkDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap);
+            ts.BuilderState.updateShapeSignature(state, ts.Debug.checkDefined(state.program), affectedFile, cancellationToken, computeHash);
             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);
@@ -120589,7 +120685,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, ts.Debug.checkDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap, !host.disableUseFileVersionAsSignature);
+                ts.BuilderState.updateShapeSignature(state, program, sourceFile, cancellationToken, computeHash, !host.disableUseFileVersionAsSignature);
                 // If not dts emit, nothing more to do
                 if (ts.getEmitDeclarations(state.compilerOptions)) {
                     addToAffectedFilesPendingEmit(state, path, 0 /* DtsOnly */);
@@ -120610,27 +120706,10 @@ var ts;
         return !state.semanticDiagnosticsFromOldState.size;
     }
     function isChangedSignature(state, path) {
-        var newSignature = ts.Debug.checkDefined(state.currentAffectedFilesSignatures).get(path);
-        var oldSignature = ts.Debug.checkDefined(state.fileInfos.get(path)).signature;
+        var oldSignature = ts.Debug.checkDefined(state.oldSignatures).get(path) || undefined;
+        var newSignature = 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))
@@ -120645,6 +120724,7 @@ 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))
@@ -120671,11 +120751,10 @@ 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
-        forEachKeyOfExportedModulesMap(state, affectedFile.resolvedPath, function (exportedFromPath) {
+        (_a = state.exportedModulesMap.getKeys(affectedFile.resolvedPath)) === null || _a === void 0 ? void 0 : _a.forEach(function (exportedFromPath) {
             if (handleDtsMayChangeOfGlobalScope(state, exportedFromPath, cancellationToken, computeHash, host))
                 return true;
             var references = state.referencedMap.getKeys(exportedFromPath);
@@ -120689,19 +120768,18 @@ 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;
+        var _a, _b;
         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
-        forEachKeyOfExportedModulesMap(state, filePath, function (exportedFromPath) {
+        (_a = state.exportedModulesMap.getKeys(filePath)) === null || _a === void 0 ? void 0 : _a.forEach(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)
-        (_a = state.referencedMap.getKeys(filePath)) === null || _a === void 0 ? void 0 : _a.forEach(function (referencingFilePath) {
+        (_b = state.referencedMap.getKeys(filePath)) === null || _b === void 0 ? void 0 : _b.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);
@@ -120722,12 +120800,13 @@ 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++;
@@ -120775,25 +120854,61 @@ 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) {
-        if (ts.outFile(state.compilerOptions))
-            return undefined;
+    function getProgramBuildInfo(state, getCanonicalFileName, host) {
+        var outFilePath = ts.outFile(state.compilerOptions);
+        if (outFilePath && !state.compilerOptions.composite)
+            return;
         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 signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key);
-            var actualSignature = signature !== null && signature !== void 0 ? signature : value.signature;
+            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]);
+                    }
+                }
+            }
             return value.version === actualSignature ?
                 value.affectsGlobalScope || value.impliedFormat ?
                     // If file version is same as signature, dont serialize signature
@@ -120801,11 +120916,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
-                    signature === undefined ?
+                    oldSignature === undefined ?
                         // If we havent computed signature, use fileInfo as is
                         value :
                         // Serialize fileInfo with new updated signature
-                        { version: value.version, signature: signature, affectsGlobalScope: value.affectsGlobalScope, impliedFormat: value.impliedFormat } :
+                        { version: value.version, signature: actualSignature, 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 };
         });
@@ -120820,17 +120935,13 @@ var ts;
         if (state.exportedModulesMap) {
             exportedModulesMap = ts.mapDefined(ts.arrayFrom(state.exportedModulesMap.keys()).sort(ts.compareStringsCaseSensitive), function (key) {
                 var _a;
-                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)];
-                    }
-                }
+                var oldValue = (_a = state.oldExportedModulesMap) === null || _a === void 0 ? void 0 : _a.get(key);
                 // Not in temporary cache, use existing value
-                return [toFileId(key), toFileIdListId(state.exportedModulesMap.getValues(key))];
+                if (oldValue === undefined)
+                    return [toFileId(key), toFileIdListId(state.exportedModulesMap.getValues(key))];
+                if (oldValue)
+                    return [toFileId(key), toFileIdListId(oldValue)];
+                return undefined;
             });
         }
         var semanticDiagnosticsPerFile;
@@ -120841,9 +120952,7 @@ var ts;
                 (semanticDiagnosticsPerFile || (semanticDiagnosticsPerFile = [])).push(value.length ?
                     [
                         toFileId(key),
-                        state.hasReusableDiagnostic ?
-                            value :
-                            convertToReusableDiagnostics(value, relativeToBuildInfo)
+                        convertToReusableDiagnostics(value, relativeToBuildInfo)
                     ] :
                     toFileId(key));
             }
@@ -120858,16 +120967,27 @@ var ts;
                 }
             }
         }
-        return {
+        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 = {
             fileNames: fileNames,
             fileInfos: fileInfos,
-            options: convertToProgramBuildInfoCompilerOptions(state.compilerOptions, relativeToBuildInfoEnsuringAbsolutePath),
+            options: convertToProgramBuildInfoCompilerOptions(state.compilerOptions, "affectsMultiFileEmitBuildInfo"),
             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));
         }
@@ -120892,24 +121012,18 @@ var ts;
             }
             return fileIdListId;
         }
-    }
-    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);
+        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);
+                }
             }
+            return result;
         }
-        return result;
     }
     function convertToReusableCompilerOptionValue(option, value, relativeToBuildInfo) {
         if (option) {
@@ -120983,6 +121097,10 @@ 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
@@ -121001,8 +121119,8 @@ var ts;
          */
         var computeHash = ts.maybeBind(host, host.createHash);
         var state = createBuilderProgramState(newProgram, getCanonicalFileName, oldState, host.disableUseFileVersionAsSignature);
-        var backupState;
-        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state, getCanonicalFileName); };
+        var backupEmitState;
+        newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state, getCanonicalFileName, host); };
         // To ensure that we arent storing any references to old program or new program without state
         newProgram = undefined; // TODO: GH#18217
         oldProgram = undefined;
@@ -121010,20 +121128,20 @@ var ts;
         var getState = function () { return state; };
         var builderProgram = createRedirectedBuilderProgram(getState, configFileParsingDiagnostics);
         builderProgram.getState = getState;
-        builderProgram.backupState = function () {
-            ts.Debug.assert(backupState === undefined);
-            backupState = cloneBuilderProgramState(state);
+        builderProgram.backupEmitState = function () {
+            ts.Debug.assert(backupEmitState === undefined);
+            backupEmitState = backupEmitBuilderProgramState(state);
         };
-        builderProgram.restoreState = function () {
-            state = ts.Debug.checkDefined(backupState);
-            backupState = undefined;
+        builderProgram.restoreEmitState = function () {
+            restoreEmitBuilderProgramState(state, ts.Debug.checkDefined(backupEmitState));
+            backupEmitState = 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);
-            backupState = undefined;
+            backupEmitState = undefined;
         };
         if (kind === BuilderProgramKind.SemanticDiagnosticsBuilderProgram) {
             builderProgram.getSemanticDiagnosticsOfNextAffectedFile = getSemanticDiagnosticsOfNextAffectedFile;
@@ -121082,35 +121200,59 @@ 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, affected !== state.program && ts.getEmitDeclarations(state.compilerOptions) && !customTransformers ?
-                getWriteFileUpdatingSignatureCallback(writeFile) :
+            ts.Debug.checkDefined(state.program).emit(affected === state.program ? undefined : affected, ts.getEmitDeclarations(state.compilerOptions) ?
+                getWriteFileCallback(writeFile, customTransformers) :
                 writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles || emitKind === 0 /* DtsOnly */, customTransformers), affected, emitKind, isPendingEmitFile);
         }
-        function getWriteFileUpdatingSignatureCallback(writeFile) {
+        function getWriteFileCallback(writeFile, customTransformers) {
             return function (fileName, text, writeByteOrderMark, onError, sourceFiles, data) {
-                var _a;
+                var _a, _b, _c;
                 if (ts.isDeclarationFileName(fileName)) {
-                    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 (!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();
+                                    }
+                                }
                             }
-                            else {
-                                info.signature = newSignature;
-                                if (state.exportedModulesMap)
-                                    ts.BuilderState.updateExportedFilesMapFromCache(state, state.currentAffectedFilesExportedModulesMap);
+                        }
+                        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 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);
@@ -121175,8 +121317,8 @@ var ts;
                     }
                 }
             }
-            return ts.Debug.checkDefined(state.program).emit(targetSourceFile, !ts.outFile(state.compilerOptions) && ts.getEmitDeclarations(state.compilerOptions) && !customTransformers ?
-                getWriteFileUpdatingSignatureCallback(writeFile) :
+            return ts.Debug.checkDefined(state.program).emit(targetSourceFile, ts.getEmitDeclarations(state.compilerOptions) ?
+                getWriteFileCallback(writeFile, customTransformers) :
                 writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         }
         /**
@@ -121265,29 +121407,58 @@ var ts;
                 { version: fileInfo.version, signature: fileInfo.signature === false ? undefined : fileInfo.version, affectsGlobalScope: fileInfo.affectsGlobalScope, impliedFormat: fileInfo.impliedFormat };
     }
     ts.toBuilderStateFileInfo = toBuilderStateFileInfo;
-    function createBuildProgramUsingProgramBuildInfo(program, buildInfoPath, host) {
-        var _a;
+    function createBuilderProgramUsingProgramBuildInfo(program, buildInfoPath, host) {
+        var _a, _b, _c, _d;
         var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
         var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
-        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,
-        };
+        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,
+            };
+        }
         return {
             getState: function () { return state; },
-            backupState: ts.noop,
-            restoreState: ts.noop,
+            backupEmitState: ts.noop,
+            restoreEmitState: ts.noop,
             getProgram: ts.notImplemented,
             getProgramOrUndefined: ts.returnUndefined,
             releaseProgram: ts.noop,
@@ -121332,12 +121503,24 @@ var ts;
             return map;
         }
     }
-    ts.createBuildProgramUsingProgramBuildInfo = createBuildProgramUsingProgramBuildInfo;
+    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;
     function createRedirectedBuilderProgram(getState, configFileParsingDiagnostics) {
         return {
             getState: ts.notImplemented,
-            backupState: ts.noop,
-            restoreState: ts.noop,
+            backupEmitState: ts.noop,
+            restoreEmitState: ts.noop,
             getProgram: getProgram,
             getProgramOrUndefined: function () { return getState().program; },
             releaseProgram: function () { return getState().program = undefined; },
@@ -122453,9 +122636,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_15 = ts.forEach(targets, function (p) { return !(shouldFilterIgnoredPaths && ts.containsIgnoredPath(p)) && cb(p, referenceRedirect === p); });
-                if (result_15)
-                    return result_15;
+                var result_16 = ts.forEach(targets, function (p) { return !(shouldFilterIgnoredPaths && ts.containsIgnoredPath(p)) && cb(p, referenceRedirect === p); });
+                if (result_16)
+                    return result_16;
             }
             var symlinkedDirectories = (_a = host.getSymlinkCache) === null || _a === void 0 ? void 0 : _a.call(host).getSymlinkedDirectoriesByRealpath();
             var fullImportedFileName = ts.getNormalizedAbsolutePath(importedFileName, cwd);
@@ -122475,10 +122658,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_16 = cb(option, target === referenceRedirect);
+                        var result_17 = cb(option, target === referenceRedirect);
                         shouldFilterIgnoredPaths = true; // We found a non-ignored path in symlinks, so we can reject ignored-path realpaths
-                        if (result_16)
-                            return result_16;
+                        if (result_17)
+                            return result_17;
                     }
                 });
             });
@@ -122520,7 +122703,7 @@ var ts;
             });
             // Sort by paths closest to importing file Name directory
             var sortedPaths = [];
-            var _loop_33 = function (directory) {
+            var _loop_34 = function (directory) {
                 var directoryStart = ts.ensureTrailingDirectorySeparator(directory);
                 var pathsInDirectory;
                 allFileNames.forEach(function (_a, fileName) {
@@ -122544,9 +122727,9 @@ var ts;
             };
             var out_directory_1;
             for (var directory = ts.getDirectoryPath(importingFileName); allFileNames.size !== 0;) {
-                var state_10 = _loop_33(directory);
+                var state_11 = _loop_34(directory);
                 directory = out_directory_1;
-                if (state_10 === "break")
+                if (state_11 === "break")
                     break;
             }
             if (allFileNames.size) {
@@ -122939,6 +123122,7 @@ var ts;
         if (system.clearScreen &&
             !options.preserveWatchOutput &&
             !options.extendedDiagnostics &&
+            !options.solutionDiagnostics &&
             !options.diagnostics &&
             ts.contains(ts.screenStartingMessageCodes, diagnostic.code)) {
             system.clearScreen();
@@ -123388,6 +123572,7 @@ 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 {
@@ -123448,6 +123633,7 @@ var ts;
             createProgram: createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram,
             disableUseFileVersionAsSignature: system.disableUseFileVersionAsSignature,
             storeFilesChangingSignatureDuringEmit: system.storeFilesChangingSignatureDuringEmit,
+            now: ts.maybeBind(system, system.now),
         };
     }
     ts.createProgramHost = createProgramHost;
@@ -123515,20 +123701,26 @@ 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 content = host.readFile(buildInfoPath);
-        if (!content)
-            return undefined;
-        var buildInfo = ts.getBuildInfo(content);
+        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);
+        }
         if (buildInfo.version !== ts.version)
             return undefined;
         if (!buildInfo.program)
             return undefined;
-        return ts.createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, host);
+        return ts.createBuilderProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, host);
     }
     ts.readBuilderProgram = readBuilderProgram;
     function createIncrementalCompilerHost(options, system) {
@@ -123537,6 +123729,7 @@ 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;
@@ -124272,14 +124465,17 @@ var ts;
         UpToDateStatusType[UpToDateStatusType["OutputMissing"] = 4] = "OutputMissing";
         UpToDateStatusType[UpToDateStatusType["OutOfDateWithSelf"] = 5] = "OutOfDateWithSelf";
         UpToDateStatusType[UpToDateStatusType["OutOfDateWithUpstream"] = 6] = "OutOfDateWithUpstream";
-        UpToDateStatusType[UpToDateStatusType["UpstreamOutOfDate"] = 7] = "UpstreamOutOfDate";
-        UpToDateStatusType[UpToDateStatusType["UpstreamBlocked"] = 8] = "UpstreamBlocked";
-        UpToDateStatusType[UpToDateStatusType["ComputingUpstream"] = 9] = "ComputingUpstream";
-        UpToDateStatusType[UpToDateStatusType["TsVersionOutputOfDate"] = 10] = "TsVersionOutputOfDate";
+        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";
         /**
          * Projects with no outputs (i.e. "solution" files)
          */
-        UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 11] = "ContainerOnly";
+        UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 13] = "ContainerOnly";
+        UpToDateStatusType[UpToDateStatusType["ForceBuild"] = 14] = "ForceBuild";
     })(UpToDateStatusType = ts.UpToDateStatusType || (ts.UpToDateStatusType = {}));
     function resolveConfigFileProjectName(project) {
         if (ts.fileExtensionIs(project, ".json" /* Json */)) {
@@ -124324,9 +124520,11 @@ var ts;
     function getOrCreateValueMapFromConfigFileMap(configFileMap, resolved) {
         return getOrCreateValueFromConfigFileMap(configFileMap, resolved, function () { return new ts.Map(); });
     }
-    function newer(date1, date2) {
-        return date2 > date1 ? date2 : date1;
+    /*@internal*/
+    function getCurrentTime(host) {
+        return host.now ? host.now() : new Date();
     }
+    ts.getCurrentTime = getCurrentTime;
     /*@internal*/
     function isCircularBuildOrder(buildOrder) {
         return !!buildOrder && !!buildOrder.buildOrder;
@@ -124379,6 +124577,8 @@ var ts;
             if (ts.hasProperty(buildOptions, option.name))
                 result[option.name] = buildOptions[option.name];
         });
+        if (buildOptions.solutionDiagnostics)
+            result.solutionDiagnostics = true;
         return result;
     }
     function createSolutionBuilder(host, rootNames, defaultOptions) {
@@ -124416,6 +124616,7 @@ 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,
@@ -124432,8 +124633,9 @@ 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(),
@@ -124456,6 +124658,7 @@ 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,
@@ -124566,11 +124769,12 @@ 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 });
@@ -124867,21 +125071,21 @@ var ts;
         }
         function emit(writeFileCallback, cancellationToken, customTransformers) {
             var _a;
-            var _b, _c;
+            var _b, _c, _d;
             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.backupState();
+            program.backupEmitState();
             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) { return outputFiles.push({ name: name, text: text, writeByteOrderMark: writeByteOrderMark }); }, cancellationToken, 
+            /*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, 
             /*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.restoreState();
+                program.restoreEmitState();
                 (_a = buildErrors(state, projectPath, program, config, declDiagnostics, BuildResultFlags.DeclarationEmitErrors, "Declaration file"), buildResult = _a.buildResult, step = _a.step);
                 return {
                     emitSkipped: true,
@@ -124891,40 +125095,46 @@ var ts;
             // Actual Emit
             var host = state.host, compilerHost = state.compilerHost;
             var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
-            var newestDeclarationFileContentChangedTime = minimumDate;
-            var anyDtsChanged = false;
+            var existingBuildInfo = ((_d = state.buildInfoCache.get(projectPath)) === null || _d === void 0 ? void 0 : _d.buildInfo) || undefined;
             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 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 {
+                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)) {
                         resultFlags &= ~BuildResultFlags.DeclarationOutputUnchanged;
-                        anyDtsChanged = true;
                     }
                 }
-                emittedOutputs.set(toPath(state, name), name);
                 ts.writeFile(writeFileCallback ? { writeFile: writeFileCallback } : compilerHost, emitterDiagnostics, name, text, writeByteOrderMark);
-                if (priorChangeTime !== undefined) {
-                    newestDeclarationFileContentChangedTime = newer(priorChangeTime, newestDeclarationFileContentChangedTime);
+                if (!isIncremental && state.watch) {
+                    (outputTimeStampMap || (outputTimeStampMap = getOutputTimeStampMap(state, projectPath))).set(path, now || (now = getCurrentTime(state.host)));
                 }
             });
             ts.solutionPerformance.mark("afterOutputFilesWrite");
             ts.solutionPerformance.measure("OutputFilesWrite", "beforeOutputFilesWrite", "afterOutputFilesWrite");
-            finishEmit(emitterDiagnostics, emittedOutputs, newestDeclarationFileContentChangedTime, 
-            /*newestDeclarationFileContentChangedTimeIsMaximumDate*/ anyDtsChanged, outputFiles.length ? outputFiles[0].name : ts.getFirstProjectOutput(config, !host.useCaseSensitiveFileNames()), resultFlags);
+            finishEmit(emitterDiagnostics, emittedOutputs, 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(writeFileCallback, cancellationToken);
+            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);
             if (emitResult.diagnostics.length) {
                 reportErrors(state, emitResult.diagnostics);
                 state.diagnostics.set(projectPath, __spreadArray(__spreadArray([], state.diagnostics.get(projectPath), true), emitResult.diagnostics, true));
@@ -124937,7 +125147,7 @@ var ts;
             step = BuildStep.QueueReferencingProjects;
             return emitResult;
         }
-        function finishEmit(emitterDiagnostics, emittedOutputs, priorNewestUpdateTime, newestDeclarationFileContentChangedTimeIsMaximumDate, oldestOutputFileName, resultFlags) {
+        function finishEmit(emitterDiagnostics, emittedOutputs, oldestOutputFileName, resultFlags) {
             var _a;
             var emitDiagnostics = emitterDiagnostics.getDiagnostics();
             if (emitDiagnostics.length) {
@@ -124948,13 +125158,11 @@ var ts;
                 emittedOutputs.forEach(function (name) { return listEmittedFile(state, config, name); });
             }
             // Update time stamps for rest of the outputs
-            var newestDeclarationFileContentChangedTime = updateOutputTimestampsWorker(state, config, priorNewestUpdateTime, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
+            updateOutputTimestampsWorker(state, config, projectPath, ts.Diagnostics.Updating_unchanged_output_timestamps_of_project_0, emittedOutputs);
             state.diagnostics.delete(projectPath);
             state.projectStatus.set(projectPath, {
                 type: ts.UpToDateStatusType.UpToDate,
-                newestDeclarationFileContentChangedTime: newestDeclarationFileContentChangedTimeIsMaximumDate ?
-                    maximumDate :
-                    newestDeclarationFileContentChangedTime,
+                newestDeclarationFileContentChangedTime: getDtsChangeTime(state, config.options, projectPath),
                 oldestOutputFileName: oldestOutputFileName
             });
             afterProgramDone(state, program, config);
@@ -124989,13 +125197,21 @@ 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 name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
+                var _b, _c;
+                var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark, buildInfo = _a.buildInfo;
                 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, minimumDate, 
-            /*newestDeclarationFileContentChangedTimeIsMaximumDate*/ false, outputFiles[0].name, BuildResultFlags.DeclarationOutputUnchanged);
+            var emitDiagnostics = finishEmit(emitterDiagnostics, emittedOutputs, outputFiles[0].name, resultFlags);
             return { emitSkipped: false, diagnostics: emitDiagnostics };
         }
         function executeSteps(till, cancellationToken, writeFile, customTransformers) {
@@ -125101,7 +125317,7 @@ var ts;
                     }
                     continue;
                 }
-                if (status.type === ts.UpToDateStatusType.UpToDateWithUpstreamTypes) {
+                if (status.type === ts.UpToDateStatusType.UpToDateWithUpstreamTypes || status.type === ts.UpToDateStatusType.UpToDateWithInputFileText) {
                     reportAndStoreErrors(state, projectPath, ts.getConfigFileParsingDiagnostics(config));
                     return {
                         kind: InvalidatedProjectKind.UpdateOutputFileStamps,
@@ -125187,7 +125403,7 @@ var ts;
         state.projectCompilerOptions = state.baseCompilerOptions;
     }
     function buildErrors(state, resolvedPath, program, config, diagnostics, buildResult, errorType) {
-        var canEmitBuildInfo = !(buildResult & BuildResultFlags.SyntaxErrors) && program && !ts.outFile(program.getCompilerOptions());
+        var canEmitBuildInfo = program && !ts.outFile(program.getCompilerOptions());
         reportAndStoreErrors(state, resolvedPath, diagnostics);
         state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.Unbuildable, reason: errorType + " errors" });
         if (canEmitBuildInfo)
@@ -125195,9 +125411,101 @@ 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 = ts.getModifiedTime(state.host, configFile);
+        var tsconfigTime = getModifiedTime(state, configFile);
         if (oldestOutputFileTime < tsconfigTime) {
             return {
                 type: ts.UpToDateStatusType.OutOfDateWithSelf,
@@ -125207,88 +125515,24 @@ var ts;
         }
     }
     function getUpToDateStatusWorker(state, project, resolvedPath) {
-        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;
-                }
-            }
-        }
+        var _a, _b, _c;
         // Container if no files are specified in the project
         if (!project.fileNames.length && !ts.canJsonReportNoInputFiles(project.raw)) {
             return {
                 type: ts.UpToDateStatusType.ContainerOnly
             };
         }
-        // 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;
+        // Fast check to see if reference projects are buildable
+        var referenceStatuses;
+        var force = !!state.options.force;
         if (project.projectReferences) {
             state.projectStatus.set(resolvedPath, { type: ts.UpToDateStatusType.ComputingUpstream });
-            for (var _c = 0, _d = project.projectReferences; _c < _d.length; _c++) {
-                var ref = _d[_c];
-                usesPrepend = usesPrepend || !!(ref.prepend);
+            for (var _i = 0, _d = project.projectReferences; _i < _d.length; _i++) {
+                var ref = _d[_i];
                 var resolvedRef = ts.resolveProjectReferencePath(ref);
                 var resolvedRefPath = toResolvedConfigFilePath(state, resolvedRef);
-                var refStatus = getUpToDateStatus(state, parseConfigFile(state, resolvedRef, resolvedRefPath), resolvedRefPath);
+                var resolvedConfig = parseConfigFile(state, resolvedRef, resolvedRefPath);
+                var refStatus = getUpToDateStatus(state, resolvedConfig, 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
@@ -125310,78 +125554,188 @@ var ts;
                         upstreamProjectName: ref.path
                     };
                 }
-                // 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");
+                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))) {
                     return {
-                        type: ts.UpToDateStatusType.OutOfDateWithUpstream,
-                        outOfDateOutputFileName: oldestOutputFileName,
-                        newerProjectName: ref.path
+                        type: ts.UpToDateStatusType.OutOfDateBuildInfo,
+                        buildInfoFile: buildInfoPath
                     };
                 }
+                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;
         }
-        if (missingOutputFileName !== undefined) {
-            return {
-                type: ts.UpToDateStatusType.OutputMissing,
-                missingOutputFileName: missingOutputFileName
-            };
+        // 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 (isOutOfDateWithInputs) {
-            return {
-                type: ts.UpToDateStatusType.OutOfDateWithSelf,
-                outOfDateOutputFileName: oldestOutputFileName,
-                newerInputFileName: newestInputFileName
-            };
+        // 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
+                    };
+                }
+            }
         }
-        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) {
+        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)) {
                     return {
-                        type: ts.UpToDateStatusType.TsVersionOutputOfDate,
-                        version: buildInfo.version
+                        type: ts.UpToDateStatusType.OutOfDateWithUpstream,
+                        outOfDateOutputFileName: buildInfoPath,
+                        newerProjectName: ref.path
                     };
                 }
+                // 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,
@@ -125391,15 +125745,37 @@ var ts;
         }
         // Up to date
         return {
-            type: pseudoUpToDate ? ts.UpToDateStatusType.UpToDateWithUpstreamTypes : ts.UpToDateStatusType.UpToDate,
+            type: pseudoUpToDate ?
+                ts.UpToDateStatusType.UpToDateWithUpstreamTypes :
+                pseudoInputUptodate ?
+                    ts.UpToDateStatusType.UpToDateWithInputFileText :
+                    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" };
@@ -125415,42 +125791,69 @@ var ts;
         state.projectStatus.set(resolvedPath, actual);
         return actual;
     }
-    function updateOutputTimestampsWorker(state, proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
+    function updateOutputTimestampsWorker(state, proj, projectPath, verboseMessage, skipOutputs) {
         if (proj.options.noEmit)
-            return priorNewestUpdateTime;
+            return;
+        var now;
         ts.solutionPerformance.mark("beforeUpdateOutputTimestamps");
-        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;
+        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)
                     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");
-        return priorNewestUpdateTime;
+    }
+    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;
     }
     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);
         }
-        var priorNewestUpdateTime = updateOutputTimestampsWorker(state, proj, minimumDate, ts.Diagnostics.Updating_output_timestamps_of_project_0);
+        updateOutputTimestampsWorker(state, proj, resolvedPath, ts.Diagnostics.Updating_output_timestamps_of_project_0);
         state.projectStatus.set(resolvedPath, {
             type: ts.UpToDateStatusType.UpToDate,
-            newestDeclarationFileContentChangedTime: priorNewestUpdateTime,
+            newestDeclarationFileContentChangedTime: getDtsChangeTime(state, proj.options, resolvedPath),
             oldestOutputFileName: ts.getFirstProjectOutput(proj, !state.host.useCaseSensitiveFileNames())
         });
     }
@@ -125496,6 +125899,7 @@ var ts;
                                 break;
                             }
                         // falls through
+                        case ts.UpToDateStatusType.UpToDateWithInputFileText:
                         case ts.UpToDateStatusType.UpToDateWithUpstreamTypes:
                         case ts.UpToDateStatusType.OutOfDateWithPrepend:
                             if (!(buildResult & BuildResultFlags.DeclarationOutputUnchanged)) {
@@ -125556,6 +125960,13 @@ var ts;
                     : ts.ExitStatus.DiagnosticsPresent_OutputsSkipped;
     }
     function clean(state, project, onlyReferences) {
+        ts.solutionPerformance.mark("beforeClean");
+        var result = cleanWorker(state, project, onlyReferences);
+        ts.solutionPerformance.mark("afterClean");
+        ts.solutionPerformance.measure("Clean", "beforeClean", "afterClean");
+        return result;
+    }
+    function cleanWorker(state, project, onlyReferences) {
         var buildOrder = getBuildOrderFor(state, project, onlyReferences);
         if (!buildOrder)
             return ts.ExitStatus.InvalidProject_OutputsSkipped;
@@ -125680,12 +126091,10 @@ var ts;
     function watchConfigFile(state, resolved, resolvedPath, parsed) {
         if (!state.watch || state.allWatchedConfigFiles.has(resolvedPath))
             return;
-        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));
+        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));
     }
     function watchExtendedConfigFiles(state, resolvedPath, parsed) {
-        ts.updateSharedExtendedConfigFileWatcher(resolvedPath, parsed === null || parsed === void 0 ? void 0 : parsed.options, state.allWatchedExtendedConfigFiles, function (extendedConfigFileName, extendedConfigFilePath) { return state.watchFile(extendedConfigFileName, function () {
+        ts.updateSharedExtendedConfigFileWatcher(resolvedPath, parsed === null || parsed === void 0 ? void 0 : parsed.options, state.allWatchedExtendedConfigFiles, function (extendedConfigFileName, extendedConfigFilePath) { return watchFile(state, 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);
@@ -125717,7 +126126,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 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); },
+            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); },
             onDeleteValue: ts.closeFileWatcher,
         });
     }
@@ -125725,7 +126134,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 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); },
+            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); },
             onDeleteValue: ts.closeFileWatcher,
         });
     }
@@ -125858,19 +126267,18 @@ 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_oldest_output_1_is_older_than_newest_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_output_1_is_older_than_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_oldest_output_1_is_older_than_newest_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_output_1_is_older_than_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_oldest_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_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;
@@ -125878,6 +126286,8 @@ 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:
@@ -125888,6 +126298,8 @@ 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
@@ -144707,7 +145119,7 @@ var ts;
                 if (!ts.textSpanIntersectsWith(span, node.pos, node.getFullWidth())) {
                     return;
                 }
-                if (ts.isTypeNode(node)) {
+                if (ts.isTypeNode(node) && !ts.isExpressionWithTypeArguments(node)) {
                     return;
                 }
                 if (preferences.includeInlayVariableTypeHints && ts.isVariableDeclaration(node)) {
@@ -147818,7 +148230,6 @@ var ts;
                                 case 280 /* JsxOpeningElement */:
                                 case 281 /* JsxClosingElement */:
                                 case 279 /* JsxSelfClosingElement */:
-                                case 228 /* ExpressionWithTypeArguments */:
                                     return false;
                             }
                             break;
@@ -147988,7 +148399,7 @@ var ts;
                     var listEndToken = getCloseTokenForOpenToken(listStartToken);
                     if (listEndToken !== 0 /* Unknown */ && formattingScanner.isOnToken() && formattingScanner.getStartPos() < originalRange.end) {
                         var tokenInfo = formattingScanner.readTokenInfo(parent);
-                        if (tokenInfo.token.kind === 27 /* CommaToken */ && ts.isCallLikeExpression(parent)) {
+                        if (tokenInfo.token.kind === 27 /* CommaToken */) {
                             // consume the comma
                             consumeTokenAndAdvanceScanner(tokenInfo, parent, listDynamicIndentation, parent);
                             tokenInfo = formattingScanner.isOnToken() ? formattingScanner.readTokenInfo(parent) : undefined;
@@ -148392,6 +148803,12 @@ var ts;
                 case 169 /* MethodDeclaration */:
                 case 168 /* MethodSignature */:
                 case 214 /* ArrowFunction */:
+                case 174 /* CallSignature */:
+                case 175 /* ConstructSignature */:
+                case 179 /* FunctionType */:
+                case 180 /* ConstructorType */:
+                case 172 /* GetAccessor */:
+                case 173 /* SetAccessor */:
                     if (node.typeParameters === list) {
                         return 29 /* LessThanToken */;
                     }
@@ -148408,7 +148825,19 @@ var ts;
                         return 20 /* OpenParenToken */;
                     }
                     break;
+                case 257 /* ClassDeclaration */:
+                case 226 /* ClassExpression */:
+                case 258 /* InterfaceDeclaration */:
+                case 259 /* TypeAliasDeclaration */:
+                    if (node.typeParameters === list) {
+                        return 29 /* LessThanToken */;
+                    }
+                    break;
                 case 178 /* TypeReference */:
+                case 210 /* TaggedTemplateExpression */:
+                case 181 /* TypeQuery */:
+                case 228 /* ExpressionWithTypeArguments */:
+                case 200 /* ImportType */:
                     if (node.typeArguments === list) {
                         return 29 /* LessThanToken */;
                     }