microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-26 03:19:10 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Simplify logic

Browse Source
This commit is contained in:
Mohamed Hegazy 2016-11-29 16:55:50 -08:00
parent 2178d5526f
commit 2152683325
1 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/compiler/checker.ts
View File

@ -3054,11 +3054,13 @@ namespace ts {
}
function getRestType(source: Type, properties: PropertyName[], symbol: Symbol): Type {
source = filterType(source, t => !(t.flags & TypeFlags.Nullable));
if (source.flags & TypeFlags.Never) {
return emptyObjectType;
}
if (source.flags & TypeFlags.Union) {
const types = filterNulableTypes(<UnionType>source);
if (types.length) {
return getUnionType(map(types, t => getRestType(t, properties, symbol)));
}
return mapType(source, t => getRestType(t, properties, symbol));
}
const members = createMap<Symbol>();
@ -6103,10 +6105,6 @@ 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
@ -6116,31 +6114,19 @@ namespace ts {
if (left.flags & TypeFlags.Any || right.flags & TypeFlags.Any) {
return anyType;
}
left = filterType(left, t => !(t.flags & TypeFlags.Nullable));
if (left.flags & TypeFlags.Never) {
return right;
}
right = filterType(right, t => !(t.flags & TypeFlags.Nullable));
if (right.flags & TypeFlags.Never) {
return left;
}
if (left.flags & TypeFlags.Union) {
const types = filterNulableTypes(<UnionType>left);
if (types.length) {
return getUnionType(map(types, t => getSpreadType(t, right, isFromObjectLiteral)));
}
else {
left = emptyObjectType;
}
return mapType(left, t => getSpreadType(t, right, isFromObjectLiteral));
}
else if (left.flags & TypeFlags.Nullable) {
left = emptyObjectType;
}
if (right.flags & TypeFlags.Union) {
const types = filterNulableTypes(<UnionType>right);
if (types.length) {
return getUnionType(map(types, t => getSpreadType(left, t, isFromObjectLiteral)));
}
else {
right = emptyObjectType;
}
}
else if (right.flags & TypeFlags.Nullable) {
right = emptyObjectType;
return mapType(right, t => getSpreadType(left, t, isFromObjectLiteral));
}
const members = createMap<Symbol>();