microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 12:51:30 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Contextually type IIFE params by their arguments

Browse Source
This commit is contained in:
Nathan Shively-Sanders
2016-05-05 11:58:36 -07:00
parent 673fa41418
commit aa38cdba56
5 changed files with 436 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/compiler/checker.ts
View File

@@ -8520,6 +8520,17 @@ namespace ts {
function getContextuallyTypedParameterType(parameter: ParameterDeclaration): Type {
const func = parameter.parent;
if (isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
if (isIife(func)) {
const indexOfParameter = indexOf(func.parameters, parameter);
const call = func.parent.parent as CallExpression;
if (indexOfParameter < call.arguments.length) {
const type = getTypeOfExpression(call.arguments[indexOfParameter]);
if (type && parameter.dotDotDotToken) {
return createArrayType(type);
}
return type;
}
}
const contextualSignature = getContextualSignature(func);
if (contextualSignature) {
const funcHasRestParameters = hasRestParameter(func);
@@ -8540,6 +8551,13 @@ namespace ts {
return undefined;
}
function isIife(func: FunctionExpression | MethodDeclaration) {
return (func.kind === SyntaxKind.FunctionExpression || func.kind === SyntaxKind.ArrowFunction) &&
func.parent.kind === SyntaxKind.ParenthesizedExpression &&
func.parent.parent.kind === SyntaxKind.CallExpression &&
(func.parent.parent as CallExpression).expression === func.parent;
}
// In a variable, parameter or property declaration with a type annotation,
// the contextual type of an initializer expression is the type of the variable, parameter or property.
// Otherwise, in a parameter declaration of a contextually typed function expression,
@@ -8898,9 +8916,9 @@ namespace ts {
}
function getContextualTypeForFunctionLikeDeclaration(node: FunctionExpression | MethodDeclaration) {
return isObjectLiteralMethod(node)
? getContextualTypeForObjectLiteralMethod(node)
: getApparentTypeOfContextualType(node);
return isObjectLiteralMethod(node) ?
getContextualTypeForObjectLiteralMethod(node) :
getApparentTypeOfContextualType(node);
}
// Return the contextual signature for a given expression node. A contextual type provides a