@typescript-deploys/pr-build 4.8.0-pr-48997-21 → 4.8.0-pr-49285-5

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.8";
-    ts.version = ts.versionMajorMinor + ".0-insiders.20220525";
+    ts.version = ts.versionMajorMinor + ".0-insiders.20220601";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -2970,14 +2970,32 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var performance;
-    (function (performance) {
+    var nullTimer = { enter: ts.noop, exit: ts.noop };
+    ts.performance = createPerformanceTracker();
+    ts.solutionPerformance = createPerformanceTracker();
+    function createPerformanceTracker() {
         var perfHooks;
         var performanceImpl;
+        var enabled = false;
+        var timeorigin = ts.timestamp();
+        var marks = new ts.Map();
+        var counts = new ts.Map();
+        var durations = new ts.Map();
+        return {
+            createTimerIf: createTimerIf,
+            createTimer: createTimer,
+            mark: mark,
+            measure: measure,
+            getCount: getCount,
+            getDuration: getDuration,
+            forEachMeasure: forEachMeasure,
+            isEnabled: isEnabled,
+            enable: enable,
+            disable: disable,
+        };
         function createTimerIf(condition, measureName, startMarkName, endMarkName) {
-            return condition ? createTimer(measureName, startMarkName, endMarkName) : performance.nullTimer;
+            return condition ? createTimer(measureName, startMarkName, endMarkName) : nullTimer;
         }
-        performance.createTimerIf = createTimerIf;
         function createTimer(measureName, startMarkName, endMarkName) {
             var enterCount = 0;
             return {
@@ -2999,13 +3017,6 @@ var ts;
                 }
             }
         }
-        performance.createTimer = createTimer;
-        performance.nullTimer = { enter: ts.noop, exit: ts.noop };
-        var enabled = false;
-        var timeorigin = ts.timestamp();
-        var marks = new ts.Map();
-        var counts = new ts.Map();
-        var durations = new ts.Map();
         function mark(markName) {
             var _a;
             if (enabled) {
@@ -3015,34 +3026,28 @@ var ts;
                 performanceImpl === null || performanceImpl === void 0 ? void 0 : performanceImpl.mark(markName);
             }
         }
-        performance.mark = mark;
         function measure(measureName, startMarkName, endMarkName) {
             var _a, _b;
             if (enabled) {
-                var end = (_a = (endMarkName !== undefined ? marks.get(endMarkName) : undefined)) !== null && _a !== void 0 ? _a : ts.timestamp();
-                var start = (_b = (startMarkName !== undefined ? marks.get(startMarkName) : undefined)) !== null && _b !== void 0 ? _b : timeorigin;
+                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;
                 durations.set(measureName, previousDuration + (end - start));
                 performanceImpl === null || performanceImpl === void 0 ? void 0 : performanceImpl.measure(measureName, startMarkName, endMarkName);
             }
         }
-        performance.measure = measure;
         function getCount(markName) {
             return counts.get(markName) || 0;
         }
-        performance.getCount = getCount;
         function getDuration(measureName) {
             return durations.get(measureName) || 0;
         }
-        performance.getDuration = getDuration;
         function forEachMeasure(cb) {
             durations.forEach(function (duration, measureName) { return cb(measureName, duration); });
         }
-        performance.forEachMeasure = forEachMeasure;
         function isEnabled() {
             return enabled;
         }
-        performance.isEnabled = isEnabled;
         function enable(system) {
             var _a;
             if (system === void 0) { system = ts.sys; }
@@ -3058,7 +3063,6 @@ var ts;
             }
             return true;
         }
-        performance.enable = enable;
         function disable() {
             if (enabled) {
                 marks.clear();
@@ -3068,8 +3072,7 @@ var ts;
                 enabled = false;
             }
         }
-        performance.disable = disable;
-    })(performance = ts.performance || (ts.performance = {}));
+    }
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -3855,7 +3858,7 @@ var ts;
     }
     ts.setSysLog = setSysLog;
     function createDirectoryWatcherSupportingRecursive(_a) {
-        var watchDirectory = _a.watchDirectory, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, getCurrentDirectory = _a.getCurrentDirectory, getAccessibleSortedChildDirectories = _a.getAccessibleSortedChildDirectories, fileSystemEntryExists = _a.fileSystemEntryExists, realpath = _a.realpath, setTimeout = _a.setTimeout, clearTimeout = _a.clearTimeout;
+        var watchDirectory = _a.watchDirectory, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, getCurrentDirectory = _a.getCurrentDirectory, getAccessibleSortedChildDirectories = _a.getAccessibleSortedChildDirectories, directoryExists = _a.directoryExists, realpath = _a.realpath, setTimeout = _a.setTimeout, clearTimeout = _a.clearTimeout;
         var cache = new ts.Map();
         var callbackCache = ts.createMultiMap();
         var cacheToUpdateChildWatches = new ts.Map();
@@ -3948,7 +3951,7 @@ var ts;
         }
         function nonSyncUpdateChildWatches(dirName, dirPath, fileName, options) {
             var parentWatcher = cache.get(dirPath);
-            if (parentWatcher && fileSystemEntryExists(dirName, 1)) {
+            if (parentWatcher && directoryExists(dirName)) {
                 scheduleUpdateChildWatches(dirName, dirPath, fileName, options);
                 return;
             }
@@ -4016,7 +4019,7 @@ var ts;
             if (!parentWatcher)
                 return false;
             var newChildWatches;
-            var hasChanges = ts.enumerateInsertsAndDeletes(fileSystemEntryExists(parentDir, 1) ? ts.mapDefined(getAccessibleSortedChildDirectories(parentDir), function (child) {
+            var hasChanges = ts.enumerateInsertsAndDeletes(directoryExists(parentDir) ? ts.mapDefined(getAccessibleSortedChildDirectories(parentDir), function (child) {
                 var childFullName = ts.getNormalizedAbsolutePath(child, parentDir);
                 return !isIgnoredPath(childFullName, options) && filePathComparer(childFullName, ts.normalizePath(realpath(childFullName))) === 0 ? childFullName : undefined;
             }) : ts.emptyArray, parentWatcher.childWatches, function (child, childWatcher) { return filePathComparer(child, childWatcher.dirName); }, createAndAddChildDirectoryWatcher, ts.closeFileWatcher, addChildDirectoryWatcher);
@@ -4047,10 +4050,10 @@ var ts;
         return function (_fileName, eventKind) { return callback(eventKind === FileWatcherEventKind.Changed ? "change" : "rename", ""); };
     }
     ts.createFileWatcherCallback = createFileWatcherCallback;
-    function createFsWatchCallbackForFileWatcherCallback(fileName, callback, fileSystemEntryExists) {
+    function createFsWatchCallbackForFileWatcherCallback(fileName, callback, fileExists) {
         return function (eventName) {
             if (eventName === "rename") {
-                callback(fileName, fileSystemEntryExists(fileName, 0) ? FileWatcherEventKind.Created : FileWatcherEventKind.Deleted);
+                callback(fileName, fileExists(fileName) ? FileWatcherEventKind.Created : FileWatcherEventKind.Deleted);
             }
             else {
                 callback(fileName, FileWatcherEventKind.Changed);
@@ -4072,12 +4075,11 @@ var ts;
         };
     }
     function createSystemWatchFunctions(_a) {
-        var pollingWatchFile = _a.pollingWatchFile, getModifiedTime = _a.getModifiedTime, setTimeout = _a.setTimeout, clearTimeout = _a.clearTimeout, fsWatchWorker = _a.fsWatchWorker, fileSystemEntryExists = _a.fileSystemEntryExists, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, getCurrentDirectory = _a.getCurrentDirectory, fsSupportsRecursiveFsWatch = _a.fsSupportsRecursiveFsWatch, getAccessibleSortedChildDirectories = _a.getAccessibleSortedChildDirectories, realpath = _a.realpath, tscWatchFile = _a.tscWatchFile, useNonPollingWatchers = _a.useNonPollingWatchers, tscWatchDirectory = _a.tscWatchDirectory, defaultWatchFileKind = _a.defaultWatchFileKind, inodeWatching = _a.inodeWatching, sysLog = _a.sysLog;
+        var pollingWatchFile = _a.pollingWatchFile, getModifiedTime = _a.getModifiedTime, setTimeout = _a.setTimeout, clearTimeout = _a.clearTimeout, fsWatch = _a.fsWatch, fileExists = _a.fileExists, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, getCurrentDirectory = _a.getCurrentDirectory, fsSupportsRecursiveFsWatch = _a.fsSupportsRecursiveFsWatch, directoryExists = _a.directoryExists, getAccessibleSortedChildDirectories = _a.getAccessibleSortedChildDirectories, realpath = _a.realpath, tscWatchFile = _a.tscWatchFile, useNonPollingWatchers = _a.useNonPollingWatchers, tscWatchDirectory = _a.tscWatchDirectory, defaultWatchFileKind = _a.defaultWatchFileKind;
         var dynamicPollingWatchFile;
         var fixedChunkSizePollingWatchFile;
         var nonPollingWatchFile;
         var hostRecursiveDirectoryWatcher;
-        var hitSystemWatcherLimit = false;
         return {
             watchFile: watchFile,
             watchDirectory: watchDirectory
@@ -4095,7 +4097,7 @@ var ts;
                 case ts.WatchFileKind.FixedChunkSizePolling:
                     return ensureFixedChunkSizePollingWatchFile()(fileName, callback, undefined, undefined);
                 case ts.WatchFileKind.UseFsEvents:
-                    return fsWatch(fileName, 0, createFsWatchCallbackForFileWatcherCallback(fileName, callback, fileSystemEntryExists), false, pollingInterval, ts.getFallbackOptions(options));
+                    return fsWatch(fileName, 0, createFsWatchCallbackForFileWatcherCallback(fileName, callback, fileExists), false, pollingInterval, ts.getFallbackOptions(options));
                 case ts.WatchFileKind.UseFsEventsOnParentDirectory:
                     if (!nonPollingWatchFile) {
                         nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames);
@@ -4148,7 +4150,7 @@ var ts;
                 hostRecursiveDirectoryWatcher = createDirectoryWatcherSupportingRecursive({
                     useCaseSensitiveFileNames: useCaseSensitiveFileNames,
                     getCurrentDirectory: getCurrentDirectory,
-                    fileSystemEntryExists: fileSystemEntryExists,
+                    directoryExists: directoryExists,
                     getAccessibleSortedChildDirectories: getAccessibleSortedChildDirectories,
                     watchDirectory: nonRecursiveWatchDirectory,
                     realpath: realpath,
@@ -4193,90 +4195,6 @@ var ts;
                     };
             }
         }
-        function fsWatch(fileOrDirectory, entryKind, callback, recursive, fallbackPollingInterval, fallbackOptions) {
-            var lastDirectoryPartWithDirectorySeparator;
-            var lastDirectoryPart;
-            if (inodeWatching) {
-                lastDirectoryPartWithDirectorySeparator = fileOrDirectory.substring(fileOrDirectory.lastIndexOf(ts.directorySeparator));
-                lastDirectoryPart = lastDirectoryPartWithDirectorySeparator.slice(ts.directorySeparator.length);
-            }
-            var watcher = !fileSystemEntryExists(fileOrDirectory, entryKind) ?
-                watchMissingFileSystemEntry() :
-                watchPresentFileSystemEntry();
-            return {
-                close: function () {
-                    watcher.close();
-                    watcher = undefined;
-                }
-            };
-            function updateWatcher(createWatcher) {
-                if (watcher) {
-                    sysLog("sysLog:: " + fileOrDirectory + ":: Changing watcher to " + (createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing") + "FileSystemEntryWatcher");
-                    watcher.close();
-                    watcher = createWatcher();
-                }
-            }
-            function watchPresentFileSystemEntry() {
-                if (hitSystemWatcherLimit) {
-                    sysLog("sysLog:: " + fileOrDirectory + ":: Defaulting to watchFile");
-                    return watchPresentFileSystemEntryWithFsWatchFile();
-                }
-                try {
-                    var presentWatcher = fsWatchWorker(fileOrDirectory, recursive, inodeWatching ?
-                        callbackChangingToMissingFileSystemEntry :
-                        function (eventName, relativeFileName) {
-                            sysLog("sysLog:: watchPresentFileSystemEntry:: " + fileOrDirectory + " " + entryKind + " " + eventName + ":: " + relativeFileName);
-                            callback(eventName, relativeFileName);
-                        });
-                    presentWatcher.on("error", function () {
-                        sysLog("sysLog:: watchPresentFileSystemEntry:: on Error " + fileOrDirectory + " " + entryKind + " rename, \"\"");
-                        callback("rename", "");
-                        updateWatcher(watchMissingFileSystemEntry);
-                    });
-                    return presentWatcher;
-                }
-                catch (e) {
-                    hitSystemWatcherLimit || (hitSystemWatcherLimit = e.code === "ENOSPC");
-                    sysLog("sysLog:: " + fileOrDirectory + ":: Changing to watchFile");
-                    return watchPresentFileSystemEntryWithFsWatchFile();
-                }
-            }
-            function callbackChangingToMissingFileSystemEntry(event, relativeName) {
-                sysLog("sysLog:: callbackChangingToMissingFileSystemEntry:: " + fileOrDirectory + " " + entryKind + " " + event + ":: " + relativeName + " " + inodeWatching + " " + lastDirectoryPart + " " + lastDirectoryPartWithDirectorySeparator);
-                if (relativeName && ts.endsWith(relativeName, "~")) {
-                    relativeName = relativeName.slice(0, relativeName.length - 1);
-                    sysLog("sysLog:: callbackChangingToMissingFileSystemEntry:: changed the relative name to " + relativeName);
-                }
-                callback(event, relativeName);
-                if (event === "rename" &&
-                    (!relativeName ||
-                        relativeName === lastDirectoryPart ||
-                        ts.endsWith(relativeName, lastDirectoryPartWithDirectorySeparator))) {
-                    if (inodeWatching) {
-                        updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
-                    }
-                    else if (!fileSystemEntryExists(fileOrDirectory, entryKind)) {
-                        updateWatcher(watchMissingFileSystemEntry);
-                    }
-                }
-            }
-            function watchPresentFileSystemEntryWithFsWatchFile() {
-                return watchFile(fileOrDirectory, createFileWatcherCallback(function (eventName, relativeFileName) {
-                    sysLog("sysLog:: watchPresentFileSystemEntryWithFsWatchFile:: " + fileOrDirectory + " " + entryKind + " " + eventName + ":: " + relativeFileName);
-                    callback(eventName, relativeFileName);
-                }), fallbackPollingInterval, fallbackOptions);
-            }
-            function watchMissingFileSystemEntry() {
-                return watchFile(fileOrDirectory, function (_fileName, eventKind) {
-                    sysLog("sysLog:: watchMissingFileSystemEntry:: " + fileOrDirectory + " " + entryKind + " " + _fileName + ":: " + eventKind);
-                    if (eventKind === FileWatcherEventKind.Created && fileSystemEntryExists(fileOrDirectory, entryKind)) {
-                        sysLog("sysLog:: watchMissingFileSystemEntry::  Callback :: rename, \"\" and will update the watcher");
-                        callback("rename", "");
-                        updateWatcher(watchPresentFileSystemEntry);
-                    }
-                }, fallbackPollingInterval, fallbackOptions);
-            }
-        }
     }
     ts.createSystemWatchFunctions = createSystemWatchFunctions;
     function patchWriteFileEnsuringDirectory(sys) {
@@ -4318,6 +4236,7 @@ var ts;
             }
             var activeSession;
             var profilePath = "./profile.cpuprofile";
+            var hitSystemWatcherLimit = false;
             var Buffer = require("buffer").Buffer;
             var nodeVersion = getNodeMajorVersion();
             var isNode4OrLater = nodeVersion >= 4;
@@ -4332,19 +4251,18 @@ var ts;
                 getModifiedTime: getModifiedTime,
                 setTimeout: setTimeout,
                 clearTimeout: clearTimeout,
-                fsWatchWorker: fsWatchWorker,
+                fsWatch: fsWatch,
                 useCaseSensitiveFileNames: useCaseSensitiveFileNames,
                 getCurrentDirectory: getCurrentDirectory,
-                fileSystemEntryExists: fileSystemEntryExists,
+                fileExists: fileExists,
                 fsSupportsRecursiveFsWatch: fsSupportsRecursiveFsWatch,
+                directoryExists: directoryExists,
                 getAccessibleSortedChildDirectories: function (path) { return getAccessibleFileSystemEntries(path).directories; },
                 realpath: realpath,
                 tscWatchFile: process.env.TSC_WATCHFILE,
                 useNonPollingWatchers: process.env.TSC_NONPOLLING_WATCHER,
                 tscWatchDirectory: process.env.TSC_WATCHDIRECTORY,
                 defaultWatchFileKind: function () { var _a, _b; return (_b = (_a = sys).defaultWatchFileKind) === null || _b === void 0 ? void 0 : _b.call(_a); },
-                inodeWatching: isLinuxOrMacOs,
-                sysLog: sysLog,
             }), watchFile = _c.watchFile, watchDirectory = _c.watchDirectory;
             var nodeSystem = {
                 args: process.argv.slice(2),
@@ -4567,9 +4485,76 @@ var ts;
                     callback(fileName, eventKind);
                 }
             }
-            function fsWatchWorker(fileOrDirectory, recursive, callback) {
-                return _fs.watch(fileOrDirectory, fsSupportsRecursiveFsWatch ?
-                    { persistent: true, recursive: !!recursive } : { persistent: true }, callback);
+            function fsWatch(fileOrDirectory, entryKind, callback, recursive, fallbackPollingInterval, fallbackOptions) {
+                var options;
+                var lastDirectoryPartWithDirectorySeparator;
+                var lastDirectoryPart;
+                if (isLinuxOrMacOs) {
+                    lastDirectoryPartWithDirectorySeparator = fileOrDirectory.substr(fileOrDirectory.lastIndexOf(ts.directorySeparator));
+                    lastDirectoryPart = lastDirectoryPartWithDirectorySeparator.slice(ts.directorySeparator.length);
+                }
+                var watcher = !fileSystemEntryExists(fileOrDirectory, entryKind) ?
+                    watchMissingFileSystemEntry() :
+                    watchPresentFileSystemEntry();
+                return {
+                    close: function () {
+                        watcher.close();
+                        watcher = undefined;
+                    }
+                };
+                function invokeCallbackAndUpdateWatcher(createWatcher) {
+                    sysLog("sysLog:: " + fileOrDirectory + ":: Changing watcher to " + (createWatcher === watchPresentFileSystemEntry ? "Present" : "Missing") + "FileSystemEntryWatcher");
+                    callback("rename", "");
+                    if (watcher) {
+                        watcher.close();
+                        watcher = createWatcher();
+                    }
+                }
+                function watchPresentFileSystemEntry() {
+                    if (options === undefined) {
+                        if (fsSupportsRecursiveFsWatch) {
+                            options = { persistent: true, recursive: !!recursive };
+                        }
+                        else {
+                            options = { persistent: true };
+                        }
+                    }
+                    if (hitSystemWatcherLimit) {
+                        sysLog("sysLog:: " + fileOrDirectory + ":: Defaulting to fsWatchFile");
+                        return watchPresentFileSystemEntryWithFsWatchFile();
+                    }
+                    try {
+                        var presentWatcher = _fs.watch(fileOrDirectory, options, isLinuxOrMacOs ?
+                            callbackChangingToMissingFileSystemEntry :
+                            callback);
+                        presentWatcher.on("error", function () { return invokeCallbackAndUpdateWatcher(watchMissingFileSystemEntry); });
+                        return presentWatcher;
+                    }
+                    catch (e) {
+                        hitSystemWatcherLimit || (hitSystemWatcherLimit = e.code === "ENOSPC");
+                        sysLog("sysLog:: " + fileOrDirectory + ":: Changing to fsWatchFile");
+                        return watchPresentFileSystemEntryWithFsWatchFile();
+                    }
+                }
+                function callbackChangingToMissingFileSystemEntry(event, relativeName) {
+                    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);
+                }
+                function watchPresentFileSystemEntryWithFsWatchFile() {
+                    return watchFile(fileOrDirectory, createFileWatcherCallback(callback), fallbackPollingInterval, fallbackOptions);
+                }
+                function watchMissingFileSystemEntry() {
+                    return watchFile(fileOrDirectory, function (_fileName, eventKind) {
+                        if (eventKind === FileWatcherEventKind.Created && fileSystemEntryExists(fileOrDirectory, entryKind)) {
+                            invokeCallbackAndUpdateWatcher(watchPresentFileSystemEntry);
+                        }
+                    }, fallbackPollingInterval, fallbackOptions);
+                }
             }
             function readFileWorker(fileName, _encoding) {
                 var buffer;
@@ -5616,6 +5601,7 @@ var ts;
         Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1: diag(2205, ts.DiagnosticCategory.Error, "Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1_2205", "Construct signatures with no arguments have incompatible return types '{0}' and '{1}'.", undefined, true),
         The_type_modifier_cannot_be_used_on_a_named_import_when_import_type_is_used_on_its_import_statement: diag(2206, ts.DiagnosticCategory.Error, "The_type_modifier_cannot_be_used_on_a_named_import_when_import_type_is_used_on_its_import_statement_2206", "The 'type' modifier cannot be used on a named import when 'import type' is used on its import statement."),
         The_type_modifier_cannot_be_used_on_a_named_export_when_export_type_is_used_on_its_export_statement: diag(2207, ts.DiagnosticCategory.Error, "The_type_modifier_cannot_be_used_on_a_named_export_when_export_type_is_used_on_its_export_statement_2207", "The 'type' modifier cannot be used on a named export when 'export type' is used on its export statement."),
+        This_type_parameter_probably_needs_an_extends_object_constraint: diag(2208, ts.DiagnosticCategory.Error, "This_type_parameter_probably_needs_an_extends_object_constraint_2208", "This type parameter probably needs an `extends object` constraint."),
         The_project_root_is_ambiguous_but_is_required_to_resolve_export_map_entry_0_in_file_1_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2209, ts.DiagnosticCategory.Error, "The_project_root_is_ambiguous_but_is_required_to_resolve_export_map_entry_0_in_file_1_Supply_the_roo_2209", "The project root is ambiguous, but is required to resolve export map entry '{0}' in file '{1}'. Supply the `rootDir` compiler option to disambiguate."),
         The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2210, ts.DiagnosticCategory.Error, "The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_roo_2210", "The project root is ambiguous, but is required to resolve import map entry '{0}' in file '{1}'. Supply the `rootDir` compiler option to disambiguate."),
         Duplicate_identifier_0: diag(2300, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
@@ -6101,6 +6087,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}'."),
@@ -12617,9 +12604,6 @@ var ts;
     }
     ts.isVariableDeclarationInitializedToBareOrAccessedRequire = isVariableDeclarationInitializedToBareOrAccessedRequire;
     function isVariableDeclarationInitializedWithRequireHelper(node, allowAccessedRequire) {
-        if (node.kind === 203) {
-            node = node.parent.parent;
-        }
         return ts.isVariableDeclaration(node) &&
             !!node.initializer &&
             isRequireCall(allowAccessedRequire ? getLeftmostAccessExpression(node.initializer) : node.initializer, true);
@@ -15879,13 +15863,13 @@ var ts;
         return !file.isDeclarationFile ? walkTreeForJSXTags(file) : undefined;
     }
     function isFileForcedToBeModuleByFormat(file) {
-        return file.impliedNodeFormat === ts.ModuleKind.ESNext && !file.isDeclarationFile ? true : undefined;
+        return (file.impliedNodeFormat === ts.ModuleKind.ESNext || (ts.fileExtensionIsOneOf(file.fileName, [".cjs", ".cts"]))) && !file.isDeclarationFile ? true : undefined;
     }
     function getSetExternalModuleIndicator(options) {
         switch (getEmitModuleDetectionKind(options)) {
             case ts.ModuleDetectionKind.Force:
                 return function (file) {
-                    file.externalModuleIndicator = !file.isDeclarationFile || ts.isFileProbablyExternalModule(file);
+                    file.externalModuleIndicator = ts.isFileProbablyExternalModule(file) || !file.isDeclarationFile || undefined;
                 };
             case ts.ModuleDetectionKind.Legacy:
                 return function (file) {
@@ -15941,7 +15925,8 @@ var ts;
     }
     ts.getEmitModuleResolutionKind = getEmitModuleResolutionKind;
     function getEmitModuleDetectionKind(options) {
-        return options.moduleDetection || ts.ModuleDetectionKind.Auto;
+        return options.moduleDetection ||
+            (getEmitModuleKind(options) === ts.ModuleKind.Node16 || getEmitModuleKind(options) === ts.ModuleKind.NodeNext ? ts.ModuleDetectionKind.Force : ts.ModuleDetectionKind.Auto);
     }
     ts.getEmitModuleDetectionKind = getEmitModuleDetectionKind;
     function hasJsonModuleEmitEnabled(options) {
@@ -35217,15 +35202,19 @@ var ts;
     function nodeNextModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode) {
         return nodeNextModuleNameResolverWorker(NodeResolutionFeatures.NodeNextDefault, moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode);
     }
-    function nodeNextModuleNameResolverWorker(features, moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode) {
-        var containingDirectory = ts.getDirectoryPath(containingFile);
-        var esmMode = resolutionMode === ts.ModuleKind.ESNext ? NodeResolutionFeatures.EsmMode : 0;
-        return nodeModuleNameResolverWorker(features | esmMode, moduleName, containingDirectory, compilerOptions, host, cache, compilerOptions.resolveJsonModule ? tsPlusJsonExtensions : tsExtensions, redirectedReference);
-    }
     var jsOnlyExtensions = [Extensions.JavaScript];
     var tsExtensions = [Extensions.TypeScript, Extensions.JavaScript];
     var tsPlusJsonExtensions = __spreadArray(__spreadArray([], tsExtensions, true), [Extensions.Json], false);
     var tsconfigExtensions = [Extensions.TSConfig];
+    function nodeNextModuleNameResolverWorker(features, moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode) {
+        var containingDirectory = ts.getDirectoryPath(containingFile);
+        var esmMode = resolutionMode === ts.ModuleKind.ESNext ? NodeResolutionFeatures.EsmMode : 0;
+        var extensions = compilerOptions.noDtsResolution ? [Extensions.TsOnly, Extensions.JavaScript] : tsExtensions;
+        if (compilerOptions.resolveJsonModule) {
+            extensions = __spreadArray(__spreadArray([], extensions, true), [Extensions.Json], false);
+        }
+        return nodeModuleNameResolverWorker(features | esmMode, moduleName, containingDirectory, compilerOptions, host, cache, extensions, redirectedReference);
+    }
     function tryResolveJSModuleWorker(moduleName, initialDir, host) {
         return nodeModuleNameResolverWorker(NodeResolutionFeatures.None, moduleName, initialDir, { moduleResolution: ts.ModuleResolutionKind.NodeJs, allowJs: true }, host, undefined, jsOnlyExtensions, undefined);
     }
@@ -36129,8 +36118,7 @@ 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
+                && (packageInfo.packageJsonContent.exports === undefined || packageInfo.packageJsonContent.exports === null)
                 && state.features & NodeResolutionFeatures.EsmMode) {
                 pathAndExtension = loadModuleFromFile(extensions, ts.combinePaths(candidate, "index.js"), onlyRecordFailures, state);
             }
@@ -38505,12 +38493,14 @@ var ts;
             }
         }
         function setCommonJsModuleIndicator(node) {
-            if (file.externalModuleIndicator) {
+            if (file.externalModuleIndicator && file.externalModuleIndicator !== true) {
                 return false;
             }
             if (!file.commonJsModuleIndicator) {
                 file.commonJsModuleIndicator = node;
-                bindSourceFileAsExternalModule();
+                if (!file.externalModuleIndicator) {
+                    bindSourceFileAsExternalModule();
+                }
             }
             return true;
         }
@@ -38863,7 +38853,11 @@ var ts;
                 checkStrictModeEvalOrArguments(node, node.name);
             }
             if (!ts.isBindingPattern(node.name)) {
-                if (ts.isInJSFile(node) && ts.isVariableDeclarationInitializedToBareOrAccessedRequire(node) && !ts.getJSDocTypeTag(node) && !(ts.getCombinedModifierFlags(node) & 1)) {
+                var possibleVariableDecl = node.kind === 254 ? node : node.parent.parent;
+                if (ts.isInJSFile(node) &&
+                    ts.isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) &&
+                    !ts.getJSDocTypeTag(node) &&
+                    !(ts.getCombinedModifierFlags(node) & 1)) {
                     declareSymbolAndAddToSymbolTable(node, 2097152, 2097152);
                 }
                 else if (ts.isBlockOrCatchScoped(node)) {
@@ -39761,6 +39755,7 @@ var ts;
         var emptyTypeLiteralSymbol = createSymbol(2048, "__type");
         emptyTypeLiteralSymbol.members = ts.createSymbolTable();
         var emptyTypeLiteralType = createAnonymousType(emptyTypeLiteralSymbol, emptySymbols, ts.emptyArray, ts.emptyArray, ts.emptyArray);
+        var unknownUnionType = strictNullChecks ? getUnionType([undefinedType, nullType, createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, ts.emptyArray)]) : unknownType;
         var emptyGenericType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, ts.emptyArray);
         emptyGenericType.instantiations = new ts.Map();
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, ts.emptyArray);
@@ -41047,7 +41042,12 @@ var ts;
         function checkAndReportErrorForUsingTypeAsValue(errorLocation, name, meaning) {
             if (meaning & (111551 & ~1024)) {
                 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 & ~111551, undefined, undefined, false));
@@ -41067,6 +41067,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;
+                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";
@@ -41176,7 +41186,8 @@ var ts;
                     && isAliasableOrJsExpression(node.parent.right)
                 || node.kind === 297
                 || node.kind === 296 && isAliasableOrJsExpression(node.initializer)
-                || ts.isVariableDeclarationInitializedToBareOrAccessedRequire(node);
+                || node.kind === 254 && ts.isVariableDeclarationInitializedToBareOrAccessedRequire(node)
+                || node.kind === 203 && ts.isVariableDeclarationInitializedToBareOrAccessedRequire(node.parent.parent);
         }
         function isAliasableOrJsExpression(e) {
             return ts.isAliasableExpression(e) || ts.isFunctionExpression(e) && isJSConstructor(e);
@@ -41257,7 +41268,7 @@ var ts;
             if (!ts.isSourceFileJS(file)) {
                 return hasExportAssignmentSymbol(moduleSymbol);
             }
-            return !file.externalModuleIndicator && !resolveExportByName(moduleSymbol, ts.escapeLeadingUnderscores("__esModule"), undefined, dontResolveAlias);
+            return typeof file.externalModuleIndicator !== "object" && !resolveExportByName(moduleSymbol, ts.escapeLeadingUnderscores("__esModule"), undefined, dontResolveAlias);
         }
         function getTargetOfImportClause(node, dontResolveAlias) {
             var _a;
@@ -43592,7 +43603,7 @@ var ts;
                     anyType : getNonMissingTypeOfSymbol(propertySymbol);
                 var saveEnclosingDeclaration = context.enclosingDeclaration;
                 context.enclosingDeclaration = undefined;
-                if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 4096 && isLateBoundName(propertySymbol.escapedName)) {
+                if (context.tracker.trackSymbol && isLateBoundName(propertySymbol.escapedName)) {
                     if (propertySymbol.declarations) {
                         var decl = ts.first(propertySymbol.declarations);
                         if (hasLateBindableName(decl)) {
@@ -45047,7 +45058,7 @@ var ts;
                         ? getBaseConstructorTypeOfClass(staticType)
                         : anyType;
                     var heritageClauses = __spreadArray(__spreadArray([], !ts.length(baseTypes) ? [] : [ts.factory.createHeritageClause(94, ts.map(baseTypes, function (b) { return serializeBaseType(b, staticBaseType, localName); }))], true), !ts.length(implementsExpressions) ? [] : [ts.factory.createHeritageClause(117, implementsExpressions)], true);
-                    var symbolProps = getNonInterhitedProperties(classType, baseTypes, getPropertiesOfType(classType));
+                    var symbolProps = getNonInheritedProperties(classType, baseTypes, getPropertiesOfType(classType));
                     var publicSymbolProps = ts.filter(symbolProps, function (s) {
                         var valueDecl = s.valueDeclaration;
                         return !!valueDecl && !(ts.isNamedDeclaration(valueDecl) && ts.isPrivateIdentifier(valueDecl.name));
@@ -45961,7 +45972,7 @@ var ts;
                 return type;
             }
             if (ts.getEffectiveTypeAnnotationNode(ts.walkUpBindingElementsAndPatterns(declaration))) {
-                return strictNullChecks && !(getFalsyFlags(checkDeclarationInitializer(declaration, 0)) & 32768) ? getNonUndefinedType(type) : type;
+                return strictNullChecks && !(getTypeFacts(checkDeclarationInitializer(declaration, 0)) & 16777216) ? getNonUndefinedType(type) : type;
             }
             return widenTypeInferredFromInitializer(declaration, getUnionType([getNonUndefinedType(type), checkDeclarationInitializer(declaration, 0)], 2));
         }
@@ -48569,7 +48580,7 @@ var ts;
                         }
                     }
                 }
-                else if (t.flags & 469892092) {
+                else if (t.flags & 469892092 || isEmptyAnonymousObjectType(t)) {
                     hasDisjointDomainType = true;
                 }
             }
@@ -48577,7 +48588,7 @@ var ts;
                 if (hasDisjointDomainType) {
                     for (var _a = 0, types_6 = types; _a < types_6.length; _a++) {
                         var t = types_6[_a];
-                        if (t.flags & 469892092) {
+                        if (t.flags & 469892092 || isEmptyAnonymousObjectType(t)) {
                             constraints = ts.append(constraints, t);
                         }
                     }
@@ -48749,7 +48760,7 @@ var ts;
             var objectType;
             return !!(type.flags & 8388608 && ts.getObjectFlags(objectType = type.objectType) & 32 &&
                 !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) &&
-                !objectType.declaration.questionToken && !objectType.declaration.nameType);
+                !(getMappedTypeModifiers(objectType) & 8) && !objectType.declaration.nameType);
         }
         function getApparentType(type) {
             var t = !(type.flags & 465829888) ? type : getBaseConstraintOfType(type) || unknownType;
@@ -50847,7 +50858,7 @@ var ts;
             }
             return includes;
         }
