Skip to content

Commit 3255fb3

Browse files
committed
feat(AsapScheduler): rename NextTickScheduler to AsapScheduler
- NextTickScheduler is now AsapScheduler - NextTickAction is now AsapAction - Rx.Scheduler.nextTick is now Rx.Scheduler.asap This was done to more clearly define in a concise way what the scheduler is doing if you google 'asap javascript', a library that does the same thing comes up as the top result. BREAKING CHANGE: Rx.Scheduler.nextTick is now Rx.Scheduler.asap closes #838
1 parent 66eb537 commit 3255fb3

20 files changed

+46
-46
lines changed

spec/observables/SubscribeOnObservable-spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ describe('SubscribeOnObservable', function () {
1818
var e1 = hot('--a--b--|');
1919
var scheduler = new SubscribeOnObservable(e1, 0, jasmine.createSpy('dummy')).scheduler;
2020

21-
expect(scheduler).toBe(Rx.Scheduler.nextTick);
21+
expect(scheduler).toBe(Rx.Scheduler.asap);
2222
});
2323

2424
it('should create observable via staic create function', function () {

spec/observables/interval-spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ describe('Observable.interval', function () {
1212
it('should specify default scheduler if incorrect scheduler specified', function () {
1313
var scheduler = Observable.interval(10, jasmine.createSpy('dummy')).scheduler;
1414

15-
expect(scheduler).toBe(Rx.Scheduler.nextTick);
15+
expect(scheduler).toBe(Rx.Scheduler.asap);
1616
});
1717

1818
it('should emit when relative interval set to zero', function () {

spec/observables/range-spec.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var Rx = require('../../dist/cjs/Rx');
22
var RangeObservable = require('../../dist/cjs/observable/range').RangeObservable;
33
var Observable = Rx.Observable;
4-
var nextTick = Rx.Scheduler.nextTick;
4+
var asap = Rx.Scheduler.asap;
55

66
describe('Observable.range', function () {
77
it('should synchronously create a range of values by default', function () {
@@ -14,14 +14,14 @@ describe('Observable.range', function () {
1414

1515
it('should accept a scheduler' , function (done) {
1616
var expected = [12, 13, 14, 15];
17-
spyOn(nextTick, 'schedule').and.callThrough();
17+
spyOn(asap, 'schedule').and.callThrough();
1818

19-
var source = Observable.range(12, 4, nextTick);
19+
var source = Observable.range(12, 4, asap);
2020

21-
expect(source.scheduler).toBe(nextTick);
21+
expect(source.scheduler).toBe(asap);
2222

2323
source.subscribe(function (x) {
24-
expect(nextTick.schedule).toHaveBeenCalled();
24+
expect(asap.schedule).toHaveBeenCalled();
2525
var exp = expected.shift();
2626
expect(x).toBe(exp);
2727
}, done.throw, done);
@@ -36,8 +36,8 @@ describe('RangeObservable', function () {
3636
});
3737

3838
it('should accept a scheduler', function () {
39-
var observable = RangeObservable.create(12, 4, nextTick);
40-
expect(observable.scheduler).toBe(nextTick);
39+
var observable = RangeObservable.create(12, 4, asap);
40+
expect(observable.scheduler).toBe(asap);
4141
});
4242
});
4343

spec/subject-spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var Rx = require('../dist/cjs/Rx');
33

44
var Subject = Rx.Subject;
5-
var nextTick = Rx.Scheduler.nextTick;
5+
var asap = Rx.Scheduler.asap;
66
var Observable = Rx.Observable;
77

88
describe('Subject', function () {

spec/subjects/behavior-subject-spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var Rx = require('../../dist/cjs/Rx');
33

44
var BehaviorSubject = Rx.BehaviorSubject;
5-
var nextTick = Rx.Scheduler.nextTick;
5+
var asap = Rx.Scheduler.asap;
66
var Observable = Rx.Observable;
77
var ObjectUnsubscribedError = Rx.ObjectUnsubscribedError;
88

spec/subjects/replay-subject-spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
var Rx = require('../../dist/cjs/Rx');
33

44
var ReplaySubject = Rx.ReplaySubject;
5-
var nextTick = Rx.Scheduler.nextTick;
5+
var asap = Rx.Scheduler.asap;
66
var Observable = Rx.Observable;
77

88
describe('ReplaySubject', function () {

src/Rx.KitchenSink.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ import {Notification} from './Notification';
139139
import {EmptyError} from './util/EmptyError';
140140
import {ObjectUnsubscribedError} from './util/ObjectUnsubscribedError';
141141
import {ArgumentOutOfRangeError} from './util/ArgumentOutOfRangeError';
142-
import {nextTick} from './scheduler/nextTick';
142+
import {asap} from './scheduler/asap';
143143
import {queue} from './scheduler/queue';
144-
import {NextTickScheduler} from './scheduler/NextTickScheduler';
144+
import {AsapScheduler} from './scheduler/AsapScheduler';
145145
import {QueueScheduler} from './scheduler/QueueScheduler';
146146
import {TimeInterval} from './operator/extended/timeInterval';
147147
import {TestScheduler} from './testing/TestScheduler';
@@ -151,7 +151,7 @@ import {rxSubscriber} from './symbol/rxSubscriber';
151151

152152
/* tslint:disable:no-var-keyword */
153153
var Scheduler = {
154-
nextTick,
154+
asap,
155155
queue
156156
};
157157

src/Rx.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,16 @@ import {Notification} from './Notification';
118118
import {EmptyError} from './util/EmptyError';
119119
import {ArgumentOutOfRangeError} from './util/ArgumentOutOfRangeError';
120120
import {ObjectUnsubscribedError} from './util/ObjectUnsubscribedError';
121+
import {asap} from './scheduler/asap';
121122
import {queue} from './scheduler/queue';
122-
import {nextTick} from './scheduler/nextTick';
123-
import {NextTickScheduler} from './scheduler/NextTickScheduler';
123+
import {AsapScheduler} from './scheduler/AsapScheduler';
124124
import {QueueScheduler} from './scheduler/QueueScheduler';
125125
import {rxSubscriber} from './symbol/rxSubscriber';
126126
/* tslint:enable:no-unused-variable */
127127

128128
/* tslint:disable:no-var-keyword */
129129
var Scheduler = {
130-
nextTick,
130+
asap,
131131
queue
132132
};
133133

src/observable/SubscribeOnObservable.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import {Scheduler} from '../Scheduler';
22
import {Subscriber} from '../Subscriber';
33
import {Subscription} from '../Subscription';
44
import {Observable} from '../Observable';
5-
import {nextTick} from '../scheduler/nextTick';
5+
import {asap} from '../scheduler/asap';
66
import {isNumeric} from '../util/isNumeric';
77

88
export class SubscribeOnObservable<T> extends Observable<T> {
9-
static create<T>(source: Observable<T>, delay: number = 0, scheduler: Scheduler = nextTick): Observable<T> {
9+
static create<T>(source: Observable<T>, delay: number = 0, scheduler: Scheduler = asap): Observable<T> {
1010
return new SubscribeOnObservable(source, delay, scheduler);
1111
}
1212

@@ -16,13 +16,13 @@ export class SubscribeOnObservable<T> extends Observable<T> {
1616

1717
constructor(public source: Observable<T>,
1818
private delayTime: number = 0,
19-
private scheduler: Scheduler = nextTick) {
19+
private scheduler: Scheduler = asap) {
2020
super();
2121
if (!isNumeric(delayTime) || delayTime < 0) {
2222
this.delayTime = 0;
2323
}
2424
if (!scheduler || typeof scheduler.schedule !== 'function') {
25-
this.scheduler = nextTick;
25+
this.scheduler = asap;
2626
}
2727
}
2828

src/observable/interval.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import {Subscriber} from '../Subscriber';
22
import {isNumeric} from '../util/isNumeric';
33
import {Scheduler} from '../Scheduler';
44
import {Observable} from '../Observable';
5-
import {nextTick} from '../scheduler/nextTick';
5+
import {asap} from '../scheduler/asap';
66

77
export class IntervalObservable<T> extends Observable<T> {
8-
static create(period: number = 0, scheduler: Scheduler = nextTick): Observable<number> {
8+
static create(period: number = 0, scheduler: Scheduler = asap): Observable<number> {
99
return new IntervalObservable(period, scheduler);
1010
}
1111

@@ -23,13 +23,13 @@ export class IntervalObservable<T> extends Observable<T> {
2323
(<any> this).schedule(state, period);
2424
}
2525

26-
constructor(private period: number = 0, private scheduler: Scheduler = nextTick) {
26+
constructor(private period: number = 0, private scheduler: Scheduler = asap) {
2727
super();
2828
if (!isNumeric(period) || period < 0) {
2929
this.period = 0;
3030
}
3131
if (!scheduler || typeof scheduler.schedule !== 'function') {
32-
this.scheduler = nextTick;
32+
this.scheduler = asap;
3333
}
3434
}
3535

src/observable/timer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {isNumeric} from '../util/isNumeric';
22
import {Scheduler} from '../Scheduler';
33
import {Observable} from '../Observable';
4-
import {nextTick} from '../scheduler/nextTick';
4+
import {asap} from '../scheduler/asap';
55
import {isScheduler} from '../util/isScheduler';
66
import {isDate} from '../util/isDate';
77

@@ -49,7 +49,7 @@ export class TimerObservable<T> extends Observable<T> {
4949
scheduler = <Scheduler> period;
5050
}
5151
if (!isScheduler(scheduler)) {
52-
scheduler = nextTick;
52+
scheduler = asap;
5353
}
5454
this.scheduler = scheduler;
5555

src/operator/bufferTime.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ import {Subscriber} from '../Subscriber';
33
import {Observable} from '../Observable';
44
import {Scheduler} from '../Scheduler';
55
import {Action} from '../scheduler/Action';
6-
import {nextTick} from '../scheduler/nextTick';
6+
import {asap} from '../scheduler/asap';
77

88
/**
99
* buffers values from the source for a specific time period. Optionally allows new buffers to be set up at an interval.
1010
* @param {number} the amount of time to fill each buffer for before emitting them and clearing them.
1111
* @param {number} [bufferCreationInterval] the interval at which to start new buffers.
12-
* @param {Scheduler} [scheduler] (optional, defaults to `nextTick` scheduler) The scheduler on which to schedule the
12+
* @param {Scheduler} [scheduler] (optional, defaults to `asap` scheduler) The scheduler on which to schedule the
1313
* intervals that determine buffer boundaries.
1414
* @returns {Observable<T[]>} an observable of arrays of buffered values.
1515
*/
1616
export function bufferTime<T>(bufferTimeSpan: number,
1717
bufferCreationInterval: number = null,
18-
scheduler: Scheduler = nextTick): Observable<T[]> {
18+
scheduler: Scheduler = asap): Observable<T[]> {
1919
return this.lift(new BufferTimeOperator(bufferTimeSpan, bufferCreationInterval, scheduler));
2020
}
2121

src/operator/debounceTime.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import {Observable} from '../Observable';
33
import {Subscriber} from '../Subscriber';
44
import {Scheduler} from '../Scheduler';
55
import {Subscription} from '../Subscription';
6-
import {nextTick} from '../scheduler/nextTick';
6+
import {asap} from '../scheduler/asap';
77

8-
export function debounceTime<T>(dueTime: number, scheduler: Scheduler = nextTick): Observable<T> {
8+
export function debounceTime<T>(dueTime: number, scheduler: Scheduler = asap): Observable<T> {
99
return this.lift(new DebounceTimeOperator(dueTime, scheduler));
1010
}
1111

src/operator/sampleTime.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import {Observable} from '../Observable';
22
import {Operator} from '../Operator';
33
import {Subscriber} from '../Subscriber';
44
import {Scheduler} from '../Scheduler';
5-
import {nextTick} from '../scheduler/nextTick';
5+
import {asap} from '../scheduler/asap';
66

7-
export function sampleTime<T>(delay: number, scheduler: Scheduler = nextTick): Observable<T> {
7+
export function sampleTime<T>(delay: number, scheduler: Scheduler = asap): Observable<T> {
88
return this.lift(new SampleTimeOperator(delay, scheduler));
99
}
1010

src/operator/throttleTime.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import {Operator} from '../Operator';
22
import {Subscriber} from '../Subscriber';
33
import {Scheduler} from '../Scheduler';
44
import {Subscription} from '../Subscription';
5-
import {nextTick} from '../scheduler/nextTick';
5+
import {asap} from '../scheduler/asap';
66

7-
export function throttleTime<T>(delay: number, scheduler: Scheduler = nextTick) {
7+
export function throttleTime<T>(delay: number, scheduler: Scheduler = asap) {
88
return this.lift(new ThrottleTimeOperator(delay, scheduler));
99
}
1010

src/operator/windowTime.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import {Observable} from '../Observable';
44
import {Subject} from '../Subject';
55
import {Scheduler} from '../Scheduler';
66
import {Action} from '../scheduler/Action';
7-
import {nextTick} from '../scheduler/nextTick';
7+
import {asap} from '../scheduler/asap';
88

99
export function windowTime<T>(windowTimeSpan: number,
1010
windowCreationInterval: number = null,
11-
scheduler: Scheduler = nextTick): Observable<Observable<T>> {
11+
scheduler: Scheduler = asap): Observable<Observable<T>> {
1212
return this.lift(new WindowTimeOperator(windowTimeSpan, windowCreationInterval, scheduler));
1313
}
1414

src/scheduler/NextTickAction.ts renamed to src/scheduler/AsapAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Immediate} from '../util/Immediate';
22
import {QueueAction} from './QueueAction';
33
import {Action} from './Action';
44

5-
export class NextTickAction<T> extends QueueAction<T> {
5+
export class AsapAction<T> extends QueueAction<T> {
66
private id: any;
77

88
schedule(state?: any): Action {
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import {QueueScheduler} from './QueueScheduler';
22
import {Subscription} from '../Subscription';
33
import {Action} from './Action';
4-
import {NextTickAction} from './NextTickAction';
4+
import {AsapAction} from './AsapAction';
55
import {QueueAction} from './QueueAction';
66

7-
export class NextTickScheduler extends QueueScheduler {
7+
export class AsapScheduler extends QueueScheduler {
88
scheduleNow<T>(work: (x?: any) => Subscription<T>, state?: any): Action {
99
return (this.scheduled ?
1010
new QueueAction(this, work) :
11-
new NextTickAction(this, work)).schedule(state);
11+
new AsapAction(this, work)).schedule(state);
1212
}
1313
}

src/scheduler/asap.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import {AsapScheduler} from './AsapScheduler';
2+
3+
export const asap = new AsapScheduler();

src/scheduler/nextTick.ts

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)