Skip to content

Commit d99289f

Browse files
david-driscolldavid-driscoll
committed
refactor(build): standardized how Rx.KitchenSink and Rx.DOM are built
1 parent 817d635 commit d99289f

File tree

3 files changed

+8
-216
lines changed

3 files changed

+8
-216
lines changed

‎src/Rx.DOM.ts

Lines changed: 6 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -1,167 +1,22 @@
1-
/* tslint:disable:no-unused-variable */
2-
// Subject imported before Observable to bypass circular dependency issue since
3-
// Subject extends Observable and Observable references Subject in it's
4-
// definition
5-
import {Subject} from './Subject';
6-
/* tslint:enable:no-unused-variable */
7-
import {Observable} from './Observable';
8-
9-
// statics
10-
/* 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/bindCallback';
15-
import './add/observable/defer';
16-
import './add/observable/empty';
17-
import './add/observable/forkJoin';
18-
import './add/observable/from';
19-
import './add/observable/fromArray';
20-
import './add/observable/fromEvent';
21-
import './add/observable/fromEventPattern';
22-
import './add/observable/fromPromise';
23-
import './add/observable/interval';
24-
import './add/observable/never';
25-
import './add/observable/range';
26-
import './add/observable/throw';
27-
import './add/observable/timer';
28-
import './add/observable/zip';
1+
export * from './Rx';
292

303
import './add/observable/dom/ajax';
314
import './add/observable/dom/webSocket';
325

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

115-
/* tslint:disable:no-unused-variable */
116-
import {Subscription, UnsubscriptionError} from './Subscription';
117-
import {Subscriber} from './Subscriber';
118-
import {AsyncSubject} from './subject/AsyncSubject';
119-
import {ReplaySubject} from './subject/ReplaySubject';
120-
import {BehaviorSubject} from './subject/BehaviorSubject';
121-
import {ConnectableObservable} from './observable/ConnectableObservable';
122-
import {Notification} from './Notification';
123-
import {EmptyError} from './util/EmptyError';
124-
import {ArgumentOutOfRangeError} from './util/ArgumentOutOfRangeError';
125-
import {ObjectUnsubscribedError} from './util/ObjectUnsubscribedError';
8+
// Rebuild `Scheduler` for Rx.DOM
1269
import {asap} from './scheduler/asap';
12710
import {queue} from './scheduler/queue';
12811
import {animationFrame} from './scheduler/animationFrame';
12+
/* tslint:disable:no-unused-variable */
12913
import {AsapScheduler} from './scheduler/AsapScheduler';
130-
import {QueueScheduler} from './scheduler/QueueScheduler';
13114
import {AnimationFrameScheduler} from './scheduler/AnimationFrameScheduler';
132-
import {rxSubscriber} from './symbol/rxSubscriber';
133-
import {AjaxRequest, AjaxResponse, AjaxError, AjaxTimeoutError} from './observable/dom/AjaxObservable';
15+
import {QueueScheduler} from './scheduler/QueueScheduler';
13416
/* tslint:enable:no-unused-variable */
13517

136-
/* tslint:disable:no-var-keyword */
137-
var Scheduler = {
18+
export var Scheduler = {
13819
asap,
13920
queue,
14021
animationFrame
14122
};
142-
143-
var Symbol = {
144-
rxSubscriber
145-
};
146-
/* tslint:enable:no-var-keyword */
147-
148-
export {
149-
AjaxResponse,
150-
AjaxError,
151-
AjaxTimeoutError,
152-
Subject,
153-
Scheduler,
154-
Observable,
155-
Subscriber,
156-
Subscription,
157-
Symbol,
158-
AsyncSubject,
159-
ReplaySubject,
160-
BehaviorSubject,
161-
ConnectableObservable,
162-
Notification,
163-
EmptyError,
164-
ArgumentOutOfRangeError,
165-
ObjectUnsubscribedError,
166-
UnsubscriptionError
167-
};

‎src/Rx.KitchenSink.ts

Lines changed: 1 addition & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
/* tslint:disable:no-unused-variable */
2-
import {Subject} from './Subject';
3-
/* tslint:enable:no-unused-variable */
4-
import {Observable} from './Observable';
5-
import {SwitchFirstSignature} from './operator/exhaust';
6-
import {SwitchFirstMapSignature} from './operator/exhaustMap';
7-
8-
import './Rx';
1+
export * from './Rx';
92

103
// Operators
114
import './add/operator/distinct';
@@ -22,60 +15,3 @@ import './add/operator/mergeScan';
2215
import './add/operator/min';
2316
import './add/operator/pairwise';
2417
import './add/operator/timeInterval';
25-
26-
/* tslint:disable:no-unused-variable */
27-
import {Operator} from './Operator';
28-
import {Observer} from './Observer';
29-
import {Subscription, UnsubscriptionError} from './Subscription';
30-
import {Subscriber} from './Subscriber';
31-
import {AsyncSubject} from './subject/AsyncSubject';
32-
import {ReplaySubject} from './subject/ReplaySubject';
33-
import {BehaviorSubject} from './subject/BehaviorSubject';
34-
import {ConnectableObservable} from './observable/ConnectableObservable';
35-
import {Notification} from './Notification';
36-
import {EmptyError} from './util/EmptyError';
37-
import {ObjectUnsubscribedError} from './util/ObjectUnsubscribedError';
38-
import {ArgumentOutOfRangeError} from './util/ArgumentOutOfRangeError';
39-
import {asap} from './scheduler/asap';
40-
import {queue} from './scheduler/queue';
41-
import {AsapScheduler} from './scheduler/AsapScheduler';
42-
import {QueueScheduler} from './scheduler/QueueScheduler';
43-
import {TimeInterval} from './operator/timeInterval';
44-
import {TestScheduler} from './testing/TestScheduler';
45-
import {VirtualTimeScheduler} from './scheduler/VirtualTimeScheduler';
46-
import {rxSubscriber} from './symbol/rxSubscriber';
47-
/* tslint:enable:no-unused-variable */
48-
49-
/* tslint:disable:no-var-keyword */
50-
var Scheduler = {
51-
asap,
52-
queue
53-
};
54-
55-
var Symbol = {
56-
rxSubscriber
57-
};
58-
/* tslint:enable:no-var-keyword */
59-
60-
export {
61-
Subject,
62-
Scheduler,
63-
Observable,
64-
Observer,
65-
Operator,
66-
Subscriber,
67-
Subscription,
68-
AsyncSubject,
69-
ReplaySubject,
70-
BehaviorSubject,
71-
ConnectableObservable,
72-
Notification,
73-
EmptyError,
74-
ArgumentOutOfRangeError,
75-
ObjectUnsubscribedError,
76-
UnsubscriptionError,
77-
TestScheduler,
78-
VirtualTimeScheduler,
79-
TimeInterval,
80-
Symbol
81-
};

‎tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
},
1616
"files": [
1717
"src/Rx.ts",
18+
"src/Rx.DOM.ts",
1819
"src/Rx.KitchenSink.ts"
1920
]
2021
}

0 commit comments

Comments
 (0)