fix(core): update

This commit is contained in:
Philipp Kunz 2020-05-25 22:04:21 +00:00
parent 2e9fe308df
commit 453c6d6ae8
5 changed files with 70 additions and 29 deletions

77
package-lock.json generated
View File

@ -986,9 +986,9 @@
}
},
"@gitzone/tsbundle": {
"version": "1.0.68",
"resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbundle/-/tsbundle-1.0.68.tgz",
"integrity": "sha512-oOgFxuv8LWkeQrGDdhE7JMU47GFMprFxOgheoTUcAsB+9emjZIF009LC1Jy64+0QRROEe9IMI6aEoIA+M7i8Hw==",
"version": "1.0.69",
"resolved": "https://verdaccio.lossless.one/@gitzone%2ftsbundle/-/tsbundle-1.0.69.tgz",
"integrity": "sha512-ncug4QrZKD0Xyjt5linq+9mUex8MV26oycbECXANTYNp7DPx6F1QJxMJWNDAO2+b+kvuv+1D+qufB1AuOyBClg==",
"dev": true,
"requires": {
"@babel/core": "^7.9.6",
@ -1003,6 +1003,7 @@
"@pushrocks/smartlog": "^2.0.21",
"@pushrocks/smartlog-destination-local": "^8.0.2",
"@rollup/plugin-commonjs": "^12.0.0",
"@rollup/plugin-json": "^4.0.3",
"@rollup/plugin-node-resolve": "^8.0.0",
"@rollup/plugin-typescript": "^4.1.2",
"@types/html-minifier": "^3.5.3",
@ -1215,6 +1216,14 @@
"ora": "^3.4.0"
}
},
"@pushrocks/smartmatch": {
"version": "1.0.7",
"resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartmatch/-/smartmatch-1.0.7.tgz",
"integrity": "sha512-D+lK5HIKO4Kj1Jm/ycKvy1VzDJ3V6ucHqmf5DMBFdm18BrMj2Zb6M7wN8HUKtkfHvOI7ig85JMuANSEyO7kAPg==",
"requires": {
"matcher": "^3.0.0"
}
},
"@pushrocks/smartmime": {
"version": "1.0.3",
"resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartmime/-/smartmime-1.0.3.tgz",
@ -1285,14 +1294,15 @@
}
},
"@pushrocks/smarttime": {
"version": "3.0.12",
"resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarttime/-/smarttime-3.0.12.tgz",
"integrity": "sha512-NoMt1NUhNqcF5y7fCTHoC3d/+MobzgNUg6yHbSGxFRaentQzCrMPNahQIVLbrAStf03LUUBePUjSRdPYucP1gw==",
"version": "3.0.15",
"resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarttime/-/smarttime-3.0.15.tgz",
"integrity": "sha512-chSBvc6whiqqTQA06xiGfSrF/j7l6z1XE47nCOvbS9B7m9uLnGI4IlwU7Z5Jmd52hhFisquWPn7Yy3sgJ7VPmg==",
"requires": {
"@pushrocks/smartdelay": "^2.0.6",
"@pushrocks/smartpromise": "^3.0.2",
"@types/cron": "^1.7.1",
"@types/luxon": "^1.15.1",
"cron": "^1.7.1",
"cron-parser": "^2.14.0",
"luxon": "^1.16.0"
}
},
@ -1335,6 +1345,15 @@
"resolve": "^1.11.0"
}
},
"@rollup/plugin-json": {
"version": "4.0.3",
"resolved": "https://verdaccio.lossless.one/@rollup%2fplugin-json/-/plugin-json-4.0.3.tgz",
"integrity": "sha512-QMUT0HZNf4CX17LMdwaslzlYHUKTYGuuk34yYIgZrNdu+pMEfqMS55gck7HEeHBKXHM4cz5Dg1OVwythDdbbuQ==",
"dev": true,
"requires": {
"@rollup/pluginutils": "^3.0.8"
}
},
"@rollup/plugin-node-resolve": {
"version": "8.0.0",
"resolved": "https://verdaccio.lossless.one/@rollup%2fplugin-node-resolve/-/plugin-node-resolve-8.0.0.tgz",
@ -1692,9 +1711,9 @@
"dev": true
},
"caniuse-lite": {
"version": "1.0.30001065",
"resolved": "https://verdaccio.lossless.one/caniuse-lite/-/caniuse-lite-1.0.30001065.tgz",
"integrity": "sha512-DDxCLgJ266YnAHQv0jS1wdOaihRFF52Zgmlag39sQJVy2H46oROpJp4hITstqhdB8qnHSrKNoAEkQA9L/oYF9A==",
"version": "1.0.30001066",
"resolved": "https://verdaccio.lossless.one/caniuse-lite/-/caniuse-lite-1.0.30001066.tgz",
"integrity": "sha512-Gfj/WAastBtfxLws0RCh2sDbTK/8rJuSeZMecrSkNGYxPcv7EzblmDGfWQCFEQcSqYE2BRgQiJh8HOD07N5hIw==",
"dev": true
},
"chai": {
@ -1894,12 +1913,13 @@
}
}
},
"cron": {
"version": "1.8.2",
"resolved": "https://verdaccio.lossless.one/cron/-/cron-1.8.2.tgz",
"integrity": "sha512-Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg==",
"cron-parser": {
"version": "2.14.0",
"resolved": "https://verdaccio.lossless.one/cron-parser/-/cron-parser-2.14.0.tgz",
"integrity": "sha512-/VuS5TLnyaB0yNznygEFmujOjn8DxyZRn3F2wN3h8e+4A5zETQYMbtCLCIvz23XhI/1di2B+ke702/grEaPfTg==",
"requires": {
"moment-timezone": "^0.5.x"
"is-nan": "^1.3.0",
"moment-timezone": "^0.5.31"
}
},
"debug": {
@ -1957,7 +1977,6 @@
"version": "1.1.3",
"resolved": "https://verdaccio.lossless.one/define-properties/-/define-properties-1.1.3.tgz",
"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
"dev": true,
"requires": {
"object-keys": "^1.0.12"
}
@ -2205,6 +2224,14 @@
"integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
"dev": true
},
"is-nan": {
"version": "1.3.0",
"resolved": "https://verdaccio.lossless.one/is-nan/-/is-nan-1.3.0.tgz",
"integrity": "sha512-z7bbREymOqt2CCaZVly8aC4ML3Xhfi0ekuOnjO2L8vKdl+CttdVoGZQhd4adMFAsxQ5VeRVwORs4tU8RH+HFtQ==",
"requires": {
"define-properties": "^1.1.3"
}
},
"is-promise": {
"version": "2.2.2",
"resolved": "https://verdaccio.lossless.one/is-promise/-/is-promise-2.2.2.tgz",
@ -2367,6 +2394,21 @@
"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
"dev": true
},
"matcher": {
"version": "3.0.0",
"resolved": "https://verdaccio.lossless.one/matcher/-/matcher-3.0.0.tgz",
"integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
"requires": {
"escape-string-regexp": "^4.0.0"
},
"dependencies": {
"escape-string-regexp": {
"version": "4.0.0",
"resolved": "https://verdaccio.lossless.one/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
}
}
},
"merge-stream": {
"version": "2.0.0",
"resolved": "https://verdaccio.lossless.one/merge-stream/-/merge-stream-2.0.0.tgz",
@ -2459,8 +2501,7 @@
"object-keys": {
"version": "1.1.1",
"resolved": "https://verdaccio.lossless.one/object-keys/-/object-keys-1.1.1.tgz",
"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
"dev": true
"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
},
"object.assign": {
"version": "4.1.0",

View File

@ -21,7 +21,7 @@
"homepage": "https://gitlab.com/pushrocks/lik#README",
"devDependencies": {
"@gitzone/tsbuild": "^2.1.24",
"@gitzone/tsbundle": "^1.0.68",
"@gitzone/tsbundle": "^1.0.69",
"@gitzone/tsrun": "^1.2.8",
"@gitzone/tstest": "^1.0.28",
"@pushrocks/tapbundle": "^3.2.1",
@ -31,12 +31,12 @@
},
"dependencies": {
"@pushrocks/smartdelay": "^2.0.6",
"@pushrocks/smartmatch": "^1.0.7",
"@pushrocks/smartpromise": "^3.0.6",
"@pushrocks/smartrx": "^2.0.5",
"@pushrocks/smarttime": "^3.0.12",
"@pushrocks/smarttime": "^3.0.15",
"@pushrocks/smartunique": "^3.0.3",
"@types/minimatch": "^3.0.3",
"minimatch": "^3.0.4",
"symbol-tree": "^3.2.4"
},
"files": [

View File

@ -1,5 +1,3 @@
import * as plugins from './lik.plugins';
/**
* fast map allows for very quick lookups of objects with a unique key
*/

View File

@ -2,17 +2,17 @@
// @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 };

View File

@ -1,4 +1,5 @@
import * as plugins from './lik.plugins';
import { SmartMatch } from '@pushrocks/smartmatch';
import * as smartpromise from '@pushrocks/smartpromise';
/**
* allows you to easily keep track of a bunch of strings
@ -58,9 +59,10 @@ export class Stringmap {
* checks stringPresence with minimatch
*/
public checkMinimatch(miniMatchStringArg: string): boolean {
const smartMatchInstance = new SmartMatch(miniMatchStringArg);
let foundMatch: boolean = false;
for (const stringItem of this._stringArray) {
if (plugins.minimatch(stringItem, miniMatchStringArg)) {
if (smartMatchInstance.match(stringItem)) {
foundMatch = true;
}
}
@ -91,7 +93,7 @@ export class Stringmap {
* register a new trigger
*/
public registerUntilTrue(functionArg: TTriggerFunction, callbackArg?: () => any) {
const trueDeferred = plugins.smartpromise.defer();
const trueDeferred = smartpromise.defer();
this._triggerUntilTrueFunctionArray.push(() => {
const result = functionArg(this.getStringArray());
if (result === true) {