refactor(observables): modularize Observable statics

Author: robwormald

src/Rx.KitchenSink.ts

@@ -17,64 +17,26 @@ export interface KitchenSinkOperators<T> extends CoreOperators<T> {
                        projectResult?: (x: T, y: any, ix: number, iy: number) => R) => Observable<R>;
 }
 
-// operators
+// statics
 /* tslint:disable:no-use-before-declare */
-import {combineLatest as combineLatestStatic} from './operators/combineLatest-static';
-Observable.combineLatest = combineLatestStatic;
-
-import {concat as concatStatic} from './operators/concat-static';
-Observable.concat = concatStatic;
-
-import {merge as mergeStatic} from './operators/merge-static';
-Observable.merge = mergeStatic;
-/* tslint:enable:no-use-before-declare */
-
-import {DeferObservable} from './observables/DeferObservable';
-Observable.defer = DeferObservable.create;
-
-import {EmptyObservable} from './observables/EmptyObservable';
-Observable.empty = EmptyObservable.create;
-
-import {ForkJoinObservable} from './observables/ForkJoinObservable';
-Observable.forkJoin = ForkJoinObservable.create;
-
-import {FromObservable} from './observables/FromObservable';
-Observable.from = FromObservable.create;
-
-import {ArrayObservable} from './observables/ArrayObservable';
-Observable.fromArray = ArrayObservable.create;
-
-import {FromEventObservable} from './observables/FromEventObservable';
-Observable.fromEvent = FromEventObservable.create;
-
-import {FromEventPatternObservable} from './observables/FromEventPatternObservable';
-Observable.fromEventPattern = FromEventPatternObservable.create;
-
-import {PromiseObservable} from './observables/PromiseObservable';
-Observable.fromPromise = PromiseObservable.create;
-
-import {CallbackObservable} from './observables/CallbackObservable';
-Observable.fromCallback = CallbackObservable.create;
-
-import {IntervalObservable} from './observables/IntervalObservable';
-Observable.interval = IntervalObservable.create;
-
-import {InfiniteObservable} from './observables/InfiniteObservable';
-Observable.never = InfiniteObservable.create;
-
-Observable.of = ArrayObservable.of;
-
-import {RangeObservable} from './observables/RangeObservable';
-Observable.range = RangeObservable.create;
-
-import {ErrorObservable} from './observables/ErrorObservable';
-Observable.throw = ErrorObservable.create;
-
-import {TimerObservable} from './observables/TimerObservable';
-Observable.timer = TimerObservable.create;
-
-import {zip as zipStatic} from './operators/zip-static';
-Observable.zip = zipStatic;
+import './operators/combineLatest-static';
+import './operators/concat-static';
+import './operators/merge-static';
+import './observables/DeferObservable';
+import './observables/EmptyObservable';
+import './observables/ForkJoinObservable';
+import './observables/FromObservable';
+import './observables/ArrayObservable';
+import './observables/FromEventObservable';
+import './observables/FromEventPatternObservable';
+import './observables/PromiseObservable';
+import './observables/CallbackObservable';
+import './observables/IntervalObservable';
+import './observables/InfiniteObservable';
+import './observables/RangeObservable';
+import './observables/ErrorObservable';
+import './observables/TimerObservable';
+import './operators/zip-static';
 
 // Operators
 import './operators/buffer';

src/Rx.ts

@@ -1,63 +1,25 @@
 import {Observable} from './Observable';
 
-// operators
+// statics
 /* tslint:disable:no-use-before-declare */
