Skip to content

Commit ad43681

Browse files
robwormaldrobwormald
committed
refactor(observables): rename files to match statics
1 parent 407aa9b commit ad43681

29 files changed

+51
-51
lines changed

‎src/Rx.KitchenSink.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ export interface KitchenSinkOperators<T> extends CoreOperators<T> {
2222
import './operators/combineLatest-static';
2323
import './operators/concat-static';
2424
import './operators/merge-static';
25-
import './observables/DeferObservable';
26-
import './observables/EmptyObservable';
27-
import './observables/ForkJoinObservable';
28-
import './observables/FromObservable';
29-
import './observables/ArrayObservable';
30-
import './observables/FromEventObservable';
31-
import './observables/FromEventPatternObservable';
32-
import './observables/PromiseObservable';
33-
import './observables/CallbackObservable';
34-
import './observables/IntervalObservable';
35-
import './observables/InfiniteObservable';
36-
import './observables/RangeObservable';
37-
import './observables/ErrorObservable';
38-
import './observables/TimerObservable';
25+
import './observables/defer';
26+
import './observables/empty';
27+
import './observables/forkJoin';
28+
import './observables/from';
29+
import './observables/fromArray';
30+
import './observables/fromEvent';
31+
import './observables/fromEventPattern';
32+
import './observables/fromPromise';
33+
import './observables/fromCallback';
34+
import './observables/interval';
35+
import './observables/never';
36+
import './observables/range';
37+
import './observables/throw';
38+
import './observables/timer';
3939
import './operators/zip-static';
4040

4141
// Operators

‎src/Rx.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ import {Observable} from './Observable';
55
import './operators/combineLatest-static';
66
import './operators/concat-static';
77
import './operators/merge-static';
8-
import './observables/DeferObservable';
9-
import './observables/EmptyObservable';
10-
import './observables/ForkJoinObservable';
11-
import './observables/FromObservable';
12-
import './observables/ArrayObservable';
13-
import './observables/FromEventObservable';
14-
import './observables/FromEventPatternObservable';
15-
import './observables/PromiseObservable';
16-
import './observables/CallbackObservable';
17-
import './observables/IntervalObservable';
18-
import './observables/InfiniteObservable';
19-
import './observables/RangeObservable';
20-
import './observables/ErrorObservable';
21-
import './observables/TimerObservable';
8+
import './observables/defer';
9+
import './observables/empty';
10+
import './observables/forkJoin';
11+
import './observables/from';
12+
import './observables/fromArray';
13+
import './observables/fromEvent';
14+
import './observables/fromEventPattern';
15+
import './observables/fromPromise';
16+
import './observables/fromCallback';
17+
import './observables/interval';
18+
import './observables/never';
19+
import './observables/range';
20+
import './observables/throw';
21+
import './observables/timer';
2222
import './operators/zip-static';
2323

2424
//operators

‎src/observables/ScalarObservable.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import {Subscriber} from '../Subscriber';
44

55
import {tryCatch} from '../util/tryCatch';
66
import {errorObject} from '../util/errorObject';
7-
import {ErrorObservable} from './ErrorObservable';
8-
import {EmptyObservable} from './EmptyObservable';
7+
import {ErrorObservable} from './throw';
8+
import {EmptyObservable} from './empty';
99

1010
export class ScalarObservable<T> extends Observable<T> {
1111
static create<T>(value: T, scheduler?: Scheduler): ScalarObservable<T> {

‎src/observables/DeferObservable.ts renamed to ‎src/observables/defer.ts

File renamed without changes.

‎src/observables/EmptyObservable.ts renamed to ‎src/observables/empty.ts

File renamed without changes.

‎src/observables/ForkJoinObservable.ts renamed to ‎src/observables/forkJoin.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Observable} from '../Observable';
22
import {Subscriber} from '../Subscriber';
3-
import {PromiseObservable} from './PromiseObservable';
4-
import {EmptyObservable} from './EmptyObservable';
3+
import {PromiseObservable} from './fromPromise';
4+
import {EmptyObservable} from './empty';
55
import {isPromise} from '../util/isPromise';
66
import {isArray} from '../util/isArray';
77

‎src/observables/FromObservable.ts renamed to ‎src/observables/from.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {PromiseObservable} from './PromiseObservable';
1+
import {PromiseObservable} from './fromPromise';
22
import {IteratorObservable} from'./IteratorObservable';
3-
import {ArrayObservable} from './ArrayObservable';
3+
import {ArrayObservable} from './fromArray';
44

55
import {Scheduler} from '../Scheduler';
66
import {$$observable} from '../util/Symbol_observable';

‎src/observables/ArrayObservable.ts renamed to ‎src/observables/fromArray.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Scheduler} from '../Scheduler';
22
import {Observable} from '../Observable';
33
import {ScalarObservable} from './ScalarObservable';
4-
import {EmptyObservable} from './EmptyObservable';
4+
import {EmptyObservable} from './empty';
55
import {isScheduler} from '../util/isScheduler';
66

77
export class ArrayObservable<T> extends Observable<T> {
@@ -79,5 +79,5 @@ export class ArrayObservable<T> extends Observable<T> {
7979
}
8080
}
8181

82-
Observable.fromArray = ArrayObservable.create;
83-
Observable.of = ArrayObservable.of;
82+
Observable.of = ArrayObservable.of;
83+
Observable.fromArray = ArrayObservable.create;

‎src/observables/CallbackObservable.ts renamed to ‎src/observables/fromCallback.ts

File renamed without changes.

‎src/observables/FromEventObservable.ts renamed to ‎src/observables/fromEvent.ts

File renamed without changes.

‎src/observables/FromEventPatternObservable.ts renamed to ‎src/observables/fromEventPattern.ts

File renamed without changes.

‎src/observables/PromiseObservable.ts renamed to ‎src/observables/fromPromise.ts

File renamed without changes.

‎src/observables/IntervalObservable.ts renamed to ‎src/observables/interval.ts

File renamed without changes.

‎src/observables/InfiniteObservable.ts renamed to ‎src/observables/never.ts

File renamed without changes.

‎src/observables/RangeObservable.ts renamed to ‎src/observables/range.ts

File renamed without changes.

‎src/observables/ErrorObservable.ts renamed to ‎src/observables/throw.ts

File renamed without changes.

‎src/observables/TimerObservable.ts renamed to ‎src/observables/timer.ts

File renamed without changes.

‎src/operators/combineLatest-static.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Observable} from '../Observable';
2-
import {ArrayObservable} from '../observables/ArrayObservable';
2+
import {ArrayObservable} from '../observables/fromArray';
33
import {CombineLatestOperator} from './combineLatest-support';
44
import {Scheduler} from '../Scheduler';
55
import {isScheduler} from '../util/isScheduler';

