diff --git a/Dockerfile b/Dockerfile index d1a6e06..c47887d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG NODE_VER=14-buster +ARG NODE_VER=16-alpine FROM node:$NODE_VER AS install @@ -16,9 +16,13 @@ RUN yarn install --immutable COPY . /trellis/ainz/ -RUN yarn build && rm -rf node_modules +# Build code and remove dev deps +RUN yarn build && rm -rfv .yarn .pnp* -FROM node:$NODE_VER-slim AS production +FROM node:$NODE_VER AS production + +# Do not run service as root +USER node WORKDIR /trellis/ainz diff --git a/README.md b/README.md index 3d38fb3..b246667 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +[![License](https://img.shields.io/github/license/trellisfw/ainz)](LICENSE) +![Docker Pulls](https://img.shields.io/docker/pulls/trellisfw/ainz) + # Ainz This is a microservice which moves (actually just makes links) @@ -8,35 +11,40 @@ resources from a "watch list" to another list based on rules. Eventually Ainz images should be pushed to dockerhub, but for now you can run Ainz by cloning this repo. -### Within the [OADA Reference API Server][] +### docker-compose -To add Ainz to the services run with an OADA v3 server, -simply add the following to your `docker-compose.override.yml`: +Here is an example of using ainz with docker-compose. ```yaml services: ainz: - extends: - # Change this to wherever you cloned the ainz git - file: ./ainz/docker-compose.yml - service: ainz + image: trellisfw/ainz + restart: unless-stopped + #volumes: + # Additional template helpers can be mapped into the helpers dir. + # Ainz will load all helpers it finds at boot. + #- ./path/to/helper-module:/trellis/ainz/dist/helpers/helper-module environment: + NODE_TLS_REJECT_UNAUTHORIZED: + NODE_ENV=: ${NODE_ENV:-development} + DEBUG: ${DEBUG-*:error,*:warn,*:info} + # Connect to host if DOMAIN not set. + # You should really not rely on this though. Set DOMAIN. + domain: ${DOMAIN:-host.docker.internal} # Unless your API server is running with development tokens enabled, # you will need to give Ainz token(s) to use. - # - # Alternatively you can set ANIZ_TOKENS in your environment. - token: abc123,def456 + token: ${AINZ_TOKENS:-abc123,def456} ``` -In the example above, -the path assumes you ran this repo inside the folder -with the OADA v3 `docker-compose.yml` etc. inside. -You can have ainz anywhere, just adjust the path to it accordingly. +### Running ainz within the [OADA Reference API Server] + +To add Ainz to the services run with an OADA v3 server, +simply add a snippet like the one in the previous section +to your `docker-compose.override.yml`. ### External Usage -To run Ainz separately, simply set the domain and token(s) of the OADA API -and then run `docker-compose` in the directory where you cloned this git. +To run Ainz separately, simply set the domain and token(s) of the OADA API. ```shell # Set up the environment. @@ -52,9 +60,9 @@ docker-compose up -d See [rule.example.json5](rule.example.json5) for an annotated example of a rule. -You can also see the corresponsing [schemas][] from OADA formats. +You can also see the corresponsing [schemas] from OADA formats. A user's rules are located at `/bookmarks/services/ainz/rules` by default. -[OADA Reference API Server]: https://github.com/OADA/oada-srvc-docker +[oada reference api server]: https://github.com/OADA/oada-srvc-docker [schemas]: https://github.com/OADA/formats/tree/master/schemas/oada/ainz diff --git a/docker-compose.yml b/docker-compose.yml index 434c638..fdf54e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,13 +2,12 @@ services: ainz: build: context: . + image: trellisfw/ainz restart: unless-stopped #volumes: - # Additional template helpers can be mapped into the helpers dir. - # Ainz will load all helpers it finds at boot. - #- ./path/to/helper-module:/trellis/ainz/dist/helpers/helper-module - #networks: - #- http_net + # Additional template helpers can be mapped into the helpers dir. + # Ainz will load all helpers it finds at boot. + #- ./path/to/helper-module:/trellis/ainz/dist/helpers/helper-module environment: - NODE_TLS_REJECT_UNAUTHORIZED - NODE_ENV=${NODE_ENV:-development} diff --git a/package.json b/package.json index 1065428..627d4f0 100644 --- a/package.json +++ b/package.json @@ -11,33 +11,31 @@ "build": "tsc -b" }, "author": "Alex Layton ", - "license": "ISC", + "license": "Apache-2.0", "dependencies": { "@oada/client": "^2.4.1", "@oada/list-lib": "^2.1.6", "@oada/types": "^1.5.1", - "ajv": "^7.2.3", - "bluebird": "^3.5.1", - "debug": "^4.3.1", + "ajv": "^7.2.4", + "bluebird": "^3.7.2", + "debug": "^4.3.2", "handlebars": "^4.7.7", "json-pointer": "^0.6.1", - "jsonschema8": "^1.1.1", "luxon": "^1.26.0", "minimist": "^1.2.5", "nconf": "^0.11.2", - "p-queue": "^6.6.2", - "pino-debug": "^2.0.0" + "p-queue": "^6.6.2" }, "devDependencies": { - "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", "@types/bluebird": "^3.5.33", "@types/debug": "^4.1.5", "@types/json-pointer": "^1.0.30", - "@types/luxon": "^1.26.3", + "@types/luxon": "^1.26.5", "@types/minimist": "^1.2.1", - "@types/node": "^14.14.35", - "@yarnpkg/pnpify": "^2.4.0", + "@types/node": "^14.14.43", + "@yarnpkg/pnpify": "^3.0.0-rc.3", "prettier": "^2.2.1", - "typescript": "^4.2.3" + "typescript": "^4.2.4" } } diff --git a/src/index.ts b/src/index.ts index c2c1a24..f0cdb5b 100755 --- a/src/index.ts +++ b/src/index.ts @@ -13,7 +13,7 @@ * limitations under the License. */ -import { join, dirname, extname } from 'path'; +import { join, dirname } from 'path'; import { promises as fs } from 'fs'; import Bluebird from 'bluebird'; @@ -29,7 +29,6 @@ import Rule, { assert as assertRule } from '@oada/types/oada/ainz/rule'; import Resource, { assert as assertResource } from '@oada/types/oada/resource'; import config from './config'; -import { Hash } from 'node:crypto'; const trace = debug('ainz:trace'); const info = debug('ainz:info'); diff --git a/tsconfig.json b/tsconfig.json index 9b3f899..b4711fb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@tsconfig/node12", + "extends": "@tsconfig/node14", "compilerOptions": { "sourceMap": true, "allowJs": true, diff --git a/yarn.lock b/yarn.lock index dc8a057..cbe3d9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -74,18 +74,7 @@ __metadata: languageName: node linkType: hard -"@oada/types@npm:^1.2.0": - version: 1.4.1 - resolution: "@oada/types@npm:1.4.1" - dependencies: - ajv: ^7.0.3 - ajv-formats: ^1.5.1 - ajv-formats-draft2019: ^1.4.3 - checksum: 917d1bc5d3d9b2a86fba9fbfc7c8e472c886701594efb92d8b4f65ce8d387f1f6939ea100c8d5c3d77b50656e424c21482e37a974f8daa83610c390bdcc8cb5f - languageName: node - linkType: hard - -"@oada/types@npm:^1.5.1": +"@oada/types@npm:^1.2.0, @oada/types@npm:^1.5.1": version: 1.5.1 resolution: "@oada/types@npm:1.5.1" dependencies: @@ -119,36 +108,34 @@ __metadata: "@oada/client": ^2.4.1 "@oada/list-lib": ^2.1.6 "@oada/types": ^1.5.1 - "@tsconfig/node12": ^1.0.7 + "@tsconfig/node14": ^1.0.0 "@types/bluebird": ^3.5.33 "@types/debug": ^4.1.5 "@types/json-pointer": ^1.0.30 - "@types/luxon": ^1.26.3 + "@types/luxon": ^1.26.5 "@types/minimist": ^1.2.1 - "@types/node": ^14.14.35 - "@yarnpkg/pnpify": ^2.4.0 - ajv: ^7.2.3 - bluebird: ^3.5.1 - debug: ^4.3.1 + "@types/node": ^14.14.43 + "@yarnpkg/pnpify": ^3.0.0-rc.3 + ajv: ^7.2.4 + bluebird: ^3.7.2 + debug: ^4.3.2 handlebars: ^4.7.7 json-pointer: ^0.6.1 - jsonschema8: ^1.1.1 luxon: ^1.26.0 minimist: ^1.2.5 nconf: ^0.11.2 p-queue: ^6.6.2 - pino-debug: ^2.0.0 prettier: ^2.2.1 - typescript: ^4.2.3 + typescript: ^4.2.4 bin: add: dist/addrule.js languageName: unknown linkType: soft -"@tsconfig/node12@npm:^1.0.7": - version: 1.0.7 - resolution: "@tsconfig/node12@npm:1.0.7" - checksum: 82b0352f66bb84afcf4fe4d771d25dcdc2fbfd0dcd6c5efe475830e0df6806d687bdde3aba52d5c4d2d4dfee252093ed5cfc27a3fc47dc389a3f4fb0ea323390 +"@tsconfig/node14@npm:^1.0.0": + version: 1.0.0 + resolution: "@tsconfig/node14@npm:1.0.0" + checksum: 3eda14250ed8a03910ce822056f0d2fc2bcf41d9f1f3c6b202a6b32277dc638f475425fe7a1c03fbdba4e7f3b89668ecbac92d101c9e9fb56018c098393759ec languageName: node linkType: hard @@ -208,10 +195,10 @@ __metadata: languageName: node linkType: hard -"@types/luxon@npm:^1.26.3": - version: 1.26.3 - resolution: "@types/luxon@npm:1.26.3" - checksum: d34b3ceaeed2fadd008b5b41357fce7e3a2d6e0a7feb7e6f39dab1d93d77cd30afae3bc1dfb09d9a4dae812a3f80da3ffcaf9b315422e6ae6c2362f6ae8d885d +"@types/luxon@npm:^1.26.5": + version: 1.26.5 + resolution: "@types/luxon@npm:1.26.5" + checksum: d3c6bdac3c7adaa88f91db3699758ad938c7d05ffe12ab2824d0fd1b57d1e9eef6695ca64a7245cc6350c923064280357a27f8581d101201af1b7bbe1e504756 languageName: node linkType: hard @@ -222,10 +209,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:^14.14.35": - version: 14.14.35 - resolution: "@types/node@npm:14.14.35" - checksum: 0f6320bf5370d1ff82105fb7f26aa0658499c97d3ec78561e65b65724280244f281602541182b63470d2c8a98db22fbb4f91409c5c7c97da8c3bb8f97fbc5dbc +"@types/node@npm:*, @types/node@npm:^14.14.43": + version: 14.14.43 + resolution: "@types/node@npm:14.14.43" + checksum: b7a9e6df7c2a6f90e783bfe6ef358cc2c3ff4e1dfcea56b83349cd3feefd02a9b6fa54b443983694b4398a06257d871c947abeae03bd0d39fd71981161d61765 languageName: node linkType: hard @@ -266,24 +253,23 @@ __metadata: languageName: node linkType: hard -"@yarnpkg/core@npm:^2.4.0": - version: 2.4.0 - resolution: "@yarnpkg/core@npm:2.4.0" +"@yarnpkg/core@npm:^3.0.0-rc.2": + version: 3.0.0-rc.2 + resolution: "@yarnpkg/core@npm:3.0.0-rc.2" dependencies: "@arcanis/slice-ansi": ^1.0.2 "@types/semver": ^7.1.0 "@types/treeify": ^1.0.0 - "@yarnpkg/fslib": ^2.4.0 + "@yarnpkg/fslib": ^2.5.0-rc.2 "@yarnpkg/json-proxy": ^2.1.0 "@yarnpkg/libzip": ^2.2.1 - "@yarnpkg/parsers": ^2.3.0 - "@yarnpkg/pnp": ^2.3.2 - "@yarnpkg/shell": ^2.4.1 - binjumper: ^0.1.4 + "@yarnpkg/parsers": ^2.3.1-rc.2 + "@yarnpkg/pnp": ^3.0.0-rc.2 + "@yarnpkg/shell": ^3.0.0-rc.2 camelcase: ^5.3.1 chalk: ^3.0.0 ci-info: ^2.0.0 - clipanion: ^2.6.2 + clipanion: ^3.0.0-rc.10 cross-spawn: 7.0.3 diff: ^4.0.1 globby: ^11.0.1 @@ -297,15 +283,16 @@ __metadata: pretty-bytes: ^5.1.0 semver: ^7.1.2 stream-to-promise: ^2.2.0 - tar-stream: ^2.0.1 + strip-ansi: ^6.0.0 + tar: ^6.0.5 treeify: ^1.1.0 tslib: ^1.13.0 tunnel: ^0.0.6 - checksum: 6e7b2af9d742c1a1aace72053f81ee1a567342c4a56b8861456426a1ad748e765aa0da274be355ca67e4fe8ecae4cf6be3e31b72d73cae9d5168f67324a347e0 + checksum: e3a522d4804ab129023d07350fd7b50827ac27a06bb47271668c59628fe8f8cc82c2c571edb72f89669e15b34933c52c10fd55755cde3f9756543603459f22e8 languageName: node linkType: hard -"@yarnpkg/fslib@npm:^2.1.0, @yarnpkg/fslib@npm:^2.4.0": +"@yarnpkg/fslib@npm:^2.1.0": version: 2.4.0 resolution: "@yarnpkg/fslib@npm:2.4.0" dependencies: @@ -315,6 +302,16 @@ __metadata: languageName: node linkType: hard +"@yarnpkg/fslib@npm:^2.5.0-rc.2": + version: 2.5.0-rc.2 + resolution: "@yarnpkg/fslib@npm:2.5.0-rc.2" + dependencies: + "@yarnpkg/libzip": ^2.2.1 + tslib: ^1.13.0 + checksum: dce861a3cd9ec17804ad8ca30c49fc429d33f9a8e864bd5983f494a3e31e513820347a97c54b03834bf0176bf425f9c8eea9dd69c83ee6c503bfd04b2bf71696 + languageName: node + linkType: hard + "@yarnpkg/json-proxy@npm:^2.1.0": version: 2.1.0 resolution: "@yarnpkg/json-proxy@npm:2.1.0" @@ -335,36 +332,37 @@ __metadata: languageName: node linkType: hard -"@yarnpkg/parsers@npm:^2.3.0": - version: 2.3.0 - resolution: "@yarnpkg/parsers@npm:2.3.0" +"@yarnpkg/parsers@npm:^2.3.1-rc.2": + version: 2.3.1-rc.2 + resolution: "@yarnpkg/parsers@npm:2.3.1-rc.2" dependencies: js-yaml: ^3.10.0 tslib: ^1.13.0 - checksum: 3c221fe5e2259a71bbfab7fe03b4790c1cc4d139b64ae45701b5a0542ae7f15e06613a6c486687fbf90318d8f95508134b42591f5918421343981496b9e721f4 + checksum: 079a7a5233eedb7d97b1a1e8ca854f7ba7f9812346fda4aa9f299e784d596a8c276cc2ab938dd83ae6af4c1700b7f1ee0a9e4177777160effbbecbc97f4d4bc1 languageName: node linkType: hard -"@yarnpkg/pnp@npm:^2.3.2": - version: 2.3.2 - resolution: "@yarnpkg/pnp@npm:2.3.2" +"@yarnpkg/pnp@npm:^3.0.0-rc.2": + version: 3.0.0-rc.2 + resolution: "@yarnpkg/pnp@npm:3.0.0-rc.2" dependencies: "@types/node": ^13.7.0 - "@yarnpkg/fslib": ^2.4.0 + "@yarnpkg/fslib": ^2.5.0-rc.2 + resolve.exports: ^1.0.2 tslib: ^1.13.0 - checksum: 8ed1259c673bdf794359b74946102856db42b002f9164c446053c9222490d43fed4b0b7469951e250ace6681a8a0acf85448df234dbdf61b0bc9e3593ab50d4f + checksum: 7a5802e1cd487c75c3db6c4d803a8210f357a30c7f48f7b2d9e0d2426ce43875ec50d7c821705c8fc69c11b7b033ccae20445bd9ad87920f1bb6259889a364d2 languageName: node linkType: hard -"@yarnpkg/pnpify@npm:^2.4.0": - version: 2.4.0 - resolution: "@yarnpkg/pnpify@npm:2.4.0" +"@yarnpkg/pnpify@npm:^3.0.0-rc.3": + version: 3.0.0-rc.3 + resolution: "@yarnpkg/pnpify@npm:3.0.0-rc.3" dependencies: - "@yarnpkg/core": ^2.4.0 - "@yarnpkg/fslib": ^2.4.0 - "@yarnpkg/parsers": ^2.3.0 + "@yarnpkg/core": ^3.0.0-rc.2 + "@yarnpkg/fslib": ^2.5.0-rc.2 + "@yarnpkg/parsers": ^2.3.1-rc.2 chalk: ^3.0.0 - clipanion: ^2.6.2 + clipanion: ^3.0.0-rc.10 comment-json: ^2.2.0 lodash: ^4.17.15 tslib: ^1.13.0 @@ -378,17 +376,17 @@ __metadata: optional: true bin: pnpify: ./lib/cli.js - checksum: 89bbbe7f6204e4cb36e4e17e7f0010ffd53d05549ad94d6dc58b90cd86b44707c32699f3f0b620e4a142cbbb573677dd0d2369b67c3fb964389fb9c5c6a67775 + checksum: e478075a193de0dd8675940737261cebd12eee335f9174ab3655b7b31345735fc9c6df57e490757f9147688c8c280dd7fd6eec7de42c72c537d988731d18c9a3 languageName: node linkType: hard -"@yarnpkg/shell@npm:^2.4.1": - version: 2.4.1 - resolution: "@yarnpkg/shell@npm:2.4.1" +"@yarnpkg/shell@npm:^3.0.0-rc.2": + version: 3.0.0-rc.2 + resolution: "@yarnpkg/shell@npm:3.0.0-rc.2" dependencies: - "@yarnpkg/fslib": ^2.4.0 - "@yarnpkg/parsers": ^2.3.0 - clipanion: ^2.6.2 + "@yarnpkg/fslib": ^2.5.0-rc.2 + "@yarnpkg/parsers": ^2.3.1-rc.2 + clipanion: ^3.0.0-rc.10 cross-spawn: 7.0.3 fast-glob: ^3.2.2 micromatch: ^4.0.2 @@ -396,7 +394,7 @@ __metadata: tslib: ^1.13.0 bin: shell: ./lib/cli.js - checksum: f173d61f6ba5fa13c4035c97286230226d05113e548f3db09719c3b7e61d2f31070dcf5d3c9f8030ad91d57dfb48f1bbe8e5eb2f43da70d98f6c45ceecbd0984 + checksum: 06d16e8e2b2a1cd0665b6996541fb3034e418ac3b3c0296f8adbbf22902f13bde44e142aa0534598b202eddced9ff9c1ec1d51f3657d29c1e077dcd70ec984b2 languageName: node linkType: hard @@ -423,15 +421,15 @@ __metadata: languageName: node linkType: hard -"ajv@npm:^7.0.0, ajv@npm:^7.0.3, ajv@npm:^7.2.3": - version: 7.2.3 - resolution: "ajv@npm:7.2.3" +"ajv@npm:^7.0.0, ajv@npm:^7.0.3, ajv@npm:^7.2.4": + version: 7.2.4 + resolution: "ajv@npm:7.2.4" dependencies: fast-deep-equal: ^3.1.1 json-schema-traverse: ^1.0.0 require-from-string: ^2.0.2 uri-js: ^4.2.2 - checksum: 899b5879497c7df1f6ead6dffab789854b3371f33797e210b51a398cf325a54fd6855a20a757f7eb7b0f8fbf370d819aa5ec1cd335e7d31b421fb343a26a0fcc + checksum: 17be02b9a6c72317acc62fb15dde885d3d9e15ac44b025923697a44787cc69cceacf4c7e4ed43769eb313a64a3fd35ba7d308f36ef2eba136f4495d1cf513001 languageName: node linkType: hard @@ -497,13 +495,6 @@ __metadata: languageName: node linkType: hard -"atomic-sleep@npm:^1.0.0": - version: 1.0.0 - resolution: "atomic-sleep@npm:1.0.0" - checksum: 2c6fa68cafef5ec1501245da00cde40b8f7ac71428bd727a923ea883b81ad643667a85677056cd663ad3ca584a49dbeb3a1bd4e6c70c1e9e36afd71b6e36ef96 - languageName: node - linkType: hard - "base-convert-int-array@npm:^1.0.1": version: 1.0.1 resolution: "base-convert-int-array@npm:1.0.1" @@ -511,32 +502,7 @@ __metadata: languageName: node linkType: hard -"base64-js@npm:^1.3.1": - version: 1.5.1 - resolution: "base64-js@npm:1.5.1" - checksum: c1b41a26ddc6620eb7f1ee6c29c812f5942a4e328e74263f995872cfb8ca3aee08542beb25cd10fd7ef16e4f16603e25c35a26e776c01fd55277e5035e829e0e - languageName: node - linkType: hard - -"binjumper@npm:^0.1.4": - version: 0.1.4 - resolution: "binjumper@npm:0.1.4" - checksum: 07b0f2cf66698c0087e5916e0848ad4a7a0c85b6980689cea443baef9beac2001d4b818d9b99347208eef2b9dfa17095e84b617e472efdea694e7009b54cad91 - languageName: node - linkType: hard - -"bl@npm:^4.0.3": - version: 4.1.0 - resolution: "bl@npm:4.1.0" - dependencies: - buffer: ^5.5.0 - inherits: ^2.0.4 - readable-stream: ^3.4.0 - checksum: 15d009339c2eeaedb9dab39c48f910a2fd6a9ba11400e61990917ebf3b25fa32cd9b80c7531a95467078258f6a59bd3f5d93323565423a7843855a16a1794261 - languageName: node - linkType: hard - -"bluebird@npm:^3.5.1, bluebird@npm:^3.7.2": +"bluebird@npm:^3.7.2": version: 3.7.2 resolution: "bluebird@npm:3.7.2" checksum: 4f2288662f3d4eadbb82d4daa4a7d7976a28fa3c7eb4102c9b4033b03e5be4574ba123ac52a7c103cde4cb7b2d2afc1dbe41817ca15a29ff21ecd258d0286047 @@ -552,16 +518,6 @@ __metadata: languageName: node linkType: hard -"buffer@npm:^5.5.0": - version: 5.7.1 - resolution: "buffer@npm:5.7.1" - dependencies: - base64-js: ^1.3.1 - ieee754: ^1.1.13 - checksum: 1750ac396eb36e0157ff5299509723ac0681338ef6cd40b039bc86d59c8b9a9494e99db992836eb6d637de0b270b53ec1a62d4a1c9faeaa51468cc340e553984 - languageName: node - linkType: hard - "cacheable-lookup@npm:^5.0.3": version: 5.0.4 resolution: "cacheable-lookup@npm:5.0.4" @@ -608,6 +564,13 @@ __metadata: languageName: node linkType: hard +"chownr@npm:^2.0.0": + version: 2.0.0 + resolution: "chownr@npm:2.0.0" + checksum: b06ba0bf4218bc2214cdb94a7d0200db5c6425f9425795c064dcf5a3801aac8ae87f764727890cd1f48c026559159e7e0e15ed3d1940ce453dec54898d013379 + languageName: node + linkType: hard + "ci-info@npm:^2.0.0": version: 2.0.0 resolution: "ci-info@npm:2.0.0" @@ -615,10 +578,14 @@ __metadata: languageName: node linkType: hard -"clipanion@npm:^2.6.2": - version: 2.6.2 - resolution: "clipanion@npm:2.6.2" - checksum: d162deedd0bd297f0881ef2814cf00409d2c67383589345cf8ae0ae6d9eee2e7235313b392dd3ec9df85490e4875dd52c085997e4161a6c8aa4ec0a2c78f8f36 +"clipanion@npm:^3.0.0-rc.10": + version: 3.0.0-rc.12 + resolution: "clipanion@npm:3.0.0-rc.12" + dependencies: + typanion: ^3.3.1 + peerDependencies: + typanion: "*" + checksum: b221278f7a84c3ba192730a9dcbc18ab9b013714d6401ed722872b5833a36775485c47fdd0a8edfec52fda254038c364511905b19b3f950cd774ae54e9948c8e languageName: node linkType: hard @@ -708,24 +675,15 @@ __metadata: languageName: node linkType: hard -"debug@npm:^4.1.1": - version: 4.1.1 - resolution: "debug@npm:4.1.1" - dependencies: - ms: ^2.1.1 - checksum: 3601a6ce96e4698ed3edf0ee6e67ef0317adfcdae2f66a43b23d1b14e8888b422337429b16dbbcba6801e7bfa6cbb8de3128fbacfb8ae1cd9bd7615ea6baf970 - languageName: node - linkType: hard - -"debug@npm:^4.3.1": - version: 4.3.1 - resolution: "debug@npm:4.3.1" +"debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2": + version: 4.3.2 + resolution: "debug@npm:4.3.2" dependencies: ms: 2.1.2 peerDependenciesMeta: supports-color: optional: true - checksum: 0d41ba5177510e8b388dfd7df143ab0f9312e4abdaba312595461511dac88e9ef8101939d33b4e6d37e10341af6a5301082e4d7d6f3deb4d57bc05fc7d296fad + checksum: 5543570879e2274f6725d4285a034d6e0822d35faefc6f55965933fb440e8c21eb3a0bef934e66f4b6b491f898ee2de37cab980e9d4fd61372136c19d3ce4527 languageName: node linkType: hard @@ -777,7 +735,7 @@ __metadata: languageName: node linkType: hard -"end-of-stream@npm:^1.1.0, end-of-stream@npm:^1.4.1": +"end-of-stream@npm:^1.1.0": version: 1.4.4 resolution: "end-of-stream@npm:1.4.4" dependencies: @@ -842,13 +800,6 @@ __metadata: languageName: node linkType: hard -"eventemitter3@npm:^4.0.0": - version: 4.0.4 - resolution: "eventemitter3@npm:4.0.4" - checksum: 6693972304a7bf91aea3727d83803e1b38819ee0ed628ed842ac909284dedd1f3a7aa0ab4ccdd332bfcb9720138c9021b7b4737259e9fe8d70f7f25c57b9f0ad - languageName: node - linkType: hard - "eventemitter3@npm:^4.0.4": version: 4.0.7 resolution: "eventemitter3@npm:4.0.7" @@ -884,20 +835,6 @@ __metadata: languageName: node linkType: hard -"fast-redact@npm:^3.0.0": - version: 3.0.0 - resolution: "fast-redact@npm:3.0.0" - checksum: 5a1a724f4b786c194117f322262440426a03996b1b8851b0e390392770ac2b6ab9037b2ef4b23d8eb7043cbdc7092b37926774a82f794f6179e9087fab44ee49 - languageName: node - linkType: hard - -"fast-safe-stringify@npm:^2.0.7": - version: 2.0.7 - resolution: "fast-safe-stringify@npm:2.0.7" - checksum: 7bd22543263b707870d70c6f2336b6e8563e34d6807dc388cc0566895e31e0a8273af017a7eb1c9538d0ef54288284e1c0585b557bd856491295a847159fd929 - languageName: node - linkType: hard - "fastq@npm:^1.6.0": version: 1.11.0 resolution: "fastq@npm:1.11.0" @@ -931,13 +868,6 @@ __metadata: languageName: node linkType: hard -"flatstr@npm:^1.0.12": - version: 1.0.12 - resolution: "flatstr@npm:1.0.12" - checksum: 2803767f91887ffd60ac2aac0d6ccf2dd9e2d8f216628a73e3f525d5b5bfa4ac9a5b57334a4c1e6d5622f92f440c52562f7ca9719ace9d025d6c5b7a1a1579db - languageName: node - linkType: hard - "foreach@npm:^2.0.4": version: 2.0.5 resolution: "foreach@npm:2.0.5" @@ -945,10 +875,12 @@ __metadata: languageName: node linkType: hard -"fs-constants@npm:^1.0.0": - version: 1.0.0 - resolution: "fs-constants@npm:1.0.0" - checksum: b8382395f555012591b20bddf08d258723f660b4e7312943d10431a893e2af879295fefc15a917df43c9ed52d80d2f014c0ca8ca359367969be5c8a133e39742 +"fs-minipass@npm:^2.0.0": + version: 2.1.0 + resolution: "fs-minipass@npm:2.1.0" + dependencies: + minipass: ^3.0.0 + checksum: e14a490658621cf1f7d8cbf9e92a9cc4dc7ce050418e4817e877e4531c438223db79f7a1774668087428d665a3de95f87014ce36c8afdc841fea42bcb782abcb languageName: node linkType: hard @@ -1096,13 +1028,6 @@ __metadata: languageName: node linkType: hard -"ieee754@npm:^1.1.13": - version: 1.2.1 - resolution: "ieee754@npm:1.2.1" - checksum: 6c1cfab995ecab3b0dbb6cfb7e192686eb02f0f8e788f2d962e1fc02e2d5ab38a85e06d417221f136bd029663a77cdb920d99605d68d3730a05597dd7910426a - languageName: node - linkType: hard - "ignore@npm:^5.1.4": version: 5.1.8 resolution: "ignore@npm:5.1.8" @@ -1110,7 +1035,7 @@ __metadata: languageName: node linkType: hard -"inherits@npm:^2.0.3, inherits@npm:^2.0.4": +"inherits@npm:^2.0.3": version: 2.0.4 resolution: "inherits@npm:2.0.4" checksum: 98426da247ddfc3dcd7d7daedd90c3ca32d5b08deca08949726f12d49232aef94772a07b36cf4ff833e105ae2ef931777f6de4a6dd8245a216b9299ad4a50bea @@ -1289,15 +1214,6 @@ __metadata: languageName: node linkType: hard -"jsonschema8@npm:^1.1.1": - version: 1.1.1 - resolution: "jsonschema8@npm:1.1.1" - dependencies: - typescript: ^3.7.5 - checksum: 59e85ddde1e7800fb8c0211c0f97d47cb523d9101547b7699afae3796c524ce46a05242130a25d002ab72800450de9d0b2b9449f12f6e45ed5c0088fb827921d - languageName: node - linkType: hard - "keyv@npm:^4.0.0": version: 4.0.3 resolution: "keyv@npm:4.0.3" @@ -1392,6 +1308,25 @@ __metadata: languageName: node linkType: hard +"minipass@npm:^3.0.0": + version: 3.1.3 + resolution: "minipass@npm:3.1.3" + dependencies: + yallist: ^4.0.0 + checksum: d12b95a845f15950bce7a77730c89400cf0c4f55e7066338da1d201ac148ece4ea8efa79e45a2c07c868c61bcaf9e996c4c3d6bf6b85c038ffa454521fc6ecd5 + languageName: node + linkType: hard + +"minizlib@npm:^2.1.1": + version: 2.1.2 + resolution: "minizlib@npm:2.1.2" + dependencies: + minipass: ^3.0.0 + yallist: ^4.0.0 + checksum: 5a45b57b3467e5a743d87a96d7be57598a6f72eb3b7eeac237074c566bd04278766ae03bb523c32f34581c565a19e74e54ec90c6ce0630a540787c755b4c4b4e + languageName: node + linkType: hard + "mkdirp@npm:^0.5.1": version: 0.5.5 resolution: "mkdirp@npm:0.5.5" @@ -1403,7 +1338,16 @@ __metadata: languageName: node linkType: hard -"ms@npm:2.1.2, ms@npm:^2.1.1": +"mkdirp@npm:^1.0.3": + version: 1.0.4 + resolution: "mkdirp@npm:1.0.4" + bin: + mkdirp: bin/cmd.js + checksum: 1aa3a6a2d7514f094a91329ec09994f5d32d2955a4985ecbb3d86f2aaeafc4aa11521f98d606144c1d49cd9835004d9a73342709b8c692c92e59eacf37412468 + languageName: node + linkType: hard + +"ms@npm:2.1.2": version: 2.1.2 resolution: "ms@npm:2.1.2" checksum: 9b65fb709bc30c0c07289dcbdb61ca032acbb9ea5698b55fa62e2cebb04c5953f1876a1f3f7f4bc2e91d4bf4d86003f3e207c3bc6ee2f716f99827e62389cd0e @@ -1520,17 +1464,7 @@ __metadata: languageName: node linkType: hard -"p-queue@npm:^6.4.0": - version: 6.4.0 - resolution: "p-queue@npm:6.4.0" - dependencies: - eventemitter3: ^4.0.0 - p-timeout: ^3.1.0 - checksum: 583234de2fc83dde252f703798ba5df27d2f09de48d87349c30c8779f99d92221cb47f1f9e887ddfb39c6592a045f6e8070f88bf86fcce34ed820a96708a27e2 - languageName: node - linkType: hard - -"p-queue@npm:^6.6.2": +"p-queue@npm:^6.4.0, p-queue@npm:^6.6.2": version: 6.6.2 resolution: "p-queue@npm:6.6.2" dependencies: @@ -1540,7 +1474,7 @@ __metadata: languageName: node linkType: hard -"p-timeout@npm:^3.1.0, p-timeout@npm:^3.2.0": +"p-timeout@npm:^3.2.0": version: 3.2.0 resolution: "p-timeout@npm:3.2.0" dependencies: @@ -1577,40 +1511,6 @@ __metadata: languageName: node linkType: hard -"pino-debug@npm:^2.0.0": - version: 2.0.0 - resolution: "pino-debug@npm:2.0.0" - dependencies: - pino: ^6.0.2 - peerDependencies: - debug: ">=2" - checksum: bcb973a09e5c21873d25e784020a5a1599c9bbb4b68ad354b56f3f24e638ad3359850a28dcbb31c7011870416982500e1d2d58a516c3982c12071cb3761673e8 - languageName: node - linkType: hard - -"pino-std-serializers@npm:^3.1.0": - version: 3.2.0 - resolution: "pino-std-serializers@npm:3.2.0" - checksum: fb386422f018951ecdaf241b76554d6149928e9dd5c89d1bc12100d61d7f14b140fcbbfcf9203921b21cda05cc3eab2499289fe272358d50836627ccda15f5ec - languageName: node - linkType: hard - -"pino@npm:^6.0.2": - version: 6.11.2 - resolution: "pino@npm:6.11.2" - dependencies: - fast-redact: ^3.0.0 - fast-safe-stringify: ^2.0.7 - flatstr: ^1.0.12 - pino-std-serializers: ^3.1.0 - quick-format-unescaped: 4.0.1 - sonic-boom: ^1.0.2 - bin: - pino: ./bin.js - checksum: e854d37d659080c6f96c4030a279b44a25cc1550b8ca6aee0c9a62420773c2771090cfec96587aa917d4c82a2d1744d52e63d9d9135d4c410f9d30438069a013 - languageName: node - linkType: hard - "pluralize@npm:^7.0.0": version: 7.0.0 resolution: "pluralize@npm:7.0.0" @@ -1693,13 +1593,6 @@ __metadata: languageName: node linkType: hard -"quick-format-unescaped@npm:4.0.1": - version: 4.0.1 - resolution: "quick-format-unescaped@npm:4.0.1" - checksum: 0935e55e0aaaf789baa080768e822694bc0a497a3170fd35bf2b1aee2a953cf3b5a24e9d29a70dbe7bdc72534c6e1be917ab5c599d587ce0425c98293d8cc1c7 - languageName: node - linkType: hard - "quick-lru@npm:^5.1.1": version: 5.1.1 resolution: "quick-lru@npm:5.1.1" @@ -1707,7 +1600,7 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:3, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0": +"readable-stream@npm:3": version: 3.6.0 resolution: "readable-stream@npm:3.6.0" dependencies: @@ -1753,6 +1646,13 @@ __metadata: languageName: node linkType: hard +"resolve.exports@npm:^1.0.2": + version: 1.0.2 + resolution: "resolve.exports@npm:1.0.2" + checksum: 012a46e3ae41c53762abf5b50ea1b4adf2de617bbea1dbc7bf6e609c1ceaedee7782acbc92d443951d5dd0c3a8fb1090ce73285a9ccc24b530e33b5e09ae196f + languageName: node + linkType: hard + "responselike@npm:^2.0.0": version: 2.0.0 resolution: "responselike@npm:2.0.0" @@ -1851,16 +1751,6 @@ __metadata: languageName: node linkType: hard -"sonic-boom@npm:^1.0.2": - version: 1.4.0 - resolution: "sonic-boom@npm:1.4.0" - dependencies: - atomic-sleep: ^1.0.0 - flatstr: ^1.0.12 - checksum: 19c5fd3fb95f374a6e3b3edcc327ed8bf98ff4d54194c1305dac5fb1855ac81e681b0f6946cab4d97165897cb65e5561d781022e07fc5915a99a42f6627b0564 - languageName: node - linkType: hard - "source-map@npm:^0.6.1": version: 0.6.1 resolution: "source-map@npm:0.6.1" @@ -1902,18 +1792,7 @@ __metadata: languageName: node linkType: hard -"string-width@npm:^4.1.0": - version: 4.2.0 - resolution: "string-width@npm:4.2.0" - dependencies: - emoji-regex: ^8.0.0 - is-fullwidth-code-point: ^3.0.0 - strip-ansi: ^6.0.0 - checksum: cf1e8acddf3d6d6e9e168628cc58cf1b33b1e7e801af2a0c18316e4e8beb62361eb9aad6eab2fc86de972ab149cb7262aedc2a5d0c2ce28873c91b171cce84d7 - languageName: node - linkType: hard - -"string-width@npm:^4.2.0": +"string-width@npm:^4.1.0, string-width@npm:^4.2.0": version: 4.2.2 resolution: "string-width@npm:4.2.2" dependencies: @@ -2003,16 +1882,17 @@ __metadata: languageName: node linkType: hard -"tar-stream@npm:^2.0.1": - version: 2.2.0 - resolution: "tar-stream@npm:2.2.0" +"tar@npm:^6.0.5": + version: 6.1.0 + resolution: "tar@npm:6.1.0" dependencies: - bl: ^4.0.3 - end-of-stream: ^1.4.1 - fs-constants: ^1.0.0 - inherits: ^2.0.3 - readable-stream: ^3.1.1 - checksum: 7eec0a7fc8d0337729c1c2356d567a7527141d6ba0dd4804db979e17fc6389163e70fd4abdb855fc5ab54b944aeff7988e35e95ab6cee34a4156ca2d42980576 + chownr: ^2.0.0 + fs-minipass: ^2.0.0 + minipass: ^3.0.0 + minizlib: ^2.1.1 + mkdirp: ^1.0.3 + yallist: ^4.0.0 + checksum: d1d988eceb1ad2ecfaaf6fc5ecfe0c46fa005d04fe4c283355ccc52d3ffb4b6bf459a62f9ac7e36fd35251ab020399bdf527ab48b968120e06b4f61906a87d62 languageName: node linkType: hard @@ -2080,43 +1960,30 @@ __metadata: languageName: node linkType: hard -typescript@^3.7.5: - version: 3.9.2 - resolution: "typescript@npm:3.9.2" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: bf7cbf2f8c695aa942be60da470aaaf902c2e9b3693ed5141fa6de5632f42f471b7e83bd9d4dcff5e0fa37eff746d61cfe1e6949019ad70f0f98d1f60ccfd3ae - languageName: node - linkType: hard - -typescript@^4.2.3: - version: 4.2.3 - resolution: "typescript@npm:4.2.3" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 06e8470f317db6f5e2fce809b20eb84a67a7d8179057abff36e5427bd1b891bd08e54581ff81f0fa36aef9b6d1eb0f54eaf6e2643c6dbd4e37a0adcc41eed256 +"typanion@npm:^3.3.1": + version: 3.3.1 + resolution: "typanion@npm:3.3.1" + checksum: 4341c4199f5ce022c9e486a47fff9509bb887768c9496fec86e10bdac9631f34298b9257dc5c9425e2eb177c3df5189ba029570114a5fddbfb11928330023262 languageName: node linkType: hard -"typescript@patch:typescript@^3.7.5#builtin": - version: 3.9.2 - resolution: "typescript@patch:typescript@npm%3A3.9.2#builtin::version=3.9.2&hash=a45b0e" +typescript@^4.2.4: + version: 4.2.4 + resolution: "typescript@npm:4.2.4" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 0fb793283513adff55a03207e9df4483f2e586c8fc98abd1423a4e4bd2b867a8e4d6105aeeaa5b4432e83aaf125747c1bcab65c61f4d942829337ad3f8fee322 + checksum: edaede2fa77f56b7fba80ee624a2368ab1216e75b0434d968ccb47ab0a5e2f6d94f848b3b111c1237dd71e988cd376af26370dcdad3b94355c76e759f0dd0a1e languageName: node linkType: hard -"typescript@patch:typescript@^4.2.3#builtin": - version: 4.2.3 - resolution: "typescript@patch:typescript@npm%3A4.2.3#builtin::version=4.2.3&hash=a45b0e" +"typescript@patch:typescript@^4.2.4#builtin": + version: 4.2.4 + resolution: "typescript@patch:typescript@npm%3A4.2.4#builtin::version=4.2.4&hash=a45b0e" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: a8956044aabf730699bcc3c2475efdd3f35e509329325cf60b4989761d4c2188e2c474183e2cf92b8c201fcf976814a5a16f144508b2a832643c4f972d0ab803 + checksum: 3be44317593182e8ce494c114e7ad9b0bb2553a22f3085cc6da4f0a36912c20850daa9be4c898af2ab6fc8b12f430c1c9e46ac715721867cd38643f2350d3ef9 languageName: node linkType: hard