Use string/number signature to get contextual type

src/compiler/checker.ts

@@ -16708,6 +16708,8 @@ namespace ts {
                             return restType;
                         }
                     }
+                    return isNumericLiteralName(name) && getIndexTypeOfContextualType(type, IndexKind.Number) ||
+                        getIndexTypeOfContextualType(type, IndexKind.String);
                 }
                 return undefined;
             }, /*noReductions*/ true);

tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.js

@@ -39,7 +39,7 @@ interface IWithNumberIndexSignature2 {
 // If S is not empty, U has a string index signature of a union type of 
 // the types of the string index signatures from each type in S.
 var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { z: a => a }; // a should be number
-var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { foo: a => a }; // a should be any
+var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { foo: a => a }; // a should be number (because of index signature of IWithStringIndexSignature1)
 var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { foo: "hello" }; 
 var x2: IWithStringIndexSignature1 | IWithStringIndexSignature2 = { z: a => a.toString() }; // a should be number
 var x2: IWithStringIndexSignature1 | IWithStringIndexSignature2 = { z: a => a }; // a should be number
@@ -49,7 +49,7 @@ var x2: IWithStringIndexSignature1 | IWithStringIndexSignature2 = { z: a => a };
 // If S is not empty, U has a numeric index signature of a union type of 
 // the types of the numeric index signatures from each type in S.
 var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 1: a => a }; // a should be number
-var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: a => a }; // a should be any
+var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: a => a }; // a should be number (because of index signature of IWithNumberIndexSignature1)
 var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: "hello" };
 var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a.toString() }; // a should be number
 var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a }; // a should be number
@@ -66,15 +66,15 @@ var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a };
 // If S is not empty, U has a string index signature of a union type of 
 // the types of the string index signatures from each type in S.
 var x = { z: function (a) { return a; } }; // a should be number
-var x = { foo: function (a) { return a; } }; // a should be any
+var x = { foo: function (a) { return a; } }; // a should be number (because of index signature of IWithStringIndexSignature1)
 var x = { foo: "hello" };
 var x2 = { z: function (a) { return a.toString(); } }; // a should be number
 var x2 = { z: function (a) { return a; } }; // a should be number
 // Let S be the set of types in U that has a numeric index signature.
 // If S is not empty, U has a numeric index signature of a union type of 
 // the types of the numeric index signatures from each type in S.
 var x3 = { 1: function (a) { return a; } }; // a should be number
-var x3 = { 0: function (a) { return a; } }; // a should be any
+var x3 = { 0: function (a) { return a; } }; // a should be number (because of index signature of IWithNumberIndexSignature1)
 var x3 = { 0: "hello" };
 var x4 = { 1: function (a) { return a.toString(); } }; // a should be number
 var x4 = { 1: function (a) { return a; } }; // a should be number

tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.symbols

@@ -74,7 +74,7 @@ var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { z: a => a };
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 39, 70))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 39, 70))
 
-var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { foo: a => a }; // a should be any
+var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { foo: a => a }; // a should be number (because of index signature of IWithStringIndexSignature1)
 >x : Symbol(x, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 39, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 40, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 41, 3))
 >IWithNoStringIndexSignature : Symbol(IWithNoStringIndexSignature, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 7, 1))
 >IWithStringIndexSignature1 : Symbol(IWithStringIndexSignature1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 14, 1))
@@ -118,7 +118,7 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 1: a => a }
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 49, 71))
 >a : Symbol(a, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 49, 71))
 
-var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: a => a }; // a should be any
+var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: a => a }; // a should be number (because of index signature of IWithNumberIndexSignature1)
 >x3 : Symbol(x3, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 49, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 50, 3), Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 51, 3))
 >IWithNoNumberIndexSignature : Symbol(IWithNoNumberIndexSignature, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 11, 1))
 >IWithNumberIndexSignature1 : Symbol(IWithNumberIndexSignature1, Decl(contextualTypeWithUnionTypeIndexSignatures.ts, 20, 1))

tests/baselines/reference/contextualTypeWithUnionTypeIndexSignatures.types

@@ -54,13 +54,13 @@ var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { z: a => a };
 >a : number
 >a : number
 
-var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { foo: a => a }; // a should be any
+var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { foo: a => a }; // a should be number (because of index signature of IWithStringIndexSignature1)
 >x : IWithNoStringIndexSignature | IWithStringIndexSignature1
->{ foo: a => a } : { foo: (a: any) => any; }
->foo : (a: any) => any
->a => a : (a: any) => any
->a : any
->a : any
+>{ foo: a => a } : { foo: (a: number) => number; }
+>foo : (a: number) => number
+>a => a : (a: number) => number
+>a : number
+>a : number
 
 var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { foo: "hello" }; 
 >x : IWithNoStringIndexSignature | IWithStringIndexSignature1
@@ -99,13 +99,13 @@ var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 1: a => a }
 >a : number
 >a : number
 
-var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: a => a }; // a should be any
+var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: a => a }; // a should be number (because of index signature of IWithNumberIndexSignature1)
 >x3 : IWithNoNumberIndexSignature | IWithNumberIndexSignature1
->{ 0: a => a } : { 0: (a: any) => any; }
->0 : (a: any) => any
->a => a : (a: any) => any
->a : any
->a : any
+>{ 0: a => a } : { 0: (a: number) => number; }
+>0 : (a: number) => number
+>a => a : (a: number) => number
+>a : number
+>a : number
 
 var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: "hello" };
 >x3 : IWithNoNumberIndexSignature | IWithNumberIndexSignature1

