typescript 4.9.1-beta → 5.0.0-dev.20221101

package/lib/tsc.js

@@ -68,8 +68,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 var ts;
 (function (ts) {
-    ts.versionMajorMinor = "4.9";
-    ts.version = "".concat(ts.versionMajorMinor, ".1-beta");
+    ts.versionMajorMinor = "5.0";
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20221101");
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -1606,8 +1606,8 @@ var ts;
         return compareValues(a === null || a === void 0 ? void 0 : a.start, b === null || b === void 0 ? void 0 : b.start) || compareValues(a === null || a === void 0 ? void 0 : a.length, b === null || b === void 0 ? void 0 : b.length);
     }
     ts.compareTextSpans = compareTextSpans;
-    function min(a, b, compare) {
-        return compare(a, b) === -1 ? a : b;
+    function min(items, compare) {
+        return reduceLeft(items, function (x, y) { return compare(x, y) === -1 ? x : y; });
     }
     ts.min = min;
     function compareStringsCaseInsensitive(a, b) {
@@ -2744,7 +2744,9 @@ var ts;
 (function (ts) {
     var versionRegExp = /^(0|[1-9]\d*)(?:\.(0|[1-9]\d*)(?:\.(0|[1-9]\d*)(?:\-([a-z0-9-.]+))?(?:\+([a-z0-9-.]+))?)?)?$/i;
     var prereleaseRegExp = /^(?:0|[1-9]\d*|[a-z-][a-z0-9-]*)(?:\.(?:0|[1-9]\d*|[a-z-][a-z0-9-]*))*$/i;
+    var prereleasePartRegExp = /^(?:0|[1-9]\d*|[a-z-][a-z0-9-]*)$/i;
     var buildRegExp = /^[a-z0-9-]+(?:\.[a-z0-9-]+)*$/i;
+    var buildPartRegExp = /^[a-z0-9-]+$/i;
     var numericIdentifierRegExp = /^(0|[1-9]\d*)$/;
     var Version = (function () {
         function Version(major, minor, patch, prerelease, build) {
@@ -2759,13 +2761,15 @@ var ts;
             ts.Debug.assert(major >= 0, "Invalid argument: major");
             ts.Debug.assert(minor >= 0, "Invalid argument: minor");
             ts.Debug.assert(patch >= 0, "Invalid argument: patch");
-            ts.Debug.assert(!prerelease || prereleaseRegExp.test(prerelease), "Invalid argument: prerelease");
-            ts.Debug.assert(!build || buildRegExp.test(build), "Invalid argument: build");
+            var prereleaseArray = prerelease ? ts.isArray(prerelease) ? prerelease : prerelease.split(".") : ts.emptyArray;
+            var buildArray = build ? ts.isArray(build) ? build : build.split(".") : ts.emptyArray;
+            ts.Debug.assert(ts.every(prereleaseArray, function (s) { return prereleasePartRegExp.test(s); }), "Invalid argument: prerelease");
+            ts.Debug.assert(ts.every(buildArray, function (s) { return buildPartRegExp.test(s); }), "Invalid argument: build");
             this.major = major;
             this.minor = minor;
             this.patch = patch;
-            this.prerelease = prerelease ? prerelease.split(".") : ts.emptyArray;
-            this.build = build ? build.split(".") : ts.emptyArray;
+            this.prerelease = prereleaseArray;
+            this.build = buildArray;
         }
         Version.tryParse = function (text) {
             var result = tryParseComponents(text);
@@ -2792,6 +2796,10 @@ var ts;
                 default: return ts.Debug.assertNever(field);
             }
         };
+        Version.prototype.with = function (fields) {
+            var _a = fields.major, major = _a === void 0 ? this.major : _a, _b = fields.minor, minor = _b === void 0 ? this.minor : _b, _c = fields.patch, patch = _c === void 0 ? this.patch : _c, _d = fields.prerelease, prerelease = _d === void 0 ? this.prerelease : _d, _e = fields.build, build = _e === void 0 ? this.build : _e;
+            return new Version(major, minor, patch, prerelease, build);
+        };
         Version.prototype.toString = function () {
             var result = "".concat(this.major, ".").concat(this.minor, ".").concat(this.patch);
             if (ts.some(this.prerelease))
@@ -2800,7 +2808,7 @@ var ts;
                 result += "+".concat(this.build.join("."));
             return result;
         };
-        Version.zero = new Version(0, 0, 0);
+        Version.zero = new Version(0, 0, 0, ["0"]);
         return Version;
     }());
     ts.Version = Version;
@@ -2950,19 +2958,20 @@ var ts;
                     break;
                 case "<":
                 case ">=":
-                    comparators.push(createComparator(operator, version));
+                    comparators.push(isWildcard(minor) || isWildcard(patch) ? createComparator(operator, version.with({ prerelease: "0" })) :
+                        createComparator(operator, version));
                     break;
                 case "<=":
                 case ">":
-                    comparators.push(isWildcard(minor) ? createComparator(operator === "<=" ? "<" : ">=", version.increment("major")) :
-                        isWildcard(patch) ? createComparator(operator === "<=" ? "<" : ">=", version.increment("minor")) :
+                    comparators.push(isWildcard(minor) ? createComparator(operator === "<=" ? "<" : ">=", version.increment("major").with({ prerelease: "0" })) :
+                        isWildcard(patch) ? createComparator(operator === "<=" ? "<" : ">=", version.increment("minor").with({ prerelease: "0" })) :
                             createComparator(operator, version));
                     break;
                 case "=":
                 case undefined:
                     if (isWildcard(minor) || isWildcard(patch)) {
-                        comparators.push(createComparator(">=", version));
-                        comparators.push(createComparator("<", version.increment(isWildcard(minor) ? "major" : "minor")));
+                        comparators.push(createComparator(">=", version.with({ prerelease: "0" })));
+                        comparators.push(createComparator("<", version.increment(isWildcard(minor) ? "major" : "minor").with({ prerelease: "0" })));
                     }
                     else {
                         comparators.push(createComparator("=", version));
@@ -4213,7 +4222,7 @@ var ts;
         };
     }
     function createSystemWatchFunctions(_a) {
-        var pollingWatchFileWorker = _a.pollingWatchFileWorker, 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 pollingWatchFileWorker = _a.pollingWatchFileWorker, 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, inodeWatching = _a.inodeWatching, sysLog = _a.sysLog;
         var pollingWatches = new ts.Map();
         var fsWatches = new ts.Map();
         var fsWatchesRecursive = new ts.Map();
@@ -4272,7 +4281,7 @@ var ts;
                 default:
                     return useNonPollingWatchers ?
                         generateWatchFileOptions(ts.WatchFileKind.UseFsEventsOnParentDirectory, ts.PollingWatchKind.PriorityInterval, options) :
-                        { watchFile: (defaultWatchFileKind === null || defaultWatchFileKind === void 0 ? void 0 : defaultWatchFileKind()) || ts.WatchFileKind.UseFsEvents };
+                        { watchFile: ts.WatchFileKind.UseFsEvents };
             }
         }
         function generateWatchFileOptions(watchFile, fallbackPolling, options) {
@@ -4495,7 +4504,6 @@ var ts;
                 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 = _b.watchFile, watchDirectory = _b.watchDirectory;
@@ -6741,6 +6749,10 @@ var ts;
         Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitted: diag(6399, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitte_6399", "Project '{0}' is out of date because buildinfo file '{1}' indicates that some of the changes were not emitted"),
         Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_files: diag(6400, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_fil_6400", "Project '{0}' is up to date but needs to update timestamps of output files that are older than input files"),
         Project_0_is_out_of_date_because_there_was_error_reading_file_1: diag(6401, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_there_was_error_reading_file_1_6401", "Project '{0}' is out of date because there was error reading file '{1}'"),
+        Resolving_in_0_mode_with_conditions_1: diag(6402, ts.DiagnosticCategory.Message, "Resolving_in_0_mode_with_conditions_1_6402", "Resolving in {0} mode with conditions {1}."),
+        Matched_0_condition_1: diag(6403, ts.DiagnosticCategory.Message, "Matched_0_condition_1_6403", "Matched '{0}' condition '{1}'."),
+        Using_0_subpath_1_with_target_2: diag(6404, ts.DiagnosticCategory.Message, "Using_0_subpath_1_with_target_2_6404", "Using '{0}' subpath '{1}' with target '{2}'."),
+        Saw_non_matching_condition_0: diag(6405, ts.DiagnosticCategory.Message, "Saw_non_matching_condition_0_6405", "Saw non-matching condition '{0}'."),
         The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"),
         The_expected_type_comes_from_this_index_signature: diag(6501, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."),
         The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."),
@@ -7057,6 +7069,8 @@ var ts;
         Remove_type_from_import_of_0_from_1: diag(90056, ts.DiagnosticCategory.Message, "Remove_type_from_import_of_0_from_1_90056", "Remove 'type' from import of '{0}' from \"{1}\""),
         Add_import_from_0: diag(90057, ts.DiagnosticCategory.Message, "Add_import_from_0_90057", "Add import from \"{0}\""),
         Update_import_from_0: diag(90058, ts.DiagnosticCategory.Message, "Update_import_from_0_90058", "Update import from \"{0}\""),
+        Export_0_from_module_1: diag(90059, ts.DiagnosticCategory.Message, "Export_0_from_module_1_90059", "Export '{0}' from module '{1}'"),
+        Export_all_referenced_locals: diag(90060, ts.DiagnosticCategory.Message, "Export_all_referenced_locals_90060", "Export all referenced locals"),
         Convert_function_to_an_ES2015_class: diag(95001, ts.DiagnosticCategory.Message, "Convert_function_to_an_ES2015_class_95001", "Convert function to an ES2015 class"),
         Convert_0_to_1_in_0: diag(95003, ts.DiagnosticCategory.Message, "Convert_0_to_1_in_0_95003", "Convert '{0}' to '{1} in {0}'"),
         Extract_to_0_in_1: diag(95004, ts.DiagnosticCategory.Message, "Extract_to_0_in_1_95004", "Extract to {0} in {1}"),
@@ -8341,7 +8355,7 @@ var ts;
             return -1;
         }
         function peekExtendedUnicodeEscape() {
-            if (languageVersion >= 2 && codePointAt(text, pos + 1) === 117 && codePointAt(text, pos + 2) === 123) {
+            if (codePointAt(text, pos + 1) === 117 && codePointAt(text, pos + 2) === 123) {
                 var start_2 = pos;
                 pos += 3;
                 var escapedValueString = scanMinimumNumberOfHexDigits(1, false);
@@ -17276,6 +17290,32 @@ var ts;
         return parameter.kind === 343 ? (_a = parameter.typeExpression) === null || _a === void 0 ? void 0 : _a.type : parameter.type;
     }
     ts.getParameterTypeNode = getParameterTypeNode;
+    function isTypeDeclaration(node) {
+        switch (node.kind) {
+            case 165:
+            case 260:
+            case 261:
+            case 262:
+            case 263:
+            case 348:
+            case 341:
+            case 342:
+                return true;
+            case 270:
+                return node.isTypeOnly;
+            case 273:
+            case 278:
+                return node.parent.parent.isTypeOnly;
+            default:
+                return false;
+        }
+    }
+    ts.isTypeDeclaration = isTypeDeclaration;
+    function canHaveExportModifier(node) {
+        return ts.isEnumDeclaration(node) || ts.isVariableStatement(node) || ts.isFunctionDeclaration(node) || ts.isClassDeclaration(node)
+            || ts.isInterfaceDeclaration(node) || isTypeDeclaration(node) || (ts.isModuleDeclaration(node) && !isExternalModuleAugmentation(node) && !isGlobalScopeAugmentation(node));
+    }
+    ts.canHaveExportModifier = canHaveExportModifier;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -18476,7 +18516,7 @@ var ts;
             nextAutoGenerateId++;
             return node;
         }
-        function createIdentifier(text, typeArguments, originalKeywordKind) {
+        function createIdentifier(text, typeArguments, originalKeywordKind, hasExtendedUnicodeEscape) {
             var node = createBaseIdentifier(text, originalKeywordKind);
             if (typeArguments) {
                 node.typeArguments = createNodeArray(typeArguments);
@@ -18484,6 +18524,10 @@ var ts;
             if (node.originalKeywordKind === 133) {
                 node.transformFlags |= 67108864;
             }
+            if (hasExtendedUnicodeEscape) {
+                node.hasExtendedUnicodeEscape = hasExtendedUnicodeEscape;
+                node.transformFlags |= 1024;
+            }
             return node;
         }
         function updateIdentifier(node, typeArguments) {
@@ -23160,7 +23204,7 @@ var ts;
         importName: "__generator",
         scoped: false,
         priority: 6,
-        text: "\n            var __generator = (this && this.__generator) || function (thisArg, body) {\n                var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;\n                return g = { next: verb(0), \"throw\": verb(1), \"return\": verb(2) }, typeof Symbol === \"function\" && (g[Symbol.iterator] = function() { return this; }), g;\n                function verb(n) { return function (v) { return step([n, v]); }; }\n                function step(op) {\n                    if (f) throw new TypeError(\"Generator is already executing.\");\n                    while (_) try {\n                        if (f = 1, y && (t = op[0] & 2 ? y[\"return\"] : op[0] ? y[\"throw\"] || ((t = y[\"return\"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;\n                        if (y = 0, t) op = [op[0] & 2, t.value];\n                        switch (op[0]) {\n                            case 0: case 1: t = op; break;\n                            case 4: _.label++; return { value: op[1], done: false };\n                            case 5: _.label++; y = op[1]; op = [0]; continue;\n                            case 7: op = _.ops.pop(); _.trys.pop(); continue;\n                            default:\n                                if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }\n                                if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }\n                                if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }\n                                if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }\n                                if (t[2]) _.ops.pop();\n                                _.trys.pop(); continue;\n                        }\n                        op = body.call(thisArg, _);\n                    } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }\n                    if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };\n                }\n            };"
+        text: "\n            var __generator = (this && this.__generator) || function (thisArg, body) {\n                var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;\n                return g = { next: verb(0), \"throw\": verb(1), \"return\": verb(2) }, typeof Symbol === \"function\" && (g[Symbol.iterator] = function() { return this; }), g;\n                function verb(n) { return function (v) { return step([n, v]); }; }\n                function step(op) {\n                    if (f) throw new TypeError(\"Generator is already executing.\");\n                    while (g && (g = 0, op[0] && (_ = 0)), _) try {\n                        if (f = 1, y && (t = op[0] & 2 ? y[\"return\"] : op[0] ? y[\"throw\"] || ((t = y[\"return\"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;\n                        if (y = 0, t) op = [op[0] & 2, t.value];\n                        switch (op[0]) {\n                            case 0: case 1: t = op; break;\n                            case 4: _.label++; return { value: op[1], done: false };\n                            case 5: _.label++; y = op[1]; op = [0]; continue;\n                            case 7: op = _.ops.pop(); _.trys.pop(); continue;\n                            default:\n                                if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }\n                                if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }\n                                if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }\n                                if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }\n                                if (t[2]) _.ops.pop();\n                                _.trys.pop(); continue;\n                        }\n                        op = body.call(thisArg, _);\n                    } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }\n                    if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };\n                }\n            };"
     };
     ts.createBindingHelper = {
         name: "typescript:commonjscreatebinding",
@@ -26751,8 +26795,9 @@ var ts;
                 var pos = getNodePos();
                 var originalKeywordKind = token();
                 var text = internIdentifier(scanner.getTokenValue());
+                var hasExtendedUnicodeEscape = scanner.hasExtendedUnicodeEscape();
                 nextTokenWithoutCheck();
-                return finishNode(factory.createIdentifier(text, undefined, originalKeywordKind), pos);
+                return finishNode(factory.createIdentifier(text, undefined, originalKeywordKind, hasExtendedUnicodeEscape), pos);
             }
             if (token() === 80) {
                 parseErrorAtCurrentToken(privateIdentifierDiagnosticMessage || ts.Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies);
@@ -32724,9 +32769,6 @@ var ts;
             name: "listFilesOnly",
             type: "boolean",
             category: ts.Diagnostics.Command_line_Options,
-            affectsSemanticDiagnostics: true,
-            affectsEmit: true,
-            affectsMultiFileEmitBuildInfo: true,
             isCommandLineOnly: true,
             description: ts.Diagnostics.Print_names_of_files_that_are_part_of_the_compilation_and_then_stop_processing,
             defaultValueDescription: false,
@@ -34350,6 +34392,7 @@ var ts;
             return (__assign(__assign({}, prev), (_a = {}, _a[cur[0]] = cur[1], _a)));
         }, {}));
     }
+    ts.optionMapToObject = optionMapToObject;
     function filterSameAsDefaultInclude(specs) {
         if (!ts.length(specs))
             return undefined;
@@ -34398,6 +34441,7 @@ var ts;
     function serializeCompilerOptions(options, pathOptions) {
         return serializeOptionBaseObject(options, getOptionsNameMap(), pathOptions);
     }
+    ts.serializeCompilerOptions = serializeCompilerOptions;
     function serializeWatchOptions(options) {
         return serializeOptionBaseObject(options, getWatchOptionsNameMap());
     }
@@ -34480,12 +34524,22 @@ var ts;
             return !isCommandLineOnly && category !== undefined && (!categoriesToSkip.includes(category) || compilerOptionsMap.has(name));
         }
         function writeConfigurations() {
-            var categorizedOptions = ts.createMultiMap();
+            var categorizedOptions = new ts.Map();
+            categorizedOptions.set(ts.Diagnostics.Projects, []);
+            categorizedOptions.set(ts.Diagnostics.Language_and_Environment, []);
+            categorizedOptions.set(ts.Diagnostics.Modules, []);
+            categorizedOptions.set(ts.Diagnostics.JavaScript_Support, []);
+            categorizedOptions.set(ts.Diagnostics.Emit, []);
+            categorizedOptions.set(ts.Diagnostics.Interop_Constraints, []);
+            categorizedOptions.set(ts.Diagnostics.Type_Checking, []);
+            categorizedOptions.set(ts.Diagnostics.Completeness, []);
             for (var _i = 0, optionDeclarations_1 = ts.optionDeclarations; _i < optionDeclarations_1.length; _i++) {
                 var option = optionDeclarations_1[_i];
-                var category = option.category;
                 if (isAllowedOptionForOutput(option)) {
-                    categorizedOptions.add(ts.getLocaleSpecificMessage(category), option);
+                    var listForCategory = categorizedOptions.get(option.category);
+                    if (!listForCategory)
+                        categorizedOptions.set(option.category, listForCategory = []);
+                    listForCategory.push(option);
                 }
             }
             var marginLength = 0;
@@ -34495,7 +34549,7 @@ var ts;
                 if (entries.length !== 0) {
                     entries.push({ value: "" });
                 }
-                entries.push({ value: "/* ".concat(category, " */") });
+                entries.push({ value: "/* ".concat(ts.getLocaleSpecificMessage(category), " */") });
                 for (var _i = 0, options_1 = options; _i < options_1.length; _i++) {
                     var option = options_1[_i];
                     var optionName = void 0;
@@ -36224,6 +36278,9 @@ var ts;
             requestContainingDirectory: containingDirectory,
             reportDiagnostic: function (diag) { return void diagnostics.push(diag); },
         };
+        if (traceEnabled && ts.getEmitModuleResolutionKind(compilerOptions) >= ts.ModuleResolutionKind.Node16 && ts.getEmitModuleResolutionKind(compilerOptions) <= ts.ModuleResolutionKind.NodeNext) {
+            trace(host, ts.Diagnostics.Resolving_in_0_mode_with_conditions_1, features & NodeResolutionFeatures.EsmMode ? "ESM" : "CJS", conditions.map(function (c) { return "'".concat(c, "'"); }).join(", "));
+        }
         var result = ts.forEach(extensions, function (ext) { return tryResolve(ext); });
         return createResolvedModuleWithFailedLookupLocations((_a = result === null || result === void 0 ? void 0 : result.value) === null || _a === void 0 ? void 0 : _a.resolved, (_b = result === null || result === void 0 ? void 0 : result.value) === null || _b === void 0 ? void 0 : _b.isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, state.resultFromCache);
         function tryResolve(extensions) {
@@ -36753,7 +36810,7 @@ var ts;
             }
             if (mainExport) {
                 var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, subpath, scope, false);
-                return loadModuleFromTargetImportOrExport(mainExport, "", false);
+                return loadModuleFromTargetImportOrExport(mainExport, "", false, ".");
             }
         }
         else if (allKeysStartWithDot(scope.contents.packageJsonContent.exports)) {
@@ -36828,7 +36885,7 @@ var ts;
         var loadModuleFromTargetImportOrExport = getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports);
         if (!ts.endsWith(moduleName, ts.directorySeparator) && moduleName.indexOf("*") === -1 && ts.hasProperty(lookupTable, moduleName)) {
             var target = lookupTable[moduleName];
-            return loadModuleFromTargetImportOrExport(target, "", false);
+            return loadModuleFromTargetImportOrExport(target, "", false, moduleName);
         }
         var expandingKeys = ts.sort(ts.filter(ts.getOwnKeys(lookupTable), function (k) { return k.indexOf("*") !== -1 || ts.endsWith(k, "/"); }), comparePatternKeys);
         for (var _i = 0, expandingKeys_1 = expandingKeys; _i < expandingKeys_1.length; _i++) {
@@ -36837,17 +36894,17 @@ var ts;
                 var target = lookupTable[potentialTarget];
                 var starPos = potentialTarget.indexOf("*");
                 var subpath = moduleName.substring(potentialTarget.substring(0, starPos).length, moduleName.length - (potentialTarget.length - 1 - starPos));
-                return loadModuleFromTargetImportOrExport(target, subpath, true);
+                return loadModuleFromTargetImportOrExport(target, subpath, true, potentialTarget);
             }
             else if (ts.endsWith(potentialTarget, "*") && ts.startsWith(moduleName, potentialTarget.substring(0, potentialTarget.length - 1))) {
                 var target = lookupTable[potentialTarget];
                 var subpath = moduleName.substring(potentialTarget.length - 1);
-                return loadModuleFromTargetImportOrExport(target, subpath, true);
+                return loadModuleFromTargetImportOrExport(target, subpath, true, potentialTarget);
             }
             else if (ts.startsWith(moduleName, potentialTarget)) {
                 var target = lookupTable[potentialTarget];
                 var subpath = moduleName.substring(potentialTarget.length);
-                return loadModuleFromTargetImportOrExport(target, subpath, false);
+                return loadModuleFromTargetImportOrExport(target, subpath, false, potentialTarget);
             }
         }
         function matchesPatternWithTrailer(target, name) {
@@ -36861,7 +36918,7 @@ var ts;
     }
     function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirectedReference, moduleName, scope, isImports) {
         return loadModuleFromTargetImportOrExport;
-        function loadModuleFromTargetImportOrExport(target, subpath, pattern) {
+        function loadModuleFromTargetImportOrExport(target, subpath, pattern, key) {
             if (typeof target === "string") {
                 if (!pattern && subpath.length > 0 && !ts.endsWith(target, "/")) {
                     if (state.traceEnabled) {
@@ -36872,6 +36929,8 @@ var ts;
                 if (!ts.startsWith(target, "./")) {
                     if (isImports && !ts.startsWith(target, "../") && !ts.startsWith(target, "/") && !ts.isRootedDiskPath(target)) {
                         var combinedLookup = pattern ? target.replace(/\*/g, subpath) : target + subpath;
+                        traceIfEnabled(state, ts.Diagnostics.Using_0_subpath_1_with_target_2, "imports", key, combinedLookup);
+                        traceIfEnabled(state, ts.Diagnostics.Resolving_module_0_from_1, combinedLookup, scope.packageDirectory + "/");
                         var result = nodeModuleNameResolverWorker(state.features, combinedLookup, scope.packageDirectory + "/", state.compilerOptions, state.host, cache, [extensions], redirectedReference);
                         return toSearchResult(result.resolvedModule ? { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension, packageId: result.resolvedModule.packageId, originalPath: result.resolvedModule.originalPath } : undefined);
                     }
@@ -36896,6 +36955,9 @@ var ts;
                     }
                     return toSearchResult(undefined);
                 }
+                if (state.traceEnabled) {
+                    trace(state.host, ts.Diagnostics.Using_0_subpath_1_with_target_2, isImports ? "imports" : "exports", key, pattern ? target.replace(/\*/g, subpath) : target + subpath);
+                }
                 var finalPath = toAbsolutePath(pattern ? resolvedTarget.replace(/\*/g, subpath) : resolvedTarget + subpath);
                 var inputLink = tryLoadInputFileForPath(finalPath, subpath, ts.combinePaths(scope.packageDirectory, "package.json"), isImports);
                 if (inputLink)
@@ -36905,14 +36967,18 @@ var ts;
             else if (typeof target === "object" && target !== null) {
                 if (!Array.isArray(target)) {
                     for (var _i = 0, _a = ts.getOwnKeys(target); _i < _a.length; _i++) {
-                        var key = _a[_i];
-                        if (key === "default" || state.conditions.indexOf(key) >= 0 || isApplicableVersionedTypesKey(state.conditions, key)) {
-                            var subTarget = target[key];
-                            var result = loadModuleFromTargetImportOrExport(subTarget, subpath, pattern);
+                        var condition = _a[_i];
+                        if (condition === "default" || state.conditions.indexOf(condition) >= 0 || isApplicableVersionedTypesKey(state.conditions, condition)) {
+                            traceIfEnabled(state, ts.Diagnostics.Matched_0_condition_1, isImports ? "imports" : "exports", condition);
+                            var subTarget = target[condition];
+                            var result = loadModuleFromTargetImportOrExport(subTarget, subpath, pattern, key);
                             if (result) {
                                 return result;
                             }
                         }
+                        else {
+                            traceIfEnabled(state, ts.Diagnostics.Saw_non_matching_condition_0, condition);
+                        }
                     }
                     return undefined;
                 }
@@ -36925,7 +36991,7 @@ var ts;
                     }
                     for (var _b = 0, target_2 = target; _b < target_2.length; _b++) {
                         var elem = target_2[_b];
-                        var result = loadModuleFromTargetImportOrExport(elem, subpath, pattern);
+                        var result = loadModuleFromTargetImportOrExport(elem, subpath, pattern, key);
                         if (result) {
                             return result;
                         }
@@ -37276,6 +37342,15 @@ var ts;
     function toSearchResult(value) {
         return value !== undefined ? { value: value } : undefined;
     }
+    function traceIfEnabled(state, diagnostic) {
+        var args = [];
+        for (var _i = 2; _i < arguments.length; _i++) {
+            args[_i - 2] = arguments[_i];
+        }
+        if (state.traceEnabled) {
+            trace.apply(void 0, __spreadArray([state.host, diagnostic], args, false));
+        }
+    }
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -40580,6 +40655,12 @@ var ts;
             getOptionalType: function () { return optionalType; },
             getPromiseType: function () { return getGlobalPromiseType(false); },
             getPromiseLikeType: function () { return getGlobalPromiseLikeType(false); },
+            getAsyncIterableType: function () {
+                var type = getGlobalAsyncIterableType(false);
+                if (type === emptyGenericType)
+                    return undefined;
+                return type;
+            },
             isSymbolAccessible: isSymbolAccessible,
             isArrayType: isArrayType,
             isTupleType: isTupleType,
@@ -41366,8 +41447,8 @@ var ts;
                         return symbol;
                     }
                     if (symbol.flags & 2097152) {
-                        var target = resolveAlias(symbol);
-                        if (target === unknownSymbol || target.flags & meaning) {
+                        var targetFlags = getAllSymbolFlags(symbol);
+                        if (targetFlags & meaning) {
                             return symbol;
                         }
                     }
@@ -41857,8 +41938,8 @@ var ts;
                                 !checkAndReportErrorForExtendingInterface(errorLocation) &&
                                 !checkAndReportErrorForUsingTypeAsNamespace(errorLocation, name, meaning) &&
                                 !checkAndReportErrorForExportingPrimitiveType(errorLocation, name) &&
+                                !checkAndReportErrorForUsingNamespaceAsTypeOrValue(errorLocation, name, meaning) &&
                                 !checkAndReportErrorForUsingTypeAsValue(errorLocation, name, meaning) &&
-                                !checkAndReportErrorForUsingNamespaceModuleAsValue(errorLocation, name, meaning) &&
                                 !checkAndReportErrorForUsingValueAsType(errorLocation, name, meaning)) {
                             var suggestion = void 0;
                             var suggestedLib = void 0;
@@ -41926,7 +42007,7 @@ var ts;
                         }
                     }
                     if (result && errorLocation && meaning & 111551 && result.flags & 2097152 && !(result.flags & 111551) && !ts.isValidTypeOnlyAliasUseSite(errorLocation)) {
-                        var typeOnlyDeclaration = getTypeOnlyAliasDeclaration(result);
+                        var typeOnlyDeclaration = getTypeOnlyAliasDeclaration(result, 111551);
                         if (typeOnlyDeclaration) {
                             var message = typeOnlyDeclaration.kind === 278
                                 ? ts.Diagnostics._0_cannot_be_used_as_a_value_because_it_was_exported_using_export_type
@@ -42079,7 +42160,7 @@ var ts;
             return false;
         }
         function checkAndReportErrorForUsingTypeAsValue(errorLocation, name, meaning) {
-            if (meaning & (111551 & ~1024)) {
+            if (meaning & 111551) {
                 if (isPrimitiveTypeName(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));
@@ -42090,7 +42171,8 @@ var ts;
                     return true;
                 }
                 var symbol = resolveSymbol(resolveName(errorLocation, name, 788968 & ~111551, undefined, undefined, false));
-                if (symbol && !(symbol.flags & 1024)) {
+                var allFlags = symbol && getAllSymbolFlags(symbol);
+                if (symbol && allFlags !== undefined && !(allFlags & 111551)) {
                     var rawName = ts.unescapeLeadingUnderscores(name);
                     if (isES2015OrLaterConstructorName(name)) {
                         error(errorLocation, ts.Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_es2015_or_later, rawName);
@@ -42138,16 +42220,16 @@ var ts;
             }
             return false;
         }
-        function checkAndReportErrorForUsingNamespaceModuleAsValue(errorLocation, name, meaning) {
-            if (meaning & (111551 & ~1024 & ~788968)) {
-                var symbol = resolveSymbol(resolveName(errorLocation, name, 1024 & ~111551, undefined, undefined, false));
+        function checkAndReportErrorForUsingNamespaceAsTypeOrValue(errorLocation, name, meaning) {
+            if (meaning & (111551 & ~788968)) {
+                var symbol = resolveSymbol(resolveName(errorLocation, name, 1024, undefined, undefined, false));
                 if (symbol) {
                     error(errorLocation, ts.Diagnostics.Cannot_use_namespace_0_as_a_value, ts.unescapeLeadingUnderscores(name));
                     return true;
                 }
             }
-            else if (meaning & (788968 & ~1024 & ~111551)) {
-                var symbol = resolveSymbol(resolveName(errorLocation, name, (512 | 1024) & ~788968, undefined, undefined, false));
+            else if (meaning & (788968 & ~111551)) {
+                var symbol = resolveSymbol(resolveName(errorLocation, name, 1536, undefined, undefined, false));
                 if (symbol) {
                     error(errorLocation, ts.Diagnostics.Cannot_use_namespace_0_as_a_type, ts.unescapeLeadingUnderscores(name));
                     return true;
@@ -42678,6 +42760,30 @@ var ts;
             }
             return undefined;
         }
+        function getAllSymbolFlags(symbol) {
+            var flags = symbol.flags;
+            var seenSymbols;
+            while (symbol.flags & 2097152) {
+                var target = resolveAlias(symbol);
+                if (target === unknownSymbol) {
+                    return 67108863;
+                }
+                if (target === symbol || (seenSymbols === null || seenSymbols === void 0 ? void 0 : seenSymbols.has(target))) {
+                    break;
+                }
+                if (target.flags & 2097152) {
+                    if (seenSymbols) {
+                        seenSymbols.add(target);
+                    }
+                    else {
+                        seenSymbols = new ts.Set([symbol, target]);
+                    }
+                }
+                flags |= target.flags;
+                symbol = target;
+            }
+            return flags;
+        }
         function markSymbolOfAliasDeclarationIfTypeOnly(aliasDeclaration, immediateTarget, finalTarget, overwriteEmpty) {
             if (!aliasDeclaration || ts.isPropertyAccessExpression(aliasDeclaration))
                 return false;
@@ -42700,19 +42806,25 @@ var ts;
             }
             return !!aliasDeclarationLinks.typeOnlyDeclaration;
         }
-        function getTypeOnlyAliasDeclaration(symbol) {
+        function getTypeOnlyAliasDeclaration(symbol, include) {
             if (!(symbol.flags & 2097152)) {
                 return undefined;
             }
             var links = getSymbolLinks(symbol);
-            return links.typeOnlyDeclaration || undefined;
+            if (include === undefined) {
+                return links.typeOnlyDeclaration || undefined;
+            }
+            if (links.typeOnlyDeclaration) {
+                return getAllSymbolFlags(resolveAlias(links.typeOnlyDeclaration.symbol)) & include ? links.typeOnlyDeclaration : undefined;
+            }
+            return undefined;
         }
         function markExportAsReferenced(node) {
             var symbol = getSymbolOfNode(node);
             var target = resolveAlias(symbol);
             if (target) {
                 var markAlias = target === unknownSymbol ||
-                    ((target.flags & 111551) && !isConstEnumOrConstEnumOnlyModule(target) && !getTypeOnlyAliasDeclaration(symbol));
+                    ((getAllSymbolFlags(target) & 111551) && !isConstEnumOrConstEnumOnlyModule(target) && !getTypeOnlyAliasDeclaration(symbol, 111551));
                 if (markAlias) {
                     markAliasSymbolAsReferenced(symbol);
                 }
@@ -42726,8 +42838,7 @@ var ts;
                 if (!node)
                     return ts.Debug.fail();
                 if (ts.isInternalModuleImportEqualsDeclaration(node)) {
-                    var target = resolveSymbol(symbol);
-                    if (target === unknownSymbol || target.flags & 111551) {
+                    if (getAllSymbolFlags(resolveSymbol(symbol)) & 111551) {
                         checkExpressionCached(node.moduleReference);
                     }
                 }
@@ -43457,7 +43568,7 @@ var ts;
         }
         function symbolIsValue(symbol, includeTypeOnlyMembers) {
             return !!(symbol.flags & 111551 ||
-                symbol.flags & 2097152 && resolveAlias(symbol).flags & 111551 && (includeTypeOnlyMembers || !getTypeOnlyAliasDeclaration(symbol)));
+                symbol.flags & 2097152 && getAllSymbolFlags(symbol) & 111551 && (includeTypeOnlyMembers || !getTypeOnlyAliasDeclaration(symbol)));
         }
         function findConstructorDeclaration(node) {
             var members = node.members;
@@ -43684,8 +43795,10 @@ var ts;
                 if (symbolFromSymbolTable === symbol) {
                     return true;
                 }
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 && !ts.getDeclarationOfKind(symbolFromSymbolTable, 278)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
-                if (symbolFromSymbolTable.flags & meaning) {
+                var shouldResolveAlias = (symbolFromSymbolTable.flags & 2097152 && !ts.getDeclarationOfKind(symbolFromSymbolTable, 278));
+                symbolFromSymbolTable = shouldResolveAlias ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                var flags = shouldResolveAlias ? getAllSymbolFlags(symbolFromSymbolTable) : symbolFromSymbolTable.flags;
+                if (flags & meaning) {
                     qualify = true;
                     return true;
                 }
@@ -45791,7 +45904,7 @@ var ts;
                             if (!e.propertyName) {
                                 var indices = ts.indicesOf(statements);
                                 var associatedIndices = ts.filter(indices, function (i) { return ts.nodeHasName(statements[i], e.name); });
-                                if (ts.length(associatedIndices) && ts.every(associatedIndices, function (i) { return canHaveExportModifier(statements[i]); })) {
+                                if (ts.length(associatedIndices) && ts.every(associatedIndices, function (i) { return ts.canHaveExportModifier(statements[i]); })) {
                                     for (var _i = 0, associatedIndices_1 = associatedIndices; _i < associatedIndices_1.length; _i++) {
                                         var index_1 = associatedIndices_1[_i];
                                         statements[index_1] = addExportModifier(statements[index_1]);
@@ -45821,15 +45934,6 @@ var ts;
                     }
                     return statements;
                 }
-                function canHaveExportModifier(node) {
-                    return ts.isEnumDeclaration(node) ||
-                        ts.isVariableStatement(node) ||
-                        ts.isFunctionDeclaration(node) ||
-                        ts.isClassDeclaration(node) ||
-                        (ts.isModuleDeclaration(node) && !ts.isExternalModuleAugmentation(node) && !ts.isGlobalScopeAugmentation(node)) ||
-                        ts.isInterfaceDeclaration(node) ||
-                        isTypeDeclaration(node);
-                }
                 function addExportModifier(node) {
                     var flags = (ts.getEffectiveModifierFlags(node) | 1) & ~2;
                     return ts.factory.updateModifiers(node, flags);
@@ -46014,7 +46118,7 @@ var ts;
                             (ts.isJSDocTypeAlias(context.enclosingDeclaration) ? ts.getSourceFileOfNode(context.enclosingDeclaration) : context.enclosingDeclaration);
                         if (additionalModifierFlags & 1 &&
                             enclosingDeclaration_1 && (isExportingScope(enclosingDeclaration_1) || ts.isModuleDeclaration(enclosingDeclaration_1)) &&
-                            canHaveExportModifier(node)) {
+                            ts.canHaveExportModifier(node)) {
                             newModifierFlags |= 1;
                         }
                         if (addingDeclare && !(newModifierFlags & 1) &&
@@ -46067,7 +46171,7 @@ var ts;
                     return !symbol.exports ? [] : ts.filter(ts.arrayFrom(symbol.exports.values()), isNamespaceMember);
                 }
                 function isTypeOnlyNamespace(symbol) {
-                    return ts.every(getNamespaceMembersForSerialization(symbol), function (m) { return !(resolveSymbol(m).flags & 111551); });
+                    return ts.every(getNamespaceMembersForSerialization(symbol), function (m) { return !(getAllSymbolFlags(resolveSymbol(m)) & 111551); });
                 }
                 function serializeModule(symbol, symbolName, modifierFlags) {
                     var members = getNamespaceMembersForSerialization(symbol);
@@ -47659,13 +47763,27 @@ var ts;
                 return getTypeFromTypeNode(typeNode);
             }
         }
+        function isParameterOfContextSensitiveSignature(symbol) {
+            var decl = symbol.valueDeclaration;
+            if (!decl) {
+                return false;
+            }
+            if (ts.isBindingElement(decl)) {
+                decl = ts.walkUpBindingElementsAndPatterns(decl);
+            }
+            if (ts.isParameter(decl)) {
+                return isContextSensitiveFunctionOrObjectLiteralMethod(decl.parent);
+            }
+            return false;
+        }
         function getTypeOfVariableOrParameterOrProperty(symbol) {
             var links = getSymbolLinks(symbol);
             if (!links.type) {
                 var type = getTypeOfVariableOrParameterOrPropertyWorker(symbol);
-                if (!links.type) {
+                if (!links.type && !isParameterOfContextSensitiveSignature(symbol)) {
                     links.type = type;
                 }
+                return type;
             }
             return links.type;
         }
@@ -47940,7 +48058,7 @@ var ts;
                 links.type = (exportSymbol === null || exportSymbol === void 0 ? void 0 : exportSymbol.declarations) && isDuplicatedCommonJSExport(exportSymbol.declarations) && symbol.declarations.length ? getFlowTypeFromCommonJSExport(exportSymbol)
                     : isDuplicatedCommonJSExport(symbol.declarations) ? autoType
                         : declaredType ? declaredType
-                            : targetSymbol.flags & 111551 ? getTypeOfSymbol(targetSymbol)
+                            : getAllSymbolFlags(targetSymbol) & 111551 ? getTypeOfSymbol(targetSymbol)
                                 : errorType;
             }
             return links.type;
@@ -49575,7 +49693,17 @@ var ts;
             return !!(ts.getObjectFlags(type) & 32 && getMappedTypeModifiers(type) & 4);
         }
         function isGenericMappedType(type) {
-            return !!(ts.getObjectFlags(type) & 32) && isGenericIndexType(getConstraintTypeFromMappedType(type));
+            if (ts.getObjectFlags(type) & 32) {
+                var constraint = getConstraintTypeFromMappedType(type);
+                if (isGenericIndexType(constraint)) {
+                    return true;
+                }
+                var nameType = getNameTypeFromMappedType(type);
+                if (nameType && isGenericIndexType(instantiateType(nameType, makeUnaryTypeMapper(getTypeParameterFromMappedType(type), constraint)))) {
+                    return true;
+                }
+            }
+            return false;
         }
         function resolveStructuredTypeMembers(type) {
             if (!type.members) {
@@ -49974,7 +50102,7 @@ var ts;
             var propSet;
             var indexTypes;
             var isUnion = containingType.flags & 1048576;
-            var optionalFlag = isUnion ? 0 : 16777216;
+            var optionalFlag;
             var syntheticFlag = 4;
             var checkFlags = isUnion ? 0 : 8;
             var mergedInstantiations = false;
@@ -49985,11 +50113,14 @@ var ts;
                     var prop = getPropertyOfType(type, name, skipObjectFunctionPropertyAugment);
                     var modifiers = prop ? ts.getDeclarationModifierFlagsFromSymbol(prop) : 0;
                     if (prop) {
-                        if (isUnion) {
-                            optionalFlag |= (prop.flags & 16777216);
-                        }
-                        else {
-                            optionalFlag &= prop.flags;
+                        if (prop.flags & 106500) {
+                            optionalFlag !== null && optionalFlag !== void 0 ? optionalFlag : (optionalFlag = isUnion ? 0 : 16777216);
+                            if (isUnion) {
+                                optionalFlag |= (prop.flags & 16777216);
+                            }
+                            else {
+                                optionalFlag &= prop.flags;
+                            }
                         }
                         if (!singleProp) {
                             singleProp = prop;
@@ -50097,7 +50228,7 @@ var ts;
                 propTypes.push(type);
             }
             ts.addRange(propTypes, indexTypes);
-            var result = createSymbol(4 | optionalFlag, name, syntheticFlag | checkFlags);
+            var result = createSymbol(4 | (optionalFlag !== null && optionalFlag !== void 0 ? optionalFlag : 0), name, syntheticFlag | checkFlags);
             result.containingType = containingType;
             if (!hasNonUniformValueDeclaration && firstValueDeclaration) {
                 result.valueDeclaration = firstValueDeclaration;
@@ -52505,8 +52636,13 @@ var ts;
                 return getStringLiteralType(text);
             }
             newTexts.push(text);
-            if (ts.every(newTexts, function (t) { return t === ""; }) && ts.every(newTypes, function (t) { return !!(t.flags & 4); })) {
-                return stringType;
+            if (ts.every(newTexts, function (t) { return t === ""; })) {
+                if (ts.every(newTypes, function (t) { return !!(t.flags & 4); })) {
+                    return stringType;
+                }
+                if (newTypes.length === 1 && isPatternLiteralType(newTypes[0])) {
+                    return newTypes[0];
+                }
             }
             var id = "".concat(getTypeListId(newTypes), "|").concat(ts.map(newTexts, function (t) { return t.length; }).join(","), "|").concat(newTexts.join(""));
             var type = templateLiteralTypes.get(id);
@@ -52565,11 +52701,12 @@ var ts;
         }
         function getStringMappingType(symbol, type) {
             return type.flags & (1048576 | 131072) ? mapType(type, function (t) { return getStringMappingType(symbol, t); }) :
-                type.flags & 268435456 && symbol === type.symbol ? type :
-                    isGenericIndexType(type) || isPatternLiteralPlaceholderType(type) ? getStringMappingTypeForGenericType(symbol, isPatternLiteralPlaceholderType(type) && !(type.flags & 268435456) ? getTemplateLiteralType(["", ""], [type]) : type) :
-                        type.flags & 128 ? getStringLiteralType(applyStringMapping(symbol, type.value)) :
-                            type.flags & 134217728 ? getTemplateLiteralType.apply(void 0, applyTemplateStringMapping(symbol, type.texts, type.types)) :
-                                type;
+                type.flags & 128 ? getStringLiteralType(applyStringMapping(symbol, type.value)) :
+                    type.flags & 134217728 ? getTemplateLiteralType.apply(void 0, applyTemplateStringMapping(symbol, type.texts, type.types)) :
+                        type.flags & 268435456 && symbol === type.symbol ? type :
+                            type.flags & (1 | 4 | 268435456) || isGenericIndexType(type) ? getStringMappingTypeForGenericType(symbol, type) :
+                                isPatternLiteralPlaceholderType(type) ? getStringMappingTypeForGenericType(symbol, getTemplateLiteralType(["", ""], [type])) :
+                                    type;
         }
         function applyStringMapping(symbol, str) {
             switch (intrinsicTypeKinds.get(symbol.escapedName)) {
@@ -52722,7 +52859,15 @@ var ts;
                         return accessFlags & 1 ? getUnionType([indexInfo.type, undefinedType]) : indexInfo.type;
                     }
                     errorIfWritingToReadonlyIndex(indexInfo);
-                    return accessFlags & 1 ? getUnionType([indexInfo.type, undefinedType]) : indexInfo.type;
+                    if ((accessFlags & 1) &&
+                        !(objectType.symbol &&
+                            objectType.symbol.flags & (256 | 128) &&
+                            (indexType.symbol &&
+                                indexType.flags & 1024 &&
+                                getParentOfSymbol(indexType.symbol) === objectType.symbol))) {
+                        return getUnionType([indexInfo.type, undefinedType]);
+                    }
+                    return indexInfo.type;
                 }
                 if (indexType.flags & 131072) {
                     return neverType;
@@ -52825,10 +52970,11 @@ var ts;
                         accessNode;
         }
         function isPatternLiteralPlaceholderType(type) {
-            return !!(type.flags & (1 | 4 | 8 | 64)) || !!(type.flags & 268435456 && isPatternLiteralPlaceholderType(type.type));
+            return !!(type.flags & (1 | 4 | 8 | 64)) || isPatternLiteralType(type);
         }
         function isPatternLiteralType(type) {
-            return !!(type.flags & 134217728) && ts.every(type.types, isPatternLiteralPlaceholderType);
+            return !!(type.flags & 134217728) && ts.every(type.types, isPatternLiteralPlaceholderType) ||
+                !!(type.flags & 268435456) && isPatternLiteralPlaceholderType(type.type);
         }
         function isGenericType(type) {
             return !!getGenericObjectFlags(type);
@@ -53056,18 +53202,18 @@ var ts;
             var result;
             var extraTypes;
             var tailCount = 0;
-            var _loop_20 = function () {
+            while (true) {
                 if (tailCount === 1000) {
                     error(currentNode, ts.Diagnostics.Type_instantiation_is_excessively_deep_and_possibly_infinite);
                     result = errorType;
-                    return "break";
+                    break;
                 }
                 var isUnwrapped = isTypicalNondistributiveConditional(root);
                 var checkType = instantiateType(unwrapNondistributiveConditionalTuple(root, getActualTypeVariable(root.checkType)), mapper);
                 var checkTypeInstantiable = isGenericType(checkType);
                 var extendsType = instantiateType(unwrapNondistributiveConditionalTuple(root, root.extendsType), mapper);
                 if (checkType === wildcardType || extendsType === wildcardType) {
-                    return { value: wildcardType };
+                    return wildcardType;
                 }
                 var combinedMapper = void 0;
                 if (root.inferTypeParameters) {
@@ -53083,7 +53229,7 @@ var ts;
                             }
                         }
                     }
-                    if (!checkTypeInstantiable || !ts.some(root.inferTypeParameters, function (t) { return t === extendsType; })) {
+                    if (!checkTypeInstantiable) {
                         inferTypes(context.inferences, checkType, instantiateType(extendsType, freshMapper), 512 | 1024);
                     }
                     var innerMapper = combineTypeMappers(freshMapper, context.mapper);
@@ -53100,23 +53246,23 @@ var ts;
                             var newRoot = falseType_1.root;
                             if (newRoot.node.parent === root.node && (!newRoot.isDistributive || newRoot.checkType === root.checkType)) {
                                 root = newRoot;
-                                return "continue";
+                                continue;
                             }
                             if (canTailRecurse(falseType_1, mapper)) {
-                                return "continue";
+                                continue;
                             }
                         }
                         result = instantiateType(falseType_1, mapper);
-                        return "break";
+                        break;
                     }
                     if (inferredExtendsType.flags & 3 || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
                         var trueType_1 = getTypeFromTypeNode(root.node.trueType);
                         var trueMapper = combinedMapper || mapper;
                         if (canTailRecurse(trueType_1, trueMapper)) {
-                            return "continue";
+                            continue;
                         }
                         result = instantiateType(trueType_1, trueMapper);
-                        return "break";
+                        break;
                     }
                 }
                 result = createType(16777216);
@@ -53127,14 +53273,7 @@ var ts;
                 result.combinedMapper = combinedMapper;
                 result.aliasSymbol = aliasSymbol || root.aliasSymbol;
                 result.aliasTypeArguments = aliasSymbol ? aliasTypeArguments : instantiateTypes(root.aliasTypeArguments, mapper);
-                return "break";
-            };
-            while (true) {
-                var state_6 = _loop_20();
-                if (typeof state_6 === "object")
-                    return state_6.value;
-                if (state_6 === "break")
-                    break;
+                break;
             }
             return extraTypes ? getUnionType(ts.append(extraTypes, result)) : result;
             function canTailRecurse(newType, newMapper) {
@@ -55350,7 +55489,7 @@ var ts;
                             return 0;
                         }
                     }
-                    var isPerformingCommonPropertyChecks = (relation !== comparableRelation || !(source.flags & 1048576) && isLiteralType(source)) &&
+                    var isPerformingCommonPropertyChecks = (relation !== comparableRelation || isUnitType(source)) &&
                         !(intersectionState & 2) &&
                         source.flags & (131068 | 524288 | 2097152) && source !== globalObjectType &&
                         target.flags & (524288 | 2097152) && isWeakType(target) &&
@@ -55378,12 +55517,6 @@ var ts;
                     var result_7 = skipCaching ?
                         unionOrIntersectionRelatedTo(source, target, reportErrors, intersectionState) :
                         recursiveTypeRelatedTo(source, target, reportErrors, intersectionState, recursionFlags);
-                    if (result_7 && !inPropertyCheck && (target.flags & 2097152 && (isPerformingExcessPropertyChecks || isPerformingCommonPropertyChecks) ||
-                        isNonGenericObjectType(target) && !isArrayOrTupleType(target) && source.flags & 2097152 && getApparentType(source).flags & 3670016 && !ts.some(source.types, function (t) { return !!(ts.getObjectFlags(t) & 262144); }))) {
-                        inPropertyCheck = true;
-                        result_7 &= recursiveTypeRelatedTo(source, target, reportErrors, 4, recursionFlags);
-                        inPropertyCheck = false;
-                    }
                     if (result_7) {
                         return result_7;
                     }
@@ -55492,7 +55625,7 @@ var ts;
                     reducedTarget = findMatchingDiscriminantType(source, target, isRelatedTo) || filterPrimitivesIfContainsNonPrimitive(target);
                     checkTypes = reducedTarget.flags & 1048576 ? reducedTarget.types : [reducedTarget];
                 }
-                var _loop_21 = function (prop) {
+                var _loop_20 = function (prop) {
                     if (shouldCheckAsExcessProperty(prop, source.symbol) && !isIgnoredJsxProperty(source, prop)) {
                         if (!isKnownProperty(reducedTarget, prop.escapedName, isComparingJsxAttributes)) {
                             if (reportErrors) {
@@ -55545,9 +55678,9 @@ var ts;
                 };
                 for (var _i = 0, _b = getPropertiesOfType(source); _i < _b.length; _i++) {
                     var prop = _b[_i];
-                    var state_7 = _loop_21(prop);
-                    if (typeof state_7 === "object")
-                        return state_7.value;
+                    var state_6 = _loop_20(prop);
+                    if (typeof state_6 === "object")
+                        return state_6.value;
                 }
                 return false;
             }
@@ -55727,8 +55860,7 @@ var ts;
                 if (overflow) {
                     return 0;
                 }
-                var keyIntersectionState = intersectionState | (inPropertyCheck ? 8 : 0);
-                var id = getRelationKey(source, target, keyIntersectionState, relation, false);
+                var id = getRelationKey(source, target, intersectionState, relation, false);
                 var entry = relation.get(id);
                 if (entry !== undefined) {
                     if (reportErrors && entry & 2 && !(entry & 4)) {
@@ -55752,7 +55884,7 @@ var ts;
                     targetStack = [];
                 }
                 else {
-                    var broadestEquivalentId = id.startsWith("*") ? getRelationKey(source, target, keyIntersectionState, relation, true) : undefined;
+                    var broadestEquivalentId = id.startsWith("*") ? getRelationKey(source, target, intersectionState, relation, true) : undefined;
                     for (var i = 0; i < maybeCount; i++) {
                         if (id === maybeKeys[i] || broadestEquivalentId && broadestEquivalentId === maybeKeys[i]) {
                             return 3;
@@ -55834,10 +55966,18 @@ var ts;
             function structuredTypeRelatedTo(source, target, reportErrors, intersectionState) {
                 var saveErrorInfo = captureErrorCalculationState();
                 var result = structuredTypeRelatedToWorker(source, target, reportErrors, intersectionState, saveErrorInfo);
-                if (!result && (source.flags & 2097152 || source.flags & 262144 && target.flags & 1048576)) {
-                    var constraint = getEffectiveConstraintOfIntersection(source.flags & 2097152 ? source.types : [source], !!(target.flags & 1048576));
-                    if (constraint && !(constraint.flags & 131072) && everyType(constraint, function (c) { return c !== source; })) {
-                        result = isRelatedTo(constraint, target, 1, false, undefined, intersectionState);
+                if (relation !== identityRelation) {
+                    if (!result && (source.flags & 2097152 || source.flags & 262144 && target.flags & 1048576)) {
+                        var constraint = getEffectiveConstraintOfIntersection(source.flags & 2097152 ? source.types : [source], !!(target.flags & 1048576));
+                        if (constraint && everyType(constraint, function (c) { return c !== source; })) {
+                            result = isRelatedTo(constraint, target, 1, false, undefined, intersectionState);
+                        }
+                    }
+                    if (result && !inPropertyCheck && (target.flags & 2097152 && !isGenericObjectType(target) && source.flags & (524288 | 2097152) ||
+                        isNonGenericObjectType(target) && !isArrayOrTupleType(target) && source.flags & 2097152 && getApparentType(source).flags & 3670016 && !ts.some(source.types, function (t) { return !!(ts.getObjectFlags(t) & 262144); }))) {
+                        inPropertyCheck = true;
+                        result &= propertiesRelatedTo(source, target, reportErrors, undefined, 0);
+                        inPropertyCheck = false;
                     }
                 }
                 if (result) {
@@ -55846,9 +55986,6 @@ var ts;
                 return result;
             }
             function structuredTypeRelatedToWorker(source, target, reportErrors, intersectionState, saveErrorInfo) {
-                if (intersectionState & 4) {
-                    return propertiesRelatedTo(source, target, reportErrors, undefined, 0);
-                }
                 var result;
                 var originalErrorInfo;
                 var varianceCheckFailed = false;
@@ -55934,7 +56071,7 @@ var ts;
                     if (relation === comparableRelation && sourceFlags & 262144) {
                         var constraint = getConstraintOfTypeParameter(source);
                         if (constraint && hasNonCircularBaseConstraint(source)) {
-                            while (constraint && constraint.flags & 262144) {
+                            while (constraint && someType(constraint, function (c) { return !!(c.flags & 262144); })) {
                                 if (result = isRelatedTo(constraint, target, 1, false)) {
                                     return result;
                                 }
@@ -56324,11 +56461,11 @@ var ts;
                 }
                 var discriminantCombinations = ts.cartesianProduct(sourceDiscriminantTypes);
                 var matchingTypes = [];
-                var _loop_22 = function (combination) {
+                var _loop_21 = function (combination) {
                     var hasMatch = false;
                     outer: for (var _c = 0, _d = target.types; _c < _d.length; _c++) {
                         var type = _d[_c];
-                        var _loop_23 = function (i) {
+                        var _loop_22 = function (i) {
                             var sourceProperty = sourcePropertiesFiltered[i];
                             var targetProperty = getPropertyOfType(type, sourceProperty.escapedName);
                             if (!targetProperty)
@@ -56341,8 +56478,8 @@ var ts;
                             }
                         };
                         for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
-                            var state_9 = _loop_23(i);
-                            switch (state_9) {
+                            var state_8 = _loop_22(i);
+                            switch (state_8) {
                                 case "continue-outer": continue outer;
                             }
                         }
@@ -56355,9 +56492,9 @@ var ts;
                 };
                 for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) {
                     var combination = discriminantCombinations_1[_a];
-                    var state_8 = _loop_22(combination);
-                    if (typeof state_8 === "object")
-                        return state_8.value;
+                    var state_7 = _loop_21(combination);
+                    if (typeof state_7 === "object")
+                        return state_7.value;
                 }
                 var result = -1;
                 for (var _b = 0, matchingTypes_1 = matchingTypes; _b < matchingTypes_1.length; _b++) {
@@ -56441,7 +56578,7 @@ var ts;
                     }
                     return 0;
                 }
-                if (!skipOptional && sourceProp.flags & 16777216 && !(targetProp.flags & 16777216)) {
+                if (!skipOptional && sourceProp.flags & 16777216 && targetProp.flags & 106500 && !(targetProp.flags & 16777216)) {
                     if (reportErrors) {
                         reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
                     }
@@ -56999,7 +57136,7 @@ var ts;
                 ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("checkTypes", "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
                 links.variances = ts.emptyArray;
                 var variances = [];
-                var _loop_24 = function (tp) {
+                var _loop_23 = function (tp) {
                     var modifiers = getVarianceModifiers(tp);
                     var variance = modifiers & 65536 ?
                         modifiers & 32768 ? 0 : 1 :
@@ -57030,7 +57167,7 @@ var ts;
                 };
                 for (var _i = 0, typeParameters_2 = typeParameters; _i < typeParameters_2.length; _i++) {
                     var tp = typeParameters_2[_i];
-                    _loop_24(tp);
+                    _loop_23(tp);
                 }
                 links.variances = variances;
                 ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop({ variances: variances.map(ts.Debug.formatVariance) });
@@ -57412,8 +57549,7 @@ var ts;
             return !!(type.flags & 109440);
         }
         function isUnitLikeType(type) {
-            return type.flags & 2097152 ? ts.some(type.types, isUnitType) :
-                !!(type.flags & 109440);
+            return isUnitType(getBaseConstraintOrType(type));
         }
         function extractUnitType(type) {
             return type.flags & 2097152 ? ts.find(type.types, isUnitType) || type : type;
@@ -58178,7 +58314,7 @@ var ts;
                 && (!roundTripOnly || s === ts.pseudoBigIntToString({ negative: negative, base10Value: ts.parsePseudoBigInt(scanner.getTokenValue()) }));
         }
         function isMemberOfStringMapping(source, target) {
-            if (target.flags & (4 | 3)) {
+            if (target.flags & (4 | 1)) {
                 return true;
             }
             if (target.flags & 134217728) {
@@ -58675,7 +58811,7 @@ 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_25 = function (i) {
+                    var _loop_24 = function (i) {
                         var source_1 = matches ? matches[i] : neverType;
                         var target_3 = types[i];
                         if (source_1.flags & 128 && target_3.flags & 8650752) {
@@ -58719,7 +58855,7 @@ var ts;
                         inferFromTypes(source_1, target_3);
                     };
                     for (var i = 0; i < types.length; i++) {
-                        _loop_25(i);
+                        _loop_24(i);
                     }
                 }
             }
@@ -59126,7 +59262,7 @@ var ts;
             }
             if (ts.isEntityNameExpression(node.argumentExpression)) {
                 var symbol = resolveEntityName(node.argumentExpression, 111551, true);
-                if (!symbol || !isConstVariable(symbol))
+                if (!symbol || !(isConstVariable(symbol) || (symbol.flags & 8)))
                     return undefined;
                 var declaration = symbol.valueDeclaration;
                 if (declaration === undefined)
@@ -59140,7 +59276,12 @@ var ts;
                 }
                 if (ts.hasOnlyExpressionInitializer(declaration) && isBlockScopedNameDeclaredBeforeUse(declaration, node.argumentExpression)) {
                     var initializer = ts.getEffectiveInitializer(declaration);
-                    return initializer && tryGetNameFromType(getTypeOfExpression(initializer));
+                    if (initializer) {
+                        return tryGetNameFromType(getTypeOfExpression(initializer));
+                    }
+                    if (ts.isEnumMember(declaration)) {
+                        return ts.getTextOfPropertyName(declaration.name);
+                    }
                 }
             }
             return undefined;
@@ -59194,7 +59335,7 @@ var ts;
         function mapTypesByKeyProperty(types, name) {
             var map = new ts.Map();
             var count = 0;
-            var _loop_26 = function (type) {
+            var _loop_25 = function (type) {
                 if (type.flags & (524288 | 2097152 | 58982400)) {
                     var discriminant = getTypeOfPropertyOfType(type, name);
                     if (discriminant) {
@@ -59220,9 +59361,9 @@ var ts;
             };
             for (var _i = 0, types_15 = types; _i < types_15.length; _i++) {
                 var type = types_15[_i];
-                var state_10 = _loop_26(type);
-                if (typeof state_10 === "object")
-                    return state_10.value;
+                var state_9 = _loop_25(type);
+                if (typeof state_9 === "object")
+                    return state_9.value;
             }
             return count >= 10 && count * 2 >= types.length ? map : undefined;
         }
@@ -59770,6 +59911,7 @@ var ts;
                     ts.isInJSFile(node) && ts.hasInitializer(node) && node.initializer && ts.isFunctionExpressionOrArrowFunction(node.initializer) && ts.getEffectiveReturnTypeNode(node.initializer));
         }
         function getExplicitTypeOfSymbol(symbol, diagnostic) {
+            symbol = resolveSymbol(symbol);
             if (symbol.flags & (16 | 8192 | 32 | 512)) {
                 return getTypeOfSymbol(symbol);
             }
@@ -59804,7 +59946,7 @@ var ts;
                 switch (node.kind) {
                     case 79:
                         var symbol = getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(node));
-                        return getExplicitTypeOfSymbol(symbol.flags & 2097152 ? resolveAlias(symbol) : symbol, diagnostic);
+                        return getExplicitTypeOfSymbol(symbol, diagnostic);
                     case 108:
                         return getExplicitThisType(node);
                     case 106:
@@ -60243,7 +60385,7 @@ var ts;
                     type = narrowTypeBySwitchOnDiscriminant(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else if (expr.kind === 218 && isMatchingReference(reference, expr.expression)) {
-                    type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
+                    type = narrowTypeBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else {
                     if (strictNullChecks) {
@@ -60476,7 +60618,7 @@ var ts;
                     !!(prop.flags & 16777216) || assumeTrue :
                     !!getApplicableIndexInfoForName(type, propName) || !assumeTrue;
             }
-            function narrowByInKeyword(type, nameType, assumeTrue) {
+            function narrowTypeByInKeyword(type, nameType, assumeTrue) {
                 var name = getPropertyNameFromType(nameType);
                 var isKnownProperty = someType(type, function (t) { return isTypePresencePossible(t, name, true); });
                 if (isKnownProperty) {
@@ -60553,7 +60695,7 @@ var ts;
                                 return getTypeWithFacts(type, assumeTrue ? 524288 : 65536);
                             }
                             if (isMatchingReference(reference, target)) {
-                                return narrowByInKeyword(type, leftType, assumeTrue);
+                                return narrowTypeByInKeyword(type, leftType, assumeTrue);
                             }
                         }
                         break;
@@ -60715,7 +60857,7 @@ var ts;
                                 neverType;
                 });
             }
-            function narrowBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
+            function narrowTypeBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
                 var witnesses = getSwitchClauseTypeOfWitnesses(switchStatement);
                 if (!witnesses) {
                     return type;
@@ -61042,12 +61184,12 @@ var ts;
             });
         }
         function markAliasReferenced(symbol, location) {
-            if (isNonLocalAlias(symbol, 111551) && !isInTypeQuery(location) && !getTypeOnlyAliasDeclaration(symbol)) {
+            if (isNonLocalAlias(symbol, 111551) && !isInTypeQuery(location) && !getTypeOnlyAliasDeclaration(symbol, 111551)) {
                 var target = resolveAlias(symbol);
-                if (target.flags & 111551) {
+                if (getAllSymbolFlags(target) & (111551 | 1048576)) {
                     if (compilerOptions.isolatedModules ||
                         ts.shouldPreserveConstEnums(compilerOptions) && isExportOrExportExpression(location) ||
-                        !isConstEnumOrConstEnumOnlyModule(target)) {
+                        !isConstEnumOrConstEnumOnlyModule(getExportSymbolOfValueSymbolIfExported(target))) {
                         markAliasSymbolAsReferenced(symbol);
                     }
                     else {
@@ -61209,7 +61351,7 @@ var ts;
                 (isConstVariable(localOrExportSymbol) && type !== autoArrayType || isParameter && !isSymbolAssigned(localOrExportSymbol))) {
                 flowContainer = getControlFlowContainer(flowContainer);
             }
-            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports || ts.isBindingElement(declaration) ||
+            var assumeInitialized = isParameter || isAlias || isOuterVariable || isSpreadDestructuringAssignmentTarget || isModuleExports || isSameScopedBindingElement(node, declaration) ||
                 type !== autoType && type !== autoArrayType && (!strictNullChecks || (type.flags & (3 | 16384)) !== 0 ||
                     isInTypeQuery(node) || node.parent.kind === 278) ||
                 node.parent.kind === 232 ||
@@ -61234,6 +61376,12 @@ var ts;
             }
             return assignmentKind ? getBaseTypeOfLiteralType(flowType) : flowType;
         }
+        function isSameScopedBindingElement(node, declaration) {
+            if (ts.isBindingElement(declaration)) {
+                var bindingElement = ts.findAncestor(node, ts.isBindingElement);
+                return bindingElement && ts.getRootDeclaration(bindingElement) === ts.getRootDeclaration(declaration);
+            }
+        }
         function shouldMarkIdentifierAliasReferenced(node) {
             var _a;
             var parent = node.parent;
@@ -61532,11 +61680,16 @@ var ts;
             var immediateContainer = ts.getSuperContainer(node, true);
             var container = immediateContainer;
             var needToCaptureLexicalThis = false;
+            var inAsyncFunction = false;
             if (!isCallExpression) {
                 while (container && container.kind === 216) {
+                    if (ts.hasSyntacticModifier(container, 512))
+                        inAsyncFunction = true;
                     container = ts.getSuperContainer(container, true);
                     needToCaptureLexicalThis = languageVersion < 2;
                 }
+                if (container && ts.hasSyntacticModifier(container, 512))
+                    inAsyncFunction = true;
             }
             var canUseSuperExpression = isLegalUsageOfSuperExpression(container);
             var nodeCheckFlag = 0;
@@ -61575,7 +61728,7 @@ var ts;
                 nodeCheckFlag = 256;
             }
             getNodeLinks(node).flags |= nodeCheckFlag;
-            if (container.kind === 171 && ts.hasSyntacticModifier(container, 512)) {
+            if (container.kind === 171 && inAsyncFunction) {
                 if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= 4096;
                 }
@@ -62195,7 +62348,7 @@ var ts;
         function instantiateContextualType(contextualType, node, contextFlags) {
             if (contextualType && maybeTypeOfKind(contextualType, 465829888)) {
                 var inferenceContext = getInferenceContext(node);
-                if (inferenceContext && contextFlags & 1 && ts.some(inferenceContext.inferences, hasInferenceCandidates)) {
+                if (inferenceContext && contextFlags & 1 && ts.some(inferenceContext.inferences, hasInferenceCandidatesOrDefault)) {
                     return instantiateInstantiableTypes(contextualType, inferenceContext.nonFixingMapper);
                 }
                 if (inferenceContext === null || inferenceContext === void 0 ? void 0 : inferenceContext.returnMapper) {
@@ -64724,7 +64877,7 @@ var ts;
             var spreadIndex = getSpreadArgumentIndex(args);
             if (spreadIndex >= 0) {
                 var effectiveArgs_1 = args.slice(0, spreadIndex);
-                var _loop_27 = function (i) {
+                var _loop_26 = function (i) {
                     var arg = args[i];
                     var spreadType = arg.kind === 227 && (flowLoopCount ? checkExpression(arg.expression) : checkExpressionCached(arg.expression));
                     if (spreadType && isTupleType(spreadType)) {
@@ -64740,7 +64893,7 @@ var ts;
                     }
                 };
                 for (var i = spreadIndex; i < args.length; i++) {
-                    _loop_27(i);
+                    _loop_26(i);
                 }
                 return effectiveArgs_1;
             }
@@ -64990,7 +65143,7 @@ var ts;
                         var min_3 = Number.MAX_VALUE;
                         var minIndex = 0;
                         var i_1 = 0;
-                        var _loop_28 = function (c) {
+                        var _loop_27 = 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) {
@@ -65008,7 +65161,7 @@ var ts;
                         };
                         for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
                             var c = candidatesForArgumentError_1[_a];
-                            _loop_28(c);
+                            _loop_27(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");
@@ -65151,7 +65304,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_29 = function (i) {
+            var _loop_28 = 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; });
@@ -65159,7 +65312,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_29(i);
+                _loop_28(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return signatureHasRestParameter(c) ? ts.last(c.parameters) : undefined; });
             var flags = 0;
@@ -65994,7 +66147,7 @@ var ts;
                     if (symbol && symbol.flags & 2097152) {
                         symbol = resolveAlias(symbol);
                     }
-                    return !!(symbol && (symbol.flags & 384) && getEnumKind(symbol) === 1);
+                    return !!(symbol && (getAllSymbolFlags(symbol) & 384) && getEnumKind(symbol) === 1);
             }
             return false;
         }
@@ -66619,7 +66772,17 @@ var ts;
         }
         function isExhaustiveSwitchStatement(node) {
             var links = getNodeLinks(node);
-            return links.isExhaustive !== undefined ? links.isExhaustive : (links.isExhaustive = computeExhaustiveSwitchStatement(node));
+            if (links.isExhaustive === undefined) {
+                links.isExhaustive = 0;
+                var exhaustive = computeExhaustiveSwitchStatement(node);
+                if (links.isExhaustive === 0) {
+                    links.isExhaustive = exhaustive;
+                }
+            }
+            else if (links.isExhaustive === 0) {
+                links.isExhaustive = false;
+            }
+            return links.isExhaustive;
         }
         function computeExhaustiveSwitchStatement(node) {
             if (node.expression.kind === 218) {
@@ -66627,14 +66790,14 @@ var ts;
                 if (!witnesses) {
                     return false;
                 }
-                var operandConstraint = getBaseConstraintOrType(getTypeOfExpression(node.expression.expression));
+                var operandConstraint = getBaseConstraintOrType(checkExpressionCached(node.expression.expression));
                 var notEqualFacts_2 = getNotEqualFactsFromTypeofSwitch(0, 0, witnesses);
                 if (operandConstraint.flags & 3) {
                     return (556800 & notEqualFacts_2) === 556800;
                 }
                 return !someType(operandConstraint, function (t) { return (getTypeFacts(t) & notEqualFacts_2) === notEqualFacts_2; });
             }
-            var type = getTypeOfExpression(node.expression);
+            var type = checkExpressionCached(node.expression);
             if (!isLiteralType(type)) {
                 return false;
             }
@@ -68144,6 +68307,9 @@ var ts;
         function hasInferenceCandidates(info) {
             return !!(info.candidates || info.contraCandidates);
         }
+        function hasInferenceCandidatesOrDefault(info) {
+            return !!(info.candidates || info.contraCandidates || hasTypeParameterDefault(info.typeParameter));
+        }
         function hasOverlappingInferences(a, b) {
             for (var i = 0; i < a.length; i++) {
                 if (hasInferenceCandidates(a[i]) && hasInferenceCandidates(b[i])) {
@@ -68776,7 +68942,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_30 = function (declaration) {
+                var _loop_29 = 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));
@@ -68791,7 +68957,7 @@ var ts;
                 };
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    _loop_30(declaration);
+                    _loop_29(declaration);
                 }
                 indexSignatureMap_1.forEach(function (entry) {
                     if (entry.declarations.length > 1) {
@@ -69037,7 +69203,7 @@ var ts;
                 }
                 var symbol = getNodeLinks(node).resolvedSymbol;
                 if (symbol) {
-                    if (ts.some(symbol.declarations, function (d) { return isTypeDeclaration(d) && !!(d.flags & 268435456); })) {
+                    if (ts.some(symbol.declarations, function (d) { return ts.isTypeDeclaration(d) && !!(d.flags & 268435456); })) {
                         addDeprecatedSuggestion(getDeprecatedSuggestionNode(node), symbol.declarations, symbol.escapedName);
                     }
                     if (type.flags & 32 && symbol.flags & 8) {
@@ -69571,7 +69737,7 @@ var ts;
             if (isReferenceToType(type, getGlobalPromiseType(false))) {
                 return typeAsPromise.promisedTypeOfPromise = getTypeArguments(type)[0];
             }
-            if (allTypesAssignableToKind(type, 131068 | 131072)) {
+            if (allTypesAssignableToKind(getBaseConstraintOrType(type), 131068 | 131072)) {
                 return undefined;
             }
             var thenFunction = getTypeOfPropertyOfType(type, "then");
@@ -69627,7 +69793,7 @@ var ts;
             return awaitedType || errorType;
         }
         function isThenableType(type) {
-            if (allTypesAssignableToKind(type, 131068 | 131072)) {
+            if (allTypesAssignableToKind(getBaseConstraintOrType(type), 131068 | 131072)) {
                 return false;
             }
             var thenFunction = getTypeOfPropertyOfType(type, "then");
@@ -69653,7 +69819,7 @@ var ts;
             if (isGenericObjectType(type)) {
                 var baseConstraint = getBaseConstraintOfType(type);
                 if (baseConstraint ?
-                    baseConstraint.flags & 3 || isEmptyObjectType(baseConstraint) || isThenableType(baseConstraint) :
+                    baseConstraint.flags & 3 || isEmptyObjectType(baseConstraint) || someType(baseConstraint, isThenableType) :
                     maybeTypeOfKind(type, 8650752)) {
                     return true;
                 }
@@ -70158,7 +70324,7 @@ var ts;
         }
         function errorUnusedLocal(declaration, name, addDiagnostic) {
             var node = ts.getNameOfDeclaration(declaration) || declaration;
-            var message = isTypeDeclaration(declaration) ? ts.Diagnostics._0_is_declared_but_never_used : ts.Diagnostics._0_is_declared_but_its_value_is_never_read;
+            var message = ts.isTypeDeclaration(declaration) ? ts.Diagnostics._0_is_declared_but_never_used : ts.Diagnostics._0_is_declared_but_its_value_is_never_read;
             addDiagnostic(declaration, 0, ts.createDiagnosticForNode(node, message, name));
         }
         function isIdentifierThatStartsWithUnderscore(node) {
@@ -71335,7 +71501,13 @@ var ts;
             var message = allowAsyncIterables
                 ? ts.Diagnostics.Type_0_must_have_a_Symbol_asyncIterator_method_that_returns_an_async_iterator
                 : ts.Diagnostics.Type_0_must_have_a_Symbol_iterator_method_that_returns_an_iterator;
-            return errorAndMaybeSuggestAwait(errorNode, !!getAwaitedTypeOfPromise(type), message, typeToString(type));
+            var suggestAwait = !!getAwaitedTypeOfPromise(type)
+                || (!allowAsyncIterables &&
+                    ts.isForOfStatement(errorNode.parent) &&
+                    errorNode.parent.expression === errorNode &&
+                    getGlobalAsyncIterableType(false) !== emptyGenericType &&
+                    isTypeAssignableTo(type, getGlobalAsyncIterableType(false)));
+            return errorAndMaybeSuggestAwait(errorNode, suggestAwait, message, typeToString(type));
         }
         function getIterationTypesOfIterator(type, resolver, errorNode, errorOutputContainer) {
             return getIterationTypesOfIteratorWorker(type, resolver, errorNode, errorOutputContainer, false);
@@ -71731,7 +71903,7 @@ var ts;
             var propDeclaration = declaration && declaration.kind === 223 ||
                 name && name.kind === 164 ? declaration : undefined;
             var localPropDeclaration = getParentOfSymbol(prop) === type.symbol ? declaration : undefined;
-            var _loop_31 = function (info) {
+            var _loop_30 = 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);
@@ -71745,7 +71917,7 @@ var ts;
             };
             for (var _i = 0, indexInfos_9 = indexInfos; _i < indexInfos_9.length; _i++) {
                 var info = indexInfos_9[_i];
-                _loop_31(info);
+                _loop_30(info);
             }
         }
         function checkIndexConstraintForIndexSignature(type, checkInfo) {
@@ -71753,7 +71925,7 @@ var ts;
             var indexInfos = getApplicableIndexInfos(type, checkInfo.keyType);
             var interfaceDeclaration = ts.getObjectFlags(type) & 2 ? ts.getDeclarationOfKind(type.symbol, 261) : undefined;
             var localCheckDeclaration = declaration && getParentOfSymbol(getSymbolOfNode(declaration)) === type.symbol ? declaration : undefined;
-            var _loop_32 = function (info) {
+            var _loop_31 = function (info) {
                 if (info === checkInfo)
                     return "continue";
                 var localIndexDeclaration = info.declaration && getParentOfSymbol(getSymbolOfNode(info.declaration)) === type.symbol ? info.declaration : undefined;
@@ -71765,7 +71937,7 @@ var ts;
             };
             for (var _i = 0, indexInfos_10 = indexInfos; _i < indexInfos_10.length; _i++) {
                 var info = indexInfos_10[_i];
-                _loop_32(info);
+                _loop_31(info);
             }
         }
         function checkTypeNameIsReserved(name, message) {
@@ -71815,7 +71987,7 @@ var ts;
             }
             else {
                 ts.forEach(jsdocParameters, function (_a, index) {
-                    var name = _a.name;
+                    var name = _a.name, isNameFirst = _a.isNameFirst;
                     if (excludedParameters.has(index) || ts.isIdentifier(name) && parameters.has(name.escapedText)) {
                         return;
                     }
@@ -71825,7 +71997,9 @@ var ts;
                         }
                     }
                     else {
-                        errorOrSuggestion(isJs, name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name, ts.idText(name));
+                        if (!isNameFirst) {
+                            errorOrSuggestion(isJs, name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name, ts.idText(name));
+                        }
                     }
                 });
             }
@@ -72060,7 +72234,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_33 = function (member) {
+            var _loop_32 = function (member) {
                 if (ts.hasAmbientModifier(member)) {
                     return "continue";
                 }
@@ -72075,7 +72249,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_33(member);
+                _loop_32(member);
             }
         }
         function checkExistingMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, member, memberIsParameterProperty, reportErrors) {
@@ -72150,7 +72324,7 @@ var ts;
         }
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             var issuedMemberError = false;
-            var _loop_34 = function (member) {
+            var _loop_33 = function (member) {
                 if (ts.isStatic(member)) {
                     return "continue";
                 }
@@ -72168,7 +72342,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_34(member);
+                _loop_33(member);
             }
             if (!issuedMemberError) {
                 checkTypeAssignableTo(typeWithThis, baseWithThis, node.name || node, broadDiag);
@@ -72215,7 +72389,7 @@ var ts;
         function checkKindsOfPropertyMemberOverrides(type, baseType) {
             var _a, _b, _c, _d;
             var baseProperties = getPropertiesOfType(baseType);
-            var _loop_35 = function (baseProperty) {
+            var _loop_34 = function (baseProperty) {
                 var base = getTargetSymbol(baseProperty);
                 if (base.flags & 4194304) {
                     return "continue";
@@ -72313,8 +72487,8 @@ var ts;
             };
             basePropertyCheck: for (var _i = 0, baseProperties_1 = baseProperties; _i < baseProperties_1.length; _i++) {
                 var baseProperty = baseProperties_1[_i];
-                var state_11 = _loop_35(baseProperty);
-                switch (state_11) {
+                var state_10 = _loop_34(baseProperty);
+                switch (state_10) {
                     case "continue-basePropertyCheck": continue basePropertyCheck;
                 }
             }
@@ -72800,11 +72974,10 @@ var ts;
             }
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
-            var _a;
             switch (node.kind) {
                 case 240:
-                    for (var _i = 0, _b = node.declarationList.declarations; _i < _b.length; _i++) {
-                        var decl = _b[_i];
+                    for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
+                        var decl = _a[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
@@ -72820,8 +72993,8 @@ var ts;
                 case 257:
                     var name = node.name;
                     if (ts.isBindingPattern(name)) {
-                        for (var _c = 0, _d = name.elements; _c < _d.length; _c++) {
-                            var el = _d[_c];
+                        for (var _b = 0, _c = name.elements; _b < _c.length; _b++) {
+                            var el = _c[_b];
                             checkModuleAugmentationElement(el, isGlobalAugmentation);
                         }
                         break;
@@ -72835,13 +73008,6 @@ var ts;
                     if (isGlobalAugmentation) {
                         return;
                     }
-                    var symbol = getSymbolOfNode(node);
-                    if (symbol) {
-                        var reportError = !(symbol.flags & 33554432);
-                        if (!reportError) {
-                            reportError = !!((_a = symbol.parent) === null || _a === void 0 ? void 0 : _a.declarations) && ts.isExternalModuleAugmentation(symbol.parent.declarations[0]);
-                        }
-                    }
                     break;
             }
         }
@@ -72929,10 +73095,11 @@ var ts;
                     }
                     return;
                 }
+                var targetFlags = getAllSymbolFlags(target);
                 var excludedMeanings = (symbol.flags & (111551 | 1048576) ? 111551 : 0) |
                     (symbol.flags & 788968 ? 788968 : 0) |
                     (symbol.flags & 1920 ? 1920 : 0);
-                if (target.flags & excludedMeanings) {
+                if (targetFlags & excludedMeanings) {
                     var message = node.kind === 278 ?
                         ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
                         ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
@@ -72942,7 +73109,7 @@ var ts;
                     && !ts.isTypeOnlyImportOrExportDeclaration(node)
                     && !(node.flags & 16777216)) {
                     var typeOnlyAlias = getTypeOnlyAliasDeclaration(symbol);
-                    var isType = !(target.flags & 111551);
+                    var isType = !(targetFlags & 111551);
                     if (isType || typeOnlyAlias) {
                         switch (node.kind) {
                             case 270:
@@ -73096,13 +73263,14 @@ var ts;
                 if (node.moduleReference.kind !== 280) {
                     var target = resolveAlias(getSymbolOfNode(node));
                     if (target !== unknownSymbol) {
-                        if (target.flags & 111551) {
+                        var targetFlags = getAllSymbolFlags(target);
+                        if (targetFlags & 111551) {
                             var moduleName = ts.getFirstIdentifier(node.moduleReference);
                             if (!(resolveEntityName(moduleName, 111551 | 1920).flags & 1920)) {
                                 error(moduleName, ts.Diagnostics.Module_0_is_hidden_by_a_local_declaration_with_the_same_name, ts.declarationNameToString(moduleName));
                             }
                         }
-                        if (target.flags & 788968) {
+                        if (targetFlags & 788968) {
                             checkTypeNameIsReserved(node.name, ts.Diagnostics.Import_name_cannot_be_0);
                         }
                     }
@@ -73229,7 +73397,7 @@ var ts;
                         markExportAsReferenced(node);
                     }
                     var target = symbol && (symbol.flags & 2097152 ? resolveAlias(symbol) : symbol);
-                    if (!target || target === unknownSymbol || target.flags & 111551) {
+                    if (!target || getAllSymbolFlags(target) & 111551) {
                         checkExpressionCached(node.propertyName || node.name);
                     }
                 }
@@ -73273,7 +73441,7 @@ var ts;
                 if (sym) {
                     markAliasReferenced(sym, id);
                     var target = sym.flags & 2097152 ? resolveAlias(sym) : sym;
-                    if (target === unknownSymbol || target.flags & 111551) {
+                    if (getAllSymbolFlags(target) & 111551) {
                         checkExpressionCached(node.expression);
                     }
                 }
@@ -73870,29 +74038,9 @@ var ts;
         }
         function isTypeDeclarationName(name) {
             return name.kind === 79 &&
-                isTypeDeclaration(name.parent) &&
+                ts.isTypeDeclaration(name.parent) &&
                 ts.getNameOfDeclaration(name.parent) === name;
         }
-        function isTypeDeclaration(node) {
-            switch (node.kind) {
-                case 165:
-                case 260:
-                case 261:
-                case 262:
-                case 263:
-                case 348:
-                case 341:
-                case 342:
-                    return true;
-                case 270:
-                    return node.isTypeOnly;
-                case 273:
-                case 278:
-                    return node.parent.parent.isTypeOnly;
-                default:
-                    return false;
-            }
-        }
         function isTypeReferenceIdentifier(node) {
             while (node.parent.kind === 163) {
                 node = node.parent;
@@ -74287,7 +74435,7 @@ var ts;
                 var baseType = ts.firstOrUndefined(getBaseTypes(classType));
                 return baseType ? getTypeWithThisArgument(baseType, classType.thisType) : errorType;
             }
-            if (isTypeDeclaration(node)) {
+            if (ts.isTypeDeclaration(node)) {
                 var symbol = getSymbolOfNode(node);
                 return getDeclaredTypeOfSymbol(symbol);
             }
@@ -74445,7 +74593,7 @@ var ts;
             return symbolLinks.exportsSomeValue;
             function isValue(s) {
                 s = resolveSymbol(s);
-                return s && !!(s.flags & 111551);
+                return s && !!(getAllSymbolFlags(s) & 111551);
             }
         }
         function isNameOfModuleOrEnumDeclaration(node) {
@@ -74484,7 +74632,7 @@ var ts;
             var node = ts.getParseTreeNode(nodeIn, ts.isIdentifier);
             if (node) {
                 var symbol = getReferencedValueOrAliasSymbol(node);
-                if (isNonLocalAlias(symbol, 111551) && !getTypeOnlyAliasDeclaration(symbol)) {
+                if (isNonLocalAlias(symbol, 111551) && !getTypeOnlyAliasDeclaration(symbol, 111551)) {
                     return getDeclarationOfAliasSymbol(symbol);
                 }
             }
@@ -74551,7 +74699,7 @@ var ts;
                 case 273:
                 case 278:
                     var symbol = getSymbolOfNode(node);
-                    return !!symbol && isAliasResolvedToValue(symbol) && !getTypeOnlyAliasDeclaration(symbol);
+                    return !!symbol && isAliasResolvedToValue(symbol) && !getTypeOnlyAliasDeclaration(symbol, 111551);
                 case 275:
                     var exportClause = node.exportClause;
                     return !!exportClause && (ts.isNamespaceExport(exportClause) ||
@@ -74572,6 +74720,7 @@ var ts;
             return isValue && node.moduleReference && !ts.nodeIsMissing(node.moduleReference);
         }
         function isAliasResolvedToValue(symbol) {
+            var _a;
             if (!symbol) {
                 return false;
             }
@@ -74579,7 +74728,7 @@ var ts;
             if (target === unknownSymbol) {
                 return true;
             }
-            return !!(target.flags & 111551) &&
+            return !!(((_a = getAllSymbolFlags(target)) !== null && _a !== void 0 ? _a : -1) & 111551) &&
                 (ts.shouldPreserveConstEnums(compilerOptions) || !isConstEnumOrConstEnumOnlyModule(target));
         }
         function isConstEnumOrConstEnumOnlyModule(s) {
@@ -74594,7 +74743,7 @@ var ts;
                 }
                 var target = getSymbolLinks(symbol).aliasTarget;
                 if (target && ts.getEffectiveModifierFlags(node) & 1 &&
-                    target.flags & 111551 &&
+                    getAllSymbolFlags(target) & 111551 &&
                     (ts.shouldPreserveConstEnums(compilerOptions) || !isConstEnumOrConstEnumOnlyModule(target))) {
                     return true;
                 }
@@ -82400,8 +82549,11 @@ var ts;
                     }
                     return ts.visitEachChild(node, visitor, context);
                 case 174:
+                    return doWithContext(1 | 2, visitGetAccessorDeclaration, node);
                 case 175:
+                    return doWithContext(1 | 2, visitSetAccessorDeclaration, node);
                 case 173:
+                    return doWithContext(1 | 2, visitConstructorDeclaration, node);
                 case 260:
                 case 228:
                     return doWithContext(1 | 2, visitDefault, node);
@@ -82492,10 +82644,19 @@ var ts;
             }
             return ts.setOriginalNode(ts.setTextRange(factory.createYieldExpression(undefined, ts.visitNode(node.expression, visitor, ts.isExpression)), node), node);
         }
+        function visitConstructorDeclaration(node) {
+            return factory.updateConstructorDeclaration(node, ts.visitNodes(node.modifiers, visitor, ts.isModifierLike), ts.visitParameterList(node.parameters, visitor, context), transformMethodBody(node));
+        }
         function visitMethodDeclaration(node) {
             return factory.updateMethodDeclaration(node, ts.visitNodes(node.modifiers, visitor, ts.isModifierLike), node.asteriskToken, node.name, undefined, undefined, ts.visitParameterList(node.parameters, visitor, context), undefined, ts.getFunctionFlags(node) & 2
                 ? transformAsyncFunctionBody(node)
-                : ts.visitFunctionBody(node.body, visitor, context));
+                : transformMethodBody(node));
+        }
+        function visitGetAccessorDeclaration(node) {
+            return factory.updateGetAccessorDeclaration(node, ts.visitNodes(node.modifiers, visitor, ts.isModifierLike), node.name, ts.visitParameterList(node.parameters, visitor, context), undefined, transformMethodBody(node));
+        }
+        function visitSetAccessorDeclaration(node) {
+            return factory.updateSetAccessorDeclaration(node, ts.visitNodes(node.modifiers, visitor, ts.isModifierLike), node.name, ts.visitParameterList(node.parameters, visitor, context), transformMethodBody(node));
         }
         function visitFunctionDeclaration(node) {
             return factory.updateFunctionDeclaration(node, ts.visitNodes(node.modifiers, visitor, ts.isModifierLike), node.asteriskToken, node.name, undefined, ts.visitParameterList(node.parameters, visitor, context), undefined, ts.getFunctionFlags(node) & 2
@@ -82579,6 +82740,39 @@ var ts;
             }
             return false;
         }
+        function transformMethodBody(node) {
+            ts.Debug.assertIsDefined(node.body);
+            var savedCapturedSuperProperties = capturedSuperProperties;
+            var savedHasSuperElementAccess = hasSuperElementAccess;
+            capturedSuperProperties = new ts.Set();
+            hasSuperElementAccess = false;
+            var updated = ts.visitFunctionBody(node.body, visitor, context);
+            var originalMethod = ts.getOriginalNode(node, ts.isFunctionLikeDeclaration);
+            var emitSuperHelpers = languageVersion >= 2 &&
+                resolver.getNodeCheckFlags(node) & (4096 | 2048) &&
+                (ts.getFunctionFlags(originalMethod) & 3) !== 3;
+            if (emitSuperHelpers) {
+                enableSubstitutionForAsyncMethodsWithSuper();
+                if (capturedSuperProperties.size) {
+                    var variableStatement = createSuperAccessVariableStatement(factory, resolver, node, capturedSuperProperties);
+                    substitutedSuperAccessors[ts.getNodeId(variableStatement)] = true;
+                    var statements = updated.statements.slice();
+                    ts.insertStatementsAfterStandardPrologue(statements, [variableStatement]);
+                    updated = factory.updateBlock(updated, statements);
+                }
+                if (hasSuperElementAccess) {
+                    if (resolver.getNodeCheckFlags(node) & 4096) {
+                        ts.addEmitHelper(updated, ts.advancedAsyncSuperHelper);
+                    }
+                    else if (resolver.getNodeCheckFlags(node) & 2048) {
+                        ts.addEmitHelper(updated, ts.asyncSuperHelper);
+                    }
+                }
+            }
+            capturedSuperProperties = savedCapturedSuperProperties;
+            hasSuperElementAccess = savedHasSuperElementAccess;
+            return updated;
+        }
         function transformAsyncFunctionBody(node) {
             resumeLexicalEnvironment();
             var original = ts.getOriginalNode(node, ts.isFunctionLike);
@@ -83132,11 +83326,22 @@ var ts;
             }
             return node;
         }
-        function convertForOfStatementHead(node, boundValue) {
-            var binding = ts.createForOfBindingStatement(factory, node.initializer, boundValue);
+        function convertForOfStatementHead(node, boundValue, nonUserCode) {
+            var value = factory.createTempVariable(hoistVariableDeclaration);
+            var iteratorValueExpression = factory.createAssignment(value, boundValue);
+            var iteratorValueStatement = factory.createExpressionStatement(iteratorValueExpression);
+            ts.setSourceMapRange(iteratorValueStatement, node.expression);
+            var exitNonUserCodeExpression = factory.createAssignment(nonUserCode, factory.createFalse());
+            var exitNonUserCodeStatement = factory.createExpressionStatement(exitNonUserCodeExpression);
+            ts.setSourceMapRange(exitNonUserCodeStatement, node.expression);
+            var enterNonUserCodeExpression = factory.createAssignment(nonUserCode, factory.createTrue());
+            var enterNonUserCodeStatement = factory.createExpressionStatement(enterNonUserCodeExpression);
+            ts.setSourceMapRange(exitNonUserCodeStatement, node.expression);
+            var statements = [];
+            var binding = ts.createForOfBindingStatement(factory, node.initializer, value);
+            statements.push(ts.visitNode(binding, visitor, ts.isStatement));
             var bodyLocation;
             var statementsLocation;
-            var statements = [ts.visitNode(binding, visitor, ts.isStatement)];
             var statement = ts.visitIterationBody(node.statement, visitor, context);
             if (ts.isBlock(statement)) {
                 ts.addRange(statements, statement.statements);
@@ -83146,7 +83351,14 @@ var ts;
             else {
                 statements.push(statement);
             }
-            return ts.setEmitFlags(ts.setTextRange(factory.createBlock(ts.setTextRange(factory.createNodeArray(statements), statementsLocation), true), bodyLocation), 48 | 384);
+            var body = ts.setEmitFlags(ts.setTextRange(factory.createBlock(ts.setTextRange(factory.createNodeArray(statements), statementsLocation), true), bodyLocation), 48 | 384);
+            return factory.createBlock([
+                iteratorValueStatement,
+                exitNonUserCodeStatement,
+                factory.createTryStatement(body, undefined, factory.createBlock([
+                    enterNonUserCodeStatement
+                ]))
+            ]);
         }
         function createDownlevelAwait(expression) {
             return enclosingFunctionFlags & 1
@@ -83157,6 +83369,8 @@ var ts;
             var expression = ts.visitNode(node.expression, visitor, ts.isExpression);
             var iterator = ts.isIdentifier(expression) ? factory.getGeneratedNameForNode(expression) : factory.createTempVariable(undefined);
             var result = ts.isIdentifier(expression) ? factory.getGeneratedNameForNode(iterator) : factory.createTempVariable(undefined);
+            var nonUserCode = factory.createTempVariable(undefined);
+            var done = factory.createTempVariable(hoistVariableDeclaration);
             var errorRecord = factory.createUniqueName("e");
             var catchVariable = factory.getGeneratedNameForNode(errorRecord);
             var returnMethod = factory.createTempVariable(undefined);
@@ -83171,9 +83385,14 @@ var ts;
                 factory.inlineExpressions([factory.createAssignment(errorRecord, factory.createVoidZero()), callValues]) :
                 callValues;
             var forStatement = ts.setEmitFlags(ts.setTextRange(factory.createForStatement(ts.setEmitFlags(ts.setTextRange(factory.createVariableDeclarationList([
+                factory.createVariableDeclaration(nonUserCode, undefined, undefined, factory.createTrue()),
                 ts.setTextRange(factory.createVariableDeclaration(iterator, undefined, undefined, initializer), node.expression),
                 factory.createVariableDeclaration(result)
-            ]), node.expression), 2097152), factory.createComma(factory.createAssignment(result, createDownlevelAwait(callNext)), factory.createLogicalNot(getDone)), undefined, convertForOfStatementHead(node, getValue)), node), 256);
+            ]), node.expression), 2097152), factory.inlineExpressions([
+                factory.createAssignment(result, createDownlevelAwait(callNext)),
+                factory.createAssignment(done, getDone),
+                factory.createLogicalNot(done)
+            ]), undefined, convertForOfStatementHead(node, getValue, nonUserCode)), node), 256);
             ts.setOriginalNode(forStatement, node);
             return factory.createTryStatement(factory.createBlock([
                 factory.restoreEnclosingLabel(forStatement, outermostLabeledStatement)
@@ -83183,7 +83402,7 @@ var ts;
                 ])))
             ]), 1)), factory.createBlock([
                 factory.createTryStatement(factory.createBlock([
-                    ts.setEmitFlags(factory.createIfStatement(factory.createLogicalAnd(factory.createLogicalAnd(result, factory.createLogicalNot(getDone)), factory.createAssignment(returnMethod, factory.createPropertyAccessExpression(iterator, "return"))), factory.createExpressionStatement(createDownlevelAwait(callReturn))), 1)
+                    ts.setEmitFlags(factory.createIfStatement(factory.createLogicalAnd(factory.createLogicalAnd(factory.createLogicalNot(nonUserCode), factory.createLogicalNot(done)), factory.createAssignment(returnMethod, factory.createPropertyAccessExpression(iterator, "return"))), factory.createExpressionStatement(createDownlevelAwait(callReturn))), 1)
                 ]), undefined, ts.setEmitFlags(factory.createBlock([
                     ts.setEmitFlags(factory.createIfStatement(errorRecord, factory.createThrowStatement(factory.createPropertyAccessExpression(errorRecord, "error"))), 1)
                 ]), 1))
@@ -84747,11 +84966,13 @@ var ts;
             return ts.visitEachChild(node, visitorWithUnusedExpressionResult, context);
         }
         function visitIdentifier(node) {
-            if (!convertedLoopState) {
-                return node;
+            if (convertedLoopState) {
+                if (resolver.isArgumentsLocalBinding(node)) {
+                    return convertedLoopState.argumentsName || (convertedLoopState.argumentsName = factory.createUniqueName("arguments"));
+                }
             }
-            if (resolver.isArgumentsLocalBinding(node)) {
-                return convertedLoopState.argumentsName || (convertedLoopState.argumentsName = factory.createUniqueName("arguments"));
+            if (node.hasExtendedUnicodeEscape) {
+                return ts.setOriginalNode(ts.setTextRange(factory.createIdentifier(ts.unescapeLeadingUnderscores(node.escapedText)), node), node);
             }
             return node;
         }
@@ -87283,19 +87504,23 @@ var ts;
         }
         function transformAndEmitForInStatement(node) {
             if (containsYield(node)) {
+                var obj = declareLocal();
                 var keysArray = declareLocal();
                 var key = declareLocal();
                 var keysIndex = factory.createLoopVariable();
                 var initializer = node.initializer;
                 hoistVariableDeclaration(keysIndex);
+                emitAssignment(obj, ts.visitNode(node.expression, visitor, ts.isExpression));
                 emitAssignment(keysArray, factory.createArrayLiteralExpression());
-                emitStatement(factory.createForInStatement(key, ts.visitNode(node.expression, visitor, ts.isExpression), factory.createExpressionStatement(factory.createCallExpression(factory.createPropertyAccessExpression(keysArray, "push"), undefined, [key]))));
+                emitStatement(factory.createForInStatement(key, obj, factory.createExpressionStatement(factory.createCallExpression(factory.createPropertyAccessExpression(keysArray, "push"), undefined, [key]))));
                 emitAssignment(keysIndex, factory.createNumericLiteral(0));
                 var conditionLabel = defineLabel();
                 var incrementLabel = defineLabel();
-                var endLabel = beginLoopBlock(incrementLabel);
+                var endLoopLabel = beginLoopBlock(incrementLabel);
                 markLabel(conditionLabel);
-                emitBreakWhenFalse(endLabel, factory.createLessThan(keysIndex, factory.createPropertyAccessExpression(keysArray, "length")));
+                emitBreakWhenFalse(endLoopLabel, factory.createLessThan(keysIndex, factory.createPropertyAccessExpression(keysArray, "length")));
+                emitAssignment(key, factory.createElementAccessExpression(keysArray, keysIndex));
+                emitBreakWhenFalse(incrementLabel, factory.createBinaryExpression(key, 101, obj));
                 var variable = void 0;
                 if (ts.isVariableDeclarationList(initializer)) {
                     for (var _i = 0, _a = initializer.declarations; _i < _a.length; _i++) {
@@ -87308,7 +87533,7 @@ var ts;
                     variable = ts.visitNode(initializer, visitor, ts.isExpression);
                     ts.Debug.assert(ts.isLeftHandSideExpression(variable));
                 }
-                emitAssignment(variable, factory.createElementAccessExpression(keysArray, keysIndex));
+                emitAssignment(variable, key);
                 transformAndEmitEmbeddedStatement(node.statement);
                 markLabel(incrementLabel);
                 emitStatement(factory.createExpressionStatement(factory.createPostfixIncrement(keysIndex)));
@@ -88588,18 +88813,18 @@ var ts;
                     return createImportCallExpressionUMD(argument !== null && argument !== void 0 ? argument : factory.createVoidZero(), containsLexicalThis);
                 case ts.ModuleKind.CommonJS:
                 default:
-                    return createImportCallExpressionCommonJS(argument, containsLexicalThis);
+                    return createImportCallExpressionCommonJS(argument);
             }
         }
         function createImportCallExpressionUMD(arg, containsLexicalThis) {
             needUMDDynamicImportHelper = true;
             if (ts.isSimpleCopiableExpression(arg)) {
                 var argClone = ts.isGeneratedIdentifier(arg) ? arg : ts.isStringLiteral(arg) ? factory.createStringLiteralFromNode(arg) : ts.setEmitFlags(ts.setTextRange(factory.cloneNode(arg), arg), 1536);
-                return factory.createConditionalExpression(factory.createIdentifier("__syncRequire"), undefined, createImportCallExpressionCommonJS(arg, containsLexicalThis), undefined, createImportCallExpressionAMD(argClone, containsLexicalThis));
+                return factory.createConditionalExpression(factory.createIdentifier("__syncRequire"), undefined, createImportCallExpressionCommonJS(arg), undefined, createImportCallExpressionAMD(argClone, containsLexicalThis));
             }
             else {
                 var temp = factory.createTempVariable(hoistVariableDeclaration);
-                return factory.createComma(factory.createAssignment(temp, arg), factory.createConditionalExpression(factory.createIdentifier("__syncRequire"), undefined, createImportCallExpressionCommonJS(temp, containsLexicalThis), undefined, createImportCallExpressionAMD(temp, containsLexicalThis)));
+                return factory.createComma(factory.createAssignment(temp, arg), factory.createConditionalExpression(factory.createIdentifier("__syncRequire"), undefined, createImportCallExpressionCommonJS(temp, true), undefined, createImportCallExpressionAMD(temp, containsLexicalThis)));
             }
         }
         function createImportCallExpressionAMD(arg, containsLexicalThis) {
@@ -88628,9 +88853,10 @@ var ts;
             }
             return promise;
         }
-        function createImportCallExpressionCommonJS(arg, containsLexicalThis) {
+        function createImportCallExpressionCommonJS(arg, isInlineable) {
+            var temp = arg && !ts.isSimpleInlineableExpression(arg) && !isInlineable ? factory.createTempVariable(hoistVariableDeclaration) : undefined;
             var promiseResolveCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Promise"), "resolve"), undefined, []);
-            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), undefined, arg ? [arg] : []);
+            var requireCall = factory.createCallExpression(factory.createIdentifier("require"), undefined, temp ? [temp] : arg ? [arg] : []);
             if (ts.getESModuleInterop(compilerOptions)) {
                 requireCall = emitHelpers().createImportStarHelper(requireCall);
             }
@@ -88640,11 +88866,9 @@ var ts;
             }
             else {
                 func = factory.createFunctionExpression(undefined, undefined, undefined, undefined, [], undefined, factory.createBlock([factory.createReturnStatement(requireCall)]));
-                if (containsLexicalThis) {
-                    ts.setEmitFlags(func, 8);
-                }
             }
-            return factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), undefined, [func]);
+            var downleveledImport = factory.createCallExpression(factory.createPropertyAccessExpression(promiseResolveCall, "then"), undefined, [func]);
+            return temp === undefined ? downleveledImport : factory.createCommaListExpression([factory.createAssignment(temp, arg), downleveledImport]);
         }
         function getHelperExpressionForExport(node, innerExpr) {
             if (!ts.getESModuleInterop(compilerOptions) || ts.getEmitFlags(node) & 67108864) {
@@ -97913,14 +98137,16 @@ var ts;
             }
             return setReadFileCache(key, fileName);
         };
-        var getSourceFileWithCache = getSourceFile ? function (fileName, languageVersion, onError, shouldCreateNewSourceFile) {
+        var getSourceFileWithCache = getSourceFile ? function (fileName, languageVersionOrOptions, onError, shouldCreateNewSourceFile) {
             var key = toPath(fileName);
-            var value = sourceFileCache.get(key);
+            var impliedNodeFormat = typeof languageVersionOrOptions === "object" ? languageVersionOrOptions.impliedNodeFormat : undefined;
+            var forImpliedNodeFormat = sourceFileCache.get(impliedNodeFormat);
+            var value = forImpliedNodeFormat === null || forImpliedNodeFormat === void 0 ? void 0 : forImpliedNodeFormat.get(key);
             if (value)
                 return value;
-            var sourceFile = getSourceFile(fileName, languageVersion, onError, shouldCreateNewSourceFile);
+            var sourceFile = getSourceFile(fileName, languageVersionOrOptions, onError, shouldCreateNewSourceFile);
             if (sourceFile && (ts.isDeclarationFileName(fileName) || ts.fileExtensionIs(fileName, ".json"))) {
-                sourceFileCache.set(key, sourceFile);
+                sourceFileCache.set(impliedNodeFormat, (forImpliedNodeFormat || new ts.Map()).set(key, sourceFile));
             }
             return sourceFile;
         } : undefined;
@@ -97944,13 +98170,15 @@ var ts;
                 var value = readFileCache.get(key);
                 if (value !== undefined && value !== data) {
                     readFileCache.delete(key);
-                    sourceFileCache.delete(key);
+                    sourceFileCache.forEach(function (map) { return map.delete(key); });
                 }
                 else if (getSourceFileWithCache) {
-                    var sourceFile = sourceFileCache.get(key);
-                    if (sourceFile && sourceFile.text !== data) {
-                        sourceFileCache.delete(key);
-                    }
+                    sourceFileCache.forEach(function (map) {
+                        var sourceFile = map.get(key);
+                        if (sourceFile && sourceFile.text !== data) {
+                            map.delete(key);
+                        }
+                    });
                 }
                 originalWriteFile.call.apply(originalWriteFile, __spreadArray([host, fileName, data], rest, false));
             };
@@ -101566,7 +101794,7 @@ var ts;
         var canCopyEmitSignatures = compilerOptions.composite &&
             (oldState === null || oldState === void 0 ? void 0 : oldState.emitSignatures) &&
             !outFilePath &&
-            !ts.compilerOptionsAffectDeclarationPath(compilerOptions, oldCompilerOptions);
+            !ts.compilerOptionsAffectDeclarationPath(compilerOptions, oldState.compilerOptions);
         if (useOldState) {
             (_a = oldState.changedFilesSet) === null || _a === void 0 ? void 0 : _a.forEach(function (value) { return state.changedFilesSet.add(value); });
             if (!outFilePath && oldState.affectedFilesPendingEmit) {
@@ -102003,7 +102231,8 @@ var ts;
             for (var _b = 0, _c = state.affectedFilesPendingEmit.slice(state.affectedFilesPendingEmitIndex).sort(ts.compareStringsCaseSensitive); _b < _c.length; _b++) {
                 var path = _c[_b];
                 if (ts.tryAddToSet(seenFiles, path)) {
-                    (affectedFilesPendingEmit || (affectedFilesPendingEmit = [])).push([toFileId(path), state.affectedFilesPendingEmitKind.get(path)]);
+                    var fileId = toFileId(path), emitKind = state.affectedFilesPendingEmitKind.get(path);
+                    (affectedFilesPendingEmit || (affectedFilesPendingEmit = [])).push(emitKind === 1 ? fileId : [fileId]);
                 }
             }
         }
@@ -102408,6 +102637,10 @@ var ts;
                 { version: fileInfo.version, signature: fileInfo.signature === false ? undefined : fileInfo.version, affectsGlobalScope: fileInfo.affectsGlobalScope, impliedFormat: fileInfo.impliedFormat };
     }
     ts.toBuilderStateFileInfo = toBuilderStateFileInfo;
+    function toBuilderFileEmit(value) {
+        return ts.isNumber(value) ? 1 : 0;
+    }
+    ts.toBuilderFileEmit = toBuilderFileEmit;
     function createBuilderProgramUsingProgramBuildInfo(program, buildInfoPath, host) {
         var _a, _b, _c, _d;
         var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
@@ -102449,8 +102682,8 @@ var ts;
                 exportedModulesMap: toManyToManyPathMap(program.exportedModulesMap),
                 semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && ts.arrayToMap(program.semanticDiagnosticsPerFile, function (value) { return toFilePath(ts.isNumber(value) ? value : value[0]); }, function (value) { return ts.isNumber(value) ? ts.emptyArray : value[1]; }),
                 hasReusableDiagnostic: true,
-                affectedFilesPendingEmit: ts.map(program.affectedFilesPendingEmit, function (value) { return toFilePath(value[0]); }),
-                affectedFilesPendingEmitKind: program.affectedFilesPendingEmit && ts.arrayToMap(program.affectedFilesPendingEmit, function (value) { return toFilePath(value[0]); }, function (value) { return value[1]; }),
+                affectedFilesPendingEmit: ts.map(program.affectedFilesPendingEmit, function (value) { return toFilePath(ts.isNumber(value) ? value : value[0]); }),
+                affectedFilesPendingEmitKind: program.affectedFilesPendingEmit && ts.arrayToMap(program.affectedFilesPendingEmit, function (value) { return toFilePath(ts.isNumber(value) ? value : value[0]); }, toBuilderFileEmit),
                 affectedFilesPendingEmitIndex: program.affectedFilesPendingEmit && 0,
                 changedFilesSet: new ts.Set(ts.map(program.changeFileSet, toFilePath)),
                 latestChangedDtsFile: latestChangedDtsFile,
@@ -102588,7 +102821,7 @@ var ts;
         var isNonDirectorySeparatorRoot = rootLength > 1 || dirPath.charCodeAt(0) !== 47;
         if (isNonDirectorySeparatorRoot &&
             dirPath.search(/[a-zA-Z]:/) !== 0 &&
-            pathPartForUserCheck.search(/[a-zA-z]\$\//) === 0) {
+            pathPartForUserCheck.search(/[a-zA-Z]\$\//) === 0) {
             nextDirectorySeparator = dirPath.indexOf(ts.directorySeparator, nextDirectorySeparator + 1);
             if (nextDirectorySeparator === -1) {
                 return false;
@@ -103678,7 +103911,7 @@ var ts;
                 importedFileFromNodeModules = importedFileFromNodeModules || isInNodeModules;
             });
             var sortedPaths = [];
-            var _loop_36 = function (directory) {
+            var _loop_35 = function (directory) {
                 var directoryStart = ts.ensureTrailingDirectorySeparator(directory);
                 var pathsInDirectory;
                 allFileNames.forEach(function (_a, fileName) {
@@ -103702,9 +103935,9 @@ var ts;
             };
             var out_directory_1;
             for (var directory = ts.getDirectoryPath(importingFileName); allFileNames.size !== 0;) {
-                var state_12 = _loop_36(directory);
+                var state_11 = _loop_35(directory);
                 directory = out_directory_1;
-                if (state_12 === "break")
+                if (state_11 === "break")
                     break;
             }
             if (allFileNames.size) {
@@ -103763,7 +103996,7 @@ var ts;
         }
         function tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, host, compilerOptions) {
             for (var key in paths) {
-                var _loop_37 = function (patternText_1) {
+                var _loop_36 = function (patternText_1) {
                     var pattern = ts.normalizePath(patternText_1);
                     var indexOfStar = pattern.indexOf("*");
                     var candidates = allowedEndings.map(function (ending) { return ({
@@ -103794,9 +104027,9 @@ var ts;
                 };
                 for (var _i = 0, _a = paths[key]; _i < _a.length; _i++) {
                     var patternText_1 = _a[_i];
-                    var state_13 = _loop_37(patternText_1);
-                    if (typeof state_13 === "object")
-                        return state_13.value;
+                    var state_12 = _loop_36(patternText_1);
+                    if (typeof state_12 === "object")
+                        return state_12.value;
                 }
             }
             function validateEnding(_a) {
@@ -103865,15 +104098,21 @@ var ts;
             return undefined;
         }
         function tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, ending, compilerOptions) {
-            var normalizedTargetPath = getPathRelativeToRootDirs(moduleFileName, rootDirs, getCanonicalFileName);
-            if (normalizedTargetPath === undefined) {
+            var normalizedTargetPaths = getPathsRelativeToRootDirs(moduleFileName, rootDirs, getCanonicalFileName);
+            if (normalizedTargetPaths === undefined) {
+                return undefined;
+            }
+            var normalizedSourcePaths = getPathsRelativeToRootDirs(sourceDirectory, rootDirs, getCanonicalFileName);
+            var relativePaths = ts.flatMap(normalizedSourcePaths, function (sourcePath) {
+                return ts.map(normalizedTargetPaths, function (targetPath) { return ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(sourcePath, targetPath, getCanonicalFileName)); });
+            });
+            var shortest = ts.min(relativePaths, ts.compareNumberOfDirectorySeparators);
+            if (!shortest) {
                 return undefined;
             }
-            var normalizedSourcePath = getPathRelativeToRootDirs(sourceDirectory, rootDirs, getCanonicalFileName);
-            var relativePath = normalizedSourcePath !== undefined ? ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(normalizedSourcePath, normalizedTargetPath, getCanonicalFileName)) : normalizedTargetPath;
             return ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeJs
-                ? removeExtensionAndIndexPostFix(relativePath, ending, compilerOptions)
-                : ts.removeFileExtension(relativePath);
+                ? removeExtensionAndIndexPostFix(shortest, ending, compilerOptions)
+                : ts.removeFileExtension(shortest);
         }
         function tryGetModuleNameAsNodeModule(_a, _b, importingSourceFile, host, options, userPreferences, packageNameOnly, overrideMode) {
             var path = _a.path, isRedirect = _a.isRedirect;
@@ -103993,8 +104232,8 @@ var ts;
                 }
             }
         }
-        function getPathRelativeToRootDirs(path, rootDirs, getCanonicalFileName) {
-            return ts.firstDefined(rootDirs, function (rootDir) {
+        function getPathsRelativeToRootDirs(path, rootDirs, getCanonicalFileName) {
+            return ts.mapDefined(rootDirs, function (rootDir) {
                 var relativePath = getRelativePathIfInDirectory(path, rootDir, getCanonicalFileName);
                 return relativePath !== undefined && isPathRelativeToParent(relativePath) ? undefined : relativePath;
             });
@@ -106380,7 +106619,9 @@ var ts;
             }
             if (buildInfo.program) {
                 if (((_a = buildInfo.program.changeFileSet) === null || _a === void 0 ? void 0 : _a.length) ||
-                    (!project.options.noEmit && ((_b = buildInfo.program.affectedFilesPendingEmit) === null || _b === void 0 ? void 0 : _b.length))) {
+                    (!project.options.noEmit ?
+                        (_b = buildInfo.program.affectedFilesPendingEmit) === null || _b === void 0 ? void 0 : _b.length :
+                        ts.some(buildInfo.program.semanticDiagnosticsPerFile, ts.isArray))) {
                     return {
                         type: ts.UpToDateStatusType.OutOfDateBuildInfo,
                         buildInfoFile: buildInfoPath