-        function removeRedundantPrimitiveTypes(types, includes) {
+        function removeRedundantSupertypes(types, includes) {
             var i = types.length;
             while (i > 0) {
                 i--;
@@ -50855,7 +50866,9 @@ var ts;
                 var remove = t.flags & 4 && includes & (128 | 134217728 | 268435456) ||
                     t.flags & 8 && includes & 256 ||
                     t.flags & 64 && includes & 2048 ||
-                    t.flags & 4096 && includes & 8192;
+                    t.flags & 4096 && includes & 8192 ||
+                    t.flags & 16384 && includes & 32768 ||
+                    isEmptyAnonymousObjectType(t) && includes & 470302716;
                 if (remove) {
                     ts.orderedRemoveItemAt(types, i);
                 }
@@ -50950,7 +50963,7 @@ var ts;
             result.aliasTypeArguments = aliasTypeArguments;
             return result;
         }
-        function getIntersectionType(types, aliasSymbol, aliasTypeArguments) {
+        function getIntersectionType(types, aliasSymbol, aliasTypeArguments, noSupertypeReduction) {
             var typeMembershipMap = new ts.Map();
             var includes = addTypesToIntersection(typeMembershipMap, 0, types);
             var typeSet = ts.arrayFrom(typeMembershipMap.values());
@@ -50978,11 +50991,11 @@ var ts;
             if (includes & 4 && includes & (128 | 134217728 | 268435456) ||
                 includes & 8 && includes & 256 ||
                 includes & 64 && includes & 2048 ||
-                includes & 4096 && includes & 8192) {
-                removeRedundantPrimitiveTypes(typeSet, includes);
-            }
-            if (includes & 16777216 && includes & 524288) {
-                ts.orderedRemoveItemAt(typeSet, ts.findIndex(typeSet, isEmptyAnonymousObjectType));
+                includes & 4096 && includes & 8192 ||
+                includes & 16384 && includes & 32768 ||
+                includes & 16777216 && includes & 470302716) {
+                if (!noSupertypeReduction)
+                    removeRedundantSupertypes(typeSet, includes);
             }
             if (includes & 262144) {
                 typeSet[typeSet.indexOf(undefinedType)] = missingType;
@@ -51014,7 +51027,7 @@ var ts;
                             return errorType;
                         }
                         var constituents = getCrossProductIntersections(typeSet);
-                        var origin = ts.some(constituents, function (t) { return !!(t.flags & 2097152); }) ? createOriginUnionOrIntersectionType(2097152, typeSet) : undefined;
+                        var origin = ts.some(constituents, function (t) { return !!(t.flags & 2097152); }) && getConstituentCountOfTypes(constituents) > getConstituentCountOfTypes(typeSet) ? createOriginUnionOrIntersectionType(2097152, typeSet) : undefined;
                         result = getUnionType(constituents, 1, aliasSymbol, aliasTypeArguments, origin);
                     }
                 }
@@ -51057,11 +51070,21 @@ var ts;
             }
             return intersections;
         }