‎src/operators/combineLatest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Observable} from '../Observable';
2-
import {ArrayObservable} from '../observables/ArrayObservable';
2+
import {ArrayObservable} from '../observables/fromArray';
33
import {CombineLatestOperator} from './combineLatest-support';
44
import {isArray} from '../util/isArray';
55

‎src/operators/concat-static.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Observable} from '../Observable';
22
import {Scheduler} from '../Scheduler';
33
import {immediate} from '../schedulers/immediate';
44
import {MergeAllOperator} from './mergeAll-support';
5-
import {ArrayObservable} from '../observables/ArrayObservable';
5+
import {ArrayObservable} from '../observables/fromArray';
66
import {isScheduler} from '../util/isScheduler';
77

88
/**

‎src/operators/concat.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Observable} from '../Observable';
22
import {Scheduler} from '../Scheduler';
33
import {isScheduler} from '../util/isScheduler';
4-
import {ArrayObservable} from '../observables/ArrayObservable';
4+
import {ArrayObservable} from '../observables/fromArray';
55
import {MergeAllOperator} from './mergeAll-support';
66

77
/**

‎src/operators/debounce.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Operator} from '../Operator';
22
import {Observable} from '../Observable';
3-
import {PromiseObservable} from '../observables/PromiseObservable';
3+
import {PromiseObservable} from '../observables/fromPromise';
44
import {Subscriber} from '../Subscriber';
55
import {Subscription} from '../Subscription';
66

‎src/operators/every.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import {Operator} from '../Operator';
22
import {Observer} from '../Observer';
33
import {Observable} from '../Observable';
44
import {ScalarObservable} from '../observables/ScalarObservable';
5-
import {ArrayObservable} from '../observables/ArrayObservable';
6-
import {ErrorObservable} from '../observables/ErrorObservable';
5+
import {ArrayObservable} from '../observables/fromArray';
6+
import {ErrorObservable} from '../observables/throw';
77
import {Subscriber} from '../Subscriber';
88
import {tryCatch} from '../util/tryCatch';
99
import {errorObject} from '../util/errorObject';

‎src/operators/merge-static.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Scheduler} from '../Scheduler';
22
import {Observable} from '../Observable';
3-
import {ArrayObservable} from '../observables/ArrayObservable';
3+
import {ArrayObservable} from '../observables/fromArray';
44
import {MergeAllOperator} from './mergeAll-support';
55
import {immediate} from '../schedulers/immediate';
66
import {isScheduler} from '../util/isScheduler';

‎src/operators/repeat.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Operator} from '../Operator';
22
import {Subscriber} from '../Subscriber';
33
import {Observable} from '../Observable';
4-
import {EmptyObservable} from '../observables/EmptyObservable';
4+
import {EmptyObservable} from '../observables/empty';
55
import {Subscription} from '../Subscription';
66

77
export function repeat<T>(count: number = -1): Observable<T> {

‎src/operators/startWith.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {Scheduler} from '../Scheduler';
22
import {Observable} from '../Observable';
3-
import {ArrayObservable} from '../observables/ArrayObservable';
3+
import {ArrayObservable} from '../observables/fromArray';
44
import {ScalarObservable} from '../observables/ScalarObservable';
5-
import {EmptyObservable} from '../observables/EmptyObservable';
5+
import {EmptyObservable} from '../observables/empty';
66
import {concat} from './concat-static';
77
import {isScheduler} from '../util/isScheduler';
88

‎src/operators/take.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Operator} from '../Operator';
22
import {Observable} from '../Observable';
33
import {Subscriber} from '../Subscriber';
44
import {ArgumentOutOfRangeError} from '../util/ArgumentOutOfRangeError';
5-
import {EmptyObservable} from '../observables/EmptyObservable';
5+
import {EmptyObservable} from '../observables/empty';
66

77
export function take(total) {
88
if (total === 0) {

‎src/operators/throttle.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Operator} from '../Operator';
22
import {Observable} from '../Observable';
3-
import {PromiseObservable} from '../observables/PromiseObservable';
3+
import {PromiseObservable} from '../observables/fromPromise';
44
import {Subscriber} from '../Subscriber';
55
import {Subscription} from '../Subscription';
66

‎src/operators/zip-static.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Observable} from '../Observable';
2-
import {ArrayObservable} from '../observables/ArrayObservable';
2+
import {ArrayObservable} from '../observables/fromArray';
33
import {ZipOperator} from './zip-support';
44

55
export function zip<T, R>(...observables: Array<Observable<any> | ((...values: Array<any>) => R)>): Observable<R> {

0 commit comments

Comments
 (0)