Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions internal/checker/checker.go
Original file line number Diff line number Diff line change
Expand Up @@ -9827,7 +9827,7 @@ func (c *Checker) contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node
inferenceContext := c.getInferenceContext(node)
var instantiatedContextualSignature *Signature
if checkMode&CheckModeInferential != 0 {
c.inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext)
c.inferFromAnnotatedParametersAndReturn(signature, contextualSignature, inferenceContext)
restType := c.getEffectiveRestType(contextualSignature)
if restType != nil && restType.flags&TypeFlagsTypeParameter != 0 {
instantiatedContextualSignature = c.instantiateSignature(contextualSignature, inferenceContext.nonFixingMapper)
Expand All @@ -9848,7 +9848,7 @@ func (c *Checker) contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node
} else if contextualSignature != nil && node.TypeParameters() == nil && len(contextualSignature.parameters) > len(node.Parameters()) {
inferenceContext := c.getInferenceContext(node)
if checkMode&CheckModeInferential != 0 {
c.inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext)
c.inferFromAnnotatedParametersAndReturn(signature, contextualSignature, inferenceContext)
}
}
if contextualSignature != nil && c.getReturnTypeFromAnnotation(node) == nil && signature.resolvedReturnType == nil {
Expand Down Expand Up @@ -9895,7 +9895,7 @@ func (c *Checker) checkFunctionExpressionOrObjectLiteralMethodDeferred(node *ast
}
}

func (c *Checker) inferFromAnnotatedParameters(sig *Signature, context *Signature, inferenceContext *InferenceContext) {
func (c *Checker) inferFromAnnotatedParametersAndReturn(sig *Signature, context *Signature, inferenceContext *InferenceContext) {
length := len(sig.parameters) - core.IfElse(signatureHasRestParameter(sig), 1, 0)
for i := range length {
declaration := sig.parameters[i].ValueDeclaration
Expand All @@ -9906,6 +9906,13 @@ func (c *Checker) inferFromAnnotatedParameters(sig *Signature, context *Signatur
c.inferTypes(inferenceContext.inferences, source, target, InferencePriorityNone, false)
}
}
if declaration := sig.Declaration(); declaration != nil {
if returnTypeNode := declaration.Type(); returnTypeNode != nil {
source := c.getTypeFromTypeNode(returnTypeNode)
target := c.getReturnTypeOfSignature(context)
c.inferTypes(inferenceContext.inferences, source, target, InferencePriorityNone, false)
}
}
}

// Return the contextual signature for a given expression node. A contextual type provides a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ declare function test<T>(cb: (arg: T) => T): T;
>arg : T

const res1 = test((arg): number => 1); // ok
>res1 : unknown
>test((arg): number => 1) : unknown
>res1 : number
>test((arg): number => 1) : number
>test : <T>(cb: (arg: T) => T) => T
>(arg): number => 1 : (arg: unknown) => number
>arg : unknown
>(arg): number => 1 : (arg: number) => number
>arg : number
>1 : 1

const res2 = test((arg): number => 'foo'); // error
>res2 : unknown
>test((arg): number => 'foo') : unknown
>res2 : number
>test((arg): number => 'foo') : number
>test : <T>(cb: (arg: T) => T) => T
>(arg): number => 'foo' : (arg: unknown) => number
>arg : unknown
>(arg): number => 'foo' : (arg: number) => number
>arg : number
>'foo' : "foo"

export declare function linkedSignal<S, D>(options: {
Expand All @@ -36,20 +36,20 @@ export declare function linkedSignal<S, D>(options: {
}): D;

const signal = linkedSignal({
>signal : unknown
>linkedSignal({ source: () => 3, computation: (s): number => 3,}) : unknown
>signal : number
>linkedSignal({ source: () => 3, computation: (s): number => 3,}) : number
>linkedSignal : <S, D>(options: { source: () => S; computation: (source: NoInfer<D>) => D; }) => D
>{ source: () => 3, computation: (s): number => 3,} : { source: () => number; computation: (s: unknown) => number; }
>{ source: () => 3, computation: (s): number => 3,} : { source: () => number; computation: (s: number) => number; }

source: () => 3,
>source : () => number
>() => 3 : () => number
>3 : 3

computation: (s): number => 3,
>computation : (s: unknown) => number
>(s): number => 3 : (s: unknown) => number
>s : unknown
>computation : (s: number) => number
>(s): number => 3 : (s: number) => number
>s : number
>3 : 3

});
Expand All @@ -66,10 +66,10 @@ class Foo<T, R> {
}

const _1 = new Foo((name: string, { x }): { name: string; x: number } => ({
>_1 : Foo<string, unknown>
>new Foo((name: string, { x }): { name: string; x: number } => ({ name, x,})) : Foo<string, unknown>
>_1 : Foo<string, { name: string; x: number; }>
>new Foo((name: string, { x }): { name: string; x: number } => ({ name, x,})) : Foo<string, { name: string; x: number; }>
>Foo : typeof Foo
>(name: string, { x }): { name: string; x: number } => ({ name, x,}) : (name: string, { x }: { x: number; other: unknown; }) => { name: string; x: number; }
>(name: string, { x }): { name: string; x: number } => ({ name, x,}) : (name: string, { x }: { x: number; other: NoInfer<{ name: string; x: number; }>; }) => { name: string; x: number; }
>name : string
>x : number
>name : string
Expand Down

This file was deleted.