typescript 4.6.0-dev.20220210 → 4.7.0-dev.20220216

package/lib/tsserverlibrary.js

@@ -290,11 +290,11 @@ var ts;
 (function (ts) {
     // WARNING: The script `configurePrerelease.ts` uses a regexp to parse out these values.
     // If changing the text in this section, be sure to test `configurePrerelease` too.
-    ts.versionMajorMinor = "4.6";
+    ts.versionMajorMinor = "4.7";
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220210";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220216";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -5034,6 +5034,8 @@ var ts;
         TypeFlags[TypeFlags["ESSymbolLike"] = 12288] = "ESSymbolLike";
         TypeFlags[TypeFlags["VoidLike"] = 49152] = "VoidLike";
         /* @internal */
+        TypeFlags[TypeFlags["DefinitelyNonNullable"] = 470302716] = "DefinitelyNonNullable";
+        /* @internal */
         TypeFlags[TypeFlags["DisjointDomains"] = 469892092] = "DisjointDomains";
         TypeFlags[TypeFlags["UnionOrIntersection"] = 3145728] = "UnionOrIntersection";
         TypeFlags[TypeFlags["StructuredType"] = 3670016] = "StructuredType";
@@ -5766,6 +5768,8 @@ var ts;
         BundleFileSectionKind["NoDefaultLib"] = "no-default-lib";
         BundleFileSectionKind["Reference"] = "reference";
         BundleFileSectionKind["Type"] = "type";
+        BundleFileSectionKind["TypeResolutionModeRequire"] = "type-require";
+        BundleFileSectionKind["TypeResolutionModeImport"] = "type-import";
         BundleFileSectionKind["Lib"] = "lib";
         BundleFileSectionKind["Prepend"] = "prepend";
         BundleFileSectionKind["Text"] = "text";
@@ -5882,7 +5886,8 @@ var ts;
                 { name: "types", optional: true, captureSpan: true },
                 { name: "lib", optional: true, captureSpan: true },
                 { name: "path", optional: true, captureSpan: true },
-                { name: "no-default-lib", optional: true }
+                { name: "no-default-lib", optional: true },
+                { name: "resolution-mode", optional: true }
             ],
             kind: 1 /* TripleSlashXML */
         },
@@ -7830,18 +7835,6 @@ var ts;
         return getCanonicalFileName(nonCanonicalizedPath);
     }
     ts.toPath = toPath;
-    function normalizePathAndParts(path) {
-        path = normalizeSlashes(path);
-        var _a = reducePathComponents(getPathComponents(path)), root = _a[0], parts = _a.slice(1);
-        if (parts.length) {
-            var joinedParts = root + parts.join(ts.directorySeparator);
-            return { path: hasTrailingDirectorySeparator(path) ? ensureTrailingDirectorySeparator(joinedParts) : joinedParts, parts: parts };
-        }
-        else {
-            return { path: root, parts: parts };
-        }
-    }
-    ts.normalizePathAndParts = normalizePathAndParts;
     function removeTrailingDirectorySeparator(path) {
         if (hasTrailingDirectorySeparator(path)) {
             return path.substr(0, path.length - 1);
@@ -8274,6 +8267,9 @@ var ts;
         An_optional_element_cannot_follow_a_rest_element: diag(1266, ts.DiagnosticCategory.Error, "An_optional_element_cannot_follow_a_rest_element_1266", "An optional element cannot follow a rest element."),
         Property_0_cannot_have_an_initializer_because_it_is_marked_abstract: diag(1267, ts.DiagnosticCategory.Error, "Property_0_cannot_have_an_initializer_because_it_is_marked_abstract_1267", "Property '{0}' cannot have an initializer because it is marked abstract."),
         An_index_signature_parameter_type_must_be_string_number_symbol_or_a_template_literal_type: diag(1268, ts.DiagnosticCategory.Error, "An_index_signature_parameter_type_must_be_string_number_symbol_or_a_template_literal_type_1268", "An index signature parameter type must be 'string', 'number', 'symbol', or a template literal type."),
+        Cannot_use_export_import_on_a_type_or_type_only_namespace_when_the_isolatedModules_flag_is_provided: diag(1269, ts.DiagnosticCategory.Error, "Cannot_use_export_import_on_a_type_or_type_only_namespace_when_the_isolatedModules_flag_is_provided_1269", "Cannot use 'export import' on a type or type-only namespace when the '--isolatedModules' flag is provided."),
+        Decorator_function_return_type_0_is_not_assignable_to_type_1: diag(1270, ts.DiagnosticCategory.Error, "Decorator_function_return_type_0_is_not_assignable_to_type_1_1270", "Decorator function return type '{0}' is not assignable to type '{1}'."),
+        Decorator_function_return_type_is_0_but_is_expected_to_be_void_or_any: diag(1271, ts.DiagnosticCategory.Error, "Decorator_function_return_type_is_0_but_is_expected_to_be_void_or_any_1271", "Decorator function return type is '{0}' but is expected to be 'void' or 'any'."),
         with_statements_are_not_allowed_in_an_async_function_block: diag(1300, ts.DiagnosticCategory.Error, "with_statements_are_not_allowed_in_an_async_function_block_1300", "'with' statements are not allowed in an async function block."),
         await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules: diag(1308, ts.DiagnosticCategory.Error, "await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules_1308", "'await' expressions are only allowed within async functions and at the top levels of modules."),
         Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_part_of_a_destructuring_pattern: diag(1312, ts.DiagnosticCategory.Error, "Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_1312", "Did you mean to use a ':'? An '=' can only follow a property name when the containing object literal is part of a destructuring pattern."),
@@ -8407,6 +8403,8 @@ var ts;
         Preserve_unused_imported_values_in_the_JavaScript_output_that_would_otherwise_be_removed: diag(1449, ts.DiagnosticCategory.Message, "Preserve_unused_imported_values_in_the_JavaScript_output_that_would_otherwise_be_removed_1449", "Preserve unused imported values in the JavaScript output that would otherwise be removed."),
         Dynamic_imports_can_only_accept_a_module_specifier_and_an_optional_assertion_as_arguments: diag(1450, ts.DiagnosticCategory.Message, "Dynamic_imports_can_only_accept_a_module_specifier_and_an_optional_assertion_as_arguments_1450", "Dynamic imports can only accept a module specifier and an optional assertion as arguments"),
         Private_identifiers_are_only_allowed_in_class_bodies_and_may_only_be_used_as_part_of_a_class_member_declaration_property_access_or_on_the_left_hand_side_of_an_in_expression: diag(1451, ts.DiagnosticCategory.Error, "Private_identifiers_are_only_allowed_in_class_bodies_and_may_only_be_used_as_part_of_a_class_member__1451", "Private identifiers are only allowed in class bodies and may only be used as part of a class member declaration, property access, or on the left-hand-side of an 'in' expression"),
+        Resolution_modes_are_only_supported_when_moduleResolution_is_node12_or_nodenext: diag(1452, ts.DiagnosticCategory.Error, "Resolution_modes_are_only_supported_when_moduleResolution_is_node12_or_nodenext_1452", "Resolution modes are only supported when `moduleResolution` is `node12` or `nodenext`."),
+        resolution_mode_should_be_either_require_or_import: diag(1453, ts.DiagnosticCategory.Error, "resolution_mode_should_be_either_require_or_import_1453", "`resolution-mode` should be either `require` or `import`."),
         The_import_meta_meta_property_is_not_allowed_in_files_which_will_build_into_CommonJS_output: diag(1470, ts.DiagnosticCategory.Error, "The_import_meta_meta_property_is_not_allowed_in_files_which_will_build_into_CommonJS_output_1470", "The 'import.meta' meta-property is not allowed in files which will build into CommonJS output."),
         Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_cannot_be_imported_synchronously_Use_dynamic_import_instead: diag(1471, ts.DiagnosticCategory.Error, "Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_c_1471", "Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead."),
         catch_or_finally_expected: diag(1472, ts.DiagnosticCategory.Error, "catch_or_finally_expected_1472", "'catch' or 'finally' expected."),
@@ -9832,6 +9830,9 @@ var ts;
         Add_all_missing_attributes: diag(95168, ts.DiagnosticCategory.Message, "Add_all_missing_attributes_95168", "Add all missing attributes"),
         Add_undefined_to_optional_property_type: diag(95169, ts.DiagnosticCategory.Message, "Add_undefined_to_optional_property_type_95169", "Add 'undefined' to optional property type"),
         Convert_named_imports_to_default_import: diag(95170, ts.DiagnosticCategory.Message, "Convert_named_imports_to_default_import_95170", "Convert named imports to default import"),
+        Delete_unused_param_tag_0: diag(95171, ts.DiagnosticCategory.Message, "Delete_unused_param_tag_0_95171", "Delete unused '@param' tag '{0}'"),
+        Delete_all_unused_param_tags: diag(95172, ts.DiagnosticCategory.Message, "Delete_all_unused_param_tags_95172", "Delete all unused '@param' tags"),
+        Rename_param_tag_name_0_to_1: diag(95173, ts.DiagnosticCategory.Message, "Rename_param_tag_name_0_to_1_95173", "Rename '@param' tag name '{0}' to '{1}'"),
         No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, ts.DiagnosticCategory.Error, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
         Classes_may_not_have_a_field_named_constructor: diag(18006, ts.DiagnosticCategory.Error, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
         JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, ts.DiagnosticCategory.Error, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -14287,7 +14288,11 @@ var ts;
         ts.Debug.assert(names.length === newResolutions.length);
         for (var i = 0; i < names.length; i++) {
             var newResolution = newResolutions[i];
-            var oldResolution = oldResolutions && oldResolutions.get(names[i], oldSourceFile && ts.getModeForResolutionAtIndex(oldSourceFile, i));
+            var entry = names[i];
+            // We lower-case all type references because npm automatically lowercases all packages. See GH#9824.
+            var name = !ts.isString(entry) ? entry.fileName.toLowerCase() : entry;
+            var mode = !ts.isString(entry) ? ts.getModeForFileReference(entry, oldSourceFile === null || oldSourceFile === void 0 ? void 0 : oldSourceFile.impliedNodeFormat) : oldSourceFile && ts.getModeForResolutionAtIndex(oldSourceFile, i);
+            var oldResolution = oldResolutions && oldResolutions.get(name, mode);
             var changed = oldResolution
                 ? !newResolution || !comparer(oldResolution, newResolution)
                 : newResolution;
@@ -26882,7 +26887,13 @@ var ts;
                     referencedFiles = ts.append(referencedFiles, { pos: -1, end: -1, fileName: section.data });
                     break;
                 case "type" /* Type */:
-                    typeReferenceDirectives = ts.append(typeReferenceDirectives, section.data);
+                    typeReferenceDirectives = ts.append(typeReferenceDirectives, { pos: -1, end: -1, fileName: section.data });
+                    break;
+                case "type-import" /* TypeResolutionModeImport */:
+                    typeReferenceDirectives = ts.append(typeReferenceDirectives, { pos: -1, end: -1, fileName: section.data, resolutionMode: ts.ModuleKind.ESNext });
+                    break;
+                case "type-require" /* TypeResolutionModeRequire */:
+                    typeReferenceDirectives = ts.append(typeReferenceDirectives, { pos: -1, end: -1, fileName: section.data, resolutionMode: ts.ModuleKind.CommonJS });
                     break;
                 case "lib" /* Lib */:
                     libReferenceDirectives = ts.append(libReferenceDirectives, { pos: -1, end: -1, fileName: section.data });
@@ -26941,6 +26952,8 @@ var ts;
                 case "no-default-lib" /* NoDefaultLib */:
                 case "reference" /* Reference */:
                 case "type" /* Type */:
+                case "type-import" /* TypeResolutionModeImport */:
+                case "type-require" /* TypeResolutionModeRequire */:
                 case "lib" /* Lib */:
                     syntheticReferences = ts.append(syntheticReferences, ts.setTextRange(ts.factory.createUnparsedSyntheticReference(section), section));
                     break;
@@ -30854,7 +30867,7 @@ var ts;
             initializeState("", content, languageVersion, /*syntaxCursor*/ undefined, 1 /* JS */);
             // Prime the scanner.
             nextToken();
-            var entityName = parseEntityName(/*allowReservedWords*/ true);
+            var entityName = parseEntityName(/*allowReservedWords*/ true, /*allowPrivateIdentifiers*/ false);
             var isInvalid = token() === 1 /* EndOfFileToken */ && !parseDiagnostics.length;
             clearState();
             return isInvalid ? entityName : undefined;
@@ -32431,7 +32444,7 @@ var ts;
             }
             return createMissingList();
         }
-        function parseEntityName(allowReservedWords, diagnosticMessage) {
+        function parseEntityName(allowReservedWords, allowPrivateIdentifiers, diagnosticMessage) {
             var pos = getNodePos();
             var entity = allowReservedWords ? parseIdentifierName(diagnosticMessage) : parseIdentifier(diagnosticMessage);
             var dotPos = getNodePos();
@@ -32442,7 +32455,7 @@ var ts;
                     break;
                 }
                 dotPos = getNodePos();
-                entity = finishNode(factory.createQualifiedName(entity, parseRightSideOfDot(allowReservedWords, /* allowPrivateIdentifiers */ false)), pos);
+                entity = finishNode(factory.createQualifiedName(entity, parseRightSideOfDot(allowReservedWords, allowPrivateIdentifiers)), pos);
             }
             return entity;
         }
@@ -32575,7 +32588,7 @@ var ts;
         }
         // TYPES
         function parseEntityNameOfTypeReference() {
-            return parseEntityName(/*allowReservedWords*/ true, ts.Diagnostics.Type_expected);
+            return parseEntityName(/*allowReservedWords*/ true, /*allowPrivateIdentifiers*/ false, ts.Diagnostics.Type_expected);
         }
         function parseTypeArgumentsOfTypeReference() {
             if (!scanner.hasPrecedingLineBreak() && reScanLessThanToken() === 29 /* LessThanToken */) {
@@ -32708,7 +32721,7 @@ var ts;
         function parseTypeQuery() {
             var pos = getNodePos();
             parseExpected(112 /* TypeOfKeyword */);
-            return finishNode(factory.createTypeQueryNode(parseEntityName(/*allowReservedWords*/ true)), pos);
+            return finishNode(factory.createTypeQueryNode(parseEntityName(/*allowReservedWords*/ true, /*allowPrivateIdentifiers*/ true)), pos);
         }
         function parseTypeParameter() {
             var pos = getNodePos();
@@ -35279,11 +35292,12 @@ var ts;
         }
         function parseCaseClause() {
             var pos = getNodePos();
+            var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(82 /* CaseKeyword */);
             var expression = allowInAnd(parseExpression);
             parseExpected(58 /* ColonToken */);
             var statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
-            return finishNode(factory.createCaseClause(expression, statements), pos);
+            return withJSDoc(finishNode(factory.createCaseClause(expression, statements), pos), hasJSDoc);
         }
         function parseDefaultClause() {
             var pos = getNodePos();
@@ -36446,7 +36460,7 @@ var ts;
         function parseModuleReference() {
             return isExternalModuleReference()
                 ? parseExternalModuleReference()
-                : parseEntityName(/*allowReservedWords*/ false);
+                : parseEntityName(/*allowReservedWords*/ false, /*allowPrivateIdentifiers*/ false);
         }
         function parseExternalModuleReference() {
             var pos = getNodePos();
@@ -36728,7 +36742,7 @@ var ts;
                 var pos = getNodePos();
                 var hasBrace = parseOptional(18 /* OpenBraceToken */);
                 var p2 = getNodePos();
-                var entityName = parseEntityName(/* allowReservedWords*/ false);
+                var entityName = parseEntityName(/* allowReservedWords*/ false, /*allowPrivateIdentifiers*/ false);
                 while (token() === 80 /* PrivateIdentifier */) {
                     reScanHashToken(); // rescan #id as # id
                     nextTokenJSDoc(); // then skip the #
@@ -37171,7 +37185,7 @@ var ts;
                     // parseEntityName logs an error for non-identifier, so create a MissingNode ourselves to avoid the error
                     var p2 = getNodePos();
                     var name = ts.tokenIsIdentifierOrKeyword(token())
-                        ? parseEntityName(/*allowReservedWords*/ true)
+                        ? parseEntityName(/*allowReservedWords*/ true, /*allowPrivateIdentifiers*/ false)
                         : undefined;
                     if (name) {
                         while (token() === 80 /* PrivateIdentifier */) {
@@ -37196,11 +37210,13 @@ var ts;
                         && nextTokenJSDoc() === 59 /* AtToken */
                         && ts.tokenIsIdentifierOrKeyword(nextTokenJSDoc())) {
                         var kind = scanner.getTokenValue();
-                        if (kind === "link" || kind === "linkcode" || kind === "linkplain") {
+                        if (isJSDocLinkTag(kind))
                             return kind;
-                        }
                     }
                 }
+                function isJSDocLinkTag(kind) {
+                    return kind === "link" || kind === "linkcode" || kind === "linkplain";
+                }
                 function parseUnknownTag(start, tagName, indent, indentText) {
                     return finishNode(factory.createJSDocUnknownTag(tagName, parseTrailingTagComments(start, getNodePos(), indent, indentText)), start);
                 }
@@ -37306,7 +37322,7 @@ var ts;
                 }
                 function parseSeeTag(start, tagName, indent, indentText) {
                     var isMarkdownOrJSDocLink = token() === 22 /* OpenBracketToken */
-                        || lookAhead(function () { return nextTokenJSDoc() === 59 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextTokenJSDoc()) && scanner.getTokenValue() === "link"; });
+                        || lookAhead(function () { return nextTokenJSDoc() === 59 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextTokenJSDoc()) && isJSDocLinkTag(scanner.getTokenValue()); });
                     var nameExpression = isMarkdownOrJSDocLink ? undefined : parseJSDocNameReference();
                     var comments = indent !== undefined && indentText !== undefined ? parseTrailingTagComments(start, getNodePos(), indent, indentText) : undefined;
                     return finishNode(factory.createJSDocSeeTag(tagName, nameExpression, comments), start);
@@ -38173,6 +38189,19 @@ var ts;
         return ts.fileExtensionIsOneOf(fileName, [".d.ts" /* Dts */, ".d.mts" /* Dmts */, ".d.cts" /* Dcts */]);
     }
     ts.isDeclarationFileName = isDeclarationFileName;
+    function parseResolutionMode(mode, pos, end, reportDiagnostic) {
+        if (!mode) {
+            return undefined;
+        }
+        if (mode === "import") {
+            return ts.ModuleKind.ESNext;
+        }
+        if (mode === "require") {
+            return ts.ModuleKind.CommonJS;
+        }
+        reportDiagnostic(pos, end - pos, ts.Diagnostics.resolution_mode_should_be_either_require_or_import);
+        return undefined;
+    }
     /*@internal*/
     function processCommentPragmas(context, sourceText) {
         var pragmas = [];
@@ -38215,12 +38244,13 @@ var ts;
                     var typeReferenceDirectives_1 = context.typeReferenceDirectives;
                     var libReferenceDirectives_1 = context.libReferenceDirectives;
                     ts.forEach(ts.toArray(entryOrList), function (arg) {
-                        var _a = arg.arguments, types = _a.types, lib = _a.lib, path = _a.path;
+                        var _a = arg.arguments, types = _a.types, lib = _a.lib, path = _a.path, res = _a["resolution-mode"];
                         if (arg.arguments["no-default-lib"]) {
                             context.hasNoDefaultLib = true;
                         }
                         else if (types) {
-                            typeReferenceDirectives_1.push({ pos: types.pos, end: types.end, fileName: types.value });
+                            var parsed = parseResolutionMode(res, types.pos, types.end, reportDiagnostic);
+                            typeReferenceDirectives_1.push(__assign({ pos: types.pos, end: types.end, fileName: types.value }, (parsed ? { resolutionMode: parsed } : {})));
                         }
                         else if (lib) {
                             libReferenceDirectives_1.push({ pos: lib.pos, end: lib.end, fileName: lib.value });
@@ -41798,14 +41828,14 @@ var ts;
      * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
      * is assumed to be the same as root directory of the project.
      */
-    function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, cache) {
+    function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, cache, resolutionMode) {
         var traceEnabled = isTraceEnabled(options, host);
         if (redirectedReference) {
             options = redirectedReference.commandLine.options;
         }
         var containingDirectory = containingFile ? ts.getDirectoryPath(containingFile) : undefined;
         var perFolderCache = containingDirectory ? cache && cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference) : undefined;
-        var result = perFolderCache && perFolderCache.get(typeReferenceDirectiveName, /*mode*/ undefined);
+        var result = perFolderCache && perFolderCache.get(typeReferenceDirectiveName, /*mode*/ resolutionMode);
         if (result) {
             if (traceEnabled) {
                 trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1, typeReferenceDirectiveName, containingFile);
@@ -41840,7 +41870,18 @@ var ts;
         }
         var failedLookupLocations = [];
         var features = getDefaultNodeResolutionFeatures(options);
-        var moduleResolutionState = { compilerOptions: options, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations, packageJsonInfoCache: cache, features: features, conditions: ["node", "require", "types"] };
+        // Unlike `import` statements, whose mode-calculating APIs are all guaranteed to return `undefined` if we're in an un-mode-ed module resolution
+        // setting, type references will return their target mode regardless of options because of how the parser works, so we guard against the mode being
+        // set in a non-modal module resolution setting here. Do note that our behavior is not particularly well defined when these mode-overriding imports
+        // are present in a non-modal project; while in theory we'd like to either ignore the mode or provide faithful modern resolution, depending on what we feel is best,
+        // in practice, not every cache has the options available to intelligently make the choice to ignore the mode request, and it's unclear how modern "faithful modern
+        // resolution" should be (`node12`? `nodenext`?). As such, witnessing a mode-overriding triple-slash reference in a non-modal module resolution
+        // context should _probably_ be an error - and that should likely be handled by the `Program` (which is what we do).
+        if (resolutionMode === ts.ModuleKind.ESNext && (ts.getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.Node12 || ts.getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.NodeNext)) {
+            features |= NodeResolutionFeatures.EsmMode;
+        }
+        var conditions = features & NodeResolutionFeatures.Exports ? features & NodeResolutionFeatures.EsmMode ? ["node", "import", "types"] : ["node", "require", "types"] : [];
+        var moduleResolutionState = { compilerOptions: options, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations, packageJsonInfoCache: cache, features: features, conditions: conditions };
         var resolved = primaryLookup();
         var primary = true;
         if (!resolved) {
@@ -41860,7 +41901,7 @@ var ts;
             };
         }
         result = { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations };
-        perFolderCache === null || perFolderCache === void 0 ? void 0 : perFolderCache.set(typeReferenceDirectiveName, /*mode*/ undefined, result);
+        perFolderCache === null || perFolderCache === void 0 ? void 0 : perFolderCache.set(typeReferenceDirectiveName, /*mode*/ resolutionMode, result);
         if (traceEnabled)
             traceResult(result);
         return result;
@@ -41911,7 +41952,7 @@ var ts;
                     result_4 = searchResult && searchResult.value;
                 }
                 else {
-                    var candidate = ts.normalizePathAndParts(ts.combinePaths(initialLocationForSecondaryLookup, typeReferenceDirectiveName)).path;
+                    var candidate = normalizePathForCJSResolution(initialLocationForSecondaryLookup, typeReferenceDirectiveName).path;
                     result_4 = nodeLoadModuleByRelativeName(Extensions.DtsOnly, candidate, /*onlyRecordFailures*/ false, moduleResolutionState, /*considerPackageJson*/ true);
                 }
                 return resolvedTypeScriptOnly(result_4);
@@ -42146,7 +42187,11 @@ var ts;
         ts.Debug.assert(keys.length === values.length);
         var map = createModeAwareCache();
         for (var i = 0; i < keys.length; ++i) {
-            map.set(keys[i], ts.getModeForResolutionAtIndex(file, i), values[i]);
+            var entry = keys[i];
+            // We lower-case all type references because npm automatically lowercases all packages. See GH#9824.
+            var name = !ts.isString(entry) ? entry.fileName.toLowerCase() : entry;
+            var mode = !ts.isString(entry) ? entry.resolutionMode || file.impliedNodeFormat : ts.getModeForResolutionAtIndex(file, i);
+            map.set(name, mode, values[i]);
         }
         return map;
     }
@@ -42614,13 +42659,25 @@ var ts;
                 return { value: resolvedValue && { resolved: resolvedValue, isExternalLibraryImport: true } };
             }
             else {
-                var _a = ts.normalizePathAndParts(ts.combinePaths(containingDirectory, moduleName)), candidate = _a.path, parts = _a.parts;
+                var _a = normalizePathForCJSResolution(containingDirectory, moduleName), candidate = _a.path, parts = _a.parts;
                 var resolved_2 = nodeLoadModuleByRelativeName(extensions, candidate, /*onlyRecordFailures*/ false, state, /*considerPackageJson*/ true);
                 // Treat explicit "node_modules" import as an external library import.
                 return resolved_2 && toSearchResult({ resolved: resolved_2, isExternalLibraryImport: ts.contains(parts, "node_modules") });
             }
         }
     }
