Fix mergeAll having wrong returntype (#29820)

This commit is contained in:
Oscar Busk
2018-10-17 13:07:56 -07:00
committed by Sheetal Nandi
parent d8bab0f3be
commit 74fb6c506a
2 changed files with 9 additions and 4 deletions
+2 -2
View File
@@ -244,8 +244,8 @@ declare namespace Rx {
merge(maxConcurrent: number): T;
merge(other: Observable<T>): Observable<T>;
merge(other: IPromise<T>): Observable<T>;
mergeAll(): Observable<T>;
mergeObservable(): Observable<T>; // alias for mergeAll
mergeAll(): T;
mergeObservable(): T; // alias for mergeAll
skipUntil<T2>(other: Observable<T2>): Observable<T>;
skipUntil<T2>(other: IPromise<T2>): Observable<T>;
switch(): T;
+7 -2
View File
@@ -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<number>
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 => {