typescript 4.8.0-dev.20220706 → 4.8.0-dev.20220707

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.8";
-    ts.version = ts.versionMajorMinor + ".0-dev.20220706";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220707";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -2362,6 +2362,22 @@ var ts;
             return formatEnum(flags, ts.FlowFlags, true);
         }
         Debug.formatFlowFlags = formatFlowFlags;
+        function formatRelationComparisonResult(result) {
+            return formatEnum(result, ts.RelationComparisonResult, true);
+        }
+        Debug.formatRelationComparisonResult = formatRelationComparisonResult;
+        function formatCheckMode(mode) {
+            return formatEnum(mode, ts.CheckMode, true);
+        }
+        Debug.formatCheckMode = formatCheckMode;
+        function formatSignatureCheckMode(mode) {
+            return formatEnum(mode, ts.SignatureCheckMode, true);
+        }
+        Debug.formatSignatureCheckMode = formatSignatureCheckMode;
+        function formatTypeFacts(facts) {
+            return formatEnum(facts, ts.TypeFacts, true);
+        }
+        Debug.formatTypeFacts = formatTypeFacts;
         var isDebugInfoEnabled = false;
         var extendedDebugModule;
         function extendedDebug() {
@@ -15381,7 +15397,8 @@ var ts;
     function getDeclarationModifierFlagsFromSymbol(s, isWrite) {
         if (isWrite === void 0) { isWrite = false; }
         if (s.valueDeclaration) {
-            var declaration = (isWrite && s.declarations && ts.find(s.declarations, function (d) { return d.kind === 173; })) || s.valueDeclaration;
+            var declaration = (isWrite && s.declarations && ts.find(s.declarations, ts.isSetAccessorDeclaration))
+                || (s.flags & 32768 && ts.find(s.declarations, ts.isGetAccessorDeclaration)) || s.valueDeclaration;
             var flags = ts.getCombinedModifierFlags(declaration);
             return s.parent && s.parent.flags & 32 ? flags : flags & ~28;
         }
@@ -16003,7 +16020,7 @@ var ts;
         return !file.isDeclarationFile ? walkTreeForJSXTags(file) : undefined;
     }
     function isFileForcedToBeModuleByFormat(file) {
-        return (file.impliedNodeFormat === ts.ModuleKind.ESNext || (ts.fileExtensionIsOneOf(file.fileName, [".cjs", ".cts"]))) && !file.isDeclarationFile ? true : undefined;
+        return (file.impliedNodeFormat === ts.ModuleKind.ESNext || (ts.fileExtensionIsOneOf(file.fileName, [".cjs", ".cts", ".mjs", ".mts"]))) && !file.isDeclarationFile ? true : undefined;
     }
     function getSetExternalModuleIndicator(options) {
         switch (getEmitModuleDetectionKind(options)) {
@@ -16020,10 +16037,7 @@ var ts;
                 if (options.jsx === 4 || options.jsx === 5) {
                     checks.push(isFileModuleFromUsingJSXTag);
                 }
-                var moduleKind = getEmitModuleKind(options);
-                if (moduleKind === ts.ModuleKind.Node16 || moduleKind === ts.ModuleKind.NodeNext) {
-                    checks.push(isFileForcedToBeModuleByFormat);
-                }
+                checks.push(isFileForcedToBeModuleByFormat);
                 var combined_1 = ts.or.apply(void 0, checks);
                 var callback = function (file) { return void (file.externalModuleIndicator = combined_1(file)); };
                 return callback;
@@ -27359,10 +27373,10 @@ var ts;
             var hasJSDoc = hasPrecedingJSDocComment();
             var modifiers = parseModifiers();
             if (parseContextualModifier(136)) {
-                return parseAccessorDeclaration(pos, hasJSDoc, undefined, modifiers, 172);
+                return parseAccessorDeclaration(pos, hasJSDoc, undefined, modifiers, 172, 4);
             }
             if (parseContextualModifier(149)) {
-                return parseAccessorDeclaration(pos, hasJSDoc, undefined, modifiers, 173);
+                return parseAccessorDeclaration(pos, hasJSDoc, undefined, modifiers, 173, 4);
             }
             if (isIndexSignature()) {
                 return parseIndexSignatureDeclaration(pos, hasJSDoc, undefined, modifiers);
@@ -28953,10 +28967,10 @@ var ts;
             var decorators = parseDecorators();
             var modifiers = parseModifiers();
             if (parseContextualModifier(136)) {
-                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 172);
+                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 172, 0);
             }
             if (parseContextualModifier(149)) {
-                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 173);
+                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 173, 0);
             }
             var asteriskToken = parseOptionalToken(41);
             var tokenIsIdentifier = isIdentifier();