+    // If you import from "." inside a containing directory "/foo", the result of `normalizePath`
+    // would be "/foo", but this loses the information that `foo` is a directory and we intended
+    // to look inside of it. The Node CommonJS resolution algorithm doesn't call this out
+    // (https://nodejs.org/api/modules.html#all-together), but it seems that module paths ending
+    // in `.` are actually normalized to `./` before proceeding with the resolution algorithm.
+    function normalizePathForCJSResolution(containingDirectory, moduleName) {
+        var combined = ts.combinePaths(containingDirectory, moduleName);
+        var parts = ts.getPathComponents(combined);
+        var lastPart = ts.lastOrUndefined(parts);
+        var path = lastPart === "." || lastPart === ".." ? ts.ensureTrailingDirectorySeparator(ts.normalizePath(combined)) : ts.normalizePath(combined);
+        return { path: path, parts: parts };
+    }
     function realPath(path, host, traceEnabled) {
         if (!host.realpath) {
             return path;
@@ -42662,7 +42719,13 @@ var ts;
                 onlyRecordFailures = true;
             }
         }
-        return loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures, state, considerPackageJson);
+        // esm mode relative imports shouldn't do any directory lookups (either inside `package.json`
+        // files or implicit `index.js`es). This is a notable depature from cjs norms, where `./foo/pkg`
+        // could have been redirected by `./foo/pkg/package.json` to an arbitrary location!
+        if (!(state.features & NodeResolutionFeatures.EsmMode)) {
+            return loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures, state, considerPackageJson);
+        }
+        return undefined;
     }
     /*@internal*/
     ts.nodeModulesPathPart = "/node_modules/";
@@ -43029,7 +43092,16 @@ var ts;
             // Even if extensions is DtsOnly, we can still look up a .ts file as a result of package.json "types"
             var nextExtensions = extensions === Extensions.DtsOnly ? Extensions.TypeScript : extensions;
             // Don't do package.json lookup recursively, because Node.js' package lookup doesn't.
-            return nodeLoadModuleByRelativeName(nextExtensions, candidate, onlyRecordFailures, state, /*considerPackageJson*/ false);
+            // Disable `EsmMode` for the resolution of the package path for cjs-mode packages (so the `main` field can omit extensions)
+            // (technically it only emits a deprecation warning in esm packages right now, but that's probably
+            // enough to mean we don't need to support it)
+            var features = state.features;
+            if ((jsonContent === null || jsonContent === void 0 ? void 0 : jsonContent.type) !== "module") {
+                state.features &= ~NodeResolutionFeatures.EsmMode;
+            }
+            var result = nodeLoadModuleByRelativeName(nextExtensions, candidate, onlyRecordFailures, state, /*considerPackageJson*/ false);
+            state.features = features;
+            return result;
         };
         var onlyRecordFailuresForPackageFile = packageFile ? !ts.directoryProbablyExists(ts.getDirectoryPath(packageFile), state.host) : undefined;
         var onlyRecordFailuresForIndex = onlyRecordFailures || !ts.directoryProbablyExists(candidate, state.host);
@@ -43374,6 +43446,14 @@ var ts;
             }
             var pathAndExtension = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state) ||
                 loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageInfo && packageInfo.packageJsonContent, packageInfo && packageInfo.versionPaths);
+            if (!pathAndExtension && packageInfo
+                && packageInfo.packageJsonContent.exports === undefined
+                && packageInfo.packageJsonContent.main === undefined
+                && state.features & NodeResolutionFeatures.EsmMode) {
+                // EsmMode disables index lookup in `loadNodeModuleFromDirectoryWorker` generally, however non-relative package resolutions still assume
+                // a default `index.js` entrypoint if no `main` or `exports` are present
+                pathAndExtension = loadModuleFromFile(extensions, ts.combinePaths(candidate, "index.js"), onlyRecordFailures, state);
+            }
             return withPackageId(packageInfo, pathAndExtension);
         };
         if (rest !== "") { // If "rest" is empty, we just did this search above.
@@ -47131,8 +47211,7 @@ var ts;
         IntersectionState[IntersectionState["Source"] = 1] = "Source";
         IntersectionState[IntersectionState["Target"] = 2] = "Target";
         IntersectionState[IntersectionState["PropertyCheck"] = 4] = "PropertyCheck";
-        IntersectionState[IntersectionState["UnionIntersectionCheck"] = 8] = "UnionIntersectionCheck";
-        IntersectionState[IntersectionState["InPropertyCheck"] = 16] = "InPropertyCheck";
+        IntersectionState[IntersectionState["InPropertyCheck"] = 8] = "InPropertyCheck";
     })(IntersectionState || (IntersectionState = {}));
     var RecursionFlags;
     (function (RecursionFlags) {
@@ -50591,8 +50670,15 @@ var ts;
                 return res;
             }
             var candidates = ts.mapDefined(symbol.declarations, function (d) {
-                if (!ts.isAmbientModule(d) && d.parent && hasNonGlobalAugmentationExternalModuleSymbol(d.parent)) {
-                    return getSymbolOfNode(d.parent);
+                if (!ts.isAmbientModule(d) && d.parent) {
+                    // direct children of a module
+                    if (hasNonGlobalAugmentationExternalModuleSymbol(d.parent)) {
+                        return getSymbolOfNode(d.parent);
+                    }
+                    // export ='d member of an ambient module
+                    if (ts.isModuleBlock(d.parent) && d.parent.parent && resolveExternalModuleSymbol(getSymbolOfNode(d.parent.parent)) === symbol) {
+                        return getSymbolOfNode(d.parent.parent);
+                    }
                 }
                 if (ts.isClassExpression(d) && ts.isBinaryExpression(d.parent) && d.parent.operatorToken.kind === 63 /* EqualsToken */ && ts.isAccessExpression(d.parent.left) && ts.isEntityNameExpression(d.parent.left.expression)) {
                     if (ts.isModuleExportsAccessExpression(d.parent.left) || ts.isExportsIdentifier(d.parent.left.expression)) {
@@ -54829,12 +54915,9 @@ var ts;
                     }
                 }
                 if (ts.isInJSFile(declaration)) {
-                    var typeTag = ts.getJSDocType(func);
-                    if (typeTag && ts.isFunctionTypeNode(typeTag)) {
-                        var signature = getSignatureFromDeclaration(typeTag);
-                        var pos = func.parameters.indexOf(declaration);
-                        return declaration.dotDotDotToken ? getRestTypeAtPosition(signature, pos) : getTypeAtPosition(signature, pos);
-                    }
+                    var type_1 = getParameterTypeOfTypeTag(func, declaration);
+                    if (type_1)
+                        return type_1;
                 }
                 // Use contextual parameter type if one is available
                 var type = declaration.symbol.escapedName === "this" /* This */ ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration);
@@ -55401,9 +55484,9 @@ var ts;
                 if (typeNode === undefined) {
                     return useUnknownInCatchVariables ? unknownType : anyType;
                 }
-                var type_1 = getTypeOfNode(typeNode);
+                var type_2 = getTypeOfNode(typeNode);
                 // an errorType will make `checkTryStatement` issue an error
-                return isTypeAny(type_1) || type_1 === unknownType ? type_1 : errorType;
+                return isTypeAny(type_2) || type_2 === unknownType ? type_2 : errorType;
             }
             // Handle export default expressions
             if (ts.isSourceFile(declaration) && ts.isJsonSourceFile(declaration)) {
@@ -55632,11 +55715,11 @@ var ts;
                         return errorType;
                     }
                     var exportEquals = getMergedSymbol(symbol.exports.get("export=" /* ExportEquals */));
-                    var type_2 = getWidenedTypeForAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
+                    var type_3 = getWidenedTypeForAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
                     if (!popTypeResolution()) {
                         return reportCircularityError(symbol);
                     }
-                    return type_2;
+                    return type_3;
                 }
             }
             var type = createObjectType(16 /* Anonymous */, symbol);
@@ -57868,10 +57951,10 @@ var ts;
                     var baseTypes = [];
                     var different = false;
                     for (var _i = 0, types_7 = types; _i < types_7.length; _i++) {
-                        var type_3 = types_7[_i];
-                        var baseType = getBaseConstraint(type_3);
+                        var type_4 = types_7[_i];
+                        var baseType = getBaseConstraint(type_4);
                         if (baseType) {
-                            if (baseType !== type_3) {
+                            if (baseType !== type_4) {
                                 different = true;
                             }
                             baseTypes.push(baseType);
@@ -58584,6 +58667,13 @@ var ts;
             var typeTag = ts.getJSDocTypeTag(node);
             return (typeTag === null || typeTag === void 0 ? void 0 : typeTag.typeExpression) && getSingleCallSignature(getTypeFromTypeNode(typeTag.typeExpression));
         }
+        function getParameterTypeOfTypeTag(func, parameter) {
+            var signature = getSignatureOfTypeTag(func);
+            if (!signature)
+                return undefined;
+            var pos = func.parameters.indexOf(parameter);
+            return parameter.dotDotDotToken ? getRestTypeAtPosition(signature, pos) : getTypeAtPosition(signature, pos);
+        }
         function getReturnTypeOfTypeTag(node) {
             var signature = getSignatureOfTypeTag(node);
             return signature && getReturnTypeOfSignature(signature);
@@ -58842,13 +58932,15 @@ var ts;
             return signature;
         }
         function getOrCreateTypeFromSignature(signature) {
+            var _a;
             // There are two ways to declare a construct signature, one is by declaring a class constructor
             // using the constructor keyword, and the other is declaring a bare construct signature in an
             // object type literal or interface (using the new keyword). Each way of declaring a constructor
             // will result in a different declaration kind.
             if (!signature.isolatedSignatureType) {
-                var kind = signature.declaration ? signature.declaration.kind : 0 /* Unknown */;
-                var isConstructor = kind === 170 /* Constructor */ || kind === 174 /* ConstructSignature */ || kind === 179 /* ConstructorType */;
+                var kind = (_a = signature.declaration) === null || _a === void 0 ? void 0 : _a.kind;
+                // If declaration is undefined, it is likely to be the signature of the default constructor.
+                var isConstructor = kind === undefined || kind === 170 /* Constructor */ || kind === 174 /* ConstructSignature */ || kind === 179 /* ConstructorType */;
                 var type = createObjectType(16 /* Anonymous */);
                 type.members = emptySymbols;
                 type.properties = ts.emptyArray;
@@ -59776,7 +59868,7 @@ var ts;
                 }
             }
             var fixedLength = properties.length;
-            var lengthSymbol = createSymbol(4 /* Property */, "length");
+            var lengthSymbol = createSymbol(4 /* Property */, "length", readonly ? 8 /* Readonly */ : 0);
             if (combinedFlags & 12 /* Variable */) {
                 lengthSymbol.type = numberType;
             }
@@ -63323,9 +63415,11 @@ var ts;
                     isEnumTypeRelatedTo(getParentOfSymbol(source.symbol), getParentOfSymbol(target.symbol), errorReporter))
                     return true;
             }
-            if (s & 32768 /* Undefined */ && (!strictNullChecks || t & (32768 /* Undefined */ | 16384 /* Void */)))
+            // In non-strictNullChecks mode, `undefined` and `null` are assignable to anything except `never`.
+            // Since unions and intersections may reduce to `never`, we exclude them here.
+            if (s & 32768 /* Undefined */ && (!strictNullChecks && !(t & 3145728 /* UnionOrIntersection */) || t & (32768 /* Undefined */ | 16384 /* Void */)))
                 return true;
-            if (s & 65536 /* Null */ && (!strictNullChecks || t & 65536 /* Null */))
+            if (s & 65536 /* Null */ && (!strictNullChecks && !(t & 3145728 /* UnionOrIntersection */) || t & 65536 /* Null */))
                 return true;
             if (s & 524288 /* Object */ && t & 67108864 /* NonPrimitive */)
                 return true;
@@ -63414,11 +63508,11 @@ var ts;
             var overflow = false;
             var overrideNextErrorInfo = 0; // How many `reportRelationError` calls should be skipped in the elaboration pyramid
             var lastSkippedInfo;
-            var incompatibleStack = [];
+            var incompatibleStack;
             var inPropertyCheck = false;
             ts.Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
             var result = isRelatedTo(source, target, 3 /* Both */, /*reportErrors*/ !!errorNode, headMessage);
