Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(Notification): replace const enum #4556

Merged
merged 2 commits into from Apr 23, 2019
Merged

fix(Notification): replace const enum #4556

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b28521d
fix(Notification): replace const enum
cartant Feb 11, 2019
ca0afc0
chore: use literal union and keep enum
cartant Mar 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 21 additions & 16 deletions src/internal/Notification.ts
View file
Open in desktop
Expand Up @@ -3,8 +3,13 @@ import { Observable } from './Observable';
import { empty } from './observable/empty';
import { of } from './observable/of';
import { throwError } from './observable/throwError';
import { deprecate } from 'util';

export const enum NotificationKind {
// TODO: When this enum is removed, replace it with a type alias. See #4556.
/**
* @deprecated NotificationKind is deprecated as const enums are not compatible with isolated modules. Use a string literal instead.
*/
export enum NotificationKind {
NEXT = 'N',
ERROR = 'E',
COMPLETE = 'C',
Expand All @@ -27,8 +32,8 @@ export const enum NotificationKind {
export class Notification<T> {
hasValue: boolean;

constructor(public kind: NotificationKind, public value?: T, public error?: any) {
this.hasValue = kind === NotificationKind.NEXT;
constructor(public kind: 'N' | 'E' | 'C', public value?: T, public error?: any) {
this.hasValue = kind === 'N';
}

/**
Expand All @@ -38,11 +43,11 @@ export class Notification<T> {
*/
observe(observer: PartialObserver<T>): any {
switch (this.kind) {
case NotificationKind.NEXT:
case 'N':
return observer.next && observer.next(this.value);
case NotificationKind.ERROR:
case 'E':
return observer.error && observer.error(this.error);
case NotificationKind.COMPLETE:
case 'C':
return observer.complete && observer.complete();
}
}
Expand All @@ -58,11 +63,11 @@ export class Notification<T> {
do(next: (value: T) => void, error?: (err: any) => void, complete?: () => void): any {
const kind = this.kind;
switch (kind) {
case NotificationKind.NEXT:
case 'N':
return next && next(this.value);
case NotificationKind.ERROR:
case 'E':
return error && error(this.error);
case NotificationKind.COMPLETE:
case 'C':
return complete && complete();
}
}
Expand Down Expand Up @@ -92,18 +97,18 @@ export class Notification<T> {
toObservable(): Observable<T> {
const kind = this.kind;
switch (kind) {
case NotificationKind.NEXT:
case 'N':
return of(this.value);
case NotificationKind.ERROR:
case 'E':
return throwError(this.error);
case NotificationKind.COMPLETE:
case 'C':
return empty();
}
throw new Error('unexpected notification kind value');
}

private static completeNotification: Notification<any> = new Notification(NotificationKind.COMPLETE);
private static undefinedValueNotification: Notification<any> = new Notification(NotificationKind.NEXT, undefined);
private static completeNotification: Notification<any> = new Notification('C');
private static undefinedValueNotification: Notification<any> = new Notification('N', undefined);

/**
* A shortcut to create a Notification instance of the type `next` from a
Expand All @@ -115,7 +120,7 @@ export class Notification<T> {
*/
static createNext<T>(value: T): Notification<T> {
if (typeof value !== 'undefined') {
return new Notification(NotificationKind.NEXT, value);
return new Notification('N', value);
}
return Notification.undefinedValueNotification;
}
Expand All @@ -129,7 +134,7 @@ export class Notification<T> {
* @nocollapse
*/
static createError<T>(err?: any): Notification<T> {
return new Notification(NotificationKind.ERROR, undefined, err);
return new Notification('E', undefined, err);
}

/**
Expand Down