typescript 4.5.0-dev.20211019 → 4.5.0-dev.20211023

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.5";
-    ts.version = ts.versionMajorMinor + ".0-dev.20211019";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211023";
     var NativeCollections;
     (function (NativeCollections) {
         function tryGetNativeMap() {
@@ -5363,6 +5363,7 @@ var ts;
         Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type: diag(1387, ts.DiagnosticCategory.Error, "Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1387", "Function type notation must be parenthesized when used in an intersection type."),
         Constructor_type_notation_must_be_parenthesized_when_used_in_an_intersection_type: diag(1388, ts.DiagnosticCategory.Error, "Constructor_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1388", "Constructor type notation must be parenthesized when used in an intersection type."),
         _0_is_not_allowed_as_a_variable_declaration_name: diag(1389, ts.DiagnosticCategory.Error, "_0_is_not_allowed_as_a_variable_declaration_name_1389", "'{0}' is not allowed as a variable declaration name."),
+        _0_is_not_allowed_as_a_parameter_name: diag(1390, ts.DiagnosticCategory.Error, "_0_is_not_allowed_as_a_parameter_name_1390", "'{0}' is not allowed as a parameter name."),
         An_import_alias_cannot_use_import_type: diag(1392, ts.DiagnosticCategory.Error, "An_import_alias_cannot_use_import_type_1392", "An import alias cannot use 'import type'"),
         Imported_via_0_from_file_1: diag(1393, ts.DiagnosticCategory.Message, "Imported_via_0_from_file_1_1393", "Imported via {0} from file '{1}'"),
         Imported_via_0_from_file_1_with_packageId_2: diag(1394, ts.DiagnosticCategory.Message, "Imported_via_0_from_file_1_with_packageId_2_1394", "Imported via {0} from file '{1}' with packageId '{2}'"),
@@ -15846,7 +15847,7 @@ var ts;
             includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
             includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
             excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
-            basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames)
+            basePaths: getBasePaths(absolutePath, includes, useCaseSensitiveFileNames)
         };
     }
     ts.getFileMatcherPatterns = getFileMatcherPatterns;
@@ -15865,20 +15866,20 @@ var ts;
         var visited = new ts.Map();
         var toCanonical = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
         for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
-            var basePath = _a[_i];
-            if (directoryExists(basePath)) {
-                visitDirectory(basePath, ts.combinePaths(currentDirectory, basePath), depth);
+            var absoluteBasePath = _a[_i];
+            if (directoryExists(absoluteBasePath)) {
+                visitDirectory(absoluteBasePath, depth);
             }
         }
         return ts.flatten(results);
-        function visitDirectory(path, absolutePath, depth) {
+        function visitDirectory(absolutePath, depth) {
             var canonicalPath = toCanonical(realpath(absolutePath));
             if (visited.has(canonicalPath))
                 return;
             visited.set(canonicalPath, true);
-            var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
+            var _a = getFileSystemEntries(absolutePath), files = _a.files, directories = _a.directories;
             var _loop_1 = function (current) {
-                var name = ts.combinePaths(path, current);
+                var name = ts.combinePaths(absolutePath, current);
                 var absoluteName = ts.combinePaths(absolutePath, current);
                 if (extensions && !ts.fileExtensionIsOneOf(name, extensions))
                     return "continue";
@@ -15906,28 +15907,27 @@ var ts;
             }
             for (var _c = 0, _d = ts.sort(directories, ts.compareStringsCaseSensitive); _c < _d.length; _c++) {
                 var current = _d[_c];
-                var name = ts.combinePaths(path, current);
                 var absoluteName = ts.combinePaths(absolutePath, current);
                 if ((!includeDirectoryRegex || includeDirectoryRegex.test(absoluteName)) &&
                     (!excludeRegex || !excludeRegex.test(absoluteName))) {
-                    visitDirectory(name, absoluteName, depth);
+                    visitDirectory(absoluteName, depth);
                 }
             }
         }
     }
     ts.matchFiles = matchFiles;
