feat(core): flatten and flattenConcurrently should optimize for Filte…

…rMapOperator
staltz · Apr 14, 2016 · e1bebff · e1bebff
1 parent 5c77ff9
commit e1bebff
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core.ts b/src/core.ts
@@ -1273,14 +1273,14 @@ export class Stream<T> implements InternalListener<T> {
   }
 
   flatten<R, T extends Stream<R>>(): T {
-    return <T> new Stream<R>(this._prod instanceof MapOperator ?
+    return <T> new Stream<R>(this._prod instanceof MapOperator || this._prod instanceof FilterMapOperator ?
       new MapFlattenOperator(<MapOperator<R, Stream<R>>> <any> this._prod) :
       new FlattenOperator(<Stream<Stream<R>>> <any> this)
     );
   }
 
   flattenConcurrently<R, T extends Stream<R>>(): T {
-    return <T> new Stream<R>(this._prod instanceof MapOperator ?
+    return <T> new Stream<R>(this._prod instanceof MapOperator || this._prod instanceof FilterMapOperator ?
       new MapFlattenConcOperator(<MapOperator<R, Stream<R>>> <any> this._prod) :
       new FlattenConcOperator(<Stream<Stream<R>>> <any> this)
     );