-            if (incompatibleStack.length) {
+            if (incompatibleStack) {
                 reportIncompatibleStack();
             }
             if (overflow) {
@@ -63475,19 +63569,19 @@ var ts;
                 return {
                     errorInfo: errorInfo,
                     lastSkippedInfo: lastSkippedInfo,
-                    incompatibleStack: incompatibleStack.slice(),
+                    incompatibleStack: incompatibleStack === null || incompatibleStack === void 0 ? void 0 : incompatibleStack.slice(),
                     overrideNextErrorInfo: overrideNextErrorInfo,
-                    relatedInfo: !relatedInfo ? undefined : relatedInfo.slice()
+                    relatedInfo: relatedInfo === null || relatedInfo === void 0 ? void 0 : relatedInfo.slice(),
                 };
             }
             function reportIncompatibleError(message, arg0, arg1, arg2, arg3) {
                 overrideNextErrorInfo++; // Suppress the next relation error
                 lastSkippedInfo = undefined; // Reset skipped info cache
-                incompatibleStack.push([message, arg0, arg1, arg2, arg3]);
+                (incompatibleStack || (incompatibleStack = [])).push([message, arg0, arg1, arg2, arg3]);
             }
             function reportIncompatibleStack() {
-                var stack = incompatibleStack;
-                incompatibleStack = [];
+                var stack = incompatibleStack || [];
+                incompatibleStack = undefined;
                 var info = lastSkippedInfo;
                 lastSkippedInfo = undefined;
                 if (stack.length === 1) {
@@ -63593,7 +63687,7 @@ var ts;
             }
             function reportError(message, arg0, arg1, arg2, arg3) {
                 ts.Debug.assert(!!errorNode);
-                if (incompatibleStack.length)
+                if (incompatibleStack)
                     reportIncompatibleStack();
                 if (message.elidedInCompatabilityPyramid)
                     return;
@@ -63609,7 +63703,7 @@ var ts;
                 }
             }
             function reportRelationError(message, source, target) {
-                if (incompatibleStack.length)
+                if (incompatibleStack)
                     reportIncompatibleStack();
                 var _a = getTypeNamesForErrorDisplay(source, target), sourceType = _a[0], targetType = _a[1];
                 var generalizedSource = source;
@@ -63721,7 +63815,9 @@ var ts;
                     if (isSimpleTypeRelatedTo(originalSource, originalTarget, relation, reportErrors ? reportError : undefined)) {
                         return -1 /* True */;
                     }
-                    reportErrorResults(originalSource, originalTarget, 0 /* False */, !!(ts.getObjectFlags(originalSource) & 2048 /* JsxAttributes */));
+                    if (reportErrors) {
+                        reportErrorResults(originalSource, originalTarget, originalSource, originalTarget, headMessage);
+                    }
                     return 0 /* False */;
                 }
                 // Normalize the source and target types: Turn fresh literal types into regular literal types,
@@ -63733,7 +63829,12 @@ var ts;
                 if (source === target)
                     return -1 /* True */;
                 if (relation === identityRelation) {
-                    return isIdenticalTo(source, target, recursionFlags);
+                    if (source.flags !== target.flags)
+                        return 0 /* False */;
+                    if (source.flags & 67358815 /* Singleton */)
+                        return -1 /* True */;
+                    traceUnionsOrIntersectionsTooLarge(source, target);
+                    return recursiveTypeRelatedTo(source, target, /*reportErrors*/ false, 0 /* None */, recursionFlags);
                 }
                 // We fastpath comparing a type parameter to exactly its constraint, as this is _super_ common,
                 // and otherwise, for type parameters in large unions, causes us to need to compare the union to itself,
@@ -63743,163 +63844,130 @@ var ts;
                 if (source.flags & 262144 /* TypeParameter */ && getConstraintOfType(source) === target) {
                     return -1 /* True */;
                 }
-                // Try to see if we're relating something like `Foo` -> `Bar | null | undefined`.
-                // If so, reporting the `null` and `undefined` in the type is hardly useful.
-                // First, see if we're even relating an object type to a union.
-                // Then see if the target is stripped down to a single non-union type.
-                // Note
-                //  * We actually want to remove null and undefined naively here (rather than using getNonNullableType),
-                //    since we don't want to end up with a worse error like "`Foo` is not assignable to `NonNullable<T>`"
-                //    when dealing with generics.
-                //  * We also don't deal with primitive source types, since we already halt elaboration below.
-                if (target.flags & 1048576 /* Union */ && source.flags & 524288 /* Object */ &&
-                    target.types.length <= 3 && maybeTypeOfKind(target, 98304 /* Nullable */)) {
-                    var nullStrippedTarget = extractTypesOfKind(target, ~98304 /* Nullable */);
-                    if (!(nullStrippedTarget.flags & (1048576 /* Union */ | 131072 /* Never */))) {
-                        target = getNormalizedType(nullStrippedTarget, /*writing*/ true);
-                    }
-                    if (source === nullStrippedTarget)
-                        return -1 /* True */;
+                // See if we're relating a definitely non-nullable type to a union that includes null and/or undefined
+                // plus a single non-nullable type. If so, remove null and/or undefined from the target type.
+                if (source.flags & 470302716 /* DefinitelyNonNullable */ && target.flags & 1048576 /* Union */) {
+                    var types = target.types;
+                    var candidate = types.length === 2 && types[0].flags & 98304 /* Nullable */ ? types[1] :
+                        types.length === 3 && types[0].flags & 98304 /* Nullable */ && types[1].flags & 98304 /* Nullable */ ? types[2] :
+                            undefined;
+                    if (candidate && !(candidate.flags & 98304 /* Nullable */)) {
+                        target = getNormalizedType(candidate, /*writing*/ true);
+                        if (source === target)
+                            return -1 /* True */;
+                    }
                 }
                 if (relation === comparableRelation && !(target.flags & 131072 /* Never */) && isSimpleTypeRelatedTo(target, source, relation) ||
                     isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined))
                     return -1 /* True */;
-                var isComparingJsxAttributes = !!(ts.getObjectFlags(source) & 2048 /* JsxAttributes */);
-                var isPerformingExcessPropertyChecks = !(intersectionState & 2 /* Target */) && (isObjectLiteralType(source) && ts.getObjectFlags(source) & 16384 /* FreshLiteral */);
-                if (isPerformingExcessPropertyChecks) {
-                    if (hasExcessProperties(source, target, reportErrors)) {
+                if (source.flags & 469499904 /* StructuredOrInstantiable */ || target.flags & 469499904 /* StructuredOrInstantiable */) {
+                    var isPerformingExcessPropertyChecks = !(intersectionState & 2 /* Target */) && (isObjectLiteralType(source) && ts.getObjectFlags(source) & 16384 /* FreshLiteral */);
+                    if (isPerformingExcessPropertyChecks) {
+                        if (hasExcessProperties(source, target, reportErrors)) {
+                            if (reportErrors) {
+                                reportRelationError(headMessage, source, originalTarget.aliasSymbol ? originalTarget : target);
+                            }
+                            return 0 /* False */;
+                        }
+                    }
+                    var isPerformingCommonPropertyChecks = relation !== comparableRelation && !(intersectionState & 2 /* Target */) &&
+                        source.flags & (131068 /* Primitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && source !== globalObjectType &&
+                        target.flags & (524288 /* Object */ | 2097152 /* Intersection */) && isWeakType(target) &&
+                        (getPropertiesOfType(source).length > 0 || typeHasCallOrConstructSignatures(source));
+                    var isComparingJsxAttributes = !!(ts.getObjectFlags(source) & 2048 /* JsxAttributes */);
+                    if (isPerformingCommonPropertyChecks && !hasCommonProperties(source, target, isComparingJsxAttributes)) {
                         if (reportErrors) {
-                            reportRelationError(headMessage, source, originalTarget.aliasSymbol ? originalTarget : target);
+                            var sourceString = typeToString(originalSource.aliasSymbol ? originalSource : source);
+                            var targetString = typeToString(originalTarget.aliasSymbol ? originalTarget : target);
+                            var calls = getSignaturesOfType(source, 0 /* Call */);
+                            var constructs = getSignaturesOfType(source, 1 /* Construct */);
+                            if (calls.length > 0 && isRelatedTo(getReturnTypeOfSignature(calls[0]), target, 1 /* Source */, /*reportErrors*/ false) ||
+                                constructs.length > 0 && isRelatedTo(getReturnTypeOfSignature(constructs[0]), target, 1 /* Source */, /*reportErrors*/ false)) {
+                                reportError(ts.Diagnostics.Value_of_type_0_has_no_properties_in_common_with_type_1_Did_you_mean_to_call_it, sourceString, targetString);
+                            }
+                            else {
+                                reportError(ts.Diagnostics.Type_0_has_no_properties_in_common_with_type_1, sourceString, targetString);
+                            }
                         }
                         return 0 /* False */;
                     }
-                }
-                var isPerformingCommonPropertyChecks = relation !== comparableRelation && !(intersectionState & 2 /* Target */) &&
-                    source.flags & (131068 /* Primitive */ | 524288 /* Object */ | 2097152 /* Intersection */) && source !== globalObjectType &&
-                    target.flags & (524288 /* Object */ | 2097152 /* Intersection */) && isWeakType(target) &&
-                    (getPropertiesOfType(source).length > 0 || typeHasCallOrConstructSignatures(source));
-                if (isPerformingCommonPropertyChecks && !hasCommonProperties(source, target, isComparingJsxAttributes)) {
-                    if (reportErrors) {
-                        var sourceString = typeToString(originalSource.aliasSymbol ? originalSource : source);
-                        var targetString = typeToString(originalTarget.aliasSymbol ? originalTarget : target);
-                        var calls = getSignaturesOfType(source, 0 /* Call */);
-                        var constructs = getSignaturesOfType(source, 1 /* Construct */);
-                        if (calls.length > 0 && isRelatedTo(getReturnTypeOfSignature(calls[0]), target, 1 /* Source */, /*reportErrors*/ false) ||
-                            constructs.length > 0 && isRelatedTo(getReturnTypeOfSignature(constructs[0]), target, 1 /* Source */, /*reportErrors*/ false)) {
-                            reportError(ts.Diagnostics.Value_of_type_0_has_no_properties_in_common_with_type_1_Did_you_mean_to_call_it, sourceString, targetString);
-                        }
-                        else {
-                            reportError(ts.Diagnostics.Type_0_has_no_properties_in_common_with_type_1, sourceString, targetString);
-                        }
+                    traceUnionsOrIntersectionsTooLarge(source, target);
+                    var skipCaching = source.flags & 1048576 /* Union */ && source.types.length < 4 && !(target.flags & 1048576 /* Union */) ||
+                        target.flags & 1048576 /* Union */ && target.types.length < 4 && !(source.flags & 469499904 /* StructuredOrInstantiable */);
+                    var result_7 = skipCaching ?
+                        unionOrIntersectionRelatedTo(source, target, reportErrors, intersectionState) :
+                        recursiveTypeRelatedTo(source, target, reportErrors, intersectionState, recursionFlags);
+                    // For certain combinations involving intersections and optional, excess, or mismatched properties we need
+                    // an extra property check where the intersection is viewed as a single object. The following are motivating
+                    // examples that all should be errors, but aren't without this extra property check:
+                    //
+                    //   let obj: { a: { x: string } } & { c: number } = { a: { x: 'hello', y: 2 }, c: 5 };  // Nested excess property
+                    //
+                    //   declare let wrong: { a: { y: string } };
+                    //   let weak: { a?: { x?: number } } & { c?: string } = wrong;  // Nested weak object type
+                    //
+                    //   function foo<T extends object>(x: { a?: string }, y: T & { a: boolean }) {
+                    //     x = y;  // Mismatched property in source intersection
+                    //   }
+                    //
+                    // We suppress recursive intersection property checks because they can generate lots of work when relating
+                    // recursive intersections that are structurally similar but not exactly identical. See #37854.
+                    if (result_7 && !inPropertyCheck && (target.flags & 2097152 /* Intersection */ && (isPerformingExcessPropertyChecks || isPerformingCommonPropertyChecks) ||
+                        isNonGenericObjectType(target) && !isArrayType(target) && !isTupleType(target) && source.flags & 2097152 /* Intersection */ && getApparentType(source).flags & 3670016 /* StructuredType */ && !ts.some(source.types, function (t) { return !!(ts.getObjectFlags(t) & 524288 /* NonInferrableType */); }))) {
+                        inPropertyCheck = true;
+                        result_7 &= recursiveTypeRelatedTo(source, target, reportErrors, 4 /* PropertyCheck */, recursionFlags);
+                        inPropertyCheck = false;
+                    }
+                    if (result_7) {
+                        return result_7;
                     }
-                    return 0 /* False */;
-                }
-                traceUnionsOrIntersectionsTooLarge(source, target);
-                var result = 0 /* False */;
-                var saveErrorInfo = captureErrorCalculationState();
-                if ((source.flags & 1048576 /* Union */ || target.flags & 1048576 /* Union */) && getConstituentCount(source) * getConstituentCount(target) < 4) {
-                    // We skip caching when source or target is a union with no more than three constituents.
-                    result = structuredTypeRelatedTo(source, target, reportErrors, intersectionState | 8 /* UnionIntersectionCheck */);
                 }
-                else if (source.flags & 3145728 /* UnionOrIntersection */ || target.flags & 3145728 /* UnionOrIntersection */) {
-                    result = recursiveTypeRelatedTo(source, target, reportErrors, intersectionState | 8 /* UnionIntersectionCheck */, recursionFlags);
+                if (reportErrors) {
+                    reportErrorResults(originalSource, originalTarget, source, target, headMessage);
                 }
-                if (!result && !(source.flags & 1048576 /* Union */) && (source.flags & (469499904 /* StructuredOrInstantiable */) || target.flags & 469499904 /* StructuredOrInstantiable */)) {
-                    if (result = recursiveTypeRelatedTo(source, target, reportErrors, intersectionState, recursionFlags)) {
-                        resetErrorInfo(saveErrorInfo);
+                return 0 /* False */;
+            }
+            function reportErrorResults(originalSource, originalTarget, source, target, headMessage) {
+                var sourceHasBase = !!getSingleBaseForNonAugmentingSubtype(originalSource);
+                var targetHasBase = !!getSingleBaseForNonAugmentingSubtype(originalTarget);
+                source = (originalSource.aliasSymbol || sourceHasBase) ? originalSource : source;
+                target = (originalTarget.aliasSymbol || targetHasBase) ? originalTarget : target;
+                var maybeSuppress = overrideNextErrorInfo > 0;
+                if (maybeSuppress) {
+                    overrideNextErrorInfo--;
+                }
+                if (source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */) {
+                    var currentError = errorInfo;
+                    tryElaborateArrayLikeErrors(source, target, /*reportErrors*/ true);
+                    if (errorInfo !== currentError) {
+                        maybeSuppress = !!errorInfo;
+                    }
+                }
+                if (source.flags & 524288 /* Object */ && target.flags & 131068 /* Primitive */) {
+                    tryElaborateErrorsForPrimitivesAndObjects(source, target);
+                }
+                else if (source.symbol && source.flags & 524288 /* Object */ && globalObjectType === source) {
+                    reportError(ts.Diagnostics.The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead);
+                }
+                else if (ts.getObjectFlags(source) & 2048 /* JsxAttributes */ && target.flags & 2097152 /* Intersection */) {
+                    var targetTypes = target.types;
+                    var intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes, errorNode);
+                    var intrinsicClassAttributes = getJsxType(JsxNames.IntrinsicClassAttributes, errorNode);
+                    if (!isErrorType(intrinsicAttributes) && !isErrorType(intrinsicClassAttributes) &&
+                        (ts.contains(targetTypes, intrinsicAttributes) || ts.contains(targetTypes, intrinsicClassAttributes))) {
+                        // do not report top error
+                        return;
                     }
                 }
-                if (!result && source.flags & (2097152 /* Intersection */ | 262144 /* TypeParameter */)) {
-                    // The combined constraint of an intersection type is the intersection of the constraints of
-                    // the constituents. When an intersection type contains instantiable types with union type
-                    // constraints, there are situations where we need to examine the combined constraint. One is
-                    // when the target is a union type. Another is when the intersection contains types belonging
-                    // to one of the disjoint domains. For example, given type variables T and U, each with the
-                    // constraint 'string | number', the combined constraint of 'T & U' is 'string | number' and
-                    // we need to check this constraint against a union on the target side. Also, given a type
-                    // variable V constrained to 'string | number', 'V & number' has a combined constraint of
-                    // 'string & number | number & number' which reduces to just 'number'.
-                    // This also handles type parameters, as a type parameter with a union constraint compared against a union
-                    // needs to have its constraint hoisted into an intersection with said type parameter, this way
-                    // the type param can be compared with itself in the target (with the influence of its constraint to match other parts)
-                    // For example, if `T extends 1 | 2` and `U extends 2 | 3` and we compare `T & U` to `T & U & (1 | 2 | 3)`
-                    var constraint = getEffectiveConstraintOfIntersection(source.flags & 2097152 /* Intersection */ ? source.types : [source], !!(target.flags & 1048576 /* Union */));
-                    if (constraint && (source.flags & 2097152 /* Intersection */ || target.flags & 1048576 /* Union */)) {
-                        if (everyType(constraint, function (c) { return c !== source; })) { // Skip comparison if expansion contains the source itself
-                            // TODO: Stack errors so we get a pyramid for the "normal" comparison above, _and_ a second for this
-                            if (result = isRelatedTo(constraint, target, 1 /* Source */, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState)) {
-                                resetErrorInfo(saveErrorInfo);
-                            }
-                        }
-                    }
+                else {
+                    errorInfo = elaborateNeverIntersection(errorInfo, originalTarget);
                 }
-                // For certain combinations involving intersections and optional, excess, or mismatched properties we need
-                // an extra property check where the intersection is viewed as a single object. The following are motivating
-                // examples that all should be errors, but aren't without this extra property check:
-                //
-                //   let obj: { a: { x: string } } & { c: number } = { a: { x: 'hello', y: 2 }, c: 5 };  // Nested excess property
-                //
-                //   declare let wrong: { a: { y: string } };
-                //   let weak: { a?: { x?: number } } & { c?: string } = wrong;  // Nested weak object type
-                //
-                //   function foo<T extends object>(x: { a?: string }, y: T & { a: boolean }) {
-                //     x = y;  // Mismatched property in source intersection
-                //   }
-                //
-                // We suppress recursive intersection property checks because they can generate lots of work when relating
-                // recursive intersections that are structurally similar but not exactly identical. See #37854.
-                if (result && !inPropertyCheck && (target.flags & 2097152 /* Intersection */ && (isPerformingExcessPropertyChecks || isPerformingCommonPropertyChecks) ||
-                    isNonGenericObjectType(target) && !isArrayType(target) && !isTupleType(target) && source.flags & 2097152 /* Intersection */ && getApparentType(source).flags & 3670016 /* StructuredType */ && !ts.some(source.types, function (t) { return !!(ts.getObjectFlags(t) & 524288 /* NonInferrableType */); }))) {
-                    inPropertyCheck = true;
-                    result &= recursiveTypeRelatedTo(source, target, reportErrors, 4 /* PropertyCheck */, recursionFlags);
-                    inPropertyCheck = false;
-                }
-                reportErrorResults(source, target, result, isComparingJsxAttributes);
-                return result;
-                function reportErrorResults(source, target, result, isComparingJsxAttributes) {
-                    if (!result && reportErrors) {
-                        var sourceHasBase = !!getSingleBaseForNonAugmentingSubtype(originalSource);
-                        var targetHasBase = !!getSingleBaseForNonAugmentingSubtype(originalTarget);
-                        source = (originalSource.aliasSymbol || sourceHasBase) ? originalSource : source;
-                        target = (originalTarget.aliasSymbol || targetHasBase) ? originalTarget : target;
-                        var maybeSuppress = overrideNextErrorInfo > 0;
-                        if (maybeSuppress) {
-                            overrideNextErrorInfo--;
-                        }
-                        if (source.flags & 524288 /* Object */ && target.flags & 524288 /* Object */) {
-                            var currentError = errorInfo;
-                            tryElaborateArrayLikeErrors(source, target, reportErrors);
-                            if (errorInfo !== currentError) {
-                                maybeSuppress = !!errorInfo;
-                            }
-                        }
-                        if (source.flags & 524288 /* Object */ && target.flags & 131068 /* Primitive */) {
-                            tryElaborateErrorsForPrimitivesAndObjects(source, target);
-                        }
-                        else if (source.symbol && source.flags & 524288 /* Object */ && globalObjectType === source) {
-                            reportError(ts.Diagnostics.The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead);
-                        }
-                        else if (isComparingJsxAttributes && target.flags & 2097152 /* Intersection */) {
-                            var targetTypes = target.types;
-                            var intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes, errorNode);
-                            var intrinsicClassAttributes = getJsxType(JsxNames.IntrinsicClassAttributes, errorNode);
-                            if (!isErrorType(intrinsicAttributes) && !isErrorType(intrinsicClassAttributes) &&
-                                (ts.contains(targetTypes, intrinsicAttributes) || ts.contains(targetTypes, intrinsicClassAttributes))) {
-                                // do not report top error
-                                return result;
-                            }
-                        }
-                        else {
-                            errorInfo = elaborateNeverIntersection(errorInfo, originalTarget);
-                        }
-                        if (!headMessage && maybeSuppress) {
-                            lastSkippedInfo = [source, target];
-                            // Used by, eg, missing property checking to replace the top-level message with a more informative one
-                            return result;
-                        }
-                        reportRelationError(headMessage, source, target);
-                    }
+                if (!headMessage && maybeSuppress) {
+                    lastSkippedInfo = [source, target];
+                    // Used by, eg, missing property checking to replace the top-level message with a more informative one
+                    return;
                 }
+                reportRelationError(headMessage, source, target);
             }
             function traceUnionsOrIntersectionsTooLarge(source, target) {
                 if (!ts.tracing) {
@@ -63926,21 +63994,6 @@ var ts;
                     }
                 }
             }
-            function isIdenticalTo(source, target, recursionFlags) {
-                if (source.flags !== target.flags)
-                    return 0 /* False */;
-                if (source.flags & 67358815 /* Singleton */)
-                    return -1 /* True */;
-                traceUnionsOrIntersectionsTooLarge(source, target);
-                if (source.flags & 3145728 /* UnionOrIntersection */) {
-                    var result_7 = eachTypeRelatedToSomeType(source, target);
-                    if (result_7) {
-                        result_7 &= eachTypeRelatedToSomeType(target, source);
-                    }
-                    return result_7;
-                }
-                return recursiveTypeRelatedTo(source, target, /*reportErrors*/ false, 0 /* None */, recursionFlags);
-            }
             function getTypeOfPropertyInTypes(types, name) {
                 var appendPropType = function (propTypes, type) {
                     var _a;
@@ -64039,6 +64092,41 @@ var ts;
             function shouldCheckAsExcessProperty(prop, container) {
                 return prop.valueDeclaration && container.valueDeclaration && prop.valueDeclaration.parent === container.valueDeclaration;
             }
+            function unionOrIntersectionRelatedTo(source, target, reportErrors, intersectionState) {
+                // Note that these checks are specifically ordered to produce correct results. In particular,
+                // we need to deconstruct unions before intersections (because unions are always at the top),
+                // and we need to handle "each" relations before "some" relations for the same kind of type.
+                if (source.flags & 1048576 /* Union */) {
+                    return relation === comparableRelation ?
+                        someTypeRelatedToType(source, target, reportErrors && !(source.flags & 131068 /* Primitive */), intersectionState) :
+                        eachTypeRelatedToType(source, target, reportErrors && !(source.flags & 131068 /* Primitive */), intersectionState);
+                }
+                if (target.flags & 1048576 /* Union */) {
+                    return typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), target, reportErrors && !(source.flags & 131068 /* Primitive */) && !(target.flags & 131068 /* Primitive */));
+                }
+                if (target.flags & 2097152 /* Intersection */) {
+                    return typeRelatedToEachType(getRegularTypeOfObjectLiteral(source), target, reportErrors, 2 /* Target */);
+                }
+                // Source is an intersection. For the comparable relation, if the target is a primitive type we hoist the
+                // constraints of all non-primitive types in the source into a new intersection. We do this because the
+                // intersection may further constrain the constraints of the non-primitive types. For example, given a type
+                // parameter 'T extends 1 | 2', the intersection 'T & 1' should be reduced to '1' such that it doesn't
+                // appear to be comparable to '2'.
+                if (relation === comparableRelation && target.flags & 131068 /* Primitive */) {
+                    var constraints = ts.sameMap(source.types, getBaseConstraintOrType);
+                    if (constraints !== source.types) {
+                        source = getIntersectionType(constraints);
+                        if (!(source.flags & 2097152 /* Intersection */)) {
+                            return isRelatedTo(source, target, 1 /* Source */, /*reportErrors*/ false);
+                        }
+                    }
+                }
+                // Check to see if any constituents of the intersection are immediately related to the target.
+                // Don't report errors though. Elaborating on whether a source constituent is related to the target is
+                // not actually useful and leads to some confusing error messages. Instead, we rely on the caller
+                // checking whether the full intersection viewed as an object is related to the target.
+                return someTypeRelatedToType(source, target, /*reportErrors*/ false, 1 /* Source */);
+            }
             function eachTypeRelatedToSomeType(source, target) {
                 var result = -1 /* True */;
                 var sourceTypes = source.types;
@@ -64074,8 +64162,11 @@ var ts;
                     }
                 }
                 if (reportErrors) {
+                    // Elaborate only if we can find a best matching type in the target union
                     var bestMatchingType = getBestMatchingType(source, target, isRelatedTo);
-                    isRelatedTo(source, bestMatchingType || targetTypes[targetTypes.length - 1], 2 /* Target */, /*reportErrors*/ true);
+                    if (bestMatchingType) {
+                        isRelatedTo(source, bestMatchingType, 2 /* Target */, /*reportErrors*/ true);
+                    }
                 }
                 return 0 /* False */;
             }
@@ -64211,7 +64302,7 @@ var ts;
                 if (overflow) {
                     return 0 /* False */;
                 }
-                var keyIntersectionState = intersectionState | (inPropertyCheck ? 16 /* InPropertyCheck */ : 0);
+                var keyIntersectionState = intersectionState | (inPropertyCheck ? 8 /* InPropertyCheck */ : 0);
                 var id = getRelationKey(source, target, keyIntersectionState, relation, /*ingnoreConstraints*/ false);
                 var entry = relation.get(id);
                 if (entry !== undefined) {
@@ -64279,6 +64370,7 @@ var ts;
                         return originalHandler(onlyUnreliable);
                     };
                 }
+                var result;
                 if (expandingFlags === 3 /* Both */) {
                     ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.instant("checkTypes" /* CheckTypes */, "recursiveTypeRelatedTo_DepthLimit", {
                         sourceId: source.id,
@@ -64288,8 +64380,13 @@ var ts;
                         depth: sourceDepth,
                         targetDepth: targetDepth
                     });
+                    result = 3 /* Maybe */;
+                }
+                else {
+                    ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("checkTypes" /* CheckTypes */, "structuredTypeRelatedTo", { sourceId: source.id, targetId: target.id });
+                    result = structuredTypeRelatedTo(source, target, reportErrors, intersectionState);
+                    ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
                 }
-                var result = expandingFlags !== 3 /* Both */ ? structuredTypeRelatedTo(source, target, reportErrors, intersectionState) : 3 /* Maybe */;
                 if (outofbandVarianceMarkerHandler) {
                     outofbandVarianceMarkerHandler = originalHandler;
                 }
@@ -64321,98 +64418,97 @@ var ts;
                 return result;
             }
             function structuredTypeRelatedTo(source, target, reportErrors, intersectionState) {
-                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("checkTypes" /* CheckTypes */, "structuredTypeRelatedTo", { sourceId: source.id, targetId: target.id });
-                var result = structuredTypeRelatedToWorker(source, target, reportErrors, intersectionState);
-                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
-                return result;
-            }
-            function structuredTypeRelatedToWorker(source, target, reportErrors, intersectionState) {
                 if (intersectionState & 4 /* PropertyCheck */) {
                     return propertiesRelatedTo(source, target, reportErrors, /*excludedProperties*/ undefined, 0 /* None */);
                 }
-                if (intersectionState & 8 /* UnionIntersectionCheck */) {
-                    // Note that these checks are specifically ordered to produce correct results. In particular,
-                    // we need to deconstruct unions before intersections (because unions are always at the top),
-                    // and we need to handle "each" relations before "some" relations for the same kind of type.
-                    if (source.flags & 1048576 /* Union */) {
-                        return relation === comparableRelation ?
-                            someTypeRelatedToType(source, target, reportErrors && !(source.flags & 131068 /* Primitive */), intersectionState & ~8 /* UnionIntersectionCheck */) :
-                            eachTypeRelatedToType(source, target, reportErrors && !(source.flags & 131068 /* Primitive */), intersectionState & ~8 /* UnionIntersectionCheck */);
-                    }
-                    if (target.flags & 1048576 /* Union */) {
-                        return typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), target, reportErrors && !(source.flags & 131068 /* Primitive */) && !(target.flags & 131068 /* Primitive */));
-                    }
-                    if (target.flags & 2097152 /* Intersection */) {
-                        return typeRelatedToEachType(getRegularTypeOfObjectLiteral(source), target, reportErrors, 2 /* Target */);
-                    }
-                    // Source is an intersection. For the comparable relation, if the target is a primitive type we hoist the
-                    // constraints of all non-primitive types in the source into a new intersection. We do this because the
-                    // intersection may further constrain the constraints of the non-primitive types. For example, given a type
-                    // parameter 'T extends 1 | 2', the intersection 'T & 1' should be reduced to '1' such that it doesn't
-                    // appear to be comparable to '2'.
-                    if (relation === comparableRelation && target.flags & 131068 /* Primitive */) {
-                        var constraints = ts.sameMap(source.types, getBaseConstraintOrType);
-                        if (constraints !== source.types) {
-                            source = getIntersectionType(constraints);
-                            if (!(source.flags & 2097152 /* Intersection */)) {
-                                return isRelatedTo(source, target, 1 /* Source */, /*reportErrors*/ false);
-                            }
+                var result;
+                var originalErrorInfo;
+                var varianceCheckFailed = false;
+                var saveErrorInfo = captureErrorCalculationState();
+                var sourceFlags = source.flags;
+                var targetFlags = target.flags;
+                if (relation === identityRelation) {
+                    // We've already checked that source.flags and target.flags are identical
+                    if (sourceFlags & 3145728 /* UnionOrIntersection */) {
+                        var result_8 = eachTypeRelatedToSomeType(source, target);
+                        if (result_8) {
+                            result_8 &= eachTypeRelatedToSomeType(target, source);
                         }
+                        return result_8;
                     }
-                    // Check to see if any constituents of the intersection are immediately related to the target.
-                    //
-                    // Don't report errors though. Checking whether a constituent is related to the source is not actually
-                    // useful and leads to some confusing error messages. Instead it is better to let the below checks
-                    // take care of this, or to not elaborate at all. For instance,
-                    //
-                    //    - For an object type (such as 'C = A & B'), users are usually more interested in structural errors.
-                    //
-                    //    - For a union type (such as '(A | B) = (C & D)'), it's better to hold onto the whole intersection
-                    //          than to report that 'D' is not assignable to 'A' or 'B'.
-                    //
-                    //    - For a primitive type or type parameter (such as 'number = A & B') there is no point in
-                    //          breaking the intersection apart.
-                    return someTypeRelatedToType(source, target, /*reportErrors*/ false, 1 /* Source */);
-                }
-                var flags = source.flags & target.flags;
-                if (relation === identityRelation && !(flags & 524288 /* Object */)) {
-                    if (flags & 4194304 /* Index */) {
+                    if (sourceFlags & 4194304 /* Index */) {
                         return isRelatedTo(source.type, target.type, 3 /* Both */, /*reportErrors*/ false);
                     }
-                    var result_8 = 0 /* False */;
-                    if (flags & 8388608 /* IndexedAccess */) {
-                        if (result_8 = isRelatedTo(source.objectType, target.objectType, 3 /* Both */, /*reportErrors*/ false)) {
-                            if (result_8 &= isRelatedTo(source.indexType, target.indexType, 3 /* Both */, /*reportErrors*/ false)) {
-                                return result_8;
+                    if (sourceFlags & 8388608 /* IndexedAccess */) {
+                        if (result = isRelatedTo(source.objectType, target.objectType, 3 /* Both */, /*reportErrors*/ false)) {
+                            if (result &= isRelatedTo(source.indexType, target.indexType, 3 /* Both */, /*reportErrors*/ false)) {
+                                return result;
                             }
                         }
                     }
-                    if (flags & 16777216 /* Conditional */) {
+                    if (sourceFlags & 16777216 /* Conditional */) {
                         if (source.root.isDistributive === target.root.isDistributive) {
-                            if (result_8 = isRelatedTo(source.checkType, target.checkType, 3 /* Both */, /*reportErrors*/ false)) {
-                                if (result_8 &= isRelatedTo(source.extendsType, target.extendsType, 3 /* Both */, /*reportErrors*/ false)) {
-                                    if (result_8 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), 3 /* Both */, /*reportErrors*/ false)) {
-                                        if (result_8 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), 3 /* Both */, /*reportErrors*/ false)) {
-                                            return result_8;
+                            if (result = isRelatedTo(source.checkType, target.checkType, 3 /* Both */, /*reportErrors*/ false)) {
+                                if (result &= isRelatedTo(source.extendsType, target.extendsType, 3 /* Both */, /*reportErrors*/ false)) {
+                                    if (result &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), 3 /* Both */, /*reportErrors*/ false)) {
+                                        if (result &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), 3 /* Both */, /*reportErrors*/ false)) {
+                                            return result;
                                         }
                                     }
                                 }
                             }
                         }
                     }
-                    if (flags & 33554432 /* Substitution */) {
+                    if (sourceFlags & 33554432 /* Substitution */) {
                         return isRelatedTo(source.substitute, target.substitute, 3 /* Both */, /*reportErrors*/ false);
                     }
-                    return 0 /* False */;
+                    if (!(sourceFlags & 524288 /* Object */)) {
+                        return 0 /* False */;
+                    }
+                }
+                else if (sourceFlags & 3145728 /* UnionOrIntersection */ || targetFlags & 3145728 /* UnionOrIntersection */) {
+                    if (result = unionOrIntersectionRelatedTo(source, target, reportErrors, intersectionState)) {
+                        return result;
+                    }
+                    if (source.flags & 2097152 /* Intersection */ || source.flags & 262144 /* TypeParameter */ && target.flags & 1048576 /* Union */) {
+                        // The combined constraint of an intersection type is the intersection of the constraints of
+                        // the constituents. When an intersection type contains instantiable types with union type
+                        // constraints, there are situations where we need to examine the combined constraint. One is
+                        // when the target is a union type. Another is when the intersection contains types belonging
+                        // to one of the disjoint domains. For example, given type variables T and U, each with the
+                        // constraint 'string | number', the combined constraint of 'T & U' is 'string | number' and
+                        // we need to check this constraint against a union on the target side. Also, given a type
+                        // variable V constrained to 'string | number', 'V & number' has a combined constraint of
+                        // 'string & number | number & number' which reduces to just 'number'.
+                        // This also handles type parameters, as a type parameter with a union constraint compared against a union
+                        // needs to have its constraint hoisted into an intersection with said type parameter, this way
+                        // the type param can be compared with itself in the target (with the influence of its constraint to match other parts)
+                        // For example, if `T extends 1 | 2` and `U extends 2 | 3` and we compare `T & U` to `T & U & (1 | 2 | 3)`
+                        var constraint = getEffectiveConstraintOfIntersection(source.flags & 2097152 /* Intersection */ ? source.types : [source], !!(target.flags & 1048576 /* Union */));
+                        if (constraint && everyType(constraint, function (c) { return c !== source; })) { // Skip comparison if expansion contains the source itself
+                            // TODO: Stack errors so we get a pyramid for the "normal" comparison above, _and_ a second for this
+                            if (result = isRelatedTo(constraint, target, 1 /* Source */, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState)) {
+                                resetErrorInfo(saveErrorInfo);
+                                return result;
+                            }
+                        }
+                    }
+                    // The ordered decomposition above doesn't handle all cases. Specifically, we also need to handle:
+                    // Source is instantiable (e.g. source has union or intersection constraint).
+                    // Source is an object, target is a union (e.g. { a, b: boolean } <=> { a, b: true } | { a, b: false }).
+                    // Source is an intersection, target is an object (e.g. { a } & { b } <=> { a, b }).
+                    // Source is an intersection, target is a union (e.g. { a } & { b: boolean } <=> { a, b: true } | { a, b: false }).
+                    // Source is an intersection, target instantiable (e.g. string & { tag } <=> T["a"] constrained to string & { tag }).
+                    if (!(sourceFlags & 465829888 /* Instantiable */ ||
+                        sourceFlags & 524288 /* Object */ && targetFlags & 1048576 /* Union */ ||
+                        sourceFlags & 2097152 /* Intersection */ && targetFlags & (524288 /* Object */ | 1048576 /* Union */ | 465829888 /* Instantiable */))) {
+                        return 0 /* False */;
+                    }
                 }
-                var result;
-                var originalErrorInfo;
-                var varianceCheckFailed = false;
-                var saveErrorInfo = captureErrorCalculationState();
                 // We limit alias variance probing to only object and conditional types since their alias behavior
                 // is more predictable than other, interned types, which may or may not have an alias depending on
                 // the order in which things were checked.
-                if (source.flags & (524288 /* Object */ | 16777216 /* Conditional */) && source.aliasSymbol &&
+                if (sourceFlags & (524288 /* Object */ | 16777216 /* Conditional */) && source.aliasSymbol &&
                     source.aliasTypeArguments && source.aliasSymbol === target.aliasSymbol &&
                     !(source.aliasTypeArgumentsContainsMarker || target.aliasTypeArgumentsContainsMarker)) {
                     var variances = getAliasVariances(source.aliasSymbol);
@@ -64430,7 +64526,7 @@ var ts;
                     isSingleElementGenericTupleType(target) && (target.target.readonly || isMutableArrayOrTuple(getBaseConstraintOfType(source) || source)) && (result = isRelatedTo(source, getTypeArguments(target)[0], 2 /* Target */))) {
                     return result;
                 }
-                if (target.flags & 262144 /* TypeParameter */) {
+                if (targetFlags & 262144 /* TypeParameter */) {
                     // A source type { [P in Q]: X } is related to a target type T if keyof T is related to Q and X is related to T[Q].
                     if (ts.getObjectFlags(source) & 32 /* Mapped */ && !source.declaration.nameType && isRelatedTo(getIndexType(target), getConstraintTypeFromMappedType(source), 3 /* Both */)) {
                         if (!(getMappedTypeModifiers(source) & 4 /* IncludeOptional */)) {
@@ -64442,10 +64538,10 @@ var ts;
                         }
                     }
                 }
-                else if (target.flags & 4194304 /* Index */) {
+                else if (targetFlags & 4194304 /* Index */) {
                     var targetType_1 = target.type;
                     // A keyof S is related to a keyof T if T is related to S.
-                    if (source.flags & 4194304 /* Index */) {
+                    if (sourceFlags & 4194304 /* Index */) {
                         if (result = isRelatedTo(targetType_1, source.type, 3 /* Both */, /*reportErrors*/ false)) {
                             return result;
                         }
@@ -64496,8 +64592,8 @@ var ts;
                         }
                     }
                 }
-                else if (target.flags & 8388608 /* IndexedAccess */) {
-                    if (source.flags & 8388608 /* IndexedAccess */) {
+                else if (targetFlags & 8388608 /* IndexedAccess */) {
+                    if (sourceFlags & 8388608 /* IndexedAccess */) {
                         // Relate components directly before falling back to constraint relationships
                         // A type S[K] is related to a type T[J] if S is related to T and K is related to J.
                         if (result = isRelatedTo(source.objectType, target.objectType, 3 /* Both */, reportErrors)) {
@@ -64603,7 +64699,7 @@ var ts;
                         }
                     }
                 }
-                else if (target.flags & 16777216 /* Conditional */) {
+                else if (targetFlags & 16777216 /* Conditional */) {
                     // If we reach 10 levels of nesting for the same conditional type, assume it is an infinitely expanding recursive
                     // conditional type and bail out with a Ternary.Maybe result.
                     if (isDeeplyNestedType(target, targetStack, targetDepth, 10)) {
@@ -64628,8 +64724,8 @@ var ts;
                         }
                     }
                 }
-                else if (target.flags & 134217728 /* TemplateLiteral */) {
-                    if (source.flags & 134217728 /* TemplateLiteral */) {
+                else if (targetFlags & 134217728 /* TemplateLiteral */) {
+                    if (sourceFlags & 134217728 /* TemplateLiteral */) {
                         if (relation === comparableRelation) {
                             return templateLiteralTypesDefinitelyUnrelated(source, target) ? 0 /* False */ : -1 /* True */;
                         }
@@ -64641,11 +64737,11 @@ var ts;
                         return -1 /* True */;
                     }
                 }
-                if (source.flags & 8650752 /* TypeVariable */) {
-                    // IndexedAccess comparisons are handled above in the `target.flags & TypeFlage.IndexedAccess` branch
-                    if (!(source.flags & 8388608 /* IndexedAccess */ && target.flags & 8388608 /* IndexedAccess */)) {
+                if (sourceFlags & 8650752 /* TypeVariable */) {
+                    // IndexedAccess comparisons are handled above in the `targetFlags & TypeFlage.IndexedAccess` branch
+                    if (!(sourceFlags & 8388608 /* IndexedAccess */ && targetFlags & 8388608 /* IndexedAccess */)) {
                         var constraint = getConstraintOfType(source);
-                        if (!constraint || (source.flags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
+                        if (!constraint || (sourceFlags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
                             // A type variable with no constraint is not related to the non-primitive object type.
                             if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864 /* NonPrimitive */), 3 /* Both */)) {
                                 resetErrorInfo(saveErrorInfo);
@@ -64658,7 +64754,7 @@ var ts;
                             return result;
                         }
                         // slower, fuller, this-instantiated check (necessary when comparing raw `this` types from base classes), see `subclassWithPolymorphicThisIsAssignable.ts` test for example
-                        else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, 1 /* Source */, reportErrors && !(target.flags & source.flags & 262144 /* TypeParameter */), /*headMessage*/ undefined, intersectionState)) {
+                        else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, 1 /* Source */, reportErrors && !(targetFlags & sourceFlags & 262144 /* TypeParameter */), /*headMessage*/ undefined, intersectionState)) {
                             resetErrorInfo(saveErrorInfo);
                             return result;
                         }
@@ -64675,14 +64771,14 @@ var ts;
                         }
                     }
                 }
-                else if (source.flags & 4194304 /* Index */) {
+                else if (sourceFlags & 4194304 /* Index */) {
                     if (result = isRelatedTo(keyofConstraintType, target, 1 /* Source */, reportErrors)) {
                         resetErrorInfo(saveErrorInfo);
                         return result;
                     }
                 }
-                else if (source.flags & 134217728 /* TemplateLiteral */ && !(target.flags & 524288 /* Object */)) {
-                    if (!(target.flags & 134217728 /* TemplateLiteral */)) {
+                else if (sourceFlags & 134217728 /* TemplateLiteral */ && !(targetFlags & 524288 /* Object */)) {
+                    if (!(targetFlags & 134217728 /* TemplateLiteral */)) {
                         var constraint = getBaseConstraintOfType(source);
                         if (constraint && constraint !== source && (result = isRelatedTo(constraint, target, 1 /* Source */, reportErrors))) {
                             resetErrorInfo(saveErrorInfo);
@@ -64690,8 +64786,8 @@ var ts;
                         }
                     }
                 }
-                else if (source.flags & 268435456 /* StringMapping */) {
-                    if (target.flags & 268435456 /* StringMapping */ && source.symbol === target.symbol) {
+                else if (sourceFlags & 268435456 /* StringMapping */) {
+                    if (targetFlags & 268435456 /* StringMapping */ && source.symbol === target.symbol) {
                         if (result = isRelatedTo(source.type, target.type, 3 /* Both */, reportErrors)) {
                             resetErrorInfo(saveErrorInfo);
                             return result;
@@ -64705,14 +64801,14 @@ var ts;
                         }
                     }
                 }
-                else if (source.flags & 16777216 /* Conditional */) {
+                else if (sourceFlags & 16777216 /* Conditional */) {
                     // If we reach 10 levels of nesting for the same conditional type, assume it is an infinitely expanding recursive
                     // conditional type and bail out with a Ternary.Maybe result.
                     if (isDeeplyNestedType(source, sourceStack, sourceDepth, 10)) {
                         resetErrorInfo(saveErrorInfo);
                         return 3 /* Maybe */;
                     }
-                    if (target.flags & 16777216 /* Conditional */) {
+                    if (targetFlags & 16777216 /* Conditional */) {
                         // Two conditional types 'T1 extends U1 ? X1 : Y1' and 'T2 extends U2 ? X2 : Y2' are related if
                         // one of T1 and T2 is related to the other, U1 and U2 are identical types, X1 is related to X2,
                         // and Y1 is related to Y2.
@@ -64772,15 +64868,21 @@ var ts;
                         }
                         return 0 /* False */;
                     }
-                    var sourceIsPrimitive = !!(source.flags & 131068 /* Primitive */);
+                    var sourceIsPrimitive = !!(sourceFlags & 131068 /* Primitive */);
                     if (relation !== identityRelation) {
                         source = getApparentType(source);
+                        sourceFlags = source.flags;
                     }
                     else if (isGenericMappedType(source)) {
                         return 0 /* False */;
                     }
                     if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target &&
                         !isTupleType(source) && !(ts.getObjectFlags(source) & 4096 /* MarkerType */ || ts.getObjectFlags(target) & 4096 /* MarkerType */)) {
+                        // When strictNullChecks is disabled, the element type of the empty array literal is undefinedWideningType,
+                        // and an empty array literal wouldn't be assignable to a `never[]` without this check.
+                        if (isEmptyArrayLiteralType(source)) {
+                            return -1 /* True */;
+                        }
                         // We have type references to the same generic type, and the type references are not marker
                         // type references (which are intended by be compared structurally). Obtain the variance
                         // information for the type parameters and relate the type arguments accordingly.
@@ -64816,7 +64918,7 @@ var ts;
                     // In a check of the form X = A & B, we will have previously checked if A relates to X or B relates
                     // to X. Failing both of those we want to check if the aggregation of A and B's members structurally
                     // relates to X. Thus, we include intersection types on the source side here.
-                    if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 524288 /* Object */) {
+                    if (sourceFlags & (524288 /* Object */ | 2097152 /* Intersection */) && targetFlags & 524288 /* Object */) {
                         // Report structural errors only if we haven't reported any errors yet
                         var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo.errorInfo && !sourceIsPrimitive;
                         result = propertiesRelatedTo(source, target, reportStructuralErrors, /*excludedProperties*/ undefined, intersectionState);
@@ -64840,7 +64942,7 @@ var ts;
                     // there exists a constituent of T for every combination of the discriminants of S
                     // with respect to T. We do not report errors here, as we will use the existing
                     // error result from checking each constituent of the union.
-                    if (source.flags & (524288 /* Object */ | 2097152 /* Intersection */) && target.flags & 1048576 /* Union */) {
+                    if (sourceFlags & (524288 /* Object */ | 2097152 /* Intersection */) && targetFlags & 1048576 /* Union */) {
                         var objectOnlyTarget = extractTypesOfKind(target, 524288 /* Object */ | 2097152 /* Intersection */ | 33554432 /* Substitution */);
                         if (objectOnlyTarget.flags & 1048576 /* Union */) {
                             var result_9 = typeRelatedToDiscriminatedType(source, objectOnlyTarget);
@@ -65087,6 +65189,15 @@ var ts;
                     }
                     return 0 /* False */;
                 }
+                // Ensure {readonly a: whatever} is not a subtype of {a: whatever},
+                // while {a: whatever} is a subtype of {readonly a: whatever}.
+                // This ensures the subtype relationship is ordered, and preventing declaration order
+                // from deciding which type "wins" in union subtype reduction.
+                // They're still assignable to one another, since `readonly` doesn't affect assignability.
+                if ((relation === subtypeRelation || relation === strictSubtypeRelation) &&
+                    !!(sourcePropFlags & 64 /* Readonly */) && !(targetPropFlags & 64 /* Readonly */)) {
+                    return 0 /* False */;
+                }
                 // If the target comes from a partial union prop, allow `undefined` in the target type
                 var related = isPropertySymbolTypeRelated(sourceProp, targetProp, getTypeOfSourceProperty, reportErrors, intersectionState);
                 if (!related) {
@@ -65355,7 +65466,6 @@ var ts;
                     }
                 }
                 var result = -1 /* True */;
-                var saveErrorInfo = captureErrorCalculationState();
                 var incompatibleReporter = kind === 1 /* Construct */ ? reportIncompatibleConstructSignatureReturn : reportIncompatibleCallSignatureReturn;
                 var sourceObjectFlags = ts.getObjectFlags(source);
                 var targetObjectFlags = ts.getObjectFlags(target);
@@ -65396,6 +65506,7 @@ var ts;
                 else {
                     outer: for (var _i = 0, targetSignatures_1 = targetSignatures; _i < targetSignatures_1.length; _i++) {
                         var t = targetSignatures_1[_i];
+                        var saveErrorInfo = captureErrorCalculationState();
                         // Only elaborate errors from the first failure
                         var shouldElaborateErrors = reportErrors;
                         for (var _c = 0, sourceSignatures_1 = sourceSignatures; _c < sourceSignatures_1.length; _c++) {
@@ -68566,9 +68677,6 @@ var ts;
                 getUnionType(ts.map(type.types, mapper), 1 /* Literal */, aliasSymbol, aliasTypeArguments) :
                 mapType(type, mapper);
         }
-        function getConstituentCount(type) {
-            return type.flags & 1048576 /* Union */ ? type.types.length : 1;
-        }
         function extractTypesOfKind(type, kind) {
             return filterType(type, function (t) { return (t.flags & kind) !== 0; });
         }
@@ -73289,6 +73397,9 @@ var ts;
                 if (compilerOptions.noPropertyAccessFromIndexSignature && ts.isPropertyAccessExpression(node)) {
                     error(right, ts.Diagnostics.Property_0_comes_from_an_index_signature_so_it_must_be_accessed_with_0, ts.unescapeLeadingUnderscores(right.escapedText));
                 }
+                if (indexInfo.declaration && ts.getCombinedNodeFlags(indexInfo.declaration) & 134217728 /* Deprecated */) {
+                    addDeprecatedSuggestion(right, [indexInfo.declaration], right.escapedText);
+                }
             }
             else {
                 if (isDeprecatedSymbol(prop) && isUncalledFunctionReference(node, prop) && prop.declarations) {
@@ -75773,8 +75884,8 @@ var ts;
             if (hasDefaultOnly && type && !isErrorType(type)) {
                 var synthType = type;
                 if (!synthType.defaultOnlyType) {
-                    var type_4 = createDefaultPropertyWrapperForModule(symbol, originalSymbol);
-                    synthType.defaultOnlyType = type_4;
+                    var type_5 = createDefaultPropertyWrapperForModule(symbol, originalSymbol);
+                    synthType.defaultOnlyType = type_5;
                 }
                 return synthType.defaultOnlyType;
             }
@@ -76234,21 +76345,22 @@ var ts;
                     if (links.type === unknownType) {
                         links.type = getTypeFromBindingPattern(declaration.name);
                     }
-                    assignBindingElementTypes(declaration.name);
+                    assignBindingElementTypes(declaration.name, links.type);
                 }
             }
         }
         // When contextual typing assigns a type to a parameter that contains a binding pattern, we also need to push
         // the destructured type into the contained binding elements.
-        function assignBindingElementTypes(pattern) {
+        function assignBindingElementTypes(pattern, parentType) {
             for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
                 var element = _a[_i];
                 if (!ts.isOmittedExpression(element)) {
+                    var type = getBindingElementTypeFromParentType(element, parentType);
                     if (element.name.kind === 79 /* Identifier */) {
-                        getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
+                        getSymbolLinks(getSymbolOfNode(element)).type = type;
                     }
                     else {
-                        assignBindingElementTypes(element.name);
+                        assignBindingElementTypes(element.name, type);
                     }
                 }
             }
@@ -76501,12 +76613,12 @@ var ts;
                 var witnesses = getSwitchClauseTypeOfWitnesses(node, /*retainDefault*/ false);
                 // notEqualFacts states that the type of the switched value is not equal to every type in the switch.
                 var notEqualFacts_1 = getFactsFromTypeofSwitch(0, 0, witnesses, /*hasDefault*/ true);
-                var type_5 = getBaseConstraintOfType(operandType) || operandType;
+                var type_6 = getBaseConstraintOfType(operandType) || operandType;
                 // Take any/unknown as a special condition. Or maybe we could change `type` to a union containing all primitive types.
-                if (type_5.flags & 3 /* AnyOrUnknown */) {
+                if (type_6.flags & 3 /* AnyOrUnknown */) {
                     return (556800 /* AllTypeofNE */ & notEqualFacts_1) === 556800 /* AllTypeofNE */;
                 }
-                return !!(filterType(type_5, function (t) { return (getTypeFacts(t) & notEqualFacts_1) === notEqualFacts_1; }).flags & 131072 /* Never */);
+                return !!(filterType(type_6, function (t) { return (getTypeFacts(t) & notEqualFacts_1) === notEqualFacts_1; }).flags & 131072 /* Never */);
             }
             var type = getTypeOfExpression(node.expression);
             if (!isLiteralType(type)) {
@@ -78628,6 +78740,7 @@ var ts;
                 }
             }
             checkTypeParameters(ts.getEffectiveTypeParameterDeclarations(node));
+            checkUnmatchedJSDocParameters(node);
             ts.forEach(node.parameters, checkParameter);
             // TODO(rbuckton): Should we start checking JSDoc types?
             if (node.type) {
@@ -79988,28 +80101,24 @@ var ts;
             if (returnType.flags & 1 /* Any */) {
                 return;
             }
+            var headMessage;
             var expectedReturnType;
-            var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
-            var errorInfo;
             switch (node.parent.kind) {
                 case 256 /* ClassDeclaration */:
+                    headMessage = ts.Diagnostics.Decorator_function_return_type_0_is_not_assignable_to_type_1;
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 163 /* Parameter */:
-                    expectedReturnType = voidType;
-                    errorInfo = ts.chainDiagnosticMessages(
-                    /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
-                    break;
                 case 166 /* PropertyDeclaration */:
+                case 163 /* Parameter */:
+                    headMessage = ts.Diagnostics.Decorator_function_return_type_is_0_but_is_expected_to_be_void_or_any;
                     expectedReturnType = voidType;
-                    errorInfo = ts.chainDiagnosticMessages(
-                    /*details*/ undefined, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
                     break;
                 case 168 /* MethodDeclaration */:
                 case 171 /* GetAccessor */:
                 case 172 /* SetAccessor */:
+                    headMessage = ts.Diagnostics.Decorator_function_return_type_0_is_not_assignable_to_type_1;
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -80017,7 +80126,7 @@ var ts;
                 default:
                     return ts.Debug.fail();
             }
-            checkTypeAssignableTo(returnType, expectedReturnType, node, headMessage, function () { return errorInfo; });
+            checkTypeAssignableTo(returnType, expectedReturnType, node, headMessage);
         }
         /**
          * If a TypeNode can be resolved to a value symbol imported from an external module, it is
@@ -80199,31 +80308,6 @@ var ts;
         }
         function checkJSDocParameterTag(node) {
             checkSourceElement(node.typeExpression);
-            if (!ts.getParameterSymbolFromJSDoc(node)) {
-                var decl = ts.getHostSignatureFromJSDoc(node);
-                // don't issue an error for invalid hosts -- just functions --
-                // and give a better error message when the host function mentions `arguments`
-                // but the tag doesn't have an array type
-                if (decl) {
-                    var i = ts.getJSDocTags(decl).filter(ts.isJSDocParameterTag).indexOf(node);
-                    if (i > -1 && i < decl.parameters.length && ts.isBindingPattern(decl.parameters[i].name)) {
-                        return;
-                    }
-                    if (!containsArgumentsReference(decl)) {
-                        if (ts.isQualifiedName(node.name)) {
-                            error(node.name, ts.Diagnostics.Qualified_name_0_is_not_allowed_without_a_leading_param_object_1, ts.entityNameToString(node.name), ts.entityNameToString(node.name.left));
-                        }
-                        else {
-                            error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name, ts.idText(node.name));
-                        }
-                    }
-                    else if (ts.findLast(ts.getJSDocTags(decl), ts.isJSDocParameterTag) === node &&
-                        node.typeExpression && node.typeExpression.type &&
-                        !isArrayType(getTypeFromTypeNode(node.typeExpression.type))) {
-                        error(node.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(node.name.kind === 160 /* QualifiedName */ ? node.name.right : node.name));
-                    }
-                }
-            }
         }
         function checkJSDocPropertyTag(node) {
             checkSourceElement(node.typeExpression);
@@ -82296,6 +82380,45 @@ var ts;
                 error(name, ts.Diagnostics.Class_name_cannot_be_Object_when_targeting_ES5_with_module_0, ts.ModuleKind[moduleKind]); // https://github.com/Microsoft/TypeScript/issues/17494
             }
         }
+        function checkUnmatchedJSDocParameters(node) {
+            var jsdocParameters = ts.filter(ts.getJSDocTags(node), ts.isJSDocParameterTag);
+            if (!ts.length(jsdocParameters))
+                return;
+            var isJs = ts.isInJSFile(node);
+            var parameters = new ts.Set();
+            var excludedParameters = new ts.Set();
+            ts.forEach(node.parameters, function (_a, index) {
+                var name = _a.name;
+                if (ts.isIdentifier(name)) {
+                    parameters.add(name.escapedText);
+                }
+                if (ts.isBindingPattern(name)) {
+                    excludedParameters.add(index);
+                }
+            });
+            var containsArguments = containsArgumentsReference(node);
+            if (containsArguments) {
+                var lastJSDocParam = ts.lastOrUndefined(jsdocParameters);
+                if (lastJSDocParam && ts.isIdentifier(lastJSDocParam.name) && lastJSDocParam.typeExpression &&
+                    lastJSDocParam.typeExpression.type && !parameters.has(lastJSDocParam.name.escapedText) && !isArrayType(getTypeFromTypeNode(lastJSDocParam.typeExpression.type))) {
+                    errorOrSuggestion(isJs, lastJSDocParam.name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_It_would_match_arguments_if_it_had_an_array_type, ts.idText(lastJSDocParam.name));
+                }
+            }
+            else {
+                ts.forEach(jsdocParameters, function (_a, index) {
+                    var name = _a.name;
+                    if (excludedParameters.has(index) || ts.isIdentifier(name) && parameters.has(name.escapedText)) {
+                        return;
+                    }
+                    if (ts.isQualifiedName(name)) {
+                        errorOrSuggestion(isJs, name, ts.Diagnostics.Qualified_name_0_is_not_allowed_without_a_leading_param_object_1, ts.entityNameToString(name), ts.entityNameToString(name.left));
+                    }
+                    else {
+                        errorOrSuggestion(isJs, name, ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name, ts.idText(name));
+                    }
+                });
+            }
+        }
         /**
          * Check each type parameter and check that type parameters have no duplicate type parameter declarations
          */
@@ -83504,6 +83627,9 @@ var ts;
                                     var name = ts.idText(node.kind === 269 /* ImportSpecifier */ ? node.propertyName || node.name : node.name);
                                     addTypeOnlyDeclarationRelatedInfo(error(node, message, name), isType ? undefined : typeOnlyAlias, name);
                                 }
+                                if (isType && node.kind === 264 /* ImportEqualsDeclaration */ && ts.hasEffectiveModifier(node, 1 /* Export */)) {
+                                    error(node, ts.Diagnostics.Cannot_use_export_import_on_a_type_or_type_only_namespace_when_the_isolatedModules_flag_is_provided);
+                                }
                                 break;
                             }
                             case 274 /* ExportSpecifier */: {
@@ -85548,7 +85674,7 @@ var ts;
             if (resolvedTypeReferenceDirectives) {
                 // populate reverse mapping: file path -> type reference directive that was resolved to this file
                 fileToDirective = new ts.Map();
-                resolvedTypeReferenceDirectives.forEach(function (resolvedDirective, key) {
+                resolvedTypeReferenceDirectives.forEach(function (resolvedDirective, key, mode) {
                     if (!resolvedDirective || !resolvedDirective.resolvedFileName) {
                         return;
                     }
@@ -85556,7 +85682,7 @@ var ts;
                     if (file) {
                         // Add the transitive closure of path references loaded by this file (as long as they are not)
                         // part of an existing type reference.
-                        addReferencedFilesToTypeDirective(file, key);
+                        addReferencedFilesToTypeDirective(file, key, mode);
                     }
                 });
             }
@@ -85750,16 +85876,16 @@ var ts;
                 }
                 return false;
             }
-            function addReferencedFilesToTypeDirective(file, key) {
+            function addReferencedFilesToTypeDirective(file, key, mode) {
                 if (fileToDirective.has(file.path))
                     return;
-                fileToDirective.set(file.path, key);
+                fileToDirective.set(file.path, [key, mode]);
                 for (var _i = 0, _a = file.referencedFiles; _i < _a.length; _i++) {
-                    var fileName = _a[_i].fileName;
+                    var _b = _a[_i], fileName = _b.fileName, resolutionMode = _b.resolutionMode;
                     var resolvedFile = ts.resolveTripleslashReference(fileName, file.fileName);
                     var referencedFile = host.getSourceFile(resolvedFile);
                     if (referencedFile) {
-                        addReferencedFilesToTypeDirective(referencedFile, key);
+                        addReferencedFilesToTypeDirective(referencedFile, key, resolutionMode || file.impliedNodeFormat);
                     }
                 }
             }
@@ -87464,28 +87590,27 @@ var ts;
         }
         function findMostOverlappyType(source, unionTarget) {
             var bestMatch;
-            var matchingCount = 0;
-            for (var _i = 0, _a = unionTarget.types; _i < _a.length; _i++) {
-                var target = _a[_i];
-                var overlap = getIntersectionType([getIndexType(source), getIndexType(target)]);
-                if (overlap.flags & 4194304 /* Index */) {
-                    // perfect overlap of keys
-                    bestMatch = target;
-                    matchingCount = Infinity;
-                }
-                else if (overlap.flags & 1048576 /* Union */) {
-                    // We only want to account for literal types otherwise.
-                    // If we have a union of index types, it seems likely that we
-                    // needed to elaborate between two generic mapped types anyway.
-                    var len = ts.length(ts.filter(overlap.types, isUnitType));
-                    if (len >= matchingCount) {
-                        bestMatch = target;
-                        matchingCount = len;
-                    }
-                }
-                else if (isUnitType(overlap) && 1 >= matchingCount) {
-                    bestMatch = target;
-                    matchingCount = 1;
+            if (!(source.flags & (131068 /* Primitive */ | 406847488 /* InstantiablePrimitive */))) {
+                var matchingCount = 0;
+                for (var _i = 0, _a = unionTarget.types; _i < _a.length; _i++) {
+                    var target = _a[_i];
+                    if (!(target.flags & (131068 /* Primitive */ | 406847488 /* InstantiablePrimitive */))) {
+                        var overlap = getIntersectionType([getIndexType(source), getIndexType(target)]);
+                        if (overlap.flags & 4194304 /* Index */) {
+                            // perfect overlap of keys
+                            return target;
+                        }
+                        else if (isUnitType(overlap) || overlap.flags & 1048576 /* Union */) {
+                            // We only want to account for literal types otherwise.
+                            // If we have a union of index types, it seems likely that we
+                            // needed to elaborate between two generic mapped types anyway.
+                            var len = overlap.flags & 1048576 /* Union */ ? ts.countWhere(overlap.types, isUnitType) : 1;
+                            if (len >= matchingCount) {
+                                bestMatch = target;
+                                matchingCount = len;
+                            }
+                        }
+                    }
                 }
             }
             return bestMatch;
@@ -106528,7 +106653,7 @@ var ts;
                         var sourceFile = ts.createUnparsedSourceFile(prepend, "dts", stripInternal);
                         hasNoDefaultLib_1 = hasNoDefaultLib_1 || !!sourceFile.hasNoDefaultLib;
                         collectReferences(sourceFile, refs);
-                        recordTypeReferenceDirectivesIfNecessary(sourceFile.typeReferenceDirectives);
+                        recordTypeReferenceDirectivesIfNecessary(ts.map(sourceFile.typeReferenceDirectives, function (ref) { return [ref.fileName, ref.resolutionMode]; }));
                         collectLibs(sourceFile, libs);
                         return sourceFile;
                     }
@@ -106583,9 +106708,10 @@ var ts;
                 return ts.map(ts.arrayFrom(libs.keys()), function (lib) { return ({ fileName: lib, pos: -1, end: -1 }); });
             }
             function getFileReferencesForUsedTypeReferences() {
-                return necessaryTypeReferences ? ts.mapDefined(ts.arrayFrom(necessaryTypeReferences.keys()), getFileReferenceForTypeName) : [];
+                return necessaryTypeReferences ? ts.mapDefined(ts.arrayFrom(necessaryTypeReferences.keys()), getFileReferenceForSpecifierModeTuple) : [];
             }
-            function getFileReferenceForTypeName(typeName) {
+            function getFileReferenceForSpecifierModeTuple(_a) {
+                var typeName = _a[0], mode = _a[1];
                 // Elide type references for which we have imports
                 if (emittedImports) {
                     for (var _i = 0, emittedImports_1 = emittedImports; _i < emittedImports_1.length; _i++) {
@@ -106601,7 +106727,7 @@ var ts;
                         }
                     }
                 }
-                return { fileName: typeName, pos: -1, end: -1 };
+                return __assign({ fileName: typeName, pos: -1, end: -1 }, (mode ? { resolutionMode: mode } : undefined));
             }
             function mapReferencesIntoArray(references, outputFilePath) {
                 return function (file) {
@@ -106621,7 +106747,7 @@ var ts;
                             // If some compiler option/symlink/whatever allows access to the file containing the ambient module declaration
                             // via a non-relative name, emit a type reference directive to that non-relative name, rather than
                             // a relative path to the declaration file
-                            recordTypeReferenceDirectivesIfNecessary([specifier]);
+                            recordTypeReferenceDirectivesIfNecessary([[specifier, /*mode*/ undefined]]);
                             return;
                         }
                         var fileName = ts.getRelativePathToDirectoryOrUrl(outputFilePath, declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, 
@@ -111733,9 +111859,12 @@ var ts;
             for (var _d = 0, types_24 = types; _d < types_24.length; _d++) {
                 var directive = types_24[_d];
                 var pos = writer.getTextPos();
-                writeComment("/// <reference types=\"" + directive.fileName + "\" />");
+                var resolutionMode = directive.resolutionMode && directive.resolutionMode !== (currentSourceFile === null || currentSourceFile === void 0 ? void 0 : currentSourceFile.impliedNodeFormat)
+                    ? "resolution-mode=\"" + (directive.resolutionMode === ts.ModuleKind.ESNext ? "import" : "require") + "\""
+                    : "";
+                writeComment("/// <reference types=\"" + directive.fileName + "\" " + resolutionMode + "/>");
                 if (bundleFileInfo)
-                    bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: "type" /* Type */, data: directive.fileName });
+                    bundleFileInfo.sections.push({ pos: pos, end: writer.getTextPos(), kind: !directive.resolutionMode ? "type" /* Type */ : directive.resolutionMode === ts.ModuleKind.ESNext ? "type-import" /* TypeResolutionModeImport */ : "type-require" /* TypeResolutionModeRequire */, data: directive.fileName });
                 writeLine();
             }
             for (var _e = 0, libs_1 = libs; _e < libs_1.length; _e++) {
@@ -114342,7 +114471,7 @@ var ts;
     }
     ts.flattenDiagnosticMessageText = flattenDiagnosticMessageText;
     /* @internal */
-    function loadWithLocalCache(names, containingFile, redirectedReference, loader) {
+    function loadWithTypeDirectiveCache(names, containingFile, redirectedReference, containingFileMode, loader) {
         if (names.length === 0) {
             return [];
         }
@@ -114351,19 +114480,28 @@ var ts;
         for (var _i = 0, names_2 = names; _i < names_2.length; _i++) {
             var name = names_2[_i];
             var result = void 0;
-            if (cache.has(name)) {
-                result = cache.get(name);
+            var mode = getModeForFileReference(name, containingFileMode);
+            // We lower-case all type references because npm automatically lowercases all packages. See GH#9824.
+            var strName = ts.isString(name) ? name : name.fileName.toLowerCase();
+            var cacheKey = mode !== undefined ? mode + "|" + strName : strName;
+            if (cache.has(cacheKey)) {
+                result = cache.get(cacheKey);
             }
             else {
-                cache.set(name, result = loader(name, containingFile, redirectedReference));
+                cache.set(cacheKey, result = loader(strName, containingFile, redirectedReference, mode));
             }
             resolutions.push(result);
         }
         return resolutions;
     }
-    ts.loadWithLocalCache = loadWithLocalCache;
+    ts.loadWithTypeDirectiveCache = loadWithTypeDirectiveCache;
     ;
     /* @internal */
+    function getModeForFileReference(ref, containingFileMode) {
+        return (ts.isString(ref) ? containingFileMode : ref.resolutionMode) || containingFileMode;
+    }
+    ts.getModeForFileReference = getModeForFileReference;
+    /* @internal */
     function getModeForResolutionAtIndex(file, index) {
         if (file.impliedNodeFormat === undefined)
             return undefined;
@@ -114466,7 +114604,7 @@ var ts;
         var _d, _e, _f, _g;
         var file = ts.Debug.checkDefined(getSourceFileByPath(ref.file));
         var kind = ref.kind, index = ref.index;
-        var pos, end, packageId;
+        var pos, end, packageId, resolutionMode;
         switch (kind) {
             case ts.FileIncludeKind.Import:
                 var importLiteral = getModuleNameStringLiteralAt(file, index);
@@ -114480,8 +114618,8 @@ var ts;
                 (_a = file.referencedFiles[index], pos = _a.pos, end = _a.end);
                 break;
             case ts.FileIncludeKind.TypeReferenceDirective:
-                (_b = file.typeReferenceDirectives[index], pos = _b.pos, end = _b.end);
-                packageId = (_g = (_f = file.resolvedTypeReferenceDirectiveNames) === null || _f === void 0 ? void 0 : _f.get(ts.toFileNameLowerCase(file.typeReferenceDirectives[index].fileName), file.impliedNodeFormat)) === null || _g === void 0 ? void 0 : _g.packageId;
+                (_b = file.typeReferenceDirectives[index], pos = _b.pos, end = _b.end, resolutionMode = _b.resolutionMode);
+                packageId = (_g = (_f = file.resolvedTypeReferenceDirectiveNames) === null || _f === void 0 ? void 0 : _f.get(ts.toFileNameLowerCase(file.typeReferenceDirectives[index].fileName), resolutionMode || file.impliedNodeFormat)) === null || _g === void 0 ? void 0 : _g.packageId;
                 break;
             case ts.FileIncludeKind.LibReferenceDirective:
                 (_c = file.libReferenceDirectives[index], pos = _c.pos, end = _c.end);
@@ -114725,7 +114863,7 @@ var ts;
         var fileReasons = ts.createMultiMap();
         var cachedBindAndCheckDiagnosticsForFile = {};
         var cachedDeclarationDiagnosticsForFile = {};
-        var resolvedTypeReferenceDirectives = new ts.Map();
+        var resolvedTypeReferenceDirectives = ts.createModeAwareCache();
         var fileProcessingDiagnostics;
         // The below settings are to track if a .js file should be add to the program if loaded via searching under node_modules.
         // This works as imported modules are discovered recursively in a depth first manner, specifically:
@@ -114778,12 +114916,12 @@ var ts;
         }
         var actualResolveTypeReferenceDirectiveNamesWorker;
         if (host.resolveTypeReferenceDirectives) {
-            actualResolveTypeReferenceDirectiveNamesWorker = function (typeDirectiveNames, containingFile, redirectedReference) { return host.resolveTypeReferenceDirectives(ts.Debug.checkEachDefined(typeDirectiveNames), containingFile, redirectedReference, options); };
+            actualResolveTypeReferenceDirectiveNamesWorker = function (typeDirectiveNames, containingFile, redirectedReference, containingFileMode) { return host.resolveTypeReferenceDirectives(ts.Debug.checkEachDefined(typeDirectiveNames), containingFile, redirectedReference, options, containingFileMode); };
         }
         else {
             typeReferenceDirectiveResolutionCache = ts.createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, /*options*/ undefined, moduleResolutionCache === null || moduleResolutionCache === void 0 ? void 0 : moduleResolutionCache.getPackageJsonInfoCache());
-            var loader_2 = function (typesRef, containingFile, redirectedReference) { return ts.resolveTypeReferenceDirective(typesRef, containingFile, options, host, redirectedReference, typeReferenceDirectiveResolutionCache).resolvedTypeReferenceDirective; }; // TODO: GH#18217
-            actualResolveTypeReferenceDirectiveNamesWorker = function (typeReferenceDirectiveNames, containingFile, redirectedReference) { return loadWithLocalCache(ts.Debug.checkEachDefined(typeReferenceDirectiveNames), containingFile, redirectedReference, loader_2); };
+            var loader_2 = function (typesRef, containingFile, redirectedReference, resolutionMode) { return ts.resolveTypeReferenceDirective(typesRef, containingFile, options, host, redirectedReference, typeReferenceDirectiveResolutionCache, resolutionMode).resolvedTypeReferenceDirective; }; // TODO: GH#18217
+            actualResolveTypeReferenceDirectiveNamesWorker = function (typeReferenceDirectiveNames, containingFile, redirectedReference, containingFileMode) { return loadWithTypeDirectiveCache(ts.Debug.checkEachDefined(typeReferenceDirectiveNames), containingFile, redirectedReference, containingFileMode, loader_2); };
         }
         // Map from a stringified PackageId to the source file with that id.
         // Only one source file may have a given packageId. Others become redirects (see createRedirectSourceFile).
@@ -114880,7 +115018,8 @@ var ts;
                 var containingFilename = ts.combinePaths(containingDirectory, ts.inferredTypesContainingFile);
                 var resolutions = resolveTypeReferenceDirectiveNamesWorker(typeReferences, containingFilename);
                 for (var i = 0; i < typeReferences.length; i++) {
-                    processTypeReferenceDirective(typeReferences[i], resolutions[i], { kind: ts.FileIncludeKind.AutomaticTypeDirectiveFile, typeReference: typeReferences[i], packageId: (_c = resolutions[i]) === null || _c === void 0 ? void 0 : _c.packageId });
+                    // under node12/nodenext module resolution, load `types`/ata include names as cjs resolution results by passing an `undefined` mode
+                    processTypeReferenceDirective(typeReferences[i], /*mode*/ undefined, resolutions[i], { kind: ts.FileIncludeKind.AutomaticTypeDirectiveFile, typeReference: typeReferences[i], packageId: (_c = resolutions[i]) === null || _c === void 0 ? void 0 : _c.packageId });
                 }
                 ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
             }
@@ -115040,9 +115179,10 @@ var ts;
                 return [];
             var containingFileName = !ts.isString(containingFile) ? ts.getNormalizedAbsolutePath(containingFile.originalFileName, currentDirectory) : containingFile;
             var redirectedReference = !ts.isString(containingFile) ? getRedirectReferenceForResolution(containingFile) : undefined;
+            var containingFileMode = !ts.isString(containingFile) ? containingFile.impliedNodeFormat : undefined;
             ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("program" /* Program */, "resolveTypeReferenceDirectiveNamesWorker", { containingFileName: containingFileName });
             ts.performance.mark("beforeResolveTypeReference");
-            var result = actualResolveTypeReferenceDirectiveNamesWorker(typeDirectiveNames, containingFileName, redirectedReference);
+            var result = actualResolveTypeReferenceDirectiveNamesWorker(typeDirectiveNames, containingFileName, redirectedReference, containingFileMode);
             ts.performance.mark("afterResolveTypeReference");
             ts.performance.measure("ResolveTypeReference", "beforeResolveTypeReference", "afterResolveTypeReference");
             ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
@@ -115434,8 +115574,7 @@ var ts;
                 else {
                     newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
                 }
-                // We lower-case all type references because npm automatically lowercases all packages. See GH#9824.
-                var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (ref) { return ts.toFileNameLowerCase(ref.fileName); });
+                var typesReferenceDirectives = newSourceFile.typeReferenceDirectives;
                 var typeReferenceResolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFile);
                 // ensure that types resolutions are still correct
                 var typeReferenceResolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, typeReferenceResolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, oldSourceFile, ts.typeDirectiveIsEqualTo);
@@ -116514,8 +116653,7 @@ var ts;
             });
         }
         function processTypeReferenceDirectives(file) {
-            // We lower-case all type references because npm automatically lowercases all packages. See GH#9824.
-            var typeDirectives = ts.map(file.typeReferenceDirectives, function (ref) { return ts.toFileNameLowerCase(ref.fileName); });
+            var typeDirectives = file.typeReferenceDirectives;
             if (!typeDirectives) {
                 return;
             }
@@ -116526,17 +116664,21 @@ var ts;
                 // store resolved type directive on the file
                 var fileName = ts.toFileNameLowerCase(ref.fileName);
                 ts.setResolvedTypeReferenceDirective(file, fileName, resolvedTypeReferenceDirective);
-                processTypeReferenceDirective(fileName, resolvedTypeReferenceDirective, { kind: ts.FileIncludeKind.TypeReferenceDirective, file: file.path, index: index, });
+                var mode = ref.resolutionMode || file.impliedNodeFormat;
+                if (mode && ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.Node12 && ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.NodeNext) {
+                    programDiagnostics.add(ts.createDiagnosticForRange(file, ref, ts.Diagnostics.Resolution_modes_are_only_supported_when_moduleResolution_is_node12_or_nodenext));
+                }
+                processTypeReferenceDirective(fileName, mode, resolvedTypeReferenceDirective, { kind: ts.FileIncludeKind.TypeReferenceDirective, file: file.path, index: index, });
             }
         }
-        function processTypeReferenceDirective(typeReferenceDirective, resolvedTypeReferenceDirective, reason) {
+        function processTypeReferenceDirective(typeReferenceDirective, mode, resolvedTypeReferenceDirective, reason) {
             ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("program" /* Program */, "processTypeReferenceDirective", { directive: typeReferenceDirective, hasResolved: !!resolveModuleNamesReusingOldState, refKind: reason.kind, refPath: isReferencedFile(reason) ? reason.file : undefined });
-            processTypeReferenceDirectiveWorker(typeReferenceDirective, resolvedTypeReferenceDirective, reason);
+            processTypeReferenceDirectiveWorker(typeReferenceDirective, mode, resolvedTypeReferenceDirective, reason);
             ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
         }
-        function processTypeReferenceDirectiveWorker(typeReferenceDirective, resolvedTypeReferenceDirective, reason) {
+        function processTypeReferenceDirectiveWorker(typeReferenceDirective, mode, resolvedTypeReferenceDirective, reason) {
             // If we already found this library as a primary reference - nothing to do
-            var previousResolution = resolvedTypeReferenceDirectives.get(typeReferenceDirective);
+            var previousResolution = resolvedTypeReferenceDirectives.get(typeReferenceDirective, mode);
             if (previousResolution && previousResolution.primary) {
                 return;
             }
@@ -116575,7 +116717,7 @@ var ts;
                 addFilePreprocessingFileExplainingDiagnostic(/*file*/ undefined, reason, ts.Diagnostics.Cannot_find_type_definition_file_for_0, [typeReferenceDirective]);
             }
             if (saveResolution) {
-                resolvedTypeReferenceDirectives.set(typeReferenceDirective, resolvedTypeReferenceDirective);
+                resolvedTypeReferenceDirectives.set(typeReferenceDirective, mode, resolvedTypeReferenceDirective);
             }
         }
         function pathForLibFile(libFileName) {
@@ -119393,9 +119535,9 @@ var ts;
             });
             hasChangedAutomaticTypeDirectiveNames = false;
         }
-        function resolveModuleName(moduleName, containingFile, compilerOptions, host, redirectedReference) {
+        function resolveModuleName(moduleName, containingFile, compilerOptions, host, redirectedReference, _containingSourceFile, mode) {
             var _a;
-            var primaryResult = ts.resolveModuleName(moduleName, containingFile, compilerOptions, host, moduleResolutionCache, redirectedReference);
+            var primaryResult = ts.resolveModuleName(moduleName, containingFile, compilerOptions, host, moduleResolutionCache, redirectedReference, mode);
             // return result immediately only if global cache support is not enabled or if it is .ts, .tsx or .d.ts
             if (!resolutionHost.getGlobalCache) {
                 return primaryResult;
@@ -119416,12 +119558,12 @@ var ts;
             // Default return the result from the first pass
             return primaryResult;
         }
-        function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference) {
-            return ts.resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, typeReferenceDirectiveResolutionCache);
+        function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, _containingSourceFile, resolutionMode) {
+            return ts.resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, typeReferenceDirectiveResolutionCache, resolutionMode);
         }
         function resolveNamesWithLocalCache(_a) {
             var _b, _c, _d;
-            var names = _a.names, containingFile = _a.containingFile, redirectedReference = _a.redirectedReference, cache = _a.cache, perDirectoryCacheWithRedirects = _a.perDirectoryCacheWithRedirects, loader = _a.loader, getResolutionWithResolvedFileName = _a.getResolutionWithResolvedFileName, shouldRetryResolution = _a.shouldRetryResolution, reusedNames = _a.reusedNames, logChanges = _a.logChanges, containingSourceFile = _a.containingSourceFile;
+            var names = _a.names, containingFile = _a.containingFile, redirectedReference = _a.redirectedReference, cache = _a.cache, perDirectoryCacheWithRedirects = _a.perDirectoryCacheWithRedirects, loader = _a.loader, getResolutionWithResolvedFileName = _a.getResolutionWithResolvedFileName, shouldRetryResolution = _a.shouldRetryResolution, reusedNames = _a.reusedNames, logChanges = _a.logChanges, containingSourceFile = _a.containingSourceFile, containingSourceFileMode = _a.containingSourceFileMode;
             var path = resolutionHost.toPath(containingFile);
             var resolutionsInFile = cache.get(path) || cache.set(path, ts.createModeAwareCache()).get(path);
             var dirPath = ts.getDirectoryPath(path);
@@ -119443,8 +119585,15 @@ var ts;
             var seenNamesInFile = ts.createModeAwareCache();
             var i = 0;
             for (var _i = 0, names_4 = names; _i < names_4.length; _i++) {
-                var name = names_4[_i];
-                var mode = containingSourceFile ? ts.getModeForResolutionAtIndex(containingSourceFile, i) : undefined;
+                var entry = names_4[_i];
+                var name = ts.isString(entry) ? entry : entry.fileName.toLowerCase();
+                // Imports supply a `containingSourceFile` but no `containingSourceFileMode` - it would be redundant
+                // they require calculating the mode for a given import from it's position in the resolution table, since a given
+                // import's syntax may override the file's default mode.
+                // Type references instead supply a `containingSourceFileMode` and a non-string entry which contains
+                // a default file mode override if applicable.
+                var mode = !ts.isString(entry) ? ts.getModeForFileReference(entry, containingSourceFileMode) :
+                    containingSourceFile ? ts.getModeForResolutionAtIndex(containingSourceFile, i) : undefined;
                 i++;
                 var resolution = resolutionsInFile.get(name, mode);
                 // Resolution is valid if it is present and not invalidated
@@ -119473,7 +119622,7 @@ var ts;
                         }
                     }
                     else {
-                        resolution = loader(name, containingFile, compilerOptions, ((_c = resolutionHost.getCompilerHost) === null || _c === void 0 ? void 0 : _c.call(resolutionHost)) || resolutionHost, redirectedReference, containingSourceFile);
+                        resolution = loader(name, containingFile, compilerOptions, ((_c = resolutionHost.getCompilerHost) === null || _c === void 0 ? void 0 : _c.call(resolutionHost)) || resolutionHost, redirectedReference, containingSourceFile, mode);
                         perDirectoryResolution.set(name, mode, resolution);
                         if (resolutionHost.onDiscoveredSymlink && resolutionIsSymlink(resolution)) {
                             resolutionHost.onDiscoveredSymlink();
@@ -119537,7 +119686,7 @@ var ts;
                 return oldResult.resolvedFileName === newResult.resolvedFileName;
             }
         }
-        function resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference) {
+        function resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference, containingFileMode) {
             return resolveNamesWithLocalCache({
                 names: typeDirectiveNames,
                 containingFile: containingFile,
@@ -119547,6 +119696,7 @@ var ts;
                 loader: resolveTypeReferenceDirective,
                 getResolutionWithResolvedFileName: getResolvedTypeReferenceDirective,
                 shouldRetryResolution: function (resolution) { return resolution.resolvedTypeReferenceDirective === undefined; },
+                containingSourceFileMode: containingFileMode
             });
         }
         function resolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference, containingSourceFile) {
@@ -121455,7 +121605,7 @@ var ts;
                 }
                 return host.resolveTypeReferenceDirectives.apply(host, args);
             }) :
-            (function (typeDirectiveNames, containingFile, redirectedReference) { return resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference); });
+            (function (typeDirectiveNames, containingFile, redirectedReference, _options, containingFileMode) { return resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference, containingFileMode); });
         var userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives;
         builderProgram = readBuilderProgram(compilerOptions, compilerHost);
         synchronizeProgram();
