3.0.4

.gitlab-ci.yml

@@ -1,127 +0,0 @@
-# gitzone ci_default
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-    - .npmci_cache/
-  key: '$CI_BUILD_STAGE'
-
-stages:
-  - security
-  - test
-  - release
-  - metadata
-
-# ====================
-# security stage
-# ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-audit:
-  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
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# test stage
-# ====================
-
-testStable:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - 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
-
-release:
-  stage: release
-  script:
-    - npmci node install stable
-    - npmci npm publish
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  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:
-    - lossless
-    - docker
-    - priv
-
-trigger:
-  stage: metadata
-  script:
-    - npmci trigger
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-pages:
-  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:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - public
-  allow_failure: true

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
-      "type": "node",
+      "command": "npm test",
+      "name": "Run npm test",
       "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"
+      "type": "node-terminal"
     }
   ]
 }

.vscode/settings.json

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

npmextra.json

@@ -10,10 +10,10 @@
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "gitscope": "push.rocks",
       "gitrepo": "smartrx",
-      "shortDescription": "smart wrapper for rxjs",
-      "npmPackagename": "@pushrocks/smartrx",
+      "description": "smart wrapper for rxjs",
+      "npmPackagename": "@push.rocks/smartrx",
       "license": "MIT"
     }
   }

package.json

@@ -1,30 +1,29 @@
 {
-  "name": "@pushrocks/smartrx",
-  "version": "2.0.15",
+  "name": "@push.rocks/smartrx",
+  "version": "3.0.4",
   "private": false,
   "description": "smart wrapper for rxjs",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild && tsbundle npm)"
+    "build": "(tsbuild --web && tsbundle npm)",
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@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"
+    "@gitzone/tsbuild": "^2.1.66",
+    "@gitzone/tsbundle": "^2.0.8",
+    "@gitzone/tsrun": "^1.2.44",
+    "@gitzone/tstest": "^1.0.77",
+    "@push.rocks/tapbundle": "^5.0.12",
+    "@types/node": "^20.4.4"
   },
   "dependencies": {
-    "@pushrocks/lik": "^4.0.11",
-    "@pushrocks/smartpromise": "^3.0.6",
-    "rxjs": "^6.5.5"
+    "@push.rocks/smartpromise": "^4.0.2",
+    "rxjs": "^7.8.1"
   },
   "files": [
     "ts/**/*",
@@ -37,5 +36,8 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -8,13 +8,20 @@ smart wrapper for rxjs
 * [docs (typedoc)](https://pushrocks.gitlab.io/smartrx/)
 
 ## Status for master
-[![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/)
+
+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
 

test/test.observableintake.both.ts

@@ -1,15 +1,15 @@
-import { tap, expect } from '@pushrocks/tapbundle';
+import { tap, expect } from '@push.rocks/tapbundle';
 
-import * as smartrx from '../ts/index';
+import * as smartrx from '../ts/index.js';
 
 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.node.ts

@@ -1,11 +1,11 @@
 // import test framework
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 import * as events from 'events';
 import * as rx from 'rxjs';
-import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartpromise from '@push.rocks/smartpromise';
 
 // import the module
-import * as smartrx from '../ts/index';
+import * as smartrx from '../ts/index.js';
 
 let testObservablemap: smartrx.Observablemap;
 let testObservable1: rx.Observable<any>;
@@ -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 = testObservablemap.getSubjectForEmitterEvent(testEmitter, 'event1');
+  testObservable1.subscribe((x) => {
     done.resolve();
   });
-  testObservable2 = testObservablemap.getObservableForEmitterEvent(testEmitter, 'event1');
-  testObservable3 = testObservablemap.getObservableForEmitterEvent(testEmitter, 'event2');
-  expect(testObservable1 === testObservable2).to.be.true;
-  expect(testObservable1 === testObservable3).to.be.false;
+  testObservable2 = testObservablemap.getSubjectForEmitterEvent(testEmitter, 'event1');
+  testObservable3 = testObservablemap.getSubjectForEmitterEvent(testEmitter, 'event2');
+  expect(testObservable1 === testObservable2).toBeTrue();
+  expect(testObservable1 === testObservable3).toBeFalse();
   testEmitter.emit('event1');
   await done.promise;
 });

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@push.rocks/smartrx',
+  version: '3.0.4',
+  description: 'smart wrapper for rxjs'
+}

ts/index.ts

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

ts/smartrx.classes.observableintake.ts

