From 5031d28c32435f0a80dca0216bcae0e88ad31119 Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Mon, 24 Jan 2022 07:30:54 +0100 Subject: [PATCH] fix(core): update --- ts/index.ts | 5 ++++- ts/smartrx.classes.observablemap.ts | 5 +++-- ts/smartrx.plugins.ts | 3 +-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ts/index.ts b/ts/index.ts index 4c2edca..82a9312 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -1,4 +1,7 @@ import * as plugins from './smartrx.plugins'; export * from './smartrx.classes.observablemap'; export * from './smartrx.classes.observableintake'; -export * from './smartrx.plugins.rxjs'; +import * as rxjs from './smartrx.plugins.rxjs'; +export { + rxjs +} diff --git a/ts/smartrx.classes.observablemap.ts b/ts/smartrx.classes.observablemap.ts index fe83c6e..79fa698 100644 --- a/ts/smartrx.classes.observablemap.ts +++ b/ts/smartrx.classes.observablemap.ts @@ -1,4 +1,5 @@ import * as plugins from './smartrx.plugins'; +import * as rxjs from './smartrx.plugins.rxjs'; export interface IEventEmitter { on: (eventNameArg: string, eventHandlerArg: (eventPayload: T) => any) => void; @@ -8,7 +9,7 @@ export interface IEventEmitter { * bundles an observable with an emitter */ export interface IObservableEmitterBundle { - observable: plugins.rxjs.Observable; + observable: rxjs.Observable; emitter: IEventEmitter; event: string; } @@ -30,7 +31,7 @@ export class Observablemap { if (existingBundle) { return existingBundle.observable; } else { - const emitterObservable = plugins.rxjs.fromEvent(emitterArg as any, eventArg); + const emitterObservable = rxjs.fromEvent(emitterArg as any, eventArg); this.observableEmitterBundleObjectmap.add({ observable: emitterObservable, emitter: emitterArg, diff --git a/ts/smartrx.plugins.ts b/ts/smartrx.plugins.ts index 98bf12e..99d373e 100644 --- a/ts/smartrx.plugins.ts +++ b/ts/smartrx.plugins.ts @@ -1,5 +1,4 @@ import * as lik from '@pushrocks/lik'; -import * as rxjs from './smartrx.plugins.rxjs'; import * as smartpromise from '@pushrocks/smartpromise'; -export { lik, rxjs, smartpromise }; +export { lik, smartpromise };