2.0.24

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@pushrocks/smartrx",
-  "version": "2.0.22",
+  "version": "2.0.24",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@pushrocks/smartrx",
-      "version": "2.0.22",
+      "version": "2.0.24",
       "license": "MIT",
       "dependencies": {
         "@pushrocks/lik": "^5.0.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartrx",
-  "version": "2.0.22",
+  "version": "2.0.24",
   "private": false,
   "description": "smart wrapper for rxjs",
   "main": "dist_ts/index.js",

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
+}

ts/smartrx.classes.observableintake.ts

@@ -1,10 +1,12 @@
 import * as plugins from './smartrx.plugins';
 
+import * as rxjs from './smartrx.plugins.rxjs';
+
 /**
  * ObservableIntake
  */
 export class ObservableIntake<T> {
-  public observable: plugins.rxjs.Observable<T>;
+  public observable: rxjs.Observable<T>;
   public completed: Promise<void>;
   private completedDeffered: plugins.smartpromise.Deferred<void>;
   private observableFunctions: any = {
@@ -20,7 +22,7 @@ export class ObservableIntake<T> {
   private payloadBuffer: any[] = [];
 
   constructor() {
-    this.observable = plugins.rxjs.Observable.create((observerArg: plugins.rxjs.Observer<any>) => {
+    this.observable = rxjs.Observable.create((observerArg: rxjs.Observer<any>) => {
       this.observableFunctions.next = (...args: any) => {
         return observerArg.next(args);
       };
@@ -33,7 +35,7 @@ export class ObservableIntake<T> {
     this.completed = this.completedDeffered.promise;
   }
 
-  public setObservable(observableFunc: plugins.rxjs.Observable<any>) {
+  public setObservable(observableFunc: rxjs.Observable<any>) {
     this.observable = observableFunc;
   }
 

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<T = any> {
   on: (eventNameArg: string, eventHandlerArg: (eventPayload: T) => any) => void;
@@ -8,7 +9,7 @@ export interface IEventEmitter<T = any> {
  * bundles an observable with an emitter
  */
 export interface IObservableEmitterBundle {
-  observable: plugins.rxjs.Observable<any>;
+  observable: rxjs.Observable<any>;
   emitter: IEventEmitter<unknown>;
   event: string;
 }
@@ -30,7 +31,7 @@ export class Observablemap {
     if (existingBundle) {
       return existingBundle.observable;
     } else {
-      const emitterObservable = plugins.rxjs.fromEvent<T>(emitterArg as any, eventArg);
+      const emitterObservable = rxjs.fromEvent<T>(emitterArg as any, eventArg);
       this.observableEmitterBundleObjectmap.add({
         observable: emitterObservable,
         emitter: emitterArg,

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 };