2.0.26

.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"
+    - .npmci_cache/
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
-- test
-- release
-- metadata
+  - security
+  - test
+  - release
+  - metadata
 
 # ====================
 # security stage
@@ -18,114 +18,114 @@ stages:
 mirror:
   stage: security
   script:
-  - npmci git mirror
+    - npmci git mirror
+  only:
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
-snyk:
+auditProductionDependencies:
+  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 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
-  - notpriv
+    - 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 --only=dev
+  tags:
+    - docker
+  allow_failure: true
 
 # ====================
 # 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:
+testStable:
   stage: test
   script:
-  - npmci npm prepare
-  - npmci node install lts
-  - 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
-  - notpriv
-    
-testSTABLE:
+    - docker
+
+testBuild:
   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 command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
-  - notpriv
+    - docker
 
 release:
   stage: release
   script:
-  - npmci node install stable
-  - npmci npm publish
+    - npmci node install stable
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
-  - notpriv
+    - lossless
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
+  only:
+    - tags
   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:
-  - 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-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:
@@ -133,15 +133,5 @@ pages:
   artifacts:
     expire_in: 1 week
     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
+      - 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", "wcc"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

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,44 @@
 {
-  "name": "smartrx",
-  "version": "2.0.0",
+  "name": "@pushrocks/smartrx",
+  "version": "2.0.26",
   "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",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --web && 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.65",
+    "@gitzone/tsbundle": "^2.0.7",
+    "@gitzone/tsrun": "^1.2.37",
+    "@gitzone/tstest": "^1.0.73",
+    "@pushrocks/tapbundle": "^5.0.4",
+    "@types/node": "^18.6.4",
+    "tslint": "^6.1.3",
+    "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/smartpromise": "^3.1.7",
+    "rxjs": "^7.5.6"
+  },
+  "files": [
+    "ts/**/*",
+    "ts_web/**/*",
+    "dist/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
+  ]
 }

readme.md

@@ -1,33 +1,39 @@
-# 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/)
+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
+
+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.html)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
 
-[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.observableintake.both.ts

@@ -1,15 +1,15 @@
 import { tap, expect } from '@pushrocks/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

@@ -5,7 +5,7 @@ import * as rx from 'rxjs';
 import * as smartpromise from '@pushrocks/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: '@pushrocks/smartrx',
+  version: '2.0.26',
+  description: 'smart wrapper for rxjs'
+}

ts/index.ts

@@ -1,9 +1,7 @@
-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';
-
-import * as rxjs from 'rxjs';
-
-export { 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,45 +1,45 @@
-import * as plugins from './smartrx.plugins';
-import { Observable, Subscription } from 'rxjs';
-import { Deferred } from 'smartq';
+import * as plugins from './smartrx.plugins.js';
+
+import * as rxjs from './smartrx.plugins.rxjs.js';
 
 /**
  * ObservableIntake
  */
 export class ObservableIntake<T> {
-  observable: Observable<T>;
-  completed: Promise<void>;
-  private completedDeffered: Deferred<void>;
+  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 = 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;
   }
 
-  setObservable(observableFunc) {
-    this.observable = observableFunc();
+  public setObservable(observableFunc: rxjs.Observable<any>) {
+    this.observable = observableFunc;
   }
 
-  push(payloadArg: T) {
+  public push(payloadArg: T) {
     if (this.buffered) {
       this.payloadBuffer.push(payloadArg);
     } else {
@@ -51,8 +51,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 +61,15 @@ export class ObservableIntake<T> {
    * sets a generator to query the next pushed value
    * @param generatorArg
    */
-  setGenerator(generatorArg) {
+  public setGenerator(generatorArg: Generator<T>) {
     this.generator = generatorArg;
   }
 
-  makeBuffered() {
+  public makeBuffered() {
     this.buffered = true;
   }
 
-  subscribe(...args) {
+  public subscribe(...args: any) {
     return this.observable.subscribe(...args);
   }
 
@@ -77,7 +77,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 {
@@ -85,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);
         }
       }
     }
@@ -95,11 +95,11 @@ export class ObservableIntake<T> {
   /**
    * signals the completion of this observable
    */
-  signalComplete() {
+  public signalComplete() {
     this.observableFunctions.complete();
   }
 
-  private internalPush(payloadArg) {
+  private internalPush(payloadArg: T) {
     this.observableFunctions.next(payloadArg);
   }
 }

ts/smartrx.classes.observablemap.ts

@@ -1,12 +1,16 @@
-import * as plugins from './smartrx.plugins';
-import { Observable, fromEvent } from 'rxjs';
-import { Objectmap, Stringmap } from '@pushrocks/lik';
+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;
+}
+
 /**
  * bundles an observable with an emitter
  */
-export interface ObservableEmitterBundle {
-  observable: plugins.rxjs.Observable<any>;
-  emitter: plugins.events.EventEmitter;
+export interface IObservableEventBundle<T> {
+  subject: rxjs.Subject<any>;
+  eventRef: T;
   event: string;
 }
 
@@ -14,26 +18,56 @@ export interface ObservableEmitterBundle {
  * manages observables by making sure that only one observable is regsitered per event
  */
 export class Observablemap {
-  ObservableEmitterBundleObjectmap = new Objectmap<ObservableEmitterBundle>();
+  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.
    */
-  getObservableForEmitterEvent(emitterArg: plugins.events.EventEmitter, eventArg: string) {
-    let 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 {
-      let emitterObservable = fromEvent(emitterArg, 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

@@ -0,0 +1,15 @@
+// this file is intended to keep the bundle size down
+
+export { Observable, Subject, fromEvent, ReplaySubject, Subscription } from 'rxjs';
+
+export type { Observer } 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,3 @@
-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 { smartpromise };

tsconfig.json

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

tslint.json

@@ -1,3 +0,0 @@
-{
-    "extends": "tslint-config-standard"
-}