Skip to content

Commit 04a6085

Browse files
david-driscolldavid-driscoll
committed
refactor(patches): move static observable stubs from Observable.ts to patch files
1 parent 7b6da90 commit 04a6085

25 files changed

+133
-88
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
"systemjs": "^0.19.6",
127127
"systemjs-builder": "^0.10.6",
128128
"tslint": "3.3.0-dev.2",
129-
"typescript": "1.9.0-dev.20160128",
129+
"typescript": "1.9.0-dev.20160202",
130130
"validate-commit-msg": "1.1.1",
131131
"watch": "0.16.0",
132132
"watchify": "3.7.0",

‎src/Observable.ts

+1-44
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,7 @@ import {toSubscriber} from './util/toSubscriber';
1414
import {tryCatch} from './util/tryCatch';
1515
import {errorObject} from './util/errorObject';
1616

17-
import {combineLatestStatic} from './operator/combineLatest';
18-
import {concatStatic} from './operator/concat';
19-
import {mergeStatic} from './operator/merge';
20-
import {zipStatic} from './operator/zip';
21-
import {BoundCallbackObservable} from './observable/BoundCallbackObservable';
22-
import {BoundNodeCallbackObservable} from './observable/BoundNodeCallbackObservable';
23-
import {DeferObservable} from './observable/DeferObservable';
24-
import {EmptyObservable} from './observable/EmptyObservable';
25-
import {ForkJoinObservable} from './observable/ForkJoinObservable';
26-
import {FromObservable} from './observable/FromObservable';
27-
import {ArrayObservable} from './observable/ArrayObservable';
28-
import {FromEventObservable} from './observable/FromEventObservable';
29-
import {FromEventPatternObservable} from './observable/FromEventPatternObservable';
30-
import {PromiseObservable} from './observable/PromiseObservable';
31-
import {IntervalObservable} from './observable/IntervalObservable';
32-
import {TimerObservable} from './observable/TimerObservable';
33-
import {raceStatic} from './operator/race';
34-
import {RangeObservable} from './observable/RangeObservable';
35-
import {NeverObservable} from './observable/NeverObservable';
3617
import {ErrorObservable} from './observable/ErrorObservable';
37-
import {AjaxCreationMethod} from './observable/dom/AjaxObservable';
38-
import {WebSocketSubject} from './observable/dom/WebSocketSubject';
3918

4019
import {CombineLatestSignature} from './operator/combineLatest';
4120

@@ -167,30 +146,8 @@ export class Observable<T> implements CoreOperators<T> {
167146
return this.source.subscribe(subscriber);
168147
}
169148

170-
// static method stubs
171-
static ajax: AjaxCreationMethod;
172-
static bindCallback: typeof BoundCallbackObservable.create;
173-
static bindNodeCallback: typeof BoundNodeCallbackObservable.create;
174-
static combineLatest: typeof combineLatestStatic;
175-
static concat: typeof concatStatic;
176-
static defer: typeof DeferObservable.create;
177-
static empty: typeof EmptyObservable.create;
178-
static forkJoin: typeof ForkJoinObservable.create;
179-
static from: typeof FromObservable.create;
180-
static fromArray: typeof ArrayObservable.create;
181-
static fromEvent: typeof FromEventObservable.create;
182-
static fromEventPattern: typeof FromEventPatternObservable.create;
183-
static fromPromise: typeof PromiseObservable.create;
184-
static interval: typeof IntervalObservable.create;
185-
static merge: typeof mergeStatic;
186-
static never: typeof NeverObservable.create;
187-
static of: typeof ArrayObservable.of;
188-
static race: typeof raceStatic;
189-
static range: typeof RangeObservable.create;
149+
// Throw is the special snow flake, the compiler sees it as a reserved word
190150
static throw: typeof ErrorObservable.create;
191-
static timer: typeof TimerObservable.create;
192-
static webSocket: typeof WebSocketSubject.create;
193-
static zip: typeof zipStatic;
194151

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

‎src/Rx.ts

+20-20
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,26 @@ import {Observable} from './Observable';
88