-import {combineLatest as combineLatestStatic} from './operators/combineLatest-static';
-Observable.combineLatest = combineLatestStatic;
-
-import {concat as concatStatic} from './operators/concat-static';
-Observable.concat = concatStatic;
-
-import {merge as mergeStatic} from './operators/merge-static';
-Observable.merge = mergeStatic;
-/* tslint:enable:no-use-before-declare */
-
-import {DeferObservable} from './observables/DeferObservable';
-Observable.defer = DeferObservable.create;
-
-import {EmptyObservable} from './observables/EmptyObservable';
-Observable.empty = EmptyObservable.create;
-
-import {ForkJoinObservable} from './observables/ForkJoinObservable';
-Observable.forkJoin = ForkJoinObservable.create;
-
-import {FromObservable} from './observables/FromObservable';
-Observable.from = FromObservable.create;
-
-import {ArrayObservable} from './observables/ArrayObservable';
-Observable.fromArray = ArrayObservable.create;
-
-import {FromEventObservable} from './observables/FromEventObservable';
-Observable.fromEvent = FromEventObservable.create;
-
-import {FromEventPatternObservable} from './observables/FromEventPatternObservable';
-Observable.fromEventPattern = FromEventPatternObservable.create;
-
-import {PromiseObservable} from './observables/PromiseObservable';
-Observable.fromPromise = PromiseObservable.create;
-
-import {CallbackObservable} from './observables/CallbackObservable';
-Observable.fromCallback = CallbackObservable.create;
-
-import {IntervalObservable} from './observables/IntervalObservable';
-Observable.interval = IntervalObservable.create;
-
-import {InfiniteObservable} from './observables/InfiniteObservable';
-Observable.never = InfiniteObservable.create;
-
-Observable.of = ArrayObservable.of;
-
-import {RangeObservable} from './observables/RangeObservable';
-Observable.range = RangeObservable.create;
-
-import {ErrorObservable} from './observables/ErrorObservable';
-Observable.throw = ErrorObservable.create;
-
-import {TimerObservable} from './observables/TimerObservable';
-Observable.timer = TimerObservable.create;
-
-import {zip as zipStatic} from './operators/zip-static';
-Observable.zip = zipStatic;
+import './operators/combineLatest-static';
+import './operators/concat-static';
+import './operators/merge-static';
+import './observables/DeferObservable';
+import './observables/EmptyObservable';
+import './observables/ForkJoinObservable';
+import './observables/FromObservable';
+import './observables/ArrayObservable';
+import './observables/FromEventObservable';
+import './observables/FromEventPatternObservable';
+import './observables/PromiseObservable';
+import './observables/CallbackObservable';
+import './observables/IntervalObservable';
+import './observables/InfiniteObservable';
+import './observables/RangeObservable';
+import './observables/ErrorObservable';
+import './observables/TimerObservable';
+import './operators/zip-static';
 
 //operators
 import './operators/buffer';

src/observables/ArrayObservable.ts

@@ -78,3 +78,6 @@ export class ArrayObservable<T> extends Observable<T> {
     }
   }
 }
+
+Observable.fromArray = ArrayObservable.create;
+Observable.of = ArrayObservable.of;

src/observables/CallbackObservable.ts

@@ -108,3 +108,5 @@ function dispatchNext({ value, subscriber }) {
 function dispatchError({ err, subscriber }) {
   subscriber.error(err);
 }
+
+Observable.fromCallback = CallbackObservable.create;

src/observables/DeferObservable.ts

@@ -22,3 +22,5 @@ export class DeferObservable<T> extends Observable<T> {
     }
   }
 }
+
+Observable.defer = DeferObservable.create;

src/observables/EmptyObservable.ts

@@ -26,3 +26,5 @@ export class EmptyObservable<T> extends Observable<T> {
     }
   }
 }
+
+Observable.empty = EmptyObservable.create;

src/observables/ErrorObservable.ts

@@ -29,3 +29,5 @@ export class ErrorObservable<T> extends Observable<T> {
     }
   }
 }
+
+Observable.throw = ErrorObservable.create;

src/observables/ForkJoinObservable.ts

@@ -101,3 +101,5 @@ function emptyArray(len: number): any[] {
   }
   return arr;
 }
+
+Observable.forkJoin = ForkJoinObservable.create;

src/observables/FromEventObservable.ts

@@ -50,4 +50,6 @@ export class FromEventObservable<T, R> extends Observable<T> {
 
     FromEventObservable.setupSubscription(sourceObj, eventName, handler, subscriber);
   }
-}
+}
+
+Observable.fromEvent = FromEventObservable.create;

src/observables/FromEventPatternObservable.ts

@@ -41,3 +41,5 @@ export class FromEventPatternObservable<T, R> extends Observable<T> {
     }));
   }
 }
+
+Observable.fromEventPattern = FromEventPatternObservable.create;

src/observables/FromObservable.ts

@@ -45,4 +45,6 @@ export class FromObservable<T> extends Observable<T> {
       return ish[$$observable]().subscribe(new ObserveOnSubscriber(subscriber, scheduler, 0));
     }
   }
-}
+}
+
+Observable.from = FromObservable.create;

src/observables/InfiniteObservable.ts

@@ -15,3 +15,5 @@ export class InfiniteObservable<T> extends Observable<T> {
     noop();
   }
 }
+
+Observable.never = InfiniteObservable.create;

src/observables/IntervalObservable.ts

@@ -43,3 +43,5 @@ export class IntervalObservable<T> extends Observable<T> {
     }));
   }
 }
+
+Observable.interval = IntervalObservable.create;

src/observables/PromiseObservable.ts

@@ -66,3 +66,5 @@ function dispatchNext({ value, subscriber }) {
 function dispatchError({ err, subscriber }) {
   subscriber.error(err);
 }
+
+Observable.fromPromise = PromiseObservable.create;

src/observables/RangeObservable.ts

@@ -64,3 +64,5 @@ export class RangeObservable<T> extends Observable<T> {
     }
   }
 }
+
+Observable.range = RangeObservable.create;

src/observables/TimerObservable.ts

@@ -67,3 +67,5 @@ export class TimerObservable<T> extends Observable<T> {
     subscriber.add(scheduler.schedule(TimerObservable.dispatch, dueTime, { index, period, subscriber }));
   }
 }
+
+Observable.timer = TimerObservable.create;