Skip to content

Commit 1905fba

Browse files
masaeedumasaeedu
committed
refactor(patches): update Rx.ts to re-export all patch files
Change all `import './add/operator/foo'` in Rx.ts to `export * from './add/operator/foo'`, in order to ensure the module augmentations appear in the generated Rx.d.ts file. Also remove `export var _void`s to avoid conflicts.
1 parent b0511be commit 1905fba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+217
-451
lines changed

‎src/Rx.ts

Lines changed: 100 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -8,108 +8,108 @@ 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+
export * from './add/observable/combineLatest';
12+
export * from './add/observable/concat';
13+
export * from './add/observable/merge';
14+
export * from './add/observable/race';
15+
export * from './add/observable/bindCallback';
16+
export * from './add/observable/bindNodeCallback';
17+
export * from './add/observable/defer';
18+
export * from './add/observable/empty';
19+
export * from './add/observable/forkJoin';
20+
export * from './add/observable/from';
21+
export * from './add/observable/fromArray';
22+
export * from './add/observable/fromEvent';
23+
export * from './add/observable/fromEventPattern';
24+
export * from './add/observable/fromPromise';
25+
export * from './add/observable/interval';
26+
export * from './add/observable/never';
27+
export * from './add/observable/range';
28+
export * from './add/observable/throw';
29+
export * from './add/observable/timer';
30+
export * from './add/observable/zip';
3131

