Properly handle mapped types with 'keyof any'

ahejlsberg · ahejlsberg · commit 07ff0fdb8186 · 2017-10-13T16:54:57.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -5777,7 +5777,7 @@ namespace ts {
                 for (const propertySymbol of getPropertiesOfType(modifiersType)) {
                     addMemberForKeyType(getLiteralTypeFromPropertyName(propertySymbol), propertySymbol);
                 }
-                if (getIndexInfoOfType(modifiersType, IndexKind.String)) {
+                if (modifiersType.flags & TypeFlags.Any || getIndexInfoOfType(modifiersType, IndexKind.String)) {
                     addMemberForKeyType(stringType);
                 }
             }
@@ -8386,7 +8386,7 @@ namespace ts {
         }
 
         function isMappableType(type: Type) {
-            return type.flags & (TypeFlags.TypeParameter | TypeFlags.Object | TypeFlags.Intersection | TypeFlags.IndexedAccess);
+            return type.flags & (TypeFlags.Any | TypeFlags.TypeParameter | TypeFlags.Object | TypeFlags.Intersection | TypeFlags.IndexedAccess);
         }
 
         function instantiateAnonymousType(type: AnonymousType, mapper: TypeMapper): AnonymousType {

Original file line number	Diff line number	Diff line change
`@@ -5777,7 +5777,7 @@ namespace ts {`
`5777`	`5777`	`for (const propertySymbol of getPropertiesOfType(modifiersType)) {`
`5778`	`5778`	`addMemberForKeyType(getLiteralTypeFromPropertyName(propertySymbol), propertySymbol);`
`5779`	`5779`	`}`
`5780`		`- if (getIndexInfoOfType(modifiersType, IndexKind.String)) {`
	`5780`	`+ if (modifiersType.flags & TypeFlags.Any \|\| getIndexInfoOfType(modifiersType, IndexKind.String)) {`
`5781`	`5781`	`addMemberForKeyType(stringType);`
`5782`	`5782`	`}`
`5783`	`5783`	`}`
`@@ -8386,7 +8386,7 @@ namespace ts {`
`8386`	`8386`	`}`
`8387`	`8387`
`8388`	`8388`	`function isMappableType(type: Type) {`
`8389`		`- return type.flags & (TypeFlags.TypeParameter \| TypeFlags.Object \| TypeFlags.Intersection \| TypeFlags.IndexedAccess);`
	`8389`	`+ return type.flags & (TypeFlags.Any \| TypeFlags.TypeParameter \| TypeFlags.Object \| TypeFlags.Intersection \| TypeFlags.IndexedAccess);`
`8390`	`8390`	`}`
`8391`	`8391`
`8392`	`8392`	`function instantiateAnonymousType(type: AnonymousType, mapper: TypeMapper): AnonymousType {`