refactor(EventEmitter): rename .next() to .emit()

BREAKING CHANGE:

EventEmitter#next(value) is deprecated, use EventEmitter#emit(value)
instead.

Closes #4287

Closes #5302
This commit is contained in:
Rob Wormald
2015-11-15 23:58:59 -08:00
parent 929abb9aa3
commit 3fa287aae2
44 changed files with 103 additions and 78 deletions
@@ -990,7 +990,7 @@ class MyInput implements ControlValueAccessor {
registerOnTouched(fn) {}
dispatchChangeEvent() {
ObservableWrapper.callNext(this.onChange, this.value.substring(1, this.value.length - 1));
ObservableWrapper.callEmit(this.onChange, this.value.substring(1, this.value.length - 1));
}
}
@@ -37,7 +37,7 @@ export function main() {
function asyncValidatorReturningObservable(c) {
var e = new EventEmitter();
PromiseWrapper.scheduleMicrotask(() => ObservableWrapper.callNext(e, {"async": true}));
PromiseWrapper.scheduleMicrotask(() => ObservableWrapper.callEmit(e, {"async": true}));
return e;
}
@@ -101,9 +101,9 @@ export function main() {
var res = c.value != expected ? response : null;
PromiseWrapper.scheduleMicrotask(() => {
ObservableWrapper.callNext(emitter, res);
ObservableWrapper.callEmit(emitter, res);
// this is required because of a bug in ObservableWrapper
// where callComplete can fire before callNext
// where callComplete can fire before callEmit
// remove this one the bug is fixed
TimerWrapper.setTimeout(() => { ObservableWrapper.callComplete(emitter); }, 0);
});
@@ -46,7 +46,7 @@ export function main() {
inject([AsyncTestCompleter], (async) => {
pipe.transform(emitter);
ObservableWrapper.callNext(emitter, message);
ObservableWrapper.callEmit(emitter, message);
TimerWrapper.setTimeout(() => {
expect(pipe.transform(emitter)).toEqual(new WrappedValue(message));
@@ -58,7 +58,7 @@ export function main() {
it("should return same value when nothing has changed since the last call",
inject([AsyncTestCompleter], (async) => {
pipe.transform(emitter);
ObservableWrapper.callNext(emitter, message);
ObservableWrapper.callEmit(emitter, message);
TimerWrapper.setTimeout(() => {
pipe.transform(emitter);
@@ -75,7 +75,7 @@ export function main() {
expect(pipe.transform(newEmitter)).toBe(null);
// this should not affect the pipe
ObservableWrapper.callNext(emitter, message);
ObservableWrapper.callEmit(emitter, message);
TimerWrapper.setTimeout(() => {
expect(pipe.transform(newEmitter)).toBe(null);
@@ -86,7 +86,7 @@ export function main() {
it("should request a change detection check upon receiving a new value",
inject([AsyncTestCompleter], (async) => {
pipe.transform(emitter);
ObservableWrapper.callNext(emitter, message);
ObservableWrapper.callEmit(emitter, message);
TimerWrapper.setTimeout(() => {
expect(ref.spy('markForCheck')).toHaveBeenCalled();
@@ -103,7 +103,7 @@ export function main() {
pipe.transform(emitter);
pipe.onDestroy();
ObservableWrapper.callNext(emitter, message);
ObservableWrapper.callEmit(emitter, message);
TimerWrapper.setTimeout(() => {
expect(pipe.transform(emitter)).toBe(null);
@@ -32,7 +32,7 @@ export function main() {
async.done();
});
ObservableWrapper.callNext(emitter, 99);
ObservableWrapper.callEmit(emitter, 99);
}));
it("should call the throw callback", inject([AsyncTestCompleter], (async) => {
@@ -58,7 +58,7 @@ export function main() {
var called = false;
ObservableWrapper.subscribe(emitter, (value) => { called = true; });
ObservableWrapper.callNext(emitter, 99);
ObservableWrapper.callEmit(emitter, 99);
expect(called).toBe(false);
});
@@ -71,7 +71,7 @@ export function main() {
async.done();
});
log.push(1);
ObservableWrapper.callNext(e, 2);
ObservableWrapper.callEmit(e, 2);
log.push(3);
}));
@@ -80,7 +80,7 @@ export function main() {
var log = [];
ObservableWrapper.subscribe(e, (x) => { log.push(x); });
log.push(1);
ObservableWrapper.callNext(e, 2);
ObservableWrapper.callEmit(e, 2);
log.push(3);
expect(log).toEqual([1, 2, 3]);
});
@@ -2016,7 +2016,7 @@ class DirectiveEmitingEvent {
this.event = new EventEmitter();
}
fireEvent(msg: string) { ObservableWrapper.callNext(this.event, msg); }
fireEvent(msg: string) { ObservableWrapper.callEmit(this.event, msg); }
}
@Directive({selector: '[update-host-attributes]', host: {'role': 'button'}})
@@ -2039,7 +2039,7 @@ class DirectiveUpdatingHostActions {
constructor() { this.setAttr = new EventEmitter(); }
triggerSetAttr(attrValue) { ObservableWrapper.callNext(this.setAttr, ["key", attrValue]); }
triggerSetAttr(attrValue) { ObservableWrapper.callEmit(this.setAttr, ["key", attrValue]); }
}
@Directive({selector: '[listener]', host: {'(event)': 'onEvent($event)'}})
@@ -2174,7 +2174,7 @@ class DirectiveWithTwoWayBinding {
controlChange = new EventEmitter();
control = null;
triggerChange(value) { ObservableWrapper.callNext(this.controlChange, value); }
triggerChange(value) { ObservableWrapper.callEmit(this.controlChange, value); }
}
@Injectable()
@@ -2382,5 +2382,5 @@ class DirectiveWithPropDecorators {
this.target = target;
}
fireEvent(msg) { ObservableWrapper.callNext(this.event, msg); }
fireEvent(msg) { ObservableWrapper.callEmit(this.event, msg); }
}
@@ -34,9 +34,9 @@ class MockNgZone extends NgZone {
this._onEventDoneStream = new EventEmitter(false);
}
start(): void { ObservableWrapper.callNext(this._onTurnStartStream, null); }
start(): void { ObservableWrapper.callEmit(this._onTurnStartStream, null); }
finish(): void { ObservableWrapper.callNext(this._onEventDoneStream, null); }
finish(): void { ObservableWrapper.callEmit(this._onEventDoneStream, null); }
}
export function main() {
+1
View File
@@ -683,6 +683,7 @@ var NG_ALL = [
*/
'EventEmitter.mapTo():js',
'EventEmitter.next():js',
'EventEmitter.emit():js',
'EventEmitter.materialize():js',
'EventEmitter.merge():js',
'EventEmitter.mergeAll():js',
@@ -404,7 +404,7 @@ function logHook(name: string, next: ComponentInstruction, prev: ComponentInstru
var message = name + ': ' + (isPresent(prev) ? ('/' + prev.urlPath) : 'null') + ' -> ' +
(isPresent(next) ? ('/' + next.urlPath) : 'null');
log.push(message);
ObservableWrapper.callNext(eventBus, message);
ObservableWrapper.callEmit(eventBus, message);
}
@Component({selector: 'activate-cmp'})
@@ -178,10 +178,10 @@ export function main() {
assertChange('twoWayA', 'initModelA');
assertChange('twoWayB', 'initModelB');
this.twoWayAEmitter.next('newA');
this.twoWayBEmitter.next('newB');
this.eventA.next('aFired');
this.eventB.next('bFired');
this.twoWayAEmitter.emit('newA');
this.twoWayBEmitter.emit('newB');
this.eventA.emit('aFired');
this.eventB.emit('bFired');
break;
case 1:
assertChange('twoWayA', 'newA');
@@ -37,7 +37,7 @@ export function main() {
async.done();
});
var toEmitter = bus.to(CHANNEL);
ObservableWrapper.callNext(toEmitter, MESSAGE);
ObservableWrapper.callEmit(toEmitter, MESSAGE);
}));
it("should broadcast", inject([AsyncTestCompleter], (async) => {
@@ -61,7 +61,7 @@ export function main() {
}
var toEmitter = bus.to(CHANNEL);
ObservableWrapper.callNext(toEmitter, MESSAGE);
ObservableWrapper.callEmit(toEmitter, MESSAGE);
}));
it("should keep channels independent", inject([AsyncTestCompleter], (async) => {
@@ -91,10 +91,10 @@ export function main() {
});
var firstToEmitter = bus.to(CHANNEL_ONE);
ObservableWrapper.callNext(firstToEmitter, MESSAGE_ONE);
ObservableWrapper.callEmit(firstToEmitter, MESSAGE_ONE);
var secondToEmitter = bus.to(CHANNEL_TWO);
ObservableWrapper.callNext(secondToEmitter, MESSAGE_TWO);
ObservableWrapper.callEmit(secondToEmitter, MESSAGE_TWO);
}));
});
@@ -121,7 +121,7 @@ export function main() {
var wasCalled = false;
ObservableWrapper.subscribe(bus.from(CHANNEL), (message) => { wasCalled = true; });
ObservableWrapper.callNext(bus.to(CHANNEL), "hi");
ObservableWrapper.callEmit(bus.to(CHANNEL), "hi");
flushMessages(() => {
@@ -141,7 +141,7 @@ export function main() {
var wasCalled = false;
ObservableWrapper.subscribe(bus.from(CHANNEL), (message) => { wasCalled = true; });
ObservableWrapper.callNext(bus.to(CHANNEL), "hi");
ObservableWrapper.callEmit(bus.to(CHANNEL), "hi");
flushMessages(() => {
expect(wasCalled).toBeTruthy();
@@ -10,7 +10,7 @@ export class MockEventEmitter<T> extends EventEmitter<T> {
return new MockDisposable();
}
next(value: any) { this._nextFns.forEach(fn => fn(value)); }
emit(value: any) { this._nextFns.forEach(fn => fn(value)); }
}
class MockDisposable {
@@ -53,7 +53,7 @@ export function main() {
expect(arg1).toEqual(PASSED_ARG_1);
expect(arg2).toEqual(PASSED_ARG_2);
});
ObservableWrapper.callNext(messageBuses.worker.to(CHANNEL),
ObservableWrapper.callEmit(messageBuses.worker.to(CHANNEL),
{'method': TEST_METHOD, 'args': [PASSED_ARG_1, PASSED_ARG_2]});
}));
@@ -63,7 +63,7 @@ export function main() {
expect(arg1).toEqual(PASSED_ARG_1);
return PromiseWrapper.wrap(() => { return RESULT; });
});
ObservableWrapper.callNext(messageBuses.worker.to(CHANNEL),
ObservableWrapper.callEmit(messageBuses.worker.to(CHANNEL),
{'method': TEST_METHOD, 'id': ID, 'args': [PASSED_ARG_1]});
ObservableWrapper.subscribe(messageBuses.worker.from(CHANNEL), (data: any) => {
expect(data.type).toEqual("result");
@@ -52,7 +52,7 @@ export function main() {
serializer.deserialize(serializer.serialize(viewRef, RenderViewRef), RenderViewRef);
webWorkerEventDispatcher.registerEventDispatcher(viewRef, eventDispatcher);
ObservableWrapper.callNext(messageBuses.ui.to(EVENT_CHANNEL), {
ObservableWrapper.callEmit(messageBuses.ui.to(EVENT_CHANNEL), {
'viewRef': viewRef.serialize(),
'elementIndex': elementIndex,
'eventName': eventName,