Compare commits
70 Commits
Author | SHA1 | Date | |
---|---|---|---|
079b093e2c | |||
55a3caec44 | |||
28b3666aad | |||
b17dd2ed64 | |||
e551a68237 | |||
f402e55ff3 | |||
15b8fe406a | |||
c7557163cd | |||
f84822dd5d | |||
21d6e19a22 | |||
8947738dc1 | |||
14bc5dcd25 | |||
c2f366de7f | |||
ae47276569 | |||
42b59c109d | |||
8f18faaf1c | |||
ccd5b80d67 | |||
298904e17e | |||
fa91e67aef | |||
5e99066bee | |||
a838f7eb80 | |||
979e93be27 | |||
60587f052c | |||
da5bd43a42 | |||
24559d1582 | |||
d92657b130 | |||
f8f34bf8a3 | |||
861d2c04b3 | |||
5845d74160 | |||
9dd952e6b7 | |||
742a711359 | |||
8878a0ef8b | |||
6a52e81cdd | |||
757e709f3f | |||
e0d9c3a3e0 | |||
150953adaf | |||
e0eba5d206 | |||
d9eb836f98 | |||
6d29798660 | |||
f80a84086c | |||
929a6eff07 | |||
87243881bb | |||
5d51c14bd6 | |||
453c6d6ae8 | |||
2e9fe308df | |||
96a71638a0 | |||
1c7582d328 | |||
ccff9b39be | |||
749be9ac60 | |||
7c9ad26519 | |||
6fdf08c8a9 | |||
de04d75e18 | |||
5159d7e4bf | |||
7b78aaea72 | |||
54a63d1f41 | |||
dd5a009d0f | |||
e7933cd7f4 | |||
56a8d9182b | |||
3a971301a4 | |||
b880036b64 | |||
9d756dbff7 | |||
b8111c66ff | |||
8d660a8573 | |||
596a897afc | |||
e1442b1bc8 | |||
2ca9e14f76 | |||
e65f36dfa2 | |||
adb95cd683 | |||
d2106690b4 | |||
2ea5111eb8 |
4
.gitignore
vendored
4
.gitignore
vendored
@ -15,8 +15,6 @@ node_modules/
|
|||||||
|
|
||||||
# builds
|
# builds
|
||||||
dist/
|
dist/
|
||||||
dist_web/
|
dist_*/
|
||||||
dist_serve/
|
|
||||||
dist_ts_web/
|
|
||||||
|
|
||||||
# custom
|
# custom
|
105
.gitlab-ci.yml
105
.gitlab-ci.yml
@ -3,14 +3,14 @@ image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
|||||||
|
|
||||||
cache:
|
cache:
|
||||||
paths:
|
paths:
|
||||||
- .npmci_cache/
|
- .npmci_cache/
|
||||||
key: "$CI_BUILD_STAGE"
|
key: '$CI_BUILD_STAGE'
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- security
|
- security
|
||||||
- test
|
- test
|
||||||
- release
|
- release
|
||||||
- metadata
|
- metadata
|
||||||
|
|
||||||
# ====================
|
# ====================
|
||||||
# security stage
|
# security stage
|
||||||
@ -18,60 +18,75 @@ stages:
|
|||||||
mirror:
|
mirror:
|
||||||
stage: security
|
stage: security
|
||||||
script:
|
script:
|
||||||
- npmci git mirror
|
- npmci git mirror
|
||||||
|
only:
|
||||||
|
- tags
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- lossless
|
||||||
- notpriv
|
- docker
|
||||||
|
- notpriv
|
||||||
|
|
||||||
snyk:
|
auditProductionDependencies:
|
||||||
|
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
|
||||||
stage: security
|
stage: security
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci command npm install -g snyk
|
- npmci command npm install --production --ignore-scripts
|
||||||
- npmci command npm install --ignore-scripts
|
- npmci command npm config set registry https://registry.npmjs.org
|
||||||
- npmci command snyk test
|
- npmci command npm audit --audit-level=high --only=prod --production
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
- notpriv
|
allow_failure: true
|
||||||
|
|
||||||
|
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
|
# test stage
|
||||||
# ====================
|
# ====================
|
||||||
|
|
||||||
testLTS:
|
testStable:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci node install lts
|
- npmci node install stable
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci npm test
|
- npmci npm test
|
||||||
coverage: /\d+.?\d+?\%\s*coverage/
|
coverage: /\d+.?\d+?\%\s*coverage/
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
- notpriv
|
|
||||||
|
|
||||||
testBuild:
|
testBuild:
|
||||||
stage: test
|
stage: test
|
||||||
script:
|
script:
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci node install lts
|
- npmci node install stable
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command npm run build
|
- npmci command npm run build
|
||||||
coverage: /\d+.?\d+?\%\s*coverage/
|
coverage: /\d+.?\d+?\%\s*coverage/
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
- notpriv
|
|
||||||
|
|
||||||
release:
|
release:
|
||||||
stage: release
|
stage: release
|
||||||
script:
|
script:
|
||||||
- npmci node install lts
|
- npmci node install stable
|
||||||
- npmci npm publish
|
- npmci npm publish
|
||||||
only:
|
only:
|
||||||
- tags
|
- tags
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- lossless
|
||||||
- notpriv
|
- docker
|
||||||
|
- notpriv
|
||||||
|
|
||||||
# ====================
|
# ====================
|
||||||
# metadata stage
|
# metadata stage
|
||||||
@ -79,35 +94,39 @@ release:
|
|||||||
codequality:
|
codequality:
|
||||||
stage: metadata
|
stage: metadata
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
|
only:
|
||||||
|
- tags
|
||||||
script:
|
script:
|
||||||
- npmci command npm install -g tslint typescript
|
- npmci command npm install -g tslint typescript
|
||||||
|
- npmci npm prepare
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
|
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- lossless
|
||||||
- priv
|
- docker
|
||||||
|
- priv
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
stage: metadata
|
stage: metadata
|
||||||
script:
|
script:
|
||||||
- npmci trigger
|
- npmci trigger
|
||||||
only:
|
only:
|
||||||
- tags
|
- tags
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- lossless
|
||||||
- notpriv
|
- docker
|
||||||
|
- notpriv
|
||||||
|
|
||||||
pages:
|
pages:
|
||||||
image: hosttoday/ht-docker-dbase:npmci
|
|
||||||
services:
|
|
||||||
- docker:18-dind
|
|
||||||
stage: metadata
|
stage: metadata
|
||||||
script:
|
script:
|
||||||
|
- npmci node install lts
|
||||||
- npmci command npm install -g @gitzone/tsdoc
|
- npmci command npm install -g @gitzone/tsdoc
|
||||||
- npmci npm prepare
|
- npmci npm prepare
|
||||||
- npmci npm install
|
- npmci npm install
|
||||||
- npmci command tsdoc
|
- npmci command tsdoc
|
||||||
tags:
|
tags:
|
||||||
|
- lossless
|
||||||
- docker
|
- docker
|
||||||
- notpriv
|
- notpriv
|
||||||
only:
|
only:
|
||||||
@ -115,5 +134,5 @@ pages:
|
|||||||
artifacts:
|
artifacts:
|
||||||
expire_in: 1 week
|
expire_in: 1 week
|
||||||
paths:
|
paths:
|
||||||
- public
|
- public
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
|
29
.vscode/launch.json
vendored
Normal file
29
.vscode/launch.json
vendored
Normal file
@ -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"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
27
.vscode/settings.json
vendored
27
.vscode/settings.json
vendored
@ -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"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
43
README.md
43
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
|
|
||||||
[](https://gitlab.com/pushrocks/lik/commits/master)
|
|
||||||
[](https://gitlab.com/pushrocks/lik/commits/master)
|
|
||||||
[](https://www.npmjs.com/package/@pushrocks/lik)
|
|
||||||
[](https://snyk.io/test/npm/@pushrocks/lik)
|
|
||||||
[](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
|
||||||
[](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
|
||||||
[](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.html)
|
|
||||||
|
|
||||||
[](https://maintainedby.lossless.com)
|
|
@ -4,6 +4,7 @@
|
|||||||
"npmAccessLevel": "public"
|
"npmAccessLevel": "public"
|
||||||
},
|
},
|
||||||
"gitzone": {
|
"gitzone": {
|
||||||
|
"projectType": "npm",
|
||||||
"module": {
|
"module": {
|
||||||
"githost": "gitlab.com",
|
"githost": "gitlab.com",
|
||||||
"gitscope": "pushrocks",
|
"gitscope": "pushrocks",
|
||||||
|
27698
package-lock.json
generated
27698
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
49
package.json
49
package.json
@ -1,13 +1,13 @@
|
|||||||
{
|
{
|
||||||
"name": "@pushrocks/lik",
|
"name": "@pushrocks/lik",
|
||||||
"version": "3.0.10",
|
"version": "5.0.2",
|
||||||
"private": false,
|
"private": false,
|
||||||
"description": "light little helpers for node",
|
"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",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "(tstest test/)",
|
"test": "(tstest test/)",
|
||||||
"build": "(tsbuild)"
|
"build": "(tsbuild --web && tsbundle npm)"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
@ -20,32 +20,37 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://gitlab.com/pushrocks/lik#README",
|
"homepage": "https://gitlab.com/pushrocks/lik#README",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@gitzone/tsbuild": "^2.1.11",
|
"@gitzone/tsbuild": "^2.1.29",
|
||||||
"@gitzone/tsrun": "^1.2.8",
|
"@gitzone/tsbundle": "^1.0.89",
|
||||||
"@gitzone/tstest": "^1.0.24",
|
"@gitzone/tsrun": "^1.2.18",
|
||||||
"@pushrocks/tapbundle": "^3.0.11",
|
"@gitzone/tstest": "^1.0.60",
|
||||||
"@types/node": "^12.6.9",
|
"@pushrocks/tapbundle": "^4.0.0",
|
||||||
"tslint": "^5.18.0",
|
"@types/node": "^17.0.10",
|
||||||
|
"tslint": "^6.1.3",
|
||||||
"tslint-config-prettier": "^1.18.0"
|
"tslint-config-prettier": "^1.18.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@pushrocks/smartdelay": "^2.0.3",
|
"@pushrocks/smartdelay": "^2.0.13",
|
||||||
"@pushrocks/smartpromise": "^3.0.2",
|
"@pushrocks/smartmatch": "^1.0.7",
|
||||||
"@pushrocks/smartrx": "^2.0.3",
|
"@pushrocks/smartpromise": "^3.1.6",
|
||||||
"@pushrocks/smarttime": "^3.0.12",
|
"@pushrocks/smartrx": "^2.0.22",
|
||||||
"@types/minimatch": "^3.0.3",
|
"@pushrocks/smarttime": "^3.0.43",
|
||||||
"minimatch": "^3.0.4",
|
"@types/minimatch": "^3.0.5",
|
||||||
"symbol-tree": "^3.2.4"
|
"symbol-tree": "^3.2.4"
|
||||||
},
|
},
|
||||||
"files": [
|
"files": [
|
||||||
"ts/*",
|
"ts/**/*",
|
||||||
"ts_web/*",
|
"ts_web/**/*",
|
||||||
"dist/*",
|
"dist/**/*",
|
||||||
"dist_web/*",
|
"dist_*/**/*",
|
||||||
"dist_ts_web/*",
|
"dist_ts/**/*",
|
||||||
"assets/*",
|
"dist_ts_web/**/*",
|
||||||
|
"assets/**/*",
|
||||||
"cli.js",
|
"cli.js",
|
||||||
"npmextra.json",
|
"npmextra.json",
|
||||||
"readme.md"
|
"readme.md"
|
||||||
|
],
|
||||||
|
"browserslist": [
|
||||||
|
"last 1 chrome versions"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
54
readme.md
Normal file
54
readme.md
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
# @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 | [](https://lossless.cloud)
|
||||||
|
GitLab Pipline Test Coverage | [](https://lossless.cloud)
|
||||||
|
npm | [](https://lossless.cloud)
|
||||||
|
Snyk | [](https://lossless.cloud)
|
||||||
|
TypeScript Support | [](https://lossless.cloud)
|
||||||
|
node Support | [](https://nodejs.org/dist/latest-v10.x/docs/api/)
|
||||||
|
Code Style | [](https://lossless.cloud)
|
||||||
|
PackagePhobia (total standalone install weight) | [](https://lossless.cloud)
|
||||||
|
PackagePhobia (package size on registry) | [](https://lossless.cloud)
|
||||||
|
BundlePhobia (total size when bundled) | [](https://lossless.cloud)
|
||||||
|
Platform support | [](https://lossless.cloud) [](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.
|
||||||
|
|
||||||
|
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
|
||||||
|
| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
|
||||||
|
|
||||||
|
[](https://maintainedby.lossless.com)
|
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).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();
|
@ -4,7 +4,7 @@ import * as lik from '../ts/index';
|
|||||||
let testInterestmap: lik.InterestMap<number, number>;
|
let testInterestmap: lik.InterestMap<number, number>;
|
||||||
|
|
||||||
tap.test('should create an interestmap', async () => {
|
tap.test('should create an interestmap', async () => {
|
||||||
testInterestmap = new lik.InterestMap(numberArg => {
|
testInterestmap = new lik.InterestMap((numberArg) => {
|
||||||
return numberArg.toString();
|
return numberArg.toString();
|
||||||
});
|
});
|
||||||
});
|
});
|
@ -6,12 +6,12 @@ let testLimitedArray: LimitedArray<string>;
|
|||||||
|
|
||||||
tap.test('should create a LimitedArray', async () => {
|
tap.test('should create a LimitedArray', async () => {
|
||||||
testLimitedArray = new LimitedArray(6);
|
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 () => {
|
tap.test('should never be longer than the set length', async () => {
|
||||||
testLimitedArray.addMany(['hi', 'this', 'is', 'quite', 'a', 'long', 'string', ':)']);
|
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();
|
tap.start();
|
@ -13,14 +13,14 @@ let myLoopTracker: lik.LoopTracker<any>;
|
|||||||
// tests
|
// tests
|
||||||
tap.test('should create a valid looptracker instance', async () => {
|
tap.test('should create a valid looptracker instance', async () => {
|
||||||
myLoopTracker = new lik.LoopTracker();
|
myLoopTracker = new lik.LoopTracker();
|
||||||
expect(myLoopTracker).to.be.instanceof(lik.LoopTracker);
|
expect(myLoopTracker).toBeInstanceOf(lik.LoopTracker);
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should add objects once and return true', async () => {
|
tap.test('should add objects once and return true', async () => {
|
||||||
expect(myLoopTracker.checkAndTrack(object1)).to.be.true;
|
expect(myLoopTracker.checkAndTrack(object1)).toBeTrue();
|
||||||
expect(myLoopTracker.checkAndTrack(object1)).to.be.false;
|
expect(myLoopTracker.checkAndTrack(object1)).toBeFalse();
|
||||||
expect(myLoopTracker.checkAndTrack(object2)).to.be.true;
|
expect(myLoopTracker.checkAndTrack(object2)).toBeTrue();
|
||||||
expect(myLoopTracker.checkAndTrack(object2)).to.be.false;
|
expect(myLoopTracker.checkAndTrack(object2)).toBeFalse();
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.start();
|
tap.start();
|
@ -11,68 +11,68 @@ interface ITestObject {
|
|||||||
propOne: string;
|
propOne: string;
|
||||||
propTwo: string;
|
propTwo: string;
|
||||||
}
|
}
|
||||||
let testObjectmap: lik.Objectmap<ITestObject>;
|
let testObjectmap: lik.ObjectMap<ITestObject>;
|
||||||
let testObject1: ITestObject = {
|
let testObject1: ITestObject = {
|
||||||
propOne: 'hello',
|
propOne: 'hello',
|
||||||
propTwo: 'hello2'
|
propTwo: 'hello2',
|
||||||
};
|
};
|
||||||
let testObject2: ITestObject = {
|
let testObject2: ITestObject = {
|
||||||
propOne: 'hello',
|
propOne: 'hello',
|
||||||
propTwo: 'hello2'
|
propTwo: 'hello2',
|
||||||
};
|
};
|
||||||
|
|
||||||
tap.test('new lik.Objectmap() -> should correctly instantiate an Objectmap', async () => {
|
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 () => {
|
tap.test('lik.Objectmap.add() -> should correctly add an object to Objectmap', async () => {
|
||||||
testObjectmap.add(testObject1);
|
testObjectmap.add(testObject1);
|
||||||
// tslint:disable-next-line:no-unused-expression
|
// 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
|
// 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 () => {
|
tap.test('lik.Objectmap.remove() -> should correctly remove an object to Objectmap', async () => {
|
||||||
testObjectmap.add(testObject2);
|
testObjectmap.add(testObject2);
|
||||||
testObjectmap.remove(testObject1);
|
testObjectmap.remove(testObject1);
|
||||||
// tslint:disable-next-line:no-unused-expression
|
// 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
|
// 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 () => {
|
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');
|
// TODO expect(itemArg).to.have.property('propOne');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
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
|
||||||
expect(myObject === referenceObject).be.true;
|
expect(myObject === referenceObject).toBeTrue();
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('lik.Objectmap.getArray() -> should return a cloned array', async () => {
|
tap.test('lik.Objectmap.getArray() -> should return a cloned array', async () => {
|
||||||
let myObject = { propOne: 'test1', propTwo: 'wow, how awesome' };
|
let myObject = { propOne: 'test1', propTwo: 'wow, how awesome' };
|
||||||
testObjectmap.add(myObject);
|
testObjectmap.add(myObject);
|
||||||
let clonedArray = testObjectmap.getArray();
|
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 () => {
|
tap.test('should get one object and then remove it', async () => {
|
||||||
let originalLength = testObjectmap.getArray().length;
|
let originalLength = testObjectmap.getArray().length;
|
||||||
let oneObject = testObjectmap.getOneAndRemove();
|
let oneObject = testObjectmap.getOneAndRemove();
|
||||||
// tslint:disable-next-line:no-unused-expression
|
// tslint:disable-next-line:no-unused-expression
|
||||||
expect(oneObject).not.be.null;
|
// TODO 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);
|
// TODO expect(testObjectmap.getArray()).to.not.contain(oneObject);
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.start();
|
tap.start();
|
@ -18,14 +18,14 @@ let testString6 = 'testString6';
|
|||||||
// tests
|
// tests
|
||||||
tap.test('new lik.Objectmap() -> should create an instance of Stringmap', async () => {
|
tap.test('new lik.Objectmap() -> should create an instance of Stringmap', async () => {
|
||||||
testStringmap = new lik.Stringmap();
|
testStringmap = new lik.Stringmap();
|
||||||
expect(testStringmap).be.instanceof(lik.Stringmap);
|
expect(testStringmap).toBeInstanceOf(lik.Stringmap);
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test(
|
tap.test(
|
||||||
'lik.Stringmap.checkString -> should return false for an string not in Stringmap',
|
'lik.Stringmap.checkString -> should return false for an string not in Stringmap',
|
||||||
async () => {
|
async () => {
|
||||||
// tslint:disable-next-line:no-unused-expression
|
// tslint:disable-next-line:no-unused-expression
|
||||||
expect(testStringmap.checkString(testString1)).be.false;
|
expect(testStringmap.checkString(testString1)).toBeFalse();
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -34,37 +34,37 @@ tap.test('lik.Stringmap.addString -> should add an string to Stringmap', async (
|
|||||||
testStringmap.addString(testString2);
|
testStringmap.addString(testString2);
|
||||||
testStringmap.addString(testString3);
|
testStringmap.addString(testString3);
|
||||||
// tslint:disable-next-line:no-unused-expression
|
// 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
|
// 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
|
// 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
|
// 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
|
// 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
|
// 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 () => {
|
tap.test('lik.Stringmap.addStringArray -> should add an array of strings', async () => {
|
||||||
testStringmap.addStringArray([testString4, testString5, testString6]);
|
testStringmap.addStringArray([testString4, testString5, testString6]);
|
||||||
// tslint:disable-next-line:no-unused-expression
|
// 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 () => {
|
tap.test('lik.Stringmap.removeString -> should remove a string from Stringmap', async () => {
|
||||||
testStringmap.removeString(testString2);
|
testStringmap.removeString(testString2);
|
||||||
// tslint:disable-next-line:no-unused-expression
|
// 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 () => {
|
tap.test('lik.Stringmap.getStringArray() -> should return a copy of stringArray', async () => {
|
||||||
let clonedArray = testStringmap.getStringArray();
|
let clonedArray = testStringmap.getStringArray();
|
||||||
// tslint:disable-next-line:no-unused-expression
|
// 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
|
// tslint:disable-next-line:no-unused-expression
|
||||||
expect(clonedArray[0] === testString1).be.true;
|
expect(clonedArray[0] === testString1).toBeTrue();
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test(
|
tap.test(
|
@ -8,12 +8,12 @@ import * as lik from '../ts/index';
|
|||||||
|
|
||||||
let testTimedAggregator: lik.TimedAggregtor<string>;
|
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>({
|
testTimedAggregator = new lik.TimedAggregtor<string>({
|
||||||
aggregationIntervalInMillis: 1000,
|
aggregationIntervalInMillis: 1000,
|
||||||
functionForAggregation: aggregation => {
|
functionForAggregation: (aggregation) => {
|
||||||
console.log(aggregation);
|
console.log(aggregation);
|
||||||
}
|
},
|
||||||
});
|
});
|
||||||
testTimedAggregator.add('This');
|
testTimedAggregator.add('This');
|
||||||
testTimedAggregator.add('is a whole sentence.');
|
testTimedAggregator.add('is a whole sentence.');
|
@ -18,13 +18,13 @@ let testInstance6 = new TestClass('sixth');
|
|||||||
|
|
||||||
tap.test('create a valid tree instance', async () => {
|
tap.test('create a valid tree instance', async () => {
|
||||||
testTree = new lik.Tree();
|
testTree = new lik.Tree();
|
||||||
expect(testTree).to.be.instanceOf(lik.Tree);
|
expect(testTree).toBeInstanceOf(lik.Tree);
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should insert an object', async () => {
|
tap.test('should insert an object', async () => {
|
||||||
testTree.initialize(testInstance);
|
testTree.initialize(testInstance);
|
||||||
let resultArray = testTree.treeToArray(testInstance, {});
|
let resultArray = testTree.treeToArray(testInstance, {});
|
||||||
expect(resultArray).to.contain(testInstance);
|
// TODO expect(resultArray).toContain(testInstance);
|
||||||
});
|
});
|
||||||
|
|
||||||
tap.test('should add other objects in a hierachy', async () => {
|
tap.test('should add other objects in a hierachy', async () => {
|
@ -1 +0,0 @@
|
|||||||
import './test.objectmap';
|
|
@ -1,8 +1,6 @@
|
|||||||
import * as plugins from './lik.plugins';
|
export * from './lik.fastmap';
|
||||||
|
|
||||||
// import modules
|
|
||||||
|
|
||||||
export * from './lik.interestmap';
|
export * from './lik.interestmap';
|
||||||
|
export * from './lik.interestmap.interest';
|
||||||
export * from './lik.limitedarray';
|
export * from './lik.limitedarray';
|
||||||
export * from './lik.looptracker';
|
export * from './lik.looptracker';
|
||||||
export * from './lik.objectmap';
|
export * from './lik.objectmap';
|
||||||
|
92
ts/lik.fastmap.ts
Normal file
92
ts/lik.fastmap.ts
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
import * as plugins from './lik.plugins';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -2,7 +2,14 @@ import * as plugins from './lik.plugins';
|
|||||||
|
|
||||||
import { InterestMap, IInterestComparisonFunc } from './lik.interestmap';
|
import { InterestMap, IInterestComparisonFunc } from './lik.interestmap';
|
||||||
|
|
||||||
|
export interface IInterestOptions<DTInterestFullfillment> {
|
||||||
|
markLostAfterDefault: number;
|
||||||
|
defaultFullfillment?: DTInterestFullfillment;
|
||||||
|
}
|
||||||
|
|
||||||
export class Interest<DTInterestId, DTInterestFullfillment> {
|
export class Interest<DTInterestId, DTInterestFullfillment> {
|
||||||
|
public options: IInterestOptions<DTInterestFullfillment>;
|
||||||
|
|
||||||
private interestMapRef: InterestMap<DTInterestId, DTInterestFullfillment>;
|
private interestMapRef: InterestMap<DTInterestId, DTInterestFullfillment>;
|
||||||
public originalInterest: DTInterestId;
|
public originalInterest: DTInterestId;
|
||||||
public comparisonFunc: IInterestComparisonFunc<DTInterestId>;
|
public comparisonFunc: IInterestComparisonFunc<DTInterestId>;
|
||||||
@ -41,14 +48,20 @@ export class Interest<DTInterestId, DTInterestFullfillment> {
|
|||||||
constructor(
|
constructor(
|
||||||
interestMapArg: InterestMap<DTInterestId, DTInterestFullfillment>,
|
interestMapArg: InterestMap<DTInterestId, DTInterestFullfillment>,
|
||||||
interestArg: DTInterestId,
|
interestArg: DTInterestId,
|
||||||
comparisonFuncArg: IInterestComparisonFunc<DTInterestId>
|
comparisonFuncArg: IInterestComparisonFunc<DTInterestId>,
|
||||||
|
optionsArg?: IInterestOptions<DTInterestFullfillment>
|
||||||
) {
|
) {
|
||||||
|
this.interestMapRef = interestMapArg;
|
||||||
this.originalInterest = interestArg;
|
this.originalInterest = interestArg;
|
||||||
this.comparisonFunc = comparisonFuncArg;
|
this.comparisonFunc = comparisonFuncArg;
|
||||||
this.interestMapRef = interestMapArg;
|
this.options = optionsArg;
|
||||||
|
|
||||||
this.destructionTimer.completed.then(() => {
|
this.destructionTimer.completed.then(() => {
|
||||||
this.destroy();
|
this.destroy();
|
||||||
});
|
});
|
||||||
|
if (this.options?.markLostAfterDefault) {
|
||||||
|
plugins.smartdelay.delayFor(this.options.markLostAfterDefault).then(this.markLost);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ===============================
|
// ===============================
|
||||||
@ -60,6 +73,9 @@ export class Interest<DTInterestId, DTInterestFullfillment> {
|
|||||||
*/
|
*/
|
||||||
public destroy() {
|
public destroy() {
|
||||||
this.interestMapRef.removeInterest(this);
|
this.interestMapRef.removeInterest(this);
|
||||||
|
if (!this.isFullfilled && this.options.defaultFullfillment) {
|
||||||
|
this.fullfillInterest(this.options.defaultFullfillment);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import * as plugins from './lik.plugins';
|
import * as plugins from './lik.plugins';
|
||||||
import { Objectmap } from './lik.objectmap';
|
import { ObjectMap } from './lik.objectmap';
|
||||||
|
|
||||||
import { Observable } from 'rxjs';
|
import { Observable } from 'rxjs';
|
||||||
|
|
||||||
@ -7,19 +7,29 @@ import { Interest } from './lik.interestmap.interest';
|
|||||||
|
|
||||||
export type IInterestComparisonFunc<T> = (objectArg: T) => string;
|
export type IInterestComparisonFunc<T> = (objectArg: T) => string;
|
||||||
|
|
||||||
|
export interface IInterestMapOptions {
|
||||||
|
markLostAfterDefault?: number;
|
||||||
|
}
|
||||||
|
|
||||||
export class InterestMap<DTInterestId, DTInterestFullfillment> {
|
export class InterestMap<DTInterestId, DTInterestFullfillment> {
|
||||||
|
public options: IInterestMapOptions;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* stores interests that are currently fullfilled by the cache
|
* 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
|
* a function to compare interests
|
||||||
*/
|
*/
|
||||||
private comparisonFunc: IInterestComparisonFunc<DTInterestId>;
|
private comparisonFunc: IInterestComparisonFunc<DTInterestId>;
|
||||||
|
|
||||||
constructor(comparisonFuncArg: IInterestComparisonFunc<DTInterestId>) {
|
constructor(
|
||||||
|
comparisonFuncArg: IInterestComparisonFunc<DTInterestId>,
|
||||||
|
optionsArg: IInterestMapOptions = {}
|
||||||
|
) {
|
||||||
this.comparisonFunc = comparisonFuncArg;
|
this.comparisonFunc = comparisonFuncArg;
|
||||||
|
this.options = optionsArg;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -27,17 +37,22 @@ export class InterestMap<DTInterestId, DTInterestFullfillment> {
|
|||||||
* @param objectArg
|
* @param objectArg
|
||||||
*/
|
*/
|
||||||
public async addInterest(
|
public async addInterest(
|
||||||
objectArg: DTInterestId
|
objectArg: DTInterestId,
|
||||||
|
defaultFullfillmentArg?: DTInterestFullfillment
|
||||||
): Promise<Interest<DTInterestId, DTInterestFullfillment>> {
|
): Promise<Interest<DTInterestId, DTInterestFullfillment>> {
|
||||||
const comparisonString = this.comparisonFunc(objectArg);
|
const comparisonString = this.comparisonFunc(objectArg);
|
||||||
let returnInterest: Interest<DTInterestId, DTInterestFullfillment>;
|
let returnInterest: Interest<DTInterestId, DTInterestFullfillment>;
|
||||||
const newInterest = new Interest<DTInterestId, DTInterestFullfillment>(
|
const newInterest = new Interest<DTInterestId, DTInterestFullfillment>(
|
||||||
this,
|
this,
|
||||||
objectArg,
|
objectArg,
|
||||||
this.comparisonFunc
|
this.comparisonFunc,
|
||||||
|
{
|
||||||
|
markLostAfterDefault: this.options.markLostAfterDefault,
|
||||||
|
defaultFullfillment: defaultFullfillmentArg,
|
||||||
|
}
|
||||||
);
|
);
|
||||||
let interestExists = false;
|
let interestExists = false;
|
||||||
await this.interestObjectMap.forEach(interestArg => {
|
await this.interestObjectMap.forEach((interestArg) => {
|
||||||
if (!interestExists && interestArg.comparisonString === newInterest.comparisonString) {
|
if (!interestExists && interestArg.comparisonString === newInterest.comparisonString) {
|
||||||
console.log('info', `interest already exists for ${newInterest.comparisonString}`);
|
console.log('info', `interest already exists for ${newInterest.comparisonString}`);
|
||||||
interestExists = true;
|
interestExists = true;
|
||||||
@ -61,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;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -79,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) {
|
||||||
@ -106,8 +121,8 @@ 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(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
|
return interest; // if an interest is found, the interest is returned, otherwise interest is null
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
import * as plugins from './lik.plugins';
|
import * as plugins from './lik.plugins';
|
||||||
|
|
||||||
import { Objectmap } from './lik.objectmap';
|
import { ObjectMap } from './lik.objectmap';
|
||||||
|
|
||||||
export class LoopTracker<T> {
|
export class LoopTracker<T> {
|
||||||
referenceObjectMap = new Objectmap<any>();
|
referenceObjectMap = new ObjectMap<any>();
|
||||||
constructor() {
|
constructor() {
|
||||||
// nothing here
|
// nothing here
|
||||||
}
|
}
|
||||||
@ -12,7 +12,12 @@ export class LoopTracker<T> {
|
|||||||
* checks and tracks an object
|
* checks and tracks an object
|
||||||
* @param objectArg
|
* @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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,18 +1,39 @@
|
|||||||
import * as plugins from './lik.plugins';
|
import * as plugins from './lik.plugins';
|
||||||
|
import { FastMap } from './lik.fastmap';
|
||||||
|
|
||||||
|
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> {
|
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> {
|
||||||
|
operation: 'add' | 'remove';
|
||||||
|
payload: T;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* allows keeping track of objects
|
* 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<IObjectMapEventData<T>>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* returns a new instance
|
* returns a new instance
|
||||||
@ -21,27 +42,59 @@ export class Objectmap<T> {
|
|||||||
// nothing here
|
// 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
|
* add object to Objectmap
|
||||||
* returns false if the object is already in the map
|
* returns false if the object is already in the map
|
||||||
* returns true if the object was added successfully
|
* 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);
|
}
|
||||||
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
|
* like .add but adds an whole array of objects
|
||||||
*/
|
*/
|
||||||
public addArray(objectArrayArg: T[]) {
|
public addArray(objectArrayArg: T[]) {
|
||||||
for (let item of objectArrayArg) {
|
for (const item of objectArrayArg) {
|
||||||
this.add(item);
|
this.add(item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -49,27 +102,53 @@ export class Objectmap<T> {
|
|||||||
/**
|
/**
|
||||||
* check if object is in Objectmap
|
* 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
|
* 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
|
* 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);
|
||||||
}
|
}
|
||||||
@ -80,8 +159,8 @@ export class Objectmap<T> {
|
|||||||
* run function for each item in Objectmap
|
* run function for each item in Objectmap
|
||||||
*/
|
*/
|
||||||
public async forEach(functionArg: IObjectmapForEachFunction<T>) {
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -89,7 +168,18 @@ export class Objectmap<T> {
|
|||||||
* gets an object in the Observablemap and removes it, so it can't be retrieved again
|
* gets an object in the Observablemap and removes it, so it can't be retrieved again
|
||||||
*/
|
*/
|
||||||
public getOneAndRemove(): T {
|
public getOneAndRemove(): T {
|
||||||
return this.objectArray.shift();
|
const keys = this.fastMap.getKeys();
|
||||||
|
if (keys.length === 0) {
|
||||||
|
return null;
|
||||||
|
} else {
|
||||||
|
const keyToUse = keys[0];
|
||||||
|
const removedItem = this.fastMap.removeFromMap(keyToUse);
|
||||||
|
this.eventSubject.next({
|
||||||
|
operation: 'remove',
|
||||||
|
payload: removedItem
|
||||||
|
});
|
||||||
|
return removedItem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -97,8 +187,8 @@ export class Objectmap<T> {
|
|||||||
*/
|
*/
|
||||||
public getArray(): T[] {
|
public getArray(): T[] {
|
||||||
const returnArray: any[] = [];
|
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;
|
return returnArray;
|
||||||
}
|
}
|
||||||
@ -107,30 +197,50 @@ export class Objectmap<T> {
|
|||||||
* check if Objectmap ist empty
|
* check if Objectmap ist empty
|
||||||
*/
|
*/
|
||||||
public isEmpty(): boolean {
|
public isEmpty(): boolean {
|
||||||
if (this.objectArray.length === 0) {
|
return this.fastMap.getKeys().length === 0;
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* remove object from Objectmap
|
* 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* wipe Objectmap
|
* wipe Objectmap
|
||||||
*/
|
*/
|
||||||
public wipe() {
|
public wipe() {
|
||||||
this.objectArray = [];
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,25 +1,17 @@
|
|||||||
// ==============
|
|
||||||
// native
|
|
||||||
// ==============
|
|
||||||
|
|
||||||
import * as events from 'events';
|
|
||||||
|
|
||||||
export { events };
|
|
||||||
|
|
||||||
// ==============
|
// ==============
|
||||||
// @pushrocks
|
// @pushrocks
|
||||||
// ==============
|
// ==============
|
||||||
import * as smartdelay from '@pushrocks/smartdelay';
|
import * as smartdelay from '@pushrocks/smartdelay';
|
||||||
|
import * as smartmatch from '@pushrocks/smartmatch';
|
||||||
import * as smartpromise from '@pushrocks/smartpromise';
|
import * as smartpromise from '@pushrocks/smartpromise';
|
||||||
import * as smartrx from '@pushrocks/smartrx';
|
import * as smartrx from '@pushrocks/smartrx';
|
||||||
import * as smarttime from '@pushrocks/smarttime';
|
import * as smarttime from '@pushrocks/smarttime';
|
||||||
|
|
||||||
export { smartdelay, smartpromise, smartrx, smarttime };
|
export { smartdelay, smartmatch, smartpromise, smartrx, smarttime };
|
||||||
|
|
||||||
// ==============
|
// ==============
|
||||||
// third party
|
// third party
|
||||||
// ==============
|
// ==============
|
||||||
import minimatch from 'minimatch';
|
|
||||||
const symbolTree = require('symbol-tree');
|
const symbolTree = require('symbol-tree');
|
||||||
|
|
||||||
export { minimatch, symbolTree };
|
export { symbolTree };
|
||||||
|
@ -4,13 +4,11 @@ import * as plugins from './lik.plugins';
|
|||||||
* allows you to easily keep track of a bunch of strings
|
* allows you to easily keep track of a bunch of strings
|
||||||
*/
|
*/
|
||||||
|
|
||||||
export interface ITriggerFunction {
|
export type TTriggerFunction = (stringArray?: string[]) => boolean;
|
||||||
(): boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class Stringmap {
|
export class Stringmap {
|
||||||
private _stringArray: string[] = [];
|
private _stringArray: string[] = [];
|
||||||
private _triggerUntilTrueFunctionArray: ITriggerFunction[] = [];
|
private _triggerUntilTrueFunctionArray: TTriggerFunction[] = [];
|
||||||
constructor() {}
|
constructor() {}
|
||||||
/**
|
/**
|
||||||
* add a string to the Stringmap
|
* add a string to the Stringmap
|
||||||
@ -24,7 +22,7 @@ export class Stringmap {
|
|||||||
* like addString, but accepts an array of strings
|
* like addString, but accepts an array of strings
|
||||||
*/
|
*/
|
||||||
addStringArray(stringArrayArg: string[]) {
|
addStringArray(stringArrayArg: string[]) {
|
||||||
for (let stringItem of stringArrayArg) {
|
for (const stringItem of stringArrayArg) {
|
||||||
this.addString(stringItem);
|
this.addString(stringItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -33,7 +31,7 @@ export class Stringmap {
|
|||||||
* removes a string from Stringmap
|
* removes a string from Stringmap
|
||||||
*/
|
*/
|
||||||
removeString(stringArg: string) {
|
removeString(stringArg: string) {
|
||||||
for (let keyArg in this._stringArray) {
|
for (const keyArg in this._stringArray) {
|
||||||
if (this._stringArray[keyArg] === stringArg) {
|
if (this._stringArray[keyArg] === stringArg) {
|
||||||
this._stringArray.splice(parseInt(keyArg), 1);
|
this._stringArray.splice(parseInt(keyArg), 1);
|
||||||
}
|
}
|
||||||
@ -60,9 +58,10 @@ export class Stringmap {
|
|||||||
* checks stringPresence with minimatch
|
* checks stringPresence with minimatch
|
||||||
*/
|
*/
|
||||||
public checkMinimatch(miniMatchStringArg: string): boolean {
|
public checkMinimatch(miniMatchStringArg: string): boolean {
|
||||||
|
const smartMatchInstance = new plugins.smartmatch.SmartMatch(miniMatchStringArg);
|
||||||
let foundMatch: boolean = false;
|
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;
|
foundMatch = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -92,22 +91,27 @@ export class Stringmap {
|
|||||||
/**
|
/**
|
||||||
* register a new trigger
|
* register a new trigger
|
||||||
*/
|
*/
|
||||||
public registerUntilTrue(functionArg: ITriggerFunction, doFunctionArg) {
|
public registerUntilTrue(functionArg: TTriggerFunction, callbackArg?: () => any) {
|
||||||
|
const trueDeferred = plugins.smartpromise.defer();
|
||||||
this._triggerUntilTrueFunctionArray.push(() => {
|
this._triggerUntilTrueFunctionArray.push(() => {
|
||||||
let result = functionArg();
|
const result = functionArg(this.getStringArray());
|
||||||
if (result === true) {
|
if (result === true) {
|
||||||
doFunctionArg();
|
if (callbackArg) {
|
||||||
|
callbackArg();
|
||||||
|
}
|
||||||
|
trueDeferred.resolve();
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
});
|
});
|
||||||
this.notifyTrigger();
|
this.notifyTrigger();
|
||||||
|
return trueDeferred.promise;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* notifies triggers
|
* notifies triggers
|
||||||
*/
|
*/
|
||||||
private notifyTrigger() {
|
private notifyTrigger() {
|
||||||
let filteredArray = this._triggerUntilTrueFunctionArray.filter(functionArg => {
|
const filteredArray = this._triggerUntilTrueFunctionArray.filter((functionArg) => {
|
||||||
return !functionArg();
|
return !functionArg();
|
||||||
});
|
});
|
||||||
this._triggerUntilTrueFunctionArray = filteredArray;
|
this._triggerUntilTrueFunctionArray = filteredArray;
|
||||||
|
@ -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