Skip to content

Commit 843b0ca

Browse files
kwonojkwonoj
committed
refactor(operators): move to singular form names
closes ReactiveX#847
1 parent 2896556 commit 843b0ca

File tree

126 files changed

+212
-212
lines changed

Some content is hidden

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

126 files changed

+212
-212
lines changed

‎spec/operators/groupBy-spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* globals describe, it, expect, hot, cold, expectObservable, expectSubscriptions */
22
var Rx = require('../../dist/cjs/Rx.KitchenSink');
33
var Observable = Rx.Observable;
4-
var GroupedObservable = require('../../dist/cjs/operators/groupBy-support').GroupedObservable;
4+
var GroupedObservable = require('../../dist/cjs/operator/groupBy-support').GroupedObservable;
55

66
describe('Observable.prototype.groupBy()', function () {
77
it.asDiagram('groupBy(i => i % 2)')('should group numbers by odd/even', function () {

‎src/CoreOperators.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 {ConnectableObservable} from './observable/ConnectableObservable';
44
import {Subject} from './Subject';
5-
import {GroupedObservable} from './operators/groupBy-support';
5+
import {GroupedObservable} from './operator/groupBy-support';
66
import {Notification} from './Notification';
77

88
export interface CoreOperators<T> {

‎src/Observable.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {Subscription} from './Subscription';
66
import {root} from './util/root';
77
import {CoreOperators } from './CoreOperators';
88
import {$$observable} from './util/Symbol_observable';
9-
import {GroupedObservable} from './operators/groupBy-support';
9+
import {GroupedObservable} from './operator/groupBy-support';
1010
import {ConnectableObservable} from './observable/ConnectableObservable';
1111
import {Subject} from './Subject';
1212
import {Notification} from './Notification';

‎src/Rx.KitchenSink.ts

Lines changed: 96 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ export interface KitchenSinkOperators<T> extends CoreOperators<T> {
1919

2020
// statics
2121
/* tslint:disable:no-use-before-declare */
22-
import './operators/combineLatest-static';
23-
import './operators/concat-static';
24-
import './operators/merge-static';
22+
import './operator/combineLatest-static';
23+
import './operator/concat-static';
24+
import './operator/merge-static';
2525
import './observable/defer';
2626
import './observable/empty';
2727
import './observable/forkJoin';
@@ -36,111 +36,111 @@ import './observable/never';
3636
import './observable/range';
3737
import './observable/throw';
3838
import './observable/timer';
39-
import './operators/zip-static';
39+
import './operator/zip-static';
4040

4141
// Operators
42-
import './operators/buffer';
43-
import './operators/bufferCount';
44-
import './operators/bufferTime';
45-
import './operators/bufferToggle';
46-
import './operators/bufferWhen';
47-
import './operators/catch';
48-
import './operators/combineAll';
49-
import './operators/combineLatest';
50-
import './operators/concat';
51-
import './operators/concatAll';
52-
import './operators/concatMap';
53-
import './operators/concatMapTo';
54-
import './operators/count';
55-
import './operators/dematerialize';
56-
import './operators/debounce';
57-
import './operators/debounceTime';
58-
import './operators/defaultIfEmpty';
59-
import './operators/delay';
60-
import './operators/distinctUntilChanged';
61-
import './operators/extended/distinctUntilKeyChanged';
62-
import './operators/do';
63-
import './operators/extended/elementAt';
64-
import './operators/expand';
65-
import './operators/filter';
66-
import './operators/extended/find';
67-
import './operators/extended/findIndex';
68-
import './operators/finally';
69-
import './operators/first';
70-
import './operators/groupBy';
71-
import './operators/ignoreElements';
72-
import './operators/extended/isEmpty';
73-
import './operators/every';
74-
import './operators/last';
75-
import './operators/map';
76-
import './operators/mapTo';
77-
import './operators/materialize';
78-
import './operators/extended/max';
79-
import './operators/merge';
80-
import './operators/mergeAll';
81-
import './operators/mergeMap';
82-
import './operators/mergeMapTo';
83-
import './operators/extended/mergeScan';
84-
import './operators/extended/min';
85-
import './operators/multicast';
86-
import './operators/observeOn';
87-
import './operators/partition';
88-
import './operators/publish';
89-
import './operators/publishBehavior';
90-
import './operators/publishReplay';
91-
import './operators/reduce';
92-
import './operators/repeat';
93-
import './operators/retry';
94-
import './operators/retryWhen';
95-
import './operators/sample';
96-
import './operators/sampleTime';
97-
import './operators/scan';
98-
import './operators/share';
99-
import './operators/single';
100-
import './operators/skip';
101-
import './operators/skipUntil';
102-
import './operators/skipWhile';
103-
import './operators/startWith';
104-
import './operators/subscribeOn';
105-
import './operators/switch';
106-
import './operators/switchMap';
107-
import './operators/switchMapTo';
108-
import './operators/take';
109-
import './operators/takeUntil';
110-
import './operators/takeWhile';
111-
import './operators/throttle';
112-
import './operators/throttleTime';
113-
import './operators/extended/timeInterval';
114-
import './operators/timeout';
115-
import './operators/timeoutWith';
116-
import './operators/toArray';
117-
import './operators/toPromise';
118-
import './operators/window';
119-
import './operators/windowCount';
120-
import './operators/windowTime';
121-
import './operators/windowToggle';
122-
import './operators/windowWhen';
123-
import './operators/withLatestFrom';
124-
import './operators/zip';
125-
import './operators/zipAll';
42+
import './operator/buffer';
43+
import './operator/bufferCount';
44+
import './operator/bufferTime';
45+
import './operator/bufferToggle';
46+
import './operator/bufferWhen';
47+
import './operator/catch';
48+
import './operator/combineAll';
49+
import './operator/combineLatest';
50+
import './operator/concat';
51+
import './operator/concatAll';
52+
import './operator/concatMap';
53+
import './operator/concatMapTo';
54+
import './operator/count';
55+
import './operator/dematerialize';
56+
import './operator/debounce';
57+
import './operator/debounceTime';
58+
import './operator/defaultIfEmpty';
59+
import './operator/delay';
60+
import './operator/distinctUntilChanged';
61+
import './operator/extended/distinctUntilKeyChanged';
62+
import './operator/do';
63+
import './operator/extended/elementAt';
64+
import './operator/expand';
65+
import './operator/filter';
66+
import './operator/extended/find';
67+
import './operator/extended/findIndex';
68+
import './operator/finally';
69+
import './operator/first';
70+
import './operator/groupBy';
71+
import './operator/ignoreElements';
72+
import './operator/extended/isEmpty';
73+
import './operator/every';
74+
import './operator/last';
75+
import './operator/map';
76+
import './operator/mapTo';
77+
import './operator/materialize';
78+
import './operator/extended/max';
79+
import './operator/merge';
80+
import './operator/mergeAll';
81+
import './operator/mergeMap';
82+
import './operator/mergeMapTo';
83+
import './operator/extended/mergeScan';
84+
import './operator/extended/min';
85+
import './operator/multicast';
86+
import './operator/observeOn';
87+
import './operator/partition';
88+
import './operator/publish';
89+
import './operator/publishBehavior';
90+
import './operator/publishReplay';
91+
import './operator/reduce';
92+
import './operator/repeat';
93+
import './operator/retry';
94+
import './operator/retryWhen';
95+
import './operator/sample';
96+
import './operator/sampleTime';
97+
import './operator/scan';
98+
import './operator/share';
99+
import './operator/single';
100+
import './operator/skip';
101+
import './operator/skipUntil';
102+
import './operator/skipWhile';
103+
import './operator/startWith';
104+
import './operator/subscribeOn';
105+
import './operator/switch';
106+
import './operator/switchMap';
107+
import './operator/switchMapTo';
108+
import './operator/take';
109+
import './operator/takeUntil';
110+
import './operator/takeWhile';
111+
import './operator/throttle';
112+
import './operator/throttleTime';
113+
import './operator/extended/timeInterval';
114+
import './operator/timeout';
115+
import './operator/timeoutWith';
116+
import './operator/toArray';
117+
import './operator/toPromise';
118+
import './operator/window';
119+
import './operator/windowCount';
120+
import './operator/windowTime';
121+
import './operator/windowToggle';
122+
import './operator/windowWhen';
123+
import './operator/withLatestFrom';
124+
import './operator/zip';
125+
import './operator/zipAll';
126126

127127
/* tslint:disable:no-unused-variable */
128128
import {Subject} from './Subject';
129129
import {Subscription} from './Subscription';
130130
import {Subscriber} from './Subscriber';
131-
import {ReplaySubject} from './subjects/ReplaySubject';
132-
import {BehaviorSubject} from './subjects/BehaviorSubject';
131+
import {ReplaySubject} from './subject/ReplaySubject';
132+
import {BehaviorSubject} from './subject/BehaviorSubject';
133133
import {ConnectableObservable} from './observable/ConnectableObservable';
134134
import {Notification} from './Notification';
135135
import {EmptyError} from './util/EmptyError';
136136
import {ArgumentOutOfRangeError} from './util/ArgumentOutOfRangeError';
137-
import {nextTick} from './schedulers/nextTick';
138-
import {immediate} from './schedulers/immediate';
139-
import {NextTickScheduler} from './schedulers/NextTickScheduler';
140-
import {ImmediateScheduler} from './schedulers/ImmediateScheduler';
141-
import {TimeInterval} from './operators/extended/timeInterval';
137+
import {nextTick} from './scheduler/nextTick';
138+
import {immediate} from './scheduler/immediate';
139+
import {NextTickScheduler} from './scheduler/NextTickScheduler';
140+
import {ImmediateScheduler} from './scheduler/ImmediateScheduler';
141+
import {TimeInterval} from './operator/extended/timeInterval';
142142
import {TestScheduler} from './testing/TestScheduler';
143-
import {VirtualTimeScheduler} from './schedulers/VirtualTimeScheduler';
143+
import {VirtualTimeScheduler} from './scheduler/VirtualTimeScheduler';
144144
/* tslint:enable:no-unused-variable */
145145

146146
/* tslint:disable:no-var-keyword */

0 commit comments

Comments
 (0)