@@ -1,40 +1,42 @@
-import * as plugins from './smartrx.plugins';
+import * as plugins from './smartrx.plugins.js';
+
+import * as rxjs from './smartrx.plugins.rxjs.js';
 
 /**
  * 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.observableFunctions.next = (...args) => {
-        return observerArg.next(...args);
+    this.observable = new rxjs.Observable((observerArg: rxjs.Observer<any>) => {
+      this.observableFunctions.next = (...args: any) => {
+        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) {
-    this.observable = observableFunc();
+  public setObservable(observableFunc: rxjs.Observable<any>) {
+    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();
-          this.internalPush(nextPayload);
+          const nextPayload = this.generator.next();
+          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,15 +1,16 @@
-import * as plugins from './smartrx.plugins';
+import * as plugins from './smartrx.plugins.js';
+import * as rxjs from './smartrx.plugins.rxjs.js';
 
 export interface IEventEmitter<T = any> {
-  on: (eventNameArg: string, eventHandlerArg: ((eventPayload: T) => any)) => void;
+  on: (eventNameArg: string, eventHandlerArg: (eventPayload: T) => any) => void;
 }
 
 /**
  * bundles an observable with an emitter
  */
-export interface IObservableEmitterBundle {
-  observable: plugins.rxjs.Observable<any>;
-  emitter: IEventEmitter<unknown>;
+export interface IObservableEventBundle<T> {
+  subject: rxjs.Subject<any>;
+  eventRef: T;
   event: string;
 }
 
@@ -17,26 +18,56 @@ export interface IObservableEmitterBundle {
  * manages observables by making sure that only one observable is regsitered per event
  */
 export class Observablemap {
-  public observableEmitterBundleObjectmap = new plugins.lik.ObjectMap<IObservableEmitterBundle>();
+  public observableEventEmitterBundleArray = new Array<
+    IObservableEventBundle<IEventEmitter<unknown>>
+  >();
+  public observableEventTargetBundleArray = new Array<IObservableEventBundle<EventTarget>>();
 
   /**
-   * creates a new observable if not yet registered for the same event.
+   * creates a hot subject if not yet registered for the event.
    * 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 => {
-      return bundleArg.emitter === emitterArg && bundleArg.event === eventArg;
+  public getSubjectForEmitterEvent<T>(
+    emitterArg: IEventEmitter<T>,
+    eventArg: string
+  ): rxjs.Subject<T> {
+    const existingBundle = this.observableEventEmitterBundleArray.find((bundleArg) => {
+      return bundleArg.eventRef === emitterArg && bundleArg.event === eventArg;
     });
     if (existingBundle) {
-      return existingBundle.observable;
+      return existingBundle.subject;
     } else {
-      const emitterObservable = plugins.rxjs.fromEvent<T>(emitterArg as any, eventArg);
-      this.observableEmitterBundleObjectmap.add({
-        observable: emitterObservable,
-        emitter: emitterArg,
-        event: eventArg
-      });
-      return emitterObservable;
+      const emitterObservable = rxjs.fromEvent<T>(emitterArg as any, eventArg);
+      const emitterSubject = new rxjs.Subject();
+      emitterObservable.subscribe(emitterSubject);
+      const newBundle: IObservableEventBundle<IEventEmitter> = {
+        subject: emitterSubject,
+        eventRef: emitterArg,
+        event: eventArg,
+      };
+      this.observableEventEmitterBundleArray.push(newBundle);
+      return newBundle.subject;
+    }
+  }
+
+  public getSubjectForEventTarget<T>(
+    eventTargetArg: EventTarget,
+    eventNameArg: string
+  ): rxjs.Subject<T> {
+    const existingBundle = this.observableEventTargetBundleArray.find((bundleArg) => {
+      return bundleArg.eventRef === eventTargetArg && bundleArg.event === eventNameArg;
+    });
+    if (existingBundle) {
+      return existingBundle.subject;
+    } else {
+      const emitterSubject = new rxjs.Subject();
+      const newBundle: IObservableEventBundle<EventTarget> = {
+        subject: emitterSubject,
+        eventRef: eventTargetArg,
+        event: eventNameArg,
+      };
+      this.observableEventTargetBundleArray.push(newBundle);
+      return newBundle.subject;
     }
   }
 }

ts/smartrx.plugins.rxjs.ts

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

ts/smartrx.plugins.ts

@@ -1,5 +1,3 @@
-import * as lik from '@pushrocks/lik';
-import * as rxjs from './smartrx.plugins.rxjs';
-import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartpromise from '@push.rocks/smartpromise';
 
-export { lik, rxjs, smartpromise };
+export { smartpromise };

tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "verbatimModuleSyntax": true,
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "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"
-}