fix(core): update
This commit is contained in:
@ -1,14 +1,12 @@
|
||||
import * as plugins from './smartrx.plugins';
|
||||
import { Observable, Subscription } from 'rxjs';
|
||||
import { Deferred } from '@pushrocks/smartpromise';
|
||||
|
||||
/**
|
||||
* ObservableIntake
|
||||
*/
|
||||
export class ObservableIntake<T> {
|
||||
public observable: Observable<T>;
|
||||
public observable: plugins.rxjs.Observable<T>;
|
||||
public completed: Promise<void>;
|
||||
private completedDeffered: Deferred<void>;
|
||||
private completedDeffered: plugins.smartpromise.Deferred<void>;
|
||||
private observableFunctions: any = {
|
||||
next: payloadArg => {
|
||||
// nothing
|
||||
@ -22,7 +20,7 @@ export class ObservableIntake<T> {
|
||||
private payloadBuffer = [];
|
||||
|
||||
constructor() {
|
||||
this.observable = Observable.create(observerArg => {
|
||||
this.observable = plugins.rxjs.Observable.create(observerArg => {
|
||||
this.observableFunctions.next = (...args) => {
|
||||
return observerArg.next(...args);
|
||||
};
|
||||
|
@ -1,12 +1,12 @@
|
||||
import * as plugins from './smartrx.plugins';
|
||||
import { Observable, fromEvent } from 'rxjs';
|
||||
import { Objectmap, Stringmap } from '@pushrocks/lik';
|
||||
import { EventEmitter } from '@pushrocks/smartevent';
|
||||
|
||||
/**
|
||||
* bundles an observable with an emitter
|
||||
*/
|
||||
export interface ObservableEmitterBundle {
|
||||
export interface IObservableEmitterBundle {
|
||||
observable: plugins.rxjs.Observable<any>;
|
||||
emitter: plugins.events.EventEmitter;
|
||||
emitter: EventEmitter;
|
||||
event: string;
|
||||
}
|
||||
|
||||
@ -14,21 +14,21 @@ export interface ObservableEmitterBundle {
|
||||
* manages observables by making sure that only one observable is regsitered per event
|
||||
*/
|
||||
export class Observablemap {
|
||||
ObservableEmitterBundleObjectmap = new Objectmap<ObservableEmitterBundle>();
|
||||
public observableEmitterBundleObjectmap = new plugins.lik.ObjectMap<IObservableEmitterBundle>();
|
||||
|
||||
/**
|
||||
* creates a new observable if not yet registered for the same event.
|
||||
* In case event has been registered before the same observable is returned.
|
||||
*/
|
||||
getObservableForEmitterEvent(emitterArg: plugins.events.EventEmitter, eventArg: string) {
|
||||
let existingBundle = this.ObservableEmitterBundleObjectmap.find(bundleArg => {
|
||||
public getObservableForEmitterEvent(emitterArg: EventEmitter, eventArg: string) {
|
||||
const existingBundle = this.observableEmitterBundleObjectmap.find(bundleArg => {
|
||||
return bundleArg.emitter === emitterArg && bundleArg.event === eventArg;
|
||||
});
|
||||
if (existingBundle) {
|
||||
return existingBundle.observable;
|
||||
} else {
|
||||
let emitterObservable = fromEvent(emitterArg, eventArg);
|
||||
this.ObservableEmitterBundleObjectmap.add({
|
||||
const emitterObservable = plugins.rxjs.fromEvent(emitterArg, eventArg);
|
||||
this.observableEmitterBundleObjectmap.add({
|
||||
observable: emitterObservable,
|
||||
emitter: emitterArg,
|
||||
event: eventArg
|
||||
|
@ -1,7 +1,6 @@
|
||||
import * as events from 'events';
|
||||
import * as lik from '@pushrocks/lik';
|
||||
import * as rxjs from 'rxjs';
|
||||
import * as smartevent from '@pushrocks/smartevent';
|
||||
import * as smartpromise from '@pushrocks/smartpromise';
|
||||
|
||||
export { events, lik, rxjs, smartevent, smartpromise };
|
||||
export { lik, rxjs, smartevent, smartpromise };
|
||||
|
Reference in New Issue
Block a user