@@ -29574,9 +29588,15 @@ var ts;
             return !scanner.hasPrecedingLineBreak() && (isIdentifier() || token() === 10);
         }
         function parseFunctionBlockOrSemicolon(flags, diagnosticMessage) {
-            if (token() !== 18 && canParseSemicolon()) {
-                parseSemicolon();
-                return;
+            if (token() !== 18) {
+                if (flags & 4) {
+                    parseTypeMemberSemicolon();
+                    return;
+                }
+                if (canParseSemicolon()) {
+                    parseSemicolon();
+                    return;
+                }
             }
             return parseFunctionBlock(flags, diagnosticMessage);
         }
@@ -29764,12 +29784,12 @@ var ts;
             }
             return parsePropertyDeclaration(pos, hasJSDoc, decorators, modifiers, name, questionToken);
         }
-        function parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, kind) {
+        function parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, kind, flags) {
             var name = parsePropertyName();
             var typeParameters = parseTypeParameters();
             var parameters = parseParameters(0);
             var type = parseReturnType(58, false);
-            var body = parseFunctionBlockOrSemicolon(0);
+            var body = parseFunctionBlockOrSemicolon(flags);
             var node = kind === 172
                 ? factory.createGetAccessorDeclaration(combineDecoratorsAndModifiers(decorators, modifiers), name, parameters, type, body)
                 : factory.createSetAccessorDeclaration(combineDecoratorsAndModifiers(decorators, modifiers), name, parameters, body);
@@ -29925,10 +29945,10 @@ var ts;
                 return parseClassStaticBlockDeclaration(pos, hasJSDoc, decorators, modifiers);
             }
             if (parseContextualModifier(136)) {
-                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 172);
+                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 172, 0);
             }
             if (parseContextualModifier(149)) {
-                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 173);
+                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 173, 0);
             }
             if (token() === 134 || token() === 10) {
                 var constructorDeclaration = tryParseConstructorDeclaration(pos, hasJSDoc, decorators, modifiers);
@@ -40031,7 +40051,7 @@ var ts;
             },
             getContextualTypeForObjectLiteralElement: function (nodeIn) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isObjectLiteralElementLike);
-                return node ? getContextualTypeForObjectLiteralElement(node) : undefined;
+                return node ? getContextualTypeForObjectLiteralElement(node, undefined) : undefined;
             },
             getContextualTypeForArgumentAtIndex: function (nodeIn, argIndex) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isCallLikeExpression);
@@ -40039,7 +40059,7 @@ var ts;
             },
             getContextualTypeForJsxAttribute: function (nodeIn) {
                 var node = ts.getParseTreeNode(nodeIn, ts.isJsxAttributeLike);
-                return node && getContextualTypeForJsxAttribute(node);
+                return node && getContextualTypeForJsxAttribute(node, undefined);
             },
             isContextSensitive: isContextSensitive,
             getTypeOfPropertyOfContextualType: getTypeOfPropertyOfContextualType,
@@ -43294,13 +43314,25 @@ var ts;
                         && isDeclarationVisible(declaration.parent)) {
                         return addVisibleAlias(declaration, declaration);
                     }
