6.0.2

.gitignore

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

.gitlab-ci.yml

@@ -1,40 +1,49 @@
 # gitzone ci_default
 image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-variables:
-  GIT_STRATEGY: clone
 
 cache:
   paths:
-  - .npmci_cache/
+    - .npmci_cache/
-  key: "$CI_BUILD_STAGE"
+  key: '$CI_BUILD_STAGE'
 
 stages:
-- security
+  - security
-- test
+  - test
-- release
+  - release
-- metadata
+  - metadata
+
+before_script:
+  - pnpm install -g pnpm
+  - pnpm install -g @shipzone/npmci
+  - npmci npm prepare
 
 # ====================
 # security stage
 # ====================
-mirror:
+# ====================
+# security stage
+# ====================
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-  - npmci git mirror
+     - npmci command npm config set registry https://registry.npmjs.org
+     - npmci command pnpm audit --audit-level=high --prod
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+  allow_failure: true
 
-snyk:
+auditDevDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
-    - npmci npm prepare
+    - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm install -g snyk
+    - npmci command pnpm audit --audit-level=high --dev
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+  allow_failure: true
 
 # ====================
 # test stage
@@ -43,37 +52,34 @@ snyk:
 testStable:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci node install stable
-  - npmci node install stable
+    - npmci npm install
-  - npmci npm install
+    - npmci npm test
-  - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - docker
-  - priv
 
 testBuild:
   stage: test
   script:
-  - npmci npm prepare
+    - npmci node install stable
-  - npmci node install lts
+    - npmci npm install
-  - npmci npm install
+    - npmci npm build
-  - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-  - docker
+    - docker
-  - notpriv
 
 release:
   stage: release
   script:
-  - npmci node install lts
+    - npmci node install stable
-  - npmci npm publish
+    - npmci npm publish
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 # ====================
 # metadata stage
@@ -81,35 +87,36 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  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:
-  - docker
+    - lossless
-  - priv
+    - docker
+    - priv
 
 trigger:
   stage: metadata
   script:
-  - npmci trigger
+    - npmci trigger
   only:
-  - tags
+    - tags
   tags:
-  - docker
+    - lossless
-  - notpriv
+    - docker
+    - notpriv
 
 pages:
-  image: hosttoday/ht-docker-dbase:npmci
-  services:
-   - docker:18-dind
   stage: metadata
   script:
-    - npmci command npm install -g @gitzone/tsdoc
+    - npmci node install stable
-    - npmci npm prepare
     - npmci npm install
-    - npmci command tsdoc
+    - npmci command npm run buildDocs
   tags:
+    - lossless
     - docker
     - notpriv
   only:
@@ -117,5 +124,5 @@ pages:
   artifacts:
     expire_in: 1 week
     paths:
-    - public
+      - public
   allow_failure: true

.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "command": "# instrumented",
+      "name": "Run instrumented terminal",
+      "request": "launch",
+      "type": "node-terminal"
+    }
+  ]
+}

.vscode/settings.json

@@ -1,3 +1,26 @@
 {
-  "workbench.colorCustomizations": {}
+  "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"]
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

README.md