3232
//operators
33-
import './add/operator/buffer';
34-
import './add/operator/bufferCount';
35-
import './add/operator/bufferTime';
36-
import './add/operator/bufferToggle';
37-
import './add/operator/bufferWhen';
38-
import './add/operator/catch';
39-
import './add/operator/combineAll';
40-
import './add/operator/combineLatest';
41-
import './add/operator/concat';
42-
import './add/operator/concatAll';
43-
import './add/operator/concatMap';
44-
import './add/operator/concatMapTo';
45-
import './add/operator/count';
46-
import './add/operator/dematerialize';
47-
import './add/operator/debounce';
48-
import './add/operator/debounceTime';
49-
import './add/operator/defaultIfEmpty';
50-
import './add/operator/delay';
51-
import './add/operator/distinctUntilChanged';
52-
import './add/operator/do';
53-
import './add/operator/expand';
54-
import './add/operator/filter';
55-
import './add/operator/finally';
56-
import './add/operator/first';
57-
import './add/operator/groupBy';
58-
import './add/operator/ignoreElements';
59-
import './add/operator/every';
60-
import './add/operator/last';
61-
import './add/operator/let';
62-
import './add/operator/map';
63-
import './add/operator/mapTo';
64-
import './add/operator/materialize';
65-
import './add/operator/merge';
66-
import './add/operator/mergeAll';
67-
import './add/operator/mergeMap';
68-
import './add/operator/mergeMapTo';
69-
import './add/operator/multicast';
70-
import './add/operator/observeOn';
71-
import './add/operator/partition';
72-
import './add/operator/pluck';
73-
import './add/operator/publish';
74-
import './add/operator/publishBehavior';
75-
import './add/operator/publishReplay';
76-
import './add/operator/publishLast';
77-
import './add/operator/race';
78-
import './add/operator/reduce';
79-
import './add/operator/repeat';
80-
import './add/operator/retry';
81-
import './add/operator/retryWhen';
82-
import './add/operator/sample';
83-
import './add/operator/sampleTime';
84-
import './add/operator/scan';
85-
import './add/operator/share';
86-
import './add/operator/single';
87-
import './add/operator/skip';
88-
import './add/operator/skipUntil';
89-
import './add/operator/skipWhile';
90-
import './add/operator/startWith';
91-
import './add/operator/subscribeOn';
92-
import './add/operator/switch';
93-
import './add/operator/switchMap';
94-
import './add/operator/switchMapTo';
95-
import './add/operator/take';
96-
import './add/operator/takeLast';
97-
import './add/operator/takeUntil';
98-
import './add/operator/takeWhile';
99-
import './add/operator/throttle';
100-
import './add/operator/throttleTime';
101-
import './add/operator/timeout';
102-
import './add/operator/timeoutWith';
103-
import './add/operator/toArray';
104-
import './add/operator/toPromise';
105-
import './add/operator/window';
106-
import './add/operator/windowCount';
107-
import './add/operator/windowTime';
108-
import './add/operator/windowToggle';
109-
import './add/operator/windowWhen';
110-
import './add/operator/withLatestFrom';
111-
import './add/operator/zip';
112-
import './add/operator/zipAll';
33+
export * from './add/operator/buffer';
34+
export * from './add/operator/bufferCount';
35+
export * from './add/operator/bufferTime';
36+
export * from './add/operator/bufferToggle';
37+
export * from './add/operator/bufferWhen';
38+
export * from './add/operator/catch';
39+
export * from './add/operator/combineAll';
40+
export * from './add/operator/combineLatest';
41+
export * from './add/operator/concat';
42+
export * from './add/operator/concatAll';
43+
export * from './add/operator/concatMap';
44+
export * from './add/operator/concatMapTo';
45+
export * from './add/operator/count';
46+
export * from './add/operator/dematerialize';
47+
export * from './add/operator/debounce';
48+
export * from './add/operator/debounceTime';
49+
export * from './add/operator/defaultIfEmpty';
50+
export * from './add/operator/delay';
51+
export * from './add/operator/distinctUntilChanged';
52+
export * from './add/operator/do';
53+
export * from './add/operator/expand';
54+
export * from './add/operator/filter';
55+
export * from './add/operator/finally';
56+
export * from './add/operator/first';
57+
export * from './add/operator/groupBy';
58+
export * from './add/operator/ignoreElements';
59+
export * from './add/operator/every';
60+
export * from './add/operator/last';
61+
export * from './add/operator/let';
62+
export * from './add/operator/map';
63+
export * from './add/operator/mapTo';
64+
export * from './add/operator/materialize';
65+
export * from './add/operator/merge';
66+
export * from './add/operator/mergeAll';
67+
export * from './add/operator/mergeMap';
68+
export * from './add/operator/mergeMapTo';
69+
export * from './add/operator/multicast';
70+
export * from './add/operator/observeOn';
71+
export * from './add/operator/partition';
72+
export * from './add/operator/pluck';
73+
export * from './add/operator/publish';
74+
export * from './add/operator/publishBehavior';
75+
export * from './add/operator/publishReplay';
76+
export * from './add/operator/publishLast';
77+
export * from './add/operator/race';
78+
export * from './add/operator/reduce';
79+
export * from './add/operator/repeat';
80+
export * from './add/operator/retry';
81+
export * from './add/operator/retryWhen';
82+
export * from './add/operator/sample';
83+
export * from './add/operator/sampleTime';
84+
export * from './add/operator/scan';
85+
export * from './add/operator/share';
86+
export * from './add/operator/single';
87+
export * from './add/operator/skip';
88+
export * from './add/operator/skipUntil';
89+
export * from './add/operator/skipWhile';
90+
export * from './add/operator/startWith';
91+
export * from './add/operator/subscribeOn';
92+
export * from './add/operator/switch';
93+
export * from './add/operator/switchMap';
94+
export * from './add/operator/switchMapTo';
95+
export * from './add/operator/take';
96+
export * from './add/operator/takeLast';
97+
export * from './add/operator/takeUntil';
98+
export * from './add/operator/takeWhile';
99+
export * from './add/operator/throttle';
100+
export * from './add/operator/throttleTime';
101+
export * from './add/operator/timeout';
102+
export * from './add/operator/timeoutWith';
103+
export * from './add/operator/toArray';
104+
export * from './add/operator/toPromise';
105+
export * from './add/operator/window';
106+
export * from './add/operator/windowCount';
107+
export * from './add/operator/windowTime';
108+
export * from './add/operator/windowToggle';
109+
export * from './add/operator/windowWhen';
110+
export * from './add/operator/withLatestFrom';
111+
export * from './add/operator/zip';
112+
export * from './add/operator/zipAll';
113113

114114
/* tslint:disable:no-unused-variable */
115115
import {Operator} from './Operator';

‎src/add/observable/bindCallback.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import {Observable} from '../../Observable';
22
import {BoundCallbackObservable} from '../../observable/BoundCallbackObservable';
33

4-
Observable.bindCallback = BoundCallbackObservable.create;
5-
6-
export var _void: void;
4+
Observable.bindCallback = BoundCallbackObservable.create;

‎src/add/observable/bindNodeCallback.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import {Observable} from '../../Observable';
22
import {BoundNodeCallbackObservable} from '../../observable/BoundNodeCallbackObservable';
33

4-
Observable.bindNodeCallback = BoundNodeCallbackObservable.create;
5-
6-
export var _void: void;
4+
Observable.bindNodeCallback = BoundNodeCallbackObservable.create;

‎src/add/observable/combineLatest.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import {Observable} from '../../Observable';
22
import {combineLatestStatic} from '../../operator/combineLatest';
33

4-
Observable.combineLatest = combineLatestStatic;
5-
6-
export var _void: void;
4+
Observable.combineLatest = combineLatestStatic;