99
// statics
1010
/* tslint:disable:no-use-before-declare */
11-
import './add/observable/combineLatest';
12-
import './add/observable/concat';
13-
import './add/observable/merge';
14-
import './add/observable/race';
15-
import './add/observable/bindCallback';
16-
import './add/observable/bindNodeCallback';
17-
import './add/observable/defer';
18-
import './add/observable/empty';
19-
import './add/observable/forkJoin';
20-
import './add/observable/from';
21-
import './add/observable/fromArray';
22-
import './add/observable/fromEvent';
23-
import './add/observable/fromEventPattern';
24-
import './add/observable/fromPromise';
25-
import './add/observable/interval';
26-
import './add/observable/never';
27-
import './add/observable/range';
28-
import './add/observable/throw';
29-
import './add/observable/timer';
30-
import './add/observable/zip';
11+
import './add/observable/combineLatest'; export * from './add/observable/combineLatest';
12+
import './add/observable/concat'; export * from './add/observable/concat';
13+
import './add/observable/merge'; export * from './add/observable/merge';
14+
import './add/observable/race'; export * from './add/observable/race';
15+
import './add/observable/bindCallback'; export * from './add/observable/bindCallback';
16+
import './add/observable/bindNodeCallback'; export * from './add/observable/bindNodeCallback';
17+
import './add/observable/defer'; export * from './add/observable/defer';
18+
import './add/observable/empty'; export * from './add/observable/empty';
19+
import './add/observable/forkJoin'; export * from './add/observable/forkJoin';
20+
import './add/observable/from'; export * from './add/observable/from';
21+
import './add/observable/fromArray'; export * from './add/observable/fromArray';
22+
import './add/observable/fromEvent'; export * from './add/observable/fromEvent';
23+
import './add/observable/fromEventPattern'; export * from './add/observable/fromEventPattern';
24+
import './add/observable/fromPromise'; export * from './add/observable/fromPromise';
25+
import './add/observable/interval'; export * from './add/observable/interval';
26+
import './add/observable/never'; export * from './add/observable/never';
27+
import './add/observable/range'; export * from './add/observable/range';
28+
import './add/observable/throw'; export * from './add/observable/throw';
29+
import './add/observable/timer'; export * from './add/observable/timer';
30+
import './add/observable/zip'; export * from './add/observable/zip';
3131

3232
//operators
3333
import './add/operator/buffer';

‎src/add/observable/bindCallback.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {BoundCallbackObservable} from '../../observable/BoundCallbackObservable'
33

44
Observable.bindCallback = BoundCallbackObservable.create;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let bindCallback: typeof BoundCallbackObservable.create;
9+
}
10+
}

‎src/add/observable/bindNodeCallback.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {BoundNodeCallbackObservable} from '../../observable/BoundNodeCallbackObs
33

44
Observable.bindNodeCallback = BoundNodeCallbackObservable.create;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let bindNodeCallback: typeof BoundNodeCallbackObservable.create;
9+
}
10+
}

‎src/add/observable/combineLatest.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {combineLatestStatic} from '../../operator/combineLatest';
33

44
Observable.combineLatest = combineLatestStatic;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let combineLatest: typeof combineLatestStatic;
9+
}
10+
}

‎src/add/observable/concat.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@ import {concatStatic} from '../../operator/concat';
44

55
Observable.concat = concatStatic;
66

7-
export var _void: void;
7+
declare module '../../Observable' {
8+
module Observable {
9+
export let concat: typeof concatStatic;
10+
}
11+
}

‎src/add/observable/defer.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {DeferObservable} from '../../observable/DeferObservable';
33

44
Observable.defer = DeferObservable.create;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let defer: typeof DeferObservable.create;
9+
}
10+
}

‎src/add/observable/dom/ajax.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@ import {AjaxObservable} from '../../../observable/dom/AjaxObservable';
44

55
Observable.ajax = AjaxObservable.create;
66

7-
export var _void: void;
7+
declare module '../../../Observable' {
8+
module Observable {
9+
export let ajax: typeof AjaxObservable.create;
10+
}
11+
}