@@ -1,43 +0,0 @@
-# @pushrocks/lik
-light little helpers for node
-
-## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/lik)
-* [gitlab.com (source)](https://gitlab.com/pushrocks/lik)
-* [github.com (source mirror)](https://github.com/pushrocks/lik)
-* [docs (typedoc)](https://pushrocks.gitlab.io/lik/)
-
-## Status for master
-[![build status](https://gitlab.com/pushrocks/lik/badges/master/build.svg)](https://gitlab.com/pushrocks/lik/commits/master)
-[![coverage report](https://gitlab.com/pushrocks/lik/badges/master/coverage.svg)](https://gitlab.com/pushrocks/lik/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/lik.svg)](https://www.npmjs.com/package/@pushrocks/lik)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/lik/badge.svg)](https://snyk.io/test/npm/@pushrocks/lik)
-[![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
-
-Use TypeScript for best in class instellisense.
-
-```javascript
-// import any tool that you need from lik
-import { Stringmap, Objectmap, Observablemap } from 'lik';
-```
-
-### class Stringmap
-
-Stringmap allows you to keep track of strings. It allows you to register triggers for certain events
-like when a certain string is removed or added to the map
-
-### class Objectmap
-
-Sometimes you need to keep track of objects, but implementing logic for removing, finding or updating is tedious.
-Objectmap takes care of keeping track of objects for you.
-
-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)

npmextra.json

@@ -4,11 +4,12 @@
     "npmAccessLevel": "public"
   },
   "gitzone": {
+    "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
       "gitscope": "pushrocks",
       "gitrepo": "lik",
-      "shortDescription": "light little helpers for node",
+      "description": "light little helpers for node",
       "npmPackagename": "@pushrocks/lik",
       "license": "MIT"
     }

package.json

@@ -1,13 +1,15 @@
 {
   "name": "@pushrocks/lik",
-  "version": "3.0.13",
+  "version": "6.0.2",
   "private": false,
   "description": "light little helpers for node",
-  "main": "dist/index.js",
+  "main": "dist_ts/index.js",
-  "typings": "dist/index.d.ts",
+  "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --web --allowimplicitany && tsbundle npm)",
+    "buildDocs": "tsdoc"
   },
   "repository": {
     "type": "git",
@@ -20,32 +22,36 @@
   },
   "homepage": "https://gitlab.com/pushrocks/lik#README",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsbuild": "^2.1.63",
-    "@gitzone/tsrun": "^1.2.8",
+    "@gitzone/tsbundle": "^2.0.4",
-    "@gitzone/tstest": "^1.0.28",
+    "@gitzone/tsrun": "^1.2.39",
-    "@pushrocks/tapbundle": "^3.2.0",
+    "@gitzone/tstest": "^1.0.71",
-    "@types/node": "^12.12.14",
+    "@pushrocks/tapbundle": "^5.0.3",
-    "tslint": "^5.20.1",
+    "@types/node": "^18.11.18"
-    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.6",
+    "@pushrocks/smartdelay": "^2.0.13",
-    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartmatch": "^2.0.0",
-    "@pushrocks/smartrx": "^2.0.5",
+    "@pushrocks/smartpromise": "^3.1.7",
-    "@pushrocks/smarttime": "^3.0.12",
+    "@pushrocks/smartrx": "^3.0.0",
-    "@types/minimatch": "^3.0.3",
+    "@pushrocks/smarttime": "^4.0.1",
-    "minimatch": "^3.0.4",
+    "@types/minimatch": "^5.1.2",
+    "@types/symbol-tree": "^3.2.2",
     "symbol-tree": "^3.2.4"
   },
   "files": [
-    "ts/*",
+    "ts/**/*",
-    "ts_web/*",
+    "ts_web/**/*",
-    "dist/*",
+    "dist/**/*",
-    "dist_web/*",
+    "dist_*/**/*",
-    "dist_ts_web/*",
+    "dist_ts/**/*",
-    "assets/*",
+    "dist_ts_web/**/*",
+    "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -0,0 +1,52 @@
+# @pushrocks/lik
+light little helpers for node
+
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/lik)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/lik)
+* [github.com (source mirror)](https://github.com/pushrocks/lik)
+* [docs (typedoc)](https://pushrocks.gitlab.io/lik/)
+
+## Status for master
+
+Status Category | Status Badge
+-- | --
+GitLab Pipelines | [![pipeline status](https://gitlab.com/pushrocks/lik/badges/master/pipeline.svg)](https://lossless.cloud)
+GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/pushrocks/lik/badges/master/coverage.svg)](https://lossless.cloud)
+npm | [![npm downloads per month](https://badgen.net/npm/dy/@pushrocks/lik)](https://lossless.cloud)
+Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/pushrocks/lik)](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/lik)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@pushrocks/lik)](https://lossless.cloud)
+BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@pushrocks/lik)](https://lossless.cloud)
+
+## Usage
+
+Use TypeScript for best in class instellisense.
+
+```javascript
+// import any tool that you need from lik
+import { Stringmap, Objectmap, Observablemap } from 'lik';
+```
+
+### class Stringmap
+
+Stringmap allows you to keep track of strings. It allows you to register triggers for certain events
+like when a certain string is removed or added to the map
+
+### class Objectmap
+
+Sometimes you need to keep track of objects, but implementing logic for removing, finding or updating is tedious.
+Objectmap takes care of keeping track of objects for you.
+
+## 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.
+
+## Legal
+> MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)

test/test.asyncexecutionstack.both.ts

@@ -0,0 +1,29 @@
+import { tap, expect } from '@pushrocks/tapbundle';
+import * as lik from '../ts/index.js';
+
+let testAsyncExecutionStack: lik.AsyncExecutionStack;
+
+tap.test('should create a valid instance of AsyncExectionStack', async () => {
+  testAsyncExecutionStack = new lik.AsyncExecutionStack();
+  expect(testAsyncExecutionStack).toBeInstanceOf(lik.AsyncExecutionStack);
+});
+
+tap.test('should run in parallel', async (toolsArg) => {
+  await testAsyncExecutionStack.getExclusiveExecutionSlot(async () => {
+    await toolsArg.delayFor(2000);
+    console.log('should run first');
+  }, 2500);
+  testAsyncExecutionStack.getNonExclusiveExecutionSlot(async () => {
+    await toolsArg.delayFor(2000);
+    console.log('should run third');
+  }, 2500);
+  testAsyncExecutionStack.getNonExclusiveExecutionSlot(async () => {
+    await toolsArg.delayFor(1000);
+    console.log('should run second');
+  }, 2500);
+  await testAsyncExecutionStack.getExclusiveExecutionSlot(async () => {
+    console.log('should run fourth');
+  }, 0);
+});
+
+tap.start();

test/test.fastmap.both.ts

@@ -0,0 +1,30 @@
+import { tap, expect } from '@pushrocks/tapbundle';
+
+import * as lik from '../ts/index.js';
+
+tap.test('should create a valid fastmap', async () => {
+  const fastmap = new lik.FastMap();
+  expect(fastmap).toBeInstanceOf(lik.FastMap);
+});
+
+tap.test('should find an entry', async () => {
+  const fastmap = new lik.FastMap<{
+    value1: string;
+    value2: string;
+  }>();
+  fastmap.addToMap('heythere', {
+    value1: 'heyho',
+    value2: 'heyho2',
+  });
+  fastmap.addToMap('heythere2', {
+    value1: 'heyho3',
+    value2: 'heyho4',
+  });
+
+  const result = await fastmap.find(async (itemArg) => {
+    return itemArg.value2 === 'heyho4';
+  });
+  expect(result.value1).toEqual('heyho3');
+});
+
+tap.start();

test/test.interestmap.both.ts

@@ -1,10 +1,10 @@
 import { tap, expect } from '@pushrocks/tapbundle';
-import * as lik from '../ts/index';
+import * as lik from '../ts/index.js';
 
 let testInterestmap: lik.InterestMap<number, number>;
 
 tap.test('should create an interestmap', async () => {
-  testInterestmap = new lik.InterestMap(numberArg => {
+  testInterestmap = new lik.InterestMap((numberArg) => {
     return numberArg.toString();
   });
 });

test/test.limitedarray.both.ts

@@ -1,17 +1,17 @@
 import { tap, expect } from '@pushrocks/tapbundle';
 
-import { LimitedArray } from '../ts/index';
+import { LimitedArray } from '../ts/index.js';
 
 let testLimitedArray: LimitedArray<string>;
 
 tap.test('should create a LimitedArray', async () => {
   testLimitedArray = new LimitedArray(6);
-  expect(testLimitedArray).to.be.instanceof(LimitedArray);
+  expect(testLimitedArray).toBeInstanceOf(LimitedArray);
 });
 
 tap.test('should never be longer than the set length', async () => {
   testLimitedArray.addMany(['hi', 'this', 'is', 'quite', 'a', 'long', 'string', ':)']);
-  expect(testLimitedArray.array.length).to.be.lessThan(7);
+  expect(testLimitedArray.array.length < 7).toBeTrue();
 });
 
 tap.start();

test/test.looptracker.both.ts

@@ -0,0 +1,24 @@
+// import test framework
+import { expect, tap } from '@pushrocks/tapbundle';
+
+// import the module
+import * as lik from '../ts/index.js';
+
+let object1 = {};
+let object2 = {};
+let myLoopTracker: lik.LoopTracker<any>;
+
+// tests
+tap.test('should create a valid looptracker instance', async () => {
+  myLoopTracker = new lik.LoopTracker();
+  expect(myLoopTracker).toBeInstanceOf(lik.LoopTracker);
+});
+
+tap.test('should add objects once and return true', async () => {
+  expect(myLoopTracker.checkAndTrack(object1)).toBeTrue();
+  expect(myLoopTracker.checkAndTrack(object1)).toBeFalse();
+  expect(myLoopTracker.checkAndTrack(object2)).toBeTrue();
+  expect(myLoopTracker.checkAndTrack(object2)).toBeFalse();
+});
+
+tap.start();

test/test.looptracker.ts

@@ -1,26 +0,0 @@
-// import test framework
-import { expect, tap } from '@pushrocks/tapbundle';
-import * as events from 'events';
-import * as smartpromise from '@pushrocks/smartpromise';
-
-// import the module
-import * as lik from '../ts/index';
-
-let object1 = {};
-let object2 = {};
-let myLoopTracker: lik.LoopTracker<any>;
-
-// tests
-tap.test('should create a valid looptracker instance', async () => {
-  myLoopTracker = new lik.LoopTracker();
-  expect(myLoopTracker).to.be.instanceof(lik.LoopTracker);
-});
-
-tap.test('should add objects once and return true', async () => {
-  expect(myLoopTracker.checkAndTrack(object1)).to.be.true;
-  expect(myLoopTracker.checkAndTrack(object1)).to.be.false;
-  expect(myLoopTracker.checkAndTrack(object2)).to.be.true;
-  expect(myLoopTracker.checkAndTrack(object2)).to.be.false;
-});
-
-tap.start();

test/test.objectmap.both.ts

@@ -1,78 +1,76 @@
 // import test framework
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as events from 'events';
-import * as smartpromise from '@pushrocks/smartpromise';
 
 // import the module
-import * as lik from '../ts/index';
+import * as lik from '../ts/index.js';
 
 // Objectmap
 interface ITestObject {
   propOne: string;
   propTwo: string;
 }
-let testObjectmap: lik.Objectmap<ITestObject>;
+let testObjectmap: lik.ObjectMap<ITestObject>;
 let testObject1: ITestObject = {
   propOne: 'hello',
-  propTwo: 'hello2'
+  propTwo: 'hello2',
 };
 let testObject2: ITestObject = {
   propOne: 'hello',
-  propTwo: 'hello2'
+  propTwo: 'hello2',
 };
 
 tap.test('new lik.Objectmap() -> should correctly instantiate an Objectmap', async () => {
-  testObjectmap = new lik.Objectmap<ITestObject>();
+  testObjectmap = new lik.ObjectMap<ITestObject>();
-  expect(testObjectmap).be.instanceof(lik.Objectmap);
+  expect(testObjectmap).toBeInstanceOf(lik.ObjectMap);
 });
 
 tap.test('lik.Objectmap.add() -> should correctly add an object to Objectmap', async () => {
   testObjectmap.add(testObject1);
   // tslint:disable-next-line:no-unused-expression
-  expect(testObjectmap.checkForObject(testObject1)).be.true;
+  expect(testObjectmap.checkForObject(testObject1)).toBeTrue();
   // tslint:disable-next-line:no-unused-expression
-  expect(testObjectmap.checkForObject(testObject2)).be.false;
+  expect(testObjectmap.checkForObject(testObject2)).toBeFalse();
 });
 
 tap.test('lik.Objectmap.remove() -> should correctly remove an object to Objectmap', async () => {
   testObjectmap.add(testObject2);
   testObjectmap.remove(testObject1);
   // tslint:disable-next-line:no-unused-expression
-  expect(testObjectmap.checkForObject(testObject1)).be.false;
+  expect(testObjectmap.checkForObject(testObject1)).toBeFalse();
   // tslint:disable-next-line:no-unused-expression
-  expect(testObjectmap.checkForObject(testObject2)).be.true;
+  expect(testObjectmap.checkForObject(testObject2)).toBeTrue();
 });
 
 tap.test('Objectmap.forEach -> should correctly run a function forEach map object', async () => {
-  testObjectmap.forEach(itemArg => {
+  testObjectmap.forEach((itemArg) => {
-    expect(itemArg).to.have.property('propOne');
+    expect(itemArg).toHaveProperty('propOne');
   });
 });
 
 tap.test('lik.Objectmap.find() -> should correctly find an object', async () => {
   let myObject = { propOne: 'helloThere', propTwo: 'helloAnyway' };
   testObjectmap.add(myObject);
-  let referenceObject = testObjectmap.find(itemArg => {
+  let referenceObject = await testObjectmap.find(async (itemArg) => {
     return itemArg.propOne === 'helloThere';
   });
   // tslint:disable-next-line:no-unused-expression
-  expect(myObject === referenceObject).be.true;
+  expect(myObject === referenceObject).toBeTrue();
 });
 
 tap.test('lik.Objectmap.getArray() -> should return a cloned array', async () => {
   let myObject = { propOne: 'test1', propTwo: 'wow, how awesome' };
   testObjectmap.add(myObject);
   let clonedArray = testObjectmap.getArray();
-  expect(clonedArray[clonedArray.length - 1]).to.eql(myObject);
+  expect(clonedArray[clonedArray.length - 1]).toEqual(myObject);
 });
 
 tap.test('should get one object and then remove it', async () => {
   let originalLength = testObjectmap.getArray().length;
   let oneObject = testObjectmap.getOneAndRemove();
   // tslint:disable-next-line:no-unused-expression
-  expect(oneObject).not.be.null;
+  expect(oneObject).not.toBeNull();
-  expect(testObjectmap.getArray().length).equal(originalLength - 1);
+  expect(testObjectmap.getArray().length).toEqual(originalLength - 1);
-  expect(testObjectmap.getArray()).to.not.contain(oneObject);
+  expect(testObjectmap.getArray()).not.toContain(oneObject);
 });
 
 tap.start();

test/test.stringmap.both.ts

@@ -1,10 +1,8 @@
 // import test framework
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as events from 'events';
-import * as smartpromise from '@pushrocks/smartpromise';
 
 // import the module
-import * as lik from '../ts/index';
+import * as lik from '../ts/index.js';
 
 // testData
 let testStringmap: lik.Stringmap;
@@ -18,14 +16,14 @@ let testString6 = 'testString6';
 // tests
 tap.test('new lik.Objectmap() -> should create an instance of Stringmap', async () => {
   testStringmap = new lik.Stringmap();
-  expect(testStringmap).be.instanceof(lik.Stringmap);
+  expect(testStringmap).toBeInstanceOf(lik.Stringmap);
 });
 
 tap.test(
   'lik.Stringmap.checkString -> should return false for an string not in Stringmap',
   async () => {
     // tslint:disable-next-line:no-unused-expression
-    expect(testStringmap.checkString(testString1)).be.false;
+    expect(testStringmap.checkString(testString1)).toBeFalse();
   }
 );
 
@@ -34,37 +32,37 @@ tap.test('lik.Stringmap.addString -> should add an string to Stringmap', async (
   testStringmap.addString(testString2);
   testStringmap.addString(testString3);
   // tslint:disable-next-line:no-unused-expression
-  expect(testStringmap.checkString(testString1)).be.true;
+  expect(testStringmap.checkString(testString1)).toBeTrue();
   // tslint:disable-next-line:no-unused-expression
-  expect(testStringmap.checkString(testString2)).be.true;
+  expect(testStringmap.checkString(testString2)).toBeTrue();
   // tslint:disable-next-line:no-unused-expression
-  expect(testStringmap.checkString(testString3)).be.true;
+  expect(testStringmap.checkString(testString3)).toBeTrue();
   // tslint:disable-next-line:no-unused-expression
-  expect(testStringmap.checkMinimatch('*String1')).be.true;
+  expect(testStringmap.checkMinimatch('*String1')).toBeTrue();
   // tslint:disable-next-line:no-unused-expression
-  expect(testStringmap.checkMinimatch('*String2')).be.true;
+  expect(testStringmap.checkMinimatch('*String2')).toBeTrue();
   // tslint:disable-next-line:no-unused-expression
-  expect(testStringmap.checkMinimatch('*String4')).be.false;
+  expect(testStringmap.checkMinimatch('*String4')).toBeFalse();
 });
 
 tap.test('lik.Stringmap.addStringArray -> should add an array of strings', async () => {
   testStringmap.addStringArray([testString4, testString5, testString6]);
   // tslint:disable-next-line:no-unused-expression
-  expect(testStringmap.checkMinimatch('*String4')).be.true;
+  expect(testStringmap.checkMinimatch('*String4')).toBeTrue();
 });
 
 tap.test('lik.Stringmap.removeString -> should remove a string from Stringmap', async () => {
   testStringmap.removeString(testString2);
   // tslint:disable-next-line:no-unused-expression
-  expect(testStringmap.checkString(testString2)).be.false;
+  expect(testStringmap.checkString(testString2)).toBeFalse();
 });
 
 tap.test('lik.Stringmap.getStringArray() -> should return a copy of stringArray', async () => {
   let clonedArray = testStringmap.getStringArray();
   // tslint:disable-next-line:no-unused-expression
-  expect(clonedArray[0] === 'testString1').be.true;
+  expect(clonedArray[0] === 'testString1').toBeTrue();
   // tslint:disable-next-line:no-unused-expression
-  expect(clonedArray[0] === testString1).be.true;
+  expect(clonedArray[0] === testString1).toBeTrue();
 });
 
 tap.test(

test/test.timedaggregator.both.ts

@@ -1,19 +1,17 @@
 // import test framework
 import { expect, tap } from '@pushrocks/tapbundle';
-import * as events from 'events';
-import * as smartpromise from '@pushrocks/smartpromise';
 
 // import the module
-import * as lik from '../ts/index';
+import * as lik from '../ts/index.js';
 
 let testTimedAggregator: lik.TimedAggregtor<string>;
 
-tap.test('should create a timed aggregaotor', async tools => {
+tap.test('should create a timed aggregaotor', async (tools) => {
   testTimedAggregator = new lik.TimedAggregtor<string>({
     aggregationIntervalInMillis: 1000,
-    functionForAggregation: aggregation => {
+    functionForAggregation: (aggregation) => {
       console.log(aggregation);
-    }
+    },
   });
   testTimedAggregator.add('This');
   testTimedAggregator.add('is a whole sentence.');

test/test.tree.both.ts

@@ -1,5 +1,5 @@
 import { tap, expect } from '@pushrocks/tapbundle';
-import * as lik from '../ts/index';
+import * as lik from '../ts/index.js';
 
 class TestClass {
   constructor(public hey: string) {
@@ -18,13 +18,13 @@ let testInstance6 = new TestClass('sixth');
 
 tap.test('create a valid tree instance', async () => {
   testTree = new lik.Tree();
-  expect(testTree).to.be.instanceOf(lik.Tree);
+  expect(testTree).toBeInstanceOf(lik.Tree);
 });
 
 tap.test('should insert an object', async () => {
   testTree.initialize(testInstance);
   let resultArray = testTree.treeToArray(testInstance, {});
-  expect(resultArray).to.contain(testInstance);
+  expect(resultArray).toContain(testInstance);
 });
 
 tap.test('should add other objects in a hierachy', async () => {

test/test.ts

@@ -1 +0,0 @@
-import './test.objectmap';

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@pushrocks/lik',
+  version: '6.0.2',
+  description: 'light little helpers for node'
+}

ts/index.ts

@@ -1,11 +1,10 @@
-import * as plugins from './lik.plugins';
+export * from './lik.asyncexecutionstack.js';
-
+export * from './lik.fastmap.js';
-// import modules
+export * from './lik.interestmap.js';
-
+export * from './lik.interestmap.interest.js';
-export * from './lik.interestmap';
+export * from './lik.limitedarray.js';
-export * from './lik.limitedarray';
+export * from './lik.looptracker.js';
-export * from './lik.looptracker';
+export * from './lik.objectmap.js';
-export * from './lik.objectmap';
+export * from './lik.stringmap.js';
-export * from './lik.stringmap';
+export * from './lik.timedaggregator.js';
-export * from './lik.timedaggregator';
+export * from './lik.tree.js';
-export * from './lik.tree';

ts/lik.asyncexecutionstack.ts

@@ -0,0 +1,82 @@
+import * as plugins from './lik.plugins.js';
+
+interface IExecutionSlot<T> {
+  executionDeferred: plugins.smartpromise.Deferred<T>;
+  funcToExecute: () => Promise<T>;
+  timeout?: number;
+  mode: 'exclusive' | 'nonexclusive';
+}
+
+/**
+ * allows for avoiding race condition
+ */
+export class AsyncExecutionStack {
+  private executionSlots: IExecutionSlot<any>[] = [];
+  public async getExclusiveExecutionSlot<T = any>(funcArg: () => Promise<T>, timeoutArg?: number) {
+    const executionDeferred = plugins.smartpromise.defer<T>();
+    const executionSlot: IExecutionSlot<T> = {
+      funcToExecute: funcArg,
+      executionDeferred,
+      timeout: timeoutArg,
+      mode: 'exclusive',
+    };
+    this.executionSlots.push(executionSlot);
+    this.processExecutionSlots();
+    return executionDeferred.promise;
+  }
+  public async getNonExclusiveExecutionSlot<T = any>(
+    funcArg: () => Promise<T>,
+    timeoutArg?: number
+  ) {
+    const executionDeferred = plugins.smartpromise.defer<T>();
+    const executionSlot: IExecutionSlot<T> = {
+      funcToExecute: funcArg,
+      executionDeferred,
+      timeout: timeoutArg,
+      mode: 'nonexclusive',
+    };
+    this.executionSlots.push(executionSlot);
+    this.processExecutionSlots();
+    return executionDeferred.promise;
+  }
+
+  private currentlyExecutingDeferred: plugins.smartpromise.Deferred<any>;
+  private async processExecutionSlots() {
+    if (this.currentlyExecutingDeferred) {
+      return;
+    }
+    this.currentlyExecutingDeferred = plugins.smartpromise.defer();
+    let nonExclusiveRunningSlots: IExecutionSlot<any>[] = [];
+    const checkNonExclusiveRunningSlots = async (cleanArg = false) => {
+      if (nonExclusiveRunningSlots.length > 100 || cleanArg) {
+        await Promise.all(nonExclusiveRunningSlots.map(nonExclusiveRunningSlotArg => nonExclusiveRunningSlotArg.executionDeferred.promise));
+        nonExclusiveRunningSlots = [];
+      }
+    };
+    while (this.executionSlots.length > 0) {
+      const nextExecutionSlot = this.executionSlots.shift();
+      const runNextExecution = async () => {
+        if (nextExecutionSlot.timeout) {
+          const result = await Promise.race([
+            nextExecutionSlot.funcToExecute(),
+            plugins.smartdelay.delayFor(nextExecutionSlot.timeout),
+          ]);
+          nextExecutionSlot.executionDeferred.resolve(result);
+        } else {
+          nextExecutionSlot.executionDeferred.resolve(await nextExecutionSlot.funcToExecute());
+        }
+      };
+      if (nextExecutionSlot.mode === 'exclusive') {
+        await checkNonExclusiveRunningSlots(true);
+        await runNextExecution();
+      } else {
+        nonExclusiveRunningSlots.push(nextExecutionSlot);
+        await checkNonExclusiveRunningSlots(false);
+        runNextExecution();
+      }
+    }
+    this.currentlyExecutingDeferred.resolve();
+    this.currentlyExecutingDeferred = null;
+    
+  }
+}

ts/lik.fastmap.ts

@@ -0,0 +1,97 @@
+/* ============
+The FastMap has the goal of creating the fastes to use map possible in JS
+
+============ */
+
+import * as plugins from './lik.plugins.js';
+
+/**
+ * fast map allows for very quick lookups of objects with a unique key
+ */
+export class FastMap<T> {
+  private mapObject: { [key: string]: T } = {};
+
+  public isUniqueKey(keyArg: string): boolean {
+    return this.mapObject[keyArg] ? false : true;
+  }
+
+  public addToMap(
+    keyArg: string,
+    objectArg: T,
+    optionsArg?: {
+      force: boolean;
+    }
+  ): boolean {
+    if (this.isUniqueKey(keyArg) || (optionsArg && optionsArg.force)) {
+      this.mapObject[keyArg] = objectArg;
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  public getByKey(keyArg: string) {
+    return this.mapObject[keyArg];
+  }
+
+  public removeFromMap(keyArg: string): T {
+    const removedItem = this.getByKey(keyArg);
+    delete this.mapObject[keyArg];
+    return removedItem;
+  }
+
+  public getKeys() {
+    const keys: string[] = [];
+    for (const keyArg in this.mapObject) {
+      if (this.mapObject[keyArg]) {
+        keys.push(keyArg);
+      }
+    }
+    return keys;
+  }
+
+  public clean() {
+    this.mapObject = {};
+  }
+
+  /**
+   * returns a new Fastmap that includes all values from this and all from the fastmap in the argument
+   */
+  public concat(fastMapArg: FastMap<T>) {
+    const concatedFastmap = new FastMap<T>();
+    for (const key of this.getKeys()) {
+      concatedFastmap.addToMap(key, this.getByKey(key));
+    }
+
+    for (const key of fastMapArg.getKeys()) {
+      concatedFastmap.addToMap(key, fastMapArg.getByKey(key), {
+        force: true,
+      });
+    }
+
+    return concatedFastmap;
+  }
+
+  /**
+   * tries to merge another Fastmap
+   * Note: uniqueKeyCollisions will cause overwrite
+   * @param fastMapArg
+   */
+  public addAllFromOther(fastMapArg: FastMap<T>) {
+    for (const key of fastMapArg.getKeys()) {
+      this.addToMap(key, fastMapArg.getByKey(key), {
+        force: true,
+      });
+    }
+  }
+
+  public async find(findFunctionArg: (mapItemArg: T) => Promise<boolean>) {
+    for (const key of this.getKeys()) {
+      const item = this.getByKey(key);
+      const findFunctionResult = await findFunctionArg(item);
+      if (findFunctionResult) {
+        return item;
+      }
+    }
+  }
+}

ts/lik.interestmap.interest.ts

@@ -1,8 +1,15 @@
-import * as plugins from './lik.plugins';
+import * as plugins from './lik.plugins.js';
 
-import { InterestMap, IInterestComparisonFunc } from './lik.interestmap';
+import { InterestMap, IInterestComparisonFunc } from './lik.interestmap.js';
+
+export interface IInterestOptions<DTInterestFullfillment> {
+  markLostAfterDefault: number;
+  defaultFullfillment?: DTInterestFullfillment;
+}
 
 export class Interest<DTInterestId, DTInterestFullfillment> {
+  public options: IInterestOptions<DTInterestFullfillment>;
+
   private interestMapRef: InterestMap<DTInterestId, DTInterestFullfillment>;
   public originalInterest: DTInterestId;
   public comparisonFunc: IInterestComparisonFunc<DTInterestId>;
@@ -21,9 +28,8 @@ export class Interest<DTInterestId, DTInterestFullfillment> {
     return this.comparisonFunc(this.originalInterest);
   }
 
-  private interestDeferred: plugins.smartpromise.Deferred<
+  private interestDeferred: plugins.smartpromise.Deferred<DTInterestFullfillment> =
-    DTInterestFullfillment
+    new plugins.smartpromise.Deferred();
-  > = new plugins.smartpromise.Deferred();
   public interestFullfilled = this.interestDeferred.promise;
 
   /**
@@ -41,14 +47,20 @@ export class Interest<DTInterestId, DTInterestFullfillment> {
   constructor(
     interestMapArg: InterestMap<DTInterestId, DTInterestFullfillment>,
     interestArg: DTInterestId,
-    comparisonFuncArg: IInterestComparisonFunc<DTInterestId>
+    comparisonFuncArg: IInterestComparisonFunc<DTInterestId>,
+    optionsArg?: IInterestOptions<DTInterestFullfillment>
   ) {
+    this.interestMapRef = interestMapArg;
     this.originalInterest = interestArg;
     this.comparisonFunc = comparisonFuncArg;
-    this.interestMapRef = interestMapArg;
+    this.options = optionsArg;
+
     this.destructionTimer.completed.then(() => {
       this.destroy();
     });
+    if (this.options?.markLostAfterDefault) {
+      plugins.smartdelay.delayFor(this.options.markLostAfterDefault).then(this.markLost);
+    }
   }
 
   // ===============================
@@ -60,6 +72,9 @@ export class Interest<DTInterestId, DTInterestFullfillment> {
    */
   public destroy() {
     this.interestMapRef.removeInterest(this);
+    if (!this.isFullfilled && this.options.defaultFullfillment) {
+      this.fullfillInterest(this.options.defaultFullfillment);
+    }
   }
 
   /**

ts/lik.interestmap.ts

@@ -1,43 +1,65 @@
-import * as plugins from './lik.plugins';
+/* ===========
-import { Objectmap } from './lik.objectmap';
+The InterestMap is an mechanism that collects interests into something
+An interest is expressed by an object, string or number.
+A comparison func can be specified to make interests comparable
 
-import { Observable } from 'rxjs';
+For every unique interestId an interest is created.
+Subssequent interests will be mapped to the same interest
+which is then is only fullfilled once.
+=========== */
 
-import { Interest } from './lik.interestmap.interest';
+import * as plugins from './lik.plugins.js';
+import { ObjectMap } from './lik.objectmap.js';
+import { Interest } from './lik.interestmap.interest.js';
 
 export type IInterestComparisonFunc<T> = (objectArg: T) => string;
 
+export interface IInterestMapOptions {
+  markLostAfterDefault?: number;
+}
+
 export class InterestMap<DTInterestId, DTInterestFullfillment> {
+  public options: IInterestMapOptions;
+
   /**
    * stores interests that are currently fullfilled by the cache
    */
-  private interestObjectMap = new Objectmap<Interest<DTInterestId, DTInterestFullfillment>>();
+  private interestObjectMap = new ObjectMap<Interest<DTInterestId, DTInterestFullfillment>>();
 
   /**
    * a function to compare interests
    */
   private comparisonFunc: IInterestComparisonFunc<DTInterestId>;
 
-  constructor(comparisonFuncArg: IInterestComparisonFunc<DTInterestId>) {
+  constructor(
+    comparisonFuncArg: IInterestComparisonFunc<DTInterestId>,
+    optionsArg: IInterestMapOptions = {}
+  ) {
     this.comparisonFunc = comparisonFuncArg;
+    this.options = optionsArg;
   }
 
   /**
    * adds an interest to the InterestMap
-   * @param objectArg
+   * @param interestId
    */
   public async addInterest(
-    objectArg: DTInterestId
+    interestId: DTInterestId,
+    defaultFullfillmentArg?: DTInterestFullfillment
   ): Promise<Interest<DTInterestId, DTInterestFullfillment>> {
-    const comparisonString = this.comparisonFunc(objectArg);
+    const comparisonString = this.comparisonFunc(interestId);
     let returnInterest: Interest<DTInterestId, DTInterestFullfillment>;
     const newInterest = new Interest<DTInterestId, DTInterestFullfillment>(
       this,
-      objectArg,
+      interestId,
-      this.comparisonFunc
+      this.comparisonFunc,
+      {
+        markLostAfterDefault: this.options.markLostAfterDefault,
+        defaultFullfillment: defaultFullfillmentArg,
+      }
     );
     let interestExists = false;
-    await this.interestObjectMap.forEach(interestArg => {
+    await this.interestObjectMap.forEach((interestArg) => {
       if (!interestExists && interestArg.comparisonString === newInterest.comparisonString) {
         console.log('info', `interest already exists for ${newInterest.comparisonString}`);
         interestExists = true;
@@ -53,15 +75,13 @@ export class InterestMap<DTInterestId, DTInterestFullfillment> {
     return returnInterest;
   }
 
-  // tslint:disable-next-line:member-ordering
   public interestObservable = new plugins.smartrx.ObservableIntake<Interest<DTInterestId, any>>();
 
   /**
    * removes an interest from the interest map
-   * @param objectArg removes an interest from the InterestMap
    */
   public removeInterest(interestArg: Interest<DTInterestId, DTInterestFullfillment>) {
-    const interestToRemove = this.interestObjectMap.findOneAndRemove(interestArg2 => {
+    const interestToRemove = this.interestObjectMap.findOneAndRemoveSync((interestArg2) => {
       return interestArg.comparisonString === interestArg2.comparisonString;
     });
   }
@@ -79,7 +99,7 @@ export class InterestMap<DTInterestId, DTInterestFullfillment> {
    * @param comparisonStringArg
    */
   public checkInterestByString(comparisonStringArg: string): boolean {
-    const foundInterest = this.interestObjectMap.find(interest => {
+    const foundInterest = this.interestObjectMap.findSync((interest) => {
       return interest.comparisonString === comparisonStringArg;
     });
     if (foundInterest) {
@@ -102,12 +122,12 @@ export class InterestMap<DTInterestId, DTInterestFullfillment> {
 
   /**
    * finds an interest
-   * @param objectArg
+   * @param interestId
    */
-  public findInterest(objectArg: DTInterestId): Interest<DTInterestId, DTInterestFullfillment> {
+  public findInterest(interestId: DTInterestId): Interest<DTInterestId, DTInterestFullfillment> {
-    const comparableString = this.comparisonFunc(objectArg);
+    const comparableString = this.comparisonFunc(interestId);
-    const interest = this.interestObjectMap.find(interest => {
+    const interest = this.interestObjectMap.findSync((interestArg) => {
-      return interest.comparisonString === comparableString;
+      return interestArg.comparisonString === comparableString;
     });
     return interest; // if an interest is found, the interest is returned, otherwise interest is null
   }

ts/lik.limitedarray.ts

@@ -1,4 +1,4 @@
-import * as plugins from './lik.plugins';
+import * as plugins from './lik.plugins.js';
 
 export class LimitedArray<T> {
   array: T[] = [];

ts/lik.looptracker.ts

@@ -1,9 +1,9 @@
-import * as plugins from './lik.plugins';
+import * as plugins from './lik.plugins.js';
 
-import { Objectmap } from './lik.objectmap';
+import { ObjectMap } from './lik.objectmap.js';
 
 export class LoopTracker<T> {
-  referenceObjectMap = new Objectmap<any>();
+  referenceObjectMap = new ObjectMap<any>();
   constructor() {
     // nothing here
   }
@@ -12,7 +12,12 @@ export class LoopTracker<T> {
    * checks and tracks an object
    * @param objectArg
    */
-  checkAndTrack(objectArg: T) {
+  checkAndTrack(objectArg: T): boolean {
-    return this.referenceObjectMap.add(objectArg);
+    if (!this.referenceObjectMap.checkForObject(objectArg)) {
+      this.referenceObjectMap.add(objectArg);
+      return true;
+    } else {
+      return false;
+    }
   }
 }

ts/lik.objectmap.ts

@@ -1,21 +1,39 @@
-import * as plugins from './lik.plugins';
+import * as plugins from './lik.plugins.js';
+import { FastMap } from './lik.fastmap.js';
+
+export const uni = (prefix: string = 'uni') => {
+  return `${prefix}xxxxxxxxxxx`.replace(/[xy]/g, (c) => {
+    const r = (Math.random() * 16) | 0;
+    const v = c === 'x' ? r : (r & 0x3) | 0x8;
+    return v.toString(16);
+  });
+};
 
 export interface IObjectmapForEachFunction<T> {
   (itemArg: T): void;
 }
 
-export interface IObjectmapFindFunction<T> {
+export interface IObjectmapFindFunctionSync<T> {
   (itemArg: T): boolean;
 }
 
+export interface IObjectmapFindFunction<T> {
+  (itemArg: T): Promise<boolean>;
+}
+
+export interface IObjectMapEventData<T> {
+  operation: 'add' | 'remove';
+  payload: T;
+}
+
 /**
  * allows keeping track of objects
  */
-export class Objectmap<T> {
+export class ObjectMap<T> {
-  private objectArray: T[] = [];
+  private fastMap = new FastMap<T>();
 
   // events
-  public eventSubject = new plugins.smartrx.rxjs.Subject<any>();
+  public eventSubject = new plugins.smartrx.rxjs.Subject<IObjectMapEventData<T>>();
 
   /**
    * returns a new instance
@@ -24,28 +42,59 @@ export class Objectmap<T> {
     // nothing here
   }
 
+  /**
+   * adds an object mapped to a string
+   * the string must be unique
+   */
+  addMappedUnique(uniqueKeyArg: string, objectArg: T) {
+    this.fastMap.addToMap(uniqueKeyArg, objectArg);
+  }
+
+  /**
+   * fastest way to get an object from the map
+   * @param uniqueKey
+   */
+  public getMappedUnique(uniqueKeyArg: string) {
+    return this.fastMap.getByKey(uniqueKeyArg);
+  }
+
+  /**
+   * remove key
+   * @param functionArg
+   */
+  public removeMappedUnique(uniqueKey: string) {
+    const object = this.getMappedUnique(uniqueKey);
+  }
+
   /**
    * add object to Objectmap
    * returns false if the object is already in the map
    * returns true if the object was added successfully
    */
-  public add(objectArg: T): boolean {
+  public add(objectArg: T): string {
-    if (this.checkForObject(objectArg)) {
+    // lets search for an existing unique key
-      // the object is already in the objectmap
+    for (const keyArg of this.fastMap.getKeys()) {
-      return false;
+      const object = this.fastMap.getByKey(keyArg);
-    } else {
+      if (object === objectArg) {
-      // the object is not yet in the objectmap
+        return keyArg;
-      this.objectArray.push(objectArg);
+      }
-      this.eventSubject.next('add');
-      return true;
     }
+
+    // otherwise lets create it
+    const uniqueKey = uni('key');
+    this.addMappedUnique(uniqueKey, objectArg);
+    this.eventSubject.next({
+      operation: 'add',
+      payload: objectArg,
+    });
+    return uniqueKey;
   }
 
   /**
    * like .add but adds an whole array of objects
    */
   public addArray(objectArrayArg: T[]) {
-    for (let item of objectArrayArg) {
+    for (const item of objectArrayArg) {
       this.add(item);
     }
   }
@@ -53,27 +102,53 @@ export class Objectmap<T> {
   /**
    * check if object is in Objectmap
    */
-  public checkForObject(objectArg: T) {
+  public checkForObject(objectArg: T): boolean {
-    return this.objectArray.indexOf(objectArg) !== -1;
+    return !!this.getKeyForObject(objectArg);
+  }
+
+  /**
+   * get key for object
+   * @param findFunction
+   */
+  public getKeyForObject(objectArg: T) {
+    let foundKey: string = null;
+    for (const keyArg of this.fastMap.getKeys()) {
+      if (!foundKey && this.fastMap.getByKey(keyArg) === objectArg) {
+        foundKey = keyArg;
+      } else {
+        continue;
+      }
+    }
+    return foundKey;
   }
 
   /**
    * find object
    */
-  public find(findFunction: IObjectmapFindFunction<T>) {
+  public async find(findFunction: IObjectmapFindFunction<T>): Promise<T> {
-    const resultArray = this.objectArray.filter(findFunction);
+    return this.fastMap.find(findFunction);
-    if (resultArray.length > 0) {
+  }
-      return resultArray[0];
+
-    } else {
+  public findSync(findFunction: IObjectmapFindFunctionSync<T>): T {
-      return null;
+    for (const keyArg of this.fastMap.getKeys()) {
+      if (findFunction(this.fastMap.getByKey(keyArg))) {
+        return this.getMappedUnique(keyArg);
+      }
     }
   }
 
   /**
    * finds a specific element and then removes it
    */
-  public findOneAndRemove(findFunction: IObjectmapFindFunction<T>): T {
+  public async findOneAndRemove(findFunction: IObjectmapFindFunction<T>): Promise<T> {
-    const foundElement = this.find(findFunction);
+    const foundElement = await this.find(findFunction);
+    if (foundElement) {
+      this.remove(foundElement);
+    }
+    return foundElement;
+  }
+  public findOneAndRemoveSync(findFunction: IObjectmapFindFunctionSync<T>): T {
+    const foundElement = this.findSync(findFunction);
     if (foundElement) {
       this.remove(foundElement);
     }
@@ -84,8 +159,8 @@ export class Objectmap<T> {
    * run function for each item in Objectmap
    */
   public async forEach(functionArg: IObjectmapForEachFunction<T>) {
-    for (let object of this.objectArray) {
+    for (const keyArg of this.fastMap.getKeys()) {
-      await functionArg(object);
+      await functionArg(this.fastMap.getByKey(keyArg));
     }
   }
 
@@ -93,9 +168,18 @@ export class Objectmap<T> {
    * gets an object in the Observablemap and removes it, so it can't be retrieved again
    */
   public getOneAndRemove(): T {
-    const removedItem = this.objectArray.shift();
+    const keys = this.fastMap.getKeys();
-    this.eventSubject.next('remove');
+    if (keys.length === 0) {
-    return removedItem;
+      return null;
+    } else {
+      const keyToUse = keys[0];
+      const removedItem = this.fastMap.removeFromMap(keyToUse);
+      this.eventSubject.next({
+        operation: 'remove',
+        payload: removedItem,
+      });
+      return removedItem;
+    }
   }
 
   /**
@@ -103,8 +187,8 @@ export class Objectmap<T> {
    */
   public getArray(): T[] {
     const returnArray: any[] = [];
-    for (const objectItem of this.objectArray) {
+    for (const keyArg of this.fastMap.getKeys()) {
-      returnArray.push(objectItem);
+      returnArray.push(this.fastMap.getByKey(keyArg));
     }
     return returnArray;
   }
@@ -113,32 +197,50 @@ export class Objectmap<T> {
    * check if Objectmap ist empty
    */
   public isEmpty(): boolean {
-    if (this.objectArray.length === 0) {
+    return this.fastMap.getKeys().length === 0;
-      return true;
-    } else {
-      return false;
-    }
   }
 
   /**
    * remove object from Objectmap
    */
-  public remove(objectArg: T) {
+  public remove(objectArg: T): T {
-    let replacementArray = [];
+    if (this.checkForObject(objectArg)) {
-    for (let item of this.objectArray) {
+      const keyArg = this.getKeyForObject(objectArg);
-      if (item !== objectArg) {
+      const removedObject = this.fastMap.removeFromMap(keyArg);
-        replacementArray.push(item);
+      this.eventSubject.next({
-      }
+        operation: 'remove',
+        payload: removedObject,
+      });
+      return removedObject;
     }
-    this.objectArray = replacementArray;
+    return null;
-    this.eventSubject.next('remove');
   }
 
   /**
    * wipe Objectmap
    */
   public wipe() {
-    this.objectArray = [];
+    for (const keyArg of this.fastMap.getKeys()) {
-    this.eventSubject.next('wiped');
+      this.fastMap.removeFromMap(keyArg);
+    }
+  }
+
+  /**
+   * returns a new Objectmap that includes
+   */
+  public concat(objectMapArg: ObjectMap<T>) {
+    const concattedObjectMap = new ObjectMap<T>();
+    concattedObjectMap.fastMap.addAllFromOther(this.fastMap);
+    concattedObjectMap.fastMap.addAllFromOther(objectMapArg.fastMap);
+    return concattedObjectMap;
+  }
+
+  /**
+   * tries to merge another Objectmap
+   * Note: uniqueKeyCollisions will cause overwrite
+   * @param objectMapArg
+   */
+  public addAllFromOther(objectMapArg: ObjectMap<T>) {
+    this.fastMap.addAllFromOther(objectMapArg.fastMap);
   }
 }

ts/lik.plugins.ts

@@ -1,25 +1,17 @@
-// ==============
-// native
-// ==============
-
-import * as events from 'events';
-
-export { events };
-
 // ==============
 // @pushrocks
 // ==============
 import * as smartdelay from '@pushrocks/smartdelay';
+import * as smartmatch from '@pushrocks/smartmatch';
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartrx from '@pushrocks/smartrx';
 import * as smarttime from '@pushrocks/smarttime';
 
-export { smartdelay, smartpromise, smartrx, smarttime };
+export { smartdelay, smartmatch, smartpromise, smartrx, smarttime };
 
 // ==============
 // third party
 // ==============
-import minimatch from 'minimatch';
+import symbolTree from 'symbol-tree';
-const symbolTree = require('symbol-tree');
 
-export { minimatch, symbolTree };
+export { symbolTree };

ts/lik.stringmap.ts

@@ -1,16 +1,14 @@
-import * as plugins from './lik.plugins';
+import * as plugins from './lik.plugins.js';
 
 /**
  * allows you to easily keep track of a bunch of strings
  */
 
-export interface ITriggerFunction {
+export type TTriggerFunction = (stringArray?: string[]) => boolean;
-  (): boolean;
-}
 
 export class Stringmap {
   private _stringArray: string[] = [];
-  private _triggerUntilTrueFunctionArray: ITriggerFunction[] = [];
+  private _triggerUntilTrueFunctionArray: TTriggerFunction[] = [];
   constructor() {}
   /**
    * add a string to the Stringmap
@@ -24,7 +22,7 @@ export class Stringmap {
    * like addString, but accepts an array of strings
    */
   addStringArray(stringArrayArg: string[]) {
-    for (let stringItem of stringArrayArg) {
+    for (const stringItem of stringArrayArg) {
       this.addString(stringItem);
     }
   }
@@ -33,7 +31,7 @@ export class Stringmap {
    * removes a string from Stringmap
    */
   removeString(stringArg: string) {
-    for (let keyArg in this._stringArray) {
+    for (const keyArg in this._stringArray) {
       if (this._stringArray[keyArg] === stringArg) {
         this._stringArray.splice(parseInt(keyArg), 1);
       }
@@ -60,9 +58,10 @@ export class Stringmap {
    * checks stringPresence with minimatch
    */
   public checkMinimatch(miniMatchStringArg: string): boolean {
+    const smartMatchInstance = new plugins.smartmatch.SmartMatch(miniMatchStringArg);
     let foundMatch: boolean = false;
-    for (let stringItem of this._stringArray) {
+    for (const stringItem of this._stringArray) {
-      if (plugins.minimatch(stringItem, miniMatchStringArg)) {
+      if (smartMatchInstance.match(stringItem)) {
         foundMatch = true;
       }
     }
@@ -92,22 +91,27 @@ export class Stringmap {
   /**
    * register a new trigger
    */
-  public registerUntilTrue(functionArg: ITriggerFunction, doFunctionArg) {
+  public registerUntilTrue(functionArg: TTriggerFunction, callbackArg?: () => any) {
+    const trueDeferred = plugins.smartpromise.defer();
     this._triggerUntilTrueFunctionArray.push(() => {
-      let result = functionArg();
+      const result = functionArg(this.getStringArray());
       if (result === true) {
-        doFunctionArg();
+        if (callbackArg) {
+          callbackArg();
+        }
+        trueDeferred.resolve();
       }
       return result;
     });
     this.notifyTrigger();
+    return trueDeferred.promise;
   }
 
   /**
    * notifies triggers
    */
   private notifyTrigger() {
-    let filteredArray = this._triggerUntilTrueFunctionArray.filter(functionArg => {
+    const filteredArray = this._triggerUntilTrueFunctionArray.filter((functionArg) => {
       return !functionArg();
     });
     this._triggerUntilTrueFunctionArray = filteredArray;

ts/lik.timedaggregator.ts

@@ -1,4 +1,4 @@
-import * as plugins from './lik.plugins';
+import * as plugins from './lik.plugins.js';
 
 export interface ITimedAggregatorOptions<T> {
   aggregationIntervalInMillis: number;

ts/lik.tree.ts

@@ -1,4 +1,4 @@
-import * as plugins from './lik.plugins';
+import * as plugins from './lik.plugins.js';
 
 export class Tree<T> {
   symbolTree: any;
@@ -62,15 +62,15 @@ export class Tree<T> {
     return this.symbolTree.ancestorsToArray(objectArg, optionsArg);
   }
 
-  treeToArray(rootArg, optionsArg: any): T[] {
+  treeToArray(rootArg: T, optionsArg: any): T[] {
     return this.symbolTree.treeToArray(rootArg, optionsArg);
   }
 
-  childrenIterator(parentArg: T, optionsArg): T {
+  childrenIterator(parentArg: T, optionsArg: any): T {
     return this.symbolTree.childrenIterator(parentArg, optionsArg);
   }
 
-  previousSiblingsIterator(objectArg): T {
+  previousSiblingsIterator(objectArg: T): T {
     return this.symbolTree.previousSiblingsIterator(objectArg);
   }
 
@@ -78,11 +78,11 @@ export class Tree<T> {
     return this.symbolTree.nextSiblingsIterator();
   }
 
-  ancestorsIterator(objectArg) {
+  ancestorsIterator(objectArg: T) {
     this.symbolTree.ancestorsIterator();
   }
 
-  treeIterator(rootArg: T, optionsArg): Iterable<T> {
+  treeIterator(rootArg: T, optionsArg: any): Iterable<T> {
     return this.symbolTree.treeIterator(rootArg);
   }
 
@@ -114,7 +114,7 @@ export class Tree<T> {
     return this.symbolTree.prependChild(referenceObjectArg, newObjectArg);
   }
 
-  appendChild(referenceObjectArg, newObjectArg) {
+  appendChild(referenceObjectArg: T, newObjectArg: T) {
     return this.symbolTree.appendChild(referenceObjectArg, newObjectArg);
   }
 
@@ -126,7 +126,7 @@ export class Tree<T> {
    * returns a branch of the tree as JSON
    * can be user
    */
-  toJsonWithHierachy(rootElement) {
+  toJsonWithHierachy(rootElement: T) {
     const treeIterable = this.treeIterator(rootElement, {});
     for (const treeItem of treeIterable) {
       console.log(treeItem);
@@ -137,5 +137,5 @@ export class Tree<T> {
    * builds a tree from a JSON with hierachy
    * @param rootElement
    */
-  fromJsonWithHierachy(rootElement) {}
+  fromJsonWithHierachy(rootElement: T) {}
 }

tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": 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"
-}