-                    else if (symbol.flags & 2097152 && ts.isBindingElement(declaration) && ts.isInJSFile(declaration) && ((_a = declaration.parent) === null || _a === void 0 ? void 0 : _a.parent)
-                        && ts.isVariableDeclaration(declaration.parent.parent)
-                        && ((_b = declaration.parent.parent.parent) === null || _b === void 0 ? void 0 : _b.parent) && ts.isVariableStatement(declaration.parent.parent.parent.parent)
-                        && !ts.hasSyntacticModifier(declaration.parent.parent.parent.parent, 1)
-                        && declaration.parent.parent.parent.parent.parent
-                        && isDeclarationVisible(declaration.parent.parent.parent.parent.parent)) {
-                        return addVisibleAlias(declaration, declaration.parent.parent.parent.parent);
+                    else if (ts.isBindingElement(declaration)) {
+                        if (symbol.flags & 2097152 && ts.isInJSFile(declaration) && ((_a = declaration.parent) === null || _a === void 0 ? void 0 : _a.parent)
+                            && ts.isVariableDeclaration(declaration.parent.parent)
+                            && ((_b = declaration.parent.parent.parent) === null || _b === void 0 ? void 0 : _b.parent) && ts.isVariableStatement(declaration.parent.parent.parent.parent)
+                            && !ts.hasSyntacticModifier(declaration.parent.parent.parent.parent, 1)
+                            && declaration.parent.parent.parent.parent.parent
+                            && isDeclarationVisible(declaration.parent.parent.parent.parent.parent)) {
+                            return addVisibleAlias(declaration, declaration.parent.parent.parent.parent);
+                        }
+                        else if (symbol.flags & 2) {
+                            var variableStatement = ts.findAncestor(declaration, ts.isVariableStatement);
+                            if (ts.hasSyntacticModifier(variableStatement, 1)) {
+                                return true;
+                            }
+                            if (!isDeclarationVisible(variableStatement.parent)) {
+                                return false;
+                            }
+                            return addVisibleAlias(declaration, variableStatement);
+                        }
                     }
                     return false;
                 }
@@ -43791,6 +43823,10 @@ var ts;
                     }
                     return typeToTypeNodeHelper(type, context);
                 }