+        function getConstituentCount(type) {
+            return !(type.flags & 3145728) || type.aliasSymbol ? 1 :
+                type.flags & 1048576 && type.origin ? getConstituentCount(type.origin) :
+                    getConstituentCountOfTypes(type.types);
+        }
+        function getConstituentCountOfTypes(types) {
+            return ts.reduceLeft(types, function (n, t) { return n + getConstituentCount(t); }, 0);
+        }
         function getTypeFromIntersectionTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
-                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNode), aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol));
+                var types = ts.map(node.types, getTypeFromTypeNode);
+                var noSupertypeReduction = types.length === 2 && !!(types[0].flags & (4 | 8 | 64)) && types[1] === emptyTypeLiteralType;
+                links.resolvedType = getIntersectionType(types, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol), noSupertypeReduction);
             }
             return links.resolvedType;
         }
@@ -53436,7 +53459,7 @@ var ts;
                     var sourceSig = checkMode & 3 ? undefined : getSingleCallSignature(getNonNullableType(sourceType));
                     var targetSig = checkMode & 3 ? undefined : getSingleCallSignature(getNonNullableType(targetType));
                     var callbacks = sourceSig && targetSig && !getTypePredicateOfSignature(sourceSig) && !getTypePredicateOfSignature(targetSig) &&
-                        (getFalsyFlags(sourceType) & 98304) === (getFalsyFlags(targetType) & 98304);
+                        (getTypeFacts(sourceType) & 50331648) === (getTypeFacts(targetType) & 50331648);
                     var related = callbacks ?
                         compareSignaturesRelated(targetSig, sourceSig, (checkMode & 8) | (strictVariance ? 2 : 1), reportErrors, errorReporter, incompatibleErrorReporter, compareTypes, reportUnreliableMarkers) :
                         !(checkMode & 3) && !strictVariance && compareTypes(sourceType, targetType, false) || compareTypes(targetType, sourceType, reportErrors);
@@ -53540,6 +53563,17 @@ var ts;
             return !!(ts.getObjectFlags(type) & 16 && (type.members && isEmptyResolvedType(type) ||
                 type.symbol && type.symbol.flags & 2048 && getMembersOfSymbol(type.symbol).size === 0));
         }
+        function isUnknownLikeUnionType(type) {
+            if (strictNullChecks && type.flags & 1048576) {
+                if (!(type.objectFlags & 33554432)) {
+                    var types = type.types;
+                    type.objectFlags |= 33554432 | (types.length >= 3 && types[0].flags & 32768 &&
+                        types[1].flags & 65536 && ts.some(types, isEmptyAnonymousObjectType) ? 67108864 : 0);
+                }
+                return !!(type.objectFlags & 67108864);
+            }
+            return false;
+        }
         function isStringIndexSignatureOnlyType(type) {
             return type.flags & 524288 && !isGenericMappedType(type) && getPropertiesOfType(type).length === 0 && getIndexInfosOfType(type).length === 1 && !!getIndexInfoOfType(type, stringType) ||
                 type.flags & 3145728 && ts.every(type.types, isStringIndexSignatureOnlyType) ||
@@ -53617,13 +53651,15 @@ var ts;
                 return true;
             if (s & 65536 && (!strictNullChecks && !(t & 3145728) || t & 65536))
                 return true;
-            if (s & 524288 && t & 67108864)
+            if (s & 524288 && t & 67108864 && !(relation === strictSubtypeRelation && isEmptyAnonymousObjectType(source)))
                 return true;
             if (relation === assignableRelation || relation === comparableRelation) {
                 if (s & 1)
                     return true;
                 if (s & (8 | 256) && !(s & 1024) && (t & 32 || relation === assignableRelation && t & 256 && t & 1024))
                     return true;
+                if (isUnknownLikeUnionType(target))
+                    return true;
             }
             return false;
         }
@@ -53665,16 +53701,27 @@ var ts;
         function getNormalizedType(type, writing) {
             while (true) {
                 var t = isFreshLiteralType(type) ? type.regularType :
-                    ts.getObjectFlags(type) & 4 && type.node ? createTypeReference(type.target, getTypeArguments(type)) :
-                        type.flags & 3145728 ? getReducedType(type) :
+                    ts.getObjectFlags(type) & 4 ? type.node ? createTypeReference(type.target, getTypeArguments(type)) : getSingleBaseForNonAugmentingSubtype(type) || type :
+                        type.flags & 3145728 ? getNormalizedUnionOrIntersectionType(type, writing) :
                             type.flags & 33554432 ? writing ? type.baseType : type.substitute :
                                 type.flags & 25165824 ? getSimplifiedType(type, writing) :
                                     type;
-                t = getSingleBaseForNonAugmentingSubtype(t) || t;
                 if (t === type)
-                    break;
+                    return t;
                 type = t;
             }
+        }
+        function getNormalizedUnionOrIntersectionType(type, writing) {
+            var reduced = getReducedType(type);
+            if (reduced !== type) {
+                return reduced;
+            }
+            if (type.flags & 2097152) {
+                var normalizedTypes = ts.sameMap(type.types, function (t) { return getNormalizedType(t, writing); });
+                if (normalizedTypes !== type.types) {
+                    return getIntersectionType(normalizedTypes);
+                }
+            }
             return type;
         }
         function checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer) {
@@ -54049,6 +54096,7 @@ var ts;
                 return 0;
             }
             function reportErrorResults(originalSource, originalTarget, source, target, headMessage) {
+                var _a, _b;
                 var sourceHasBase = !!getSingleBaseForNonAugmentingSubtype(originalSource);
                 var targetHasBase = !!getSingleBaseForNonAugmentingSubtype(originalTarget);
                 source = (originalSource.aliasSymbol || sourceHasBase) ? originalSource : source;
@@ -54087,6 +54135,9 @@ var ts;
                     return;
                 }
                 reportRelationError(headMessage, source, target);