-    function getBasePaths(path, includes, useCaseSensitiveFileNames) {
-        var basePaths = [path];
+    function getBasePaths(absoluteTsconfigPath, includes, useCaseSensitiveFileNames) {
+        var basePaths = [absoluteTsconfigPath];
         if (includes) {
             var includeBasePaths = [];
             for (var _i = 0, includes_1 = includes; _i < includes_1.length; _i++) {
                 var include = includes_1[_i];
-                var absolute = ts.isRootedDiskPath(include) ? include : ts.normalizePath(ts.combinePaths(path, include));
-                includeBasePaths.push(getIncludeBasePath(absolute));
+                var absoluteIncludePath = ts.isRootedDiskPath(include) ? include : ts.normalizePath(ts.combinePaths(absoluteTsconfigPath, include));
+                includeBasePaths.push(getIncludeBasePath(absoluteIncludePath));
             }
             includeBasePaths.sort(ts.getStringComparer(!useCaseSensitiveFileNames));
             var _loop_2 = function (includeBasePath) {
-                if (ts.every(basePaths, function (basePath) { return !ts.containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames); })) {
+                if (ts.every(basePaths, function (basePath) { return !ts.containsPath(basePath, includeBasePath, absoluteTsconfigPath, !useCaseSensitiveFileNames); })) {
                     basePaths.push(includeBasePath);
                 }
             };
@@ -25738,7 +25738,10 @@ var ts;
                 case 12: return parseErrorAtCurrentToken(ts.Diagnostics.Property_assignment_expected);
                 case 15: return parseErrorAtCurrentToken(ts.Diagnostics.Expression_or_comma_expected);
                 case 17: return parseErrorAtCurrentToken(ts.Diagnostics.Parameter_declaration_expected);
-                case 16: return parseErrorAtCurrentToken(ts.Diagnostics.Parameter_declaration_expected);
+                case 16:
+                    return ts.isKeyword(token())
+                        ? parseErrorAtCurrentToken(ts.Diagnostics._0_is_not_allowed_as_a_parameter_name, ts.tokenToString(token()))
+                        : parseErrorAtCurrentToken(ts.Diagnostics.Parameter_declaration_expected);
                 case 19: return parseErrorAtCurrentToken(ts.Diagnostics.Type_parameter_declaration_expected);
                 case 20: return parseErrorAtCurrentToken(ts.Diagnostics.Type_argument_expected);
                 case 21: return parseErrorAtCurrentToken(ts.Diagnostics.Type_expected);
@@ -30674,7 +30677,7 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    ts.compileOnSaveCommandLineOption = { name: "compileOnSave", type: "boolean" };
+    ts.compileOnSaveCommandLineOption = { name: "compileOnSave", type: "boolean", defaultValueDescription: "false" };
     var jsxOptionMap = new ts.Map(ts.getEntries({
         "preserve": 1,
         "react-native": 3,
@@ -30790,6 +30793,7 @@ var ts;
             type: "boolean",
             category: ts.Diagnostics.Watch_and_Build_Modes,
             description: ts.Diagnostics.Synchronously_call_callbacks_and_update_the_state_of_directory_watchers_on_platforms_that_don_t_support_recursive_watching_natively,
+            defaultValueDescription: "false",
         },
         {
             name: "excludeDirectories",
@@ -30824,11 +30828,13 @@ var ts;
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Command_line_Options,
             description: ts.Diagnostics.Print_this_message,
+            defaultValueDescription: "false",
         },
         {
             name: "help",
             shortName: "?",
-            type: "boolean"
+            type: "boolean",
+            defaultValueDescription: "false",
         },
         {
             name: "watch",
@@ -30838,6 +30844,7 @@ var ts;
             isCommandLineOnly: true,
             category: ts.Diagnostics.Command_line_Options,
             description: ts.Diagnostics.Watch_input_files,
+            defaultValueDescription: "false",
         },
         {
             name: "preserveWatchOutput",
@@ -30845,7 +30852,7 @@ var ts;
             showInSimplifiedHelpView: false,
             category: ts.Diagnostics.Output_Formatting,
             description: ts.Diagnostics.Disable_wiping_the_console_in_watch_mode,
-            defaultValueDescription: "n/a"
+            defaultValueDescription: "false",
         },
         {
             name: "listFiles",
@@ -30858,7 +30865,8 @@ var ts;
             name: "explainFiles",
             type: "boolean",
             category: ts.Diagnostics.Compiler_Diagnostics,
-            description: ts.Diagnostics.Print_files_read_during_the_compilation_including_why_it_was_included
+            description: ts.Diagnostics.Print_files_read_during_the_compilation_including_why_it_was_included,
+            defaultValueDescription: "false",
         },
         {
             name: "listEmittedFiles",
@@ -30929,7 +30937,8 @@ var ts;
             affectsSemanticDiagnostics: true,
             affectsEmit: true,
             category: ts.Diagnostics.Watch_and_Build_Modes,
-            description: ts.Diagnostics.Have_recompiles_in_projects_that_use_incremental_and_watch_mode_assume_that_changes_within_a_file_will_only_affect_files_directly_depending_on_it
+            description: ts.Diagnostics.Have_recompiles_in_projects_that_use_incremental_and_watch_mode_assume_that_changes_within_a_file_will_only_affect_files_directly_depending_on_it,
+            defaultValueDescription: "false",
         },
         {
             name: "locale",
@@ -30972,6 +30981,7 @@ var ts;
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Command_line_Options,
             description: ts.Diagnostics.Show_all_compiler_options,
+            defaultValueDescription: "false",
         },
         {
             name: "version",
@@ -30980,6 +30990,7 @@ var ts;
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Command_line_Options,
             description: ts.Diagnostics.Print_the_compiler_s_version,
+            defaultValueDescription: "false",
         },
         {
             name: "init",
@@ -30987,6 +30998,7 @@ var ts;
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Command_line_Options,
             description: ts.Diagnostics.Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file,
+            defaultValueDescription: "false",
         },
         {
             name: "project",
@@ -31004,7 +31016,8 @@ var ts;
             shortName: "b",
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Command_line_Options,
-            description: ts.Diagnostics.Build_one_or_more_projects_and_their_dependencies_if_out_of_date
+            description: ts.Diagnostics.Build_one_or_more_projects_and_their_dependencies_if_out_of_date,
+            defaultValueDescription: "false",
         },
         {
             name: "showConfig",
@@ -31012,7 +31025,8 @@ var ts;
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Command_line_Options,
             isCommandLineOnly: true,
-            description: ts.Diagnostics.Print_the_final_configuration_instead_of_building
+            description: ts.Diagnostics.Print_the_final_configuration_instead_of_building,
+            defaultValueDescription: "false",
         },
         {
             name: "listFilesOnly",
@@ -31021,7 +31035,8 @@ var ts;
             affectsSemanticDiagnostics: true,
             affectsEmit: true,
             isCommandLineOnly: true,
-            description: ts.Diagnostics.Print_names_of_files_that_are_part_of_the_compilation_and_then_stop_processing
+            description: ts.Diagnostics.Print_names_of_files_that_are_part_of_the_compilation_and_then_stop_processing,
+            defaultValueDescription: "false",
         },
         ts.targetOptionDeclaration,
         {
@@ -31140,7 +31155,6 @@ var ts;
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Specify_a_file_that_bundles_all_outputs_into_one_JavaScript_file_If_declaration_is_true_also_designates_a_file_that_bundles_all_d_ts_output,
             transpileOptionValue: undefined,
-            defaultValueDescription: "n/a"
         },
         {
             name: "outDir",
@@ -31151,7 +31165,6 @@ var ts;
             showInSimplifiedHelpView: true,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Specify_an_output_folder_for_all_emitted_files,
-            defaultValueDescription: "n/a"
         },
         {
             name: "rootDir",
@@ -31305,6 +31318,7 @@ var ts;
             strictFlag: true,
             category: ts.Diagnostics.Type_Checking,
             description: ts.Diagnostics.Type_catch_clause_variables_as_unknown_instead_of_any,
+            defaultValueDescription: "false",
         },
         {
             name: "alwaysStrict",
@@ -31336,7 +31350,8 @@ var ts;
             type: "boolean",
             affectsSemanticDiagnostics: true,
             category: ts.Diagnostics.Type_Checking,
-            description: ts.Diagnostics.Interpret_optional_property_types_as_written_rather_than_adding_undefined
+            description: ts.Diagnostics.Interpret_optional_property_types_as_written_rather_than_adding_undefined,
+            defaultValueDescription: "false",
         },
         {
             name: "noImplicitReturns",
@@ -31352,21 +31367,24 @@ var ts;
             affectsBindDiagnostics: true,
             affectsSemanticDiagnostics: true,
             category: ts.Diagnostics.Type_Checking,
-            description: ts.Diagnostics.Enable_error_reporting_for_fallthrough_cases_in_switch_statements
+            description: ts.Diagnostics.Enable_error_reporting_for_fallthrough_cases_in_switch_statements,
+            defaultValueDescription: "false",
         },
         {
             name: "noUncheckedIndexedAccess",
             type: "boolean",
             affectsSemanticDiagnostics: true,
             category: ts.Diagnostics.Type_Checking,
-            description: ts.Diagnostics.Include_undefined_in_index_signature_results
+            description: ts.Diagnostics.Include_undefined_in_index_signature_results,
+            defaultValueDescription: "false",
         },
         {
             name: "noImplicitOverride",
             type: "boolean",
             affectsSemanticDiagnostics: true,
             category: ts.Diagnostics.Type_Checking,
-            description: ts.Diagnostics.Ensure_overriding_members_in_derived_classes_are_marked_with_an_override_modifier
+            description: ts.Diagnostics.Ensure_overriding_members_in_derived_classes_are_marked_with_an_override_modifier,
+            defaultValueDescription: "false",
         },
         {
             name: "noPropertyAccessFromIndexSignature",
@@ -31470,7 +31488,7 @@ var ts;
             type: "boolean",
             category: ts.Diagnostics.Interop_Constraints,
             description: ts.Diagnostics.Disable_resolving_symlinks_to_their_realpath_This_correlates_to_the_same_flag_in_node,
-            defaultValueDescription: "n/a"
+            defaultValueDescription: "false",
         },
         {
             name: "allowUmdGlobalAccess",
@@ -31517,7 +31535,8 @@ var ts;
             type: "boolean",
             affectsSemanticDiagnostics: true,
             category: ts.Diagnostics.Language_and_Environment,
-            description: ts.Diagnostics.Enable_experimental_support_for_TC39_stage_2_draft_decorators
+            description: ts.Diagnostics.Enable_experimental_support_for_TC39_stage_2_draft_decorators,
+            defaultValueDescription: "false",
         },
         {
             name: "emitDecoratorMetadata",
@@ -31525,7 +31544,8 @@ var ts;
             affectsSemanticDiagnostics: true,
             affectsEmit: true,
             category: ts.Diagnostics.Language_and_Environment,
-            description: ts.Diagnostics.Emit_design_type_metadata_for_decorated_declarations_in_source_files
+            description: ts.Diagnostics.Emit_design_type_metadata_for_decorated_declarations_in_source_files,
+            defaultValueDescription: "false",
         },
         {
             name: "jsxFactory",
@@ -31566,7 +31586,6 @@ var ts;
             category: ts.Diagnostics.Backwards_Compatibility,
             paramType: ts.Diagnostics.FILE,
             transpileOptionValue: undefined,
-            defaultValueDescription: "n/a",
             description: ts.Diagnostics.Deprecated_setting_Use_outFile_instead,
         },
         {
@@ -31643,6 +31662,7 @@ var ts;
             affectsEmit: true,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Disable_emitting_declarations_that_have_internal_in_their_JSDoc_comments,
+            defaultValueDescription: "false",
         },
         {
             name: "disableSizeLimit",
@@ -31657,21 +31677,24 @@ var ts;
             type: "boolean",
             isTSConfigOnly: true,
             category: ts.Diagnostics.Projects,
-            description: ts.Diagnostics.Disable_preferring_source_files_instead_of_declaration_files_when_referencing_composite_projects
+            description: ts.Diagnostics.Disable_preferring_source_files_instead_of_declaration_files_when_referencing_composite_projects,
+            defaultValueDescription: "false",
         },
         {
             name: "disableSolutionSearching",
             type: "boolean",
             isTSConfigOnly: true,
             category: ts.Diagnostics.Projects,
-            description: ts.Diagnostics.Opt_a_project_out_of_multi_project_reference_checking_when_editing
+            description: ts.Diagnostics.Opt_a_project_out_of_multi_project_reference_checking_when_editing,
+            defaultValueDescription: "false",
         },
         {
             name: "disableReferencedProjectLoad",
             type: "boolean",
             isTSConfigOnly: true,
             category: ts.Diagnostics.Projects,
-            description: ts.Diagnostics.Reduce_the_number_of_projects_loaded_automatically_by_TypeScript
+            description: ts.Diagnostics.Reduce_the_number_of_projects_loaded_automatically_by_TypeScript,
+            defaultValueDescription: "false",
         },
         {
             name: "noImplicitUseStrict",
@@ -31704,7 +31727,7 @@ var ts;
             affectsEmit: true,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Disable_erasing_const_enum_declarations_in_generated_code,
-            defaultValueDescription: "n/a"
+            defaultValueDescription: "false",
         },
         {
             name: "declarationDir",
@@ -31715,7 +31738,6 @@ var ts;
             category: ts.Diagnostics.Emit,
             transpileOptionValue: undefined,
             description: ts.Diagnostics.Specify_the_output_directory_for_generated_declaration_files,
-            defaultValueDescription: "n/a"
         },
         {
             name: "skipLibCheck",
@@ -31797,6 +31819,7 @@ var ts;
             affectsEmit: true,
             category: ts.Diagnostics.Emit,
             description: ts.Diagnostics.Preserve_unused_imported_values_in_the_JavaScript_output_that_would_otherwise_be_removed,
+            defaultValueDescription: "false",
         },
         {
             name: "keyofStringsOnly",
@@ -31834,27 +31857,31 @@ var ts;
             shortName: "v",
             category: ts.Diagnostics.Command_line_Options,
             description: ts.Diagnostics.Enable_verbose_logging,
-            type: "boolean"
+            type: "boolean",
+            defaultValueDescription: "false",
         },
         {
             name: "dry",
             shortName: "d",
             category: ts.Diagnostics.Command_line_Options,
             description: ts.Diagnostics.Show_what_would_be_built_or_deleted_if_specified_with_clean,
-            type: "boolean"
+            type: "boolean",
+            defaultValueDescription: "false",
         },
         {
             name: "force",
             shortName: "f",
             category: ts.Diagnostics.Command_line_Options,
             description: ts.Diagnostics.Build_all_projects_including_those_that_appear_to_be_up_to_date,
-            type: "boolean"
+            type: "boolean",
+            defaultValueDescription: "false",
         },
         {
             name: "clean",
             category: ts.Diagnostics.Command_line_Options,
             description: ts.Diagnostics.Delete_the_outputs_of_all_projects,
-            type: "boolean"
+            type: "boolean",
+            defaultValueDescription: "false",
         }
     ];
     ts.buildOpts = __spreadArray(__spreadArray([], ts.commonOptionsWithBuild, true), ts.optionsForBuild, true);
@@ -31862,10 +31889,12 @@ var ts;
         {
             name: "enableAutoDiscovery",
             type: "boolean",
+            defaultValueDescription: "false",
         },
         {
             name: "enable",
             type: "boolean",
+            defaultValueDescription: "false",
         },
         {
             name: "include",
@@ -31886,6 +31915,7 @@ var ts;
         {
             name: "disableFilenameBasedTypeAcquisition",
             type: "boolean",
+            defaultValueDescription: "false",
         },
     ];
     function createOptionNameMap(optionDeclarations) {
@@ -37448,6 +37478,7 @@ var ts;
                 case 168:
                 case 171:
                 case 172:
+                case 169:
                     var containingClass = thisContainer.parent;
                     var symbolTable = ts.isStatic(thisContainer) ? containingClass.symbol.exports : containingClass.symbol.members;
                     if (ts.hasDynamicName(node)) {
@@ -40842,8 +40873,8 @@ var ts;
             if (exportEquals !== moduleSymbol) {
                 var type = getTypeOfSymbol(exportEquals);
                 if (shouldTreatPropertiesOfExternalModuleAsExports(type)) {
-                    getPropertiesOfType(type).forEach(function (symbol) {
-                        cb(symbol, symbol.escapedName);
+                    forEachPropertyOfType(type, function (symbol, escapedName) {
+                        cb(symbol, escapedName);
                     });
                 }
             }
@@ -41143,12 +41174,15 @@ var ts;
         function getNamedMembers(members) {
             var result;
             members.forEach(function (symbol, id) {
-                if (!isReservedMemberName(id) && symbolIsValue(symbol)) {
+                if (isNamedMember(symbol, id)) {
                     (result || (result = [])).push(symbol);
                 }
             });
             return result || ts.emptyArray;
         }
+        function isNamedMember(member, escapedName) {
+            return !isReservedMemberName(escapedName) && symbolIsValue(member);
+        }
         function getNamedOrIndexSignatureMembers(members) {
             var result = getNamedMembers(members);
             var index = getIndexSymbolFromSymbolTable(members);
@@ -47064,6 +47098,16 @@ var ts;
                 getPropertiesOfUnionOrIntersectionType(type) :
                 getPropertiesOfObjectType(type);
         }
+        function forEachPropertyOfType(type, action) {
+            type = getReducedApparentType(type);
+            if (type.flags & 3670016) {
+                resolveStructuredTypeMembers(type).members.forEach(function (symbol, escapedName) {
+                    if (isNamedMember(symbol, escapedName)) {
+                        action(symbol, escapedName);
+                    }
+                });
+            }
+        }
         function isTypeInvalidDueToUnionDiscriminant(contextualType, obj) {
             var list = obj.properties;
             return list.some(function (property) {
@@ -50144,12 +50188,6 @@ var ts;
             }
             return type[cache] = type;
         }
-        function isConditionalTypeAlwaysTrueDisregardingInferTypes(type) {
-            var extendsInferParamMapper = type.root.inferTypeParameters && createTypeMapper(type.root.inferTypeParameters, ts.map(type.root.inferTypeParameters, function () { return wildcardType; }));
-            var checkType = type.checkType;
-            var extendsType = type.extendsType;
-            return isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(instantiateType(extendsType, extendsInferParamMapper)));
-        }
         function getSimplifiedConditionalType(type, writing) {
             var checkType = type.checkType;
             var extendsType = type.extendsType;
@@ -50401,6 +50439,10 @@ var ts;
             }
             return result;
         }
+        function isDistributionDependent(root) {
+            return root.isDistributive && (isTypeParameterPossiblyReferenced(root.checkType, root.node.trueType) ||
+                isTypeParameterPossiblyReferenced(root.checkType, root.node.falseType));
+        }
         function getTypeFromConditionalTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
@@ -53170,25 +53212,16 @@ var ts;
                         return 3;
                     }
                     var c = target;
-                    var skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
-                    var skipFalse = !skipTrue && isConditionalTypeAlwaysTrueDisregardingInferTypes(c);
-                    var distributionMapper = void 0;
-                    var checkVar = getActualTypeVariable(c.root.checkType);
-                    if (c.root.isDistributive && checkVar.flags & 262144) {
-                        var newParam = cloneTypeParameter(checkVar);
-                        distributionMapper = prependTypeMapping(checkVar, newParam, c.mapper);
-                        newParam.mapper = distributionMapper;
-                    }
-                    var expanding = isDeeplyNestedType(target, targetStack, targetDepth);
-                    var localResult = expanding ? 3 : undefined;
-                    if (skipTrue || expanding || (localResult = isRelatedTo(source, distributionMapper ? instantiateType(getTypeFromTypeNode(c.root.node.trueType), distributionMapper) : getTrueTypeFromConditionalType(c), 2, false))) {
-                        if (!skipFalse && !expanding) {
-                            localResult = (localResult || 3) & isRelatedTo(source, distributionMapper ? instantiateType(getTypeFromTypeNode(c.root.node.falseType), distributionMapper) : getFalseTypeFromConditionalType(c), 2, false);
-                        }
-                    }
-                    if (localResult) {
-                        resetErrorInfo(saveErrorInfo);
-                        return localResult;
+                    if (!c.root.inferTypeParameters && !isDistributionDependent(c.root)) {
+                        var skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
+                        var skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
+                        if (result = skipTrue ? -1 : isRelatedTo(source, getTrueTypeFromConditionalType(c), 2, false)) {
+                            result &= skipFalse ? -1 : isRelatedTo(source, getFalseTypeFromConditionalType(c), 2, false);
+                            if (result) {
+                                resetErrorInfo(saveErrorInfo);
+                                return result;
+                            }
+                        }
                     }
                 }
                 else if (target.flags & 134217728) {
@@ -55893,15 +55926,14 @@ var ts;
                 var inferredType = void 0;
                 var signature = context.signature;
                 if (signature) {
-                    var inferredCovariantType = inference.candidates ? getCovariantInference(inference, signature) : undefined;
+                    var inferredCovariantType_1 = inference.candidates ? getCovariantInference(inference, signature) : undefined;
                     if (inference.contraCandidates) {
-                        var inferredContravariantType = getContravariantInference(inference);
-                        inferredType = inferredCovariantType && !(inferredCovariantType.flags & 131072) &&
-                            isTypeSubtypeOf(inferredCovariantType, inferredContravariantType) ?
-                            inferredCovariantType : inferredContravariantType;
+                        inferredType = inferredCovariantType_1 && !(inferredCovariantType_1.flags & 131072) &&
+                            ts.some(inference.contraCandidates, function (t) { return isTypeSubtypeOf(inferredCovariantType_1, t); }) ?
+                            inferredCovariantType_1 : getContravariantInference(inference);
                     }
-                    else if (inferredCovariantType) {
-                        inferredType = inferredCovariantType;
+                    else if (inferredCovariantType_1) {
+                        inferredType = inferredCovariantType_1;
                     }
                     else if (context.flags & 1) {
                         inferredType = silentNeverType;