2.0.24

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartrx",
-  "version": "2.0.19",
+  "version": "2.0.24",
   "private": false,
   "description": "smart wrapper for rxjs",
   "main": "dist_ts/index.js",
@@ -12,19 +12,19 @@
     "build": "(tsbuild --web && tsbundle npm)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsbuild": "^2.1.29",
-    "@gitzone/tsbundle": "^1.0.78",
+    "@gitzone/tsbundle": "^1.0.89",
-    "@gitzone/tsrun": "^1.2.12",
+    "@gitzone/tsrun": "^1.2.18",
-    "@gitzone/tstest": "^1.0.44",
+    "@gitzone/tstest": "^1.0.60",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@pushrocks/tapbundle": "^4.0.0",
-    "@types/node": "^14.11.2",
+    "@types/node": "^17.0.10",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/lik": "^4.0.17",
+    "@pushrocks/lik": "^5.0.1",
-    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartpromise": "^3.1.6",
-    "rxjs": "^6.6.3"
+    "rxjs": "^7.5.2"
   },
   "files": [
     "ts/**/*",

test/test.observableintake.ts

@@ -4,12 +4,12 @@ import * as smartrx from '../ts/index';
 
 tap.test('should create a valid instance of observableinstake', async () => {
   const testObservableIntake = new smartrx.ObservableIntake();
-  expect(testObservableIntake).to.be.instanceOf(smartrx.ObservableIntake);
+  expect(testObservableIntake).toBeInstanceOf(smartrx.ObservableIntake);
 });
 
 tap.test('expect testObserservableIntake to push things', async (tools) => {
   const testObserservableIntake = new smartrx.ObservableIntake();
-  testObserservableIntake.subscribe((value) => {
+  testObserservableIntake.subscribe((value: any) => {
     console.log(value);
   });
 
@@ -25,7 +25,7 @@ tap.test('expect testObserservableIntake to push things', async (tools) => {
   testObserservableIntake.push('wow');
   testObserservableIntake.makeBuffered();
   testObserservableIntake.push('jo');
-  testObserservableIntake.subscribe((value) => {
+  testObserservableIntake.subscribe((value: any) => {
     console.log(value);
     testObserservableIntake.signalComplete();
   });

test/test.observablemap.ts

@@ -15,7 +15,7 @@ let testEmitter: events.EventEmitter;
 
 tap.test('should create an instance', async () => {
   testObservablemap = new smartrx.Observablemap();
-  expect(testObservablemap).be.instanceof(smartrx.Observablemap);
+  expect(testObservablemap).toBeInstanceOf(smartrx.Observablemap);
 });
 
 tap.test('should accept a new emitter', async () => {
@@ -27,8 +27,8 @@ tap.test('should accept a new emitter', async () => {
   });
   testObservable2 = testObservablemap.getObservableForEmitterEvent(testEmitter, 'event1');
   testObservable3 = testObservablemap.getObservableForEmitterEvent(testEmitter, 'event2');
-  expect(testObservable1 === testObservable2).to.be.true;
+  expect(testObservable1 === testObservable2).toBeTrue();
-  expect(testObservable1 === testObservable3).to.be.false;
+  expect(testObservable1 === testObservable3).toBeFalse();
   testEmitter.emit('event1');
   await done.promise;
 });

ts/index.ts

@@ -1,6 +1,7 @@
 import * as plugins from './smartrx.plugins';
 export * from './smartrx.classes.observablemap';
 export * from './smartrx.classes.observableintake';
-
 import * as rxjs from './smartrx.plugins.rxjs';
-export { rxjs };
+export {
+  rxjs
+}

ts/smartrx.classes.observableintake.ts

@@ -1,40 +1,42 @@
 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 = {
-    next: (payloadArg) => {
+    next: (payloadArg: T) => {
       // nothing
     },
-    complete: (payloadArg) => {
+    complete: (payloadArg: T) => {
       // nothing
     },
   };
-  private generator = null;
+  private generator: Generator<T> = null;
   private buffered = false;
-  private payloadBuffer = [];
+  private payloadBuffer: any[] = [];
 
   constructor() {
-    this.observable = plugins.rxjs.Observable.create((observerArg) => {
+    this.observable = rxjs.Observable.create((observerArg: rxjs.Observer<any>) => {
-      this.observableFunctions.next = (...args) => {
+      this.observableFunctions.next = (...args: any) => {
-        return observerArg.next(...args);
+        return observerArg.next(args);
       };
-      this.observableFunctions.complete = (...args) => {
+      this.observableFunctions.complete = () => {
         this.completedDeffered.resolve();
-        return observerArg.complete(...args);
+        return observerArg.complete();
       };
     });
     this.completedDeffered = plugins.smartpromise.defer();
     this.completed = this.completedDeffered.promise;
   }
 
-  public setObservable(observableFunc) {
+  public setObservable(observableFunc: rxjs.Observable<any>) {
-    this.observable = observableFunc();
+    this.observable = observableFunc;
   }
 
   public push(payloadArg: T) {
@@ -59,7 +61,7 @@ export class ObservableIntake<T> {
    * sets a generator to query the next pushed value
    * @param generatorArg
    */
-  public setGenerator(generatorArg) {
+  public setGenerator(generatorArg: Generator<T>) {
     this.generator = generatorArg;
   }
 
@@ -67,7 +69,7 @@ export class ObservableIntake<T> {
     this.buffered = true;
   }
 
-  public subscribe(...args) {
+  public subscribe(...args: any) {
     return this.observable.subscribe(...args);
   }
 
@@ -83,8 +85,8 @@ export class ObservableIntake<T> {
         if (this.payloadBuffer.length > 0) {
           this.internalPush(this.payloadBuffer.shift());
         } else {
-          const nextPayload = this.generator();
+          const nextPayload = this.generator.next();
-          this.internalPush(nextPayload);
+          this.internalPush(nextPayload.value);
         }
       }
     }
@@ -97,7 +99,7 @@ export class ObservableIntake<T> {
     this.observableFunctions.complete();
   }
 
-  private internalPush(payloadArg) {
+  private internalPush(payloadArg: T) {
     this.observableFunctions.next(payloadArg);
   }
 }

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;
 }
@@ -24,13 +25,13 @@ export class Observablemap {
    * In case event has been registered before the same observable is returned.
    */
   public getObservableForEmitterEvent<T>(emitterArg: IEventEmitter<T>, eventArg: string) {
-    const existingBundle = this.observableEmitterBundleObjectmap.find((bundleArg) => {
+    const existingBundle = this.observableEmitterBundleObjectmap.findSync((bundleArg) => {
       return bundleArg.emitter === emitterArg && bundleArg.event === eventArg;
     });
     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.rxjs.ts

@@ -1,6 +1,6 @@
 // this file is intended to keep the bundle size down
 
-export { Observable, Subject, fromEvent, ReplaySubject, Subscription } from 'rxjs';
+export { Observable, Subject, fromEvent, ReplaySubject, Subscription, Observer } from 'rxjs';
 
 import { startWith, takeUntil, map, debounce, debounceTime } from 'rxjs/operators';
 

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