2.0.18

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/
 
 # custom

.gitlab-ci.yml

@@ -3,14 +3,14 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
-  - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
-- test
-- release
-- metadata
+  - security
+  - test
+  - release
+  - metadata
 
 # ====================
 # security stage
@@ -18,21 +18,24 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
-snyk:
+audit:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
-    - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # test stage
@@ -41,37 +44,40 @@ snyk:
 testStable:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install stable
-  - npmci npm install
-  - npmci npm test
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv
 
 testBuild:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install lts
-  - npmci npm install
-  - npmci command npm run build
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install lts
-  - npmci npm publish
+    - npmci node install stable
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
@@ -81,33 +87,35 @@ codequality:
   allow_failure: true
   script:
     - npmci command npm install -g tslint typescript
+    - npmci npm prepare
     - npmci npm install
     - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
-  - docker
-  - priv
+    - lossless
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:stable-dind
   stage: metadata
   script:
+    - npmci node install lts
     - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
     - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -115,5 +123,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone",
+            "properties": {
+              "projectType": {
+                "type": "string",
+                "enum": ["website", "element", "service", "npm"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

@@ -7,6 +7,7 @@
     "command": "rm -r node_modules && yarn install && yarn test"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",

package.json

@@ -1,40 +1,44 @@
 {
   "name": "@pushrocks/smartrx",
-  "version": "2.0.5",
+  "version": "2.0.18",
   "private": false,
   "description": "smart wrapper for rxjs",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --web && tsbundle npm)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.24",
-    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^12.7.4",
-    "tslint": "^5.20.0",
+    "@gitzone/tsbuild": "^2.1.24",
+    "@gitzone/tsbundle": "^1.0.72",
+    "@gitzone/tsrun": "^1.2.12",
+    "@gitzone/tstest": "^1.0.43",
+    "@pushrocks/tapbundle": "^3.2.9",
+    "@types/node": "^14.0.22",
+    "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/lik": "^3.0.11",
-    "@pushrocks/smartevent": "^2.0.3",
-    "@pushrocks/smartpromise": "^3.0.2",
-    "rxjs": "^6.5.3"
+    "@pushrocks/lik": "^4.0.14",
+    "@pushrocks/smartpromise": "^3.0.6",
+    "rxjs": "^6.6.0"
   },
   "files": [
-    "ts/*",
-    "ts_web/*",
-    "dist/*",
-    "dist_web/*",
-    "dist_ts_web/*",
-    "assets/*",
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -8,24 +8,28 @@ smart wrapper for rxjs
 * [docs (typedoc)](https://pushrocks.gitlab.io/smartrx/)
 
 ## Status for master
-[![build status](https://gitlab.com/pushrocks/smartrx/badges/master/build.svg)](https://gitlab.com/pushrocks/smartrx/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/smartrx/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartrx/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartrx.svg)](https://www.npmjs.com/package/@pushrocks/smartrx)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartrx/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartrx)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/smartrx/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/smartrx/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/smartrx)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/smartrx)](https://lossless.cloud)
+TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
+node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
+PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@pushrocks/smartrx)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/smartrx)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/smartrx)](https://lossless.cloud)
+Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
 Use TypeScript for best in class instellisense.
 
-For further information read the linked docs at the top of this README.
+## Contribution
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
-
-[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
 
 For further information read the linked docs at the top of this readme.
 

test/test.observableintake.ts

@@ -7,9 +7,9 @@ tap.test('should create a valid instance of observableinstake', async () => {
   expect(testObservableIntake).to.be.instanceOf(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) => {
     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) => {
     console.log(value);
     testObserservableIntake.signalComplete();
   });

test/test.observablemap.ts

@@ -22,7 +22,7 @@ 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');

ts/index.ts

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

ts/smartrx.classes.observableintake.ts

@@ -1,28 +1,26 @@
 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 => {
+    next: (payloadArg) => {
       // nothing
     },
-    complete: payloadArg => {
+    complete: (payloadArg) => {
       // nothing
-    }
+    },
   };
   private generator = null;
   private buffered = false;
   private payloadBuffer = [];
 
   constructor() {
-    this.observable = Observable.create(observerArg => {
+    this.observable = plugins.rxjs.Observable.create((observerArg) => {
       this.observableFunctions.next = (...args) => {
         return observerArg.next(...args);
       };

ts/smartrx.classes.observablemap.ts

@@ -1,12 +1,15 @@
 import * as plugins from './smartrx.plugins';
-import { Observable, fromEvent } from 'rxjs';
-import { Objectmap, Stringmap } from '@pushrocks/lik';
+
+export interface IEventEmitter<T = any> {
+  on: (eventNameArg: string, eventHandlerArg: (eventPayload: T) => any) => void;
+}
+
 /**
  * bundles an observable with an emitter
  */
-export interface ObservableEmitterBundle {
+export interface IObservableEmitterBundle {
   observable: plugins.rxjs.Observable<any>;
-  emitter: plugins.events.EventEmitter;
+  emitter: IEventEmitter<unknown>;
   event: string;
 }
 
@@ -14,24 +17,24 @@ 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<T>(emitterArg: IEventEmitter<T>, 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<T>(emitterArg as any, eventArg);
+      this.observableEmitterBundleObjectmap.add({
         observable: emitterObservable,
         emitter: emitterArg,
-        event: eventArg
+        event: eventArg,
       });
       return emitterObservable;
     }

ts/smartrx.plugins.rxjs.ts

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

ts/smartrx.plugins.ts

@@ -1,7 +1,5 @@
-import * as events from 'events';
 import * as lik from '@pushrocks/lik';
-import * as rxjs from 'rxjs';
-import * as smartevent from '@pushrocks/smartevent';
+import * as rxjs from './smartrx.plugins.rxjs';
 import * as smartpromise from '@pushrocks/smartpromise';
 
-export { events, lik, rxjs, smartevent, smartpromise };
+export { lik, rxjs, smartpromise };