tests/baselines/reference/contextualTypingOfOptionalMembers.types

@@ -183,8 +183,8 @@ const a = <App4 state={100} foo={s => s} />; // TODO: should be number => number
 >App4 : <State, Actions extends ActionsObjectOr<State>>(props: (string & { state: State; }) | (Actions & { state: State; })) => JSX.Element
 >state : number
 >100 : 100
->foo : (s: any) => any
->s => s : (s: any) => any
->s : any
->s : any
+>foo : (s: number) => number
+>s => s : (s: number) => number
+>s : number
+>s : number
 

tests/baselines/reference/narrowingByTypeofInSwitch.types

@@ -543,7 +543,7 @@ function multipleGenericFuse<X extends L | number, Y extends R | number>(xy: X |
 
         case 'function': return [xy, 1];
 >'function' : "function"
->[xy, 1] : [X, number]
+>[xy, 1] : [X, 1]
 >xy : X
 >1 : 1
 

tests/baselines/reference/tsxAttributeResolution10.types

@@ -35,7 +35,7 @@ export class MyComponent {
 <MyComponent bar={true} />;
 ><MyComponent bar={true} /> : JSX.Element
 >MyComponent : typeof MyComponent
->bar : boolean
+>bar : true
 >true : true
 
 // Should be ok

tests/baselines/reference/unionTypeWithIndexedLiteralType.js

@@ -0,0 +1,8 @@
+//// [unionTypeWithIndexedLiteralType.ts]
+interface I { x: number; }
+interface Idx { [index: string]: U; }
+type U = Idx | I | "lit";
+const u: U = { x: "lit" };
+
+//// [unionTypeWithIndexedLiteralType.js]
+var u = { x: "lit" };

tests/baselines/reference/unionTypeWithIndexedLiteralType.symbols

@@ -0,0 +1,20 @@
+=== tests/cases/compiler/unionTypeWithIndexedLiteralType.ts ===
+interface I { x: number; }
+>I : Symbol(I, Decl(unionTypeWithIndexedLiteralType.ts, 0, 0))
+>x : Symbol(I.x, Decl(unionTypeWithIndexedLiteralType.ts, 0, 13))
+
+interface Idx { [index: string]: U; }
+>Idx : Symbol(Idx, Decl(unionTypeWithIndexedLiteralType.ts, 0, 26))
+>index : Symbol(index, Decl(unionTypeWithIndexedLiteralType.ts, 1, 17))
+>U : Symbol(U, Decl(unionTypeWithIndexedLiteralType.ts, 1, 37))
+
+type U = Idx | I | "lit";
+>U : Symbol(U, Decl(unionTypeWithIndexedLiteralType.ts, 1, 37))
+>Idx : Symbol(Idx, Decl(unionTypeWithIndexedLiteralType.ts, 0, 26))
+>I : Symbol(I, Decl(unionTypeWithIndexedLiteralType.ts, 0, 0))
+
+const u: U = { x: "lit" };
+>u : Symbol(u, Decl(unionTypeWithIndexedLiteralType.ts, 3, 5))
+>U : Symbol(U, Decl(unionTypeWithIndexedLiteralType.ts, 1, 37))
+>x : Symbol(x, Decl(unionTypeWithIndexedLiteralType.ts, 3, 14))
+

tests/baselines/reference/unionTypeWithIndexedLiteralType.types

@@ -0,0 +1,16 @@
+=== tests/cases/compiler/unionTypeWithIndexedLiteralType.ts ===
+interface I { x: number; }
+>x : number
+
+interface Idx { [index: string]: U; }
+>index : string
+
+type U = Idx | I | "lit";
+>U : U
+
+const u: U = { x: "lit" };
+>u : U
+>{ x: "lit" } : { x: "lit"; }
+>x : "lit"
+>"lit" : "lit"
+

tests/cases/compiler/unionTypeWithIndexedLiteralType.ts

@@ -0,0 +1,4 @@
+interface I { x: number; }
+interface Idx { [index: string]: U; }
+type U = Idx | I | "lit";
+const u: U = { x: "lit" };

tests/cases/conformance/types/union/contextualTypeWithUnionTypeIndexSignatures.ts

@@ -38,7 +38,7 @@ interface IWithNumberIndexSignature2 {
 // If S is not empty, U has a string index signature of a union type of 
 // the types of the string index signatures from each type in S.
 var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { z: a => a }; // a should be number
-var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { foo: a => a }; // a should be any
+var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { foo: a => a }; // a should be number (because of index signature of IWithStringIndexSignature1)
 var x: IWithNoStringIndexSignature | IWithStringIndexSignature1 = { foo: "hello" }; 
 var x2: IWithStringIndexSignature1 | IWithStringIndexSignature2 = { z: a => a.toString() }; // a should be number
 var x2: IWithStringIndexSignature1 | IWithStringIndexSignature2 = { z: a => a }; // a should be number
@@ -48,7 +48,7 @@ var x2: IWithStringIndexSignature1 | IWithStringIndexSignature2 = { z: a => a };
 // If S is not empty, U has a numeric index signature of a union type of 
 // the types of the numeric index signatures from each type in S.
 var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 1: a => a }; // a should be number
-var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: a => a }; // a should be any
+var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: a => a }; // a should be number (because of index signature of IWithNumberIndexSignature1)
 var x3: IWithNoNumberIndexSignature | IWithNumberIndexSignature1 = { 0: "hello" };
 var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a.toString() }; // a should be number
 var x4: IWithNumberIndexSignature1 | IWithNumberIndexSignature2 = { 1: a => a }; // a should be number