refactor(patches): move static observable stubs from Observable.ts to…

… patch files
ReactiveX · Feb 4, 2016 · 2e6da38 · 2e6da38
1 parent 7b6da90
commit 2e6da38
Show file tree

Hide file tree

Showing 24 changed files with 113 additions and 68 deletions.
diff --git a/package.json b/package.json
@@ -126,7 +126,7 @@
     "systemjs": "^0.19.6",
     "systemjs-builder": "^0.10.6",
     "tslint": "3.3.0-dev.2",
-    "typescript": "1.9.0-dev.20160128",
+    "typescript": "1.9.0-dev.20160202",
     "validate-commit-msg": "1.1.1",
     "watch": "0.16.0",
     "watchify": "3.7.0",

diff --git a/src/Observable.ts b/src/Observable.ts
@@ -14,28 +14,7 @@ import {toSubscriber} from './util/toSubscriber';
 import {tryCatch} from './util/tryCatch';
 import {errorObject} from './util/errorObject';
 
-import {combineLatestStatic} from './operator/combineLatest';
-import {concatStatic} from './operator/concat';
-import {mergeStatic} from './operator/merge';
-import {zipStatic} from './operator/zip';
-import {BoundCallbackObservable} from './observable/BoundCallbackObservable';
-import {BoundNodeCallbackObservable} from './observable/BoundNodeCallbackObservable';
-import {DeferObservable} from './observable/DeferObservable';
-import {EmptyObservable} from './observable/EmptyObservable';
-import {ForkJoinObservable} from './observable/ForkJoinObservable';
-import {FromObservable} from './observable/FromObservable';
-import {ArrayObservable} from './observable/ArrayObservable';
-import {FromEventObservable} from './observable/FromEventObservable';
-import {FromEventPatternObservable} from './observable/FromEventPatternObservable';
-import {PromiseObservable} from './observable/PromiseObservable';
-import {IntervalObservable} from './observable/IntervalObservable';
-import {TimerObservable} from './observable/TimerObservable';
-import {raceStatic} from './operator/race';
-import {RangeObservable} from './observable/RangeObservable';
-import {NeverObservable} from './observable/NeverObservable';
 import {ErrorObservable} from './observable/ErrorObservable';
-import {AjaxCreationMethod} from './observable/dom/AjaxObservable';
-import {WebSocketSubject} from './observable/dom/WebSocketSubject';
 
 import {CombineLatestSignature} from './operator/combineLatest';
 
@@ -167,30 +146,8 @@ export class Observable<T> implements CoreOperators<T>  {
     return this.source.subscribe(subscriber);
   }
 
-  // static method stubs
-  static ajax: AjaxCreationMethod;
-  static bindCallback: typeof BoundCallbackObservable.create;
-  static bindNodeCallback: typeof BoundNodeCallbackObservable.create;
-  static combineLatest: typeof combineLatestStatic;
-  static concat: typeof concatStatic;
-  static defer: typeof DeferObservable.create;
-  static empty: typeof EmptyObservable.create;
-  static forkJoin: typeof ForkJoinObservable.create;
-  static from: typeof FromObservable.create;
-  static fromArray: typeof ArrayObservable.create;
-  static fromEvent: typeof FromEventObservable.create;
-  static fromEventPattern: typeof FromEventPatternObservable.create;
-  static fromPromise: typeof PromiseObservable.create;
-  static interval: typeof IntervalObservable.create;
-  static merge: typeof mergeStatic;
-  static never: typeof NeverObservable.create;
-  static of: typeof ArrayObservable.of;
-  static race: typeof raceStatic;
-  static range: typeof RangeObservable.create;
+  // Throw is the special snow flake, the compiler sees it as a reserved word
   static throw: typeof ErrorObservable.create;
-  static timer: typeof TimerObservable.create;
-  static webSocket: typeof WebSocketSubject.create;
-  static zip: typeof zipStatic;
 
   // core operators
   buffer: (closingNotifier: Observable<any>) => Observable<T[]>;

diff --git a/src/add/observable/bindCallback.ts b/src/add/observable/bindCallback.ts
@@ -3,4 +3,8 @@ import {BoundCallbackObservable} from '../../observable/BoundCallbackObservable'
 
 Observable.bindCallback = BoundCallbackObservable.create;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let bindCallback: typeof BoundCallbackObservable.create;
+  }
+}
diff --git a/src/add/observable/bindNodeCallback.ts b/src/add/observable/bindNodeCallback.ts
@@ -3,4 +3,8 @@ import {BoundNodeCallbackObservable} from '../../observable/BoundNodeCallbackObs
 
 Observable.bindNodeCallback = BoundNodeCallbackObservable.create;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let bindNodeCallback: typeof BoundNodeCallbackObservable.create;
+  }
+}
diff --git a/src/add/observable/combineLatest.ts b/src/add/observable/combineLatest.ts
@@ -3,4 +3,8 @@ import {combineLatestStatic} from '../../operator/combineLatest';
 
 Observable.combineLatest = combineLatestStatic;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let combineLatest: typeof combineLatestStatic;
+  }
+}
diff --git a/src/add/observable/concat.ts b/src/add/observable/concat.ts
@@ -4,4 +4,8 @@ import {concatStatic} from '../../operator/concat';
 
 Observable.concat = concatStatic;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let concat: typeof concatStatic;
+  }
+}
diff --git a/src/add/observable/defer.ts b/src/add/observable/defer.ts
@@ -3,4 +3,8 @@ import {DeferObservable} from '../../observable/DeferObservable';
 
 Observable.defer = DeferObservable.create;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let defer: typeof DeferObservable.create;
