microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-06 04:35:21 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #23645 from Microsoft/distributeKeyofUnion2

Browse Source 
Distribute 'keyof' union types (take 2)
This commit is contained in:
Anders Hejlsberg
2018-04-24 10:09:45 -07:00
committed by GitHub
parent 59765e2d86 f0c3291976
commit 5d67f8ef68
10 changed files with 594 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/checker.ts
View File

@@ -8268,7 +8268,8 @@ namespace ts {
}
function getIndexType(type: Type, stringsOnly = keyofStringsOnly): Type {
return type.flags & TypeFlags.Intersection ? getUnionType(map((<IntersectionType>type).types, t => getIndexType(t, stringsOnly))) :
return type.flags & TypeFlags.Union ? getIntersectionType(map((<IntersectionType>type).types, t => getIndexType(t, stringsOnly))) :
type.flags & TypeFlags.Intersection ? getUnionType(map((<IntersectionType>type).types, t => getIndexType(t, stringsOnly))) :
maybeTypeOfKind(type, TypeFlags.InstantiableNonPrimitive) ? getIndexTypeForGenericType(<InstantiableType | UnionOrIntersectionType>type, stringsOnly) :
getObjectFlags(type) & ObjectFlags.Mapped ? getConstraintTypeFromMappedType(<MappedType>type) :
type === wildcardType ? wildcardType :