3.0.3

.gitlab-ci.yml

@@ -12,20 +12,12 @@ stages:
   - release
   - metadata
 
+before_script:
+  - npm install -g @shipzone/npmci
+
 # ====================
 # security stage
 # ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
 auditProductionDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
@@ -36,6 +28,7 @@ auditProductionDependencies:
     - npmci command npm audit --audit-level=high --only=prod --production
   tags:
     - docker
+  allow_failure: true
 
 auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
@@ -96,10 +89,9 @@ codequality:
   only:
     - tags
   script:
-    - npmci command npm install -g tslint typescript
+    - npmci command npm install -g typescript
     - npmci npm prepare
     - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
     - lossless
     - docker
@@ -119,11 +111,10 @@ trigger:
 pages:
   stage: metadata
   script:
-    - npmci node install lts
+    - npmci node install stable 
-    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
     - lossless
     - docker

.vscode/launch.json

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

npmextra.json

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

package.json

@@ -1,30 +1,29 @@
 {
-  "name": "@pushrocks/smartrx",
+  "name": "@push.rocks/smartrx",
-  "version": "2.0.23",
+  "version": "3.0.3",
   "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 --web && tsbundle npm)"
+    "build": "(tsbuild --web && tsbundle npm)",
+    "buildDocs": "tsdoc"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.29",
+    "@gitzone/tsbuild": "^2.1.66",
-    "@gitzone/tsbundle": "^1.0.89",
+    "@gitzone/tsbundle": "^2.0.8",
-    "@gitzone/tsrun": "^1.2.18",
+    "@gitzone/tsrun": "^1.2.42",
-    "@gitzone/tstest": "^1.0.60",
+    "@gitzone/tstest": "^1.0.73",
-    "@pushrocks/tapbundle": "^4.0.0",
+    "@push.rocks/tapbundle": "^5.0.4",
-    "@types/node": "^17.0.10",
+    "@types/node": "^20.4.1"
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/lik": "^5.0.1",
+    "@push.rocks/smartpromise": "^4.0.2",
-    "@pushrocks/smartpromise": "^3.1.6",
+    "rxjs": "^7.8.1"
-    "rxjs": "^7.5.2"
   },
   "files": [
     "ts/**/*",

test/test.observableintake.both.ts

@@ -1,6 +1,6 @@
-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();

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>;
@@ -21,12 +21,12 @@ tap.test('should create an instance', async () => {
 tap.test('should accept a new emitter', async () => {
   let done = smartpromise.defer();
   testEmitter = new events.EventEmitter();
-  testObservable1 = testObservablemap.getObservableForEmitterEvent(testEmitter, 'event1');
+  testObservable1 = testObservablemap.getSubjectForEmitterEvent(testEmitter, 'event1');
   testObservable1.subscribe((x) => {
     done.resolve();
   });
-  testObservable2 = testObservablemap.getObservableForEmitterEvent(testEmitter, 'event1');
+  testObservable2 = testObservablemap.getSubjectForEmitterEvent(testEmitter, 'event1');
-  testObservable3 = testObservablemap.getObservableForEmitterEvent(testEmitter, 'event2');
+  testObservable3 = testObservablemap.getSubjectForEmitterEvent(testEmitter, 'event2');
   expect(testObservable1 === testObservable2).toBeTrue();
   expect(testObservable1 === testObservable3).toBeFalse();
   testEmitter.emit('event1');

ts/00_commitinfo_data.ts

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

ts/index.ts

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

ts/smartrx.classes.observableintake.ts

@@ -1,10 +1,12 @@
-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 = {
@@ -20,7 +22,7 @@ export class ObservableIntake<T> {
   private payloadBuffer: any[] = [];
 
   constructor() {
-    this.observable = plugins.rxjs.Observable.create((observerArg: plugins.rxjs.Observer<any>) => {
+    this.observable = new rxjs.Observable((observerArg: rxjs.Observer<any>) => {
       this.observableFunctions.next = (...args: any) => {
         return observerArg.next(args);
       };
@@ -33,7 +35,7 @@ export class ObservableIntake<T> {
     this.completed = this.completedDeffered.promise;
   }
 
-  public setObservable(observableFunc: plugins.rxjs.Observable<any>) {
+  public setObservable(observableFunc: rxjs.Observable<any>) {
     this.observable = observableFunc;
   }
 

ts/smartrx.classes.observablemap.ts

@@ -1,5 +1,5 @@
-import * as plugins from './smartrx.plugins';
+import * as plugins from './smartrx.plugins.js';
-import * as rxjs from './smartrx.plugins.rxjs';
+import * as rxjs from './smartrx.plugins.rxjs.js';
 
 export interface IEventEmitter<T = any> {
   on: (eventNameArg: string, eventHandlerArg: (eventPayload: T) => any) => void;
@@ -8,9 +8,9 @@ export interface IEventEmitter<T = any> {
 /**
  * bundles an observable with an emitter
  */
-export interface IObservableEmitterBundle {
+export interface IObservableEventBundle<T> {
-  observable: rxjs.Observable<any>;
+  subject: rxjs.Subject<any>;
-  emitter: IEventEmitter<unknown>;
+  eventRef: T;
   event: string;
 }
 
@@ -18,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) {
+  public getSubjectForEmitterEvent<T>(
-    const existingBundle = this.observableEmitterBundleObjectmap.findSync((bundleArg) => {
+    emitterArg: IEventEmitter<T>,
-      return bundleArg.emitter === emitterArg && bundleArg.event === eventArg;
+    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 = rxjs.fromEvent<T>(emitterArg as any, eventArg);
-      this.observableEmitterBundleObjectmap.add({
+      const emitterSubject = new rxjs.Subject();
-        observable: emitterObservable,
+      emitterObservable.subscribe(emitterSubject);
-        emitter: emitterArg,
+      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;
     });
-      return emitterObservable;
+    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,8 +1,10 @@
 // this file is intended to keep the bundle size down
 
-export { Observable, Subject, fromEvent, ReplaySubject, Subscription, Observer } from 'rxjs';
+export { Observable, Subject, fromEvent, ReplaySubject, Subscription } from 'rxjs';
 
-import { startWith, takeUntil, map, debounce, debounceTime } from 'rxjs/operators';
+export type { Observer } from 'rxjs';
+
+import { startWith, takeUntil, map, debounce, debounceTime, throttleTime } from 'rxjs/operators';
 
 export const ops = {
   debounce,
@@ -10,4 +12,5 @@ export const ops = {
   map,
   startWith,
   takeUntil,
+  throttleTime,
 };

ts/smartrx.plugins.ts

@@ -1,4 +1,3 @@
-import * as lik from '@pushrocks/lik';
+import * as smartpromise from '@push.rocks/smartpromise';
-import * as smartpromise from '@pushrocks/smartpromise';
 
-export { lik, 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"
-}