@@ -122191,9 +122341,9 @@ var ts;
             compilerHost.getModuleResolutionCache = function () { return moduleResolutionCache; };
         }
         if (!compilerHost.resolveTypeReferenceDirectives) {
-            var loader_4 = function (moduleName, containingFile, redirectedReference) { return ts.resolveTypeReferenceDirective(moduleName, containingFile, state.projectCompilerOptions, compilerHost, redirectedReference, state.typeReferenceDirectiveResolutionCache).resolvedTypeReferenceDirective; };
-            compilerHost.resolveTypeReferenceDirectives = function (typeReferenceDirectiveNames, containingFile, redirectedReference) {
-                return ts.loadWithLocalCache(ts.Debug.checkEachDefined(typeReferenceDirectiveNames), containingFile, redirectedReference, loader_4);
+            var loader_4 = function (moduleName, containingFile, redirectedReference, containingFileMode) { return ts.resolveTypeReferenceDirective(moduleName, containingFile, state.projectCompilerOptions, compilerHost, redirectedReference, state.typeReferenceDirectiveResolutionCache, containingFileMode).resolvedTypeReferenceDirective; };
+            compilerHost.resolveTypeReferenceDirectives = function (typeReferenceDirectiveNames, containingFile, redirectedReference, _options, containingFileMode) {
+                return ts.loadWithTypeDirectiveCache(ts.Debug.checkEachDefined(typeReferenceDirectiveNames), containingFile, redirectedReference, containingFileMode, loader_4);
             };
         }
         var _a = ts.createWatchFactory(hostWithWatch, options), watchFile = _a.watchFile, watchDirectory = _a.watchDirectory, writeLog = _a.writeLog;
@@ -127519,6 +127669,10 @@ var ts;
         return __assign(__assign({}, options), { semicolons: shouldRemoveSemicolons ? ts.SemicolonPreference.Remove : ts.SemicolonPreference.Ignore });
     }
     ts.getFormatCodeSettingsForWriting = getFormatCodeSettingsForWriting;
