Make getContextualTypeOfApparentType mapType over unions (#17668)

* Instantiate contextual types while in an inferrential context

* Limit scope of instantiation to only when likely needed

* Still get aparent type

* Expand test

* Fix nit

* Handle JSX and array

* Tests for the JSX and Array cases

* After much deliberation and inspection, much simpler fix

After much deliberation and inspection, much simpler fix

Undo

Redo

Author: weswigham

src/compiler/checker.ts

@@ -13691,7 +13691,7 @@ namespace ts {
         // be "pushed" onto a node using the contextualType property.
         function getApparentTypeOfContextualType(node: Expression): Type {
             const type = getContextualType(node);
-            return type && getApparentType(type);
+            return type && mapType(type, getApparentType);
         }
 
         /**

tests/baselines/reference/contextualTypingOfOptionalMembers.errors.txt

@@ -0,0 +1,80 @@
+tests/cases/compiler/index.tsx(73,34): error TS7006: Parameter 's' implicitly has an 'any' type.
+
+
+==== tests/cases/compiler/index.tsx (1 errors) ====
+    interface ActionsObject<State> {
+        [prop: string]: (state: State) => State;
+    }
+    
+    interface Options<State, Actions> {
+        state?: State;
+        view?: (state: State, actions: Actions) => any;
+        actions: string | Actions;
+    }
+    
+    declare function app<State, Actions extends ActionsObject<State>>(obj: Options<State, Actions>): void;
+    
+    app({
+        state: 100,
+        actions: {
+            foo: s => s // Should be typed number => number
+        },
+        view: (s, a) => undefined as any,
+    });
+    
+    
+    interface Bar {
+        bar: (a: number) => void;
+    }
+    
+    declare function foo<T extends Bar>(x: string | T): T;
+    
+    const y = foo({
+        bar(x) { // Should be typed number => void
+        }
+    });
+    
+    interface Options2<State, Actions> {
+        state?: State;
+        view?: (state: State, actions: Actions) => any;
+        actions?: Actions;
+    }
+    
+    declare function app2<State, Actions extends ActionsObject<State>>(obj: Options2<State, Actions>): void;
+    
+    app2({
+        state: 100,
+        actions: {
+            foo: s => s // Should be typed number => number
+        },
+        view: (s, a) => undefined as any,
+    });
+    
+    
+    type ActionsArray<State> = ((state: State) => State)[];
+    
+    declare function app3<State, Actions extends ActionsArray<State>>(obj: Options<State, Actions>): void;
+    
+    app3({
+        state: 100,
+        actions: [
+            s => s // Should be typed number => number
+        ],
+        view: (s, a) => undefined as any,
+    });
+    
+    namespace JSX {
+        export interface Element {}
+        export interface IntrinsicElements {}
+    }
+    
+    interface ActionsObjectOr<State> {
+        [prop: string]: ((state: State) => State) | State;
+    }
+    
+    declare function App4<State, Actions extends ActionsObjectOr<State>>(props: Options<State, Actions>["actions"] & { state: State }): JSX.Element;
+    
+    const a = <App4 state={100} foo={s => s} />; // TODO: should be number => number, but JSX resolution is missing an inferential pass
+                                     ~
+!!! error TS7006: Parameter 's' implicitly has an 'any' type.
+    

tests/baselines/reference/contextualTypingOfOptionalMembers.js

@@ -0,0 +1,103 @@
+//// [index.tsx]
+interface ActionsObject<State> {
+    [prop: string]: (state: State) => State;
+}
+
+interface Options<State, Actions> {
+    state?: State;
+    view?: (state: State, actions: Actions) => any;
+    actions: string | Actions;
+}
+
+declare function app<State, Actions extends ActionsObject<State>>(obj: Options<State, Actions>): void;
+
+app({
+    state: 100,
+    actions: {
+        foo: s => s // Should be typed number => number
+    },
+    view: (s, a) => undefined as any,
+});
+
+
+interface Bar {
+    bar: (a: number) => void;
+}
+
+declare function foo<T extends Bar>(x: string | T): T;
+
+const y = foo({
+    bar(x) { // Should be typed number => void
+    }
+});
+
+interface Options2<State, Actions> {
+    state?: State;
+    view?: (state: State, actions: Actions) => any;
+    actions?: Actions;
+}
+
+declare function app2<State, Actions extends ActionsObject<State>>(obj: Options2<State, Actions>): void;
+
+app2({
+    state: 100,
+    actions: {
+        foo: s => s // Should be typed number => number
+    },
+    view: (s, a) => undefined as any,
+});
+
+
+type ActionsArray<State> = ((state: State) => State)[];
+
+declare function app3<State, Actions extends ActionsArray<State>>(obj: Options<State, Actions>): void;
+
+app3({
+    state: 100,
+    actions: [
+        s => s // Should be typed number => number
+    ],
+    view: (s, a) => undefined as any,
+});
+
+namespace JSX {
+    export interface Element {}
+    export interface IntrinsicElements {}
+}
+
+interface ActionsObjectOr<State> {
+    [prop: string]: ((state: State) => State) | State;
+}
+
+declare function App4<State, Actions extends ActionsObjectOr<State>>(props: Options<State, Actions>["actions"] & { state: State }): JSX.Element;
+
+const a = <App4 state={100} foo={s => s} />; // TODO: should be number => number, but JSX resolution is missing an inferential pass
+
+
+//// [index.jsx]
+app({
+    state: 100,
+    actions: {
+        foo: function (s) { return s; } // Should be typed number => number
+    },
+    view: function (s, a) { return undefined; }
+});
+var y = foo({
+    bar: function (x) {
+    }
+});
+app2({
+    state: 100,
+    actions: {
+        foo: function (s) { return s; } // Should be typed number => number
+    },
+    view: function (s, a) { return undefined; }
+});
+app3({
+    state: 100,
+    actions: [
+        function (s) { return s; } // Should be typed number => number
+    ],
+    view: function (s, a) { return undefined; }
+});
+var a = <App4 state={100} foo={function (s) { return s; }}/>; // TODO: should be number => number, but JSX resolution is missing an inferential pass