diff --git a/types/rx-lite/index.d.ts b/types/rx-lite/index.d.ts index 16646b0473..9487683dce 100644 --- a/types/rx-lite/index.d.ts +++ b/types/rx-lite/index.d.ts @@ -244,8 +244,8 @@ declare namespace Rx { merge(maxConcurrent: number): T; merge(other: Observable): Observable; merge(other: IPromise): Observable; - mergeAll(): Observable; - mergeObservable(): Observable; // alias for mergeAll + mergeAll(): T; + mergeObservable(): T; // alias for mergeAll skipUntil(other: Observable): Observable; skipUntil(other: IPromise): Observable; switch(): T; diff --git a/types/rx-lite/rx-lite-tests.ts b/types/rx-lite/rx-lite-tests.ts index 17f0bbe726..755a2b2443 100644 --- a/types/rx-lite/rx-lite-tests.ts +++ b/types/rx-lite/rx-lite-tests.ts @@ -86,14 +86,19 @@ function test_concatAll() { }); } +// https://github.com/Reactive-Extensions/RxJS/blob/master/doc/api/core/operators/mergeall.md function test_mergeAll() { - /* mergeAll example */ + /* mergeAll example */ + + // $ExpectType Observable const source = Rx.Observable.range(0, 3) .map(x => Rx.Observable.range(x, 3)) - .mergeAll(); + .mergeAll(); const subscription = source.subscribe( x => { + // $ExpectType number + x; console.log('Next: %s', x); }, err => {