Skip to content

Commit 603c9eb

Browse files
masaeedukwonoj
authored andcommitted
fix(typings): remove redundant generics from call<T, R> and lift<T, R>
1 parent 835b9e9 commit 603c9eb

File tree

7 files changed

+11
-9
lines changed

7 files changed

+11
-9
lines changed

src/Observable.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export class Observable<T> implements CoreOperators<T> {
101101
* @description creates a new Observable, with this Observable as the source, and the passed
102102
* operator defined as the new observable's operator.
103103
*/
104-
lift<T, R>(operator: Operator<T, R>): Observable<R> {
104+
lift<R>(operator: Operator<T, R>): Observable<R> {
105105
const observable = new Observable<R>();
106106
observable.source = this;
107107
observable.operator = operator;

src/Operator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Subscriber} from './Subscriber';
22

33
export class Operator<T, R> {
4-
call<T, R>(subscriber: Subscriber<R>): Subscriber<T> {
4+
call<R>(subscriber: Subscriber<R>): Subscriber<T> {
55
return new Subscriber<T>(subscriber);
66
}
77
}

src/operator/combineLatest.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export function combineLatest<T, R>(...observables: Array<ObservableInput<any> |
3535

3636
observables.unshift(this);
3737

38-
return new ArrayObservable(observables).lift<T, R>(new CombineLatestOperator<T, R>(project));
38+
return new ArrayObservable(observables).lift(new CombineLatestOperator(project));
3939
}
4040

4141
/* tslint:disable:max-line-length */
@@ -107,7 +107,7 @@ export function combineLatestStatic<T, R>(...observables: Array<any | Observable
107107
observables = <Array<Observable<any>>>observables[0];
108108
}
109109

110-
return new ArrayObservable(observables, scheduler).lift<T, R>(new CombineLatestOperator<T, R>(project));
110+
return new ArrayObservable(observables, scheduler).lift(new CombineLatestOperator<T, R>(project));
111111
}
112112

113113
export class CombineLatestOperator<T, R> implements Operator<T, R> {

src/operator/concat.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ export function concatStatic<T, R>(...observables: Array<Observable<any> | Sched
3030
scheduler = args.pop();
3131
}
3232

33-
return new ArrayObservable(observables, scheduler).lift<Observable<T>, T | R>(new MergeAllOperator<T | R>(1));
33+
return new ArrayObservable(observables, scheduler).lift(new MergeAllOperator<T | R>(1));
3434
}

src/operator/merge.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ export function mergeStatic<T, R>(...observables: Array<Observable<any> | Schedu
3434
return <Observable<R>>observables[0];
3535
}
3636

37-
return new ArrayObservable<Observable<T>>(<any>observables, scheduler).lift<Observable<T>, R>(new MergeAllOperator<R>(concurrent));
37+
return new ArrayObservable(<any>observables, scheduler).lift(new MergeAllOperator<R>(concurrent));
3838
}

src/operator/mergeMapTo.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ export function mergeMapTo<T, R, R2>(observable: Observable<R>,
1313
return this.lift(new MergeMapToOperator(observable, <any>resultSelector, concurrent));
1414
}
1515

16+
// TODO: Figure out correct signature here: an Operator<Observable<T>, R2>
17+
// needs to implement call(observer: Subscriber<R2>): Subscriber<Observable<T>>
1618
export class MergeMapToOperator<T, R, R2> implements Operator<Observable<T>, R2> {
1719
constructor(private ish: Observable<R> | Promise<R>,
1820
private resultSelector?: (outerValue: T, innerValue: R, outerIndex: number, innerIndex: number) => R2,
1921
private concurrent: number = Number.POSITIVE_INFINITY) {
20-
}
22+
}
2123

22-
call(observer: Subscriber<R2>): Subscriber<T> {
24+
call(observer: Subscriber<R2>): Subscriber<any> {
2325
return new MergeMapToSubscriber(observer, this.ish, this.resultSelector, this.concurrent);
2426
}
2527
}

src/operator/zip.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export function zipStatic<T, R>(...observables: Array<ObservableInput<any> | ((.
5757
if (typeof project === 'function') {
5858
observables.pop();
5959
}
60-
return new ArrayObservable(observables).lift<T, R>(new ZipOperator<T, R>(project));
60+
return new ArrayObservable(observables).lift(new ZipOperator(project));
6161
}
6262

6363
export class ZipOperator<T, R> implements Operator<T, R> {

0 commit comments

Comments
 (0)