4.0.12

.gitignore

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

.gitlab-ci.yml

@@ -24,13 +24,14 @@ mirror:
     - docker
     - notpriv
 
-snyk:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
+audit:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
-    - npmci command snyk test
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high
   tags:
     - lossless
     - docker

package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pushrocks/lik",
-  "version": "3.0.16",
+  "version": "4.0.12",
   "private": false,
   "description": "light little helpers for node",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild && tsbundle npm)"
   },
   "repository": {
     "type": "git",
@@ -20,29 +20,31 @@
   },
   "homepage": "https://gitlab.com/pushrocks/lik#README",
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsbuild": "^2.1.24",
+    "@gitzone/tsbundle": "^1.0.69",
     "@gitzone/tsrun": "^1.2.8",
     "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/tapbundle": "^3.2.0",
-    "@types/node": "^13.7.0",
-    "tslint": "^6.0.0",
+    "@pushrocks/tapbundle": "^3.2.1",
+    "@types/node": "^14.0.5",
+    "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.6",
+    "@pushrocks/smartdelay": "^2.0.9",
+    "@pushrocks/smartmatch": "^1.0.7",
     "@pushrocks/smartpromise": "^3.0.6",
-    "@pushrocks/smartrx": "^2.0.5",
-    "@pushrocks/smarttime": "^3.0.12",
-    "@pushrocks/smartunique": "^3.0.1",
+    "@pushrocks/smartrx": "^2.0.15",
+    "@pushrocks/smarttime": "^3.0.18",
+    "@pushrocks/smartunique": "^3.0.3",
     "@types/minimatch": "^3.0.3",
-    "minimatch": "^3.0.4",
     "symbol-tree": "^3.2.4"
   },
   "files": [
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",

readme.md

@@ -35,7 +35,6 @@ like when a certain string is removed or added to the map
 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). :)

test/test.objectmap.ts

@@ -11,7 +11,7 @@ interface ITestObject {
   propOne: string;
   propTwo: string;
 }
