2.0.7

.gitignore

@@ -1,5 +1,20 @@
 .nogit/
-node_modules/
+
+# artifacts
 coverage/
 public/
 pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_*/
+
+# custom

.gitlab-ci.yml

@@ -1,16 +1,16 @@
-# gitzone standard
-image: hosttoday/ht-docker-node:npmci
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
     - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
-- test
-- release
-- metadata
+  - security
+  - test
+  - release
+  - metadata
 
 # ====================
 # security stage
@@ -20,49 +20,28 @@ mirror:
   script:
     - npmci git mirror
   tags:
+    - 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:
+    - lossless
     - docker
     - notpriv
 
 # ====================
 # test stage
 # ====================
-testLEGACY:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install legacy
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-  allow_failure: true
 
-testLTS:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
+testStable:
   stage: test
   script:
     - npmci npm prepare
@@ -71,6 +50,20 @@ testSTABLE:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
+    - lossless
+    - docker
+    - priv
+
+testBuild:
+  stage: test
+  script:
+    - npmci npm prepare
+    - npmci node install stable
+    - npmci npm install
+    - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+    - lossless
     - docker
     - notpriv
 
@@ -82,6 +75,7 @@ release:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
@@ -90,20 +84,14 @@ release:
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SOURCE_CODE="$PWD"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
+    - npmci command npm install -g tslint typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
+    - lossless
     - docker
     - priv
 
@@ -114,18 +102,20 @@ trigger:
   only:
     - tags
   tags:
+    - lossless
     - docker
     - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci node install lts
+    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -135,13 +125,3 @@ pages:
     paths:
       - public
   allow_failure: true
-
-windowsCompatibility:
-  image: stefanscherer/node-windows:10-build-tools
-  stage: metadata
-  script:
-  - npm install & npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - windows
-  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

@@ -5,5 +5,16 @@
   },
   "npmdocker": {
     "command": "rm -r node_modules && yarn install && yarn test"
+  },
+  "gitzone": {
+    "projectType": "npm",
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "smartrx",
+      "shortDescription": "smart wrapper for rxjs",
+      "npmPackagename": "@pushrocks/smartrx",
+      "license": "MIT"
+    }
   }
 }

package.json

@@ -1,27 +1,41 @@
 {
   "name": "@pushrocks/smartrx",
-  "version": "2.0.1",
+  "version": "2.0.7",
   "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 && tsbundle npm)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
-    "@gitzone/tsrun": "^1.1.12",
-    "@gitzone/tstest": "^1.0.15",
-    "@pushrocks/tapbundle": "^3.0.7",
-    "@types/node": "^10.11.6"
+    "@gitzone/tsbuild": "^2.1.24",
+    "@gitzone/tsbundle": "^1.0.69",
+    "@gitzone/tsrun": "^1.2.8",
+    "@gitzone/tstest": "^1.0.28",
+    "@pushrocks/tapbundle": "^3.2.1",
+    "@types/node": "^14.0.5",
+    "tslint": "^6.1.2",
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/lik": "^3.0.1",
-    "@pushrocks/smartpromise": "^2.0.5",
-    "rxjs": "^6.3.3",
-    "smartevent": "^1.0.1"
-  }
+    "@pushrocks/lik": "^4.0.6",
+    "@pushrocks/smartpromise": "^3.0.6",
+    "rxjs": "^6.5.5"
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

readme.md

@@ -1,25 +1,20 @@
-# smartrx
-
+# @pushrocks/smartrx
 smart wrapper for rxjs
 