+  }
+}
diff --git a/src/add/observable/dom/ajax.ts b/src/add/observable/dom/ajax.ts
@@ -4,4 +4,8 @@ import {AjaxObservable} from '../../../observable/dom/AjaxObservable';
 
 Observable.ajax = AjaxObservable.create;
 
-export var _void: void;
+declare module '../../../Observable' {
+  namespace Observable {
+    export let ajax: typeof AjaxObservable.create;
+  }
+}
diff --git a/src/add/observable/dom/webSocket.ts b/src/add/observable/dom/webSocket.ts
@@ -4,4 +4,8 @@ import {WebSocketSubject} from '../../../observable/dom/WebSocketSubject';
 
 Observable.webSocket = WebSocketSubject.create;
 
-export var _void: void;
+declare module '../../../Observable' {
+  namespace Observable {
+    export let webSocket: typeof WebSocketSubject.create;
+  }
+}
diff --git a/src/add/observable/empty.ts b/src/add/observable/empty.ts
@@ -3,4 +3,8 @@ import {EmptyObservable} from '../../observable/EmptyObservable';
 
 Observable.empty = EmptyObservable.create;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let empty: typeof EmptyObservable.create;
+  }
+}
diff --git a/src/add/observable/forkJoin.ts b/src/add/observable/forkJoin.ts
@@ -3,4 +3,8 @@ import {ForkJoinObservable} from '../../observable/ForkJoinObservable';
 
 Observable.forkJoin = ForkJoinObservable.create;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let forkJoin: typeof ForkJoinObservable.create;
+  }
+}
diff --git a/src/add/observable/from.ts b/src/add/observable/from.ts
@@ -3,4 +3,8 @@ import {FromObservable} from '../../observable/FromObservable';
 
 Observable.from = FromObservable.create;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let from: typeof FromObservable.create;
+  }
+}
diff --git a/src/add/observable/fromArray.ts b/src/add/observable/fromArray.ts
@@ -1,7 +1,11 @@
 import {Observable} from '../../Observable';
 import {ArrayObservable} from '../../observable/ArrayObservable';
+import './of';
 
 Observable.fromArray = ArrayObservable.create;
-Observable.of = ArrayObservable.of;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let fromArray: typeof ArrayObservable.create;
+  }
+}
diff --git a/src/add/observable/fromEvent.ts b/src/add/observable/fromEvent.ts
@@ -3,4 +3,8 @@ import {FromEventObservable} from '../../observable/FromEventObservable';
 
 Observable.fromEvent = FromEventObservable.create;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let fromEvent: typeof FromEventObservable.create;
+  }
+}
diff --git a/src/add/observable/fromEventPattern.ts b/src/add/observable/fromEventPattern.ts
@@ -3,4 +3,8 @@ import {FromEventPatternObservable} from '../../observable/FromEventPatternObser
 
 Observable.fromEventPattern = FromEventPatternObservable.create;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let fromEventPattern: typeof FromEventPatternObservable.create;
+  }
+}
diff --git a/src/add/observable/fromPromise.ts b/src/add/observable/fromPromise.ts
@@ -3,4 +3,8 @@ import {PromiseObservable} from '../../observable/PromiseObservable';
 
 Observable.fromPromise = PromiseObservable.create;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let fromPromise: typeof PromiseObservable.create;
+  }
+}
diff --git a/src/add/observable/interval.ts b/src/add/observable/interval.ts
@@ -3,4 +3,8 @@ import {IntervalObservable} from '../../observable/IntervalObservable';
 
 Observable.interval = IntervalObservable.create;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let interval: typeof IntervalObservable.create;
+  }
+}
diff --git a/src/add/observable/merge.ts b/src/add/observable/merge.ts
@@ -4,4 +4,8 @@ import {mergeStatic} from '../../operator/merge';
 
 Observable.merge = mergeStatic;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let merge: typeof mergeStatic;
+  }
+}
diff --git a/src/add/observable/never.ts b/src/add/observable/never.ts
@@ -3,4 +3,8 @@ import {NeverObservable} from '../../observable/NeverObservable';
 
 Observable.never = NeverObservable.create;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let never: typeof NeverObservable.create;
+  }
+}
diff --git a/src/add/observable/of.ts b/src/add/observable/of.ts
@@ -3,4 +3,8 @@ import {ArrayObservable} from '../../observable/ArrayObservable';
 
 Observable.of = ArrayObservable.of;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let of: typeof ArrayObservable.of;
+  }
+}
diff --git a/src/add/observable/race.ts b/src/add/observable/race.ts
@@ -3,4 +3,8 @@ import {raceStatic} from '../../operator/race';
 
 Observable.race = raceStatic;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let race: typeof raceStatic;
+  }
+}
diff --git a/src/add/observable/range.ts b/src/add/observable/range.ts
@@ -3,4 +3,8 @@ import {RangeObservable} from '../../observable/RangeObservable';
 
 Observable.range = RangeObservable.create;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let range: typeof RangeObservable.create;
+  }
+}
diff --git a/src/add/observable/timer.ts b/src/add/observable/timer.ts
@@ -3,4 +3,8 @@ import {TimerObservable} from '../../observable/TimerObservable';
 
 Observable.timer = TimerObservable.create;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let timer: typeof TimerObservable.create;
+  }
+}
diff --git a/src/add/observable/zip.ts b/src/add/observable/zip.ts
@@ -3,4 +3,8 @@ import {zipStatic} from '../../operator/zip';
 
 Observable.zip = zipStatic;
 
-export var _void: void;
+declare module '../../Observable' {
+  namespace Observable {
+    export let zip: typeof zipStatic;
+  }
+}