From 23fe17dd98fda5f1b485e301d7c18955a8068f9b Mon Sep 17 00:00:00 2001
From: LongYinan <lynweklm@gmail.com>
Date: Mon, 25 Dec 2017 14:08:45 +0800
Subject: [PATCH] fix(typings): the return type of project of mergeScan should
 be ObservableInput<R>

---
 src/operator/mergeScan.ts  | 4 ++--
 src/operators/mergeScan.ts | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/operator/mergeScan.ts b/src/operator/mergeScan.ts
index 682708c2fa..f8f736708d 100644
--- a/src/operator/mergeScan.ts
+++ b/src/operator/mergeScan.ts
@@ -1,5 +1,5 @@
 
-import { Observable } from '../Observable';
+import { Observable, ObservableInput } from '../Observable';
 import { mergeScan as higherOrder } from '../operators/mergeScan';
 
 /**
@@ -34,7 +34,7 @@ import { mergeScan as higherOrder } from '../operators/mergeScan';
  * @owner Observable
  */
 export function mergeScan<T, R>(this: Observable<T>,
-                                accumulator: (acc: R, value: T) => Observable<R>,
+                                accumulator: (acc: R, value: T) => ObservableInput<R>,
                                 seed: R,
                                 concurrent: number = Number.POSITIVE_INFINITY): Observable<R> {
   return higherOrder(accumulator, seed, concurrent)(this);
diff --git a/src/operators/mergeScan.ts b/src/operators/mergeScan.ts
index b45da5a83e..34a1d407d9 100644
--- a/src/operators/mergeScan.ts
+++ b/src/operators/mergeScan.ts
@@ -1,5 +1,5 @@
 import { Operator } from '../Operator';
-import { Observable } from '../Observable';
+import { Observable, ObservableInput } from '../Observable';
 import { Subscriber } from '../Subscriber';
 import { Subscription } from '../Subscription';
 import { tryCatch } from '../util/tryCatch';
@@ -40,14 +40,14 @@ import { OperatorFunction } from '../interfaces';
  * @method mergeScan
  * @owner Observable
  */
-export function mergeScan<T, R>(accumulator: (acc: R, value: T) => Observable<R>,
+export function mergeScan<T, R>(accumulator: (acc: R, value: T) => ObservableInput<R>,
                                 seed: R,
                                 concurrent: number = Number.POSITIVE_INFINITY): OperatorFunction<T, R> {
   return (source: Observable<T>) => source.lift(new MergeScanOperator(accumulator, seed, concurrent));
 }
 
 export class MergeScanOperator<T, R> implements Operator<T, R> {
-  constructor(private accumulator: (acc: R, value: T) => Observable<R>,
+  constructor(private accumulator: (acc: R, value: T) => ObservableInput<R>,
               private seed: R,
               private concurrent: number) {
   }
@@ -72,7 +72,7 @@ export class MergeScanSubscriber<T, R> extends OuterSubscriber<T, R> {
   protected index: number = 0;
 
   constructor(destination: Subscriber<R>,
-              private accumulator: (acc: R, value: T) => Observable<R>,
+              private accumulator: (acc: R, value: T) => ObservableInput<R>,
               private acc: R,
               private concurrent: number) {
     super(destination);