-## Availabililty
-
-[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartrx)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartrx)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartrx)
-[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartrx/)
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartrx)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/smartrx)
+* [github.com (source mirror)](https://github.com/pushrocks/smartrx)
+* [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/smartrx.svg)](https://www.npmjs.com/package/smartrx)
-[![Dependency Status](https://david-dm.org/pushrocks/smartrx.svg)](https://david-dm.org/pushrocks/smartrx)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartrx/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartrx/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/smartrx/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartrx)
-[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
+[![pipeline status](https://gitlab.com/pushrocks/smartrx/badges/master/pipeline.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/)
 
 ## Usage
 
@@ -31,3 +26,15 @@ For further information read the linked docs at the top of this README.
 > | 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)
+
+
+## Contribution
+
+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.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

ts/index.ts

@@ -1,6 +1,4 @@
 import * as plugins from './smartrx.plugins';
-
-export let standardExport = 'Hi there! :) This is a exported string';
 export * from './smartrx.classes.observablemap';
 export * from './smartrx.classes.observableintake';
 

ts/smartrx.classes.observableintake.ts

@@ -1,14 +1,12 @@
 import * as plugins from './smartrx.plugins';
-import { Observable, Subscription } from 'rxjs';
-import { Deferred } from 'smartq';
 
 /**
  * ObservableIntake
  */
 export class ObservableIntake<T> {
-  observable: Observable<T>;
-  completed: Promise<void>;
-  private completedDeffered: Deferred<void>;
+  public observable: plugins.rxjs.Observable<T>;
+  public completed: Promise<void>;
+  private completedDeffered: plugins.smartpromise.Deferred<void>;
   private observableFunctions: any = {
     next: payloadArg => {
       // nothing
@@ -22,7 +20,7 @@ export class ObservableIntake<T> {
   private payloadBuffer = [];
 
   constructor() {
-    this.observable = Observable.create(observerArg => {
+    this.observable = plugins.rxjs.Observable.create(observerArg => {
       this.observableFunctions.next = (...args) => {
         return observerArg.next(...args);
       };
@@ -35,11 +33,11 @@ export class ObservableIntake<T> {
     this.completed = this.completedDeffered.promise;
   }
 
-  setObservable(observableFunc) {
+  public setObservable(observableFunc) {
     this.observable = observableFunc();
   }
 
-  push(payloadArg: T) {
+  public push(payloadArg: T) {
     if (this.buffered) {
       this.payloadBuffer.push(payloadArg);
     } else {
@@ -51,8 +49,8 @@ export class ObservableIntake<T> {
    * pushes many payloads as array
    * @param payloadArgArray
    */
-  pushMany(payloadArgArray: T[]) {
-    for (let item of payloadArgArray) {
+  public pushMany(payloadArgArray: T[]) {
+    for (const item of payloadArgArray) {
       this.push(item);
     }
   }
@@ -61,15 +59,15 @@ export class ObservableIntake<T> {
    * sets a generator to query the next pushed value
    * @param generatorArg
    */
-  setGenerator(generatorArg) {
+  public setGenerator(generatorArg) {
     this.generator = generatorArg;
   }
 
-  makeBuffered() {
+  public makeBuffered() {
     this.buffered = true;
   }
 
-  subscribe(...args) {
+  public subscribe(...args) {
     return this.observable.subscribe(...args);
   }
 
@@ -77,7 +75,7 @@ export class ObservableIntake<T> {
    * request the next values in the quantity specified
    * @param howManyArg if a generator is set, of a buffer exists, this allows retrieving values
    */
-  request(howManyArg: number) {
+  public request(howManyArg: number) {
     if (howManyArg === 0) {
       return;
     } else {
@@ -95,7 +93,7 @@ export class ObservableIntake<T> {
   /**
    * signals the completion of this observable
    */
-  signalComplete() {
+  public signalComplete() {
     this.observableFunctions.complete();
   }
 

ts/smartrx.classes.observablemap.ts

@@ -1,12 +1,12 @@
 import * as plugins from './smartrx.plugins';
-import { Observable, fromEvent } from 'rxjs';
-import { Objectmap, Stringmap } from '@pushrocks/lik';
+import { EventEmitter } from '@pushrocks/smartevent';
+
 /**
  * bundles an observable with an emitter
  */
-export interface ObservableEmitterBundle {
+export interface IObservableEmitterBundle {
   observable: plugins.rxjs.Observable<any>;
-  emitter: plugins.events.EventEmitter;
+  emitter: EventEmitter;
   event: string;
 }
 
@@ -14,21 +14,21 @@ 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(emitterArg: EventEmitter, 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(emitterArg, eventArg);
+      this.observableEmitterBundleObjectmap.add({
         observable: emitterObservable,
         emitter: emitterArg,
         event: eventArg

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 'smartevent';
 import * as smartpromise from '@pushrocks/smartpromise';
 
-export { events, lik, rxjs, smartevent, smartpromise };
+export { lik, rxjs, smartpromise };

tslint.json

@@ -1,3 +1,17 @@
 {
-    "extends": "tslint-config-standard"
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
 }