2.0.22

.gitlab-ci.yml

@@ -19,23 +19,35 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-audit:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+
+auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -50,9 +62,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -63,9 +73,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,6 +93,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartrx",
-  "version": "2.0.16",
+  "version": "2.0.22",
   "private": false,
   "description": "smart wrapper for rxjs",
   "main": "dist_ts/index.js",
@@ -9,22 +9,22 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild && tsbundle npm)"
+    "build": "(tsbuild --web && tsbundle npm)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.24",
+    "@gitzone/tsbuild": "^2.1.29",
-    "@gitzone/tsbundle": "^1.0.69",
+    "@gitzone/tsbundle": "^1.0.89",
-    "@gitzone/tsrun": "^1.2.12",
+    "@gitzone/tsrun": "^1.2.18",
-    "@gitzone/tstest": "^1.0.33",
+    "@gitzone/tstest": "^1.0.60",
-    "@pushrocks/tapbundle": "^3.2.1",
+    "@pushrocks/tapbundle": "^4.0.0",
-    "@types/node": "^14.0.14",
+    "@types/node": "^17.0.10",
-    "tslint": "^6.1.2",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/lik": "^4.0.13",
+    "@pushrocks/lik": "^5.0.1",
-    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartpromise": "^3.1.6",
-    "rxjs": "^6.5.5"
+    "rxjs": "^7.5.2"
   },
   "files": [
     "ts/**/*",
@@ -37,5 +37,8 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

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 => {
+tap.test('expect testObserservableIntake to push things', async (tools) => {
   const testObserservableIntake = new smartrx.ObservableIntake();
-  testObserservableIntake.subscribe(value => {
+  testObserservableIntake.subscribe((value: any) => {
     console.log(value);
   });
 
@@ -19,13 +19,13 @@ tap.test('expect testObserservableIntake to push things', async tools => {
   await testObserservableIntake.completed;
 });
 
-tap.test('expect testObserservableIntake to push things', async tools => {
+tap.test('expect testObserservableIntake to push things', async (tools) => {
   const testObserservableIntake = new smartrx.ObservableIntake();
   testObserservableIntake.push('hi');
   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,20 +15,20 @@ 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 () => {
   let done = smartpromise.defer();
   testEmitter = new events.EventEmitter();
   testObservable1 = testObservablemap.getObservableForEmitterEvent(testEmitter, 'event1');
-  testObservable1.subscribe(x => {
+  testObservable1.subscribe((x) => {
     done.resolve();
   });
   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,4 @@
 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

@@ -8,33 +8,33 @@ export class ObservableIntake<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 = plugins.rxjs.Observable.create((observerArg: plugins.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: plugins.rxjs.Observable<any>) {
-    this.observable = observableFunc();
+    this.observable = observableFunc;
   }
 
   public push(payloadArg: T) {
@@ -59,7 +59,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 +67,7 @@ export class ObservableIntake<T> {
     this.buffered = true;
   }
 
-  public subscribe(...args) {
+  public subscribe(...args: any) {
     return this.observable.subscribe(...args);
   }
 
@@ -83,8 +83,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 +97,7 @@ export class ObservableIntake<T> {
     this.observableFunctions.complete();
   }
 
-  private internalPush(payloadArg) {
+  private internalPush(payloadArg: T) {
     this.observableFunctions.next(payloadArg);
   }
 }

ts/smartrx.classes.observablemap.ts

@@ -24,7 +24,7 @@ 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) {
@@ -34,7 +34,7 @@ export class Observablemap {
       this.observableEmitterBundleObjectmap.add({
         observable: emitterObservable,
         emitter: emitterArg,
-        event: eventArg
+        event: eventArg,
       });
       return emitterObservable;
     }

ts/smartrx.plugins.rxjs.ts

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