+                function isHomomorphicMappedTypeWithNonHomomorphicInstantiation(type) {
+                    return isMappedTypeWithKeyofConstraintDeclaration(type)
+                        && !(getModifiersTypeFromMappedType(type).flags & 262144);
+                }
                 function createMappedTypeNodeFromType(type) {
                     ts.Debug.assert(!!(type.flags & 524288));
                     var readonlyToken = type.declaration.readonlyToken ? ts.factory.createToken(type.declaration.readonlyToken.kind) : undefined;
@@ -43798,7 +43834,7 @@ var ts;
                     var appropriateConstraintTypeNode;
                     var newTypeVariable;
                     if (isMappedTypeWithKeyofConstraintDeclaration(type)) {
-                        if (!(getModifiersTypeFromMappedType(type).flags & 262144) && context.flags & 4) {
+                        if (isHomomorphicMappedTypeWithNonHomomorphicInstantiation(type) && context.flags & 4) {
                             var newParam = createTypeParameter(createSymbol(262144, "T"));
                             var name = typeParameterToName(newParam, context);
                             newTypeVariable = ts.factory.createTypeReferenceNode(name);
@@ -43814,8 +43850,9 @@ var ts;
                     var mappedTypeNode = ts.factory.createMappedTypeNode(readonlyToken, typeParameterNode, nameTypeNode, questionToken, templateTypeNode, undefined);
                     context.approximateLength += 10;
                     var result = ts.setEmitFlags(mappedTypeNode, 1);
-                    if (isMappedTypeWithKeyofConstraintDeclaration(type) && !(getModifiersTypeFromMappedType(type).flags & 262144) && context.flags & 4) {
-                        return ts.factory.createConditionalTypeNode(typeToTypeNodeHelper(getModifiersTypeFromMappedType(type), context), ts.factory.createInferTypeNode(ts.factory.createTypeParameterDeclaration(undefined, ts.factory.cloneNode(newTypeVariable.typeName))), result, ts.factory.createKeywordTypeNode(143));
+                    if (isHomomorphicMappedTypeWithNonHomomorphicInstantiation(type) && context.flags & 4) {
+                        var originalConstraint = instantiateType(getConstraintOfTypeParameter(getTypeFromTypeNode(type.declaration.typeParameter.constraint.type)) || unknownType, type.mapper);
+                        return ts.factory.createConditionalTypeNode(typeToTypeNodeHelper(getModifiersTypeFromMappedType(type), context), ts.factory.createInferTypeNode(ts.factory.createTypeParameterDeclaration(undefined, ts.factory.cloneNode(newTypeVariable.typeName), originalConstraint.flags & 2 ? undefined : typeToTypeNodeHelper(originalConstraint, context))), result, ts.factory.createKeywordTypeNode(143));
                     }
                     return result;
                 }
@@ -55157,13 +55194,20 @@ var ts;
                 return result;
             }
             function structuredTypeRelatedTo(source, target, reportErrors, intersectionState) {
+                var saveErrorInfo = captureErrorCalculationState();
+                var result = structuredTypeRelatedToWorker(source, target, reportErrors, intersectionState, saveErrorInfo);
+                if (result) {
+                    resetErrorInfo(saveErrorInfo);
+                }
+                return result;
+            }
+            function structuredTypeRelatedToWorker(source, target, reportErrors, intersectionState, saveErrorInfo) {
                 if (intersectionState & 4) {
                     return propertiesRelatedTo(source, target, reportErrors, undefined, 0);
                 }
                 var result;
                 var originalErrorInfo;
                 var varianceCheckFailed = false;
-                var saveErrorInfo = captureErrorCalculationState();
                 var sourceFlags = source.flags;
                 var targetFlags = target.flags;
                 if (relation === identityRelation) {
@@ -55212,7 +55256,6 @@ var ts;
                         var constraint = getEffectiveConstraintOfIntersection(source.flags & 2097152 ? source.types : [source], !!(target.flags & 1048576));
                         if (constraint && everyType(constraint, function (c) { return c !== source; })) {
                             if (result = isRelatedTo(constraint, target, 1, false, undefined, intersectionState)) {
-                                resetErrorInfo(saveErrorInfo);
                                 return result;
                             }
                         }
@@ -55305,7 +55348,6 @@ var ts;
                             result &= isRelatedTo(source.indexType, target.indexType, 3, reportErrors);
                         }
                         if (result) {
-                            resetErrorInfo(saveErrorInfo);
                             return result;
                         }
                         if (reportErrors) {
@@ -55381,7 +55423,6 @@ var ts;
                 }
                 else if (targetFlags & 16777216) {
                     if (isDeeplyNestedType(target, targetStack, targetDepth, 10)) {
-                        resetErrorInfo(saveErrorInfo);
                         return 3;
                     }
                     var c = target;
@@ -55391,7 +55432,6 @@ var ts;
                         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;
                             }
                         }
@@ -55419,18 +55459,15 @@ var ts;
                     if (!(sourceFlags & 8388608 && targetFlags & 8388608)) {
                         var constraint = getConstraintOfType(source) || unknownType;
                         if (result = isRelatedTo(constraint, target, 1, false, undefined, intersectionState)) {
-                            resetErrorInfo(saveErrorInfo);
                             return result;
                         }
                         else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, 1, reportErrors && constraint !== unknownType && !(targetFlags & sourceFlags & 262144), undefined, intersectionState)) {
-                            resetErrorInfo(saveErrorInfo);
                             return result;
                         }
                         if (isMappedTypeGenericIndexedAccess(source)) {
                             var indexConstraint = getConstraintOfType(source.indexType);
                             if (indexConstraint) {
                                 if (result = isRelatedTo(getIndexedAccessType(source.objectType, indexConstraint), target, 1, reportErrors)) {
-                                    resetErrorInfo(saveErrorInfo);
                                     return result;
                                 }
                             }
@@ -55439,7 +55476,6 @@ var ts;
                 }
                 else if (sourceFlags & 4194304) {
                     if (result = isRelatedTo(keyofConstraintType, target, 1, reportErrors)) {
-                        resetErrorInfo(saveErrorInfo);
                         return result;
                     }
                 }
@@ -55447,7 +55483,6 @@ var ts;
                     if (!(targetFlags & 134217728)) {
                         var constraint = getBaseConstraintOfType(source);
                         if (constraint && constraint !== source && (result = isRelatedTo(constraint, target, 1, reportErrors))) {
-                            resetErrorInfo(saveErrorInfo);
                             return result;
                         }
                     }
@@ -55458,21 +55493,18 @@ var ts;
                             return 0;
                         }
                         if (result = isRelatedTo(source.type, target.type, 3, reportErrors)) {
-                            resetErrorInfo(saveErrorInfo);
                             return result;
                         }
                     }
                     else {
                         var constraint = getBaseConstraintOfType(source);
                         if (constraint && (result = isRelatedTo(constraint, target, 1, reportErrors))) {
-                            resetErrorInfo(saveErrorInfo);
                             return result;
                         }
                     }
                 }
                 else if (sourceFlags & 16777216) {
                     if (isDeeplyNestedType(source, sourceStack, sourceDepth, 10)) {
-                        resetErrorInfo(saveErrorInfo);
                         return 3;
                     }
                     if (targetFlags & 16777216) {
@@ -55491,7 +55523,6 @@ var ts;
                                 result &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), 3, reportErrors);
                             }
                             if (result) {
-                                resetErrorInfo(saveErrorInfo);
                                 return result;
                             }
                         }
