diff --git a/package.json b/package.json index 516a8d0..38e45ab 100644 --- a/package.json +++ b/package.json @@ -18,11 +18,11 @@ "@gitzone/tsrun": "^1.2.42", "@gitzone/tstest": "^1.0.74", "@push.rocks/tapbundle": "^5.0.8", - "@types/node": "^17.0.45" + "@types/node": "^20.4.1" }, "dependencies": { "fast-deep-equal": "^3.1.3", - "minimatch": "^5.1.6" + "minimatch": "^9.0.3" }, "browserslist": [ "last 1 chrome versions" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5de4527..0a220b1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ dependencies: specifier: ^3.1.3 version: 3.1.3 minimatch: - specifier: ^5.1.6 - version: 5.1.6 + specifier: ^9.0.3 + version: 9.0.3 devDependencies: '@gitzone/tsbuild': @@ -18,16 +18,16 @@ devDependencies: version: 2.1.66 '@gitzone/tsrun': specifier: ^1.2.42 - version: 1.2.42(@types/node@17.0.45) + version: 1.2.42(@types/node@20.4.1) '@gitzone/tstest': specifier: ^1.0.74 - version: 1.0.74(@types/node@17.0.45) + version: 1.0.74(@types/node@20.4.1) '@push.rocks/tapbundle': specifier: ^5.0.8 version: 5.0.8 '@types/node': - specifier: ^17.0.45 - version: 17.0.45 + specifier: ^20.4.1 + version: 20.4.1 packages: @@ -386,13 +386,13 @@ packages: - supports-color dev: true - /@gitzone/tsrun@1.2.42(@types/node@17.0.45): + /@gitzone/tsrun@1.2.42(@types/node@20.4.1): resolution: {integrity: sha512-56TC2F09FeyFE74dJHSS0QMKdoXVNx1XsFOsOWGiOAjt8bkXenktsUN9s5vy53TYBS4HYXo5pyvRZ7Xym+TD7g==} hasBin: true dependencies: '@pushrocks/smartfile': 10.0.26 '@pushrocks/smartshell': 2.0.30 - ts-node: 10.9.1(@types/node@17.0.45)(typescript@5.1.6) + ts-node: 10.9.1(@types/node@20.4.1)(typescript@5.1.6) typescript: 5.1.6 transitivePeerDependencies: - '@swc/core' @@ -401,12 +401,12 @@ packages: - supports-color dev: true - /@gitzone/tstest@1.0.74(@types/node@17.0.45): + /@gitzone/tstest@1.0.74(@types/node@20.4.1): resolution: {integrity: sha512-6V8bsfvpnODWqrkdooVqcOS1z5GA8dMDnLCOHnr/SUTeie3ox8KGpckwiZ+gTfz9WvzX6+KLVTZNYKGOaNbmMQ==} hasBin: true dependencies: '@gitzone/tsbundle': 2.0.8 - '@gitzone/tsrun': 1.2.42(@types/node@17.0.45) + '@gitzone/tsrun': 1.2.42(@types/node@20.4.1) '@pushrocks/consolecolor': 2.0.1 '@pushrocks/smartbrowser': 2.0.5 '@pushrocks/smartdelay': 2.0.13 @@ -1287,7 +1287,7 @@ packages: /@types/accepts@1.3.5: resolution: {integrity: sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==} dependencies: - '@types/node': 17.0.45 + '@types/node': 20.4.1 dev: true /@types/babel__code-frame@7.0.3: @@ -1298,7 +1298,7 @@ packages: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} dependencies: '@types/connect': 3.4.35 - '@types/node': 17.0.45 + '@types/node': 20.4.1 dev: true /@types/buffer-json@2.0.1: @@ -1325,14 +1325,14 @@ packages: /@types/clean-css@4.2.6: resolution: {integrity: sha512-Ze1tf+LnGPmG6hBFMi0B4TEB0mhF7EiMM5oyjLDNPE9hxrPU0W+5+bHvO+eFPA+bt0iC1zkQMoU/iGdRVjcRbw==} dependencies: - '@types/node': 17.0.45 + '@types/node': 20.4.1 source-map: 0.6.1 dev: true /@types/co-body@6.1.0: resolution: {integrity: sha512-3e0q2jyDAnx/DSZi0z2H0yoZ2wt5yRDZ+P7ymcMObvq0ufWRT4tsajyO+Q1VwVWiv9PRR4W3YEjEzBjeZlhF+w==} dependencies: - '@types/node': 17.0.45 + '@types/node': 20.4.1 '@types/qs': 6.9.7 dev: true @@ -1345,7 +1345,7 @@ packages: /@types/connect@3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 17.0.45 + '@types/node': 20.4.1 dev: true /@types/content-disposition@0.5.5: @@ -1366,13 +1366,13 @@ packages: '@types/connect': 3.4.35 '@types/express': 4.17.17 '@types/keygrip': 1.0.2 - '@types/node': 17.0.45 + '@types/node': 20.4.1 dev: true /@types/cors@2.8.13: resolution: {integrity: sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==} dependencies: - '@types/node': 17.0.45 + '@types/node': 20.4.1 dev: true /@types/debounce@1.2.1: @@ -1386,7 +1386,7 @@ packages: /@types/express-serve-static-core@4.17.35: resolution: {integrity: sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==} dependencies: - '@types/node': 17.0.45 + '@types/node': 20.4.1 '@types/qs': 6.9.7 '@types/range-parser': 1.2.4 '@types/send': 0.17.1 @@ -1404,27 +1404,27 @@ packages: /@types/finalhandler@1.2.0: resolution: {integrity: sha512-NgEZKOhxUSXkwNnWNaMXZaopQ5aFGPAYiEpEWIkQ6Dzc4iS0M1oQsvWne2t+ex9QZUAdTz/ZT4tOXJhWtP6mCw==} dependencies: - '@types/node': 17.0.45 + '@types/node': 20.4.1 dev: true /@types/from2@2.3.2: resolution: {integrity: sha512-s1pdctxW2+CA4FOxxTBRxC3RKQL9Br1a2s2LngP4jh1BI84JBL3mDXj87EwcckN9z/IXp8o3ySmvZveGEAAwqw==} dependencies: - '@types/node': 17.0.45 + '@types/node': 20.4.1 dev: true /@types/fs-extra@11.0.1: resolution: {integrity: sha512-MxObHvNl4A69ofaTRU8DFqvgzzv8s9yRtaPPm5gud9HDNvpB3GPQFvNuTWAI59B9huVGV5jXYJwbCsmBsOGYWA==} dependencies: '@types/jsonfile': 6.1.1 - '@types/node': 17.0.45 + '@types/node': 20.4.1 dev: true /@types/glob@8.1.0: resolution: {integrity: sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 17.0.45 + '@types/node': 20.4.1 dev: true /@types/html-minifier@4.0.2: @@ -1474,7 +1474,7 @@ packages: /@types/jsonfile@6.1.1: resolution: {integrity: sha512-GSgiRCVeapDN+3pqA35IkQwasaCh/0YFH5dEF6S88iDvEn901DjOeH3/QPY+XYP1DFzDZPvIvfeEgk+7br5png==} dependencies: - '@types/node': 17.0.45 + '@types/node': 20.4.1 dev: true /@types/keygrip@1.0.2: @@ -1497,7 +1497,7 @@ packages: '@types/http-errors': 2.0.1 '@types/keygrip': 1.0.2 '@types/koa-compose': 3.2.5 - '@types/node': 17.0.45 + '@types/node': 20.4.1 dev: true /@types/mime-types@2.1.1: @@ -1520,8 +1520,8 @@ packages: resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==} dev: true - /@types/node@17.0.45: - resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} + /@types/node@20.4.1: + resolution: {integrity: sha512-JIzsAvJeA/5iY6Y/OxZbv1lUcc8dNSE77lb2gnBH+/PJ3lFR1Ccvgwl5JWnHAkNHcRsT0TbpVOsiMKZ1F/yyJg==} dev: true /@types/parse5@6.0.3: @@ -1552,7 +1552,7 @@ packages: resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==} dependencies: '@types/mime': 1.3.2 - '@types/node': 17.0.45 + '@types/node': 20.4.1 dev: true /@types/serve-static@1.15.2: @@ -1560,7 +1560,7 @@ packages: dependencies: '@types/http-errors': 2.0.1 '@types/mime': 3.0.1 - '@types/node': 17.0.45 + '@types/node': 20.4.1 dev: true /@types/shortid@0.0.29: @@ -1591,7 +1591,7 @@ packages: /@types/through2@2.0.38: resolution: {integrity: sha512-YFu+nHmjxMurkH1BSzA0Z1WrKDAY8jUKPZctNQn7mc+/KKtp2XxnclHFXxdB1m7Iqnzb5aywgP8TMK283LezGQ==} dependencies: - '@types/node': 17.0.45 + '@types/node': 20.4.1 dev: true /@types/trusted-types@2.0.3: @@ -1615,14 +1615,14 @@ packages: /@types/ws@7.4.7: resolution: {integrity: sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==} dependencies: - '@types/node': 17.0.45 + '@types/node': 20.4.1 dev: true /@types/yauzl@2.10.0: resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==} requiresBuild: true dependencies: - '@types/node': 17.0.45 + '@types/node': 20.4.1 dev: true optional: true @@ -2406,7 +2406,7 @@ packages: dependencies: '@types/cookie': 0.4.1 '@types/cors': 2.8.13 - '@types/node': 17.0.45 + '@types/node': 20.4.1 accepts: 1.3.8 base64id: 2.0.0 cookie: 0.4.2 @@ -2426,7 +2426,7 @@ packages: dependencies: '@types/cookie': 0.4.1 '@types/cors': 2.8.13 - '@types/node': 17.0.45 + '@types/node': 20.4.1 accepts: 1.3.8 base64id: 2.0.0 cookie: 0.4.2 @@ -3515,19 +3515,11 @@ packages: brace-expansion: 1.1.11 dev: true - /minimatch@5.1.6: - resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==} - engines: {node: '>=10'} - dependencies: - brace-expansion: 2.0.1 - dev: false - /minimatch@9.0.3: resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} engines: {node: '>=16 || 14 >=14.17'} dependencies: brace-expansion: 2.0.1 - dev: true /minipass@7.0.2: resolution: {integrity: sha512-eL79dXrE1q9dBbDCLg7xfn/vl7MS4F1gvJAgjJrQli/jbQWdUttuVawphqpffoIYfRdq78LHx6GP4bU/EQ2ATA==} @@ -4378,7 +4370,6 @@ packages: /tiny-worker@2.3.0: resolution: {integrity: sha512-pJ70wq5EAqTAEl9IkGzA+fN0836rycEuz2Cn6yeZ6FRzlVS5IDOkFHpIoEsksPRQV34GDqXm65+OlnZqUSyK2g==} - requiresBuild: true dependencies: esm: 3.2.25 dev: true @@ -4411,7 +4402,7 @@ packages: hasBin: true dev: true - /ts-node@10.9.1(@types/node@17.0.45)(typescript@5.1.6): + /ts-node@10.9.1(@types/node@20.4.1)(typescript@5.1.6): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: @@ -4430,7 +4421,7 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 17.0.45 + '@types/node': 20.4.1 acorn: 8.10.0 acorn-walk: 8.2.0 arg: 4.1.3 diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index bbe08a8..88a8dbc 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@push.rocks/smartobject', - version: '1.0.11', + version: '1.0.12', description: 'work with objects' } diff --git a/ts/smartobject.plugins.ts b/ts/smartobject.plugins.ts index 87cadeb..0fbe9b2 100644 --- a/ts/smartobject.plugins.ts +++ b/ts/smartobject.plugins.ts @@ -1,6 +1,6 @@ // thirdparty scope // tslint:disable-next-line: no-submodule-imports import fastDeepEqual from 'fast-deep-equal/es6/index.js'; -import minimatch from 'minimatch'; +import * as minimatch from 'minimatch'; export { fastDeepEqual, minimatch }; diff --git a/ts/tools/foreachminimatch.ts b/ts/tools/foreachminimatch.ts index c7d586b..2ebc0c6 100644 --- a/ts/tools/foreachminimatch.ts +++ b/ts/tools/foreachminimatch.ts @@ -13,7 +13,7 @@ export let forEachMinimatch = async ( ) => { let propertyNames = Object.getOwnPropertyNames(parentObjectArg); let propertyNamesMatched = propertyNames.filter((propertyNameArg) => { - return plugins.minimatch(propertyNameArg, wildcardArg); + return plugins.minimatch.minimatch(propertyNameArg, wildcardArg); }); for (let propertyNameArg of propertyNamesMatched) { await callbackArg(parentObjectArg[propertyNameArg]);