Skip to content

Commit fa99594

Browse files
style(typings): Use typeof to capture typings for all static Observable methods
1 parent 9996d77 commit fa99594

File tree

1 file changed

+38
-27
lines changed

1 file changed

+38
-27
lines changed

src/Observable.ts

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,25 @@ import {Subject} from './Subject';
1212
import {Notification} from './Notification';
1313
import {rxSubscriber} from'./symbol/rxSubscriber';
1414

15+
import {combineLatest as combineLatestStatic} from './operator/combineLatest-static';
16+
import {concat as concatStatic} from './operator/concat-static';
17+
import {merge as mergeStatic} from './operator/merge-static';
18+
import {zip as zipStatic} from './operator/zip-static';
19+
import {BoundCallbackObservable} from './observable/bindCallback';
20+
import {DeferObservable} from './observable/defer';
21+
import {EmptyObservable} from './observable/empty';
22+
import {ForkJoinObservable} from './observable/forkJoin';
23+
import {FromObservable} from './observable/from';
24+
import {ArrayObservable} from './observable/fromArray';
25+
import {FromEventObservable} from './observable/fromEvent';
26+
import {FromEventPatternObservable} from './observable/fromEventPattern';
27+
import {PromiseObservable} from './observable/fromPromise';
28+
import {IntervalObservable} from './observable/interval';
29+
import {TimerObservable} from './observable/timer';
30+
import {RangeObservable} from './observable/range';
31+
import {InfiniteObservable} from './observable/never';
32+
import {ErrorObservable} from './observable/throw';
33+
1534
/**
1635
* A representation of any set of values over any amount of time. This the most basic building block
1736
* of RxJS.
@@ -156,33 +175,25 @@ export class Observable<T> implements CoreOperators<T> {
156175
}
157176

158177
// static method stubs
159-
static bindCallback: <T>(callbackFunc: Function, selector?: Function, scheduler?: Scheduler) => Function;
160-
static combineLatest: <T>(...observables: Array<Observable<any> |
161-
Array<Observable<any>> |
162-
((...values: Array<any>) => T) |
163-
Scheduler>) => Observable<T>;
164-
static concat: <T>(...observables: Array<Observable<any> | Scheduler>) => Observable<T>;
165-
static defer: <T>(observableFactory: () => Observable<T>) => Observable<T>;
166-
static empty: <T>(scheduler?: Scheduler) => Observable<T>;
167-
static forkJoin: (...sources: Array<Observable<any> |
168-
Array<Observable<any>> |
169-
Promise<any> |
170-
((...values: Array<any>) => any)>) => Observable<any>;
171-
static from: <T>(iterable: any, scheduler?: Scheduler) => Observable<T>;
172-
static fromArray: <T>(array: T[], scheduler?: Scheduler) => Observable<T>;
173-
static fromEvent: <T>(element: any, eventName: string, selector?: (...args: Array<any>) => T) => Observable<T>;
174-
static fromEventPattern: <T>(addHandler: (handler: Function) => void,
175-
removeHandler: (handler: Function) => void,
176-
selector?: (...args: Array<any>) => T) => Observable<T>;
177-
static fromPromise: <T>(promise: Promise<T>, scheduler?: Scheduler) => Observable<T>;
178-
static interval: (interval: number, scheduler?: Scheduler) => Observable<number>;
179-
static merge: <T>(...observables: Array<Observable<any> | Scheduler | number>) => Observable<T>;
180-
static never: <T>() => Observable<T>;
181-
static of: <T>(...values: Array<T | Scheduler>) => Observable<T>;
182-
static range: (start: number, end: number, scheduler?: Scheduler) => Observable<number>;
183-
static throw: <T>(error: T) => Observable<T>;
184-
static timer: (dueTime?: number | Date, period?: number | Scheduler, scheduler?: Scheduler) => Observable<number>;
185-
static zip: <T>(...observables: Array<Observable<any> | ((...values: Array<any>) => T)>) => Observable<T>;
178+
static bindCallback: typeof BoundCallbackObservable.create;
179+
static combineLatest: typeof combineLatestStatic;
180+
static concat: typeof concatStatic;
181+
static defer: typeof DeferObservable.create;
182+
static empty: typeof EmptyObservable.create;
183+
static forkJoin: typeof ForkJoinObservable.create;
184+
static from: typeof FromObservable.create;
185+
static fromArray: typeof ArrayObservable.create;
186+
static fromEvent: typeof FromEventObservable.create;
187+
static fromEventPattern: typeof FromEventPatternObservable.create;
188+
static fromPromise: typeof PromiseObservable.create;
189+
static interval: typeof IntervalObservable.create;
190+
static merge: typeof mergeStatic;
191+
static never: typeof InfiniteObservable.create;
192+
static of: typeof ArrayObservable.of;
193+
static range: typeof RangeObservable.create;
194+
static throw: typeof ErrorObservable.create;
195+
static timer: typeof TimerObservable.create;
196+
static zip: typeof zipStatic;
186197

187198
// core operators
188199
buffer: (closingNotifier: Observable<any>) => Observable<T[]>;

0 commit comments

Comments
 (0)