+    function jsxModeNeedsExplicitImport(jsx) {
+        return jsx === 2 /* React */ || jsx === 3 /* ReactNative */;
+    }
+    ts.jsxModeNeedsExplicitImport = jsxModeNeedsExplicitImport;
     // #endregion
 })(ts || (ts = {}));
 /*@internal*/
@@ -129463,9 +129617,18 @@ var ts;
                     return getCompletionEntriesForDirectoryFragment(literalValue, scriptDirectory, extensionOptions, host, scriptPath);
                 }
             }
+            function isEmitResolutionKindUsingNodeModules(compilerOptions) {
+                return ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeJs ||
+                    ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.Node12 ||
+                    ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeNext;
+            }
+            function isEmitModuleResolutionRespectingExportMaps(compilerOptions) {
+                return ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.Node12 ||
+                    ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeNext;
+            }
             function getSupportedExtensionsForModuleResolution(compilerOptions) {
                 var extensions = ts.getSupportedExtensions(compilerOptions);
-                return ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeJs ?
+                return isEmitResolutionKindUsingNodeModules(compilerOptions) ?
                     ts.getSupportedExtensionsWithJsonIfResolveJsonModule(compilerOptions, extensions) :
                     extensions;
             }
@@ -129628,7 +129791,7 @@ var ts;
                     result.push(nameAndKind(ambientName, "external module name" /* externalModuleName */, /*extension*/ undefined));
                 }
                 getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, fragmentDirectory, extensionOptions, result);
