microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-03-15 14:05:47 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

extract filterNullableTypes

Browse Source
This commit is contained in:
Mohamed Hegazy
2016-11-29 16:30:27 -08:00
parent 51f5ef6752
commit 2178d5526f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/checker.ts
View File

@@ -3055,7 +3055,7 @@ namespace ts {
function getRestType(source: Type, properties: PropertyName[], symbol: Symbol): Type {
if (source.flags & TypeFlags.Union) {
const types = filter((<UnionType>source).types, t => !(t.flags & TypeFlags.Nullable));
const types = filterNulableTypes(<UnionType>source);
if (types.length) {
return getUnionType(map(types, t => getRestType(t, properties, symbol)));
}
@@ -6103,6 +6103,10 @@ namespace ts {
return symbol ? getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) : undefined;
}
function filterNulableTypes(union: UnionType): Type[] {
return filter(union.types, t => !(t.flags & TypeFlags.Nullable));
}
/**
* Since the source of spread types are object literals, which are not binary,
* this function should be called in a left folding style, with left = previous result of getSpreadType
@@ -6114,7 +6118,7 @@ namespace ts {
}
if (left.flags & TypeFlags.Union) {
const types = filter((<UnionType>left).types, t => !(t.flags & TypeFlags.Nullable));
const types = filterNulableTypes(<UnionType>left);
if (types.length) {
return getUnionType(map(types, t => getSpreadType(t, right, isFromObjectLiteral)));
}
@@ -6127,7 +6131,7 @@ namespace ts {
}
if (right.flags & TypeFlags.Union) {
const types = filter((<UnionType>right).types, t => !(t.flags & TypeFlags.Nullable));
const types = filterNulableTypes(<UnionType>right);
if (types.length) {
return getUnionType(map(types, t => getSpreadType(left, t, isFromObjectLiteral)));
}