+                if (strictNullChecks && source.flags & 8650752 && ((_b = (_a = source.symbol) === null || _a === void 0 ? void 0 : _a.declarations) === null || _b === void 0 ? void 0 : _b[0]) && !getConstraintOfType(source) && isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864))) {
+                    associateRelatedInfo(ts.createDiagnosticForNode(source.symbol.declarations[0], ts.Diagnostics.This_type_parameter_probably_needs_an_extends_object_constraint));
+                }
             }
             function traceUnionsOrIntersectionsTooLarge(source, target) {
                 if (!ts.tracing) {
@@ -54728,12 +54779,6 @@ var ts;
                 if (sourceFlags & 8650752) {
                     if (!(sourceFlags & 8388608 && targetFlags & 8388608)) {
                         var constraint = getConstraintOfType(source) || unknownType;
-                        if (!getConstraintOfType(source) || (sourceFlags & 262144 && constraint.flags & 1)) {
-                            if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864), 3)) {
-                                resetErrorInfo(saveErrorInfo);
-                                return result;
-                            }
-                        }
                         if (result = isRelatedTo(constraint, target, 1, false, undefined, intersectionState)) {
                             resetErrorInfo(saveErrorInfo);
                             return result;
@@ -55989,9 +56034,11 @@ var ts;
                 return getSupertypeOrUnion(types);
             }
             var primaryTypes = ts.filter(types, function (t) { return !(t.flags & 98304); });
-            return primaryTypes.length ?
-                getNullableType(getSupertypeOrUnion(primaryTypes), getFalsyFlagsOfTypes(types) & 98304) :
-                getUnionType(types, 2);
+            if (primaryTypes.length) {
+                var supertypeOrUnion = getSupertypeOrUnion(primaryTypes);
+                return primaryTypes === types ? supertypeOrUnion : getUnionType(__spreadArray([supertypeOrUnion], ts.filter(types, function (t) { return !!(t.flags & 98304); }), true));
+            }
+            return getUnionType(types, 2);
         }
         function getCommonSubtype(types) {
             return ts.reduceLeft(types, function (s, t) { return isTypeSubtypeOf(t, s) ? t : s; });
@@ -56169,26 +56216,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;
-        }
-        function getFalsyFlags(type) {
-            return type.flags & 1048576 ? getFalsyFlagsOfTypes(type.types) :
-                type.flags & 128 ? type.value === "" ? 128 : 0 :
-                    type.flags & 256 ? type.value === 0 ? 256 : 0 :
-                        type.flags & 2048 ? isZeroBigInt(type) ? 2048 : 0 :
-                            type.flags & 512 ? (type === falseType || type === regularFalseType) ? 512 : 0 :
-                                type.flags & 117724;
-        }
         function removeDefinitelyFalsyTypes(type) {
-            return getFalsyFlags(type) & 117632 ?
-                filterType(type, function (t) { return !(getFalsyFlags(t) & 117632); }) :
-                type;
+            return filterType(type, function (t) { return !!(getTypeFacts(t) & 4194304); });
         }
         function extractDefinitelyFalsyTypes(type) {
             return mapType(type, getDefinitelyFalsyPartOfType);
@@ -56218,16 +56247,15 @@ var ts;
             return type.flags & 32768 ? type : getUnionType([type, isProperty ? missingType : undefinedType]);
         }
         function getGlobalNonNullableTypeInstantiation(type) {
-            var reducedType = getTypeWithFacts(type, 2097152);
             if (!deferredGlobalNonNullableTypeAlias) {
                 deferredGlobalNonNullableTypeAlias = getGlobalSymbol("NonNullable", 524288, undefined) || unknownSymbol;
             }
             return deferredGlobalNonNullableTypeAlias !== unknownSymbol ?
-                getTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [reducedType]) :
-                reducedType;
+                getTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [type]) :
+                getIntersectionType([type, emptyObjectType]);
         }
         function getNonNullableType(type) {
-            return strictNullChecks ? getGlobalNonNullableTypeInstantiation(type) : type;
+            return strictNullChecks ? getAdjustedTypeWithFacts(type, 2097152) : type;
         }
         function addOptionalTypeMarker(type) {
             return strictNullChecks ? getUnionType([type, optionalType]) : type;
@@ -56821,17 +56849,32 @@ var ts;
             return sourceStart.slice(0, startLen) !== targetStart.slice(0, startLen) ||
                 sourceEnd.slice(sourceEnd.length - endLen) !== targetEnd.slice(targetEnd.length - endLen);
         }
