Spread types handle nested index [access] types

sandersn · sandersn · commit f2d739ffcfef · 2016-11-02T11:36:25.000-07:00
Nested index [access] types are treated as assignable to themselves only,
just like type parameters.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -6097,10 +6097,10 @@ namespace ts {
             }
             const spread = spreadTypes[id] = createType(TypeFlags.Spread) as SpreadType;
             Debug.assert(!!(left.flags & (TypeFlags.Spread | TypeFlags.Object)), "Left flags: " + left.flags.toString(2));
-            Debug.assert(!!(right.flags & (TypeFlags.TypeParameter | TypeFlags.Intersection | TypeFlags.Object)), "Right flags: " + right.flags.toString(2));
+            Debug.assert(!!(right.flags & (TypeFlags.TypeParameter | TypeFlags.Intersection | TypeFlags.Index | TypeFlags.IndexedAccess | TypeFlags.Object)), "Right flags: " + right.flags.toString(2));
             spread.symbol = symbol;
             spread.left = left as SpreadType | ResolvedType;
-            spread.right = right as TypeParameter | IntersectionType | ResolvedType;
+            spread.right = right as TypeParameter | IntersectionType | IndexType | IndexedAccessType | ResolvedType;
             spread.aliasSymbol = aliasSymbol;
             spread.aliasTypeArguments = aliasTypeArguments;
             return spread;
@@ -7173,7 +7173,8 @@ namespace ts {
                         spreadTypeRelatedTo(source.right.flags & TypeFlags.Object ? source.left as SpreadType : source,
                                             target.right.flags & TypeFlags.Object ? target.left as SpreadType : target);
                 }
-                // If both right sides are type parameters or intersections, then they must be identical for the spread types to be related.
+                // If both right sides are type parameters, intersections, index types or indexed access types,
+                // then they must be identical for the spread types to be related.
                 // It also means that the left sides are either spread types or object types.
 
                 // if one left is object and the other is spread, that means the second has another type parameter. which isn't allowed
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2852,7 +2852,7 @@ namespace ts {
     /* @internal */
     export interface SpreadType extends Type {
         left: SpreadType | ResolvedType;
-        right: TypeParameter | IntersectionType | ResolvedType;
+        right: TypeParameter | IntersectionType | IndexType | IndexedAccessType | ResolvedType;
     }
 
     /* @internal */

Original file line number	Diff line number	Diff line change
`@@ -2852,7 +2852,7 @@ namespace ts {`
`2852`	`2852`	`/* @internal */`
`2853`	`2853`	`export interface SpreadType extends Type {`
`2854`	`2854`	`left: SpreadType \| ResolvedType;`
`2855`		`- right: TypeParameter \| IntersectionType \| ResolvedType;`
	`2855`	`+ right: TypeParameter \| IntersectionType \| IndexType \| IndexedAccessType \| ResolvedType;`
`2856`	`2856`	`}`
`2857`	`2857`
`2858`	`2858`	`/* @internal */`