microsoft · sandersn · Dec 22, 2017 · Dec 1, 2017 · Dec 1, 2017 · Dec 4, 2017
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -5809,6 +5809,7 @@ namespace ts {
                if (source.symbol && members === getMembersOfSymbol(source.symbol)) {
                    members = createSymbolTable(source.declaredProperties);
                }
+                setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
                const thisArgument = lastOrUndefined(typeArguments);
                for (const baseType of baseTypes) {
                    const instantiatedBaseType = thisArgument ? getTypeWithThisArgument(instantiateType(baseType, mapper), thisArgument) : baseType;
@@ -6071,6 +6072,7 @@ namespace ts {
                if (symbol.exports) {
                    members = getExportsOfSymbol(symbol);
                }
+                setStructuredTypeMembers(type, members, emptyArray, emptyArray, undefined, undefined);
                if (symbol.flags & SymbolFlags.Class) {
                    const classType = getDeclaredTypeOfClassOrInterface(symbol);
                    const baseConstructorType = getBaseConstructorTypeOfClass(classType);

diff --git a/tests/baselines/reference/dynamicNames.js b/tests/baselines/reference/dynamicNames.js
@@ -138,17 +138,21 @@ export const o1_s2 = o1[s2];
 export const o2: T0 = o1;

 // recursive declarations
-declare const rI: RI;
-interface RI {
-    x: "a";
+// (type parameter indirection courtesy of #20400)
+declare const rI: RI<"a">;
+rI.x
+interface RI<T extends "a" | "b"> {
+    x: T;
    [rI.x]: "b";
 }

-declare const rC: RC;
-declare class RC {
-    x: "a";
+declare const rC: RC<"a">;
+rC.x
+declare class RC<T extends "a" | "b"> {
+    x: T;
    [rC.x]: "b";
-}
+}
+

 //// [module.js]
 "use strict";
@@ -205,6 +209,8 @@ exports.o1_c4 = exports.o1[exports.c4];
 exports.o1_c5 = exports.o1[exports.c5];
 exports.o1_s2 = exports.o1[exports.s2];
 exports.o2 = exports.o1;
+rI.x;
+rC.x;


 //// [module.d.ts]

diff --git a/tests/baselines/reference/dynamicNames.symbols b/tests/baselines/reference/dynamicNames.symbols
@@ -443,34 +443,50 @@ export const o2: T0 = o1;
 >o1 : Symbol(o1, Decl(main.ts, 101, 12))

 // recursive declarations
-declare const rI: RI;
->rI : Symbol(rI, Decl(main.ts, 115, 13))
->RI : Symbol(RI, Decl(main.ts, 115, 21))
+// (type parameter indirection courtesy of #20400)
+declare const rI: RI<"a">;
+>rI : Symbol(rI, Decl(main.ts, 116, 13))
+>RI : Symbol(RI, Decl(main.ts, 117, 4))

-interface RI {
->RI : Symbol(RI, Decl(main.ts, 115, 21))
+rI.x
+>rI.x : Symbol(RI.x, Decl(main.ts, 118, 35))
+>rI : Symbol(rI, Decl(main.ts, 116, 13))
+>x : Symbol(RI.x, Decl(main.ts, 118, 35))

-    x: "a";
->x : Symbol(RI.x, Decl(main.ts, 116, 14))
+interface RI<T extends "a" | "b"> {
+>RI : Symbol(RI, Decl(main.ts, 117, 4))
+>T : Symbol(T, Decl(main.ts, 118, 13))
+
+    x: T;
+>x : Symbol(RI.x, Decl(main.ts, 118, 35))
+>T : Symbol(T, Decl(main.ts, 118, 13))

    [rI.x]: "b";
->rI.x : Symbol(RI.x, Decl(main.ts, 116, 14))
->rI : Symbol(rI, Decl(main.ts, 115, 13))
->x : Symbol(RI.x, Decl(main.ts, 116, 14))
+>rI.x : Symbol(RI.x, Decl(main.ts, 118, 35))
+>rI : Symbol(rI, Decl(main.ts, 116, 13))
+>x : Symbol(RI.x, Decl(main.ts, 118, 35))
 }

-declare const rC: RC;
->rC : Symbol(rC, Decl(main.ts, 121, 13))
->RC : Symbol(RC, Decl(main.ts, 121, 21))
+declare const rC: RC<"a">;
+>rC : Symbol(rC, Decl(main.ts, 123, 13))
+>RC : Symbol(RC, Decl(main.ts, 124, 4))
+
+rC.x
+>rC.x : Symbol(RC.x, Decl(main.ts, 125, 39))
+>rC : Symbol(rC, Decl(main.ts, 123, 13))
+>x : Symbol(RC.x, Decl(main.ts, 125, 39))

-declare class RC {
->RC : Symbol(RC, Decl(main.ts, 121, 21))
+declare class RC<T extends "a" | "b"> {
+>RC : Symbol(RC, Decl(main.ts, 124, 4))
+>T : Symbol(T, Decl(main.ts, 125, 17))

-    x: "a";
->x : Symbol(RC.x, Decl(main.ts, 122, 18))
+    x: T;
+>x : Symbol(RC.x, Decl(main.ts, 125, 39))
+>T : Symbol(T, Decl(main.ts, 125, 17))

    [rC.x]: "b";
->rC.x : Symbol(RC.x, Decl(main.ts, 122, 18))
->rC : Symbol(rC, Decl(main.ts, 121, 13))
->x : Symbol(RC.x, Decl(main.ts, 122, 18))
+>rC.x : Symbol(RC.x, Decl(main.ts, 125, 39))
+>rC : Symbol(rC, Decl(main.ts, 123, 13))
+>x : Symbol(RC.x, Decl(main.ts, 125, 39))
 }
+
diff --git a/tests/baselines/reference/dynamicNames.types b/tests/baselines/reference/dynamicNames.types
@@ -519,34 +519,50 @@ export const o2: T0 = o1;
 >o1 : { [c4]: number; [c5]: string; [s2]: boolean; }

 // recursive declarations
-declare const rI: RI;
->rI : RI
->RI : RI
+// (type parameter indirection courtesy of #20400)
+declare const rI: RI<"a">;
+>rI : RI<"a">
+>RI : RI<T>

-interface RI {
->RI : RI
-
-    x: "a";
+rI.x
+>rI.x : "a"
+>rI : RI<"a">
 >x : "a"

+interface RI<T extends "a" | "b"> {
+>RI : RI<T>
+>T : T
+
+    x: T;
+>x : T
+>T : T
+
    [rI.x]: "b";
 >rI.x : "a"
->rI : RI
+>rI : RI<"a">
 >x : "a"
 }

-declare const rC: RC;
->rC : RC
->RC : RC
-
-declare class RC {
->RC : RC
+declare const rC: RC<"a">;
+>rC : RC<"a">
+>RC : RC<T>

-    x: "a";
+rC.x
+>rC.x : "a"
+>rC : RC<"a">
 >x : "a"

+declare class RC<T extends "a" | "b"> {
+>RC : RC<T>
+>T : T
+
+    x: T;
+>x : T
+>T : T
+
    [rC.x]: "b";
 >rC.x : "a"
->rC : RC
+>rC : RC<"a">
 >x : "a"
 }
+
diff --git a/tests/baselines/reference/mutuallyRecursiveInference.js b/tests/baselines/reference/mutuallyRecursiveInference.js
@@ -0,0 +1,51 @@
+//// [mutuallyRecursiveInference.ts]
+class T<A> {
+    a: A;
+    b: any
+}
+class L<RT extends { a: 'a' | 'b', b: any }> extends T<RT[RT['a']]> {
+    m() { this.a }
+}
+class X extends L<X> {
+    a: 'a' | 'b'
+    b: number
+    m2() {
+        this.a
+    }
+}
+
+
+//// [mutuallyRecursiveInference.js]
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var T = /** @class */ (function () {
+    function T() {
+    }
+    return T;
+}());
+var L = /** @class */ (function (_super) {
+    __extends(L, _super);
+    function L() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    L.prototype.m = function () { this.a; };
+    return L;
+}(T));
+var X = /** @class */ (function (_super) {
+    __extends(X, _super);
+    function X() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    X.prototype.m2 = function () {
+        this.a;
+    };
+    return X;
+}(L));
diff --git a/tests/baselines/reference/mutuallyRecursiveInference.symbols b/tests/baselines/reference/mutuallyRecursiveInference.symbols
@@ -0,0 +1,48 @@
+=== tests/cases/compiler/mutuallyRecursiveInference.ts ===
+class T<A> {
+>T : Symbol(T, Decl(mutuallyRecursiveInference.ts, 0, 0))
+>A : Symbol(A, Decl(mutuallyRecursiveInference.ts, 0, 8))
+
+    a: A;
+>a : Symbol(T.a, Decl(mutuallyRecursiveInference.ts, 0, 12))
+>A : Symbol(A, Decl(mutuallyRecursiveInference.ts, 0, 8))
+
+    b: any
+>b : Symbol(T.b, Decl(mutuallyRecursiveInference.ts, 1, 9))
+}
+class L<RT extends { a: 'a' | 'b', b: any }> extends T<RT[RT['a']]> {
+>L : Symbol(L, Decl(mutuallyRecursiveInference.ts, 3, 1))
+>RT : Symbol(RT, Decl(mutuallyRecursiveInference.ts, 4, 8))
+>a : Symbol(a, Decl(mutuallyRecursiveInference.ts, 4, 20))
+>b : Symbol(b, Decl(mutuallyRecursiveInference.ts, 4, 34))
+>T : Symbol(T, Decl(mutuallyRecursiveInference.ts, 0, 0))
+>RT : Symbol(RT, Decl(mutuallyRecursiveInference.ts, 4, 8))
+>RT : Symbol(RT, Decl(mutuallyRecursiveInference.ts, 4, 8))
+
+    m() { this.a }
+>m : Symbol(L.m, Decl(mutuallyRecursiveInference.ts, 4, 69))
+>this.a : Symbol(T.a, Decl(mutuallyRecursiveInference.ts, 0, 12))
+>this : Symbol(L, Decl(mutuallyRecursiveInference.ts, 3, 1))
+>a : Symbol(T.a, Decl(mutuallyRecursiveInference.ts, 0, 12))
+}
+class X extends L<X> {
+>X : Symbol(X, Decl(mutuallyRecursiveInference.ts, 6, 1))
+>L : Symbol(L, Decl(mutuallyRecursiveInference.ts, 3, 1))
+>X : Symbol(X, Decl(mutuallyRecursiveInference.ts, 6, 1))
+
+    a: 'a' | 'b'
+>a : Symbol(X.a, Decl(mutuallyRecursiveInference.ts, 7, 22))
+
+    b: number
+>b : Symbol(X.b, Decl(mutuallyRecursiveInference.ts, 8, 16))
+
+    m2() {
+>m2 : Symbol(X.m2, Decl(mutuallyRecursiveInference.ts, 9, 13))
+
+        this.a
+>this.a : Symbol(X.a, Decl(mutuallyRecursiveInference.ts, 7, 22))
+>this : Symbol(X, Decl(mutuallyRecursiveInference.ts, 6, 1))
+>a : Symbol(X.a, Decl(mutuallyRecursiveInference.ts, 7, 22))
+    }
+}
+
diff --git a/tests/baselines/reference/mutuallyRecursiveInference.types b/tests/baselines/reference/mutuallyRecursiveInference.types
@@ -0,0 +1,48 @@
+=== tests/cases/compiler/mutuallyRecursiveInference.ts ===
+class T<A> {
+>T : T<A>
+>A : A
+
+    a: A;
+>a : A
+>A : A
+
+    b: any
+>b : any
+}
+class L<RT extends { a: 'a' | 'b', b: any }> extends T<RT[RT['a']]> {
+>L : L<RT>
+>RT : RT
+>a : "a" | "b"
+>b : any
+>T : T<RT[RT["a"]]>
+>RT : RT
+>RT : RT
+
+    m() { this.a }
+>m : () => void
+>this.a : RT[RT["a"]]
+>this : this
+>a : RT[RT["a"]]
+}
+class X extends L<X> {
+>X : X
+>L : L<X>
+>X : X
+
+    a: 'a' | 'b'
+>a : "a" | "b"
+
+    b: number
+>b : number
+
+    m2() {
+>m2 : () => void
+
+        this.a
+>this.a : "a" | "b"
+>this : this
+>a : "a" | "b"
+    }
+}
+
diff --git a/tests/cases/compiler/dynamicNames.ts b/tests/cases/compiler/dynamicNames.ts
@@ -140,14 +140,17 @@ export const o1_s2 = o1[s2];
 export const o2: T0 = o1;

 // recursive declarations
-declare const rI: RI;
-interface RI {
-    x: "a";
+// (type parameter indirection courtesy of #20400)
+declare const rI: RI<"a">;
+rI.x
+interface RI<T extends "a" | "b"> {
+    x: T;
    [rI.x]: "b";
 }

-declare const rC: RC;
-declare class RC {
-    x: "a";
+declare const rC: RC<"a">;
+rC.x
+declare class RC<T extends "a" | "b"> {
+    x: T;
    [rC.x]: "b";
-}
+}
diff --git a/tests/cases/compiler/mutuallyRecursiveInference.ts b/tests/cases/compiler/mutuallyRecursiveInference.ts
@@ -0,0 +1,14 @@
+class T<A> {
+    a: A;
+    b: any
+}
+class L<RT extends { a: 'a' | 'b', b: any }> extends T<RT[RT['a']]> {
+    m() { this.a }
+}
+class X extends L<X> {
+    a: 'a' | 'b'
+    b: number
+    m2() {
+        this.a
+    }
+}