-                if (ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeJs) {
+                if (isEmitResolutionKindUsingNodeModules(compilerOptions)) {
                     // If looking for a global package name, don't just include everything in `node_modules` because that includes dependencies' own dependencies.
                     // (But do if we didn't find anything, e.g. 'package.json' missing.)
                     var foundGlobal = false;
@@ -129645,12 +129808,68 @@ var ts;
                         }
                     }
                     if (!foundGlobal) {
-                        ts.forEachAncestorDirectory(scriptPath, function (ancestor) {
+                        var ancestorLookup = function (ancestor) {
                             var nodeModules = ts.combinePaths(ancestor, "node_modules");
                             if (ts.tryDirectoryExists(host, nodeModules)) {
                                 getCompletionEntriesForDirectoryFragment(fragment, nodeModules, extensionOptions, host, /*exclude*/ undefined, result);
                             }
-                        });
+                        };
+                        if (fragmentDirectory && isEmitModuleResolutionRespectingExportMaps(compilerOptions)) {
+                            var nodeModulesDirectoryLookup_1 = ancestorLookup;
+                            ancestorLookup = function (ancestor) {
+                                var components = ts.getPathComponents(fragment);
+                                components.shift(); // shift off empty root
+                                var packagePath = components.shift();
+                                if (!packagePath) {
+                                    return nodeModulesDirectoryLookup_1(ancestor);
+                                }
+                                if (ts.startsWith(packagePath, "@")) {
+                                    var subName = components.shift();
+                                    if (!subName) {
+                                        return nodeModulesDirectoryLookup_1(ancestor);
+                                    }
+                                    packagePath = ts.combinePaths(packagePath, subName);
+                                }
+                                var packageFile = ts.combinePaths(ancestor, "node_modules", packagePath, "package.json");
+                                if (ts.tryFileExists(host, packageFile)) {
+                                    var packageJson = ts.readJson(packageFile, host);
+                                    var exports = packageJson.exports;
+                                    if (exports) {
+                                        if (typeof exports !== "object" || exports === null) { // eslint-disable-line no-null/no-null
+                                            return; // null exports or entrypoint only, no sub-modules available
+                                        }
+                                        var keys = ts.getOwnKeys(exports);
+                                        var fragmentSubpath_1 = components.join("/");
+                                        var processedKeys = ts.mapDefined(keys, function (k) {
+                                            if (k === ".")
+                                                return undefined;
+                                            if (!ts.startsWith(k, "./"))
+                                                return undefined;
+                                            var subpath = k.substring(2);
+                                            if (!ts.startsWith(subpath, fragmentSubpath_1))
+                                                return undefined;
+                                            // subpath is a valid export (barring conditions, which we don't currently check here)
+                                            if (!ts.stringContains(subpath, "*")) {
+                                                return subpath;
+                                            }
+                                            // pattern export - only return everything up to the `*`, so the user can autocomplete, then
+                                            // keep filling in the pattern (we could speculatively return a list of options by hitting disk,
+                                            // but conditions will make that somewhat awkward, as each condition may have a different set of possible
+                                            // options for the `*`.
+                                            return subpath.slice(0, subpath.indexOf("*"));
+                                        });
+                                        ts.forEach(processedKeys, function (k) {
+                                            if (k) {
+                                                result.push(nameAndKind(k, "external module name" /* externalModuleName */, /*extension*/ undefined));
+                                            }
+                                        });
+                                        return;
+                                    }
+                                }
+                                return nodeModulesDirectoryLookup_1(ancestor);
+                            };
+                        }
+                        ts.forEachAncestorDirectory(scriptPath, ancestorLookup);
                     }
                 }
                 return result;