@@ -55500,7 +55531,6 @@ var ts;
                         var distributiveConstraint = hasNonCircularBaseConstraint(source) ? getConstraintOfDistributiveConditionalType(source) : undefined;
                         if (distributiveConstraint) {
                             if (result = isRelatedTo(distributiveConstraint, target, 1, reportErrors)) {
-                                resetErrorInfo(saveErrorInfo);
                                 return result;
                             }
                         }
@@ -55508,7 +55538,6 @@ var ts;
                     var defaultConstraint = getDefaultConstraintOfConditionalType(source);
                     if (defaultConstraint) {
                         if (result = isRelatedTo(defaultConstraint, target, 1, reportErrors)) {
-                            resetErrorInfo(saveErrorInfo);
                             return result;
                         }
                     }
@@ -55520,7 +55549,6 @@ var ts;
                     if (isGenericMappedType(target)) {
                         if (isGenericMappedType(source)) {
                             if (result = mappedTypeRelatedTo(source, target, reportErrors)) {
-                                resetErrorInfo(saveErrorInfo);
                                 return result;
                             }
                         }
@@ -60324,7 +60352,7 @@ var ts;
                 !((ts.isJsxOpeningElement(node.parent) || ts.isJsxSelfClosingElement(node.parent)) && node.parent.tagName === node) &&
                 (checkMode && checkMode & 64 ?
                     getContextualType(node, 8)
-                    : getContextualType(node));
+                    : getContextualType(node, undefined));
             return contextualType && !isGenericType(contextualType);
         }
         function getNarrowableTypeForReference(type, reference, checkMode) {
@@ -60981,7 +61009,7 @@ var ts;
             if (noImplicitThis || inJs) {
                 var containingLiteral = getContainingObjectLiteral(func);
                 if (containingLiteral) {
-                    var contextualType = getApparentTypeOfContextualType(containingLiteral);
+                    var contextualType = getApparentTypeOfContextualType(containingLiteral, undefined);
                     var literal = containingLiteral;
                     var type = contextualType;
                     while (type) {
@@ -60993,7 +61021,7 @@ var ts;
                             break;
                         }
                         literal = literal.parent.parent;
-                        type = getApparentTypeOfContextualType(literal);
+                        type = getApparentTypeOfContextualType(literal, undefined);
                     }
                     return getWidenedType(contextualType ? getNonNullableType(contextualType) : checkExpressionCached(containingLiteral));
                 }
@@ -61043,7 +61071,7 @@ var ts;
                     tryGetTypeAtPosition(contextualSignature, index);
             }
         }