-let testObjectmap: lik.Objectmap<ITestObject>;
+let testObjectmap: lik.ObjectMap<ITestObject>;
 let testObject1: ITestObject = {
   propOne: 'hello',
   propTwo: 'hello2'
@@ -22,8 +22,8 @@ let testObject2: ITestObject = {
 };
 
 tap.test('new lik.Objectmap() -> should correctly instantiate an Objectmap', async () => {
-  testObjectmap = new lik.Objectmap<ITestObject>();
-  expect(testObjectmap).be.instanceof(lik.Objectmap);
+  testObjectmap = new lik.ObjectMap<ITestObject>();
+  expect(testObjectmap).be.instanceof(lik.ObjectMap);
 });
 
 tap.test('lik.Objectmap.add() -> should correctly add an object to Objectmap', async () => {

ts/index.ts

@@ -1,7 +1,4 @@
-import * as plugins from './lik.plugins';
-
-// import modules
-
+export * from './lik.fastmap';
 export * from './lik.interestmap';
 export * from './lik.limitedarray';
 export * from './lik.looptracker';

ts/lik.fastmap.ts

@@ -10,8 +10,14 @@ export class FastMap<T> {
     return this.mapObject[keyArg] ? false : true;
   }
 
-  public addToMap(keyArg: string, objectArg: T): boolean {
-    if (this.isUniqueKey(keyArg)) {
+  public addToMap(
+    keyArg: string,
+    objectArg: T,
+    optionsArg?: {
+      force: boolean;
+    }
+  ): boolean {
+    if (this.isUniqueKey(keyArg) || (optionsArg && optionsArg.force)) {
       this.mapObject[keyArg] = objectArg;
       return true;
     } else {
@@ -38,4 +44,39 @@ export class FastMap<T> {
     }
     return keys;
   }
+
+  public clean() {
+    this.mapObject = {};
+  }
+
+  /**
+   * returns a new Objectmap that includes
+   */
+  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 Objectmap
+   * Note: uniqueKeyCollisions will cause overwrite
+   * @param objectMapArg
+   */
+  public addAllFromOther(fastMapArg: FastMap<T>) {
+    for (const key of fastMapArg.getKeys()) {
+      this.addToMap(key, fastMapArg.getByKey(key), {
+        force: true
+      });
+    }
+  }
 }

ts/lik.interestmap.ts

@@ -1,5 +1,5 @@
 import * as plugins from './lik.plugins';
-import { Objectmap } from './lik.objectmap';
+import { ObjectMap } from './lik.objectmap';
 
 import { Observable } from 'rxjs';
 
@@ -11,7 +11,7 @@ export class InterestMap<DTInterestId, DTInterestFullfillment> {
   /**
    * 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
@@ -106,8 +106,8 @@ export class InterestMap<DTInterestId, DTInterestFullfillment> {
    */
   public findInterest(objectArg: DTInterestId): Interest<DTInterestId, DTInterestFullfillment> {
     const comparableString = this.comparisonFunc(objectArg);
-    const interest = this.interestObjectMap.find(interest => {
-      return interest.comparisonString === comparableString;
+    const interest = this.interestObjectMap.find(interestArg => {
+      return interestArg.comparisonString === comparableString;
     });
     return interest; // if an interest is found, the interest is returned, otherwise interest is null
   }

ts/lik.looptracker.ts

@@ -1,9 +1,9 @@
 import * as plugins from './lik.plugins';
 
-import { Objectmap } from './lik.objectmap';
+import { ObjectMap } from './lik.objectmap';
 
 export class LoopTracker<T> {
-  referenceObjectMap = new Objectmap<any>();
+  referenceObjectMap = new ObjectMap<any>();
   constructor() {
     // nothing here
   }

ts/lik.objectmap.ts

@@ -12,7 +12,7 @@ export interface IObjectmapFindFunction<T> {
 /**
  * allows keeping track of objects
  */
-export class Objectmap<T> {
+export class ObjectMap<T> {
   private fastMap = new FastMap<T>();
 
   // events
@@ -137,11 +137,15 @@ export class Objectmap<T> {
    */
   public getOneAndRemove(): T {
     const keys = this.fastMap.getKeys();
-    const keyToUse = keys[keys.length - 1];
+    if (keys.length === 0) {
+      return null;
+    } else {
+      const keyToUse = keys[0];
       const removedItem = this.fastMap.removeFromMap(keyToUse);
       this.eventSubject.next('remove');
       return removedItem;
     }
+  }
 
   /**
    * returns a cloned array of all the objects currently in the Objectmap
@@ -181,6 +185,24 @@ export class Objectmap<T> {
     for (const keyArg of this.fastMap.getKeys()) {
       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,26 +1,18 @@
-// ==============
-// 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';
 import * as smartunique from '@pushrocks/smartunique';
 
-export { smartdelay, smartpromise, smartrx, smarttime, smartunique };
+export { smartdelay, smartmatch, smartpromise, smartrx, smarttime, smartunique };
 
 // ==============
 // third party
 // ==============
-import minimatch from 'minimatch';
 const symbolTree = require('symbol-tree');
 
-export { minimatch, symbolTree };
+export { symbolTree };

ts/lik.stringmap.ts

@@ -4,13 +4,11 @@ import * as plugins from './lik.plugins';
  * allows you to easily keep track of a bunch of strings
  */
 
-export interface ITriggerFunction {
-  (): boolean;
-}
+export type TTriggerFunction =  (stringArray?: string[]) => boolean;
 
 export class Stringmap {
   private _stringArray: string[] = [];
-  private _triggerUntilTrueFunctionArray: ITriggerFunction[] = [];
+  private _triggerUntilTrueFunctionArray: TTriggerFunction[] = [];
   constructor() {}
   /**
    * add a string to the Stringmap
@@ -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 (const stringItem of this._stringArray) {
-      if (plugins.minimatch(stringItem, miniMatchStringArg)) {
+      if (smartMatchInstance.match(stringItem)) {
         foundMatch = true;
       }
     }
@@ -92,15 +91,20 @@ 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(() => {
-      const result = functionArg();
+      const result = functionArg(this.getStringArray());
       if (result === true) {
-        doFunctionArg();
+        if (callbackArg) {
+          callbackArg();
+        }
+        trueDeferred.resolve();
       }
       return result;
     });
     this.notifyTrigger();
+    return trueDeferred.promise;
   }
 
   /**