@@ -131092,14 +131311,15 @@ var ts;
                     if (tag.tagName.pos <= position && position <= tag.tagName.end) {
                         return { kind: 1 /* JsDocTagName */ };
                     }
-                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 307 /* JSDocTypeExpression */) {
+                    var typeExpression = tryGetTypeExpressionFromTag(tag);
+                    if (typeExpression) {
                         currentToken = ts.getTokenAtPosition(sourceFile, position);
                         if (!currentToken ||
                             (!ts.isDeclarationName(currentToken) &&
                                 (currentToken.parent.kind !== 345 /* JSDocPropertyTag */ ||
                                     currentToken.parent.name !== currentToken))) {
                             // Use as type location if inside tag's type expression
-                            insideJsDocTagTypeExpression = isCurrentlyEditingNode(tag.typeExpression);
+                            insideJsDocTagTypeExpression = isCurrentlyEditingNode(typeExpression);
                         }
                     }
                     if (!insideJsDocTagTypeExpression && ts.isJSDocParameterTag(tag) && (ts.nodeIsMissing(tag.name) || tag.name.pos <= position && position <= tag.name.end)) {
@@ -131356,10 +131576,19 @@ var ts;
                     case 341 /* JSDocTypeTag */:
                     case 343 /* JSDocTypedefTag */:
                         return true;
+                    case 342 /* JSDocTemplateTag */:
+                        return !!tag.constraint;
                     default:
                         return false;
                 }
             }
+            function tryGetTypeExpressionFromTag(tag) {
+                if (isTagWithTypeExpression(tag)) {
+                    var typeExpression = ts.isJSDocTemplateTag(tag) ? tag.constraint : tag.typeExpression;
+                    return typeExpression && typeExpression.kind === 307 /* JSDocTypeExpression */ ? typeExpression : undefined;
+                }
+                return undefined;
+            }
             function getTypeScriptMemberSymbols() {
                 // Right of dot member completion list
                 completionKind = 2 /* PropertyAccess */;
@@ -134115,7 +134344,7 @@ var ts;
                     }
                     for (var _c = 0, _d = referencingFile.typeReferenceDirectives; _c < _d.length; _c++) {
                         var ref = _d[_c];
-                        var referenced = program.getResolvedTypeReferenceDirectives().get(ref.fileName);
+                        var referenced = program.getResolvedTypeReferenceDirectives().get(ref.fileName, ref.resolutionMode || referencingFile.impliedNodeFormat);
                         if (referenced !== undefined && referenced.resolvedFileName === searchSourceFile.fileName) {
                             refs.push({ kind: "reference", referencingFile: referencingFile, ref: ref });
                         }
@@ -137337,7 +137566,7 @@ var ts;
             }
             var typeReferenceDirective = findReferenceInPosition(sourceFile.typeReferenceDirectives, position);
             if (typeReferenceDirective) {
-                var reference = program.getResolvedTypeReferenceDirectives().get(typeReferenceDirective.fileName);
+                var reference = program.getResolvedTypeReferenceDirectives().get(typeReferenceDirective.fileName, typeReferenceDirective.resolutionMode || sourceFile.impliedNodeFormat);
                 var file = reference && program.getSourceFile(reference.resolvedFileName); // TODO:GH#18217
                 return file && { reference: typeReferenceDirective, fileName: file.fileName, file: file, unverified: false };
             }
@@ -139143,6 +139372,7 @@ var ts;
                 return oldImports;
             }
             var typeChecker = program.getTypeChecker();
+            var compilerOptions = program.getCompilerOptions();
             var jsxNamespace = typeChecker.getJsxNamespace(sourceFile);
             var jsxFragmentFactory = typeChecker.getJsxFragmentFactory(sourceFile);
             var jsxElementsPresent = !!(sourceFile.transformFlags & 2 /* ContainsJsx */);
@@ -139199,7 +139429,7 @@ var ts;
             return usedImports;
             function isDeclarationUsed(identifier) {
                 // The JSX factory symbol is always used if JSX elements are present - even if they are not allowed.
-                return jsxElementsPresent && (identifier.text === jsxNamespace || jsxFragmentFactory && identifier.text === jsxFragmentFactory) ||
+                return jsxElementsPresent && (identifier.text === jsxNamespace || jsxFragmentFactory && identifier.text === jsxFragmentFactory) && ts.jsxModeNeedsExplicitImport(compilerOptions.jsx) ||
                     ts.FindAllReferences.Core.isSymbolReferencedInFile(identifier, typeChecker, sourceFile);
             }
         }
@@ -146439,8 +146669,18 @@ var ts;
                 var indent = sourceFile.text.slice(startPosition, fnStart);
                 this.insertNodeAt(sourceFile, fnStart, tag, { preserveLeadingWhitespace: false, suffix: this.newLineCharacter + indent });
             };
+            ChangeTracker.prototype.createJSDocText = function (sourceFile, node) {
+                var comments = ts.flatMap(node.jsDoc, function (jsDoc) {
+                    return ts.isString(jsDoc.comment) ? ts.factory.createJSDocText(jsDoc.comment) : jsDoc.comment;
+                });
+                var jsDoc = ts.singleOrUndefined(node.jsDoc);
+                return jsDoc && ts.positionsAreOnSameLine(jsDoc.pos, jsDoc.end, sourceFile) && ts.length(comments) === 0 ? undefined :
+                    ts.factory.createNodeArray(ts.intersperse(comments, ts.factory.createJSDocText("\n")));
+            };
+            ChangeTracker.prototype.replaceJSDocComment = function (sourceFile, node, tags) {
+                this.insertJsdocCommentBefore(sourceFile, updateJSDocHost(node), ts.factory.createJSDocComment(this.createJSDocText(sourceFile, node), ts.factory.createNodeArray(tags)));
+            };
             ChangeTracker.prototype.addJSDocTags = function (sourceFile, parent, newTags) {
-                var comments = ts.flatMap(parent.jsDoc, function (j) { return typeof j.comment === "string" ? ts.factory.createJSDocText(j.comment) : j.comment; });
                 var oldTags = ts.flatMapToMutable(parent.jsDoc, function (j) { return j.tags; });
                 var unmergedNewTags = newTags.filter(function (newTag) { return !oldTags.some(function (tag, i) {
                     var merged = tryMergeJsdocTags(tag, newTag);
@@ -146448,20 +146688,10 @@ var ts;
                         oldTags[i] = merged;
                     return !!merged;
                 }); });
-                var tags = __spreadArray(__spreadArray([], oldTags, true), unmergedNewTags, true);
-                var jsDoc = ts.singleOrUndefined(parent.jsDoc);
-                var comment = jsDoc && ts.positionsAreOnSameLine(jsDoc.pos, jsDoc.end, sourceFile) && !ts.length(comments) ? undefined :
-                    ts.factory.createNodeArray(ts.intersperse(comments, ts.factory.createJSDocText("\n")));
-                var tag = ts.factory.createJSDocComment(comment, ts.factory.createNodeArray(tags));
-                var host = updateJSDocHost(parent);
-                this.insertJsdocCommentBefore(sourceFile, host, tag);
+                this.replaceJSDocComment(sourceFile, parent, __spreadArray(__spreadArray([], oldTags, true), unmergedNewTags, true));
             };
             ChangeTracker.prototype.filterJSDocTags = function (sourceFile, parent, predicate) {
-                var comments = ts.flatMap(parent.jsDoc, function (j) { return typeof j.comment === "string" ? ts.factory.createJSDocText(j.comment) : j.comment; });
-                var oldTags = ts.flatMapToMutable(parent.jsDoc, function (j) { return j.tags; });
-                var tag = ts.factory.createJSDocComment(ts.factory.createNodeArray(ts.intersperse(comments, ts.factory.createJSDocText("\n"))), ts.factory.createNodeArray(__spreadArray([], (ts.filter(oldTags, predicate) || ts.emptyArray), true)));
-                var host = updateJSDocHost(parent);
-                this.insertJsdocCommentBefore(sourceFile, host, tag);
+                this.replaceJSDocComment(sourceFile, parent, ts.filter(ts.flatMapToMutable(parent.jsDoc, function (j) { return j.tags; }), predicate));
             };
             ChangeTracker.prototype.replaceRangeWithText = function (sourceFile, range, text) {
                 this.changes.push({ kind: ChangeKind.Text, sourceFile: sourceFile, range: range, text: text });
@@ -150256,9 +150486,9 @@ var ts;
                 var symbolName = ts.getNameForExportedSymbol(exportedSymbol, ts.getEmitScriptTarget(compilerOptions));
                 var checker = program.getTypeChecker();
                 var symbol = checker.getMergedSymbol(ts.skipAlias(exportedSymbol, checker));
-                var exportInfos = getAllReExportingModules(sourceFile, symbol, moduleSymbol, symbolName, /*isJsxTagName*/ false, host, program, preferences, useAutoImportProvider);
+                var exportInfo = getAllReExportingModules(sourceFile, symbol, moduleSymbol, symbolName, /*isJsxTagName*/ false, host, program, preferences, useAutoImportProvider);
                 var useRequire = shouldUseRequire(sourceFile, program);
-                var fix = getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, symbolName, program, /*position*/ undefined, !!isValidTypeOnlyUseSite, useRequire, host, preferences);
+                var fix = getImportFixForSymbol(sourceFile, exportInfo, moduleSymbol, symbolName, program, /*position*/ undefined, !!isValidTypeOnlyUseSite, useRequire, host, preferences);
                 if (fix) {
                     addImport({ fixes: [fix], symbolName: symbolName, errorIdentifierText: undefined });
                 }