‎src/add/observable/dom/webSocket.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@ import {WebSocketSubject} from '../../../observable/dom/WebSocketSubject';
44

55
Observable.webSocket = WebSocketSubject.create;
66

7-
export var _void: void;
7+
declare module '../../../Observable' {
8+
module Observable {
9+
export let webSocket: typeof WebSocketSubject.create;
10+
}
11+
}

‎src/add/observable/empty.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {EmptyObservable} from '../../observable/EmptyObservable';
33

44
Observable.empty = EmptyObservable.create;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let empty: typeof EmptyObservable.create;
9+
}
10+
}

‎src/add/observable/forkJoin.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {ForkJoinObservable} from '../../observable/ForkJoinObservable';
33

44
Observable.forkJoin = ForkJoinObservable.create;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let forkJoin: typeof ForkJoinObservable.create;
9+
}
10+
}

‎src/add/observable/from.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {FromObservable} from '../../observable/FromObservable';
33

44
Observable.from = FromObservable.create;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let from: typeof FromObservable.create;
9+
}
10+
}

‎src/add/observable/fromArray.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import {Observable} from '../../Observable';
22
import {ArrayObservable} from '../../observable/ArrayObservable';
3+
import './of';
34

45
Observable.fromArray = ArrayObservable.create;
5-
Observable.of = ArrayObservable.of;
66

7-
export var _void: void;
7+
declare module '../../Observable' {
8+
module Observable {
9+
export let fromArray: typeof ArrayObservable.create;
10+
}
11+
}

‎src/add/observable/fromEvent.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {FromEventObservable} from '../../observable/FromEventObservable';
33

44
Observable.fromEvent = FromEventObservable.create;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let fromEvent: typeof FromEventObservable.create;
9+
}
10+
}

‎src/add/observable/fromEventPattern.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {FromEventPatternObservable} from '../../observable/FromEventPatternObser
33

44
Observable.fromEventPattern = FromEventPatternObservable.create;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let fromEventPattern: typeof FromEventPatternObservable.create;
9+
}
10+
}

‎src/add/observable/fromPromise.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {PromiseObservable} from '../../observable/PromiseObservable';
33

44
Observable.fromPromise = PromiseObservable.create;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let fromPromise: typeof PromiseObservable.create;
9+
}
10+
}

‎src/add/observable/interval.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {IntervalObservable} from '../../observable/IntervalObservable';
33

44
Observable.interval = IntervalObservable.create;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let interval: typeof IntervalObservable.create;
9+
}
10+
}

‎src/add/observable/merge.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@ import {mergeStatic} from '../../operator/merge';
44

55
Observable.merge = mergeStatic;
66

7-
export var _void: void;
7+
declare module '../../Observable' {
8+
module Observable {
9+
export let merge: typeof mergeStatic;
10+
}
11+
}

‎src/add/observable/never.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {NeverObservable} from '../../observable/NeverObservable';
33

44
Observable.never = NeverObservable.create;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let never: typeof NeverObservable.create;
9+
}
10+
}

‎src/add/observable/of.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {ArrayObservable} from '../../observable/ArrayObservable';
33

44
Observable.of = ArrayObservable.of;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let of: typeof ArrayObservable.of;
9+
}
10+
}

‎src/add/observable/race.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {raceStatic} from '../../operator/race';
33

44
Observable.race = raceStatic;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let race: typeof raceStatic;
9+
}
10+
}

‎src/add/observable/range.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {RangeObservable} from '../../observable/RangeObservable';
33

44
Observable.range = RangeObservable.create;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let range: typeof RangeObservable.create;
9+
}
10+
}

‎src/add/observable/timer.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {TimerObservable} from '../../observable/TimerObservable';
33

44
Observable.timer = TimerObservable.create;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let timer: typeof TimerObservable.create;
9+
}
10+
}

‎src/add/observable/zip.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ import {zipStatic} from '../../operator/zip';
33

44
Observable.zip = zipStatic;
55

6-
export var _void: void;
6+
declare module '../../Observable' {
7+
module Observable {
8+
export let zip: typeof zipStatic;
9+
}
10+
}

0 commit comments

Comments
 (0)