Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
e551a68237 | |||
f402e55ff3 | |||
15b8fe406a | |||
c7557163cd | |||
f84822dd5d | |||
21d6e19a22 |
@ -36,6 +36,7 @@ auditProductionDependencies:
|
|||||||
- npmci command npm audit --audit-level=high --only=prod --production
|
- npmci command npm audit --audit-level=high --only=prod --production
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
|
allow_failure: true
|
||||||
|
|
||||||
auditDevDependencies:
|
auditDevDependencies:
|
||||||
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||||
|
21019
package-lock.json
generated
21019
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
22
package.json
22
package.json
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/lik",
|
"name": "@pushrocks/lik",
|
||||||
"version": "4.0.20",
|
"version": "5.0.0",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "light little helpers for node",
|
"description": "light little helpers for node",
|
||||||
"main": "dist_ts/index.js",
|
"main": "dist_ts/index.js",
|
||||||
@ -20,22 +20,22 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://gitlab.com/pushrocks/lik#README",
|
"homepage": "https://gitlab.com/pushrocks/lik#README",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@gitzone/tsbuild": "^2.1.25",
|
"@gitzone/tsbuild": "^2.1.27",
|
||||||
"@gitzone/tsbundle": "^1.0.78",
|
"@gitzone/tsbundle": "^1.0.87",
|
||||||
"@gitzone/tsrun": "^1.2.12",
|
"@gitzone/tsrun": "^1.2.17",
|
||||||
"@gitzone/tstest": "^1.0.52",
|
"@gitzone/tstest": "^1.0.57",
|
||||||
"@pushrocks/tapbundle": "^3.2.9",
|
"@pushrocks/tapbundle": "^3.2.14",
|
||||||
"@types/node": "^14.14.9",
|
"@types/node": "^16.9.1",
|
||||||
"tslint": "^6.1.3",
|
"tslint": "^6.1.3",
|
||||||
"tslint-config-prettier": "^1.18.0"
|
"tslint-config-prettier": "^1.18.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@pushrocks/smartdelay": "^2.0.10",
|
"@pushrocks/smartdelay": "^2.0.13",
|
||||||
"@pushrocks/smartmatch": "^1.0.7",
|
"@pushrocks/smartmatch": "^1.0.7",
|
||||||
"@pushrocks/smartpromise": "^3.1.3",
|
"@pushrocks/smartpromise": "^3.1.6",
|
||||||
"@pushrocks/smartrx": "^2.0.19",
|
"@pushrocks/smartrx": "^2.0.19",
|
||||||
"@pushrocks/smarttime": "^3.0.37",
|
"@pushrocks/smarttime": "^3.0.38",
|
||||||
"@types/minimatch": "^3.0.3",
|
"@types/minimatch": "^3.0.5",
|
||||||
"symbol-tree": "^3.2.4"
|
"symbol-tree": "^3.2.4"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
|
28
test/test.fastmap.both.ts
Normal file
28
test/test.fastmap.both.ts
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
import { tap, expect } from '@pushrocks/tapbundle';
|
||||||
|
|
||||||
|
import * as lik from '../ts';
|
||||||
|
|
||||||
|
tap.test('should create a valid fastmap', async () => {
|
||||||
|
const fastmap = new lik.FastMap();
|
||||||
|
expect(fastmap).to.be.instanceOf(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).to.equal('heyho3');
|
||||||
|
});
|
||||||
|
|
||||||
|
tap.start();
|
@ -52,7 +52,7 @@ tap.test('Objectmap.forEach -> should correctly run a function forEach map objec
|
|||||||
tap.test('lik.Objectmap.find() -> should correctly find an object', async () => {
|
tap.test('lik.Objectmap.find() -> should correctly find an object', async () => {
|
||||||
let myObject = { propOne: 'helloThere', propTwo: 'helloAnyway' };
|
let myObject = { propOne: 'helloThere', propTwo: 'helloAnyway' };
|
||||||
testObjectmap.add(myObject);
|
testObjectmap.add(myObject);
|
||||||
let referenceObject = testObjectmap.find((itemArg) => {
|
let referenceObject = await testObjectmap.find(async (itemArg) => {
|
||||||
return itemArg.propOne === 'helloThere';
|
return itemArg.propOne === 'helloThere';
|
||||||
});
|
});
|
||||||
// tslint:disable-next-line:no-unused-expression
|
// tslint:disable-next-line:no-unused-expression
|
||||||
|
@ -29,7 +29,7 @@ export class FastMap<T> {
|
|||||||
return this.mapObject[keyArg];
|
return this.mapObject[keyArg];
|
||||||
}
|
}
|
||||||
|
|
||||||
public removeFromMap(keyArg): T {
|
public removeFromMap(keyArg: string): T {
|
||||||
const removedItem = this.getByKey(keyArg);
|
const removedItem = this.getByKey(keyArg);
|
||||||
delete this.mapObject[keyArg];
|
delete this.mapObject[keyArg];
|
||||||
return removedItem;
|
return removedItem;
|
||||||
@ -50,7 +50,7 @@ export class FastMap<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* returns a new Objectmap that includes
|
* returns a new Fastmap that includes all values from this and all from the fastmap in the argument
|
||||||
*/
|
*/
|
||||||
public concat(fastMapArg: FastMap<T>) {
|
public concat(fastMapArg: FastMap<T>) {
|
||||||
const concatedFastmap = new FastMap<T>();
|
const concatedFastmap = new FastMap<T>();
|
||||||
@ -68,9 +68,9 @@ export class FastMap<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* tries to merge another Objectmap
|
* tries to merge another Fastmap
|
||||||
* Note: uniqueKeyCollisions will cause overwrite
|
* Note: uniqueKeyCollisions will cause overwrite
|
||||||
* @param objectMapArg
|
* @param fastMapArg
|
||||||
*/
|
*/
|
||||||
public addAllFromOther(fastMapArg: FastMap<T>) {
|
public addAllFromOther(fastMapArg: FastMap<T>) {
|
||||||
for (const key of fastMapArg.getKeys()) {
|
for (const key of fastMapArg.getKeys()) {
|
||||||
@ -79,4 +79,14 @@ export class FastMap<T> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -76,7 +76,7 @@ export class InterestMap<DTInterestId, DTInterestFullfillment> {
|
|||||||
* @param objectArg removes an interest from the InterestMap
|
* @param objectArg removes an interest from the InterestMap
|
||||||
*/
|
*/
|
||||||
public removeInterest(interestArg: Interest<DTInterestId, DTInterestFullfillment>) {
|
public removeInterest(interestArg: Interest<DTInterestId, DTInterestFullfillment>) {
|
||||||
const interestToRemove = this.interestObjectMap.findOneAndRemove((interestArg2) => {
|
const interestToRemove = this.interestObjectMap.findOneAndRemoveSync((interestArg2) => {
|
||||||
return interestArg.comparisonString === interestArg2.comparisonString;
|
return interestArg.comparisonString === interestArg2.comparisonString;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -94,7 +94,7 @@ export class InterestMap<DTInterestId, DTInterestFullfillment> {
|
|||||||
* @param comparisonStringArg
|
* @param comparisonStringArg
|
||||||
*/
|
*/
|
||||||
public checkInterestByString(comparisonStringArg: string): boolean {
|
public checkInterestByString(comparisonStringArg: string): boolean {
|
||||||
const foundInterest = this.interestObjectMap.find((interest) => {
|
const foundInterest = this.interestObjectMap.findSync((interest) => {
|
||||||
return interest.comparisonString === comparisonStringArg;
|
return interest.comparisonString === comparisonStringArg;
|
||||||
});
|
});
|
||||||
if (foundInterest) {
|
if (foundInterest) {
|
||||||
@ -121,7 +121,7 @@ export class InterestMap<DTInterestId, DTInterestFullfillment> {
|
|||||||
*/
|
*/
|
||||||
public findInterest(objectArg: DTInterestId): Interest<DTInterestId, DTInterestFullfillment> {
|
public findInterest(objectArg: DTInterestId): Interest<DTInterestId, DTInterestFullfillment> {
|
||||||
const comparableString = this.comparisonFunc(objectArg);
|
const comparableString = this.comparisonFunc(objectArg);
|
||||||
const interest = this.interestObjectMap.find((interestArg) => {
|
const interest = this.interestObjectMap.findSync((interestArg) => {
|
||||||
return interestArg.comparisonString === comparableString;
|
return interestArg.comparisonString === comparableString;
|
||||||
});
|
});
|
||||||
return interest; // if an interest is found, the interest is returned, otherwise interest is null
|
return interest; // if an interest is found, the interest is returned, otherwise interest is null
|
||||||
|
@ -13,10 +13,14 @@ export interface IObjectmapForEachFunction<T> {
|
|||||||
(itemArg: T): void;
|
(itemArg: T): void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface IObjectmapFindFunction<T> {
|
export interface IObjectmapFindFunctionSync<T> {
|
||||||
(itemArg: T): boolean;
|
(itemArg: T): boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface IObjectmapFindFunction<T> {
|
||||||
|
(itemArg: T): Promise<boolean>;
|
||||||
|
}
|
||||||
|
|
||||||
export interface IObjectMapEventData<T> {
|
export interface IObjectMapEventData<T> {
|
||||||
operation: 'add' | 'remove';
|
operation: 'add' | 'remove';
|
||||||
payload: T;
|
payload: T;
|
||||||
@ -121,7 +125,11 @@ export class ObjectMap<T> {
|
|||||||
/**
|
/**
|
||||||
* find object
|
* find object
|
||||||
*/
|
*/
|
||||||
public find(findFunction: IObjectmapFindFunction<T>): T {
|
public async find(findFunction: IObjectmapFindFunction<T>): Promise<T> {
|
||||||
|
return this.fastMap.find(findFunction);
|
||||||
|
}
|
||||||
|
|
||||||
|
public findSync(findFunction: IObjectmapFindFunctionSync<T>): T {
|
||||||
for (const keyArg of this.fastMap.getKeys()) {
|
for (const keyArg of this.fastMap.getKeys()) {
|
||||||
if (findFunction(this.fastMap.getByKey(keyArg))) {
|
if (findFunction(this.fastMap.getByKey(keyArg))) {
|
||||||
return this.getMappedUnique(keyArg);
|
return this.getMappedUnique(keyArg);
|
||||||
@ -132,8 +140,15 @@ export class ObjectMap<T> {
|
|||||||
/**
|
/**
|
||||||
* finds a specific element and then removes it
|
* 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) {
|
if (foundElement) {
|
||||||
this.remove(foundElement);
|
this.remove(foundElement);
|
||||||
}
|
}
|
||||||
|
@ -62,15 +62,15 @@ export class Tree<T> {
|
|||||||
return this.symbolTree.ancestorsToArray(objectArg, optionsArg);
|
return this.symbolTree.ancestorsToArray(objectArg, optionsArg);
|
||||||
}
|
}
|
||||||
|
|
||||||
treeToArray(rootArg, optionsArg: any): T[] {
|
treeToArray(rootArg: T, optionsArg: any): T[] {
|
||||||
return this.symbolTree.treeToArray(rootArg, optionsArg);
|
return this.symbolTree.treeToArray(rootArg, optionsArg);
|
||||||
}
|
}
|
||||||
|
|
||||||
childrenIterator(parentArg: T, optionsArg): T {
|
childrenIterator(parentArg: T, optionsArg: any): T {
|
||||||
return this.symbolTree.childrenIterator(parentArg, optionsArg);
|
return this.symbolTree.childrenIterator(parentArg, optionsArg);
|
||||||
}
|
}
|
||||||
|
|
||||||
previousSiblingsIterator(objectArg): T {
|
previousSiblingsIterator(objectArg: T): T {
|
||||||
return this.symbolTree.previousSiblingsIterator(objectArg);
|
return this.symbolTree.previousSiblingsIterator(objectArg);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -78,11 +78,11 @@ export class Tree<T> {
|
|||||||
return this.symbolTree.nextSiblingsIterator();
|
return this.symbolTree.nextSiblingsIterator();
|
||||||
}
|
}
|
||||||
|
|
||||||
ancestorsIterator(objectArg) {
|
ancestorsIterator(objectArg: T) {
|
||||||
this.symbolTree.ancestorsIterator();
|
this.symbolTree.ancestorsIterator();
|
||||||
}
|
}
|
||||||
|
|
||||||
treeIterator(rootArg: T, optionsArg): Iterable<T> {
|
treeIterator(rootArg: T, optionsArg: any): Iterable<T> {
|
||||||
return this.symbolTree.treeIterator(rootArg);
|
return this.symbolTree.treeIterator(rootArg);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -114,7 +114,7 @@ export class Tree<T> {
|
|||||||
return this.symbolTree.prependChild(referenceObjectArg, newObjectArg);
|
return this.symbolTree.prependChild(referenceObjectArg, newObjectArg);
|
||||||
}
|
}
|
||||||
|
|
||||||
appendChild(referenceObjectArg, newObjectArg) {
|
appendChild(referenceObjectArg: T, newObjectArg: T) {
|
||||||
return this.symbolTree.appendChild(referenceObjectArg, newObjectArg);
|
return this.symbolTree.appendChild(referenceObjectArg, newObjectArg);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -126,7 +126,7 @@ export class Tree<T> {
|
|||||||
* returns a branch of the tree as JSON
|
* returns a branch of the tree as JSON
|
||||||
* can be user
|
* can be user
|
||||||
*/
|
*/
|
||||||
toJsonWithHierachy(rootElement) {
|
toJsonWithHierachy(rootElement: T) {
|
||||||
const treeIterable = this.treeIterator(rootElement, {});
|
const treeIterable = this.treeIterator(rootElement, {});
|
||||||
for (const treeItem of treeIterable) {
|
for (const treeItem of treeIterable) {
|
||||||
console.log(treeItem);
|
console.log(treeItem);
|
||||||
@ -137,5 +137,5 @@ export class Tree<T> {
|
|||||||
* builds a tree from a JSON with hierachy
|
* builds a tree from a JSON with hierachy
|
||||||
* @param rootElement
|
* @param rootElement
|
||||||
*/
|
*/
|
||||||
fromJsonWithHierachy(rootElement) {}
|
fromJsonWithHierachy(rootElement: T) {}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user