‎src/add/observable/concat.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22
import {Observable} from '../../Observable';
33
import {concatStatic} from '../../operator/concat';
44

5-
Observable.concat = concatStatic;
6-
7-
export var _void: void;
5+
Observable.concat = concatStatic;

‎src/add/observable/defer.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import {Observable} from '../../Observable';
22
import {DeferObservable} from '../../observable/DeferObservable';
33

4-
Observable.defer = DeferObservable.create;
5-
6-
export var _void: void;
4+
Observable.defer = DeferObservable.create;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22
import {Observable} from '../../../Observable';
33
import {AjaxObservable} from '../../../observable/dom/AjaxObservable';
44

5-
Observable.ajax = AjaxObservable.create;
6-
7-
export var _void: void;
5+
Observable.ajax = AjaxObservable.create;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22
import {Observable} from '../../../Observable';
33
import {WebSocketSubject} from '../../../observable/dom/WebSocketSubject';
44

5-
Observable.webSocket = WebSocketSubject.create;
6-
7-
export var _void: void;
5+
Observable.webSocket = WebSocketSubject.create;

‎src/add/observable/empty.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import {Observable} from '../../Observable';
22
import {EmptyObservable} from '../../observable/EmptyObservable';
33

4-
Observable.empty = EmptyObservable.create;
5-
6-
export var _void: void;
4+
Observable.empty = EmptyObservable.create;

‎src/add/observable/forkJoin.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import {Observable} from '../../Observable';
22
import {ForkJoinObservable} from '../../observable/ForkJoinObservable';
33

4-
Observable.forkJoin = ForkJoinObservable.create;
5-
6-
export var _void: void;
4+
Observable.forkJoin = ForkJoinObservable.create;

‎src/add/observable/from.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import {Observable} from '../../Observable';
22
import {FromObservable} from '../../observable/FromObservable';
33

4-
Observable.from = FromObservable.create;
5-
6-
export var _void: void;
4+
Observable.from = FromObservable.create;

‎src/add/observable/fromArray.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@ import {Observable} from '../../Observable';
22
import {ArrayObservable} from '../../observable/ArrayObservable';
33

44
Observable.fromArray = ArrayObservable.create;
5-
Observable.of = ArrayObservable.of;
6-
7-
export var _void: void;
5+
Observable.of = ArrayObservable.of;

‎src/add/observable/fromEvent.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import {Observable} from '../../Observable';
22
import {FromEventObservable} from '../../observable/FromEventObservable';
33

4-
Observable.fromEvent = FromEventObservable.create;
5-
6-
export var _void: void;
4+
Observable.fromEvent = FromEventObservable.create;

‎src/add/observable/fromEventPattern.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import {Observable} from '../../Observable';
22
import {FromEventPatternObservable} from '../../observable/FromEventPatternObservable';
33

4-
Observable.fromEventPattern = FromEventPatternObservable.create;
5-
6-
export var _void: void;
4+
Observable.fromEventPattern = FromEventPatternObservable.create;

‎src/add/observable/fromPromise.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import {Observable} from '../../Observable';
22
import {PromiseObservable} from '../../observable/PromiseObservable';
33

4-
Observable.fromPromise = PromiseObservable.create;
5-
6-
export var _void: void;
4+
Observable.fromPromise = PromiseObservable.create;

‎src/add/observable/interval.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import {Observable} from '../../Observable';
22
import {IntervalObservable} from '../../observable/IntervalObservable';
33

4-
Observable.interval = IntervalObservable.create;
5-
6-
export var _void: void;
4+
Observable.interval = IntervalObservable.create;

‎src/add/observable/merge.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22
import {Observable} from '../../Observable';
33
import {mergeStatic} from '../../operator/merge';
44

5-
Observable.merge = mergeStatic;
6-
7-
export var _void: void;
5+
Observable.merge = mergeStatic;

‎src/add/observable/never.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import {Observable} from '../../Observable';
22
import {NeverObservable} from '../../observable/NeverObservable';
33

4-
Observable.never = NeverObservable.create;
5-
6-
export var _void: void;
4+
Observable.never = NeverObservable.create;

‎src/add/observable/of.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import {Observable} from '../../Observable';
22
import {ArrayObservable} from '../../observable/ArrayObservable';
33

4-
Observable.of = ArrayObservable.of;
5-
6-
export var _void: void;
4+
Observable.of = ArrayObservable.of;

‎src/add/observable/race.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import {Observable} from '../../Observable';
22
import {raceStatic} from '../../operator/race';
33

4-
Observable.race = raceStatic;
5-
6-
export var _void: void;
4+
Observable.race = raceStatic;

0 commit comments

Comments
 (0)