-        function isValidBigIntString(s) {
+        function isValidNumberString(s, roundTripOnly) {
+            if (s === "")
+                return false;
+            var n = +s;
+            return isFinite(n) && (!roundTripOnly || "" + n === s);
+        }
+        function parseBigIntLiteralType(text) {
+            var negative = text.startsWith("-");
+            var base10Value = ts.parsePseudoBigInt((negative ? text.slice(1) : text) + "n");
+            return getBigIntLiteralType({ negative: negative, base10Value: base10Value });
+        }
+        function isValidBigIntString(s, roundTripOnly) {
+            if (s === "")
+                return false;
             var scanner = ts.createScanner(99, false);
             var success = true;
             scanner.setOnError(function () { return success = false; });
             scanner.setText(s + "n");
             var result = scanner.scan();
-            if (result === 40) {
+            var negative = result === 40;
+            if (negative) {
                 result = scanner.scan();
             }
             var flags = scanner.getTokenFlags();
-            return success && result === 9 && scanner.getTextPos() === (s.length + 1) && !(flags & 512);
+            return success && result === 9 && scanner.getTextPos() === (s.length + 1) && !(flags & 512)
+                && (!roundTripOnly || s === ts.pseudoBigIntToString({ negative: negative, base10Value: ts.parsePseudoBigInt(scanner.getTokenValue()) }));
         }
         function isValidTypeForTemplateLiteralPlaceholder(source, target) {
             if (source === target || target.flags & (1 | 4)) {
@@ -56839,8 +56882,8 @@ var ts;
             }
             if (source.flags & 128) {
                 var value = source.value;
-                return !!(target.flags & 8 && value !== "" && isFinite(+value) ||
-                    target.flags & 64 && value !== "" && isValidBigIntString(value) ||
+                return !!(target.flags & 8 && isValidNumberString(value, false) ||
+                    target.flags & 64 && isValidBigIntString(value, false) ||
                     target.flags & (512 | 98304) && value === target.intrinsicName);
             }
             if (source.flags & 134217728) {
@@ -57182,8 +57225,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 && ts.find(type.types, function (t) { return !!getInferenceInfoForType(t); });
                     if (!t || typeVariable && t !== typeVariable) {
                         return undefined;
@@ -57305,8 +57348,51 @@ var ts;
                 var matches = inferTypesFromTemplateLiteralType(source, target);
                 var types = target.types;
                 if (matches || ts.every(target.texts, function (s) { return s.length === 0; })) {
+                    var _loop_23 = function (i) {
+                        var source_1 = matches ? matches[i] : neverType;
+                        var target_3 = types[i];
+                        if (source_1.flags & 128 && target_3.flags & 8650752) {
+                            var inferenceContext = getInferenceInfoForType(target_3);
+                            var constraint = inferenceContext ? getBaseConstraintOfType(inferenceContext.typeParameter) : undefined;
+                            if (constraint && !isTypeAny(constraint)) {
+                                var constraintTypes = constraint.flags & 1048576 ? constraint.types : [constraint];
+                                var allTypeFlags_1 = ts.reduceLeft(constraintTypes, function (flags, t) { return flags | t.flags; }, 0);
+                                if (!(allTypeFlags_1 & 4)) {
+                                    var str_1 = source_1.value;
+                                    if (allTypeFlags_1 & 296 && !isValidNumberString(str_1, true)) {
+                                        allTypeFlags_1 &= ~296;
+                                    }
+                                    if (allTypeFlags_1 & 2112 && !isValidBigIntString(str_1, true)) {
+                                        allTypeFlags_1 &= ~2112;
+                                    }
+                                    var matchingType = ts.reduceLeft(constraintTypes, function (left, right) {
+                                        return !(right.flags & allTypeFlags_1) ? left :
+                                            left.flags & 4 ? left : right.flags & 4 ? source_1 :
+                                                left.flags & 134217728 ? left : right.flags & 134217728 && isTypeMatchedByTemplateLiteralType(source_1, right) ? source_1 :
+                                                    left.flags & 268435456 ? left : right.flags & 268435456 && str_1 === applyStringMapping(right.symbol, str_1) ? source_1 :
+                                                        left.flags & 128 ? left : right.flags & 128 && right.value === str_1 ? right :
+                                                            left.flags & 8 ? left : right.flags & 8 ? getNumberLiteralType(+str_1) :
+                                                                left.flags & 32 ? left : right.flags & 32 ? getNumberLiteralType(+str_1) :
+                                                                    left.flags & 256 ? left : right.flags & 256 && right.value === +str_1 ? right :
+                                                                        left.flags & 64 ? left : right.flags & 64 ? parseBigIntLiteralType(str_1) :
+                                                                            left.flags & 2048 ? left : right.flags & 2048 && ts.pseudoBigIntToString(right.value) === str_1 ? right :
+                                                                                left.flags & 16 ? left : right.flags & 16 ? str_1 === "true" ? trueType : str_1 === "false" ? falseType : booleanType :
+                                                                                    left.flags & 512 ? left : right.flags & 512 && right.intrinsicName === str_1 ? right :
+                                                                                        left.flags & 32768 ? left : right.flags & 32768 && right.intrinsicName === str_1 ? right :
+                                                                                            left.flags & 65536 ? left : right.flags & 65536 && right.intrinsicName === str_1 ? right :
+                                                                                                left;
+                                    }, neverType);
+                                    if (!(matchingType.flags & 131072)) {
+                                        inferFromTypes(matchingType, target_3);
+                                        return "continue";
+                                    }
+                                }
+                            }
+                        }
+                        inferFromTypes(source_1, target_3);
+                    };
                     for (var i = 0; i < types.length; i++) {
-                        inferFromTypes(matches ? matches[i] : neverType, types[i]);
+                        _loop_23(i);
                     }
                 }
             }
@@ -57776,7 +57862,7 @@ var ts;
         function mapTypesByKeyProperty(types, name) {
             var map = new ts.Map();
             var count = 0;
-            var _loop_23 = function (type) {
+            var _loop_24 = function (type) {
                 if (type.flags & (524288 | 2097152 | 58982400)) {
                     var discriminant = getTypeOfPropertyOfType(type, name);
                     if (discriminant) {
@@ -57800,9 +57886,9 @@ var ts;
                     }
                 }
             };
-            for (var _i = 0, types_16 = types; _i < types_16.length; _i++) {
-                var type = types_16[_i];
-                var state_9 = _loop_23(type);
+            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;
             }
@@ -57900,14 +57986,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 | 465829888)) {
+                type = getBaseConstraintOfType(type) || unknownType;
+            }
             var flags = type.flags;
-            if (flags & 4) {
+            if (flags & (4 | 268435456)) {
                 return strictNullChecks ? 16317953 : 16776705;
             }
-            if (flags & 128) {
-                var isEmpty = type.value === "";
+            if (flags & (128 | 134217728)) {
+                var isEmpty = flags & 128 && type.value === "";
                 return strictNullChecks ?
                     isEmpty ? 12123649 : 7929345 :
                     isEmpty ? 12582401 : 16776705;
@@ -57939,20 +58027,20 @@ var ts;
                     (type === falseType || type === regularFalseType) ? 12580616 : 16774920;
             }
             if (flags & 524288) {
-                if (ignoreObjects) {
-                    return 16768959;
-                }
                 return ts.getObjectFlags(type) & 16 && isEmptyObjectType(type) ?
-                    strictNullChecks ? 16318463 : 16777215 :
+                    strictNullChecks ? 83427327 : 83886079 :
                     isFunctionObjectType(type) ?
                         strictNullChecks ? 7880640 : 16728000 :
                         strictNullChecks ? 7888800 : 16736160;
             }
-            if (flags & (16384 | 32768)) {
+            if (flags & 16384) {
                 return 9830144;
             }
+            if (flags & 32768) {
+                return 26607360;
+            }
             if (flags & 65536) {
-                return 9363232;
+                return 42917664;
             }
             if (flags & 12288) {
                 return strictNullChecks ? 7925520 : 16772880;
@@ -57963,33 +58051,49 @@ var ts;
             if (flags & 131072) {
                 return 0;
             }
-            if (flags & 465829888) {
-                return !isPatternLiteralType(type) ? getTypeFacts(getBaseConstraintOfType(type) || unknownType, ignoreObjects) :
-                    strictNullChecks ? 7929345 : 16776705;
-            }
             if (flags & 1048576) {
-                return ts.reduceLeft(type.types, function (facts, t) { return facts | getTypeFacts(t, ignoreObjects); }, 0);
+                return ts.reduceLeft(type.types, function (facts, t) { return facts | getTypeFacts(t); }, 0);
             }
             if (flags & 2097152) {
-                ignoreObjects || (ignoreObjects = maybeTypeOfKind(type, 131068));
-                return getIntersectionTypeFacts(type, ignoreObjects);
+                return getIntersectionTypeFacts(type);
             }
-            return 16777215;
+            return 83886079;
         }
-        function getIntersectionTypeFacts(type, ignoreObjects) {
+        function getIntersectionTypeFacts(type) {
+            var ignoreObjects = maybeTypeOfKind(type, 131068);
             var oredFacts = 0;
-            var andedFacts = 16777215;
+            var andedFacts = 134217727;
             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)) {
+                    var f = getTypeFacts(t);
+                    oredFacts |= f;
+                    andedFacts &= f;
+                }
             }
-            return oredFacts & 8256 | andedFacts & 16768959;
+            return oredFacts & 8256 | andedFacts & 134209471;
         }
         function getTypeWithFacts(type, include) {
             return filterType(type, function (t) { return (getTypeFacts(t) & include) !== 0; });
         }
+        function getAdjustedTypeWithFacts(type, facts) {
+            var reduced = recombineUnknownType(getTypeWithFacts(strictNullChecks && type.flags & 2 ? unknownUnionType : type, facts));
+            if (strictNullChecks) {
+                switch (facts) {
+                    case 524288:
+                        return mapType(reduced, function (t) { return getTypeFacts(t) & 65536 ? getIntersectionType([t, getTypeFacts(t) & 131072 && !maybeTypeOfKind(reduced, 65536) ? getUnionType([emptyObjectType, nullType]) : emptyObjectType]) : t; });
+                    case 1048576:
+                        return mapType(reduced, function (t) { return getTypeFacts(t) & 131072 ? getIntersectionType([t, getTypeFacts(t) & 65536 && !maybeTypeOfKind(reduced, 32768) ? getUnionType([emptyObjectType, undefinedType]) : emptyObjectType]) : t; });
+                    case 2097152:
+                    case 4194304:
+                        return mapType(reduced, function (t) { return getTypeFacts(t) & 262144 ? getGlobalNonNullableTypeInstantiation(t) : t; });
+                }
+            }
+            return reduced;
+        }
+        function recombineUnknownType(type) {
+            return type === unknownUnionType ? unknownType : type;
+        }
         function getTypeWithDefault(type, defaultExpression) {
             return defaultExpression ?
                 getUnionType([getNonUndefinedType(type), getTypeOfExpression(defaultExpression)]) :
@@ -58230,8 +58334,8 @@ var ts;
             var types = origin && origin.flags & 1048576 ? 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 ? mapType(t, mapper, noReductions) : mapper(t);
                 changed || (changed = t !== mapped);
                 if (mapped) {
@@ -58304,8 +58408,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)) {
                     if (!(ts.getObjectFlags(t) & 256)) {
                         return false;
@@ -58930,7 +59034,7 @@ var ts;
                 if (isEvolvingArrayTypeList(types)) {
                     return getEvolvingArrayType(getUnionType(ts.map(types, getElementTypeOfEvolvingArrayType)));
                 }
-                var result = getUnionType(ts.sameMap(types, finalizeEvolvingArrayType), subtypeReduction);
+                var result = recombineUnknownType(getUnionType(ts.sameMap(types, finalizeEvolvingArrayType), subtypeReduction));
                 if (result !== declaredType && result.flags & declaredType.flags & 1048576 && ts.arraysEqual(result.types, declaredType.types)) {
                     return declaredType;
                 }
@@ -59026,11 +59130,10 @@ var ts;
             }
             function narrowTypeByTruthiness(type, expr, assumeTrue) {
                 if (isMatchingReference(reference, expr)) {
-                    return type.flags & 2 && assumeTrue ? nonNullUnknownType :
-                        getTypeWithFacts(type, assumeTrue ? 4194304 : 8388608);
+                    return getAdjustedTypeWithFacts(type, assumeTrue ? 4194304 : 8388608);
                 }
                 if (strictNullChecks && assumeTrue && optionalChainContainsReference(expr, reference)) {
-                    type = getTypeWithFacts(type, 2097152);
+                    type = getAdjustedTypeWithFacts(type, 2097152);
                 }
                 var access = getDiscriminantPropertyAccess(expr, type);
                 if (access) {
@@ -59157,7 +59260,7 @@ var ts;
                 var valueType = getTypeOfExpression(value);
                 var removeNullable = equalsOperator !== assumeTrue && everyType(valueType, function (t) { return !!(t.flags & nullableFlags); }) ||
                     equalsOperator === assumeTrue && everyType(valueType, function (t) { return !(t.flags & (3 | nullableFlags)); });
-                return removeNullable ? getTypeWithFacts(type, 2097152) : type;
+                return removeNullable ? getAdjustedTypeWithFacts(type, 2097152) : type;
             }
             function narrowTypeByEquality(type, operator, value, assumeTrue) {
                 if (type.flags & 1) {
@@ -59167,9 +59270,6 @@ var ts;
                     assumeTrue = !assumeTrue;
                 }
                 var valueType = getTypeOfExpression(value);
-                if (assumeTrue && (type.flags & 2) && (operator === 34 || operator === 35) && (valueType.flags & 65536)) {
-                    return getUnionType([nullType, undefinedType]);
-                }
                 if ((type.flags & 2) && assumeTrue && (operator === 36 || operator === 37)) {
                     if (valueType.flags & (131068 | 67108864)) {
                         return valueType;
@@ -59189,7 +59289,7 @@ var ts;
                         valueType.flags & 65536 ?
                             assumeTrue ? 131072 : 1048576 :
                             assumeTrue ? 65536 : 524288;
-                    return type.flags & 2 && facts & (1048576 | 2097152) ? nonNullUnknownType : getTypeWithFacts(type, facts);
+                    return getAdjustedTypeWithFacts(type, facts);
                 }
                 if (assumeTrue) {
                     var filterFn = operator === 34 ?
@@ -59209,21 +59309,18 @@ var ts;
                 var target = getReferenceCandidate(typeOfExpr.expression);
                 if (!isMatchingReference(reference, target)) {
                     if (strictNullChecks && optionalChainContainsReference(target, reference) && assumeTrue === (literal.text !== "undefined")) {
-                        return getTypeWithFacts(type, 2097152);
+                        return getAdjustedTypeWithFacts(type, 2097152);
                     }
                     return type;
                 }
                 if (type.flags & 1 && literal.text === "function") {
                     return type;
                 }
-                if (assumeTrue && type.flags & 2 && literal.text === "object") {
-                    return type === nonNullUnknownType ? nonPrimitiveType : getUnionType([nonPrimitiveType, nullType]);
-                }
                 var facts = assumeTrue ?
                     typeofEQFacts.get(literal.text) || 128 :
                     typeofNEFacts.get(literal.text) || 32768;
                 var impliedType = getImpliedTypeFromTypeofGuard(type, literal.text);
-                return getTypeWithFacts(assumeTrue && impliedType ? mapType(type, narrowUnionMemberByTypeof(impliedType)) : type, facts);
+                return getTypeWithFacts(assumeTrue && impliedType ? narrowTypeByImpliedType(type, impliedType) : type, facts);
             }
             function narrowTypeBySwitchOptionalChainContainment(type, switchStatement, clauseStart, clauseEnd, clauseCheck) {
                 var everyClauseChecks = clauseStart !== clauseEnd && ts.every(getSwitchClauseTypes(switchStatement).slice(clauseStart, clauseEnd), clauseCheck);
@@ -59268,30 +59365,35 @@ var ts;
             }
             function getImpliedTypeFromTypeofGuard(type, text) {
                 switch (text) {
+                    case "object":
+                        return type.flags & 1 ? type : getUnionType([nullType, nonPrimitiveType]);
                     case "function":
                         return type.flags & 1 ? type : globalFunctionType;
-                    case "object":
-                        return type.flags & 2 ? getUnionType([nonPrimitiveType, nullType]) : type;
                     default:
                         return typeofTypesByName.get(text);
                 }
             }
-            function narrowUnionMemberByTypeof(candidate) {
-                return function (type) {
-                    if (isTypeSubtypeOf(type, candidate)) {
-                        return type;
-                    }
-                    if (isTypeSubtypeOf(candidate, type)) {
-                        return candidate;
+            function narrowTypeByImpliedType(type, candidate) {
+                if (type.flags & 3) {
+                    return candidate;
+                }
+                return mapType(type, function (t) {
+                    if (isTypeRelatedTo(t, candidate, strictSubtypeRelation)) {
+                        return t;
                     }
-                    if (type.flags & 465829888) {
-                        var constraint = getBaseConstraintOfType(type) || anyType;
-                        if (isTypeSubtypeOf(candidate, constraint)) {
-                            return getIntersectionType([type, candidate]);
+                    return mapType(candidate, function (c) {
+                        if (!areTypesComparable(t, c)) {
+                            return neverType;
                         }
-                    }
-                    return type;
-                };
+                        if (c.flags & 131068 && t.flags & 524288 && !isEmptyAnonymousObjectType(t)) {
+                            return isTypeSubtypeOf(c, t) ? c : neverType;
+                        }
+                        if (c === globalFunctionType && isTypeSubtypeOf(c, t)) {
+                            return c;
+                        }
+                        return getIntersectionType([t, c]);
+                    });
+                });
             }
             function narrowBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
                 var switchWitnesses = getSwitchClauseTypeOfWitnesses(switchStatement, true);
@@ -59317,7 +59419,7 @@ var ts;
                     return filterType(type, function (t) { return (getTypeFacts(t) & switchFacts) === switchFacts; });
                 }
                 var impliedType = getTypeWithFacts(getUnionType(clauseWitnesses.map(function (text) { return getImpliedTypeFromTypeofGuard(type, text) || type; })), switchFacts);
-                return getTypeWithFacts(mapType(type, narrowUnionMemberByTypeof(impliedType)), switchFacts);
+                return getTypeWithFacts(narrowTypeByImpliedType(type, impliedType), switchFacts);
             }
             function isMatchingConstructorReference(expr) {
                 return (ts.isPropertyAccessExpression(expr) && ts.idText(expr.name) === "constructor" ||
@@ -59357,7 +59459,7 @@ var ts;
                 var left = getReferenceCandidate(expr.left);
                 if (!isMatchingReference(reference, left)) {
                     if (assumeTrue && strictNullChecks && optionalChainContainsReference(left, reference)) {
-                        return getTypeWithFacts(type, 2097152);
+                        return getAdjustedTypeWithFacts(type, 2097152);
                     }
                     return type;
                 }
@@ -59433,7 +59535,7 @@ var ts;
                         }
                         if (strictNullChecks && assumeTrue && optionalChainContainsReference(predicateArgument, reference) &&
                             !(getTypeFacts(predicate.type) & 65536)) {
-                            type = getTypeWithFacts(type, 2097152);
+                            type = getAdjustedTypeWithFacts(type, 2097152);
                         }
                         var access = getDiscriminantPropertyAccess(predicateArgument, type);
                         if (access) {
@@ -59484,7 +59586,7 @@ var ts;
             }
             function narrowTypeByOptionality(type, expr, assumePresent) {
                 if (isMatchingReference(reference, expr)) {
-                    return getTypeWithFacts(type, assumePresent ? 2097152 : 262144);
+                    return getAdjustedTypeWithFacts(type, assumePresent ? 2097152 : 262144);
                 }
                 var access = getDiscriminantPropertyAccess(expr, type);
                 if (access) {
@@ -59559,8 +59661,8 @@ var ts;
                 var annotationIncludesUndefined = strictNullChecks &&
                     declaration.kind === 164 &&
                     declaration.initializer &&
-                    getFalsyFlags(declaredType) & 32768 &&
-                    !(getFalsyFlags(checkExpression(declaration.initializer)) & 32768);
+                    getTypeFacts(declaredType) & 16777216 &&
+                    !(getTypeFacts(checkExpression(declaration.initializer)) & 16777216);
                 popTypeResolution();
                 return annotationIncludesUndefined ? getTypeWithFacts(declaredType, 524288) : declaredType;
             }
@@ -59578,7 +59680,9 @@ var ts;
                     !(someType(type, isGenericTypeWithoutNullableConstraint) && isGenericIndexType(getTypeOfExpression(parent.argumentExpression)));
         }
         function isGenericTypeWithUnionConstraint(type) {
-            return !!(type.flags & 465829888 && getBaseConstraintOrType(type).flags & (98304 | 1048576));
+            return type.flags & 2097152 ?
+                ts.some(type.types, isGenericTypeWithUnionConstraint) :
+                !!(type.flags & 465829888 && getBaseConstraintOrType(type).flags & (98304 | 1048576));
         }
         function isGenericTypeWithoutNullableConstraint(type) {
             return !!(type.flags & 465829888 && !maybeTypeOfKind(getBaseConstraintOrType(type), 98304));
@@ -59595,7 +59699,7 @@ var ts;
             var substituteConstraints = !(checkMode && checkMode & 2) &&
                 someType(type, isGenericTypeWithUnionConstraint) &&
                 (isConstraintPosition(type, reference) || hasContextualTypeWithNoGenericTypes(reference, checkMode));
-            return substituteConstraints ? mapType(type, function (t) { return t.flags & 465829888 ? getBaseConstraintOrType(t) : t; }) : type;
+            return substituteConstraints ? mapType(type, getBaseConstraintOrType) : type;
         }
         function isExportOrExportExpression(location) {
             return !!ts.findAncestor(location, function (n) {
@@ -59798,7 +59902,7 @@ var ts;
                     return convertAutoToAny(flowType);
                 }
             }
-            else if (!assumeInitialized && !(getFalsyFlags(type) & 32768) && getFalsyFlags(flowType) & 32768) {
+            else if (!assumeInitialized && !(getTypeFacts(type) & 16777216) && getTypeFacts(flowType) & 16777216) {
                 error(node, ts.Diagnostics.Variable_0_is_used_before_being_assigned, symbolToString(symbol));
                 return type;
             }
@@ -61076,8 +61180,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) {
@@ -62040,19 +62144,19 @@ var ts;
             return checkNonNullType(checkExpression(node), node);
         }
         function isNullableType(type) {
-            return !!((strictNullChecks ? getFalsyFlags(type) : type.flags) & 98304);
+            return !!(getTypeFacts(type) & 50331648);
         }
         function getNonNullableTypeIfNeeded(type) {
             return isNullableType(type) ? getNonNullableType(type) : type;
         }
-        function reportObjectPossiblyNullOrUndefinedError(node, flags) {
-            error(node, flags & 32768 ? flags & 65536 ?
+        function reportObjectPossiblyNullOrUndefinedError(node, facts) {
+            error(node, facts & 16777216 ? facts & 33554432 ?
                 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 ? flags & 65536 ?
+        function reportCannotInvokePossiblyNullOrUndefinedError(node, facts) {
+            error(node, facts & 16777216 ? facts & 33554432 ?
                 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);
@@ -62062,9 +62166,9 @@ var ts;
                 error(node, ts.Diagnostics.Object_is_of_type_unknown);
                 return errorType;
             }
-            var kind = (strictNullChecks ? getFalsyFlags(type) : type.flags) & 98304;
-            if (kind) {
-                reportError(node, kind);
+            var facts = getTypeFacts(type);
+            if (facts & 50331648) {
+                reportError(node, facts);
                 var t = getNonNullableType(type);
                 return t.flags & (98304 | 131072) ? errorType : t;
             }
@@ -62330,7 +62434,7 @@ var ts;
                 assumeUninitialized = true;
             }
             var flowType = getFlowTypeOfReference(node, propType, assumeUninitialized ? getOptionalType(propType) : propType);
-            if (assumeUninitialized && !(getFalsyFlags(propType) & 32768) && getFalsyFlags(flowType) & 32768) {
+            if (assumeUninitialized && !(getTypeFacts(propType) & 16777216) && getTypeFacts(flowType) & 16777216) {
                 error(errorNode, ts.Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop));
                 return propType;
             }
@@ -63225,7 +63329,7 @@ var ts;
             var spreadIndex = getSpreadArgumentIndex(args);
             if (spreadIndex >= 0) {
                 var effectiveArgs_1 = args.slice(0, spreadIndex);
-                var _loop_24 = function (i) {
+                var _loop_25 = function (i) {
                     var arg = args[i];
                     var spreadType = arg.kind === 225 && (flowLoopCount ? checkExpression(arg.expression) : checkExpressionCached(arg.expression));
                     if (spreadType && isTupleType(spreadType)) {
@@ -63241,7 +63345,7 @@ var ts;
                     }
                 };
                 for (var i = spreadIndex; i < args.length; i++) {
-                    _loop_24(i);
+                    _loop_25(i);
                 }
                 return effectiveArgs_1;
             }
@@ -63489,7 +63593,7 @@ var ts;
                         var min_3 = Number.MAX_VALUE;
                         var minIndex = 0;
                         var i_1 = 0;
-                        var _loop_25 = function (c) {
+                        var _loop_26 = function (c) {
                             var chain_2 = function () { return ts.chainDiagnosticMessages(undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); };
                             var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0, true, chain_2);
                             if (diags_2) {
@@ -63507,7 +63611,7 @@ var ts;
                         };
                         for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
                             var c = candidatesForArgumentError_1[_a];
-                            _loop_25(c);
+                            _loop_26(c);
                         }
                         var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
                         ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
@@ -63650,7 +63754,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_26 = function (i) {
+            var _loop_27 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (s) { return signatureHasRestParameter(s) ?
                     i < s.parameters.length - 1 ? s.parameters[i] : ts.last(s.parameters) :
                     i < s.parameters.length ? s.parameters[i] : undefined; });
@@ -63658,7 +63762,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_26(i);
+                _loop_27(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return signatureHasRestParameter(c) ? ts.last(c.parameters) : undefined; });
             var flags = 0;
@@ -63934,8 +64038,8 @@ var ts;
             if (apparentType.flags & 1048576) {
                 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;
@@ -65443,7 +65547,7 @@ var ts;
             var type = getTypeOfSymbol(symbol);
             if (strictNullChecks &&
                 !(type.flags & (3 | 131072)) &&
-                !(exactOptionalPropertyTypes ? symbol.flags & 16777216 : getFalsyFlags(type) & 32768)) {
+                !(exactOptionalPropertyTypes ? symbol.flags & 16777216 : getTypeFacts(type) & 16777216)) {
                 error(expr, ts.Diagnostics.The_operand_of_a_delete_operator_must_be_optional);
             }
         }
@@ -65602,8 +65706,8 @@ var ts;
             }
             if (type.flags & 3145728) {
                 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;
                     }
@@ -65793,7 +65897,7 @@ var ts;
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     if (strictNullChecks &&
-                        !(getFalsyFlags(checkExpression(prop.objectAssignmentInitializer)) & 32768)) {
+                        !(getTypeFacts(checkExpression(prop.objectAssignmentInitializer)) & 16777216)) {
                         sourceType = getTypeWithFacts(sourceType, 524288);
                     }
                     checkBinaryLikeExpression(prop.name, prop.equalsToken, prop.objectAssignmentInitializer, checkMode);
@@ -66158,7 +66262,7 @@ var ts;
                 case 56:
                 case 75: {
                     var resultType_3 = getTypeFacts(leftType) & 8388608 ?
-                        getUnionType([removeDefinitelyFalsyTypes(leftType), rightType], 2) :
+                        getUnionType([getNonNullableType(removeDefinitelyFalsyTypes(leftType)), rightType], 2) :
                         leftType;
                     if (operator === 75) {
                         checkAssignmentOperator(rightType);
@@ -67254,7 +67358,7 @@ var ts;
             var indexSymbol = getIndexSymbol(getSymbolOfNode(node));
             if (indexSymbol === null || indexSymbol === void 0 ? void 0 : indexSymbol.declarations) {
                 var indexSignatureMap_1 = new ts.Map();
-                var _loop_27 = function (declaration) {
+                var _loop_28 = function (declaration) {
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         forEachType(getTypeFromTypeNode(declaration.parameters[0].type), function (type) {
                             var entry = indexSignatureMap_1.get(getTypeId(type));
@@ -67269,7 +67373,7 @@ var ts;
                 };
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    _loop_27(declaration);
+                    _loop_28(declaration);
                 }
                 indexSignatureMap_1.forEach(function (entry) {
                     if (entry.declarations.length > 1) {
@@ -68320,8 +68424,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 || typeNode.kind === 197) {
                     typeNode = typeNode.type;
                 }
@@ -69071,7 +69175,7 @@ var ts;
             }
             if (ts.isBindingPattern(node.name)) {
                 var needCheckInitializer = node.initializer && node.parent.parent.kind !== 243;
-                var needCheckWidenedType = node.name.elements.length === 0;
+                var needCheckWidenedType = !ts.some(node.name.elements, ts.not(ts.isOmittedExpression));
                 if (needCheckInitializer || needCheckWidenedType) {
                     var widenedType = getWidenedTypeForVariableLikeDeclaration(node);
                     if (needCheckInitializer) {
@@ -69095,7 +69199,7 @@ var ts;
                 return;
             }
             var symbol = getSymbolOfNode(node);
-            if (symbol.flags & 2097152 && ts.isVariableDeclarationInitializedToBareOrAccessedRequire(node)) {
+            if (symbol.flags & 2097152 && ts.isVariableDeclarationInitializedToBareOrAccessedRequire(node.kind === 203 ? node.parent.parent : node)) {
                 checkAliasSymbol(node);
                 return;
             }
@@ -69212,7 +69316,7 @@ var ts;
                     return;
                 var type = checkTruthinessExpression(location);
                 var isPropertyExpressionCast = ts.isPropertyAccessExpression(location) && isTypeAssertion(location.expression);
-                if (getFalsyFlags(type) || isPropertyExpressionCast)
+                if (!(getTypeFacts(type) & 4194304) || isPropertyExpressionCast)
                     return;
                 var callSignatures = getSignaturesOfType(type, 0);
                 var isPromise = !!getAwaitedTypeOfPromise(type);
@@ -70089,7 +70193,7 @@ var ts;
             var interfaceDeclaration = ts.getObjectFlags(type) & 2 ? ts.getDeclarationOfKind(type.symbol, 258) : undefined;
             var localPropDeclaration = declaration && declaration.kind === 221 ||
                 name && name.kind === 162 || getParentOfSymbol(prop) === type.symbol ? declaration : undefined;
-            var _loop_28 = function (info) {
+            var _loop_29 = function (info) {
                 var localIndexDeclaration = info.declaration && getParentOfSymbol(getSymbolOfNode(info.declaration)) === type.symbol ? info.declaration : undefined;
                 var errorNode = localPropDeclaration || localIndexDeclaration ||
                     (interfaceDeclaration && !ts.some(getBaseTypes(type), function (base) { return !!getPropertyOfObjectType(base, prop.escapedName) && !!getIndexTypeOfType(base, info.keyType); }) ? interfaceDeclaration : undefined);
@@ -70099,7 +70203,7 @@ var ts;
             };
             for (var _i = 0, indexInfos_9 = indexInfos; _i < indexInfos_9.length; _i++) {
                 var info = indexInfos_9[_i];
-                _loop_28(info);
+                _loop_29(info);
             }
         }
         function checkIndexConstraintForIndexSignature(type, checkInfo) {
@@ -70107,7 +70211,7 @@ var ts;
             var indexInfos = getApplicableIndexInfos(type, checkInfo.keyType);
             var interfaceDeclaration = ts.getObjectFlags(type) & 2 ? ts.getDeclarationOfKind(type.symbol, 258) : undefined;
             var localCheckDeclaration = declaration && getParentOfSymbol(getSymbolOfNode(declaration)) === type.symbol ? declaration : undefined;
-            var _loop_29 = function (info) {
+            var _loop_30 = function (info) {
                 if (info === checkInfo)
                     return "continue";
                 var localIndexDeclaration = info.declaration && getParentOfSymbol(getSymbolOfNode(info.declaration)) === type.symbol ? info.declaration : undefined;
@@ -70119,7 +70223,7 @@ var ts;
             };
             for (var _i = 0, indexInfos_10 = indexInfos; _i < indexInfos_10.length; _i++) {
                 var info = indexInfos_10[_i];
-                _loop_29(info);
+                _loop_30(info);
             }
         }
         function checkTypeNameIsReserved(name, message) {
@@ -70413,7 +70517,7 @@ var ts;
             var baseTypes = baseTypeNode && getBaseTypes(type);
             var baseWithThis = (baseTypes === null || baseTypes === void 0 ? void 0 : baseTypes.length) ? getTypeWithThisArgument(ts.first(baseTypes), type.thisType) : undefined;
             var baseStaticType = getBaseConstructorTypeOfClass(type);
-            var _loop_30 = function (member) {
+            var _loop_31 = function (member) {
                 if (ts.hasAmbientModifier(member)) {
                     return "continue";
                 }
@@ -70428,7 +70532,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_30(member);
+                _loop_31(member);
             }
         }
         function checkExistingMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, member, memberIsParameterProperty, reportErrors) {
@@ -70503,7 +70607,7 @@ var ts;
         }
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             var issuedMemberError = false;
-            var _loop_31 = function (member) {
+            var _loop_32 = function (member) {
                 if (ts.isStatic(member)) {
                     return "continue";
                 }
@@ -70521,7 +70625,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_31(member);
+                _loop_32(member);
             }
             if (!issuedMemberError) {
                 checkTypeAssignableTo(typeWithThis, baseWithThis, node.name || node, broadDiag);
@@ -70566,17 +70670,16 @@ var ts;
             });
         }
         function checkKindsOfPropertyMemberOverrides(type, baseType) {
-            var _a, _b;
+            var _a, _b, _c, _d;
             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) {
-                    continue;
+                    return "continue";
                 }
                 var baseSymbol = getPropertyOfObjectType(type, base.escapedName);
                 if (!baseSymbol) {
-                    continue;
+                    return "continue";
                 }
                 var derived = getTargetSymbol(baseSymbol);
                 var baseDeclarationFlags = ts.getDeclarationModifierFlagsFromSymbol(base);
@@ -70584,14 +70687,14 @@ var ts;
                 if (derived === base) {
                     var derivedClassDecl = ts.getClassLikeDeclarationOfSymbol(type.symbol);
                     if (baseDeclarationFlags & 128 && (!derivedClassDecl || !ts.hasSyntacticModifier(derivedClassDecl, 128))) {
-                        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) {
@@ -70605,16 +70708,18 @@ var ts;
                 else {
                     var derivedDeclarationFlags = ts.getDeclarationModifierFlagsFromSymbol(derived);
                     if (baseDeclarationFlags & 8 || derivedDeclarationFlags & 8) {
-                        continue;
+                        return "continue";
                     }
                     var errorMessage = void 0;
                     var basePropertyFlags = base.flags & 98308;
                     var derivedPropertyFlags = derived.flags & 98308;
                     if (basePropertyFlags && derivedPropertyFlags) {
-                        if (baseDeclarationFlags & 128 && !(base.valueDeclaration && ts.isPropertyDeclaration(base.valueDeclaration) && base.valueDeclaration.initializer)
-                            || base.valueDeclaration && base.valueDeclaration.parent.kind === 258
+                        if ((ts.getCheckFlags(base) & 6
+                            ? (_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
                             || derived.valueDeclaration && ts.isBinaryExpression(derived.valueDeclaration)) {
-                            continue;
+                            return "continue";
                         }
                         var overriddenInstanceProperty = basePropertyFlags !== 4 && derivedPropertyFlags === 4;
                         var overriddenInstanceAccessor = basePropertyFlags === 4 && derivedPropertyFlags !== 4;
@@ -70625,12 +70730,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 && !d.initializer; });
+                            var uninitialized = (_c = derived.declarations) === null || _c === void 0 ? void 0 : _c.find(function (d) { return d.kind === 167 && !d.initializer; });
                             if (uninitialized
                                 && !(derived.flags & 33554432)
                                 && !(baseDeclarationFlags & 128)
                                 && !(derivedDeclarationFlags & 128)
-                                && !((_b = derived.declarations) === null || _b === void 0 ? void 0 : _b.some(function (d) { return !!(d.flags & 16777216); }))) {
+                                && !((_d = derived.declarations) === null || _d === void 0 ? void 0 : _d.some(function (d) { return !!(d.flags & 16777216); }))) {
                                 var constructor = findConstructorDeclaration(ts.getClassLikeDeclarationOfSymbol(type.symbol));
                                 var propName = uninitialized.name;
                                 if (uninitialized.exclamationToken
@@ -70643,11 +70748,11 @@ var ts;
                                 }
                             }
                         }
-                        continue;
+                        return "continue";
                     }
                     else if (isPrototypeProperty(base)) {
                         if (isPrototypeProperty(derived) || derived.flags & 4) {
-                            continue;
+                            return "continue";
                         }
                         else {
                             ts.Debug.assert(!!(derived.flags & 98304));
@@ -70662,9 +70767,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 && (!ts.isPropertyDeclaration(declaration) || !declaration.initializer)
+                || ts.isInterfaceDeclaration(declaration.parent);
+        }
+        function getNonInheritedProperties(type, baseTypes, properties) {
             if (!ts.length(baseTypes)) {
                 return properties;
             }
@@ -70733,7 +70849,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 || getFalsyFlags(type) & 32768)) {
+                        if (!(type.flags & 3 || getTypeFacts(type) & 16777216)) {
                             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));
                             }
@@ -70757,7 +70873,7 @@ var ts;
                     ts.setParent(reference, staticBlock);
                     reference.flowNode = staticBlock.returnFlowNode;
                     var flowType = getFlowTypeOfReference(reference, propType, getOptionalType(propType));
-                    if (!(getFalsyFlags(flowType) & 32768)) {
+                    if (!(getTypeFacts(flowType) & 16777216)) {
                         return true;
                     }
                 }
@@ -70772,7 +70888,7 @@ var ts;
             ts.setParent(reference, constructor);
             reference.flowNode = constructor.returnFlowNode;
             var flowType = getFlowTypeOfReference(reference, propType, getOptionalType(propType));
-            return !(getFalsyFlags(flowType) & 32768);
+            return !(getTypeFacts(flowType) & 16777216);
         }
         function checkInterfaceDeclaration(node) {
             if (!checkGrammarDecoratorsAndModifiers(node))
@@ -75651,9 +75767,7 @@ var ts;
 var ts;
 (function (ts) {
     function createSourceMapGenerator(host, file, sourceRoot, sourcesDirectoryPath, generatorOptions) {
-        var _a = generatorOptions.extendedDiagnostics
-            ? ts.performance.createTimer("Source Map", "beforeSourcemap", "afterSourcemap")
-            : ts.performance.nullTimer, enter = _a.enter, exit = _a.exit;
+        var _a = ts.performance.createTimerIf(!!generatorOptions.extendedDiagnostics, "Source Map", "beforeSourcemap", "afterSourcemap"), enter = _a.enter, exit = _a.exit;
         var rawSources = [];
         var sources = [];
         var sourceToSourceIndexMap = new ts.Map();
@@ -77793,8 +77907,8 @@ var ts;
         }
         function serializeTypeList(types) {
             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) {
                     typeNode = typeNode.type;
                 }
@@ -93419,8 +93533,8 @@ var ts;
                     bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "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") + "\""
@@ -101013,7 +101127,7 @@ var ts;
                 importedFileFromNodeModules = importedFileFromNodeModules || isInNodeModules;
             });
             var sortedPaths = [];
-            var _loop_32 = function (directory) {
+            var _loop_34 = function (directory) {
                 var directoryStart = ts.ensureTrailingDirectorySeparator(directory);
                 var pathsInDirectory;
                 allFileNames.forEach(function (_a, fileName) {
@@ -101037,9 +101151,9 @@ var ts;
             };
             var out_directory_1;
             for (var directory = ts.getDirectoryPath(importingFileName); allFileNames.size !== 0;) {
-                var state_10 = _loop_32(directory);
+                var state_11 = _loop_34(directory);
                 directory = out_directory_1;
-                if (state_10 === "break")
+                if (state_11 === "break")
                     break;
             }
             if (allFileNames.size) {
@@ -102803,6 +102917,7 @@ var ts;
         if (value) {
             return isParsedCommandLine(value) ? value : undefined;
         }
+        ts.solutionPerformance.mark("beforeParseConfigFile");
         var diagnostic;
         var parseConfigFileHost = state.parseConfigFileHost, baseCompilerOptions = state.baseCompilerOptions, baseWatchOptions = state.baseWatchOptions, extendedConfigCache = state.extendedConfigCache, host = state.host;
         var parsed;
@@ -102817,6 +102932,8 @@ var ts;
             parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = ts.noop;
         }
         configFileCache.set(configFilePath, parsed || diagnostic);
+        ts.solutionPerformance.mark("afterParseConfigFile");
+        ts.solutionPerformance.measure("ParseConfigFile", "beforeParseConfigFile", "afterParseConfigFile");
         return parsed;
     }
     function resolveProjectName(state, name) {
@@ -102864,6 +102981,7 @@ var ts;
         return state.buildOrder || createStateBuildOrder(state);
     }
     function createStateBuildOrder(state) {
+        ts.solutionPerformance.mark("beforeCreateBuildOrder");
         var buildOrder = createBuildOrder(state, state.rootNames.map(function (f) { return resolveProjectName(state, f); }));
         state.resolvedConfigFilePaths.clear();
         var currentProjects = new ts.Map(getBuildOrderFromAnyBuildOrder(buildOrder).map(function (resolved) { return [toResolvedConfigFilePath(state, resolved), true]; }));
@@ -102889,6 +103007,8 @@ var ts;
             ts.mutateMapSkippingNewValues(state.allWatchedInputFiles, currentProjects, { onDeleteValue: function (existingMap) { return existingMap.forEach(ts.closeFileWatcher); } });
             ts.mutateMapSkippingNewValues(state.allWatchedPackageJsonFiles, currentProjects, { onDeleteValue: function (existingMap) { return existingMap.forEach(ts.closeFileWatcher); } });
         }
+        ts.solutionPerformance.mark("afterCreateBuildOrder");
+        ts.solutionPerformance.measure("CreateBuildOrder", "beforeCreateBuildOrder", "afterCreateBuildOrder");
         return state.buildOrder = buildOrder;
     }
     function getBuildOrderFor(state, project, onlyReferences) {
@@ -103008,6 +103128,7 @@ var ts;
                 if (updateOutputFileStampsPending) {
                     updateOutputTimestamps(state, config, projectPath);
                 }
+                ts.solutionPerformance.mark("timestampUpdated");
                 return doneInvalidatedProject(state, projectPath);
             }
         };
@@ -103101,6 +103222,10 @@ var ts;
             };
         function done(cancellationToken, writeFile, customTransformers) {
             executeSteps(BuildStep.Done, cancellationToken, writeFile, customTransformers);
+            if (kind === InvalidatedProjectKind.Build)
+                ts.solutionPerformance.mark("projectsBuilt");
+            else
+                ts.solutionPerformance.mark("bundlesUpdated");
             return doneInvalidatedProject(state, projectPath);
         }
         function withProgramOrUndefined(action) {
@@ -103181,6 +103306,7 @@ var ts;
             var anyDtsChanged = false;
             var emitterDiagnostics = ts.createDiagnosticCollection();
             var emittedOutputs = new ts.Map();
+            ts.solutionPerformance.mark("beforeOutputFilesWrite");
             outputFiles.forEach(function (_a) {
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
                 var priorChangeTime;
@@ -103199,6 +103325,8 @@ var ts;
                     newestDeclarationFileContentChangedTime = newer(priorChangeTime, newestDeclarationFileContentChangedTime);
                 }
             });
+            ts.solutionPerformance.mark("afterOutputFilesWrite");
+            ts.solutionPerformance.measure("OutputFilesWrite", "beforeOutputFilesWrite", "afterOutputFilesWrite");
             finishEmit(emitterDiagnostics, emittedOutputs, newestDeclarationFileContentChangedTime, anyDtsChanged, outputFiles.length ? outputFiles[0].name : ts.getFirstProjectOutput(config, !host.useCaseSensitiveFileNames()), resultFlags);
             return emitResult;
         }
@@ -103322,6 +103450,13 @@ var ts;
             !ts.isIncrementalCompilation(config.options);
     }
     function getNextInvalidatedProjectCreateInfo(state, buildOrder, reportQueue) {
+        ts.solutionPerformance.mark("beforeGetNextInvalidatedProjectCreateInfo");
+        var result = getNextInvalidatedProjectCreateInfoWorker(state, buildOrder, reportQueue);
+        ts.solutionPerformance.mark("afterGetNextInvalidatedProjectCreateInfo");
+        ts.solutionPerformance.measure("GetNextInvalidatedProjectCreateInfo", "beforeGetNextInvalidatedProjectCreateInfo", "afterGetNextInvalidatedProjectCreateInfo");
+        return result;
+    }
+    function getNextInvalidatedProjectCreateInfoWorker(state, buildOrder, reportQueue) {
         if (!state.projectPendingBuild.size)
             return undefined;
         if (isCircularBuildOrder(buildOrder))
@@ -103417,9 +103552,7 @@ var ts;
     }
     function getNextInvalidatedProject(state, buildOrder, reportQueue) {
         var info = getNextInvalidatedProjectCreateInfo(state, buildOrder, reportQueue);
-        if (!info)
-            return info;
-        return createInvalidatedProjectWithInfo(state, info, buildOrder);
+        return info && createInvalidatedProjectWithInfo(state, info, buildOrder);
     }
     function listEmittedFile(_a, proj, file) {
         var write = _a.write;
@@ -103427,14 +103560,17 @@ var ts;
             write("TSFILE: " + file);
         }
     }
-    function getOldProgram(_a, proj, parsed) {
-        var options = _a.options, builderPrograms = _a.builderPrograms, compilerHost = _a.compilerHost;
-        if (options.force)
+    function getOldProgram(state, proj, parsed) {
+        if (state.options.force)
             return undefined;
-        var value = builderPrograms.get(proj);
+        var value = state.builderPrograms.get(proj);
         if (value)
             return value;
-        return ts.readBuilderProgram(parsed.options, compilerHost);
+        ts.solutionPerformance.mark("beforeReadBuilderProgram");
+        var program = ts.readBuilderProgram(parsed.options, state.compilerHost);
+        ts.solutionPerformance.mark("afterReadBuilderProgram");
+        ts.solutionPerformance.measure("ReadBuilderProgram", "beforeReadBuilderProgram", "afterReadBuilderProgram");
+        return program;
     }
     function afterProgramDone(state, program, config) {
         if (program) {
@@ -103607,7 +103743,10 @@ var ts;
             state.buildInfoChecked.set(resolvedPath, true);
             var buildInfoPath = ts.getTsBuildInfoEmitOutputFilePath(project.options);
             if (buildInfoPath) {
+                ts.solutionPerformance.mark("beforeBuildInfoRead");
                 var value = state.readFileWithCache(buildInfoPath);
+                ts.solutionPerformance.mark("afterBuildInfoRead");
+                ts.solutionPerformance.measure("BuildInfoRead", "beforeBuildInfoRead", "afterBuildInfoRead");
                 var buildInfo = value && ts.getBuildInfo(value);
                 if (buildInfo && (buildInfo.bundle || buildInfo.program) && buildInfo.version !== ts.version) {
                     return {
@@ -103642,13 +103781,17 @@ var ts;
         if (prior !== undefined) {
             return prior;
         }
+        ts.solutionPerformance.mark("beforeGetUpToDateStatus");
         var actual = getUpToDateStatusWorker(state, project, resolvedPath);
+        ts.solutionPerformance.mark("afterGetUpToDateStatus");
+        ts.solutionPerformance.measure("GetUpToDateStatus", "beforeGetUpToDateStatus", "afterGetUpToDateStatus");
         state.projectStatus.set(resolvedPath, actual);
         return actual;
     }
     function updateOutputTimestampsWorker(state, proj, priorNewestUpdateTime, verboseMessage, skipOutputs) {
         if (proj.options.noEmit)
             return priorNewestUpdateTime;
+        ts.solutionPerformance.mark("beforeUpdateOutputTimestamps");
         var host = state.host;
         var outputs = ts.getAllProjectOutputs(proj, !host.useCaseSensitiveFileNames());
         if (!skipOutputs || outputs.length !== skipOutputs.size) {
@@ -103669,6 +103812,8 @@ var ts;
                 host.setModifiedTime(file, now);
             }
         }
+        ts.solutionPerformance.mark("afterUpdateOutputTimestamps");
+        ts.solutionPerformance.measure("UpdateOutputTimestamps", "beforeUpdateOutputTimestamps", "afterUpdateOutputTimestamps");
         return priorNewestUpdateTime;
     }
     function updateOutputTimestamps(state, proj, resolvedPath) {
@@ -103740,6 +103885,13 @@ var ts;
         }
     }
     function build(state, project, cancellationToken, writeFile, getCustomTransformers, onlyReferences) {
+        ts.solutionPerformance.mark("beforeBuild");
+        var result = buildWorker(state, project, cancellationToken, writeFile, getCustomTransformers, onlyReferences);
+        ts.solutionPerformance.mark("afterBuild");
+        ts.solutionPerformance.measure("Build", "beforeBuild", "afterBuild");
+        return result;
+    }
+    function buildWorker(state, project, cancellationToken, writeFile, getCustomTransformers, onlyReferences) {
         var buildOrder = getBuildOrderFor(state, project, onlyReferences);
         if (!buildOrder)
             return ts.ExitStatus.InvalidProject_OutputsSkipped;
@@ -103751,7 +103903,10 @@ var ts;
             if (!invalidatedProject)
                 break;
             reportQueue = false;
+            ts.solutionPerformance.mark("beforeInvalidatedProjectBuild");
             invalidatedProject.done(cancellationToken, writeFile, getCustomTransformers === null || getCustomTransformers === void 0 ? void 0 : getCustomTransformers(invalidatedProject.project));
+            ts.solutionPerformance.mark("afterInvalidatedProjectBuild");
+            ts.solutionPerformance.measure("InvalidatedProjectBuild", "beforeInvalidatedProjectBuild", "afterInvalidatedProjectBuild");
             if (!state.diagnostics.has(invalidatedProject.projectPath))
                 successfulProjects++;
         }
@@ -103837,6 +103992,14 @@ var ts;
         state.timerToBuildInvalidatedProject = hostWithWatch.setTimeout(buildNextInvalidatedProject, time, state, changeDetected);
     }
     function buildNextInvalidatedProject(state, changeDetected) {
+        ts.solutionPerformance.mark("beforeBuild");
+        var buildOrder = buildNextInvalidatedProjectWorker(state, changeDetected);
+        ts.solutionPerformance.mark("afterBuild");
+        ts.solutionPerformance.measure("Build", "beforeBuild", "afterBuild");
+        if (buildOrder)
+            reportErrorSummary(state, buildOrder);
+    }
+    function buildNextInvalidatedProjectWorker(state, changeDetected) {
         state.timerToBuildInvalidatedProject = undefined;
         if (state.reportFileChangeDetected) {
             state.reportFileChangeDetected = false;
@@ -103847,7 +104010,10 @@ var ts;
         var buildOrder = getBuildOrder(state);
         var invalidatedProject = getNextInvalidatedProject(state, buildOrder, false);
         if (invalidatedProject) {
+            ts.solutionPerformance.mark("beforeInvalidatedProjectBuild");
             invalidatedProject.done();
+            ts.solutionPerformance.mark("afterInvalidatedProjectBuild");
+            ts.solutionPerformance.measure("InvalidatedProjectBuild", "beforeInvalidatedProjectBuild", "afterInvalidatedProjectBuild");
             projectsBuilt++;
             while (state.projectPendingBuild.size) {
                 if (state.timerToBuildInvalidatedProject)
@@ -103860,13 +104026,16 @@ var ts;
                     return;
                 }
                 var project = createInvalidatedProjectWithInfo(state, info, buildOrder);
+                ts.solutionPerformance.mark("beforeInvalidatedProjectBuild");
                 project.done();
+                ts.solutionPerformance.mark("afterInvalidatedProjectBuild");
+                ts.solutionPerformance.measure("InvalidatedProjectBuild", "beforeInvalidatedProjectBuild", "afterInvalidatedProjectBuild");
                 if (info.kind !== InvalidatedProjectKind.UpdateOutputFileStamps)
                     projectsBuilt++;
             }
         }
         disableCache(state);
-        reportErrorSummary(state, buildOrder);
+        return buildOrder;
     }
     function watchConfigFile(state, resolved, resolvedPath, parsed) {
         if (!state.watch || state.allWatchedConfigFiles.has(resolvedPath))
@@ -103923,6 +104092,7 @@ var ts;
     function startWatching(state, buildOrder) {
         if (!state.watchAllProjectsPending)
             return;
+        ts.solutionPerformance.mark("beforeStartWatching");
         state.watchAllProjectsPending = false;
         for (var _i = 0, _a = getBuildOrderFromAnyBuildOrder(buildOrder); _i < _a.length; _i++) {
             var resolved = _a[_i];
@@ -103936,6 +104106,8 @@ var ts;
                 watchPackageJsonFiles(state, resolved, resolvedPath, cfg);
             }
         }
+        ts.solutionPerformance.mark("afterStartWatching");
+        ts.solutionPerformance.measure("StartWatching", "beforeStartWatching", "afterStartWatching");
     }
     function stopWatching(state) {
         ts.clearMap(state.allWatchedConfigFiles, ts.closeFileWatcher);
@@ -104082,6 +104254,12 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
+    var StatisticType;
+    (function (StatisticType) {
+        StatisticType[StatisticType["time"] = 0] = "time";
+        StatisticType[StatisticType["count"] = 1] = "count";
+        StatisticType[StatisticType["memory"] = 2] = "memory";
+    })(StatisticType = ts.StatisticType || (ts.StatisticType = {}));
     function countLines(program) {
         var counts = getCountsMap();
         ts.forEach(program.getSourceFiles(), function (file) {
@@ -104642,18 +104820,73 @@ var ts;
             if (reportWatchModeWithoutSysSupport(sys, reportDiagnostic))
                 return;
             var buildHost_1 = ts.createSolutionBuilderWithWatchHost(sys, undefined, reportDiagnostic, ts.createBuilderStatusReporter(sys, shouldBePretty(sys, buildOptions)), createWatchStatusReporter(sys, buildOptions));
+            var onWatchStatusChange_1 = buildHost_1.onWatchStatusChange;
+            var reportWatchStatistics_1 = false;
+            buildHost_1.onWatchStatusChange = function (d, newLine, options, errorCount) {
+                onWatchStatusChange_1 === null || onWatchStatusChange_1 === void 0 ? void 0 : onWatchStatusChange_1(d, newLine, options, errorCount);
+                if (!reportWatchStatistics_1)
+                    return;
+                if (d.code === ts.Diagnostics.Found_0_errors_Watching_for_file_changes.code ||
+                    d.code === ts.Diagnostics.Found_1_error_Watching_for_file_changes.code) {
+                    reportSolutionBuilderTimes(sys, builder_1, buildHost_1);
+                }
+            };
             updateSolutionBuilderHost(sys, cb, buildHost_1);
+            enableSolutionPerformance(sys, buildOptions);
             var builder_1 = ts.createSolutionBuilderWithWatch(buildHost_1, projects, buildOptions, watchOptions);
             builder_1.build();
+            reportSolutionBuilderTimes(sys, builder_1, buildHost_1);
+            reportWatchStatistics_1 = true;
             return builder_1;
         }
         var buildHost = ts.createSolutionBuilderHost(sys, undefined, reportDiagnostic, ts.createBuilderStatusReporter(sys, shouldBePretty(sys, buildOptions)), createReportErrorSummary(sys, buildOptions));
         updateSolutionBuilderHost(sys, cb, buildHost);
+        enableSolutionPerformance(sys, buildOptions);
         var builder = ts.createSolutionBuilder(buildHost, projects, buildOptions);
         var exitStatus = buildOptions.clean ? builder.clean() : builder.build();
+        reportSolutionBuilderTimes(sys, builder, buildHost);
         ts.dumpTracingLegend();
         return sys.exit(exitStatus);
     }
+    function enableSolutionPerformance(system, options) {
+        if (system === ts.sys && (options.diagnostics || options.extendedDiagnostics))
+            ts.solutionPerformance.enable();
+    }
+    function reportSolutionBuilderTimes(system, builder, buildHost) {
+        if (system !== ts.sys)
+            return;
+        if (ts.solutionPerformance.isEnabled()) {
+            var solutionStatistics_1 = [];
+            ts.solutionPerformance.forEachMeasure(function (name, duration) { return solutionStatistics_1.push({ name: name + " time", value: duration, type: StatisticType.time }); });
+            solutionStatistics_1.push({ name: "projectsBuilt", value: ts.solutionPerformance.getCount("projectsBuilt"), type: StatisticType.count }, { name: "timestampUpdated", value: ts.solutionPerformance.getCount("timestampUpdated"), type: StatisticType.count }, { name: "bundlesUpdated", value: ts.solutionPerformance.getCount("bundlesUpdated"), type: StatisticType.count }, { name: "projects", value: ts.getBuildOrderFromAnyBuildOrder(builder.getBuildOrder()).length, type: StatisticType.count });
+            buildHost.statistics = ts.append(buildHost.statistics, solutionStatistics_1);
+            ts.solutionPerformance.disable();
+            ts.solutionPerformance.enable();
+        }
+        if (!buildHost.statistics)
+            return;
+        var statistics = [];
+        var map = new ts.Map();
+        for (var _i = 0, _a = buildHost.statistics; _i < _a.length; _i++) {
+            var statistic = _a[_i];
+            for (var _b = 0, statistic_1 = statistic; _b < statistic_1.length; _b++) {
+                var s = statistic_1[_b];
+                var existing = map.get(s.name);
+                if (existing) {
+                    if (existing.type === StatisticType.memory)
+                        existing.value = Math.max(existing.value, s.value);
+                    else
+                        existing.value += s.value;
+                }
+                else {
+                    map.set(s.name, s);
+                    statistics.push(s);
+                }
+            }
+        }
+        buildHost.statistics = undefined;
+        reportAllStatistics(system, statistics);
+    }
     function createReportErrorSummary(sys, options) {
         return shouldBePretty(sys, options) ?
             function (errorCount, filesInError) { return sys.write(ts.getErrorSummaryText(errorCount, filesInError, sys.newLine, sys)); } :
@@ -104702,10 +104935,13 @@ var ts;
     function updateSolutionBuilderHost(sys, cb, buildHost) {
         updateCreateProgram(sys, buildHost);
         buildHost.afterProgramEmitAndDiagnostics = function (program) {
-            reportStatistics(sys, program.getProgram());
+            buildHost.statistics = ts.append(buildHost.statistics, reportStatistics(sys, program.getProgram()));
             cb(program);
         };
-        buildHost.afterEmitBundle = cb;
+        buildHost.afterEmitBundle = function (config) {
+            buildHost.statistics = ts.append(buildHost.statistics, reportStatistics(sys, config));
+            cb(config);
+        };
     }
     function updateCreateProgram(sys, host) {
         var compileUsingBuilder = host.createProgram;
@@ -104769,8 +105005,13 @@ var ts;
             ts.startTracing(isBuildMode ? "build" : "project", compilerOptions.generateTrace, compilerOptions.configFilePath);
         }
     }
-    function reportStatistics(sys, program) {
-        var compilerOptions = program.getCompilerOptions();
+    function isProgram(programOrConfig) {
+        return !!programOrConfig.getCompilerOptions;
+    }
+    function reportStatistics(sys, programOrConfig) {
+        var program = isProgram(programOrConfig) ? programOrConfig : undefined;
+        var config = !isProgram(programOrConfig) ? programOrConfig : undefined;
+        var compilerOptions = (program === null || program === void 0 ? void 0 : program.getCompilerOptions()) || (config === null || config === void 0 ? void 0 : config.options);
         if (canTrace(sys, compilerOptions)) {
             ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.stopTracing();
         }
@@ -104778,29 +105019,31 @@ var ts;
         if (canReportDiagnostics(sys, compilerOptions)) {
             statistics = [];
             var memoryUsed = sys.getMemoryUsage ? sys.getMemoryUsage() : -1;
-            reportCountStatistic("Files", program.getSourceFiles().length);
-            var lineCounts = countLines(program);
-            var nodeCounts = countNodes(program);
-            if (compilerOptions.extendedDiagnostics) {
-                for (var _i = 0, _a = ts.arrayFrom(lineCounts.keys()); _i < _a.length; _i++) {
-                    var key = _a[_i];
-                    reportCountStatistic("Lines of " + key, lineCounts.get(key));
+            if (program) {
+                reportCountStatistic("Files", program.getSourceFiles().length);
+                var lineCounts = countLines(program);
+                var nodeCounts = countNodes(program);
+                if (compilerOptions.extendedDiagnostics) {
+                    for (var _i = 0, _a = ts.arrayFrom(lineCounts.keys()); _i < _a.length; _i++) {
+                        var key = _a[_i];
+                        reportCountStatistic("Lines of " + key, lineCounts.get(key));
+                    }
+                    for (var _b = 0, _c = ts.arrayFrom(nodeCounts.keys()); _b < _c.length; _b++) {
+                        var key = _c[_b];
+                        reportCountStatistic("Nodes of " + key, nodeCounts.get(key));
+                    }
                 }
-                for (var _b = 0, _c = ts.arrayFrom(nodeCounts.keys()); _b < _c.length; _b++) {
-                    var key = _c[_b];
-                    reportCountStatistic("Nodes of " + key, nodeCounts.get(key));
+                else {
+                    reportCountStatistic("Lines", ts.reduceLeftIterator(lineCounts.values(), function (sum, count) { return sum + count; }, 0));
+                    reportCountStatistic("Nodes", ts.reduceLeftIterator(nodeCounts.values(), function (sum, count) { return sum + count; }, 0));
                 }
+                reportCountStatistic("Identifiers", program.getIdentifierCount());
+                reportCountStatistic("Symbols", program.getSymbolCount());
+                reportCountStatistic("Types", program.getTypeCount());
+                reportCountStatistic("Instantiations", program.getInstantiationCount());
             }
-            else {
-                reportCountStatistic("Lines", ts.reduceLeftIterator(lineCounts.values(), function (sum, count) { return sum + count; }, 0));
-                reportCountStatistic("Nodes", ts.reduceLeftIterator(nodeCounts.values(), function (sum, count) { return sum + count; }, 0));
-            }
-            reportCountStatistic("Identifiers", program.getIdentifierCount());
-            reportCountStatistic("Symbols", program.getSymbolCount());
-            reportCountStatistic("Types", program.getTypeCount());
-            reportCountStatistic("Instantiations", program.getInstantiationCount());
             if (memoryUsed >= 0) {
-                reportStatisticalValue("Memory used", Math.round(memoryUsed / 1000) + "K");
+                reportMemoryStatistic("Memory used", memoryUsed);
             }
             var isPerformanceEnabled = ts.performance.isEnabled();
             var programTime = isPerformanceEnabled ? ts.performance.getDuration("Program") : 0;
@@ -104808,11 +105051,13 @@ var ts;
             var checkTime = isPerformanceEnabled ? ts.performance.getDuration("Check") : 0;
             var emitTime = isPerformanceEnabled ? ts.performance.getDuration("Emit") : 0;
             if (compilerOptions.extendedDiagnostics) {
-                var caches = program.getRelationCacheSizes();
-                reportCountStatistic("Assignability cache size", caches.assignable);
-                reportCountStatistic("Identity cache size", caches.identity);
-                reportCountStatistic("Subtype cache size", caches.subtype);
-                reportCountStatistic("Strict subtype cache size", caches.strictSubtype);
+                if (program) {
+                    var caches = program.getRelationCacheSizes();
+                    reportCountStatistic("Assignability cache size", caches.assignable);
+                    reportCountStatistic("Identity cache size", caches.identity);
+                    reportCountStatistic("Subtype cache size", caches.subtype);
+                    reportCountStatistic("Strict subtype cache size", caches.strictSubtype);
+                }
                 if (isPerformanceEnabled) {
                     ts.performance.forEachMeasure(function (name, duration) { return reportTimeStatistic(name + " time", duration); });
                 }
@@ -104828,39 +105073,54 @@ var ts;
             if (isPerformanceEnabled) {
                 reportTimeStatistic("Total time", programTime + bindTime + checkTime + emitTime);
             }
-            reportStatistics();
+            reportAllStatistics(sys, statistics);
             if (!isPerformanceEnabled) {
                 sys.write(ts.Diagnostics.Performance_timings_for_diagnostics_or_extendedDiagnostics_are_not_available_in_this_session_A_native_implementation_of_the_Web_Performance_API_could_not_be_found.message + "\n");
             }
             else {
                 ts.performance.disable();
             }
+            return statistics;
         }
-        function reportStatistics() {
-            var nameSize = 0;
-            var valueSize = 0;
-            for (var _i = 0, statistics_1 = statistics; _i < statistics_1.length; _i++) {
-                var _a = statistics_1[_i], name = _a.name, value = _a.value;
-                if (name.length > nameSize) {
-                    nameSize = name.length;
-                }
-                if (value.length > valueSize) {
-                    valueSize = value.length;
-                }
-            }
-            for (var _b = 0, statistics_2 = statistics; _b < statistics_2.length; _b++) {
-                var _c = statistics_2[_b], name = _c.name, value = _c.value;
-                sys.write(ts.padRight(name + ":", nameSize + 2) + ts.padLeft(value.toString(), valueSize) + sys.newLine);
-            }
-        }
-        function reportStatisticalValue(name, value) {
-            statistics.push({ name: name, value: value });
+        function reportMemoryStatistic(name, memoryUsed) {
+            statistics.push({ name: name, value: memoryUsed, type: StatisticType.memory });
         }
         function reportCountStatistic(name, count) {
-            reportStatisticalValue(name, "" + count);
+            statistics.push({ name: name, value: count, type: StatisticType.count });
         }
         function reportTimeStatistic(name, time) {
-            reportStatisticalValue(name, (time / 1000).toFixed(2) + "s");
+            statistics.push({ name: name, value: time, type: StatisticType.time });
+        }
+    }
+    function reportAllStatistics(sys, statistics) {
+        var nameSize = 0;
+        var valueSize = 0;
+        for (var _i = 0, statistics_1 = statistics; _i < statistics_1.length; _i++) {
+            var s = statistics_1[_i];
+            if (s.name.length > nameSize) {
+                nameSize = s.name.length;
+            }
+            var valueString = statisticValue(s);
+            if (valueString.length > valueSize) {
+                valueSize = valueString.length;
+            }
+        }
+        for (var _a = 0, statistics_2 = statistics; _a < statistics_2.length; _a++) {
+            var s = statistics_2[_a];
+            sys.write(ts.padRight(s.name + ":", nameSize + 2) + ts.padLeft(statisticValue(s).toString(), valueSize) + sys.newLine);
+        }
+    }
+    function statisticValue(s) {
+        switch (s.type) {
+            case StatisticType.count:
+                return "" + s.value;
+            case StatisticType.time:
+                return (s.value / 1000).toFixed(2) + "s";
+            case StatisticType.memory:
+                return Math.round(s.value / 1000) + "K";
+                break;
+            default:
+                ts.Debug.assertNever(s.type);
         }
     }
     function writeConfigFile(sys, reportDiagnostic, options, fileNames) {