-        function getContextualTypeForVariableLikeDeclaration(declaration) {
+        function getContextualTypeForVariableLikeDeclaration(declaration, contextFlags) {
             var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
             if (typeNode) {
                 return getTypeFromTypeNode(typeNode);
@@ -61052,17 +61080,17 @@ var ts;
                 case 164:
                     return getContextuallyTypedParameterType(declaration);
                 case 203:
-                    return getContextualTypeForBindingElement(declaration);
+                    return getContextualTypeForBindingElement(declaration, contextFlags);
                 case 167:
                     if (ts.isStatic(declaration)) {
-                        return getContextualTypeForStaticPropertyDeclaration(declaration);
+                        return getContextualTypeForStaticPropertyDeclaration(declaration, contextFlags);
                     }
             }
         }
-        function getContextualTypeForBindingElement(declaration) {
+        function getContextualTypeForBindingElement(declaration, contextFlags) {
             var parent = declaration.parent.parent;
             var name = declaration.propertyName || declaration.name;
-            var parentType = getContextualTypeForVariableLikeDeclaration(parent) ||
+            var parentType = getContextualTypeForVariableLikeDeclaration(parent, contextFlags) ||
                 parent.kind !== 203 && parent.initializer && checkDeclarationInitializer(parent, declaration.dotDotDotToken ? 64 : 0);
             if (!parentType || ts.isBindingPattern(name) || ts.isComputedNonLiteralName(name))
                 return undefined;
@@ -61078,8 +61106,8 @@ var ts;
                 return getTypeOfPropertyOfType(parentType, text);
             }
         }
-        function getContextualTypeForStaticPropertyDeclaration(declaration) {
-            var parentType = ts.isExpression(declaration.parent) && getContextualType(declaration.parent);
+        function getContextualTypeForStaticPropertyDeclaration(declaration, contextFlags) {
+            var parentType = ts.isExpression(declaration.parent) && getContextualType(declaration.parent, contextFlags);
             if (!parentType)
                 return undefined;
             return getTypeOfPropertyOfContextualType(parentType, getSymbolOfNode(declaration).escapedName);
@@ -61087,7 +61115,7 @@ var ts;
         function getContextualTypeForInitializerExpression(node, contextFlags) {
             var declaration = node.parent;
             if (ts.hasInitializer(declaration) && node === declaration.initializer) {
-                var result = getContextualTypeForVariableLikeDeclaration(declaration);
+                var result = getContextualTypeForVariableLikeDeclaration(declaration, contextFlags);
                 if (result) {
                     return result;
                 }
@@ -61097,10 +61125,10 @@ var ts;
             }
             return undefined;
         }
-        function getContextualTypeForReturnExpression(node) {
+        function getContextualTypeForReturnExpression(node, contextFlags) {
             var func = ts.getContainingFunction(node);
             if (func) {
-                var contextualReturnType = getContextualReturnType(func);
+                var contextualReturnType = getContextualReturnType(func, contextFlags);
                 if (contextualReturnType) {
                     var functionFlags = ts.getFunctionFlags(func);
                     if (functionFlags & 1) {
@@ -61128,11 +61156,11 @@ var ts;
             }
             return undefined;
         }
-        function getContextualTypeForYieldOperand(node) {
+        function getContextualTypeForYieldOperand(node, contextFlags) {
             var func = ts.getContainingFunction(node);
             if (func) {
                 var functionFlags = ts.getFunctionFlags(func);
-                var contextualReturnType = getContextualReturnType(func);
+                var contextualReturnType = getContextualReturnType(func, contextFlags);
                 if (contextualReturnType) {
                     return node.asteriskToken
                         ? contextualReturnType
@@ -61156,14 +61184,14 @@ var ts;
         }
         function getContextualIterationType(kind, functionDecl) {
             var isAsync = !!(ts.getFunctionFlags(functionDecl) & 2);
-            var contextualReturnType = getContextualReturnType(functionDecl);
+            var contextualReturnType = getContextualReturnType(functionDecl, undefined);
             if (contextualReturnType) {
                 return getIterationTypeOfGeneratorFunctionReturnType(kind, contextualReturnType, isAsync)
                     || undefined;
             }
             return undefined;
         }
-        function getContextualReturnType(functionDecl) {
+        function getContextualReturnType(functionDecl, contextFlags) {
             var returnType = getReturnTypeFromAnnotation(functionDecl);
             if (returnType) {
                 return returnType;
@@ -61174,7 +61202,7 @@ var ts;
             }
             var iife = ts.getImmediatelyInvokedFunctionExpression(functionDecl);
             if (iife) {
-                return getContextualType(iife);
+                return getContextualType(iife, contextFlags);
             }
             return undefined;
         }
@@ -61404,7 +61432,7 @@ var ts;
         }
         function getContextualTypeForObjectLiteralElement(element, contextFlags) {
             var objectLiteral = element.parent;
-            var propertyAssignmentType = ts.isPropertyAssignment(element) && getContextualTypeForVariableLikeDeclaration(element);
+            var propertyAssignmentType = ts.isPropertyAssignment(element) && getContextualTypeForVariableLikeDeclaration(element, contextFlags);
             if (propertyAssignmentType) {
                 return propertyAssignmentType;
             }
@@ -61549,9 +61577,9 @@ var ts;
                     return getContextualTypeForInitializerExpression(node, contextFlags);
                 case 214:
                 case 247:
-                    return getContextualTypeForReturnExpression(node);
+                    return getContextualTypeForReturnExpression(node, contextFlags);
                 case 224:
-                    return getContextualTypeForYieldOperand(parent);
+                    return getContextualTypeForYieldOperand(parent, contextFlags);
                 case 218:
                     return getContextualTypeForAwaitOperand(parent, contextFlags);
                 case 208:
@@ -61598,7 +61626,7 @@ var ts;
             }
             return undefined;
             function tryFindWhenConstTypeReference(node) {
-                return getContextualType(node);
+                return getContextualType(node, contextFlags);
             }
         }
         function getInferenceContext(node) {
@@ -61867,7 +61895,7 @@ var ts;
             var elementCount = elements.length;
             var elementTypes = [];
             var elementFlags = [];
-            var contextualType = getApparentTypeOfContextualType(node);
+            var contextualType = getApparentTypeOfContextualType(node, undefined);
             var inDestructuringPattern = ts.isAssignmentTarget(node);
             var inConstContext = isConstContext(node);
             var hasOmittedExpression = false;
@@ -62016,7 +62044,7 @@ var ts;
             var propertiesTable = ts.createSymbolTable();
             var propertiesArray = [];
             var spread = emptyObjectType;
-            var contextualType = getApparentTypeOfContextualType(node);
+            var contextualType = getApparentTypeOfContextualType(node, undefined);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
                 (contextualType.pattern.kind === 201 || contextualType.pattern.kind === 205);
             var inConstContext = isConstContext(node);
@@ -62314,7 +62342,7 @@ var ts;
                     if (explicitlySpecifyChildrenAttribute) {
                         error(attributes, ts.Diagnostics._0_are_specified_twice_The_attribute_named_0_will_be_overwritten, ts.unescapeLeadingUnderscores(jsxChildrenPropertyName));
                     }
-                    var contextualType = getApparentTypeOfContextualType(openingLikeElement.attributes);
+                    var contextualType = getApparentTypeOfContextualType(openingLikeElement.attributes, undefined);
                     var childrenContextualType = contextualType && getTypeOfPropertyOfContextualType(contextualType, jsxChildrenPropertyName);
                     var childrenPropSymbol = createSymbol(4, jsxChildrenPropertyName);
                     childrenPropSymbol.type = childrenTypes.length === 1 ? childrenTypes[0] :
@@ -65602,13 +65630,6 @@ var ts;
                     }
                 }
             }
-            var restType = getEffectiveRestType(context);
-            if (restType && restType.flags & 262144) {
-                var instantiatedContext = instantiateSignature(context, inferenceContext.nonFixingMapper);
-                assignContextualParameterTypes(signature, instantiatedContext);
-                var restPos = getParameterCount(context) - 1;
-                inferTypes(inferenceContext.inferences, getRestTypeAtPosition(signature, restPos), restType);
-            }
         }
         function assignContextualParameterTypes(signature, context) {
             if (context.typeParameters) {
@@ -65781,7 +65802,7 @@ var ts;
                     var contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
                     var contextualType = !contextualSignature ? undefined :
                         contextualSignature === getSignatureFromDeclaration(func) ? isGenerator ? undefined : returnType :
-                            instantiateContextualType(getReturnTypeOfSignature(contextualSignature), func);
+                            instantiateContextualType(getReturnTypeOfSignature(contextualSignature), func, undefined);
                     if (isGenerator) {
                         yieldType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(yieldType, contextualType, 0, isAsync);
                         returnType = getWidenedLiteralLikeTypeForContextualIterationTypeIfNeeded(returnType, contextualType, 1, isAsync);
@@ -65844,7 +65865,7 @@ var ts;
                     nextType = iterationTypes && iterationTypes.nextType;
                 }
                 else {
-                    nextType = getContextualType(yieldExpression);
+                    nextType = getContextualType(yieldExpression, undefined);
                 }
                 if (nextType)
                     ts.pushIfUnique(nextTypes, nextType);
@@ -66017,11 +66038,16 @@ var ts;
                     if (isContextSensitive(node)) {
                         if (contextualSignature) {
                             var inferenceContext = getInferenceContext(node);
+                            var instantiatedContextualSignature = void 0;
                             if (checkMode && checkMode & 2) {
                                 inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext);
+                                var restType = getEffectiveRestType(contextualSignature);
+                                if (restType && restType.flags & 262144) {
+                                    instantiatedContextualSignature = instantiateSignature(contextualSignature, inferenceContext.nonFixingMapper);
+                                }
                             }
-                            var instantiatedContextualSignature = inferenceContext ?
-                                instantiateSignature(contextualSignature, inferenceContext.mapper) : contextualSignature;
+                            instantiatedContextualSignature || (instantiatedContextualSignature = inferenceContext ?
+                                instantiateSignature(contextualSignature, inferenceContext.mapper) : contextualSignature);
                             assignContextualParameterTypes(signature, instantiatedContextualSignature);
                         }
                         else {
@@ -67136,7 +67162,7 @@ var ts;
                 type = anyType;
                 addLazyDiagnostic(function () {
                     if (noImplicitAny && !ts.expressionResultIsUnused(node)) {
-                        var contextualType = getContextualType(node);
+                        var contextualType = getContextualType(node, undefined);
                         if (!contextualType || isTypeAny(contextualType)) {
                             error(node, ts.Diagnostics.yield_expression_implicitly_results_in_an_any_type_because_its_containing_generator_lacks_a_return_type_annotation);
                         }
@@ -67177,7 +67203,7 @@ var ts;
                 texts.push(span.literal.text);
                 types.push(isTypeAssignableTo(type, templateConstraintType) ? type : stringType);
             }
-            return isConstContext(node) || isTemplateLiteralContext(node) || someType(getContextualType(node) || unknownType, isTemplateLiteralContextualType) ? getTemplateLiteralType(texts, types) : stringType;
+            return isConstContext(node) || isTemplateLiteralContext(node) || someType(getContextualType(node, undefined) || unknownType, isTemplateLiteralContextualType) ? getTemplateLiteralType(texts, types) : stringType;
         }
         function isTemplateLiteralContextualType(type) {
             return !!(type.flags & (128 | 134217728) ||
@@ -67200,7 +67226,7 @@ var ts;
                 if (inferenceContext && inferenceContext.intraExpressionInferenceSites) {
                     inferenceContext.intraExpressionInferenceSites = undefined;
                 }
-                var result = maybeTypeOfKind(type, 2944) && isLiteralOfContextualType(type, instantiateContextualType(contextualType, node)) ?
+                var result = maybeTypeOfKind(type, 2944) && isLiteralOfContextualType(type, instantiateContextualType(contextualType, node, undefined)) ?
                     getRegularTypeOfLiteralType(type) : type;
                 return result;
             }
@@ -67304,7 +67330,7 @@ var ts;
             var type = checkExpression(node, checkMode, forceTuple);
             return isConstContext(node) || ts.isCommonJsExportedExpression(node) ? getRegularTypeOfLiteralType(type) :
                 isTypeAssertion(node) ? type :
-                    getWidenedLiteralLikeTypeForContextualType(type, instantiateContextualType(arguments.length === 2 ? getContextualType(node) : contextualType, node));
+                    getWidenedLiteralLikeTypeForContextualType(type, instantiateContextualType(arguments.length === 2 ? getContextualType(node, undefined) : contextualType, node, undefined));
         }
         function checkPropertyAssignment(node, checkMode) {
             if (node.name.kind === 162) {