@@ -150447,7 +150677,7 @@ var ts;
         function getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, symbolName, program, position, isValidTypeOnlyUseSite, useRequire, host, preferences) {
             ts.Debug.assert(exportInfos.some(function (info) { return info.moduleSymbol === moduleSymbol || info.symbol.parent === moduleSymbol; }), "Some exportInfo should match the specified moduleSymbol");
             var packageJsonImportFilter = ts.createPackageJsonImportFilter(sourceFile, preferences, host);
-            return getBestFix(getImportFixes(exportInfos, symbolName, position, isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences), sourceFile, program, packageJsonImportFilter);
+            return getBestFix(getImportFixes(exportInfos, symbolName, position, isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences), sourceFile, program, packageJsonImportFilter, host);
         }
         function codeFixActionToCodeAction(_a) {
             var description = _a.description, changes = _a.changes, commands = _a.commands;
@@ -150507,7 +150737,7 @@ var ts;
             /*position*/ undefined, 
             /*isValidTypeOnlyUseSite*/ false, 
             /*useRequire*/ false, exportInfo, host, preferences, fromCacheOnly), fixes = _a.fixes, computedWithoutCacheCount = _a.computedWithoutCacheCount;
-            var result = getBestFix(fixes, importingFile, program, packageJsonImportFilter || ts.createPackageJsonImportFilter(importingFile, preferences, host));
+            var result = getBestFix(fixes, importingFile, program, packageJsonImportFilter || ts.createPackageJsonImportFilter(importingFile, preferences, host), host);
             return result && __assign(__assign({}, result), { computedWithoutCacheCount: computedWithoutCacheCount });
         }
         codefix.getModuleSpecifierForBestExportInfo = getModuleSpecifierForBestExportInfo;
@@ -150677,7 +150907,7 @@ var ts;
             // 5. Literally nothing to go on
             return true;
         }
-        function getNewImportFixes(program, sourceFile, position, isValidTypeOnlyUseSite, useRequire, moduleSymbols, host, preferences, fromCacheOnly) {
+        function getNewImportFixes(program, sourceFile, position, isValidTypeOnlyUseSite, useRequire, exportInfo, host, preferences, fromCacheOnly) {
             var isJs = ts.isSourceFileJS(sourceFile);
             var compilerOptions = program.getCompilerOptions();
             var moduleSpecifierResolutionHost = ts.createModuleSpecifierResolutionHost(program, host);
@@ -150686,7 +150916,7 @@ var ts;
                 ? function (moduleSymbol) { return ({ moduleSpecifiers: ts.moduleSpecifiers.tryGetModuleSpecifiersFromCache(moduleSymbol, sourceFile, moduleSpecifierResolutionHost, preferences), computedWithoutCache: false }); }
                 : function (moduleSymbol, checker) { return ts.moduleSpecifiers.getModuleSpecifiersWithCacheInfo(moduleSymbol, checker, compilerOptions, sourceFile, moduleSpecifierResolutionHost, preferences); };
             var computedWithoutCacheCount = 0;
-            var fixes = ts.flatMap(moduleSymbols, function (exportInfo) {
+            var fixes = ts.flatMap(exportInfo, function (exportInfo, i) {
                 var checker = getChecker(exportInfo.isFromPackageJson);
                 var _a = getModuleSpecifiers(exportInfo.moduleSymbol, checker), computedWithoutCache = _a.computedWithoutCache, moduleSpecifiers = _a.moduleSpecifiers;
                 var importedSymbolHasValueMeaning = !!(exportInfo.targetFlags & 111551 /* Value */);
@@ -150695,7 +150925,7 @@ var ts;
                 return moduleSpecifiers === null || moduleSpecifiers === void 0 ? void 0 : moduleSpecifiers.map(function (moduleSpecifier) {
                     // `position` should only be undefined at a missing jsx namespace, in which case we shouldn't be looking for pure types.
                     return !importedSymbolHasValueMeaning && isJs && position !== undefined
-                        ? { kind: 1 /* JsdocTypeImport */, moduleSpecifier: moduleSpecifier, position: position, exportInfo: exportInfo }
+                        ? { kind: 1 /* JsdocTypeImport */, moduleSpecifier: moduleSpecifier, position: position, exportInfo: exportInfo, isReExport: i > 0 }
                         : {
                             kind: 3 /* AddNew */,
                             moduleSpecifier: moduleSpecifier,
@@ -150703,6 +150933,7 @@ var ts;
                             useRequire: useRequire,
                             addAsTypeOnly: addAsTypeOnly,
                             exportInfo: exportInfo,
+                            isReExport: i > 0,
                         };
                 });
             });
@@ -150740,12 +150971,13 @@ var ts;
                 info = getFixesInfoForNonUMDImport(context, symbolToken, useAutoImportProvider);
             }
             var packageJsonImportFilter = ts.createPackageJsonImportFilter(context.sourceFile, context.preferences, context.host);
-            return info && __assign(__assign({}, info), { fixes: sortFixes(info.fixes, context.sourceFile, context.program, packageJsonImportFilter) });
+            return info && __assign(__assign({}, info), { fixes: sortFixes(info.fixes, context.sourceFile, context.program, packageJsonImportFilter, context.host) });
         }
-        function sortFixes(fixes, sourceFile, program, packageJsonImportFilter) {
-            return ts.sort(fixes, function (a, b) { return ts.compareValues(a.kind, b.kind) || compareModuleSpecifiers(a, b, sourceFile, program, packageJsonImportFilter.allowsImportingSpecifier); });
+        function sortFixes(fixes, sourceFile, program, packageJsonImportFilter, host) {
+            var _toPath = function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), ts.hostGetCanonicalFileName(host)); };
+            return ts.sort(fixes, function (a, b) { return ts.compareValues(a.kind, b.kind) || compareModuleSpecifiers(a, b, sourceFile, program, packageJsonImportFilter.allowsImportingSpecifier, _toPath); });
         }
-        function getBestFix(fixes, sourceFile, program, packageJsonImportFilter) {
+        function getBestFix(fixes, sourceFile, program, packageJsonImportFilter, host) {
             if (!ts.some(fixes))
                 return;
             // These will always be placed first if available, and are better than other kinds
@@ -150754,22 +150986,37 @@ var ts;
             }
             return fixes.reduce(function (best, fix) {
                 // Takes true branch of conditional if `fix` is better than `best`
-                return compareModuleSpecifiers(fix, best, sourceFile, program, packageJsonImportFilter.allowsImportingSpecifier) === -1 /* LessThan */ ? fix : best;
+                return compareModuleSpecifiers(fix, best, sourceFile, program, packageJsonImportFilter.allowsImportingSpecifier, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), ts.hostGetCanonicalFileName(host)); }) === -1 /* LessThan */ ? fix : best;
             });
         }
         /** @returns `Comparison.LessThan` if `a` is better than `b`. */
-        function compareModuleSpecifiers(a, b, importingFile, program, allowsImportingSpecifier) {
+        function compareModuleSpecifiers(a, b, importingFile, program, allowsImportingSpecifier, toPath) {
             if (a.kind !== 0 /* UseNamespace */ && b.kind !== 0 /* UseNamespace */) {
                 return ts.compareBooleans(allowsImportingSpecifier(b.moduleSpecifier), allowsImportingSpecifier(a.moduleSpecifier))
                     || compareNodeCoreModuleSpecifiers(a.moduleSpecifier, b.moduleSpecifier, importingFile, program)
-                    || ts.compareBooleans(isOnlyDotsAndSlashes(a.moduleSpecifier), isOnlyDotsAndSlashes(b.moduleSpecifier))
+                    || ts.compareBooleans(isFixPossiblyReExportingImportingFile(a, importingFile, program.getCompilerOptions(), toPath), isFixPossiblyReExportingImportingFile(b, importingFile, program.getCompilerOptions(), toPath))
                     || ts.compareNumberOfDirectorySeparators(a.moduleSpecifier, b.moduleSpecifier);
             }
             return 0 /* EqualTo */;
         }
-        var notDotOrSlashPattern = /[^.\/]/;
-        function isOnlyDotsAndSlashes(path) {
-            return !notDotOrSlashPattern.test(path);
+        // This is a simple heuristic to try to avoid creating an import cycle with a barrel re-export.
+        // E.g., do not `import { Foo } from ".."` when you could `import { Foo } from "../Foo"`.
+        // This can produce false positives or negatives if re-exports cross into sibling directories
+        // (e.g. `export * from "../whatever"`) or are not named "index" (we don't even try to consider
+        // this if we're in a resolution mode where you can't drop trailing "/index" from paths).
+        function isFixPossiblyReExportingImportingFile(fix, importingFile, compilerOptions, toPath) {
+            var _a;
+            if (fix.isReExport &&
+                ((_a = fix.exportInfo) === null || _a === void 0 ? void 0 : _a.moduleFileName) &&
+                ts.getEmitModuleResolutionKind(compilerOptions) === ts.ModuleResolutionKind.NodeJs &&
+                isIndexFileName(fix.exportInfo.moduleFileName)) {
+                var reExportDir = toPath(ts.getDirectoryPath(fix.exportInfo.moduleFileName));
+                return ts.startsWith((importingFile.path), reExportDir);
+            }
+            return false;
+        }
+        function isIndexFileName(fileName) {
+            return ts.getBaseFileName(fileName, [".js", ".jsx", ".d.ts", ".ts", ".tsx"], /*ignoreCase*/ true) === "index";
         }
         function compareNodeCoreModuleSpecifiers(a, b, importingFile, program) {
             if (ts.startsWith(a, "node:") && !ts.startsWith(b, "node:"))
@@ -150787,9 +151034,9 @@ var ts;
                 return undefined;
             var symbol = checker.getAliasedSymbol(umdSymbol);
             var symbolName = umdSymbol.name;
-            var exportInfos = [{ symbol: umdSymbol, moduleSymbol: symbol, moduleFileName: undefined, exportKind: 3 /* UMD */, targetFlags: symbol.flags, isFromPackageJson: false }];
+            var exportInfo = [{ symbol: umdSymbol, moduleSymbol: symbol, moduleFileName: undefined, exportKind: 3 /* UMD */, targetFlags: symbol.flags, isFromPackageJson: false }];
             var useRequire = shouldUseRequire(sourceFile, program);
-            var fixes = getImportFixes(exportInfos, symbolName, ts.isIdentifier(token) ? token.getStart(sourceFile) : undefined, /*isValidTypeOnlyUseSite*/ false, useRequire, program, sourceFile, host, preferences);
+            var fixes = getImportFixes(exportInfo, symbolName, ts.isIdentifier(token) ? token.getStart(sourceFile) : undefined, /*isValidTypeOnlyUseSite*/ false, useRequire, program, sourceFile, host, preferences);
             return { fixes: fixes, symbolName: symbolName, errorIdentifierText: (_b = ts.tryCast(token, ts.isIdentifier)) === null || _b === void 0 ? void 0 : _b.text };
         }
         function getUmdSymbol(token, checker) {
@@ -150856,8 +151103,8 @@ var ts;
             ts.Debug.assert(symbolName !== "default" /* Default */, "'default' isn't a legal identifier and couldn't occur here");
             var isValidTypeOnlyUseSite = ts.isValidTypeOnlyAliasUseSite(symbolToken);
             var useRequire = shouldUseRequire(sourceFile, program);
-            var exportInfos = getExportInfos(symbolName, ts.isJSXTagName(symbolToken), ts.getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, program, useAutoImportProvider, host, preferences);
-            var fixes = ts.arrayFrom(ts.flatMapIterator(exportInfos.entries(), function (_a) {
+            var exportInfo = getExportInfos(symbolName, ts.isJSXTagName(symbolToken), ts.getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, program, useAutoImportProvider, host, preferences);
+            var fixes = ts.arrayFrom(ts.flatMapIterator(exportInfo.entries(), function (_a) {
                 var _ = _a[0], exportInfos = _a[1];
                 return getImportFixes(exportInfos, symbolName, symbolToken.getStart(sourceFile), isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences);
             }));
@@ -150873,12 +151120,9 @@ var ts;
                 return undefined;
             return { kind: 4 /* PromoteTypeOnly */, typeOnlyAliasDeclaration: typeOnlyAliasDeclaration };
         }
-        function jsxModeNeedsExplicitImport(jsx) {
-            return jsx === 2 /* React */ || jsx === 3 /* ReactNative */;
-        }
         function getSymbolName(sourceFile, checker, symbolToken, compilerOptions) {
             var parent = symbolToken.parent;
-            if ((ts.isJsxOpeningLikeElement(parent) || ts.isJsxClosingElement(parent)) && parent.tagName === symbolToken && jsxModeNeedsExplicitImport(compilerOptions.jsx)) {
+            if ((ts.isJsxOpeningLikeElement(parent) || ts.isJsxClosingElement(parent)) && parent.tagName === symbolToken && ts.jsxModeNeedsExplicitImport(compilerOptions.jsx)) {
                 var jsxNamespace = checker.getJsxNamespace(sourceFile);
                 if (needsJsxNamespaceFix(jsxNamespace, symbolToken, checker)) {
                     return jsxNamespace;
@@ -152958,6 +153202,95 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var deleteUnmatchedParameter = "deleteUnmatchedParameter";
+        var renameUnmatchedParameter = "renameUnmatchedParameter";
+        var errorCodes = [
+            ts.Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name.code,
+        ];
+        codefix.registerCodeFix({
+            fixIds: [deleteUnmatchedParameter, renameUnmatchedParameter],
+            errorCodes: errorCodes,
+            getCodeActions: function getCodeActionsToFixUnmatchedParameter(context) {
+                var sourceFile = context.sourceFile, span = context.span;
+                var actions = [];
+                var info = getInfo(sourceFile, span.start);
+                if (info) {
+                    ts.append(actions, getDeleteAction(context, info));
+                    ts.append(actions, getRenameAction(context, info));
+                    return actions;
+                }
+                return undefined;
+            },
+            getAllCodeActions: function getAllCodeActionsToFixUnmatchedParameter(context) {
+                var tagsToSignature = new ts.Map();
+                return codefix.createCombinedCodeActions(ts.textChanges.ChangeTracker.with(context, function (changes) {
+                    codefix.eachDiagnostic(context, errorCodes, function (_a) {
+                        var file = _a.file, start = _a.start;
+                        var info = getInfo(file, start);
+                        if (info) {
+                            tagsToSignature.set(info.signature, ts.append(tagsToSignature.get(info.signature), info.jsDocParameterTag));
+                        }
+                    });
+                    tagsToSignature.forEach(function (tags, signature) {
+                        if (context.fixId === deleteUnmatchedParameter) {
+                            var tagsSet_1 = new ts.Set(tags);
+                            changes.filterJSDocTags(signature.getSourceFile(), signature, function (t) { return !tagsSet_1.has(t); });
+                        }
+                    });
+                }));
+            }
+        });
+        function getDeleteAction(context, _a) {
+            var name = _a.name, signature = _a.signature, jsDocParameterTag = _a.jsDocParameterTag;
+            var changes = ts.textChanges.ChangeTracker.with(context, function (changeTracker) {
+                return changeTracker.filterJSDocTags(context.sourceFile, signature, function (t) { return t !== jsDocParameterTag; });
+            });
+            return codefix.createCodeFixAction(deleteUnmatchedParameter, changes, [ts.Diagnostics.Delete_unused_param_tag_0, name.getText(context.sourceFile)], deleteUnmatchedParameter, ts.Diagnostics.Delete_all_unused_param_tags);
+        }
+        function getRenameAction(context, _a) {
+            var name = _a.name, signature = _a.signature, jsDocParameterTag = _a.jsDocParameterTag;
+            if (!ts.length(signature.parameters))
+                return undefined;
+            var sourceFile = context.sourceFile;
+            var tags = ts.getJSDocTags(signature);
+            var names = new ts.Set();
+            for (var _i = 0, tags_2 = tags; _i < tags_2.length; _i++) {
+                var tag = tags_2[_i];
+                if (ts.isJSDocParameterTag(tag) && ts.isIdentifier(tag.name)) {
+                    names.add(tag.name.escapedText);
+                }
+            }
+            // @todo - match to all available names instead to the first parameter name
+            // @see /codeFixRenameUnmatchedParameter3.ts
+            var parameterName = ts.firstDefined(signature.parameters, function (p) {
+                return ts.isIdentifier(p.name) && !names.has(p.name.escapedText) ? p.name.getText(sourceFile) : undefined;
+            });
+            if (parameterName === undefined)
+                return undefined;
+            var newJSDocParameterTag = ts.factory.updateJSDocParameterTag(jsDocParameterTag, jsDocParameterTag.tagName, ts.factory.createIdentifier(parameterName), jsDocParameterTag.isBracketed, jsDocParameterTag.typeExpression, jsDocParameterTag.isNameFirst, jsDocParameterTag.comment);
+            var changes = ts.textChanges.ChangeTracker.with(context, function (changeTracker) {
+                return changeTracker.replaceJSDocComment(sourceFile, signature, ts.map(tags, function (t) { return t === jsDocParameterTag ? newJSDocParameterTag : t; }));
+            });
+            return codefix.createCodeFixActionWithoutFixAll(renameUnmatchedParameter, changes, [ts.Diagnostics.Rename_param_tag_name_0_to_1, name.getText(sourceFile), parameterName]);
+        }
+        function getInfo(sourceFile, pos) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            if (token.parent && ts.isJSDocParameterTag(token.parent) && ts.isIdentifier(token.parent.name)) {
+                var jsDocParameterTag = token.parent;
+                var signature = ts.getHostSignatureFromJSDoc(jsDocParameterTag);
+                if (signature) {
+                    return { signature: signature, name: token.parent.name, jsDocParameterTag: jsDocParameterTag };
+                }
+            }
+            return undefined;
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -164055,7 +164388,7 @@ var ts;
             if ("getTypeReferenceDirectiveResolutionsForFile" in this.shimHost) {
                 this.resolveTypeReferenceDirectives = function (typeDirectiveNames, containingFile) {
                     var typeDirectivesForFile = JSON.parse(_this.shimHost.getTypeReferenceDirectiveResolutionsForFile(containingFile)); // TODO: GH#18217
-                    return ts.map(typeDirectiveNames, function (name) { return ts.getProperty(typeDirectivesForFile, name); });
+                    return ts.map(typeDirectiveNames, function (name) { return ts.getProperty(typeDirectivesForFile, ts.isString(name) ? name : name.fileName.toLowerCase()); });
                 };
             }
         }
@@ -166337,8 +166670,8 @@ var ts;
             Project.prototype.getResolvedModuleWithFailedLookupLocationsFromCache = function (moduleName, containingFile, resolutionMode) {
                 return this.resolutionCache.getResolvedModuleWithFailedLookupLocationsFromCache(moduleName, containingFile, resolutionMode);
             };
-            Project.prototype.resolveTypeReferenceDirectives = function (typeDirectiveNames, containingFile, redirectedReference) {
-                return this.resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference);
+            Project.prototype.resolveTypeReferenceDirectives = function (typeDirectiveNames, containingFile, redirectedReference, _options, containingFileMode) {
+                return this.resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference, containingFileMode);
             };
             Project.prototype.directoryExists = function (path) {
                 return this.directoryStructureHost.directoryExists(path); // TODO: GH#18217