From 32134b0dc2c65e8e97dade910ecf91d537e0c80b Mon Sep 17 00:00:00 2001 From: Vladislav Tupikin Date: Fri, 10 Dec 2021 15:09:17 +0300 Subject: [PATCH 1/5] telemetry data removed from endpoints --- package-lock.json | 256 +++++++++++------------ package.json | 6 +- src/api/audit.ts | 12 +- src/api/content.ts | 20 +- src/api/contentAttachments.ts | 12 +- src/api/contentBody.ts | 2 +- src/api/contentChildrenAndDescendants.ts | 14 +- src/api/contentComments.ts | 2 +- src/api/contentLabels.ts | 8 +- src/api/contentMacroBody.ts | 2 +- src/api/contentPermissions.ts | 2 +- src/api/contentProperties.ts | 12 +- src/api/contentRestrictions.ts | 30 +-- src/api/contentVersions.ts | 8 +- src/api/contentWatches.ts | 24 +-- src/api/dynamicModules.ts | 6 +- src/api/experimental.ts | 10 +- src/api/group.ts | 31 +-- src/api/inlineTasks.ts | 6 +- src/api/labelInfo.ts | 2 +- src/api/longRunningTask.ts | 4 +- src/api/relation.ts | 10 +- src/api/search.ts | 10 +- src/api/settings.ts | 12 +- src/api/space.ts | 18 +- src/api/spacePermissions.ts | 6 +- src/api/spaceProperties.ts | 12 +- src/api/spaceSettings.ts | 4 +- src/api/template.ts | 12 +- src/api/themes.ts | 12 +- src/api/users.ts | 16 +- 31 files changed, 292 insertions(+), 289 deletions(-) diff --git a/package-lock.json b/package-lock.json index acf8d3ec..210a024c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "confluence.js", - "version": "1.3.0", + "version": "1.3.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -631,15 +631,15 @@ } }, "@jest/core": { - "version": "27.4.3", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.4.3.tgz", - "integrity": "sha512-V9ms3zSxUHxh1E/ZLAiXF7SLejsdFnjWTFizWotMOWvjho0lW5kSjZymhQSodNW0T0ZMQRiha7f8+NcFVm3hJQ==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.4.4.tgz", + "integrity": "sha512-xBNPVqYAdAiAMXnb4ugx9Cdmr0S52lBsLbQMR/sGBRO0810VSPKiuSDtuup6qdkK1e9vxbv3KK3IAP1QFAp8mw==", "dev": true, "requires": { "@jest/console": "^27.4.2", - "@jest/reporters": "^27.4.2", + "@jest/reporters": "^27.4.4", "@jest/test-result": "^27.4.2", - "@jest/transform": "^27.4.2", + "@jest/transform": "^27.4.4", "@jest/types": "^27.4.2", "@types/node": "*", "ansi-escapes": "^4.2.1", @@ -648,15 +648,15 @@ "exit": "^0.1.2", "graceful-fs": "^4.2.4", "jest-changed-files": "^27.4.2", - "jest-config": "^27.4.3", - "jest-haste-map": "^27.4.2", + "jest-config": "^27.4.4", + "jest-haste-map": "^27.4.4", "jest-message-util": "^27.4.2", "jest-regex-util": "^27.4.0", - "jest-resolve": "^27.4.2", - "jest-resolve-dependencies": "^27.4.2", - "jest-runner": "^27.4.3", - "jest-runtime": "^27.4.2", - "jest-snapshot": "^27.4.2", + "jest-resolve": "^27.4.4", + "jest-resolve-dependencies": "^27.4.4", + "jest-runner": "^27.4.4", + "jest-runtime": "^27.4.4", + "jest-snapshot": "^27.4.4", "jest-util": "^27.4.2", "jest-validate": "^27.4.2", "jest-watcher": "^27.4.2", @@ -667,9 +667,9 @@ } }, "@jest/environment": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.4.2.tgz", - "integrity": "sha512-uSljKxh/rGlHlmhyeG4ZoVK9hOec+EPBkwTHkHKQ2EqDu5K+MaG9uJZ8o1CbRsSdZqSuhXvJCYhBWsORPPg6qw==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.4.4.tgz", + "integrity": "sha512-q+niMx7cJgt/t/b6dzLOh4W8Ef/8VyKG7hxASK39jakijJzbFBGpptx3RXz13FFV7OishQ9lTbv+dQ5K3EhfDQ==", "dev": true, "requires": { "@jest/fake-timers": "^27.4.2", @@ -704,26 +704,26 @@ } }, "@jest/globals": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.4.2.tgz", - "integrity": "sha512-KkfaHEttlGpXYAQTZHgrESiEPx2q/DKAFLGLFda1uGVrqc17snd3YVPhOxlXOHIzVPs+lQ/SDB2EIvxyGzb3Ew==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.4.4.tgz", + "integrity": "sha512-bqpqQhW30BOreXM8bA8t8JbOQzsq/WnPTnBl+It3UxAD9J8yxEAaBEylHx1dtBapAr/UBk8GidXbzmqnee8tYQ==", "dev": true, "requires": { - "@jest/environment": "^27.4.2", + "@jest/environment": "^27.4.4", "@jest/types": "^27.4.2", "expect": "^27.4.2" } }, "@jest/reporters": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.2.tgz", - "integrity": "sha512-sp4aqmdBJtjKetEakzDPcZggPcVIF6w9QLkYBbaWDV6e/SIsHnF1S4KtIH91eEc2fp7ep6V/e1xvdfEoho1d2w==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.4.tgz", + "integrity": "sha512-ssyJSw9B9Awb1QaxDhIPSs4de1b7SE2kv7tqFehQL13xpn5HUkMYZK/ufTOXiCAnXFOZS+XDl1GaQ/LmJAzI1A==", "dev": true, "requires": { "@bcoe/v8-coverage": "^0.2.3", "@jest/console": "^27.4.2", "@jest/test-result": "^27.4.2", - "@jest/transform": "^27.4.2", + "@jest/transform": "^27.4.4", "@jest/types": "^27.4.2", "@types/node": "*", "chalk": "^4.0.0", @@ -736,10 +736,10 @@ "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^4.0.0", "istanbul-reports": "^3.0.2", - "jest-haste-map": "^27.4.2", - "jest-resolve": "^27.4.2", + "jest-haste-map": "^27.4.4", + "jest-resolve": "^27.4.4", "jest-util": "^27.4.2", - "jest-worker": "^27.4.2", + "jest-worker": "^27.4.4", "slash": "^3.0.0", "source-map": "^0.6.0", "string-length": "^4.0.1", @@ -771,21 +771,21 @@ } }, "@jest/test-sequencer": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.2.tgz", - "integrity": "sha512-HmHp5mlh9f9GyNej5yCS1JZIFfUGnP9+jEOH5zoq5EmsuZeYD+dGULqyvGDPtuzzbyAFJ6R4+z4SS0VvnFwwGQ==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.4.tgz", + "integrity": "sha512-mCh+d4JTGTtX7vr13d7q2GHJy33nAobEwtEJ8X3u7R8+0ImVO2eAsQzsLfX8lyvdYHBxYABhqbYuaUNo42/pQw==", "dev": true, "requires": { "@jest/test-result": "^27.4.2", "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.4.2", - "jest-runtime": "^27.4.2" + "jest-haste-map": "^27.4.4", + "jest-runtime": "^27.4.4" } }, "@jest/transform": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.4.2.tgz", - "integrity": "sha512-RTKcPZllfcmLfnlxBya7aypofhdz05+E6QITe55Ex0rxyerkgjmmpMlvVn11V0cP719Ps6WcDYCnDzxnnJUwKg==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.4.4.tgz", + "integrity": "sha512-7U/nDSrGsGzL7+X8ScNFV71w8u8knJQWSa9C2xsrrKLMOgb+rWuCG4VAyWke/53BU96GnT+Ka81xCAHA5gk6zA==", "dev": true, "requires": { "@babel/core": "^7.1.0", @@ -795,7 +795,7 @@ "convert-source-map": "^1.4.0", "fast-json-stable-stringify": "^2.0.0", "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.4.2", + "jest-haste-map": "^27.4.4", "jest-regex-util": "^27.4.0", "jest-util": "^27.4.2", "micromatch": "^4.0.4", @@ -1371,12 +1371,12 @@ } }, "babel-jest": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.2.tgz", - "integrity": "sha512-MADrjb3KBO2eyZCAc6QaJg6RT5u+6oEdDyHO5HEalnpwQ6LrhTsQF2Kj1Wnz2t6UPXIXPk18dSXXOT0wF5yTxA==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.4.tgz", + "integrity": "sha512-+6RVutZxOQgJkt4svgTHPFtOQlVe9dUg3wrimIAM38pY6hL/nsL8glfFSUjD9jNVjaVjzkCzj6loFFecrjr9Qw==", "dev": true, "requires": { - "@jest/transform": "^27.4.2", + "@jest/transform": "^27.4.4", "@jest/types": "^27.4.2", "@types/babel__core": "^7.1.14", "babel-plugin-istanbul": "^6.0.0", @@ -1837,9 +1837,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.14.tgz", - "integrity": "sha512-RsGkAN9JEAYMObS72kzUsPPcPGMqX1rBqGuXi9aa4TBKLzICoLf+DAAtd0fVFzrniJqYzpby47gthCUoObfs0Q==", + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.15.tgz", + "integrity": "sha512-WDw2IUL3k4QpbzInV3JZK+Zd1NjWJPDZ28oUSchWb/kf6AVj7/niaAlgcJlvojFa1d7pJSyQ/KSZsEtq5W7aGQ==", "dev": true }, "emittery": { @@ -3024,30 +3024,30 @@ } }, "jest": { - "version": "27.4.3", - "resolved": "https://registry.npmjs.org/jest/-/jest-27.4.3.tgz", - "integrity": "sha512-jwsfVABBzuN3Atm+6h6vIEpTs9+VApODLt4dk2qv1WMOpb1weI1IIZfuwpMiWZ62qvWj78MvdvMHIYdUfqrFaA==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/jest/-/jest-27.4.4.tgz", + "integrity": "sha512-AXwEIFa58Uf1Jno3/KSo5HZZ0/2Xwqvfrz0/3bmTwImkFlbOvz5vARAW9nTrxRLkojjkitaZ1KNKAtw3JRFAaA==", "dev": true, "requires": { - "@jest/core": "^27.4.3", + "@jest/core": "^27.4.4", "import-local": "^3.0.2", - "jest-cli": "^27.4.3" + "jest-cli": "^27.4.4" }, "dependencies": { "jest-cli": { - "version": "27.4.3", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.3.tgz", - "integrity": "sha512-zZSJBXNC/i8UnJPwcKWsqnhGgIF3uoTYP7th32Zej7KNQJdxzOMj+wCfy2Ox3kU7nXErJ36DtYyXDhfiqaiDRw==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.4.tgz", + "integrity": "sha512-+MfsHnZPUOBigCBURuQFRpgYoPCgmIFkICkqt4SrramZCUp/UAuWcst4pMZb84O3VU8JyKJmnpGG4qH8ClQloA==", "dev": true, "requires": { - "@jest/core": "^27.4.3", + "@jest/core": "^27.4.4", "@jest/test-result": "^27.4.2", "@jest/types": "^27.4.2", "chalk": "^4.0.0", "exit": "^0.1.2", "graceful-fs": "^4.2.4", "import-local": "^3.0.2", - "jest-config": "^27.4.3", + "jest-config": "^27.4.4", "jest-util": "^27.4.2", "jest-validate": "^27.4.2", "prompts": "^2.0.1", @@ -3068,12 +3068,12 @@ } }, "jest-circus": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.2.tgz", - "integrity": "sha512-2ePUSru1BGMyzxsMvRfu+tNb+PW60rUyMLJBfw1Nrh5zC8RoTPfF+zbE0JToU31a6ZVe4nnrNKWYRzlghAbL0A==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.4.tgz", + "integrity": "sha512-4DWhvQerDq5X4GaqhEUoZiBhuNdKDGr0geW0iJwarbDljAmGaGOErKQG+z2PBr0vgN05z7tsGSY51mdWr8E4xg==", "dev": true, "requires": { - "@jest/environment": "^27.4.2", + "@jest/environment": "^27.4.4", "@jest/test-result": "^27.4.2", "@jest/types": "^27.4.2", "@types/node": "*", @@ -3085,8 +3085,8 @@ "jest-each": "^27.4.2", "jest-matcher-utils": "^27.4.2", "jest-message-util": "^27.4.2", - "jest-runtime": "^27.4.2", - "jest-snapshot": "^27.4.2", + "jest-runtime": "^27.4.4", + "jest-snapshot": "^27.4.4", "jest-util": "^27.4.2", "pretty-format": "^27.4.2", "slash": "^3.0.0", @@ -3095,28 +3095,28 @@ } }, "jest-config": { - "version": "27.4.3", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.4.3.tgz", - "integrity": "sha512-DQ10HTSqYtC2pO7s9j2jw+li4xUnm2wLYWH2o7K1ftB8NyvToHsXoLlXxtsGh3AW9gUQR6KY/4B7G+T/NswJBw==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.4.4.tgz", + "integrity": "sha512-6lxg0ugO6KS2zKEbpdDwBzu1IT0Xg4/VhxXMuBu+z/5FvBjLCEMTaWQm3bCaGCZUR9j9FK4DzUIxyhIgn6kVEg==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/test-sequencer": "^27.4.2", + "@jest/test-sequencer": "^27.4.4", "@jest/types": "^27.4.2", - "babel-jest": "^27.4.2", + "babel-jest": "^27.4.4", "chalk": "^4.0.0", "ci-info": "^3.2.0", "deepmerge": "^4.2.2", "glob": "^7.1.1", "graceful-fs": "^4.2.4", - "jest-circus": "^27.4.2", - "jest-environment-jsdom": "^27.4.3", - "jest-environment-node": "^27.4.2", + "jest-circus": "^27.4.4", + "jest-environment-jsdom": "^27.4.4", + "jest-environment-node": "^27.4.4", "jest-get-type": "^27.4.0", - "jest-jasmine2": "^27.4.2", + "jest-jasmine2": "^27.4.4", "jest-regex-util": "^27.4.0", - "jest-resolve": "^27.4.2", - "jest-runner": "^27.4.3", + "jest-resolve": "^27.4.4", + "jest-runner": "^27.4.4", "jest-util": "^27.4.2", "jest-validate": "^27.4.2", "micromatch": "^4.0.4", @@ -3159,12 +3159,12 @@ } }, "jest-environment-jsdom": { - "version": "27.4.3", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.3.tgz", - "integrity": "sha512-x1AUVz3G14LpEJs7KIFUaTINT2n0unOUmvdAby3s/sldUpJJetOJifHo1O/EUQC5fNBowggwJbVulko18y6OWw==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.4.tgz", + "integrity": "sha512-cYR3ndNfHBqQgFvS1RL7dNqSvD//K56j/q1s2ygNHcfTCAp12zfIromO1w3COmXrxS8hWAh7+CmZmGCIoqGcGA==", "dev": true, "requires": { - "@jest/environment": "^27.4.2", + "@jest/environment": "^27.4.4", "@jest/fake-timers": "^27.4.2", "@jest/types": "^27.4.2", "@types/node": "*", @@ -3174,12 +3174,12 @@ } }, "jest-environment-node": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.2.tgz", - "integrity": "sha512-nzTZ5nJ+FabuZPH2YVci7SZIHpvtNRHPt8+vipLkCnAgXGjVzHm7XJWdnNqXbAkExIgiKeVEkVMNZOZE/LeiIg==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.4.tgz", + "integrity": "sha512-D+v3lbJ2GjQTQR23TK0kY3vFVmSeea05giInI41HHOaJnAwOnmUHTZgUaZL+VxUB43pIzoa7PMwWtCVlIUoVoA==", "dev": true, "requires": { - "@jest/environment": "^27.4.2", + "@jest/environment": "^27.4.4", "@jest/fake-timers": "^27.4.2", "@jest/types": "^27.4.2", "@types/node": "*", @@ -3194,9 +3194,9 @@ "dev": true }, "jest-haste-map": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.2.tgz", - "integrity": "sha512-foiyAEePORUN2eeJnOtcM1y8qW0ShEd9kTjWVL4sVaMcuCJM6gtHegvYPBRT0mpI/bs4ueThM90+Eoj2ncoNsA==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.4.tgz", + "integrity": "sha512-kvspmHmgPIZoDaqUsvsJFTaspuxhATvdO6wsFNGNSi8kfdiOCEEvECNbht8xG+eE5Ol88JyJmp2D7RF4dYo85Q==", "dev": true, "requires": { "@jest/types": "^27.4.2", @@ -3209,19 +3209,19 @@ "jest-regex-util": "^27.4.0", "jest-serializer": "^27.4.0", "jest-util": "^27.4.2", - "jest-worker": "^27.4.2", + "jest-worker": "^27.4.4", "micromatch": "^4.0.4", "walker": "^1.0.7" } }, "jest-jasmine2": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.2.tgz", - "integrity": "sha512-VO/fyAJSH9u0THjbteFiL8qc93ufU+yW+bdieDc8tzTCWwlWzO53UHS5nFK1qmE8izb5Smkn+XHlVt6/l06MKQ==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.4.tgz", + "integrity": "sha512-ygk2tUgtLeN3ouj4KEYw9p81GLI1EKrnvourPULN5gdgB482PH5op9gqaRG0IenbJhBbbRwiSvh5NoBoQZSqdA==", "dev": true, "requires": { "@babel/traverse": "^7.1.0", - "@jest/environment": "^27.4.2", + "@jest/environment": "^27.4.4", "@jest/source-map": "^27.4.0", "@jest/test-result": "^27.4.2", "@jest/types": "^27.4.2", @@ -3233,8 +3233,8 @@ "jest-each": "^27.4.2", "jest-matcher-utils": "^27.4.2", "jest-message-util": "^27.4.2", - "jest-runtime": "^27.4.2", - "jest-snapshot": "^27.4.2", + "jest-runtime": "^27.4.4", + "jest-snapshot": "^27.4.4", "jest-util": "^27.4.2", "pretty-format": "^27.4.2", "throat": "^6.0.1" @@ -3302,15 +3302,15 @@ "dev": true }, "jest-resolve": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.2.tgz", - "integrity": "sha512-d/zqPjxCzMqHlOdRTg8cTpO9jY+1/T74KazT8Ws/LwmwxV5sRMWOkiLjmzUCDj/5IqA5XHNK4Hkmlq9Kdpb9Sg==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.4.tgz", + "integrity": "sha512-Yh5jK3PBmDbm01Rc8pT0XqpBlTPEGwWp7cN61ijJuwony/tR2Taof3TLy6yfNiuRS8ucUOPO7NBYm3ei38kkcg==", "dev": true, "requires": { "@jest/types": "^27.4.2", "chalk": "^4.0.0", "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.4.2", + "jest-haste-map": "^27.4.4", "jest-pnp-resolver": "^1.2.2", "jest-util": "^27.4.2", "jest-validate": "^27.4.2", @@ -3320,26 +3320,26 @@ } }, "jest-resolve-dependencies": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.2.tgz", - "integrity": "sha512-hb++cTpqvOWfU49MCP/JQkxmnrhKoAVqXWFjgYXswRSVGk8Q6bDTSvhbCeYXDtXaymY0y7WrrSIlKogClcKJuw==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.4.tgz", + "integrity": "sha512-iAnpCXh81sd9nbyqySvm5/aV9X6JZKE0dQyFXTC8tptXcdrgS0vjPFy+mEgzPHxXw+tq4TQupuTa0n8OXwRIxw==", "dev": true, "requires": { "@jest/types": "^27.4.2", "jest-regex-util": "^27.4.0", - "jest-snapshot": "^27.4.2" + "jest-snapshot": "^27.4.4" } }, "jest-runner": { - "version": "27.4.3", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.3.tgz", - "integrity": "sha512-JgR6Om/j22Fd6ZUUIGTWNcCtuZVYbNrecb4k89W4UyFJoRtHpo2zMKWkmFFFJoqwWGrfrcPLnVBIgkJiTV3cyA==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.4.tgz", + "integrity": "sha512-AXv/8Q0Xf1puWnDf52m7oLrK7sXcv6re0V/kItwTSVHJbX7Oebm07oGFQqGmq0R0mhO1zpmB3OpqRuaCN2elPA==", "dev": true, "requires": { "@jest/console": "^27.4.2", - "@jest/environment": "^27.4.2", + "@jest/environment": "^27.4.4", "@jest/test-result": "^27.4.2", - "@jest/transform": "^27.4.2", + "@jest/transform": "^27.4.4", "@jest/types": "^27.4.2", "@types/node": "*", "chalk": "^4.0.0", @@ -3347,31 +3347,31 @@ "exit": "^0.1.2", "graceful-fs": "^4.2.4", "jest-docblock": "^27.4.0", - "jest-environment-jsdom": "^27.4.3", - "jest-environment-node": "^27.4.2", - "jest-haste-map": "^27.4.2", + "jest-environment-jsdom": "^27.4.4", + "jest-environment-node": "^27.4.4", + "jest-haste-map": "^27.4.4", "jest-leak-detector": "^27.4.2", "jest-message-util": "^27.4.2", - "jest-resolve": "^27.4.2", - "jest-runtime": "^27.4.2", + "jest-resolve": "^27.4.4", + "jest-runtime": "^27.4.4", "jest-util": "^27.4.2", - "jest-worker": "^27.4.2", + "jest-worker": "^27.4.4", "source-map-support": "^0.5.6", "throat": "^6.0.1" } }, "jest-runtime": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.2.tgz", - "integrity": "sha512-eqPgcBaUNaw6j8T5M+dnfAEh6MIrh2YmtskCr9sl50QYpD22Sg+QqHw3J3nmaLzVMbBtOMHFFxLF0Qx8MsZVFQ==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.4.tgz", + "integrity": "sha512-tZGay6P6vXJq8t4jVFAUzYHx+lzIHXjz+rj1XBk6mAR1Lwtf5kz0Uun7qNuU+oqpZu4+hhuxpUfXb6j30bEPqA==", "dev": true, "requires": { "@jest/console": "^27.4.2", - "@jest/environment": "^27.4.2", - "@jest/globals": "^27.4.2", + "@jest/environment": "^27.4.4", + "@jest/globals": "^27.4.4", "@jest/source-map": "^27.4.0", "@jest/test-result": "^27.4.2", - "@jest/transform": "^27.4.2", + "@jest/transform": "^27.4.4", "@jest/types": "^27.4.2", "@types/yargs": "^16.0.0", "chalk": "^4.0.0", @@ -3381,12 +3381,12 @@ "exit": "^0.1.2", "glob": "^7.1.3", "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.4.2", + "jest-haste-map": "^27.4.4", "jest-message-util": "^27.4.2", "jest-mock": "^27.4.2", "jest-regex-util": "^27.4.0", - "jest-resolve": "^27.4.2", - "jest-snapshot": "^27.4.2", + "jest-resolve": "^27.4.4", + "jest-snapshot": "^27.4.4", "jest-util": "^27.4.2", "jest-validate": "^27.4.2", "slash": "^3.0.0", @@ -3413,9 +3413,9 @@ } }, "jest-snapshot": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.2.tgz", - "integrity": "sha512-DI7lJlNIu6WSQ+esqhnJzEzU70+dV+cNjoF1c+j5FagWEd3KtOyZvVliAH0RWNQ6KSnAAnKSU0qxJ8UXOOhuUQ==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.4.tgz", + "integrity": "sha512-yy+rpCvYMOjTl7IMuaMI9OP9WT229zi8BhdNHm6e6mttAOIzvIiCxFoZ6yRxaV3HDPPgMryi+ReX2b8+IQJdPA==", "dev": true, "requires": { "@babel/core": "^7.7.2", @@ -3424,7 +3424,7 @@ "@babel/plugin-syntax-typescript": "^7.7.2", "@babel/traverse": "^7.7.2", "@babel/types": "^7.0.0", - "@jest/transform": "^27.4.2", + "@jest/transform": "^27.4.4", "@jest/types": "^27.4.2", "@types/babel__traverse": "^7.0.4", "@types/prettier": "^2.1.5", @@ -3434,10 +3434,10 @@ "graceful-fs": "^4.2.4", "jest-diff": "^27.4.2", "jest-get-type": "^27.4.0", - "jest-haste-map": "^27.4.2", + "jest-haste-map": "^27.4.4", "jest-matcher-utils": "^27.4.2", "jest-message-util": "^27.4.2", - "jest-resolve": "^27.4.2", + "jest-resolve": "^27.4.4", "jest-util": "^27.4.2", "natural-compare": "^1.4.0", "pretty-format": "^27.4.2", @@ -3496,9 +3496,9 @@ } }, "jest-worker": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.2.tgz", - "integrity": "sha512-0QMy/zPovLfUPyHuOuuU4E+kGACXXE84nRnq6lBVI9GJg5DCBiA97SATi+ZP8CpiJwEQy1oCPjRBf8AnLjN+Ag==", + "version": "27.4.4", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.4.tgz", + "integrity": "sha512-jfwxYJvfua1b1XkyuyPh01ATmgg4e5fPM/muLmhy9Qc6dmiwacQB0MLHaU6IjEsv/+nAixHGxTn8WllA27Pn0w==", "dev": true, "requires": { "@types/node": "*", @@ -4658,9 +4658,9 @@ "dev": true }, "typescript": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.2.tgz", - "integrity": "sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.3.tgz", + "integrity": "sha512-eVYaEHALSt+s9LbvgEv4Ef+Tdq7hBiIZgii12xXJnukryt3pMgJf6aKhoCZ3FWQsu6sydEnkg11fYXLzhLBjeQ==", "dev": true }, "unbox-primitive": { diff --git a/package.json b/package.json index 0ded37ea..9b0f5996 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "confluence.js", - "version": "1.3.0", + "version": "1.3.1", "description": "confluence.js is a powerful Node.JS/Browser module that allows you to interact with the Confluence API very easily", "author": "Vladislav Tupikin ", "license": "MIT", @@ -45,14 +45,14 @@ "eslint-config-airbnb-typescript": "^16.1.0", "eslint-import-resolver-typescript": "^2.5.0", "eslint-plugin-import": "^2.25.3", - "jest": "^27.4.3", + "jest": "^27.4.4", "prettier": "^2.5.1", "prettier-plugin-jsdoc": "^0.3.30", "sinon": "^12.0.1", "ts-jest": "^27.1.1", "typedoc": "^0.22.10", "typedoc-plugin-extras": "^2.2.1", - "typescript": "^4.5.2" + "typescript": "^4.5.3" }, "dependencies": { "atlassian-jwt": "^2.0.2", diff --git a/src/api/audit.ts b/src/api/audit.ts index fbb3639b..0fef0a0a 100644 --- a/src/api/audit.ts +++ b/src/api/audit.ts @@ -45,7 +45,7 @@ export class Audit { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getAuditRecords' }); + return this.client.sendRequest(config, callback); } /** @@ -87,7 +87,7 @@ export class Audit { }, }; - return this.client.sendRequest(config, callback, { methodName: 'createAuditRecord' }); + return this.client.sendRequest(config, callback); } /** @@ -120,7 +120,7 @@ export class Audit { }, }; - return this.client.sendRequest(config, callback, { methodName: 'exportAuditRecords' }); + return this.client.sendRequest(config, callback); } /** @@ -143,7 +143,7 @@ export class Audit { method: 'GET', }; - return this.client.sendRequest(config, callback, { methodName: 'getRetentionPeriod' }); + return this.client.sendRequest(config, callback); } /** @@ -177,7 +177,7 @@ export class Audit { }, }; - return this.client.sendRequest(config, callback, { methodName: 'setRetentionPeriod' }); + return this.client.sendRequest(config, callback); } /** @@ -224,6 +224,6 @@ export class Audit { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getAuditRecordsForTimePeriod' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/content.ts b/src/api/content.ts index 11e79f5d..9b5d331c 100644 --- a/src/api/content.ts +++ b/src/api/content.ts @@ -49,7 +49,7 @@ export class Content { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getContent' }); + return this.client.sendRequest(config, callback); } /** @@ -99,7 +99,7 @@ export class Content { }, }; - return this.client.sendRequest(config, callback, { methodName: 'createContent' }); + return this.client.sendRequest(config, callback); } /** @@ -138,7 +138,7 @@ export class Content { }, }; - return this.client.sendRequest(config, callback, { methodName: 'archivePages' }); + return this.client.sendRequest(config, callback); } /** @@ -185,7 +185,7 @@ export class Content { }, }; - return this.client.sendRequest(config, callback, { methodName: 'publishLegacyDraft' }); + return this.client.sendRequest(config, callback); } /** @@ -230,7 +230,7 @@ export class Content { }, }; - return this.client.sendRequest(config, callback, { methodName: 'publishSharedDraft' }); + return this.client.sendRequest(config, callback); } /** @@ -286,7 +286,7 @@ export class Content { }, }; - return this.client.sendRequest(config, callback, { methodName: 'searchContentByCQL' }); + return this.client.sendRequest(config, callback); } /** @@ -323,7 +323,7 @@ export class Content { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getContentById' }); + return this.client.sendRequest(config, callback); } /** @@ -365,7 +365,7 @@ export class Content { }, }; - return this.client.sendRequest(config, callback, { methodName: 'updateContent' }); + return this.client.sendRequest(config, callback); } /** @@ -401,7 +401,7 @@ export class Content { }, }; - return this.client.sendRequest(config, callback, { methodName: 'deleteContent' }); + return this.client.sendRequest(config, callback); } /** @@ -434,6 +434,6 @@ export class Content { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getHistoryForContent' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/contentAttachments.ts b/src/api/contentAttachments.ts index 5d2021a5..2fe02785 100644 --- a/src/api/contentAttachments.ts +++ b/src/api/contentAttachments.ts @@ -44,7 +44,7 @@ export class ContentAttachments { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getAttachments' }); + return this.client.sendRequest(config, callback); } /** @@ -136,7 +136,7 @@ export class ContentAttachments { }, }; - return this.client.sendRequest(config, callback, { methodName: 'createAttachments' }); + return this.client.sendRequest(config, callback); } /** @@ -230,7 +230,7 @@ export class ContentAttachments { }, }; - return this.client.sendRequest(config, callback, { methodName: 'createOrUpdateAttachments' }); + return this.client.sendRequest(config, callback); } /** @@ -263,7 +263,7 @@ export class ContentAttachments { data: parameters.body, }; - return this.client.sendRequest(config, callback, { methodName: 'updateAttachmentProperties' }); + return this.client.sendRequest(config, callback); } /** @@ -358,7 +358,7 @@ export class ContentAttachments { }, }; - return this.client.sendRequest(config, callback, { methodName: 'updateAttachmentData' }); + return this.client.sendRequest(config, callback); } /** Redirects the client to a URL that serves an attachment's binary data. */ @@ -381,6 +381,6 @@ export class ContentAttachments { }, }; - return this.client.sendRequest(config, callback, { methodName: 'downloadAttachment' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/contentBody.ts b/src/api/contentBody.ts index 4a278cfc..3d1f6d2c 100644 --- a/src/api/contentBody.ts +++ b/src/api/contentBody.ts @@ -61,6 +61,6 @@ export class ContentBody { }, }; - return this.client.sendRequest(config, callback, { methodName: 'convertContentBody' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/contentChildrenAndDescendants.ts b/src/api/contentChildrenAndDescendants.ts index a8c7196a..52850405 100644 --- a/src/api/contentChildrenAndDescendants.ts +++ b/src/api/contentChildrenAndDescendants.ts @@ -64,7 +64,7 @@ export class ContentChildrenAndDescendants { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getContentChildren' }); + return this.client.sendRequest(config, callback); } /** @@ -97,7 +97,7 @@ export class ContentChildrenAndDescendants { method: 'PUT', }; - return this.client.sendRequest(config, callback, { methodName: 'movePage' }); + return this.client.sendRequest(config, callback); } /** @@ -156,7 +156,7 @@ export class ContentChildrenAndDescendants { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getContentChildrenByType' }); + return this.client.sendRequest(config, callback); } /** @@ -215,7 +215,7 @@ export class ContentChildrenAndDescendants { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getContentDescendants' }); + return this.client.sendRequest(config, callback); } /** @deprecated This API will be removed in the next major version. Use `getDescendantsOfType` method instead. */ @@ -292,7 +292,7 @@ export class ContentChildrenAndDescendants { }, }; - return this.client.sendRequest(config, callback, { methodName: 'descendantsOfType' }); + return this.client.sendRequest(config, callback); } /** @@ -329,7 +329,7 @@ export class ContentChildrenAndDescendants { }, }; - return this.client.sendRequest(config, callback, { methodName: 'copyPageHierarchy' }); + return this.client.sendRequest(config, callback); } /** @@ -372,6 +372,6 @@ export class ContentChildrenAndDescendants { data: parameters.bodyParameters, }; - return this.client.sendRequest(config, callback, { methodName: 'copyPage' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/contentComments.ts b/src/api/contentComments.ts index ddb28f7b..6bdd9b65 100644 --- a/src/api/contentComments.ts +++ b/src/api/contentComments.ts @@ -43,6 +43,6 @@ export class ContentComments { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getContentComments' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/contentLabels.ts b/src/api/contentLabels.ts index 68ffdf1a..193d5a19 100644 --- a/src/api/contentLabels.ts +++ b/src/api/contentLabels.ts @@ -41,7 +41,7 @@ export class ContentLabels { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getLabelsForContent' }); + return this.client.sendRequest(config, callback); } /** @@ -87,7 +87,7 @@ export class ContentLabels { data: parameters.body, }; - return this.client.sendRequest(config, callback, { methodName: 'addLabelsToContent' }); + return this.client.sendRequest(config, callback); } /** @@ -128,7 +128,7 @@ export class ContentLabels { }, }; - return this.client.sendRequest(config, callback, { methodName: 'removeLabelFromContentUsingQueryParameter' }); + return this.client.sendRequest(config, callback); } /** @@ -165,6 +165,6 @@ export class ContentLabels { method: 'DELETE', }; - return this.client.sendRequest(config, callback, { methodName: 'removeLabelFromContent' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/contentMacroBody.ts b/src/api/contentMacroBody.ts index 4d639c61..a342f6e4 100644 --- a/src/api/contentMacroBody.ts +++ b/src/api/contentMacroBody.ts @@ -54,6 +54,6 @@ export class ContentMacroBody { method: 'GET', }; - return this.client.sendRequest(config, callback, { methodName: 'getMacroBodyByMacroId' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/contentPermissions.ts b/src/api/contentPermissions.ts index 7e7bfbf0..9ad3b976 100644 --- a/src/api/contentPermissions.ts +++ b/src/api/contentPermissions.ts @@ -73,6 +73,6 @@ export class ContentPermissions { }, }; - return this.client.sendRequest(config, callback, { methodName: 'checkContentPermission' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/contentProperties.ts b/src/api/contentProperties.ts index 360b9b0c..da781d10 100644 --- a/src/api/contentProperties.ts +++ b/src/api/contentProperties.ts @@ -44,7 +44,7 @@ export class ContentProperties { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getContentProperties' }); + return this.client.sendRequest(config, callback); } /** @@ -92,7 +92,7 @@ export class ContentProperties { }, }; - return this.client.sendRequest(config, callback, { methodName: 'createContentProperty' }); + return this.client.sendRequest(config, callback); } /** @@ -130,7 +130,7 @@ export class ContentProperties { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getContentProperty' }); + return this.client.sendRequest(config, callback); } /** @@ -177,7 +177,7 @@ export class ContentProperties { }, }; - return this.client.sendRequest(config, callback, { methodName: 'createContentPropertyForKey' }); + return this.client.sendRequest(config, callback); } /** @@ -215,7 +215,7 @@ export class ContentProperties { }, }; - return this.client.sendRequest(config, callback, { methodName: 'updateContentProperty' }); + return this.client.sendRequest(config, callback); } /** @@ -244,6 +244,6 @@ export class ContentProperties { method: 'DELETE', }; - return this.client.sendRequest(config, callback, { methodName: 'deleteContentProperty' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/contentRestrictions.ts b/src/api/contentRestrictions.ts index 1361572e..aeec2f3e 100644 --- a/src/api/contentRestrictions.ts +++ b/src/api/contentRestrictions.ts @@ -39,7 +39,7 @@ export class ContentRestrictions { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getRestrictions' }); + return this.client.sendRequest(config, callback); } /** @@ -73,7 +73,7 @@ export class ContentRestrictions { data: parameters.body, }; - return this.client.sendRequest(config, callback, { methodName: 'addRestrictions' }); + return this.client.sendRequest(config, callback); } /** @@ -109,7 +109,7 @@ export class ContentRestrictions { data: parameters.body, }; - return this.client.sendRequest(config, callback, { methodName: 'updateRestrictions' }); + return this.client.sendRequest(config, callback); } /** @@ -142,7 +142,7 @@ export class ContentRestrictions { }, }; - return this.client.sendRequest(config, callback, { methodName: 'deleteRestrictions' }); + return this.client.sendRequest(config, callback); } /** @@ -179,7 +179,7 @@ export class ContentRestrictions { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getRestrictionsByOperation' }); + return this.client.sendRequest(config, callback); } /** @@ -214,7 +214,7 @@ export class ContentRestrictions { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getRestrictionsForOperation' }); + return this.client.sendRequest(config, callback); } /** @@ -258,7 +258,7 @@ export class ContentRestrictions { method: 'GET', }; - return this.client.sendRequest(config, callback, { methodName: 'getContentRestrictionStatusForGroup' }); + return this.client.sendRequest(config, callback); } /** @@ -288,7 +288,7 @@ export class ContentRestrictions { method: 'PUT', }; - return this.client.sendRequest(config, callback, { methodName: 'addGroupToContentRestriction' }); + return this.client.sendRequest(config, callback); } /** @@ -312,7 +312,7 @@ export class ContentRestrictions { method: 'DELETE', }; - return this.client.sendRequest(config, callback, { methodName: 'removeGroupByName' }); + return this.client.sendRequest(config, callback); } /** @@ -356,7 +356,7 @@ export class ContentRestrictions { method: 'GET', }; - return this.client.sendRequest(config, callback, { methodName: 'getIndividualGroupRestrictionStatusByGroupId' }); + return this.client.sendRequest(config, callback); } /** @@ -388,7 +388,7 @@ export class ContentRestrictions { method: 'PUT', }; - return this.client.sendRequest(config, callback, { methodName: 'addGroupToContentRestrictionByGroupId' }); + return this.client.sendRequest(config, callback); } /** @@ -412,7 +412,7 @@ export class ContentRestrictions { method: 'DELETE', }; - return this.client.sendRequest(config, callback, { methodName: 'removeGroupById' }); + return this.client.sendRequest(config, callback); } /** @@ -463,7 +463,7 @@ export class ContentRestrictions { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getContentRestrictionStatusForUser' }); + return this.client.sendRequest(config, callback); } /** @@ -498,7 +498,7 @@ export class ContentRestrictions { }, }; - return this.client.sendRequest(config, callback, { methodName: 'addUserToContentRestriction' }); + return this.client.sendRequest(config, callback); } /** @@ -533,6 +533,6 @@ export class ContentRestrictions { }, }; - return this.client.sendRequest(config, callback, { methodName: 'removeUserFromContentRestriction' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/contentVersions.ts b/src/api/contentVersions.ts index 364b0102..659863d1 100644 --- a/src/api/contentVersions.ts +++ b/src/api/contentVersions.ts @@ -41,7 +41,7 @@ export class ContentVersions { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getContentVersions' }); + return this.client.sendRequest(config, callback); } /** @@ -80,7 +80,7 @@ export class ContentVersions { }, }; - return this.client.sendRequest(config, callback, { methodName: 'restoreContentVersion' }); + return this.client.sendRequest(config, callback); } /** @@ -112,7 +112,7 @@ export class ContentVersions { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getContentVersion' }); + return this.client.sendRequest(config, callback); } /** @@ -141,6 +141,6 @@ export class ContentVersions { method: 'DELETE', }; - return this.client.sendRequest(config, callback, { methodName: 'deleteContentVersion' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/contentWatches.ts b/src/api/contentWatches.ts index 55dd8144..f2047687 100644 --- a/src/api/contentWatches.ts +++ b/src/api/contentWatches.ts @@ -52,7 +52,7 @@ export class ContentWatches { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getWatchesForPage' }); + return this.client.sendRequest(config, callback); } /** @@ -102,7 +102,7 @@ export class ContentWatches { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getWatchesForSpace' }); + return this.client.sendRequest(config, callback); } /** Returns a list of watchers of a space */ @@ -128,7 +128,7 @@ export class ContentWatches { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getWatchersForSpace' }); + return this.client.sendRequest(config, callback); } /** @@ -171,7 +171,7 @@ export class ContentWatches { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getContentWatchStatus' }); + return this.client.sendRequest(config, callback); } /** @@ -212,7 +212,7 @@ export class ContentWatches { }, }; - return this.client.sendRequest(config, callback, { methodName: 'addContentWatcher' }); + return this.client.sendRequest(config, callback); } /** @@ -255,7 +255,7 @@ export class ContentWatches { }, }; - return this.client.sendRequest(config, callback, { methodName: 'removeContentWatcher' }); + return this.client.sendRequest(config, callback); } /** @@ -295,7 +295,7 @@ export class ContentWatches { }, }; - return this.client.sendRequest(config, callback, { methodName: 'isWatchingLabel' }); + return this.client.sendRequest(config, callback); } /** @@ -336,7 +336,7 @@ export class ContentWatches { }, }; - return this.client.sendRequest(config, callback, { methodName: 'addLabelWatcher' }); + return this.client.sendRequest(config, callback); } /** @@ -373,7 +373,7 @@ export class ContentWatches { }, }; - return this.client.sendRequest(config, callback, { methodName: 'removeLabelWatcher' }); + return this.client.sendRequest(config, callback); } /** @@ -413,7 +413,7 @@ export class ContentWatches { }, }; - return this.client.sendRequest(config, callback, { methodName: 'isWatchingSpace' }); + return this.client.sendRequest(config, callback); } /** @@ -454,7 +454,7 @@ export class ContentWatches { }, }; - return this.client.sendRequest(config, callback, { methodName: 'addSpaceWatcher' }); + return this.client.sendRequest(config, callback); } /** @@ -488,6 +488,6 @@ export class ContentWatches { }, }; - return this.client.sendRequest(config, callback, { methodName: 'removeSpaceWatch' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/dynamicModules.ts b/src/api/dynamicModules.ts index 62eb4d7c..d4c68f7b 100644 --- a/src/api/dynamicModules.ts +++ b/src/api/dynamicModules.ts @@ -24,7 +24,7 @@ export class DynamicModules { method: 'GET', }; - return this.client.sendRequest(config, callback, { methodName: 'getModules' }); + return this.client.sendRequest(config, callback); } /** @@ -53,7 +53,7 @@ export class DynamicModules { method: 'POST', }; - return this.client.sendRequest(config, callback, { methodName: 'registerModules' }); + return this.client.sendRequest(config, callback); } /** @@ -77,6 +77,6 @@ export class DynamicModules { }, }; - return this.client.sendRequest(config, callback, { methodName: 'removeModules' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/experimental.ts b/src/api/experimental.ts index 8f307c94..66bff51f 100644 --- a/src/api/experimental.ts +++ b/src/api/experimental.ts @@ -37,7 +37,7 @@ export class Experimental { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getLabelsForSpace' }); + return this.client.sendRequest(config, callback); } /** @@ -76,7 +76,7 @@ export class Experimental { method: 'POST', }; - return this.client.sendRequest(config, callback, { methodName: 'addLabelsToSpace' }); + return this.client.sendRequest(config, callback); } async deleteLabelFromSpace( @@ -97,7 +97,7 @@ export class Experimental { }, }; - return this.client.sendRequest(config, callback, { methodName: 'deleteLabelFromSpace' }); + return this.client.sendRequest(config, callback); } /** Get the total number of views a piece of content has. */ @@ -113,7 +113,7 @@ export class Experimental { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getViews' }); + return this.client.sendRequest(config, callback); } /** Get the total number of distinct viewers a piece of content has. */ @@ -132,6 +132,6 @@ export class Experimental { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getViewers' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/group.ts b/src/api/group.ts index 1bedb539..9a7340a1 100644 --- a/src/api/group.ts +++ b/src/api/group.ts @@ -38,7 +38,7 @@ export class Group { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getGroups' }); + return this.client.sendRequest(config, callback); } /** @@ -65,7 +65,7 @@ export class Group { }, }; - return this.client.sendRequest(config, callback, { methodName: 'createGroup' }); + return this.client.sendRequest(config, callback); } /** @@ -89,7 +89,7 @@ export class Group { }, }; - return this.client.sendRequest(config, callback, { methodName: 'removeGroup' }); + return this.client.sendRequest(config, callback); } /** @@ -124,7 +124,7 @@ export class Group { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getGroupByQueryParam' }); + return this.client.sendRequest(config, callback); } /** @@ -156,7 +156,7 @@ export class Group { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getGroupByGroupId' }); + return this.client.sendRequest(config, callback); } /** @@ -180,7 +180,7 @@ export class Group { }, }; - return this.client.sendRequest(config, callback, { methodName: 'removeGroupById' }); + return this.client.sendRequest(config, callback); } /** @deprecated Will be removed in the next major version. Use `getGroupByName` instead. */ @@ -190,6 +190,7 @@ export class Group { async getGroup(parameters: Parameters.GetGroup, callback?: Callback): Promise { return this.getGroupByName(parameters, callback!); } + /** * Returns a user group for a given group name. * @@ -217,7 +218,7 @@ export class Group { method: 'GET', }; - return this.client.sendRequest(config, callback, { methodName: 'getGroupByName' }); + return this.client.sendRequest(config, callback); } /** @@ -254,7 +255,7 @@ export class Group { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getMembersByQueryParam' }); + return this.client.sendRequest(config, callback); } /** @@ -291,7 +292,7 @@ export class Group { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getGroupMembers' }); + return this.client.sendRequest(config, callback); } /** @deprecated Will be removed in the next major version. Use `searchGroups` instead. */ @@ -332,7 +333,7 @@ export class Group { }, }; - return this.client.sendRequest(config, callback, { methodName: 'searchGroups' }); + return this.client.sendRequest(config, callback); } /** @@ -368,7 +369,7 @@ export class Group { }, }; - return this.client.sendRequest(config, callback, { methodName: 'addUserToGroupByGroupId' }); + return this.client.sendRequest(config, callback); } /** @@ -402,7 +403,7 @@ export class Group { }, }; - return this.client.sendRequest(config, callback, { methodName: 'removeMemberFromGroupByGroupId' }); + return this.client.sendRequest(config, callback); } /** @@ -442,7 +443,7 @@ export class Group { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getGroupMembersByGroupId' }); + return this.client.sendRequest(config, callback); } /** @@ -469,7 +470,7 @@ export class Group { }, }; - return this.client.sendRequest(config, callback, { methodName: 'addUserToGroup' }); + return this.client.sendRequest(config, callback); } /** @@ -500,6 +501,6 @@ export class Group { }, }; - return this.client.sendRequest(config, callback, { methodName: 'removeMemberFromGroup' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/inlineTasks.ts b/src/api/inlineTasks.ts index 3675b0af..5b7e2a83 100644 --- a/src/api/inlineTasks.ts +++ b/src/api/inlineTasks.ts @@ -49,7 +49,7 @@ export class InlineTasks { }, }; - return this.client.sendRequest(config, callback, { methodName: 'searchTasks' }); + return this.client.sendRequest(config, callback); } /** @@ -72,7 +72,7 @@ export class InlineTasks { method: 'GET', }; - return this.client.sendRequest(config, callback, { methodName: 'getTaskById' }); + return this.client.sendRequest(config, callback); } /** @@ -101,6 +101,6 @@ export class InlineTasks { }, }; - return this.client.sendRequest(config, callback, { methodName: 'updateTaskById' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/labelInfo.ts b/src/api/labelInfo.ts index b689cabe..758b7ff8 100644 --- a/src/api/labelInfo.ts +++ b/src/api/labelInfo.ts @@ -42,6 +42,6 @@ export class LabelInfo { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getAllLabelContent' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/longRunningTask.ts b/src/api/longRunningTask.ts index 60b3055c..615f50c6 100644 --- a/src/api/longRunningTask.ts +++ b/src/api/longRunningTask.ts @@ -39,7 +39,7 @@ export class LongRunningTask { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getTasks' }); + return this.client.sendRequest(config, callback); } /** @@ -70,6 +70,6 @@ export class LongRunningTask { method: 'GET', }; - return this.client.sendRequest(config, callback, { methodName: 'getTask' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/relation.ts b/src/api/relation.ts index 20551352..d6866a02 100644 --- a/src/api/relation.ts +++ b/src/api/relation.ts @@ -53,7 +53,7 @@ export class Relation { }, }; - return this.client.sendRequest(config, callback, { methodName: 'findTargetFromSource' }); + return this.client.sendRequest(config, callback); } /** @deprecated Will be removed in the next major version. Use `getRelationship` instead. */ @@ -113,7 +113,7 @@ export class Relation { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getRelationship' }); + return this.client.sendRequest(config, callback); } /** @@ -159,7 +159,7 @@ export class Relation { }, }; - return this.client.sendRequest(config, callback, { methodName: 'createRelationship' }); + return this.client.sendRequest(config, callback); } /** @deprecated Will be removed in the next major version. Use `deleteRelationship` instead. */ @@ -201,7 +201,7 @@ export class Relation { }, }; - return this.client.sendRequest(config, callback, { methodName: 'deleteRelationship' }); + return this.client.sendRequest(config, callback); } /** @@ -252,6 +252,6 @@ export class Relation { }, }; - return this.client.sendRequest(config, callback, { methodName: 'findSourcesForTarget' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/search.ts b/src/api/search.ts index d2d11caa..27765e2f 100644 --- a/src/api/search.ts +++ b/src/api/search.ts @@ -74,7 +74,7 @@ export class Search { }, }; - return this.client.sendRequest(config, callback, { methodName: 'searchByCQL' }); + return this.client.sendRequest(config, callback); } /** @deprecated Will be removed in the next major version. Use `searchUser` instead. */ @@ -93,12 +93,13 @@ export class Search { ): Promise { return this.searchUser(parameters, callback!); } + /** * Searches for users using user-specific queries from the [Confluence Query Language * (CQL)](https://developer.atlassian.com/cloud/confluence/advanced-searching-using-cql/). * * Note that some user fields may be set to null depending on the user's privacy settings. These are: email, - * profilePicture, and displayName. + * profilePicture, displayName, and timeZone. */ async searchUser( parameters: Parameters.SearchUser, @@ -109,7 +110,7 @@ export class Search { * (CQL)](https://developer.atlassian.com/cloud/confluence/advanced-searching-using-cql/). * * Note that some user fields may be set to null depending on the user's privacy settings. These are: email, - * profilePicture, and displayName. + * profilePicture, displayName, and timeZone. */ async searchUser( parameters: Parameters.SearchUser, @@ -126,9 +127,10 @@ export class Search { cql: parameters.cql, start: parameters.start, limit: parameters.limit, + expand: parameters.expand, }, }; - return this.client.sendRequest(config, callback, { methodName: 'searchUser' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/settings.ts b/src/api/settings.ts index e4e445a7..09b3a44f 100644 --- a/src/api/settings.ts +++ b/src/api/settings.ts @@ -43,7 +43,7 @@ export class Settings { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getLookAndFeelSettings' }); + return this.client.sendRequest(config, callback); } /** @@ -81,7 +81,7 @@ export class Settings { }, }; - return this.client.sendRequest(config, callback, { methodName: 'updateLookAndFeel' }); + return this.client.sendRequest(config, callback); } /** @@ -133,7 +133,7 @@ export class Settings { }, }; - return this.client.sendRequest(config, callback, { methodName: 'updateLookAndFeelSettings' }); + return this.client.sendRequest(config, callback); } /** @@ -170,7 +170,7 @@ export class Settings { }, }; - return this.client.sendRequest(config, callback, { methodName: 'resetLookAndFeelSettings' }); + return this.client.sendRequest(config, callback); } /** @@ -205,7 +205,7 @@ export class Settings { }, }; - return this.client.sendRequest(config, callback, { methodName: 'setLookAndFeelSettings' }); + return this.client.sendRequest(config, callback); } /** @@ -228,6 +228,6 @@ export class Settings { method: 'GET', }; - return this.client.sendRequest(config, callback, { methodName: 'getSystemInfo' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/space.ts b/src/api/space.ts index ba732bf8..ca474a2b 100644 --- a/src/api/space.ts +++ b/src/api/space.ts @@ -31,7 +31,7 @@ export class Space { url: '/api/space', method: 'GET', params: { - spaceKey: parameters?.spaceKey?.map((key, index) => index ? `&spaceKey=${key}` : key), + spaceKey: parameters?.spaceKey, spaceId: parameters?.spaceId, type: parameters?.type, status: parameters?.status, @@ -43,7 +43,7 @@ export class Space { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getSpaces' }); + return this.client.sendRequest(config, callback); } /** @@ -73,7 +73,7 @@ export class Space { }, }; - return this.client.sendRequest(config, callback, { methodName: 'createSpace' }); + return this.client.sendRequest(config, callback); } /** @@ -110,7 +110,7 @@ export class Space { }, }; - return this.client.sendRequest(config, callback, { methodName: 'createPrivateSpace' }); + return this.client.sendRequest(config, callback); } /** @@ -131,7 +131,7 @@ export class Space { method: 'GET', }; - return this.client.sendRequest(config, callback, { methodName: 'getSpace' }); + return this.client.sendRequest(config, callback); } /** @@ -165,7 +165,7 @@ export class Space { }, }; - return this.client.sendRequest(config, callback, { methodName: 'updateSpace' }); + return this.client.sendRequest(config, callback); } /** @@ -193,7 +193,7 @@ export class Space { method: 'DELETE', }; - return this.client.sendRequest(config, callback, { methodName: 'deleteSpace' }); + return this.client.sendRequest(config, callback); } /** @@ -232,7 +232,7 @@ export class Space { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getContentForSpace' }); + return this.client.sendRequest(config, callback); } /** @@ -269,6 +269,6 @@ export class Space { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getContentByTypeForSpace' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/spacePermissions.ts b/src/api/spacePermissions.ts index fead3d32..4e1ad2fd 100644 --- a/src/api/spacePermissions.ts +++ b/src/api/spacePermissions.ts @@ -61,7 +61,7 @@ export class SpacePermissions { }, }; - return this.client.sendRequest(config, callback, { methodName: 'addPermissionToSpace' }); + return this.client.sendRequest(config, callback); } /** @@ -103,7 +103,7 @@ export class SpacePermissions { }, }; - return this.client.sendRequest(config, callback, { methodName: 'addCustomContentPermissions' }); + return this.client.sendRequest(config, callback); } /** @@ -130,6 +130,6 @@ export class SpacePermissions { method: 'DELETE', }; - return this.client.sendRequest(config, callback, { methodName: 'removePermission' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/spaceProperties.ts b/src/api/spaceProperties.ts index 2757b267..f1a594aa 100644 --- a/src/api/spaceProperties.ts +++ b/src/api/spaceProperties.ts @@ -39,7 +39,7 @@ export class SpaceProperties { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getSpaceProperties' }); + return this.client.sendRequest(config, callback); } /** @@ -74,7 +74,7 @@ export class SpaceProperties { }, }; - return this.client.sendRequest(config, callback, { methodName: 'createSpaceProperty' }); + return this.client.sendRequest(config, callback); } /** @@ -107,7 +107,7 @@ export class SpaceProperties { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getSpaceProperty' }); + return this.client.sendRequest(config, callback); } /** @@ -142,7 +142,7 @@ export class SpaceProperties { }, }; - return this.client.sendRequest(config, callback, { methodName: 'createSpacePropertyForKey' }); + return this.client.sendRequest(config, callback); } /** @@ -176,7 +176,7 @@ export class SpaceProperties { }, }; - return this.client.sendRequest(config, callback, { methodName: 'updateSpaceProperty' }); + return this.client.sendRequest(config, callback); } /** @@ -200,6 +200,6 @@ export class SpaceProperties { method: 'DELETE', }; - return this.client.sendRequest(config, callback, { methodName: 'deleteSpaceProperty' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/spaceSettings.ts b/src/api/spaceSettings.ts index 405b5f14..f18b2683 100644 --- a/src/api/spaceSettings.ts +++ b/src/api/spaceSettings.ts @@ -34,7 +34,7 @@ export class SpaceSettings { method: 'GET', }; - return this.client.sendRequest(config, callback, { methodName: 'getSpaceSettings' }); + return this.client.sendRequest(config, callback); } /** @@ -67,6 +67,6 @@ export class SpaceSettings { }, }; - return this.client.sendRequest(config, callback, { methodName: 'updateSpaceSettings' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/template.ts b/src/api/template.ts index 7d182134..526960df 100644 --- a/src/api/template.ts +++ b/src/api/template.ts @@ -44,7 +44,7 @@ export class Template { }, }; - return this.client.sendRequest(config, callback, { methodName: 'createContentTemplate' }); + return this.client.sendRequest(config, callback); } /** @@ -85,7 +85,7 @@ export class Template { }, }; - return this.client.sendRequest(config, callback, { methodName: 'updateContentTemplate' }); + return this.client.sendRequest(config, callback); } /** @@ -133,7 +133,7 @@ export class Template { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getBlueprintTemplates' }); + return this.client.sendRequest(config, callback); } /** @@ -171,7 +171,7 @@ export class Template { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getContentTemplates' }); + return this.client.sendRequest(config, callback); } /** @@ -205,7 +205,7 @@ export class Template { method: 'GET', }; - return this.client.sendRequest(config, callback, { methodName: 'getContentTemplate' }); + return this.client.sendRequest(config, callback); } /** @@ -242,6 +242,6 @@ export class Template { method: 'DELETE', }; - return this.client.sendRequest(config, callback, { methodName: 'removeTemplate' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/themes.ts b/src/api/themes.ts index a713e144..4c506d09 100644 --- a/src/api/themes.ts +++ b/src/api/themes.ts @@ -32,7 +32,7 @@ export class Themes { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getThemes' }); + return this.client.sendRequest(config, callback); } /** @@ -53,7 +53,7 @@ export class Themes { method: 'GET', }; - return this.client.sendRequest(config, callback, { methodName: 'getGlobalTheme' }); + return this.client.sendRequest(config, callback); } /** @@ -74,7 +74,7 @@ export class Themes { method: 'GET', }; - return this.client.sendRequest(config, callback, { methodName: 'getTheme' }); + return this.client.sendRequest(config, callback); } /** @@ -100,7 +100,7 @@ export class Themes { method: 'GET', }; - return this.client.sendRequest(config, callback, { methodName: 'getSpaceTheme' }); + return this.client.sendRequest(config, callback); } /** @@ -129,7 +129,7 @@ export class Themes { }, }; - return this.client.sendRequest(config, callback, { methodName: 'setSpaceTheme' }); + return this.client.sendRequest(config, callback); } /** @@ -150,6 +150,6 @@ export class Themes { method: 'DELETE', }; - return this.client.sendRequest(config, callback, { methodName: 'resetSpaceTheme' }); + return this.client.sendRequest(config, callback); } } diff --git a/src/api/users.ts b/src/api/users.ts index e3fceece..0c867ac8 100644 --- a/src/api/users.ts +++ b/src/api/users.ts @@ -41,7 +41,7 @@ export class Users { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getUser' }); + return this.client.sendRequest(config, callback); } /** @@ -76,7 +76,7 @@ export class Users { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getAnonymousUser' }); + return this.client.sendRequest(config, callback); } /** @@ -110,7 +110,7 @@ export class Users { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getCurrentUser' }); + return this.client.sendRequest(config, callback); } /** @@ -149,7 +149,7 @@ export class Users { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getGroupMembershipsForUser' }); + return this.client.sendRequest(config, callback); } /** @@ -186,7 +186,7 @@ export class Users { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getBulkUserLookup' }); + return this.client.sendRequest(config, callback); } /** @@ -223,7 +223,7 @@ export class Users { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getPrivacyUnsafeUserEmail' }); + return this.client.sendRequest(config, callback); } /** @@ -266,7 +266,7 @@ export class Users { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getPrivacyUnsafeUserEmailBulk' }); + return this.client.sendRequest(config, callback); } /** @@ -306,6 +306,6 @@ export class Users { }, }; - return this.client.sendRequest(config, callback, { methodName: 'getBulkUserMigration' }); + return this.client.sendRequest(config, callback); } } From f5c67f95bc566b355456d25437d47d3625dc23ae Mon Sep 17 00:00:00 2001 From: Vladislav Tupikin Date: Fri, 10 Dec 2021 16:24:35 +0300 Subject: [PATCH 2/5] #14 bugfix --- src/api/space.ts | 2 +- src/clients/baseClient.ts | 8 ++++++-- tests/unit/api/space.test.ts | 14 +++++++++++--- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/api/space.ts b/src/api/space.ts index ca474a2b..39504551 100644 --- a/src/api/space.ts +++ b/src/api/space.ts @@ -31,7 +31,7 @@ export class Space { url: '/api/space', method: 'GET', params: { - spaceKey: parameters?.spaceKey, + spaceKey: () => parameters?.spaceKey?.map((key) => `spaceKey=${key}`).join('&'), spaceId: parameters?.spaceId, type: parameters?.type, status: parameters?.status, diff --git a/src/clients/baseClient.ts b/src/clients/baseClient.ts index d1878590..20cb8d80 100644 --- a/src/clients/baseClient.ts +++ b/src/clients/baseClient.ts @@ -20,7 +20,7 @@ export class BaseClient implements Client { Object.entries(parameters).forEach(([key, value]) => { if (value === null || typeof value === 'undefined') { - return undefined; + return; } if (Array.isArray(value)) { @@ -34,11 +34,15 @@ export class BaseClient implements Client { } else if (value !== null && typeof value === 'object') { // eslint-disable-next-line no-param-reassign value = JSON.stringify(value); + } else if (value instanceof Function) { + const part = value(); + + return part && parts.push(part); } parts.push(`${this.encode(key)}=${this.encode(value)}`); - return undefined; + return; }); return parts.join('&'); diff --git a/tests/unit/api/space.test.ts b/tests/unit/api/space.test.ts index db9a6e99..9d4a0de0 100644 --- a/tests/unit/api/space.test.ts +++ b/tests/unit/api/space.test.ts @@ -12,12 +12,20 @@ describe('Space', () => { }); describe('getSpaces should generate correct URL', () => { + it('when spaceKey is not provided', () => { + space.getSpaces({}); + + const callArgument = sendRequestStub.lastCall.args[0]; + + expect(callArgument.params.spaceKey()).toBe(undefined); + }); + it('when spaceKey is empty array', () => { space.getSpaces({ spaceKey: [] }); const callArgument = sendRequestStub.lastCall.args[0]; - expect(callArgument.params.spaceKey).toEqual([]); + expect(callArgument.params.spaceKey()).toBe(''); }); it('when spaceKey has one key', () => { @@ -25,7 +33,7 @@ describe('Space', () => { const callArgument = sendRequestStub.lastCall.args[0]; - expect(callArgument.params.spaceKey).toEqual(['KEY1']); + expect(callArgument.params.spaceKey()).toBe('spaceKey=KEY1'); }); it('when spaceKey has multiple keys', () => { @@ -33,7 +41,7 @@ describe('Space', () => { const callArgument = sendRequestStub.lastCall.args[0]; - expect(callArgument.params.spaceKey).toEqual(['KEY1', '&spaceKey=KEY2']); + expect(callArgument.params.spaceKey()).toBe('spaceKey=KEY1&spaceKey=KEY2'); }); }); }); From 909038434bfcc2898492516b708d81d6e58a07b0 Mon Sep 17 00:00:00 2001 From: Vladislav Tupikin Date: Tue, 29 Mar 2022 13:40:00 +0400 Subject: [PATCH 3/5] deps update and lint fixes --- .eslintrc | 18 +- README.md | 14 + package-lock.json | 4179 +++++------------ package.json | 54 +- src/api/audit.ts | 2 +- src/api/content.ts | 2 +- src/api/contentAttachments.ts | 2 +- src/api/contentBody.ts | 2 +- src/api/contentChildrenAndDescendants.ts | 2 +- src/api/contentComments.ts | 2 +- src/api/contentLabels.ts | 2 +- src/api/contentMacroBody.ts | 2 +- src/api/contentPermissions.ts | 2 +- src/api/contentProperties.ts | 2 +- src/api/contentRestrictions.ts | 2 +- src/api/contentVersions.ts | 2 +- src/api/contentWatches.ts | 2 +- src/api/dynamicModules.ts | 2 +- src/api/experimental.ts | 2 +- src/api/group.ts | 2 +- src/api/inlineTasks.ts | 2 +- src/api/labelInfo.ts | 2 +- src/api/longRunningTask.ts | 2 +- src/api/models/blueprintTemplate.ts | 2 +- src/api/models/bulkUserLookup.ts | 4 +- src/api/models/content.ts | 12 +- src/api/models/contentHistory.ts | 4 +- src/api/models/contentLookAndFeel.ts | 2 +- src/api/models/contentMetadata.ts | 2 +- src/api/models/contentRestriction.ts | 4 +- src/api/models/contentTemplate.ts | 2 +- src/api/models/copyPageRequest.ts | 2 +- src/api/models/horizontalHeaderLookAndFeel.ts | 2 +- src/api/models/labelArray.ts | 2 +- src/api/models/longTaskStatusArray.ts | 2 +- src/api/models/lookAndFeel.ts | 4 +- src/api/models/migratedUserArray.ts | 2 +- src/api/models/relation.ts | 2 +- src/api/models/relationArray.ts | 2 +- .../models/searchPageResponseSearchResult.ts | 2 +- src/api/models/searchResult.ts | 4 +- src/api/models/space.ts | 8 +- src/api/models/spaceArray.ts | 2 +- src/api/models/spacePermission.ts | 2 +- src/api/models/spacePermissionCreate.ts | 2 +- src/api/models/spacePermissionRequest.ts | 2 +- src/api/models/spacePermissionV2.ts | 2 +- src/api/models/spacePropertyArray.ts | 2 +- src/api/models/spaceWatchArray.ts | 2 +- src/api/models/themeArray.ts | 2 +- src/api/models/user.ts | 4 +- src/api/models/userAnonymous.ts | 2 +- src/api/models/usersUserKeys.ts | 2 +- src/api/models/version.ts | 4 +- src/api/models/versionArray.ts | 2 +- src/api/models/watchArray.ts | 2 +- src/api/relation.ts | 2 +- src/api/search.ts | 2 +- src/api/settings.ts | 2 +- src/api/space.ts | 5 +- src/api/spacePermissions.ts | 2 +- src/api/spaceProperties.ts | 2 +- src/api/spaceSettings.ts | 2 +- src/api/template.ts | 2 +- src/api/themes.ts | 2 +- src/api/users.ts | 2 +- src/clients/baseClient.ts | 6 +- src/config.ts | 8 +- src/paramSerializer.ts | 15 + src/server/audit.ts | 4 +- src/server/content.ts | 4 +- src/server/contentBody.ts | 2 +- src/server/group.ts | 4 +- src/server/longTask.ts | 4 +- src/server/models/content.ts | 12 +- src/server/models/contentChildren.ts | 2 +- src/server/models/contentHistory.ts | 4 +- src/server/models/contentLookAndFeel.ts | 2 +- src/server/models/contentRestriction.ts | 4 +- src/server/models/lookAndFeel.ts | 4 +- src/server/models/searchResult.ts | 4 +- src/server/models/space.ts | 6 +- src/server/models/spacePermission.ts | 2 +- src/server/models/user.ts | 2 +- src/server/models/version.ts | 2 +- src/server/search.ts | 4 +- src/server/space.ts | 4 +- src/server/user.ts | 4 +- .../authenticationService.ts | 5 + .../createBasicAuthenticationToken.ts | 2 +- .../createPATAuthenticationToken.ts | 5 + .../authentications/index.ts | 1 + tests/e2e/pageCreating.test.ts | 95 +- tests/setup.ts | 3 - tests/unit/api/space.test.ts | 62 +- tests/unit/index.test.ts | 75 +- tests/unit/serverApiClient.test.ts | 23 +- tsconfig.lint.json | 7 + tsconfig.tests.json | 14 - 99 files changed, 1617 insertions(+), 3200 deletions(-) create mode 100644 src/paramSerializer.ts create mode 100644 src/services/authenticationService/authentications/createPATAuthenticationToken.ts delete mode 100644 tests/setup.ts create mode 100644 tsconfig.lint.json delete mode 100644 tsconfig.tests.json diff --git a/.eslintrc b/.eslintrc index 02e98f48..844b2c40 100644 --- a/.eslintrc +++ b/.eslintrc @@ -6,7 +6,7 @@ "parserOptions": { "ecmaVersion": 2018, "sourceType": "module", - "project": "./tsconfig.tests.json" + "project": "./tsconfig.lint.json" }, "plugins": [ "import" @@ -24,6 +24,22 @@ "import/no-cycle": "off", "no-underscore-dangle": "off", "lines-between-class-members": "off", + "eol-last": "error", + "sort-imports": [ + "error", + { + "ignoreCase": true, + "ignoreDeclarationSort": false, + "ignoreMemberSort": false, + "memberSyntaxSortOrder": [ + "all", + "single", + "multiple", + "none" + ], + "allowSeparatedGroups": false + } + ], "padding-line-between-statements": [ "error", { diff --git a/README.md b/README.md index 10d12df0..5cef009c 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ Usability, consistency, and performance are key focuses of confluence.js, and it - [Basic](#basic-authenticationhttpsdeveloperatlassiancomcloudconfluencebasic-auth-for-rest-apis) - [OAuth 2.0](#oauth-20httpsdeveloperatlassiancomcloudconfluenceoauth-2-3lo-apps) - [JWT](#jwthttpsdeveloperatlassiancomcloudconfluenceunderstanding-jwt) + - [Personal access token](#personal-access-token) - [Your first request and using algorithm](#your-first-request-and-using-algorithm) - [Decreasing Webpack bundle size](#decreasing-webpack-bundle-size) - [Take a look at our other products](#take-a-look-at-our-other-products) @@ -122,6 +123,19 @@ const client = new ConfluenceClient({ }); ``` +##### [Personal access token](https://confluence.atlassian.com/enterprise/using-personal-access-tokens-1026032365.html) + +```typescript +import { ConfluenceClient } from 'confluence.js'; + +const client = new ConfluenceClient({ + host: 'https://your-domain.atlassian.net', + authentication: { + personalAccessToken: 'secrectPAT', + }, +}); +``` + #### Your first request and using algorithm ```typescript diff --git a/package-lock.json b/package-lock.json index 210a024c..845e868c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,819 +4,71 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@babel/code-frame": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz", - "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==", - "dev": true, - "requires": { - "@babel/highlight": "^7.16.0" - } - }, - "@babel/compat-data": { - "version": "7.16.4", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz", - "integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==", - "dev": true - }, - "@babel/core": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.0.tgz", - "integrity": "sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.16.0", - "@babel/generator": "^7.16.0", - "@babel/helper-compilation-targets": "^7.16.0", - "@babel/helper-module-transforms": "^7.16.0", - "@babel/helpers": "^7.16.0", - "@babel/parser": "^7.16.0", - "@babel/template": "^7.16.0", - "@babel/traverse": "^7.16.0", - "@babel/types": "^7.16.0", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.1.2", - "semver": "^6.3.0", - "source-map": "^0.5.0" - }, - "dependencies": { - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "@babel/generator": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.0.tgz", - "integrity": "sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==", - "dev": true, - "requires": { - "@babel/types": "^7.16.0", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "@babel/helper-compilation-targets": { - "version": "7.16.3", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz", - "integrity": "sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.16.0", - "@babel/helper-validator-option": "^7.14.5", - "browserslist": "^4.17.5", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "@babel/helper-function-name": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz", - "integrity": "sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.16.0", - "@babel/template": "^7.16.0", - "@babel/types": "^7.16.0" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz", - "integrity": "sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==", - "dev": true, - "requires": { - "@babel/types": "^7.16.0" - } - }, - "@babel/helper-hoist-variables": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz", - "integrity": "sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==", - "dev": true, - "requires": { - "@babel/types": "^7.16.0" - } - }, - "@babel/helper-member-expression-to-functions": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz", - "integrity": "sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ==", - "dev": true, - "requires": { - "@babel/types": "^7.16.0" - } - }, - "@babel/helper-module-imports": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz", - "integrity": "sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==", - "dev": true, - "requires": { - "@babel/types": "^7.16.0" - } - }, - "@babel/helper-module-transforms": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz", - "integrity": "sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.16.0", - "@babel/helper-replace-supers": "^7.16.0", - "@babel/helper-simple-access": "^7.16.0", - "@babel/helper-split-export-declaration": "^7.16.0", - "@babel/helper-validator-identifier": "^7.15.7", - "@babel/template": "^7.16.0", - "@babel/traverse": "^7.16.0", - "@babel/types": "^7.16.0" - } - }, - "@babel/helper-optimise-call-expression": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz", - "integrity": "sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw==", - "dev": true, - "requires": { - "@babel/types": "^7.16.0" - } - }, - "@babel/helper-plugin-utils": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz", - "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==", - "dev": true - }, - "@babel/helper-replace-supers": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz", - "integrity": "sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA==", - "dev": true, - "requires": { - "@babel/helper-member-expression-to-functions": "^7.16.0", - "@babel/helper-optimise-call-expression": "^7.16.0", - "@babel/traverse": "^7.16.0", - "@babel/types": "^7.16.0" - } - }, - "@babel/helper-simple-access": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz", - "integrity": "sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw==", - "dev": true, - "requires": { - "@babel/types": "^7.16.0" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz", - "integrity": "sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==", - "dev": true, - "requires": { - "@babel/types": "^7.16.0" - } - }, - "@babel/helper-validator-identifier": { - "version": "7.15.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz", - "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==", + "@cspotcode/source-map-consumer": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", + "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==", "dev": true }, - "@babel/helper-validator-option": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz", - "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==", - "dev": true - }, - "@babel/helpers": { - "version": "7.16.3", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.3.tgz", - "integrity": "sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w==", - "dev": true, - "requires": { - "@babel/template": "^7.16.0", - "@babel/traverse": "^7.16.3", - "@babel/types": "^7.16.0" - } - }, - "@babel/highlight": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz", - "integrity": "sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.15.7", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "@babel/parser": { - "version": "7.16.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz", - "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==", - "dev": true - }, - "@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-bigint": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", - "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-class-properties": { - "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.12.13" - } - }, - "@babel/plugin-syntax-import-meta": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", - "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/plugin-syntax-typescript": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.0.tgz", - "integrity": "sha512-Xv6mEXqVdaqCBfJFyeab0fH2DnUoMsDmhamxsSi4j8nLd4Vtw213WMJr55xxqipC/YVWyPY3K0blJncPYji+dQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.14.5" - } - }, - "@babel/template": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.0.tgz", - "integrity": "sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.16.0", - "@babel/parser": "^7.16.0", - "@babel/types": "^7.16.0" - } - }, - "@babel/traverse": { - "version": "7.16.3", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.3.tgz", - "integrity": "sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.16.0", - "@babel/generator": "^7.16.0", - "@babel/helper-function-name": "^7.16.0", - "@babel/helper-hoist-variables": "^7.16.0", - "@babel/helper-split-export-declaration": "^7.16.0", - "@babel/parser": "^7.16.3", - "@babel/types": "^7.16.0", - "debug": "^4.1.0", - "globals": "^11.1.0" - }, - "dependencies": { - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true - } - } - }, - "@babel/types": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz", - "integrity": "sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==", + "@cspotcode/source-map-support": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz", + "integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.15.7", - "to-fast-properties": "^2.0.0" + "@cspotcode/source-map-consumer": "0.8.0" } }, - "@bcoe/v8-coverage": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", - "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", - "dev": true - }, "@eslint/eslintrc": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz", - "integrity": "sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz", + "integrity": "sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==", "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.2.0", + "espree": "^9.3.1", "globals": "^13.9.0", - "ignore": "^4.0.6", + "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", "minimatch": "^3.0.4", "strip-json-comments": "^3.1.1" }, - "dependencies": { - "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "dev": true - } - } - }, - "@humanwhocodes/config-array": { - "version": "0.9.2", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.2.tgz", - "integrity": "sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==", - "dev": true, - "requires": { - "@humanwhocodes/object-schema": "^1.2.1", - "debug": "^4.1.1", - "minimatch": "^3.0.4" - } - }, - "@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", - "dev": true - }, - "@istanbuljs/load-nyc-config": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", - "dev": true, - "requires": { - "camelcase": "^5.3.1", - "find-up": "^4.1.0", - "get-package-type": "^0.1.0", - "js-yaml": "^3.13.1", - "resolve-from": "^5.0.0" - }, "dependencies": { "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true - } - } - }, - "@istanbuljs/schema": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", - "dev": true - }, - "@jest/console": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.4.2.tgz", - "integrity": "sha512-xknHThRsPB/To1FUbi6pCe43y58qFC03zfb6R7fDb/FfC7k2R3i1l+izRBJf8DI46KhYGRaF14Eo9A3qbBoixg==", - "dev": true, - "requires": { - "@jest/types": "^27.4.2", - "@types/node": "*", - "chalk": "^4.0.0", - "jest-message-util": "^27.4.2", - "jest-util": "^27.4.2", - "slash": "^3.0.0" - } - }, - "@jest/core": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.4.4.tgz", - "integrity": "sha512-xBNPVqYAdAiAMXnb4ugx9Cdmr0S52lBsLbQMR/sGBRO0810VSPKiuSDtuup6qdkK1e9vxbv3KK3IAP1QFAp8mw==", - "dev": true, - "requires": { - "@jest/console": "^27.4.2", - "@jest/reporters": "^27.4.4", - "@jest/test-result": "^27.4.2", - "@jest/transform": "^27.4.4", - "@jest/types": "^27.4.2", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "emittery": "^0.8.1", - "exit": "^0.1.2", - "graceful-fs": "^4.2.4", - "jest-changed-files": "^27.4.2", - "jest-config": "^27.4.4", - "jest-haste-map": "^27.4.4", - "jest-message-util": "^27.4.2", - "jest-regex-util": "^27.4.0", - "jest-resolve": "^27.4.4", - "jest-resolve-dependencies": "^27.4.4", - "jest-runner": "^27.4.4", - "jest-runtime": "^27.4.4", - "jest-snapshot": "^27.4.4", - "jest-util": "^27.4.2", - "jest-validate": "^27.4.2", - "jest-watcher": "^27.4.2", - "micromatch": "^4.0.4", - "rimraf": "^3.0.0", - "slash": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "@jest/environment": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.4.4.tgz", - "integrity": "sha512-q+niMx7cJgt/t/b6dzLOh4W8Ef/8VyKG7hxASK39jakijJzbFBGpptx3RXz13FFV7OishQ9lTbv+dQ5K3EhfDQ==", - "dev": true, - "requires": { - "@jest/fake-timers": "^27.4.2", - "@jest/types": "^27.4.2", - "@types/node": "*", - "jest-mock": "^27.4.2" - } - }, - "@jest/fake-timers": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.2.tgz", - "integrity": "sha512-f/Xpzn5YQk5adtqBgvw1V6bF8Nx3hY0OIRRpCvWcfPl0EAjdqWPdhH3t/3XpiWZqtjIEHDyMKP9ajpva1l4Zmg==", - "dev": true, - "requires": { - "@jest/types": "^27.4.2", - "@sinonjs/fake-timers": "^8.0.1", - "@types/node": "*", - "jest-message-util": "^27.4.2", - "jest-mock": "^27.4.2", - "jest-util": "^27.4.2" - }, - "dependencies": { - "@sinonjs/fake-timers": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz", - "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==", - "dev": true, - "requires": { - "@sinonjs/commons": "^1.7.0" - } - } - } - }, - "@jest/globals": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.4.4.tgz", - "integrity": "sha512-bqpqQhW30BOreXM8bA8t8JbOQzsq/WnPTnBl+It3UxAD9J8yxEAaBEylHx1dtBapAr/UBk8GidXbzmqnee8tYQ==", - "dev": true, - "requires": { - "@jest/environment": "^27.4.4", - "@jest/types": "^27.4.2", - "expect": "^27.4.2" - } - }, - "@jest/reporters": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.4.tgz", - "integrity": "sha512-ssyJSw9B9Awb1QaxDhIPSs4de1b7SE2kv7tqFehQL13xpn5HUkMYZK/ufTOXiCAnXFOZS+XDl1GaQ/LmJAzI1A==", - "dev": true, - "requires": { - "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^27.4.2", - "@jest/test-result": "^27.4.2", - "@jest/transform": "^27.4.4", - "@jest/types": "^27.4.2", - "@types/node": "*", - "chalk": "^4.0.0", - "collect-v8-coverage": "^1.0.0", - "exit": "^0.1.2", - "glob": "^7.1.2", - "graceful-fs": "^4.2.4", - "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^4.0.3", - "istanbul-lib-report": "^3.0.0", - "istanbul-lib-source-maps": "^4.0.0", - "istanbul-reports": "^3.0.2", - "jest-haste-map": "^27.4.4", - "jest-resolve": "^27.4.4", - "jest-util": "^27.4.2", - "jest-worker": "^27.4.4", - "slash": "^3.0.0", - "source-map": "^0.6.0", - "string-length": "^4.0.1", - "terminal-link": "^2.0.0", - "v8-to-istanbul": "^8.1.0" - } - }, - "@jest/source-map": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.4.0.tgz", - "integrity": "sha512-Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ==", - "dev": true, - "requires": { - "callsites": "^3.0.0", - "graceful-fs": "^4.2.4", - "source-map": "^0.6.0" - } - }, - "@jest/test-result": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.2.tgz", - "integrity": "sha512-kr+bCrra9jfTgxHXHa2UwoQjxvQk3Am6QbpAiJ5x/50LW8llOYrxILkqY0lZRW/hu8FXesnudbql263+EW9iNA==", - "dev": true, - "requires": { - "@jest/console": "^27.4.2", - "@jest/types": "^27.4.2", - "@types/istanbul-lib-coverage": "^2.0.0", - "collect-v8-coverage": "^1.0.0" - } - }, - "@jest/test-sequencer": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.4.tgz", - "integrity": "sha512-mCh+d4JTGTtX7vr13d7q2GHJy33nAobEwtEJ8X3u7R8+0ImVO2eAsQzsLfX8lyvdYHBxYABhqbYuaUNo42/pQw==", - "dev": true, - "requires": { - "@jest/test-result": "^27.4.2", - "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.4.4", - "jest-runtime": "^27.4.4" + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + } } }, - "@jest/transform": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.4.4.tgz", - "integrity": "sha512-7U/nDSrGsGzL7+X8ScNFV71w8u8knJQWSa9C2xsrrKLMOgb+rWuCG4VAyWke/53BU96GnT+Ka81xCAHA5gk6zA==", + "@humanwhocodes/config-array": { + "version": "0.9.5", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", + "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==", "dev": true, "requires": { - "@babel/core": "^7.1.0", - "@jest/types": "^27.4.2", - "babel-plugin-istanbul": "^6.0.0", - "chalk": "^4.0.0", - "convert-source-map": "^1.4.0", - "fast-json-stable-stringify": "^2.0.0", - "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.4.4", - "jest-regex-util": "^27.4.0", - "jest-util": "^27.4.2", - "micromatch": "^4.0.4", - "pirates": "^4.0.1", - "slash": "^3.0.0", - "source-map": "^0.6.1", - "write-file-atomic": "^3.0.0" + "@humanwhocodes/object-schema": "^1.2.1", + "debug": "^4.1.1", + "minimatch": "^3.0.4" } }, - "@jest/types": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.4.2.tgz", - "integrity": "sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==", - "dev": true, - "requires": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^16.0.0", - "chalk": "^4.0.0" - } + "@humanwhocodes/object-schema": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", + "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "dev": true }, "@nodelib/fs.scandir": { "version": "2.1.5", @@ -854,18 +106,18 @@ } }, "@sinonjs/fake-timers": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz", - "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.0.tgz", + "integrity": "sha512-M8vapsv9qQupMdzrVzkn5rb9jG7aUTEPAZdMtME2PuBaefksFZVE2C1g4LBRTkF/k3nRDNbDc5tp5NFC1PEYxA==", "dev": true, "requires": { "@sinonjs/commons": "^1.7.0" } }, "@sinonjs/samsam": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.0.2.tgz", - "integrity": "sha512-jxPRPp9n93ci7b8hMfJOFDPRLFYadN6FSpeROFTR4UNF4i5b+EK6m4QXPO46BDhFgRy1JuS87zAnFOzCUwMJcQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.1.tgz", + "integrity": "sha512-cZ7rKJTLiE7u7Wi/v9Hc2fs3Ucc3jrWeMgPHbbTCeVAB2S0wOBbYlkJVeNSL04i7fdhT8wIbDq1zhC/PXTD2SA==", "dev": true, "requires": { "@sinonjs/commons": "^1.6.0", @@ -879,52 +131,29 @@ "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", "dev": true }, - "@tootallnate/once": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "@tsconfig/node10": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", + "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", "dev": true }, - "@types/babel__core": { - "version": "7.1.17", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.17.tgz", - "integrity": "sha512-6zzkezS9QEIL8yCBvXWxPTJPNuMeECJVxSOhxNY/jfq9LxOTHivaYTqr37n9LknWWRTIkzqH2UilS5QFvfa90A==", - "dev": true, - "requires": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" - } - }, - "@types/babel__generator": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.3.tgz", - "integrity": "sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==", - "dev": true, - "requires": { - "@babel/types": "^7.0.0" - } + "@tsconfig/node12": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", + "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", + "dev": true }, - "@types/babel__template": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", - "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", - "dev": true, - "requires": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" - } + "@tsconfig/node14": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", + "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", + "dev": true }, - "@types/babel__traverse": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz", - "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==", - "dev": true, - "requires": { - "@babel/types": "^7.3.0" - } + "@tsconfig/node16": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", + "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", + "dev": true }, "@types/body-parser": { "version": "1.19.2", @@ -958,9 +187,9 @@ } }, "@types/express-serve-static-core": { - "version": "4.17.26", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.26.tgz", - "integrity": "sha512-zeu3tpouA043RHxW0gzRxwCHchMgftE8GArRsvYT0ByDMbn19olQHx5jLue0LxWY6iYtXb7rXmuVtSkhy9YZvQ==", + "version": "4.17.28", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz", + "integrity": "sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==", "dev": true, "requires": { "@types/node": "*", @@ -968,53 +197,10 @@ "@types/range-parser": "*" } }, - "@types/graceful-fs": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz", - "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==", - "dev": true, - "requires": { - "@types/node": "*" - } - }, - "@types/istanbul-lib-coverage": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", - "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==", - "dev": true - }, - "@types/istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", - "dev": true, - "requires": { - "@types/istanbul-lib-coverage": "*" - } - }, - "@types/istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", - "dev": true, - "requires": { - "@types/istanbul-lib-report": "*" - } - }, - "@types/jest": { - "version": "27.0.3", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.0.3.tgz", - "integrity": "sha512-cmmwv9t7gBYt7hNKH5Spu7Kuu/DotGa+Ff+JGRKZ4db5eh8PnKS4LuebJ3YLUoyOyIHraTGyULn23YtEAm0VSg==", - "dev": true, - "requires": { - "jest-diff": "^27.0.0", - "pretty-format": "^27.0.0" - } - }, "@types/json-schema": { - "version": "7.0.9", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz", - "integrity": "sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==", + "version": "7.0.11", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", + "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", "dev": true }, "@types/json5": { @@ -1039,9 +225,9 @@ "dev": true }, "@types/node": { - "version": "16.11.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz", - "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==", + "version": "17.0.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.18.tgz", + "integrity": "sha512-eKj4f/BsN/qcculZiRSujogjvp5O/k4lOW5m35NopjZM/QwLOR075a8pJW5hD+Rtdm2DaCVPENS6KtSQnUD6BA==", "dev": true }, "@types/oauth": { @@ -1053,12 +239,6 @@ "@types/node": "*" } }, - "@types/prettier": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz", - "integrity": "sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA==", - "dev": true - }, "@types/qs": { "version": "6.9.7", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz", @@ -1082,18 +262,18 @@ } }, "@types/sinon": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.6.tgz", - "integrity": "sha512-6EF+wzMWvBNeGrfP3Nx60hhx+FfwSg1JJBLAAP/IdIUq0EYkqCYf70VT3PhuhPX9eLD+Dp+lNdpb/ZeHG8Yezg==", + "version": "10.0.11", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.11.tgz", + "integrity": "sha512-dmZsHlBsKUtBpHriNjlK0ndlvEh8dcb9uV9Afsbt89QIyydpC7NcR+nWlAhASfy3GHnxTl4FX/aKE7XZUt/B4g==", "dev": true, "requires": { - "@sinonjs/fake-timers": "^7.1.0" + "@types/sinonjs__fake-timers": "*" } }, - "@types/stack-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", - "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", + "@types/sinonjs__fake-timers": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz", + "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==", "dev": true }, "@types/unist": { @@ -1102,29 +282,15 @@ "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==", "dev": true }, - "@types/yargs": { - "version": "16.0.4", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz", - "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==", - "dev": true, - "requires": { - "@types/yargs-parser": "*" - } - }, - "@types/yargs-parser": { - "version": "20.2.1", - "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz", - "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==", - "dev": true - }, "@typescript-eslint/eslint-plugin": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.6.0.tgz", - "integrity": "sha512-MIbeMy5qfLqtgs1hWd088k1hOuRsN9JrHUPwVVKCD99EOUqScd7SrwoZl4Gso05EAP9w1kvLWUVGJOVpRPkDPA==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.17.0.tgz", + "integrity": "sha512-qVstvQilEd89HJk3qcbKt/zZrfBZ+9h2ynpAGlWjWiizA7m/MtLT9RoX6gjtpE500vfIg8jogAkDzdCxbsFASQ==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "5.6.0", - "@typescript-eslint/scope-manager": "5.6.0", + "@typescript-eslint/scope-manager": "5.17.0", + "@typescript-eslint/type-utils": "5.17.0", + "@typescript-eslint/utils": "5.17.0", "debug": "^4.3.2", "functional-red-black-tree": "^1.0.1", "ignore": "^5.1.8", @@ -1133,56 +299,53 @@ "tsutils": "^3.21.0" } }, - "@typescript-eslint/experimental-utils": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.6.0.tgz", - "integrity": "sha512-VDoRf3Qj7+W3sS/ZBXZh3LBzp0snDLEgvp6qj0vOAIiAPM07bd5ojQ3CTzF/QFl5AKh7Bh1ycgj6lFBJHUt/DA==", + "@typescript-eslint/parser": { + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.17.0.tgz", + "integrity": "sha512-aRzW9Jg5Rlj2t2/crzhA2f23SIYFlF9mchGudyP0uiD6SenIxzKoLjwzHbafgHn39dNV/TV7xwQkLfFTZlJ4ig==", "dev": true, "requires": { - "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.6.0", - "@typescript-eslint/types": "5.6.0", - "@typescript-eslint/typescript-estree": "5.6.0", - "eslint-scope": "^5.1.1", - "eslint-utils": "^3.0.0" + "@typescript-eslint/scope-manager": "5.17.0", + "@typescript-eslint/types": "5.17.0", + "@typescript-eslint/typescript-estree": "5.17.0", + "debug": "^4.3.2" } }, - "@typescript-eslint/parser": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.6.0.tgz", - "integrity": "sha512-YVK49NgdUPQ8SpCZaOpiq1kLkYRPMv9U5gcMrywzI8brtwZjr/tG3sZpuHyODt76W/A0SufNjYt9ZOgrC4tLIQ==", + "@typescript-eslint/scope-manager": { + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.17.0.tgz", + "integrity": "sha512-062iCYQF/doQ9T2WWfJohQKKN1zmmXVfAcS3xaiialiw8ZUGy05Em6QVNYJGO34/sU1a7a+90U3dUNfqUDHr3w==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.6.0", - "@typescript-eslint/types": "5.6.0", - "@typescript-eslint/typescript-estree": "5.6.0", - "debug": "^4.3.2" + "@typescript-eslint/types": "5.17.0", + "@typescript-eslint/visitor-keys": "5.17.0" } }, - "@typescript-eslint/scope-manager": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.6.0.tgz", - "integrity": "sha512-1U1G77Hw2jsGWVsO2w6eVCbOg0HZ5WxL/cozVSTfqnL/eB9muhb8THsP0G3w+BB5xAHv9KptwdfYFAUfzcIh4A==", + "@typescript-eslint/type-utils": { + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.17.0.tgz", + "integrity": "sha512-3hU0RynUIlEuqMJA7dragb0/75gZmwNwFf/QJokWzPehTZousP/MNifVSgjxNcDCkM5HI2K22TjQWUmmHUINSg==", "dev": true, "requires": { - "@typescript-eslint/types": "5.6.0", - "@typescript-eslint/visitor-keys": "5.6.0" + "@typescript-eslint/utils": "5.17.0", + "debug": "^4.3.2", + "tsutils": "^3.21.0" } }, "@typescript-eslint/types": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.6.0.tgz", - "integrity": "sha512-OIZffked7mXv4mXzWU5MgAEbCf9ecNJBKi+Si6/I9PpTaj+cf2x58h2oHW5/P/yTnPkKaayfjhLvx+crnl5ubA==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.17.0.tgz", + "integrity": "sha512-AgQ4rWzmCxOZLioFEjlzOI3Ch8giDWx8aUDxyNw9iOeCvD3GEYAB7dxWGQy4T/rPVe8iPmu73jPHuaSqcjKvxw==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.6.0.tgz", - "integrity": "sha512-92vK5tQaE81rK7fOmuWMrSQtK1IMonESR+RJR2Tlc7w4o0MeEdjgidY/uO2Gobh7z4Q1hhS94Cr7r021fMVEeA==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.17.0.tgz", + "integrity": "sha512-X1gtjEcmM7Je+qJRhq7ZAAaNXYhTgqMkR10euC4Si6PIjb+kwEQHSxGazXUQXFyqfEXdkGf6JijUu5R0uceQzg==", "dev": true, "requires": { - "@typescript-eslint/types": "5.6.0", - "@typescript-eslint/visitor-keys": "5.6.0", + "@typescript-eslint/types": "5.17.0", + "@typescript-eslint/visitor-keys": "5.17.0", "debug": "^4.3.2", "globby": "^11.0.4", "is-glob": "^4.0.3", @@ -1190,46 +353,36 @@ "tsutils": "^3.21.0" } }, + "@typescript-eslint/utils": { + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.17.0.tgz", + "integrity": "sha512-DVvndq1QoxQH+hFv+MUQHrrWZ7gQ5KcJzyjhzcqB1Y2Xes1UQQkTRPUfRpqhS8mhTWsSb2+iyvDW1Lef5DD7vA==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.9", + "@typescript-eslint/scope-manager": "5.17.0", + "@typescript-eslint/types": "5.17.0", + "@typescript-eslint/typescript-estree": "5.17.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" + } + }, "@typescript-eslint/visitor-keys": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.6.0.tgz", - "integrity": "sha512-1p7hDp5cpRFUyE3+lvA74egs+RWSgumrBpzBCDzfTFv0aQ7lIeay80yU0hIxgAhwQ6PcasW35kaOCyDOv6O/Ng==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.17.0.tgz", + "integrity": "sha512-6K/zlc4OfCagUu7Am/BD5k8PSWQOgh34Nrv9Rxe2tBzlJ7uOeJ/h7ugCGDCeEZHT6k2CJBhbk9IsbkPI0uvUkA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.6.0", + "@typescript-eslint/types": "5.17.0", "eslint-visitor-keys": "^3.0.0" } }, - "abab": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", - "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==", - "dev": true - }, "acorn": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz", - "integrity": "sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", + "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", "dev": true }, - "acorn-globals": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", - "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", - "dev": true, - "requires": { - "acorn": "^7.1.1", - "acorn-walk": "^7.1.1" - }, - "dependencies": { - "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true - } - } - }, "acorn-jsx": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", @@ -1237,18 +390,27 @@ "dev": true }, "acorn-walk": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", - "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", "dev": true }, - "agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "dev": true, "requires": { - "debug": "4" + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "dependencies": { + "indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true + } } }, "ajv": { @@ -1263,43 +425,17 @@ "uri-js": "^4.2.2" } }, - "ansi-colors": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true - }, - "ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "requires": { - "type-fest": "^0.21.3" - }, - "dependencies": { - "type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true - } - } - }, "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", "dev": true }, "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz", + "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==", + "dev": true }, "anymatch": { "version": "3.1.2", @@ -1311,10 +447,25 @@ "picomatch": "^2.0.4" } }, + "arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true + }, "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "requires": { + "sprintf-js": "~1.0.2" + } + }, + "array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", "dev": true }, "array-includes": { @@ -1347,10 +498,16 @@ "es-abstract": "^1.19.0" } }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "arrgv": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/arrgv/-/arrgv-1.0.2.tgz", + "integrity": "sha512-a4eg4yhp7mmruZDQFqVMlxNRFGi/i1r87pt8SDHy0/I8PqSXoUTlWZRdAZo0VXgvEARcujbtTk8kiZRi1uDGRw==", + "dev": true + }, + "arrify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-3.0.0.tgz", + "integrity": "sha512-tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw==", "dev": true }, "atlassian-jwt": { @@ -1362,104 +519,88 @@ "lodash": "^4.17.21" } }, - "axios": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", - "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==", - "requires": { - "follow-redirects": "^1.14.4" - } - }, - "babel-jest": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.4.tgz", - "integrity": "sha512-+6RVutZxOQgJkt4svgTHPFtOQlVe9dUg3wrimIAM38pY6hL/nsL8glfFSUjD9jNVjaVjzkCzj6loFFecrjr9Qw==", - "dev": true, - "requires": { - "@jest/transform": "^27.4.4", - "@jest/types": "^27.4.2", - "@types/babel__core": "^7.1.14", - "babel-plugin-istanbul": "^6.0.0", - "babel-preset-jest": "^27.4.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.4", - "slash": "^3.0.0" - } - }, - "babel-plugin-istanbul": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@istanbuljs/load-nyc-config": "^1.0.0", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-instrument": "^5.0.4", - "test-exclude": "^6.0.0" + "ava": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ava/-/ava-4.1.0.tgz", + "integrity": "sha512-QD6MBWHzagAwb9vxduXzVWx6Q77DUHLxvIebSY6+enL+Ri6KzSZYj0IBOFifA26wfpJPZnWKLUh3vwx1LyVh/g==", + "dev": true, + "requires": { + "acorn": "^8.7.0", + "acorn-walk": "^8.2.0", + "ansi-styles": "^6.1.0", + "arrgv": "^1.0.2", + "arrify": "^3.0.0", + "callsites": "^4.0.0", + "cbor": "^8.1.0", + "chalk": "^5.0.0", + "chokidar": "^3.5.3", + "chunkd": "^2.0.1", + "ci-info": "^3.3.0", + "ci-parallel-vars": "^1.0.1", + "clean-yaml-object": "^0.1.0", + "cli-truncate": "^3.1.0", + "code-excerpt": "^4.0.0", + "common-path-prefix": "^3.0.0", + "concordance": "^5.0.4", + "currently-unhandled": "^0.4.1", + "debug": "^4.3.3", + "del": "^6.0.0", + "emittery": "^0.10.1", + "figures": "^4.0.0", + "globby": "^13.1.1", + "ignore-by-default": "^2.0.0", + "indent-string": "^5.0.0", + "is-error": "^2.2.2", + "is-plain-object": "^5.0.0", + "is-promise": "^4.0.0", + "matcher": "^5.0.0", + "mem": "^9.0.2", + "ms": "^2.1.3", + "p-event": "^5.0.1", + "p-map": "^5.3.0", + "picomatch": "^2.3.1", + "pkg-conf": "^4.0.0", + "plur": "^5.1.0", + "pretty-ms": "^7.0.1", + "resolve-cwd": "^3.0.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.5", + "strip-ansi": "^7.0.1", + "supertap": "^3.0.1", + "temp-dir": "^2.0.0", + "write-file-atomic": "^4.0.1", + "yargs": "^17.3.1" }, "dependencies": { - "istanbul-lib-instrument": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz", - "integrity": "sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==", + "globby": { + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-13.1.1.tgz", + "integrity": "sha512-XMzoDZbGZ37tufiv7g0N4F/zp3zkwdFtVbV3EHsVl1KQr4RPLfNoT068/97RPshz2J5xYNEjLKKBKaGHifBd3Q==", "dev": true, "requires": { - "@babel/core": "^7.12.3", - "@babel/parser": "^7.14.7", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.11", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^4.0.0" + }, + "dependencies": { + "slash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", + "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", + "dev": true + } } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true } } }, - "babel-plugin-jest-hoist": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.4.0.tgz", - "integrity": "sha512-Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw==", - "dev": true, - "requires": { - "@babel/template": "^7.3.3", - "@babel/types": "^7.3.3", - "@types/babel__core": "^7.0.0", - "@types/babel__traverse": "^7.0.6" - } - }, - "babel-preset-current-node-syntax": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", - "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", - "dev": true, - "requires": { - "@babel/plugin-syntax-async-generators": "^7.8.4", - "@babel/plugin-syntax-bigint": "^7.8.3", - "@babel/plugin-syntax-class-properties": "^7.8.3", - "@babel/plugin-syntax-import-meta": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.3", - "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3", - "@babel/plugin-syntax-top-level-await": "^7.8.3" - } - }, - "babel-preset-jest": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.4.0.tgz", - "integrity": "sha512-NK4jGYpnBvNxcGo7/ZpZJr51jCGT+3bwwpVIDY2oNfTxJJldRtB4VAcYdgp1loDE50ODuTu+yBjpMAswv5tlpg==", - "dev": true, + "axios": { + "version": "0.26.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", "requires": { - "babel-plugin-jest-hoist": "^27.4.0", - "babel-preset-current-node-syntax": "^1.0.0" + "follow-redirects": "^1.14.8" } }, "balanced-match": { @@ -1468,12 +609,24 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, + "binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true + }, "binary-search-bounds": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/binary-search-bounds/-/binary-search-bounds-2.0.5.tgz", "integrity": "sha512-H0ea4Fd3lS1+sTEB2TgcLoK21lLhwEJzlQv3IN47pJS976Gx4zoWe0ak3q+uYh60ppQxg9F16Ri4tS1sfD4+jA==", "dev": true }, + "blueimp-md5": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz", + "integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==", + "dev": true + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1493,49 +646,6 @@ "fill-range": "^7.0.1" } }, - "browser-process-hrtime": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", - "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", - "dev": true - }, - "browserslist": { - "version": "4.18.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz", - "integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30001280", - "electron-to-chromium": "^1.3.896", - "escalade": "^3.1.1", - "node-releases": "^2.0.1", - "picocolors": "^1.0.0" - } - }, - "bs-logger": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", - "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", - "dev": true, - "requires": { - "fast-json-stable-stringify": "2.x" - } - }, - "bser": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", - "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", - "dev": true, - "requires": { - "node-int64": "^0.4.0" - } - }, - "buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, "call-bind": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", @@ -1547,37 +657,24 @@ } }, "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "caniuse-lite": { - "version": "1.0.30001286", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz", - "integrity": "sha512-zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-4.0.0.tgz", + "integrity": "sha512-y3jRROutgpKdz5vzEhWM34TidDU8vkJppF8dszITeb1PQmSqV3DTxyV8G/lyO/DNvtE1YTedehmw9MPZsCBHxQ==", "dev": true }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "cbor": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/cbor/-/cbor-8.1.0.tgz", + "integrity": "sha512-DwGjNW9omn6EwP70aXsn7FQJx5kO12tX0bZkaTjzdVFM6/7nhA4t0EENocKGx6D2Bch9PE2KzCUf5SceBdeijg==", "dev": true, "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "nofilter": "^3.1.0" } }, - "char-regex": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", - "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "chalk": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.0.1.tgz", + "integrity": "sha512-Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w==", "dev": true }, "character-entities": { @@ -1598,41 +695,122 @@ "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==", "dev": true }, + "chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, + "requires": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + } + }, + "chunkd": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/chunkd/-/chunkd-2.0.1.tgz", + "integrity": "sha512-7d58XsFmOq0j6el67Ug9mHf9ELUXsQXYJBkyxhH/k+6Ke0qXRnv0kbemx+Twc6fRJ07C49lcbdgm9FL1Ei/6SQ==", + "dev": true + }, "ci-info": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.0.tgz", "integrity": "sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==", "dev": true }, - "cjs-module-lexer": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", - "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", + "ci-parallel-vars": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ci-parallel-vars/-/ci-parallel-vars-1.0.1.tgz", + "integrity": "sha512-uvzpYrpmidaoxvIQHM+rKSrigjOe9feHYbw4uOI2gdfe1C3xIlxO+kVXq83WQWNniTf8bAxVpy+cQeFQsMERKg==", + "dev": true + }, + "clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true + }, + "clean-yaml-object": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/clean-yaml-object/-/clean-yaml-object-0.1.0.tgz", + "integrity": "sha1-Y/sRDcLOGoTcIfbZM0h20BCui2g=", "dev": true }, - "cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "cli-truncate": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz", + "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==", + "dev": true, + "requires": { + "slice-ansi": "^5.0.0", + "string-width": "^5.0.0" + } + }, + "cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + } + } + }, + "code-excerpt": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-4.0.0.tgz", + "integrity": "sha512-xxodCmBen3iy2i0WtAK8FlFNrRzjUqjRsMfho58xT/wvZU1YTM3fCnRjcy1gJPMepaRlgm/0e6w8SpWHpn3/cA==", "dev": true, "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" + "convert-to-spaces": "^2.0.1" } }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", - "dev": true - }, - "collect-v8-coverage": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", - "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==", - "dev": true - }, "color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -1648,19 +826,16 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, "comment-parser": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.0.tgz", - "integrity": "sha512-hRpmWIKgzd81vn0ydoWoyPoALEOnF4wt8yKD35Ib1D6XC2siLiYaiqfGkYrunuKdsXGwpBpHU3+9r+RVw2NZfA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz", + "integrity": "sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==", + "dev": true + }, + "common-path-prefix": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz", + "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==", "dev": true }, "concat-map": { @@ -1669,21 +844,40 @@ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, - "confusing-browser-globals": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz", - "integrity": "sha512-gNld/3lySHwuhaVluJUKLePYirM3QNCKzVxqAdhJII9/WXKVX5PURzMVJspS1jTslSqjeuG4KMVTSouit5YPHA==", - "dev": true - }, - "convert-source-map": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", + "concordance": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/concordance/-/concordance-5.0.4.tgz", + "integrity": "sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==", "dev": true, "requires": { - "safe-buffer": "~5.1.1" + "date-time": "^3.1.0", + "esutils": "^2.0.3", + "fast-diff": "^1.2.0", + "js-string-escape": "^1.0.1", + "lodash": "^4.17.15", + "md5-hex": "^3.0.1", + "semver": "^7.3.2", + "well-known-symbols": "^2.0.0" } }, + "confusing-browser-globals": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz", + "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==", + "dev": true + }, + "convert-to-spaces": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-2.0.1.tgz", + "integrity": "sha512-rcQ1bsQO9799wq24uE5AM2tAILy4gXGIK/njFWcVQkGNZ96edlpY+A7bjwvzjYvLDyzmG1MmMLZhpcsb+klNMQ==", + "dev": true + }, + "create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true + }, "cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -1695,73 +889,47 @@ "which": "^2.0.1" } }, - "cssom": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", - "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==", - "dev": true - }, - "cssstyle": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", - "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "cssom": "~0.3.6" - }, - "dependencies": { - "cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", - "dev": true - } + "array-find-index": "^1.0.1" } }, - "data-urls": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", - "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "date-time": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/date-time/-/date-time-3.1.0.tgz", + "integrity": "sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg==", "dev": true, "requires": { - "abab": "^2.0.3", - "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^8.0.0" + "time-zone": "^1.0.0" } }, "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { "ms": "2.1.2" + }, + "dependencies": { + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } } }, - "decimal.js": { - "version": "10.3.1", - "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz", - "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==", - "dev": true - }, - "dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=", - "dev": true - }, "deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, - "deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", - "dev": true - }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -1771,17 +939,32 @@ "object-keys": "^1.0.12" } }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true - }, - "detect-newline": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", - "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", - "dev": true + "del": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/del/-/del-6.0.0.tgz", + "integrity": "sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==", + "dev": true, + "requires": { + "globby": "^11.0.1", + "graceful-fs": "^4.2.4", + "is-glob": "^4.0.1", + "is-path-cwd": "^2.2.0", + "is-path-inside": "^3.0.2", + "p-map": "^4.0.0", + "rimraf": "^3.0.2", + "slash": "^3.0.0" + }, + "dependencies": { + "p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, + "requires": { + "aggregate-error": "^3.0.0" + } + } + } }, "diff": { "version": "5.0.0", @@ -1789,12 +972,6 @@ "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", "dev": true }, - "diff-sequences": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.4.0.tgz", - "integrity": "sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==", - "dev": true - }, "dir-glob": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", @@ -1813,56 +990,30 @@ "esutils": "^2.0.2" } }, - "domexception": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", - "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", - "dev": true, - "requires": { - "webidl-conversions": "^5.0.0" - }, - "dependencies": { - "webidl-conversions": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", - "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", - "dev": true - } - } - }, "dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", - "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.0.tgz", + "integrity": "sha512-qD9WU0MPM4SWLPJy/r2Be+2WgQj8plChsyrCNQzW/0WjvcJQiKQJ9mH3ZgB3fxbUUxgc/11ZJ0Fi5KiimWGz2Q==", "dev": true }, - "electron-to-chromium": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.15.tgz", - "integrity": "sha512-WDw2IUL3k4QpbzInV3JZK+Zd1NjWJPDZ28oUSchWb/kf6AVj7/niaAlgcJlvojFa1d7pJSyQ/KSZsEtq5W7aGQ==", + "eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", "dev": true }, "emittery": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz", - "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==", + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.1.tgz", + "integrity": "sha512-OBSS9uVXbpgqEGq2V5VnpfCu9vSnfiR9eYVJmxFYToNIcWRHkM4BAFbJe/PWjf/pQdEL7OPxd2jOW/bJiyX7gg==", "dev": true }, "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "dev": true }, - "enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", - "dev": true, - "requires": { - "ansi-colors": "^4.1.1" - } - }, "es-abstract": { "version": "1.19.1", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz", @@ -1909,90 +1060,29 @@ "dev": true }, "escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", + "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", "dev": true }, - "escodegen": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", - "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", - "dev": true, - "requires": { - "esprima": "^4.0.1", - "estraverse": "^5.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" - }, - "dependencies": { - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - } - }, - "optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "dev": true, - "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" - } - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2" - } - } - } - }, "eslint": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.4.1.tgz", - "integrity": "sha512-TxU/p7LB1KxQ6+7aztTnO7K0i+h0tDi81YRY9VzB6Id71kNz+fFYnf5HD5UOQmxkzcoa0TlVZf9dpMtUv0GpWg==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz", + "integrity": "sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==", "dev": true, "requires": { - "@eslint/eslintrc": "^1.0.5", + "@eslint/eslintrc": "^1.2.1", "@humanwhocodes/config-array": "^0.9.2", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", "debug": "^4.3.2", "doctrine": "^3.0.0", - "enquirer": "^2.3.5", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.1.0", + "eslint-scope": "^7.1.1", "eslint-utils": "^3.0.0", - "eslint-visitor-keys": "^3.1.0", - "espree": "^9.2.0", + "eslint-visitor-keys": "^3.3.0", + "espree": "^9.3.1", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -2000,7 +1090,7 @@ "functional-red-black-tree": "^1.0.1", "glob-parent": "^6.0.1", "globals": "^13.6.0", - "ignore": "^4.0.6", + "ignore": "^5.2.0", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", @@ -2011,19 +1101,54 @@ "minimatch": "^3.0.4", "natural-compare": "^1.4.0", "optionator": "^0.9.1", - "progress": "^2.0.0", "regexpp": "^3.2.0", - "semver": "^7.2.1", "strip-ansi": "^6.0.1", "strip-json-comments": "^3.1.0", "text-table": "^0.2.0", "v8-compile-cache": "^2.0.3" }, "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true + }, "eslint-scope": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz", - "integrity": "sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", + "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", "dev": true, "requires": { "esrecurse": "^4.3.0", @@ -2045,18 +1170,30 @@ "is-glob": "^4.0.3" } }, - "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "dev": true + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } } } }, "eslint-config-airbnb": { - "version": "19.0.2", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.2.tgz", - "integrity": "sha512-4v5DEMVSl043LaCT+gsxPcoiIk0iYG5zxJKKjIy80H/D//2E0vtuOBWkb0CBDxjF+y26yQzspIXYuY6wMmt9Cw==", + "version": "19.0.4", + "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-19.0.4.tgz", + "integrity": "sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==", "dev": true, "requires": { "eslint-config-airbnb-base": "^15.0.0", @@ -2085,9 +1222,9 @@ } }, "eslint-config-airbnb-typescript": { - "version": "16.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-16.1.0.tgz", - "integrity": "sha512-W5Cq20KpEx5ZLC54bnVrC37zq2+WD956Kp/Ma3nYFRjT1v9KM63v+DPkrrmmrVqrlDKaD0ivm/qeYmyHV6qKlw==", + "version": "16.1.4", + "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-16.1.4.tgz", + "integrity": "sha512-dfm2cEaYXh4mCYd+RyJO8+PQfd5/zp8WwrCeRznly5qD9W5tal3KTjgdInYWuEAdwWnNJxWcmQ/HFiA4bfkM1g==", "dev": true, "requires": { "eslint-config-airbnb-base": "^15.0.0" @@ -2115,27 +1252,46 @@ } }, "eslint-import-resolver-typescript": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.5.0.tgz", - "integrity": "sha512-qZ6e5CFr+I7K4VVhQu3M/9xGv9/YmwsEXrsm3nimw8vWaVHRDrQRp26BgCypTxBp3vUp4o5aVEJRiy0F2DFddQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-2.7.0.tgz", + "integrity": "sha512-MNHS3u5pebvROX4MjGP9coda589ZGfL1SqdxUV4kSrcclfDRWvNE2D+eljbnWVMvWDVRgT89nhscMHPKYGcObQ==", "dev": true, "requires": { - "debug": "^4.3.1", - "glob": "^7.1.7", - "is-glob": "^4.0.1", - "resolve": "^1.20.0", - "tsconfig-paths": "^3.9.0" + "debug": "^4.3.4", + "glob": "^7.2.0", + "is-glob": "^4.0.3", + "resolve": "^1.22.0", + "tsconfig-paths": "^3.14.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", + "dev": true + }, + "tsconfig-paths": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", + "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", + "dev": true, + "requires": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + } } }, "eslint-module-utils": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz", - "integrity": "sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==", + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz", + "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==", "dev": true, "requires": { "debug": "^3.2.7", - "find-up": "^2.1.0", - "pkg-dir": "^2.0.0" + "find-up": "^2.1.0" }, "dependencies": { "debug": { @@ -2150,9 +1306,9 @@ } }, "eslint-plugin-import": { - "version": "2.25.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz", - "integrity": "sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==", + "version": "2.25.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz", + "integrity": "sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==", "dev": true, "requires": { "array-includes": "^3.1.4", @@ -2160,14 +1316,14 @@ "debug": "^2.6.9", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.6", - "eslint-module-utils": "^2.7.1", + "eslint-module-utils": "^2.7.2", "has": "^1.0.3", "is-core-module": "^2.8.0", "is-glob": "^4.0.3", "minimatch": "^3.0.4", "object.values": "^1.1.5", "resolve": "^1.20.0", - "tsconfig-paths": "^3.11.0" + "tsconfig-paths": "^3.12.0" }, "dependencies": { "debug": { @@ -2224,20 +1380,20 @@ } }, "eslint-visitor-keys": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", - "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz", + "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==", "dev": true }, "espree": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.2.0.tgz", - "integrity": "sha512-oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg==", + "version": "9.3.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz", + "integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==", "dev": true, "requires": { - "acorn": "^8.6.0", + "acorn": "^8.7.0", "acorn-jsx": "^5.3.1", - "eslint-visitor-keys": "^3.1.0" + "eslint-visitor-keys": "^3.3.0" } }, "esprima": { @@ -2292,61 +1448,22 @@ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true }, - "execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - } - }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", - "dev": true - }, - "expect": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/expect/-/expect-27.4.2.tgz", - "integrity": "sha512-BjAXIDC6ZOW+WBFNg96J22D27Nq5ohn+oGcuP2rtOtcjuxNoV9McpQ60PcQWhdFOSBIQdR72e+4HdnbZTFSTyg==", - "dev": true, - "requires": { - "@jest/types": "^27.4.2", - "ansi-styles": "^5.0.0", - "jest-get-type": "^27.4.0", - "jest-matcher-utils": "^27.4.2", - "jest-message-util": "^27.4.2", - "jest-regex-util": "^27.4.0" - }, - "dependencies": { - "ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true - } - } - }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, + "fast-diff": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", + "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "dev": true + }, "fast-glob": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", - "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", + "version": "3.2.11", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", + "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", @@ -2377,13 +1494,14 @@ "reusify": "^1.0.4" } }, - "fb-watchman": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz", - "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==", + "figures": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/figures/-/figures-4.0.1.tgz", + "integrity": "sha512-rElJwkA/xS04Vfg+CaZodpso7VqBknOYbzi6I76hI4X80RUjkSxO2oAyPmGbuXUppywjqndOrQDl817hDnI++w==", "dev": true, "requires": { - "bser": "2.1.1" + "escape-string-regexp": "^5.0.0", + "is-unicode-supported": "^1.2.0" } }, "file-entry-cache": { @@ -2424,26 +1542,15 @@ } }, "flatted": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz", - "integrity": "sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz", + "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==", "dev": true }, "follow-redirects": { - "version": "1.14.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz", - "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==" - }, - "form-data": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", - "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } + "version": "1.14.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==" }, "fs.realpath": { "version": "1.0.0", @@ -2470,12 +1577,6 @@ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, - "gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", - "dev": true - }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -2493,18 +1594,6 @@ "has-symbols": "^1.0.1" } }, - "get-package-type": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", - "dev": true - }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true - }, "get-symbol-description": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", @@ -2539,32 +1628,40 @@ } }, "globals": { - "version": "13.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz", - "integrity": "sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==", + "version": "13.13.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz", + "integrity": "sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==", "dev": true, "requires": { "type-fest": "^0.20.2" + }, + "dependencies": { + "type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true + } } }, "globby": { - "version": "11.0.4", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz", - "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", "dev": true, "requires": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", "slash": "^3.0.0" } }, "graceful-fs": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", - "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==", + "version": "4.2.9", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", + "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", "dev": true }, "has": { @@ -2580,84 +1677,39 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "has-symbols": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", - "dev": true - }, - "has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", - "dev": true, - "requires": { - "has-symbols": "^1.0.2" - } - }, - "html-encoding-sniffer": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", - "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", - "dev": true, - "requires": { - "whatwg-encoding": "^1.0.5" - } - }, - "html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true - }, - "http-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", - "dev": true, - "requires": { - "@tootallnate/once": "1", - "agent-base": "6", - "debug": "4" - } - }, - "https-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", - "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", - "dev": true, - "requires": { - "agent-base": "6", - "debug": "4" - } + "dev": true }, - "human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "has-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", "dev": true }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "has-tostringtag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", "dev": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "has-symbols": "^1.0.2" } }, "ignore": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz", - "integrity": "sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", + "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "dev": true + }, + "ignore-by-default": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-2.0.0.tgz", + "integrity": "sha512-+mQSgMRiFD3L3AOxLYOCxjIq4OnAmo5CIuC+lj5ehCJcPtV++QacEV7FdpzvYxH6DaOySWzQU6RR0lPLy37ckA==", "dev": true }, "import-fresh": { @@ -2668,75 +1720,13 @@ "requires": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" - } - }, - "import-local": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz", - "integrity": "sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA==", - "dev": true, - "requires": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" }, "dependencies": { - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "path-exists": { + "resolve-from": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } } } }, @@ -2746,6 +1736,12 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, + "indent-string": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz", + "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==", + "dev": true + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -2773,6 +1769,12 @@ "side-channel": "^1.0.4" } }, + "irregular-plurals": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.3.0.tgz", + "integrity": "sha512-MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g==", + "dev": true + }, "is-alphabetical": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz", @@ -2798,6 +1800,15 @@ "has-bigints": "^1.0.1" } }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, "is-boolean-object": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", @@ -2815,9 +1826,9 @@ "dev": true }, "is-core-module": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz", - "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", + "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", "dev": true, "requires": { "has": "^1.0.3" @@ -2838,6 +1849,12 @@ "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==", "dev": true }, + "is-error": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/is-error/-/is-error-2.2.2.tgz", + "integrity": "sha512-IOQqts/aHWbiisY5DuPJQ0gcbvaLFCa7fBa9xoLfxBZvQ+ZI/Zh9xoI7Gk+G64N0FdK4AbibytHht2tWgpJWLg==", + "dev": true + }, "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -2845,15 +1862,9 @@ "dev": true }, "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "is-generator-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", - "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", + "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", "dev": true }, "is-glob": { @@ -2872,707 +1883,127 @@ "dev": true }, "is-negative-zero": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz", - "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==", - "dev": true - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "is-number-object": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz", - "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-potential-custom-element-name": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", - "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", - "dev": true - }, - "is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", - "dev": true, - "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - } - }, - "is-shared-array-buffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz", - "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==", - "dev": true - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true - }, - "is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", - "dev": true, - "requires": { - "has-tostringtag": "^1.0.0" - } - }, - "is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", - "dev": true, - "requires": { - "has-symbols": "^1.0.2" - } - }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, - "is-weakref": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz", - "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==", - "dev": true, - "requires": { - "call-bind": "^1.0.0" - } - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "istanbul-lib-coverage": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz", - "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==", - "dev": true - }, - "istanbul-lib-instrument": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", - "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", - "dev": true, - "requires": { - "@babel/core": "^7.7.5", - "@istanbuljs/schema": "^0.1.2", - "istanbul-lib-coverage": "^3.0.0", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "istanbul-lib-report": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", - "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", - "dev": true, - "requires": { - "istanbul-lib-coverage": "^3.0.0", - "make-dir": "^3.0.0", - "supports-color": "^7.1.0" - } - }, - "istanbul-lib-source-maps": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", - "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", - "dev": true, - "requires": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^3.0.0", - "source-map": "^0.6.1" - } - }, - "istanbul-reports": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.1.tgz", - "integrity": "sha512-q1kvhAXWSsXfMjCdNHNPKZZv94OlspKnoGv+R9RGbnqOOQ0VbNfLFgQDVgi7hHenKsndGq3/o0OBdzDXthWcNw==", - "dev": true, - "requires": { - "html-escaper": "^2.0.0", - "istanbul-lib-report": "^3.0.0" - } - }, - "jest": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/jest/-/jest-27.4.4.tgz", - "integrity": "sha512-AXwEIFa58Uf1Jno3/KSo5HZZ0/2Xwqvfrz0/3bmTwImkFlbOvz5vARAW9nTrxRLkojjkitaZ1KNKAtw3JRFAaA==", - "dev": true, - "requires": { - "@jest/core": "^27.4.4", - "import-local": "^3.0.2", - "jest-cli": "^27.4.4" - }, - "dependencies": { - "jest-cli": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.4.tgz", - "integrity": "sha512-+MfsHnZPUOBigCBURuQFRpgYoPCgmIFkICkqt4SrramZCUp/UAuWcst4pMZb84O3VU8JyKJmnpGG4qH8ClQloA==", - "dev": true, - "requires": { - "@jest/core": "^27.4.4", - "@jest/test-result": "^27.4.2", - "@jest/types": "^27.4.2", - "chalk": "^4.0.0", - "exit": "^0.1.2", - "graceful-fs": "^4.2.4", - "import-local": "^3.0.2", - "jest-config": "^27.4.4", - "jest-util": "^27.4.2", - "jest-validate": "^27.4.2", - "prompts": "^2.0.1", - "yargs": "^16.2.0" - } - } - } - }, - "jest-changed-files": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.4.2.tgz", - "integrity": "sha512-/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A==", - "dev": true, - "requires": { - "@jest/types": "^27.4.2", - "execa": "^5.0.0", - "throat": "^6.0.1" - } - }, - "jest-circus": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.4.tgz", - "integrity": "sha512-4DWhvQerDq5X4GaqhEUoZiBhuNdKDGr0geW0iJwarbDljAmGaGOErKQG+z2PBr0vgN05z7tsGSY51mdWr8E4xg==", - "dev": true, - "requires": { - "@jest/environment": "^27.4.4", - "@jest/test-result": "^27.4.2", - "@jest/types": "^27.4.2", - "@types/node": "*", - "chalk": "^4.0.0", - "co": "^4.6.0", - "dedent": "^0.7.0", - "expect": "^27.4.2", - "is-generator-fn": "^2.0.0", - "jest-each": "^27.4.2", - "jest-matcher-utils": "^27.4.2", - "jest-message-util": "^27.4.2", - "jest-runtime": "^27.4.4", - "jest-snapshot": "^27.4.4", - "jest-util": "^27.4.2", - "pretty-format": "^27.4.2", - "slash": "^3.0.0", - "stack-utils": "^2.0.3", - "throat": "^6.0.1" - } - }, - "jest-config": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.4.4.tgz", - "integrity": "sha512-6lxg0ugO6KS2zKEbpdDwBzu1IT0Xg4/VhxXMuBu+z/5FvBjLCEMTaWQm3bCaGCZUR9j9FK4DzUIxyhIgn6kVEg==", - "dev": true, - "requires": { - "@babel/core": "^7.1.0", - "@jest/test-sequencer": "^27.4.4", - "@jest/types": "^27.4.2", - "babel-jest": "^27.4.4", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "deepmerge": "^4.2.2", - "glob": "^7.1.1", - "graceful-fs": "^4.2.4", - "jest-circus": "^27.4.4", - "jest-environment-jsdom": "^27.4.4", - "jest-environment-node": "^27.4.4", - "jest-get-type": "^27.4.0", - "jest-jasmine2": "^27.4.4", - "jest-regex-util": "^27.4.0", - "jest-resolve": "^27.4.4", - "jest-runner": "^27.4.4", - "jest-util": "^27.4.2", - "jest-validate": "^27.4.2", - "micromatch": "^4.0.4", - "pretty-format": "^27.4.2", - "slash": "^3.0.0" - } - }, - "jest-diff": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.2.tgz", - "integrity": "sha512-ujc9ToyUZDh9KcqvQDkk/gkbf6zSaeEg9AiBxtttXW59H/AcqEYp1ciXAtJp+jXWva5nAf/ePtSsgWwE5mqp4Q==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "diff-sequences": "^27.4.0", - "jest-get-type": "^27.4.0", - "pretty-format": "^27.4.2" - } - }, - "jest-docblock": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.4.0.tgz", - "integrity": "sha512-7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg==", - "dev": true, - "requires": { - "detect-newline": "^3.0.0" - } - }, - "jest-each": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.4.2.tgz", - "integrity": "sha512-53V2MNyW28CTruB3lXaHNk6PkiIFuzdOC9gR3C6j8YE/ACfrPnz+slB0s17AgU1TtxNzLuHyvNlLJ+8QYw9nBg==", - "dev": true, - "requires": { - "@jest/types": "^27.4.2", - "chalk": "^4.0.0", - "jest-get-type": "^27.4.0", - "jest-util": "^27.4.2", - "pretty-format": "^27.4.2" - } - }, - "jest-environment-jsdom": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.4.tgz", - "integrity": "sha512-cYR3ndNfHBqQgFvS1RL7dNqSvD//K56j/q1s2ygNHcfTCAp12zfIromO1w3COmXrxS8hWAh7+CmZmGCIoqGcGA==", - "dev": true, - "requires": { - "@jest/environment": "^27.4.4", - "@jest/fake-timers": "^27.4.2", - "@jest/types": "^27.4.2", - "@types/node": "*", - "jest-mock": "^27.4.2", - "jest-util": "^27.4.2", - "jsdom": "^16.6.0" - } - }, - "jest-environment-node": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.4.tgz", - "integrity": "sha512-D+v3lbJ2GjQTQR23TK0kY3vFVmSeea05giInI41HHOaJnAwOnmUHTZgUaZL+VxUB43pIzoa7PMwWtCVlIUoVoA==", - "dev": true, - "requires": { - "@jest/environment": "^27.4.4", - "@jest/fake-timers": "^27.4.2", - "@jest/types": "^27.4.2", - "@types/node": "*", - "jest-mock": "^27.4.2", - "jest-util": "^27.4.2" - } - }, - "jest-get-type": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.4.0.tgz", - "integrity": "sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", "dev": true }, - "jest-haste-map": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.4.tgz", - "integrity": "sha512-kvspmHmgPIZoDaqUsvsJFTaspuxhATvdO6wsFNGNSi8kfdiOCEEvECNbht8xG+eE5Ol88JyJmp2D7RF4dYo85Q==", - "dev": true, - "requires": { - "@jest/types": "^27.4.2", - "@types/graceful-fs": "^4.1.2", - "@types/node": "*", - "anymatch": "^3.0.3", - "fb-watchman": "^2.0.0", - "fsevents": "^2.3.2", - "graceful-fs": "^4.2.4", - "jest-regex-util": "^27.4.0", - "jest-serializer": "^27.4.0", - "jest-util": "^27.4.2", - "jest-worker": "^27.4.4", - "micromatch": "^4.0.4", - "walker": "^1.0.7" - } - }, - "jest-jasmine2": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.4.tgz", - "integrity": "sha512-ygk2tUgtLeN3ouj4KEYw9p81GLI1EKrnvourPULN5gdgB482PH5op9gqaRG0IenbJhBbbRwiSvh5NoBoQZSqdA==", - "dev": true, - "requires": { - "@babel/traverse": "^7.1.0", - "@jest/environment": "^27.4.4", - "@jest/source-map": "^27.4.0", - "@jest/test-result": "^27.4.2", - "@jest/types": "^27.4.2", - "@types/node": "*", - "chalk": "^4.0.0", - "co": "^4.6.0", - "expect": "^27.4.2", - "is-generator-fn": "^2.0.0", - "jest-each": "^27.4.2", - "jest-matcher-utils": "^27.4.2", - "jest-message-util": "^27.4.2", - "jest-runtime": "^27.4.4", - "jest-snapshot": "^27.4.4", - "jest-util": "^27.4.2", - "pretty-format": "^27.4.2", - "throat": "^6.0.1" - } - }, - "jest-leak-detector": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.2.tgz", - "integrity": "sha512-ml0KvFYZllzPBJWDei3mDzUhyp/M4ubKebX++fPaudpe8OsxUE+m+P6ciVLboQsrzOCWDjE20/eXew9QMx/VGw==", - "dev": true, - "requires": { - "jest-get-type": "^27.4.0", - "pretty-format": "^27.4.2" - } - }, - "jest-matcher-utils": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.2.tgz", - "integrity": "sha512-jyP28er3RRtMv+fmYC/PKG8wvAmfGcSNproVTW2Y0P/OY7/hWUOmsPfxN1jOhM+0u2xU984u2yEagGivz9OBGQ==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "jest-diff": "^27.4.2", - "jest-get-type": "^27.4.0", - "pretty-format": "^27.4.2" - } + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true }, - "jest-message-util": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.2.tgz", - "integrity": "sha512-OMRqRNd9E0DkBLZpFtZkAGYOXl6ZpoMtQJWTAREJKDOFa0M6ptB7L67tp+cszMBkvSgKOhNtQp2Vbcz3ZZKo/w==", + "is-number-object": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz", + "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==", "dev": true, "requires": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^27.4.2", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.4", - "micromatch": "^4.0.4", - "pretty-format": "^27.4.2", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" + "has-tostringtag": "^1.0.0" } }, - "jest-mock": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.2.tgz", - "integrity": "sha512-PDDPuyhoukk20JrQKeofK12hqtSka7mWH0QQuxSNgrdiPsrnYYLS6wbzu/HDlxZRzji5ylLRULeuI/vmZZDrYA==", - "dev": true, - "requires": { - "@jest/types": "^27.4.2", - "@types/node": "*" - } + "is-path-cwd": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", + "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", + "dev": true }, - "jest-pnp-resolver": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", - "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==", + "is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", "dev": true }, - "jest-regex-util": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.4.0.tgz", - "integrity": "sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==", + "is-plain-object": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", + "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", "dev": true }, - "jest-resolve": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.4.tgz", - "integrity": "sha512-Yh5jK3PBmDbm01Rc8pT0XqpBlTPEGwWp7cN61ijJuwony/tR2Taof3TLy6yfNiuRS8ucUOPO7NBYm3ei38kkcg==", - "dev": true, - "requires": { - "@jest/types": "^27.4.2", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.4.4", - "jest-pnp-resolver": "^1.2.2", - "jest-util": "^27.4.2", - "jest-validate": "^27.4.2", - "resolve": "^1.20.0", - "resolve.exports": "^1.1.0", - "slash": "^3.0.0" - } + "is-promise": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", + "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", + "dev": true }, - "jest-resolve-dependencies": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.4.tgz", - "integrity": "sha512-iAnpCXh81sd9nbyqySvm5/aV9X6JZKE0dQyFXTC8tptXcdrgS0vjPFy+mEgzPHxXw+tq4TQupuTa0n8OXwRIxw==", + "is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "dev": true, "requires": { - "@jest/types": "^27.4.2", - "jest-regex-util": "^27.4.0", - "jest-snapshot": "^27.4.4" + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" } }, - "jest-runner": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.4.tgz", - "integrity": "sha512-AXv/8Q0Xf1puWnDf52m7oLrK7sXcv6re0V/kItwTSVHJbX7Oebm07oGFQqGmq0R0mhO1zpmB3OpqRuaCN2elPA==", - "dev": true, - "requires": { - "@jest/console": "^27.4.2", - "@jest/environment": "^27.4.4", - "@jest/test-result": "^27.4.2", - "@jest/transform": "^27.4.4", - "@jest/types": "^27.4.2", - "@types/node": "*", - "chalk": "^4.0.0", - "emittery": "^0.8.1", - "exit": "^0.1.2", - "graceful-fs": "^4.2.4", - "jest-docblock": "^27.4.0", - "jest-environment-jsdom": "^27.4.4", - "jest-environment-node": "^27.4.4", - "jest-haste-map": "^27.4.4", - "jest-leak-detector": "^27.4.2", - "jest-message-util": "^27.4.2", - "jest-resolve": "^27.4.4", - "jest-runtime": "^27.4.4", - "jest-util": "^27.4.2", - "jest-worker": "^27.4.4", - "source-map-support": "^0.5.6", - "throat": "^6.0.1" - } - }, - "jest-runtime": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.4.tgz", - "integrity": "sha512-tZGay6P6vXJq8t4jVFAUzYHx+lzIHXjz+rj1XBk6mAR1Lwtf5kz0Uun7qNuU+oqpZu4+hhuxpUfXb6j30bEPqA==", - "dev": true, - "requires": { - "@jest/console": "^27.4.2", - "@jest/environment": "^27.4.4", - "@jest/globals": "^27.4.4", - "@jest/source-map": "^27.4.0", - "@jest/test-result": "^27.4.2", - "@jest/transform": "^27.4.4", - "@jest/types": "^27.4.2", - "@types/yargs": "^16.0.0", - "chalk": "^4.0.0", - "cjs-module-lexer": "^1.0.0", - "collect-v8-coverage": "^1.0.0", - "execa": "^5.0.0", - "exit": "^0.1.2", - "glob": "^7.1.3", - "graceful-fs": "^4.2.4", - "jest-haste-map": "^27.4.4", - "jest-message-util": "^27.4.2", - "jest-mock": "^27.4.2", - "jest-regex-util": "^27.4.0", - "jest-resolve": "^27.4.4", - "jest-snapshot": "^27.4.4", - "jest-util": "^27.4.2", - "jest-validate": "^27.4.2", - "slash": "^3.0.0", - "strip-bom": "^4.0.0", - "yargs": "^16.2.0" - }, - "dependencies": { - "strip-bom": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", - "dev": true - } - } + "is-shared-array-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz", + "integrity": "sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==", + "dev": true }, - "jest-serializer": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.4.0.tgz", - "integrity": "sha512-RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ==", + "is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", "dev": true, "requires": { - "@types/node": "*", - "graceful-fs": "^4.2.4" - } - }, - "jest-snapshot": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.4.tgz", - "integrity": "sha512-yy+rpCvYMOjTl7IMuaMI9OP9WT229zi8BhdNHm6e6mttAOIzvIiCxFoZ6yRxaV3HDPPgMryi+ReX2b8+IQJdPA==", - "dev": true, - "requires": { - "@babel/core": "^7.7.2", - "@babel/generator": "^7.7.2", - "@babel/parser": "^7.7.2", - "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/traverse": "^7.7.2", - "@babel/types": "^7.0.0", - "@jest/transform": "^27.4.4", - "@jest/types": "^27.4.2", - "@types/babel__traverse": "^7.0.4", - "@types/prettier": "^2.1.5", - "babel-preset-current-node-syntax": "^1.0.0", - "chalk": "^4.0.0", - "expect": "^27.4.2", - "graceful-fs": "^4.2.4", - "jest-diff": "^27.4.2", - "jest-get-type": "^27.4.0", - "jest-haste-map": "^27.4.4", - "jest-matcher-utils": "^27.4.2", - "jest-message-util": "^27.4.2", - "jest-resolve": "^27.4.4", - "jest-util": "^27.4.2", - "natural-compare": "^1.4.0", - "pretty-format": "^27.4.2", - "semver": "^7.3.2" + "has-tostringtag": "^1.0.0" } }, - "jest-util": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.4.2.tgz", - "integrity": "sha512-YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA==", + "is-symbol": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", "dev": true, "requires": { - "@jest/types": "^27.4.2", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.4", - "picomatch": "^2.2.3" + "has-symbols": "^1.0.2" } }, - "jest-validate": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.2.tgz", - "integrity": "sha512-hWYsSUej+Fs8ZhOm5vhWzwSLmVaPAxRy+Mr+z5MzeaHm9AxUpXdoVMEW4R86y5gOobVfBsMFLk4Rb+QkiEpx1A==", - "dev": true, - "requires": { - "@jest/types": "^27.4.2", - "camelcase": "^6.2.0", - "chalk": "^4.0.0", - "jest-get-type": "^27.4.0", - "leven": "^3.1.0", - "pretty-format": "^27.4.2" - }, - "dependencies": { - "camelcase": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz", - "integrity": "sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==", - "dev": true - } - } + "is-unicode-supported": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-1.2.0.tgz", + "integrity": "sha512-wH+U77omcRzevfIG8dDhTS0V9zZyweakfD01FULl97+0EHiJTTZtJqxPSkIIo/SDPv/i07k/C9jAPY+jwLLeUQ==", + "dev": true }, - "jest-watcher": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.2.tgz", - "integrity": "sha512-NJvMVyyBeXfDezhWzUOCOYZrUmkSCiatpjpm+nFUid74OZEHk6aMLrZAukIiFDwdbqp6mTM6Ui1w4oc+8EobQg==", + "is-weakref": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", "dev": true, "requires": { - "@jest/test-result": "^27.4.2", - "@jest/types": "^27.4.2", - "@types/node": "*", - "ansi-escapes": "^4.2.1", - "chalk": "^4.0.0", - "jest-util": "^27.4.2", - "string-length": "^4.0.1" + "call-bind": "^1.0.2" } }, - "jest-worker": { - "version": "27.4.4", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.4.tgz", - "integrity": "sha512-jfwxYJvfua1b1XkyuyPh01ATmgg4e5fPM/muLmhy9Qc6dmiwacQB0MLHaU6IjEsv/+nAixHGxTn8WllA27Pn0w==", - "dev": true, - "requires": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "dependencies": { - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } - }, - "jsdom": { - "version": "16.7.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", - "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", - "dev": true, - "requires": { - "abab": "^2.0.5", - "acorn": "^8.2.4", - "acorn-globals": "^6.0.0", - "cssom": "^0.4.4", - "cssstyle": "^2.3.0", - "data-urls": "^2.0.0", - "decimal.js": "^10.2.1", - "domexception": "^2.0.1", - "escodegen": "^2.0.0", - "form-data": "^3.0.0", - "html-encoding-sniffer": "^2.0.1", - "http-proxy-agent": "^4.0.1", - "https-proxy-agent": "^5.0.0", - "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.0", - "parse5": "6.0.1", - "saxes": "^5.0.1", - "symbol-tree": "^3.2.4", - "tough-cookie": "^4.0.0", - "w3c-hr-time": "^1.0.2", - "w3c-xmlserializer": "^2.0.0", - "webidl-conversions": "^6.1.0", - "whatwg-encoding": "^1.0.5", - "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^8.5.0", - "ws": "^7.4.6", - "xml-name-validator": "^3.0.0" - } - }, - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "js-string-escape": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz", + "integrity": "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=", "dev": true }, + "js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -3611,18 +2042,6 @@ "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==", "dev": true }, - "kleur": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", - "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", - "dev": true - }, - "leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", - "dev": true - }, "levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", @@ -3639,6 +2058,12 @@ "integrity": "sha512-qkSSNDjDDycZ2Wcw+GziNBB3nNo3ddYUInM/PL8Amgwbd9RQ/BKGj2/1d6mdxKgBFnUqZuaDbkIwkE4KUwwmtQ==", "dev": true }, + "load-json-file": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-7.0.1.tgz", + "integrity": "sha512-Gnxj3ev3mB5TkVBGad0JM6dmLiQL+o0t23JPBZ9sd+yvSLk05mFoqKBw5N8gbbkU4TNXyqCgIrl/VM17OgUIgQ==", + "dev": true + }, "locate-path": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", @@ -3660,12 +2085,6 @@ "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", "dev": true }, - "lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", - "dev": true - }, "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -3687,44 +2106,45 @@ "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==", "dev": true }, - "make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "requires": { - "semver": "^6.0.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, "make-error": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", "dev": true }, - "makeerror": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", - "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", + "map-age-cleaner": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", + "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", "dev": true, "requires": { - "tmpl": "1.0.5" + "p-defer": "^1.0.0" } }, "marked": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/marked/-/marked-3.0.8.tgz", - "integrity": "sha512-0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw==", + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz", + "integrity": "sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ==", "dev": true }, + "matcher": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/matcher/-/matcher-5.0.0.tgz", + "integrity": "sha512-s2EMBOWtXFc8dgqvoAzKJXxNHibcdJMV0gwqKUaw9E2JBJuGUK7DrNKrA6g/i+v72TT16+6sVm5mS3thaMLQUw==", + "dev": true, + "requires": { + "escape-string-regexp": "^5.0.0" + } + }, + "md5-hex": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-3.0.1.tgz", + "integrity": "sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==", + "dev": true, + "requires": { + "blueimp-md5": "^2.10.0" + } + }, "mdast-util-from-markdown": { "version": "0.8.5", "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz", @@ -3744,11 +2164,15 @@ "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==", "dev": true }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true + "mem": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/mem/-/mem-9.0.2.tgz", + "integrity": "sha512-F2t4YIv9XQUBHt6AOJ0y7lSmP1+cY7Fm1DRh9GClTGzKST7UWLMx6ly9WZdLH/G/ppM5RL4MlQfRT71ri9t19A==", + "dev": true, + "requires": { + "map-age-cleaner": "^0.1.3", + "mimic-fn": "^4.0.0" + } }, "merge2": { "version": "1.4.1", @@ -3767,55 +2191,39 @@ } }, "micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", - "dev": true, - "requires": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" - } - }, - "mime-db": { - "version": "1.51.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", - "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==", - "dev": true - }, - "mime-types": { - "version": "2.1.34", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", - "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", "dev": true, "requires": { - "mime-db": "1.51.0" + "braces": "^3.0.2", + "picomatch": "^2.3.1" } }, "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", "dev": true }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, "natural-compare": { @@ -3825,28 +2233,22 @@ "dev": true }, "nise": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.0.tgz", - "integrity": "sha512-W5WlHu+wvo3PaKLsJJkgPup2LrsXCcm7AWwyNZkUnn5rwPkuPBi3Iwk5SQtN0mv+K65k7nKKjwNQ30wg3wLAQQ==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.1.tgz", + "integrity": "sha512-yr5kW2THW1AkxVmCnKEh4nbYkJdB3I7LUkiUgOvEkOp414mc2UMaHMA7pjq1nYowhdoJZGwEKGaQVbxfpWj10A==", "dev": true, "requires": { - "@sinonjs/commons": "^1.7.0", - "@sinonjs/fake-timers": "^7.0.4", + "@sinonjs/commons": "^1.8.3", + "@sinonjs/fake-timers": ">=5", "@sinonjs/text-encoding": "^0.7.1", "just-extend": "^4.0.2", "path-to-regexp": "^1.7.0" } }, - "node-int64": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=", - "dev": true - }, - "node-releases": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", - "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", + "nofilter": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/nofilter/-/nofilter-3.1.0.tgz", + "integrity": "sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g==", "dev": true }, "normalize-path": { @@ -3855,30 +2257,15 @@ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "requires": { - "path-key": "^3.0.0" - } - }, - "nwsapi": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", - "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", - "dev": true - }, "oauth": { "version": "0.9.15", "resolved": "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz", "integrity": "sha1-vR/vr2hslrdUda7VGWQS/2DPucE=" }, "object-inspect": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz", - "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz", + "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==", "dev": true }, "object-keys": { @@ -3930,15 +2317,6 @@ "wrappy": "1" } }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, "optionator": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", @@ -3953,6 +2331,21 @@ "word-wrap": "^1.2.3" } }, + "p-defer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", + "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", + "dev": true + }, + "p-event": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/p-event/-/p-event-5.0.1.tgz", + "integrity": "sha512-dd589iCQ7m1L0bmC5NLlVYfy3TbBEsMUfWx9PyAgPeIcFZ/E2yaTZ4Rz4MiBmmJShviiftHVXOqfnfzJ6kyMrQ==", + "dev": true, + "requires": { + "p-timeout": "^5.0.2" + } + }, "p-limit": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", @@ -3971,6 +2364,42 @@ "p-limit": "^1.1.0" } }, + "p-map": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-5.3.0.tgz", + "integrity": "sha512-SRbIQFoLYNezHkqZslqeg963HYUtqOrfMCxjNrFOpJ19WTYuq26rQoOXeX8QQiMLUlLqdYV/7PuDsdYJ7hLE1w==", + "dev": true, + "requires": { + "aggregate-error": "^4.0.0" + }, + "dependencies": { + "aggregate-error": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-4.0.0.tgz", + "integrity": "sha512-8DGp7zUt1E9k0NE2q4jlXHk+V3ORErmwolEdRz9iV+LKJ40WhMHh92cxAvhqV2I+zEn/gotIoqoMs0NjF3xofg==", + "dev": true, + "requires": { + "clean-stack": "^4.0.0", + "indent-string": "^5.0.0" + } + }, + "clean-stack": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-4.1.0.tgz", + "integrity": "sha512-dxXQYI7mfQVcaF12s6sjNFoZ6ZPDQuBBLp3QJ5156k9EvUFClUoZ11fo8HnLQO241DDVntHEug8MOuFO5PSfRg==", + "dev": true, + "requires": { + "escape-string-regexp": "5.0.0" + } + } + } + }, + "p-timeout": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-5.0.2.tgz", + "integrity": "sha512-sEmji9Yaq+Tw+STwsGAE56hf7gMy9p0tQfJojIAamB7WHJYJKf1qlsg9jqBWG8q9VCxKPhZaP/AcXwEoBcYQhQ==", + "dev": true + }, "p-try": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", @@ -3984,6 +2413,14 @@ "dev": true, "requires": { "callsites": "^3.0.0" + }, + "dependencies": { + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + } } }, "parse-entities": { @@ -4000,10 +2437,10 @@ "is-hexadecimal": "^1.0.0" } }, - "parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", + "parse-ms": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz", + "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==", "dev": true }, "path-exists": { @@ -4039,37 +2476,80 @@ "isarray": "0.0.1" } }, - "path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true - }, - "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true - }, - "picomatch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", - "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", - "dev": true - }, - "pirates": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz", - "integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==", - "dev": true - }, - "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true + }, + "picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true + }, + "pkg-conf": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/pkg-conf/-/pkg-conf-4.0.0.tgz", + "integrity": "sha512-7dmgi4UY4qk+4mj5Cd8v/GExPo0K+SlY+hulOSdfZ/T6jVH6//y7NtzZo5WrfhDBxuQ0jCa7fLZmNaNh7EWL/w==", + "dev": true, + "requires": { + "find-up": "^6.0.0", + "load-json-file": "^7.0.0" + }, + "dependencies": { + "find-up": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz", + "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==", + "dev": true, + "requires": { + "locate-path": "^7.1.0", + "path-exists": "^5.0.0" + } + }, + "locate-path": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.1.0.tgz", + "integrity": "sha512-HNx5uOnYeK4SxEoid5qnhRfprlJeGMzFRKPLCf/15N3/B4AiofNwC/yq7VBKdVk9dx7m+PiYCJOGg55JYTAqoQ==", + "dev": true, + "requires": { + "p-locate": "^6.0.0" + } + }, + "p-limit": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", + "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", + "dev": true, + "requires": { + "yocto-queue": "^1.0.0" + } + }, + "p-locate": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", + "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", + "dev": true, + "requires": { + "p-limit": "^4.0.0" + } + }, + "path-exists": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", + "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", + "dev": true + } + } + }, + "plur": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/plur/-/plur-5.1.0.tgz", + "integrity": "sha512-VP/72JeXqak2KiOzjgKtQen5y3IZHn+9GOuLDafPv0eXa47xq0At93XahYBs26MsifCQ4enGKwbjBTKgb9QJXg==", "dev": true, "requires": { - "find-up": "^2.1.0" + "irregular-plurals": "^3.3.0" } }, "prelude-ls": { @@ -4079,15 +2559,15 @@ "dev": true }, "prettier": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz", - "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.1.tgz", + "integrity": "sha512-8UVbTBYGwN37Bs9LERmxCPjdvPxlEowx2urIL6urHzdb3SDq4B/Z6xLFCblrSnE4iKWcS6ziJ3aOYrc1kz/E2A==", "dev": true }, "prettier-plugin-jsdoc": { - "version": "0.3.30", - "resolved": "https://registry.npmjs.org/prettier-plugin-jsdoc/-/prettier-plugin-jsdoc-0.3.30.tgz", - "integrity": "sha512-BTBojOMmrUA1qsWLpJN5whUfU/E72WBUQAB5AvrDkha+O8TxmqaAivnuW+87ItYGRPBFWWzj2r5iWELhBml1Ag==", + "version": "0.3.33", + "resolved": "https://registry.npmjs.org/prettier-plugin-jsdoc/-/prettier-plugin-jsdoc-0.3.33.tgz", + "integrity": "sha512-DvSuTArH2nUFCa0DrSkLfJwsIpXxhpvxwIIvE2Gs0zEyDIdjFGKa9oCj/h17MQk640Gzm4Eey3u4NwyfMq0uiw==", "dev": true, "requires": { "binary-search-bounds": "^2.0.5", @@ -4096,48 +2576,15 @@ "mdast-util-from-markdown": "^0.8.5" } }, - "pretty-format": { - "version": "27.4.2", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.2.tgz", - "integrity": "sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==", - "dev": true, - "requires": { - "@jest/types": "^27.4.2", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^17.0.1" - }, - "dependencies": { - "ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true - } - } - }, - "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true - }, - "prompts": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", - "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "pretty-ms": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz", + "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==", "dev": true, "requires": { - "kleur": "^3.0.3", - "sisteransi": "^1.0.5" + "parse-ms": "^2.1.0" } }, - "psl": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", - "dev": true - }, "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", @@ -4150,11 +2597,14 @@ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true }, - "react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", - "dev": true + "readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "requires": { + "picomatch": "^2.2.1" + } }, "regexpp": { "version": "3.2.0", @@ -4169,13 +2619,14 @@ "dev": true }, "resolve": { - "version": "1.20.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", - "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==", + "version": "1.22.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", + "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", "dev": true, "requires": { - "is-core-module": "^2.2.0", - "path-parse": "^1.0.6" + "is-core-module": "^2.8.1", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" } }, "resolve-cwd": { @@ -4185,26 +2636,12 @@ "dev": true, "requires": { "resolve-from": "^5.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true - } } }, "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true - }, - "resolve.exports": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz", - "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true }, "reusify": { @@ -4231,27 +2668,6 @@ "queue-microtask": "^1.2.2" } }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "saxes": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", - "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", - "dev": true, - "requires": { - "xmlchars": "^2.2.0" - } - }, "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -4261,6 +2677,15 @@ "lru-cache": "^6.0.0" } }, + "serialize-error": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", + "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", + "dev": true, + "requires": { + "type-fest": "^0.13.1" + } + }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -4277,9 +2702,9 @@ "dev": true }, "shiki": { - "version": "0.9.14", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.9.14.tgz", - "integrity": "sha512-uLHjjyJdNsMzF9GOF8vlOuZ8BwigiYPraMN5yjC826k8K7Xu90JQcC5GUNrzRibLgT2EOk9597I1IX+jRdA8nw==", + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/shiki/-/shiki-0.10.1.tgz", + "integrity": "sha512-VsY7QJVzU51j5o1+DguUd+6vmCmZ5v/6gYu4vyYAhzjuNQU6P/vmSy4uQaOhvje031qQMiW0d2BwgMH52vqMng==", "dev": true, "requires": { "jsonc-parser": "^3.0.0", @@ -4299,62 +2724,39 @@ } }, "signal-exit": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", - "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==", + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true }, "sinon": { - "version": "12.0.1", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-12.0.1.tgz", - "integrity": "sha512-iGu29Xhym33ydkAT+aNQFBINakjq69kKO6ByPvTsm3yyIACfyQttRTP03aBP/I8GfhFmLzrnKwNNkr0ORb1udg==", + "version": "13.0.1", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-13.0.1.tgz", + "integrity": "sha512-8yx2wIvkBjIq/MGY1D9h1LMraYW+z1X0mb648KZnKSdvLasvDu7maa0dFaNYdTDczFgbjNw2tOmWdTk9saVfwQ==", "dev": true, "requires": { "@sinonjs/commons": "^1.8.3", - "@sinonjs/fake-timers": "^8.1.0", - "@sinonjs/samsam": "^6.0.2", + "@sinonjs/fake-timers": "^9.0.0", + "@sinonjs/samsam": "^6.1.1", "diff": "^5.0.0", - "nise": "^5.1.0", + "nise": "^5.1.1", "supports-color": "^7.2.0" - }, - "dependencies": { - "@sinonjs/fake-timers": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz", - "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==", - "dev": true, - "requires": { - "@sinonjs/commons": "^1.7.0" - } - } } }, - "sisteransi": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", - "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", - "dev": true - }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "slice-ansi": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", + "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", "dev": true, "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" + "ansi-styles": "^6.0.0", + "is-fullwidth-code-point": "^4.0.0" } }, "sprintf-js": { @@ -4380,25 +2782,15 @@ } } }, - "string-length": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", - "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", - "dev": true, - "requires": { - "char-regex": "^1.0.2", - "strip-ansi": "^6.0.0" - } - }, "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", "dev": true, "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" } }, "string.prototype.trimend": { @@ -4422,12 +2814,12 @@ } }, "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz", + "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==", "dev": true, "requires": { - "ansi-regex": "^5.0.1" + "ansi-regex": "^6.0.1" } }, "strip-bom": { @@ -4436,18 +2828,24 @@ "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", "dev": true }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true - }, "strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true }, + "supertap": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/supertap/-/supertap-3.0.1.tgz", + "integrity": "sha512-u1ZpIBCawJnO+0QePsEiOknOfCRq0yERxiAchT0i4li0WHNUJbf0evXXSXOcCAR4M8iMDoajXYmstm/qO81Isw==", + "dev": true, + "requires": { + "indent-string": "^5.0.0", + "js-yaml": "^3.14.1", + "serialize-error": "^7.0.1", + "strip-ansi": "^7.0.1" + } + }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4457,42 +2855,17 @@ "has-flag": "^4.0.0" } }, - "supports-hyperlinks": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz", - "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==", - "dev": true, - "requires": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" - } - }, - "symbol-tree": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true }, - "terminal-link": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", - "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "supports-hyperlinks": "^2.0.0" - } - }, - "test-exclude": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", - "dev": true, - "requires": { - "@istanbuljs/schema": "^0.1.2", - "glob": "^7.1.4", - "minimatch": "^3.0.4" - } + "temp-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz", + "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==", + "dev": true }, "text-table": { "version": "0.2.0", @@ -4500,22 +2873,10 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, - "throat": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz", - "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==", - "dev": true - }, - "tmpl": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", - "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", - "dev": true - }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "time-zone": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-1.0.0.tgz", + "integrity": "sha1-mcW/VZWJZq9tBtg73zgA3IL67F0=", "dev": true }, "to-regex-range": { @@ -4527,50 +2888,32 @@ "is-number": "^7.0.0" } }, - "tough-cookie": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz", - "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==", - "dev": true, - "requires": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.1.2" - } - }, - "tr46": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", - "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", - "dev": true, - "requires": { - "punycode": "^2.1.1" - } - }, - "ts-jest": { - "version": "27.1.1", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-27.1.1.tgz", - "integrity": "sha512-Ds0VkB+cB+8g2JUmP/GKWndeZcCKrbe6jzolGrVWdqVUFByY/2KDHqxJ7yBSon7hDB1TA4PXxjfZ+JjzJisvgA==", - "dev": true, - "requires": { - "bs-logger": "0.x", - "fast-json-stable-stringify": "2.x", - "jest-util": "^27.0.0", - "json5": "2.x", - "lodash.memoize": "4.x", - "make-error": "1.x", - "semver": "7.x", - "yargs-parser": "20.x" + "ts-node": { + "version": "10.7.0", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.7.0.tgz", + "integrity": "sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==", + "dev": true, + "requires": { + "@cspotcode/source-map-support": "0.7.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.0", + "yn": "3.1.1" }, "dependencies": { - "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } + "diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true } } }, @@ -4624,43 +2967,54 @@ "dev": true }, "type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", + "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", "dev": true }, - "typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, - "requires": { - "is-typedarray": "^1.0.0" - } - }, "typedoc": { - "version": "0.22.10", - "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.22.10.tgz", - "integrity": "sha512-hQYZ4WtoMZ61wDC6w10kxA42+jclWngdmztNZsDvIz7BMJg7F2xnT+uYsUa7OluyKossdFj9E9Ye4QOZKTy8SA==", + "version": "0.22.13", + "resolved": "https://registry.npmjs.org/typedoc/-/typedoc-0.22.13.tgz", + "integrity": "sha512-NHNI7Dr6JHa/I3+c62gdRNXBIyX7P33O9TafGLd07ur3MqzcKgwTvpg18EtvCLHJyfeSthAtCLpM7WkStUmDuQ==", "dev": true, "requires": { "glob": "^7.2.0", "lunr": "^2.3.9", - "marked": "^3.0.8", - "minimatch": "^3.0.4", - "shiki": "^0.9.12" + "marked": "^4.0.12", + "minimatch": "^5.0.1", + "shiki": "^0.10.1" + }, + "dependencies": { + "brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0" + } + }, + "minimatch": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", + "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==", + "dev": true, + "requires": { + "brace-expansion": "^2.0.1" + } + } } }, "typedoc-plugin-extras": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/typedoc-plugin-extras/-/typedoc-plugin-extras-2.2.1.tgz", - "integrity": "sha512-WOIB587S+Q+DojCFB89QVLT4NGmC1tjaHDunnZ20Z2eEEe6w7AdYtS5oqO6S6v1VPCzj4WehGbayK7TbnCzIMg==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/typedoc-plugin-extras/-/typedoc-plugin-extras-2.2.3.tgz", + "integrity": "sha512-G4sLPKHO/Q2AB3arxy8Co0jdvO6glGCHtGOUxiiR/Kx1fz+C+/ZbN6Jxu3qi7nyVVW5sX39bW26w+7EjpxicqQ==", "dev": true }, "typescript": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.3.tgz", - "integrity": "sha512-eVYaEHALSt+s9LbvgEv4Ef+Tdq7hBiIZgii12xXJnukryt3pMgJf6aKhoCZ3FWQsu6sydEnkg11fYXLzhLBjeQ==", + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz", + "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==", "dev": true }, "unbox-primitive": { @@ -4684,12 +3038,6 @@ "@types/unist": "^2.0.2" } }, - "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true - }, "uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -4705,29 +3053,16 @@ "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", "dev": true }, - "v8-to-istanbul": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz", - "integrity": "sha512-/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA==", - "dev": true, - "requires": { - "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^1.6.0", - "source-map": "^0.7.3" - }, - "dependencies": { - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true - } - } + "v8-compile-cache-lib": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz", + "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==", + "dev": true }, "vscode-oniguruma": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.6.1.tgz", - "integrity": "sha512-vc4WhSIaVpgJ0jJIejjYxPvURJavX6QG41vu0mGhqywMkQqulezEqEQ3cO3gc8GvcOpX6ycmKGqRoROEMBNXTQ==", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.6.2.tgz", + "integrity": "sha512-KH8+KKov5eS/9WhofZR8M8dMHWN2gTxjMsG4jd04YhpbPR91fUj7rYQ2/XjeHCJWbg7X++ApRIU9NUwM2vTvLA==", "dev": true }, "vscode-textmate": { @@ -4736,65 +3071,12 @@ "integrity": "sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ==", "dev": true }, - "w3c-hr-time": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", - "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", - "dev": true, - "requires": { - "browser-process-hrtime": "^1.0.0" - } - }, - "w3c-xmlserializer": { + "well-known-symbols": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", - "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", - "dev": true, - "requires": { - "xml-name-validator": "^3.0.0" - } - }, - "walker": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", - "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", - "dev": true, - "requires": { - "makeerror": "1.0.12" - } - }, - "webidl-conversions": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", - "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", - "dev": true - }, - "whatwg-encoding": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", - "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", - "dev": true, - "requires": { - "iconv-lite": "0.4.24" - } - }, - "whatwg-mimetype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", - "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", + "resolved": "https://registry.npmjs.org/well-known-symbols/-/well-known-symbols-2.0.0.tgz", + "integrity": "sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==", "dev": true }, - "whatwg-url": { - "version": "8.7.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", - "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", - "dev": true, - "requires": { - "lodash": "^4.7.0", - "tr46": "^2.1.0", - "webidl-conversions": "^6.1.0" - } - }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -4832,6 +3114,55 @@ "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + } } }, "wrappy": { @@ -4841,35 +3172,15 @@ "dev": true }, "write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz", + "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==", "dev": true, "requires": { "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" + "signal-exit": "^3.0.7" } }, - "ws": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz", - "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==", - "dev": true - }, - "xml-name-validator": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", - "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", - "dev": true - }, - "xmlchars": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", - "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", - "dev": true - }, "y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -4883,24 +3194,76 @@ "dev": true }, "yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "version": "17.4.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.4.0.tgz", + "integrity": "sha512-WJudfrk81yWFSOkZYpAZx4Nt7V4xp7S/uJkX0CnxovMCt1wCE8LNftPpNuF9X/u9gN5nsD7ycYtRcDf2pL3UiA==", "dev": true, "requires": { "cliui": "^7.0.2", "escalade": "^3.1.1", "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "string-width": "^4.2.0", + "string-width": "^4.2.3", "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" + "yargs-parser": "^21.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + } } }, "yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "version": "21.0.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz", + "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==", + "dev": true + }, + "yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true + }, + "yocto-queue": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", + "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", "dev": true } } diff --git a/package.json b/package.json index 9b0f5996..4e072156 100644 --- a/package.json +++ b/package.json @@ -12,16 +12,21 @@ "build": "tsc", "prepublishOnly": "npm run build && npm run test && npm run lint", "test": "npm run test:unit && npm run test:e2e", - "test:unit": "jest tests/unit --verbose", - "test:e2e": "jest tests/e2e --setupFiles=./tests/setup.ts --runInBand", "prettier": "prettier --write src/**/*.ts", "doc": "typedoc --name \"Confluence.js - Cloud and Server API library\" --out docs ./src/index.ts --plugin typedoc-plugin-extras --footerDate --footerTime --footerTypedocVersion --favicon https://svgshare.com/i/bVi.svg", "lint": "eslint src --ext .ts", - "lint:fix": "npm run lint -- --fix" + "lint:fix": "npm run lint -- --fix", + "test:unit": "ava --timeout=2m tests/unit", + "test:e2e": "ava --timeout=2m --fail-fast --no-worker-threads -c 1 -s tests/e2e/**/*.test.ts" }, - "jest": { - "preset": "ts-jest", - "testEnvironment": "node" + "ava": { + "extensions": [ + "ts" + ], + "require": [ + "ts-node/register", + "dotenv/config" + ] }, "keywords": [ "confluence", @@ -34,29 +39,28 @@ ], "devDependencies": { "@types/express": "^4.17.13", - "@types/jest": "^27.0.3", "@types/oauth": "^0.9.1", - "@types/sinon": "^10.0.6", - "@typescript-eslint/eslint-plugin": "^5.6.0", - "@typescript-eslint/parser": "^5.6.0", - "dotenv": "^10.0.0", - "eslint": "^8.4.1", - "eslint-config-airbnb": "^19.0.2", - "eslint-config-airbnb-typescript": "^16.1.0", - "eslint-import-resolver-typescript": "^2.5.0", - "eslint-plugin-import": "^2.25.3", - "jest": "^27.4.4", - "prettier": "^2.5.1", - "prettier-plugin-jsdoc": "^0.3.30", - "sinon": "^12.0.1", - "ts-jest": "^27.1.1", - "typedoc": "^0.22.10", - "typedoc-plugin-extras": "^2.2.1", - "typescript": "^4.5.3" + "@types/sinon": "^10.0.11", + "@typescript-eslint/eslint-plugin": "^5.17.0", + "@typescript-eslint/parser": "^5.17.0", + "ava": "^4.1.0", + "dotenv": "^16.0.0", + "eslint": "^8.12.0", + "eslint-config-airbnb": "^19.0.4", + "eslint-config-airbnb-typescript": "^16.1.4", + "eslint-import-resolver-typescript": "^2.7.0", + "eslint-plugin-import": "^2.25.4", + "prettier": "^2.6.1", + "prettier-plugin-jsdoc": "^0.3.33", + "sinon": "^13.0.1", + "ts-node": "^10.7.0", + "typedoc": "^0.22.13", + "typedoc-plugin-extras": "^2.2.3", + "typescript": "^4.6.3" }, "dependencies": { "atlassian-jwt": "^2.0.2", - "axios": "^0.24.0", + "axios": "^0.26.1", "oauth": "^0.9.15", "tslib": "^2.3.1" } diff --git a/src/api/audit.ts b/src/api/audit.ts index 0fef0a0a..8ec406fb 100644 --- a/src/api/audit.ts +++ b/src/api/audit.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class Audit { diff --git a/src/api/content.ts b/src/api/content.ts index 9b5d331c..540157e6 100644 --- a/src/api/content.ts +++ b/src/api/content.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class Content { diff --git a/src/api/contentAttachments.ts b/src/api/contentAttachments.ts index 2fe02785..333ec693 100644 --- a/src/api/contentAttachments.ts +++ b/src/api/contentAttachments.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class ContentAttachments { diff --git a/src/api/contentBody.ts b/src/api/contentBody.ts index 3d1f6d2c..75b4f4a9 100644 --- a/src/api/contentBody.ts +++ b/src/api/contentBody.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class ContentBody { diff --git a/src/api/contentChildrenAndDescendants.ts b/src/api/contentChildrenAndDescendants.ts index 52850405..c6fe9594 100644 --- a/src/api/contentChildrenAndDescendants.ts +++ b/src/api/contentChildrenAndDescendants.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class ContentChildrenAndDescendants { diff --git a/src/api/contentComments.ts b/src/api/contentComments.ts index 6bdd9b65..c1e8346a 100644 --- a/src/api/contentComments.ts +++ b/src/api/contentComments.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class ContentComments { diff --git a/src/api/contentLabels.ts b/src/api/contentLabels.ts index 193d5a19..9b48d41d 100644 --- a/src/api/contentLabels.ts +++ b/src/api/contentLabels.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class ContentLabels { diff --git a/src/api/contentMacroBody.ts b/src/api/contentMacroBody.ts index a342f6e4..af86a22c 100644 --- a/src/api/contentMacroBody.ts +++ b/src/api/contentMacroBody.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class ContentMacroBody { diff --git a/src/api/contentPermissions.ts b/src/api/contentPermissions.ts index 9ad3b976..858a9ca3 100644 --- a/src/api/contentPermissions.ts +++ b/src/api/contentPermissions.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class ContentPermissions { diff --git a/src/api/contentProperties.ts b/src/api/contentProperties.ts index da781d10..d56be0fc 100644 --- a/src/api/contentProperties.ts +++ b/src/api/contentProperties.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class ContentProperties { diff --git a/src/api/contentRestrictions.ts b/src/api/contentRestrictions.ts index aeec2f3e..0ade1c8f 100644 --- a/src/api/contentRestrictions.ts +++ b/src/api/contentRestrictions.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class ContentRestrictions { diff --git a/src/api/contentVersions.ts b/src/api/contentVersions.ts index 659863d1..88a019de 100644 --- a/src/api/contentVersions.ts +++ b/src/api/contentVersions.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class ContentVersions { diff --git a/src/api/contentWatches.ts b/src/api/contentWatches.ts index f2047687..727f6daa 100644 --- a/src/api/contentWatches.ts +++ b/src/api/contentWatches.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class ContentWatches { diff --git a/src/api/dynamicModules.ts b/src/api/dynamicModules.ts index d4c68f7b..983e30a3 100644 --- a/src/api/dynamicModules.ts +++ b/src/api/dynamicModules.ts @@ -1,6 +1,6 @@ import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class DynamicModules { diff --git a/src/api/experimental.ts b/src/api/experimental.ts index 66bff51f..aace257a 100644 --- a/src/api/experimental.ts +++ b/src/api/experimental.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class Experimental { diff --git a/src/api/group.ts b/src/api/group.ts index 9a7340a1..4a290d83 100644 --- a/src/api/group.ts +++ b/src/api/group.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class Group { diff --git a/src/api/inlineTasks.ts b/src/api/inlineTasks.ts index 5b7e2a83..4948d540 100644 --- a/src/api/inlineTasks.ts +++ b/src/api/inlineTasks.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class InlineTasks { diff --git a/src/api/labelInfo.ts b/src/api/labelInfo.ts index 758b7ff8..9496b879 100644 --- a/src/api/labelInfo.ts +++ b/src/api/labelInfo.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class LabelInfo { diff --git a/src/api/longRunningTask.ts b/src/api/longRunningTask.ts index 615f50c6..b84f3de0 100644 --- a/src/api/longRunningTask.ts +++ b/src/api/longRunningTask.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class LongRunningTask { diff --git a/src/api/models/blueprintTemplate.ts b/src/api/models/blueprintTemplate.ts index d1472ecd..443351dd 100644 --- a/src/api/models/blueprintTemplate.ts +++ b/src/api/models/blueprintTemplate.ts @@ -1,6 +1,6 @@ -import { Label } from './label'; import { ContentBody } from './contentBody'; import { GenericLinks } from './genericLinks'; +import { Label } from './label'; export interface BlueprintTemplate { templateId: string; diff --git a/src/api/models/bulkUserLookup.ts b/src/api/models/bulkUserLookup.ts index 1235d24a..d255e4f2 100644 --- a/src/api/models/bulkUserLookup.ts +++ b/src/api/models/bulkUserLookup.ts @@ -1,8 +1,8 @@ +import { GenericLinks } from './genericLinks'; import { Icon } from './icon'; import { OperationCheckResult } from './operationCheckResult'; -import { UserDetails } from './userDetails'; import { Space } from './space'; -import { GenericLinks } from './genericLinks'; +import { UserDetails } from './userDetails'; export interface BulkUserLookup { type: string; diff --git a/src/api/models/content.ts b/src/api/models/content.ts index a3398835..1c6ce641 100644 --- a/src/api/models/content.ts +++ b/src/api/models/content.ts @@ -1,13 +1,13 @@ -import { Space } from './space'; -import { ContentHistory } from './contentHistory'; -import { Version } from './version'; -import { OperationCheckResult } from './operationCheckResult'; -import { ContentChildren } from './contentChildren'; -import { ContentChildType } from './contentChildType'; import { Container } from './container'; import { ContentBody } from './contentBody'; +import { ContentChildren } from './contentChildren'; +import { ContentChildType } from './contentChildType'; +import { ContentHistory } from './contentHistory'; import { ContentRestriction } from './contentRestriction'; import { GenericLinks } from './genericLinks'; +import { OperationCheckResult } from './operationCheckResult'; +import { Space } from './space'; +import { Version } from './version'; /** Base object for all content types. */ export interface Content { diff --git a/src/api/models/contentHistory.ts b/src/api/models/contentHistory.ts index 0f5ca049..ebb94648 100644 --- a/src/api/models/contentHistory.ts +++ b/src/api/models/contentHistory.ts @@ -1,7 +1,7 @@ +import { GenericLinks } from './genericLinks'; import { User } from './user'; -import { Version } from './version'; import { UsersUserKeys } from './usersUserKeys'; -import { GenericLinks } from './genericLinks'; +import { Version } from './version'; export interface ContentHistory { latest: boolean; diff --git a/src/api/models/contentLookAndFeel.ts b/src/api/models/contentLookAndFeel.ts index 2a0d9128..a8c2016b 100644 --- a/src/api/models/contentLookAndFeel.ts +++ b/src/api/models/contentLookAndFeel.ts @@ -1,5 +1,5 @@ -import { ScreenLookAndFeel } from './screenLookAndFeel'; import { ContainerLookAndFeel } from './containerLookAndFeel'; +import { ScreenLookAndFeel } from './screenLookAndFeel'; export interface ContentLookAndFeel { screen: ScreenLookAndFeel; diff --git a/src/api/models/contentMetadata.ts b/src/api/models/contentMetadata.ts index 9f09371b..2157d8c1 100644 --- a/src/api/models/contentMetadata.ts +++ b/src/api/models/contentMetadata.ts @@ -1,6 +1,6 @@ -import { Version } from './version'; import { GenericLinks } from './genericLinks'; import { LabelArray } from './labelArray'; +import { Version } from './version'; /** Metadata object for page, blogpost, comment content */ export interface ContentMetadata { diff --git a/src/api/models/contentRestriction.ts b/src/api/models/contentRestriction.ts index 4bfb34e0..51093127 100644 --- a/src/api/models/contentRestriction.ts +++ b/src/api/models/contentRestriction.ts @@ -1,7 +1,7 @@ -import { UserArray } from './userArray'; -import { GroupArray } from './groupArray'; import { Content } from './content'; import { GenericLinks } from './genericLinks'; +import { GroupArray } from './groupArray'; +import { UserArray } from './userArray'; export interface ContentRestriction { operation: string; diff --git a/src/api/models/contentTemplate.ts b/src/api/models/contentTemplate.ts index 948235b7..26c4432e 100644 --- a/src/api/models/contentTemplate.ts +++ b/src/api/models/contentTemplate.ts @@ -1,6 +1,6 @@ -import { Label } from './label'; import { ContentBody } from './contentBody'; import { GenericLinks } from './genericLinks'; +import { Label } from './label'; export interface ContentTemplate { templateId: string; diff --git a/src/api/models/copyPageRequest.ts b/src/api/models/copyPageRequest.ts index 3d748404..98ee1e85 100644 --- a/src/api/models/copyPageRequest.ts +++ b/src/api/models/copyPageRequest.ts @@ -1,5 +1,5 @@ -import { CopyPageRequestDestination } from './copyPageRequestDestination'; import { ContentBodyCreate } from './contentBodyCreate'; +import { CopyPageRequestDestination } from './copyPageRequestDestination'; export interface CopyPageRequest { /** If set to `true`, attachments are copied to the destination page. */ diff --git a/src/api/models/horizontalHeaderLookAndFeel.ts b/src/api/models/horizontalHeaderLookAndFeel.ts index bf990fb4..c2422422 100644 --- a/src/api/models/horizontalHeaderLookAndFeel.ts +++ b/src/api/models/horizontalHeaderLookAndFeel.ts @@ -1,7 +1,7 @@ import { ButtonLookAndFeel } from './buttonLookAndFeel'; -import { TopNavigationLookAndFeel } from './topNavigationLookAndFeel'; import { NavigationLookAndFeel } from './navigationLookAndFeel'; import { SearchFieldLookAndFeel } from './searchFieldLookAndFeel'; +import { TopNavigationLookAndFeel } from './topNavigationLookAndFeel'; export interface HorizontalHeaderLookAndFeel { backgroundColor: string; diff --git a/src/api/models/labelArray.ts b/src/api/models/labelArray.ts index 697e5789..25dba002 100644 --- a/src/api/models/labelArray.ts +++ b/src/api/models/labelArray.ts @@ -1,5 +1,5 @@ -import { Label } from './label'; import { GenericLinks } from './genericLinks'; +import { Label } from './label'; export interface LabelArray { results: Label[]; diff --git a/src/api/models/longTaskStatusArray.ts b/src/api/models/longTaskStatusArray.ts index 7278e997..e6a4a073 100644 --- a/src/api/models/longTaskStatusArray.ts +++ b/src/api/models/longTaskStatusArray.ts @@ -1,5 +1,5 @@ -import { LongTaskStatus } from './longTaskStatus'; import { GenericLinks } from './genericLinks'; +import { LongTaskStatus } from './longTaskStatus'; export interface LongTaskStatusArray { results: LongTaskStatus[]; diff --git a/src/api/models/lookAndFeel.ts b/src/api/models/lookAndFeel.ts index a1e91d61..e1a5b6ef 100644 --- a/src/api/models/lookAndFeel.ts +++ b/src/api/models/lookAndFeel.ts @@ -1,7 +1,7 @@ -import { MenusLookAndFeel } from './menusLookAndFeel'; -import { HeaderLookAndFeel } from './headerLookAndFeel'; import { ContentLookAndFeel } from './contentLookAndFeel'; +import { HeaderLookAndFeel } from './headerLookAndFeel'; import { HorizontalHeaderLookAndFeel } from './horizontalHeaderLookAndFeel'; +import { MenusLookAndFeel } from './menusLookAndFeel'; export interface LookAndFeel { headings: { diff --git a/src/api/models/migratedUserArray.ts b/src/api/models/migratedUserArray.ts index 51058330..4bf7d0b1 100644 --- a/src/api/models/migratedUserArray.ts +++ b/src/api/models/migratedUserArray.ts @@ -1,5 +1,5 @@ -import { MigratedUser } from './migratedUser'; import { GenericLinks } from './genericLinks'; +import { MigratedUser } from './migratedUser'; export interface MigratedUserArray { results: MigratedUser[]; diff --git a/src/api/models/relation.ts b/src/api/models/relation.ts index cfafe482..9a9e544b 100644 --- a/src/api/models/relation.ts +++ b/src/api/models/relation.ts @@ -1,5 +1,5 @@ -import { RelationData } from './relationData'; import { GenericLinks } from './genericLinks'; +import { RelationData } from './relationData'; export interface Relation { name: string; diff --git a/src/api/models/relationArray.ts b/src/api/models/relationArray.ts index 64c8cd50..16c6d94f 100644 --- a/src/api/models/relationArray.ts +++ b/src/api/models/relationArray.ts @@ -1,5 +1,5 @@ -import { Relation } from './relation'; import { GenericLinks } from './genericLinks'; +import { Relation } from './relation'; export interface RelationArray { results: Relation[]; diff --git a/src/api/models/searchPageResponseSearchResult.ts b/src/api/models/searchPageResponseSearchResult.ts index 65d83e54..042ad1ba 100644 --- a/src/api/models/searchPageResponseSearchResult.ts +++ b/src/api/models/searchPageResponseSearchResult.ts @@ -1,5 +1,5 @@ -import { SearchResult } from './searchResult'; import { GenericLinks } from './genericLinks'; +import { SearchResult } from './searchResult'; export interface SearchPageResponseSearchResult { results: SearchResult[]; diff --git a/src/api/models/searchResult.ts b/src/api/models/searchResult.ts index d4ebf17a..b8645e92 100644 --- a/src/api/models/searchResult.ts +++ b/src/api/models/searchResult.ts @@ -1,6 +1,6 @@ -import { Content } from './content'; -import { ContainerSummary } from './containerSummary'; import { Breadcrumb } from './breadcrumb'; +import { ContainerSummary } from './containerSummary'; +import { Content } from './content'; export interface SearchResult { content: Content; diff --git a/src/api/models/space.ts b/src/api/models/space.ts index f328a252..a9815896 100644 --- a/src/api/models/space.ts +++ b/src/api/models/space.ts @@ -1,13 +1,13 @@ -import { Icon } from './icon'; -import { SpaceDescription } from './spaceDescription'; import { Content } from './content'; +import { GenericLinks } from './genericLinks'; +import { Icon } from './icon'; import { LabelArray } from './labelArray'; +import { LookAndFeel } from './lookAndFeel'; import { OperationCheckResult } from './operationCheckResult'; +import { SpaceDescription } from './spaceDescription'; import { SpacePermission } from './spacePermission'; import { SpaceSettings } from './spaceSettings'; import { Theme } from './theme'; -import { LookAndFeel } from './lookAndFeel'; -import { GenericLinks } from './genericLinks'; export interface Space { id: number; diff --git a/src/api/models/spaceArray.ts b/src/api/models/spaceArray.ts index 81a25902..5dcec348 100644 --- a/src/api/models/spaceArray.ts +++ b/src/api/models/spaceArray.ts @@ -1,5 +1,5 @@ -import { Space } from './space'; import { GenericLinks } from './genericLinks'; +import { Space } from './space'; export interface SpaceArray { results: Space[]; diff --git a/src/api/models/spacePermission.ts b/src/api/models/spacePermission.ts index f3d2eaef..f719b1d3 100644 --- a/src/api/models/spacePermission.ts +++ b/src/api/models/spacePermission.ts @@ -1,6 +1,6 @@ -import { User } from './user'; import { Group } from './group'; import { OperationCheckResult } from './operationCheckResult'; +import { User } from './user'; /** * This object represents a permission for given space. Permissions consist of* at least one operation object with an diff --git a/src/api/models/spacePermissionCreate.ts b/src/api/models/spacePermissionCreate.ts index e634a81c..efa48b59 100644 --- a/src/api/models/spacePermissionCreate.ts +++ b/src/api/models/spacePermissionCreate.ts @@ -1,6 +1,6 @@ -import { User } from './user'; import { GroupCreate } from './groupCreate'; import { OperationCheckResult } from './operationCheckResult'; +import { User } from './user'; /** * This object represents a permission for given space. Permissions consist of* at least one operation object with an diff --git a/src/api/models/spacePermissionRequest.ts b/src/api/models/spacePermissionRequest.ts index aad211a2..d3626026 100644 --- a/src/api/models/spacePermissionRequest.ts +++ b/src/api/models/spacePermissionRequest.ts @@ -1,5 +1,5 @@ -import { PermissionSubject } from './permissionSubject'; import { GenericLinks } from './genericLinks'; +import { PermissionSubject } from './permissionSubject'; /** * This object represents the request for the single space permission. Permissions consist of* at least one operation diff --git a/src/api/models/spacePermissionV2.ts b/src/api/models/spacePermissionV2.ts index 57a51cb1..e909cc65 100644 --- a/src/api/models/spacePermissionV2.ts +++ b/src/api/models/spacePermissionV2.ts @@ -1,5 +1,5 @@ -import { PermissionSubject } from './permissionSubject'; import { GenericLinks } from './genericLinks'; +import { PermissionSubject } from './permissionSubject'; /** * This object represents a single space permission. Permissions consist of* at least one operation object with an diff --git a/src/api/models/spacePropertyArray.ts b/src/api/models/spacePropertyArray.ts index bf18ed3f..441a23dc 100644 --- a/src/api/models/spacePropertyArray.ts +++ b/src/api/models/spacePropertyArray.ts @@ -1,5 +1,5 @@ -import { SpaceProperty } from './spaceProperty'; import { GenericLinks } from './genericLinks'; +import { SpaceProperty } from './spaceProperty'; export interface SpacePropertyArray { results: SpaceProperty[]; diff --git a/src/api/models/spaceWatchArray.ts b/src/api/models/spaceWatchArray.ts index 52c7d90d..dce15192 100644 --- a/src/api/models/spaceWatchArray.ts +++ b/src/api/models/spaceWatchArray.ts @@ -1,5 +1,5 @@ -import { SpaceWatch } from './spaceWatch'; import { GenericLinks } from './genericLinks'; +import { SpaceWatch } from './spaceWatch'; export interface SpaceWatchArray { results: SpaceWatch[]; diff --git a/src/api/models/themeArray.ts b/src/api/models/themeArray.ts index d0f3cd32..28b99ed6 100644 --- a/src/api/models/themeArray.ts +++ b/src/api/models/themeArray.ts @@ -1,5 +1,5 @@ -import { ThemeNoLinks } from './themeNoLinks'; import { GenericLinks } from './genericLinks'; +import { ThemeNoLinks } from './themeNoLinks'; export interface ThemeArray { results: ThemeNoLinks[]; diff --git a/src/api/models/user.ts b/src/api/models/user.ts index 41e4b672..217c196c 100644 --- a/src/api/models/user.ts +++ b/src/api/models/user.ts @@ -1,8 +1,8 @@ +import { GenericLinks } from './genericLinks'; import { Icon } from './icon'; import { OperationCheckResult } from './operationCheckResult'; -import { UserDetails } from './userDetails'; import { Space } from './space'; -import { GenericLinks } from './genericLinks'; +import { UserDetails } from './userDetails'; export interface User { type: string; diff --git a/src/api/models/userAnonymous.ts b/src/api/models/userAnonymous.ts index f6697d08..d1605235 100644 --- a/src/api/models/userAnonymous.ts +++ b/src/api/models/userAnonymous.ts @@ -1,6 +1,6 @@ +import { GenericLinks } from './genericLinks'; import { Icon } from './icon'; import { OperationCheckResult } from './operationCheckResult'; -import { GenericLinks } from './genericLinks'; export interface UserAnonymous { type: string; diff --git a/src/api/models/usersUserKeys.ts b/src/api/models/usersUserKeys.ts index 21a78ae2..0dadfb5c 100644 --- a/src/api/models/usersUserKeys.ts +++ b/src/api/models/usersUserKeys.ts @@ -1,5 +1,5 @@ -import { User } from './user'; import { GenericLinks } from './genericLinks'; +import { User } from './user'; export interface UsersUserKeys { users: User[]; diff --git a/src/api/models/version.ts b/src/api/models/version.ts index 20f8df60..0d8b74e7 100644 --- a/src/api/models/version.ts +++ b/src/api/models/version.ts @@ -1,7 +1,7 @@ -import { User } from './user'; import { Content } from './content'; -import { UsersUserKeys } from './usersUserKeys'; import { GenericLinks } from './genericLinks'; +import { User } from './user'; +import { UsersUserKeys } from './usersUserKeys'; export interface Version { by: User; diff --git a/src/api/models/versionArray.ts b/src/api/models/versionArray.ts index c6e35b4e..fd3aa149 100644 --- a/src/api/models/versionArray.ts +++ b/src/api/models/versionArray.ts @@ -1,5 +1,5 @@ -import { Version } from './version'; import { GenericLinks } from './genericLinks'; +import { Version } from './version'; export interface VersionArray { results: Version[]; diff --git a/src/api/models/watchArray.ts b/src/api/models/watchArray.ts index 44b3aafc..a52ba1d0 100644 --- a/src/api/models/watchArray.ts +++ b/src/api/models/watchArray.ts @@ -1,5 +1,5 @@ -import { Watch } from './watch'; import { GenericLinks } from './genericLinks'; +import { Watch } from './watch'; export interface WatchArray { results: Watch[]; diff --git a/src/api/relation.ts b/src/api/relation.ts index d6866a02..0e0b9375 100644 --- a/src/api/relation.ts +++ b/src/api/relation.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class Relation { diff --git a/src/api/search.ts b/src/api/search.ts index 27765e2f..a2955f87 100644 --- a/src/api/search.ts +++ b/src/api/search.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class Search { diff --git a/src/api/settings.ts b/src/api/settings.ts index 09b3a44f..f2494c55 100644 --- a/src/api/settings.ts +++ b/src/api/settings.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class Settings { diff --git a/src/api/space.ts b/src/api/space.ts index 39504551..5f14505d 100644 --- a/src/api/space.ts +++ b/src/api/space.ts @@ -1,7 +1,8 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; +import { paramSerializer } from '../paramSerializer'; import { RequestConfig } from '../requestConfig'; export class Space { @@ -31,7 +32,7 @@ export class Space { url: '/api/space', method: 'GET', params: { - spaceKey: () => parameters?.spaceKey?.map((key) => `spaceKey=${key}`).join('&'), + spaceKey: paramSerializer('spaceKey', parameters?.spaceKey), spaceId: parameters?.spaceId, type: parameters?.type, status: parameters?.status, diff --git a/src/api/spacePermissions.ts b/src/api/spacePermissions.ts index 4e1ad2fd..c307ba08 100644 --- a/src/api/spacePermissions.ts +++ b/src/api/spacePermissions.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class SpacePermissions { diff --git a/src/api/spaceProperties.ts b/src/api/spaceProperties.ts index f1a594aa..f0d21d18 100644 --- a/src/api/spaceProperties.ts +++ b/src/api/spaceProperties.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class SpaceProperties { diff --git a/src/api/spaceSettings.ts b/src/api/spaceSettings.ts index f18b2683..7bcb0f8f 100644 --- a/src/api/spaceSettings.ts +++ b/src/api/spaceSettings.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class SpaceSettings { diff --git a/src/api/template.ts b/src/api/template.ts index 526960df..41696773 100644 --- a/src/api/template.ts +++ b/src/api/template.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class Template { diff --git a/src/api/themes.ts b/src/api/themes.ts index 4c506d09..79274fb2 100644 --- a/src/api/themes.ts +++ b/src/api/themes.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class Themes { diff --git a/src/api/users.ts b/src/api/users.ts index 0c867ac8..2ca21b67 100644 --- a/src/api/users.ts +++ b/src/api/users.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class Users { diff --git a/src/clients/baseClient.ts b/src/clients/baseClient.ts index 20cb8d80..71edab2d 100644 --- a/src/clients/baseClient.ts +++ b/src/clients/baseClient.ts @@ -1,9 +1,9 @@ -import axios, { AxiosInstance } from 'axios'; -import type { Client } from './client'; +import { AuthenticationService } from '../services/authenticationService'; import type { Callback } from '../callback'; +import type { Client } from './client'; import type { Config } from '../config'; -import { AuthenticationService } from '../services/authenticationService'; import type { RequestConfig } from '../requestConfig'; +import axios, { AxiosInstance } from 'axios'; const ATLASSIAN_TOKEN_CHECK_FLAG = 'X-Atlassian-Token'; const ATLASSIAN_TOKEN_CHECK_NOCHECK_VALUE = 'no-check'; diff --git a/src/config.ts b/src/config.ts index 40fd4b19..ef19e68c 100644 --- a/src/config.ts +++ b/src/config.ts @@ -23,11 +23,13 @@ export namespace Config { export type Authentication = UtilityTypes.XOR<{ jwt: Authentication.JWT; + }, UtilityTypes.XOR<{ + personalAccessToken: Authentication.PersonalAccessToken; }, UtilityTypes.XOR<{ basic: Authentication.Basic; }, { oauth2: Authentication.OAuth2; - }>>; + }>>>; export interface Middlewares { onError?: Config.Middlewares.OnErrorHandler; @@ -40,10 +42,12 @@ export namespace Config { } export namespace Authentication { + export type PersonalAccessToken = string; + export type JWT = { /** The key from the app descriptor. */ issuer: string; - /** The sharedsecret key received during the app installation handshake */ + /** The shared secret key received during the app installation handshake */ secret: string; /** Token expiry time (default 3 minutes after issuing) */ expiryTimeSeconds?: number; diff --git a/src/paramSerializer.ts b/src/paramSerializer.ts new file mode 100644 index 00000000..f29eb59a --- /dev/null +++ b/src/paramSerializer.ts @@ -0,0 +1,15 @@ +export function paramSerializer(key: string, values?: string | string[]) { + if (typeof values === 'string') { + return () => `${key}=${values}`; + } + + if (!values) { + return undefined; + } + + if (!values.length) { + return ''; + } + + return () => values.map((value) => `${key}=${value}`).join('&'); +} diff --git a/src/server/audit.ts b/src/server/audit.ts index 43a9499c..288828d6 100644 --- a/src/server/audit.ts +++ b/src/server/audit.ts @@ -1,9 +1,9 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; -import { RequestConfig } from '../requestConfig'; +import { Client } from '../clients'; import { Pagination } from '../pagination'; +import { RequestConfig } from '../requestConfig'; export class Audit { constructor(private client: Client) {} diff --git a/src/server/content.ts b/src/server/content.ts index 05ddc999..7a4b9dce 100644 --- a/src/server/content.ts +++ b/src/server/content.ts @@ -1,9 +1,9 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; -import { RequestConfig } from '../requestConfig'; +import { Client } from '../clients'; import { Pagination } from '../pagination'; +import { RequestConfig } from '../requestConfig'; export class Content { constructor(private client: Client) {} diff --git a/src/server/contentBody.ts b/src/server/contentBody.ts index 29323a58..110dfdc2 100644 --- a/src/server/contentBody.ts +++ b/src/server/contentBody.ts @@ -1,7 +1,7 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; +import { Client } from '../clients'; import { RequestConfig } from '../requestConfig'; export class ContentBody { diff --git a/src/server/group.ts b/src/server/group.ts index 3cf32f57..370db7f6 100644 --- a/src/server/group.ts +++ b/src/server/group.ts @@ -1,9 +1,9 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; -import { RequestConfig } from '../requestConfig'; +import { Client } from '../clients'; import { Pagination } from '../pagination'; +import { RequestConfig } from '../requestConfig'; export class Group { constructor(private client: Client) {} diff --git a/src/server/longTask.ts b/src/server/longTask.ts index 8f126dce..361cc5e2 100644 --- a/src/server/longTask.ts +++ b/src/server/longTask.ts @@ -1,9 +1,9 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; -import { RequestConfig } from '../requestConfig'; +import { Client } from '../clients'; import { Pagination } from '../pagination'; +import { RequestConfig } from '../requestConfig'; export class LongTask { constructor(private client: Client) {} diff --git a/src/server/models/content.ts b/src/server/models/content.ts index 7ada84ee..cc6112f6 100644 --- a/src/server/models/content.ts +++ b/src/server/models/content.ts @@ -1,12 +1,12 @@ -import { Space } from './space'; -import { ContentHistory } from './contentHistory'; -import { Version } from './version'; -import { OperationCheckResult } from './operationCheckResult'; -import { ContentChildren } from './contentChildren'; -import { ContentChildType } from './contentChildType'; import { Container } from './container'; import { ContentBody } from './contentBody'; +import { ContentChildren } from './contentChildren'; +import { ContentChildType } from './contentChildType'; +import { ContentHistory } from './contentHistory'; import { ContentRestriction } from './contentRestriction'; +import { OperationCheckResult } from './operationCheckResult'; +import { Space } from './space'; +import { Version } from './version'; /** Base object for all content types. */ export interface Content { diff --git a/src/server/models/contentChildren.ts b/src/server/models/contentChildren.ts index 1a87e684..dd47be01 100644 --- a/src/server/models/contentChildren.ts +++ b/src/server/models/contentChildren.ts @@ -1,5 +1,5 @@ -import { Pagination } from '../../pagination'; import { Content } from './content'; +import { Pagination } from '../../pagination'; export interface ContentChildren { attachment?: Pagination; diff --git a/src/server/models/contentHistory.ts b/src/server/models/contentHistory.ts index d1581ed1..524436e1 100644 --- a/src/server/models/contentHistory.ts +++ b/src/server/models/contentHistory.ts @@ -1,6 +1,6 @@ -import { Version } from './version'; -import { UsersUserKeys } from './usersUserKeys'; import { User } from './user'; +import { UsersUserKeys } from './usersUserKeys'; +import { Version } from './version'; export interface ContentHistory { latest: boolean; diff --git a/src/server/models/contentLookAndFeel.ts b/src/server/models/contentLookAndFeel.ts index 2a0d9128..a8c2016b 100644 --- a/src/server/models/contentLookAndFeel.ts +++ b/src/server/models/contentLookAndFeel.ts @@ -1,5 +1,5 @@ -import { ScreenLookAndFeel } from './screenLookAndFeel'; import { ContainerLookAndFeel } from './containerLookAndFeel'; +import { ScreenLookAndFeel } from './screenLookAndFeel'; export interface ContentLookAndFeel { screen: ScreenLookAndFeel; diff --git a/src/server/models/contentRestriction.ts b/src/server/models/contentRestriction.ts index df57f3ef..73fa3f7e 100644 --- a/src/server/models/contentRestriction.ts +++ b/src/server/models/contentRestriction.ts @@ -1,6 +1,6 @@ -import { UserArray } from './userArray'; -import { GroupArray } from './groupArray'; import { Content } from './content'; +import { GroupArray } from './groupArray'; +import { UserArray } from './userArray'; export interface ContentRestriction { operation: string; diff --git a/src/server/models/lookAndFeel.ts b/src/server/models/lookAndFeel.ts index 744c6614..808736eb 100644 --- a/src/server/models/lookAndFeel.ts +++ b/src/server/models/lookAndFeel.ts @@ -1,6 +1,6 @@ -import { MenusLookAndFeel } from './menusLookAndFeel'; -import { HeaderLookAndFeel } from './headerLookAndFeel'; import { ContentLookAndFeel } from './contentLookAndFeel'; +import { HeaderLookAndFeel } from './headerLookAndFeel'; +import { MenusLookAndFeel } from './menusLookAndFeel'; export interface LookAndFeel { headings: { diff --git a/src/server/models/searchResult.ts b/src/server/models/searchResult.ts index d4ebf17a..b8645e92 100644 --- a/src/server/models/searchResult.ts +++ b/src/server/models/searchResult.ts @@ -1,6 +1,6 @@ -import { Content } from './content'; -import { ContainerSummary } from './containerSummary'; import { Breadcrumb } from './breadcrumb'; +import { ContainerSummary } from './containerSummary'; +import { Content } from './content'; export interface SearchResult { content: Content; diff --git a/src/server/models/space.ts b/src/server/models/space.ts index 15a4432d..b74eb3d3 100644 --- a/src/server/models/space.ts +++ b/src/server/models/space.ts @@ -1,12 +1,12 @@ -import { Icon } from './icon'; -import { SpaceDescription } from './spaceDescription'; import { Content } from './content'; +import { Icon } from './icon'; import { LabelArray } from './labelArray'; +import { LookAndFeel } from './lookAndFeel'; import { OperationCheckResult } from './operationCheckResult'; +import { SpaceDescription } from './spaceDescription'; import { SpacePermission } from './spacePermission'; import { SpaceSettings } from './spaceSettings'; import { Theme } from './theme'; -import { LookAndFeel } from './lookAndFeel'; export interface Space { id: number; diff --git a/src/server/models/spacePermission.ts b/src/server/models/spacePermission.ts index f3d2eaef..f719b1d3 100644 --- a/src/server/models/spacePermission.ts +++ b/src/server/models/spacePermission.ts @@ -1,6 +1,6 @@ -import { User } from './user'; import { Group } from './group'; import { OperationCheckResult } from './operationCheckResult'; +import { User } from './user'; /** * This object represents a permission for given space. Permissions consist of* at least one operation object with an diff --git a/src/server/models/user.ts b/src/server/models/user.ts index 4ff8d398..8727eaf9 100644 --- a/src/server/models/user.ts +++ b/src/server/models/user.ts @@ -1,7 +1,7 @@ import { Icon } from './icon'; import { OperationCheckResult } from './operationCheckResult'; -import { UserDetails } from './userDetails'; import { Space } from './space'; +import { UserDetails } from './userDetails'; export interface User { type: string; diff --git a/src/server/models/version.ts b/src/server/models/version.ts index 52874eca..f5cd3d78 100644 --- a/src/server/models/version.ts +++ b/src/server/models/version.ts @@ -1,5 +1,5 @@ -import { User } from './user'; import { Content } from './content'; +import { User } from './user'; import { UsersUserKeys } from './usersUserKeys'; export interface Version { diff --git a/src/server/search.ts b/src/server/search.ts index 7c0fac09..7cfd8ada 100644 --- a/src/server/search.ts +++ b/src/server/search.ts @@ -1,9 +1,9 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; -import { RequestConfig } from '../requestConfig'; +import { Client } from '../clients'; import { Pagination } from '../pagination'; +import { RequestConfig } from '../requestConfig'; export class Search { constructor(private client: Client) {} diff --git a/src/server/space.ts b/src/server/space.ts index cbd2e6ee..bc3e3fce 100644 --- a/src/server/space.ts +++ b/src/server/space.ts @@ -1,9 +1,9 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; -import { RequestConfig } from '../requestConfig'; +import { Client } from '../clients'; import { Pagination } from '../pagination'; +import { RequestConfig } from '../requestConfig'; export class Space { constructor(private client: Client) {} diff --git a/src/server/user.ts b/src/server/user.ts index f7d0ed0f..d562beac 100644 --- a/src/server/user.ts +++ b/src/server/user.ts @@ -1,9 +1,9 @@ import * as Models from './models'; import * as Parameters from './parameters'; -import { Client } from '../clients'; import { Callback } from '../callback'; -import { RequestConfig } from '../requestConfig'; +import { Client } from '../clients'; import { Pagination } from '../pagination'; +import { RequestConfig } from '../requestConfig'; export class User { constructor(private client: Client) {} diff --git a/src/services/authenticationService/authenticationService.ts b/src/services/authenticationService/authenticationService.ts index c3b32b6c..02db9e23 100644 --- a/src/services/authenticationService/authenticationService.ts +++ b/src/services/authenticationService/authenticationService.ts @@ -3,6 +3,7 @@ import { createBasicAuthenticationToken, createJWTAuthentication, createOAuth2AuthenticationToken, + createPATAuthenticationToken, } from './authentications'; export namespace AuthenticationService { @@ -30,6 +31,10 @@ export namespace AuthenticationService { return createJWTAuthentication(authentication.jwt, requestData!); } + if (authentication.personalAccessToken) { + return createPATAuthenticationToken(authentication.personalAccessToken); + } + return undefined; } } diff --git a/src/services/authenticationService/authentications/createBasicAuthenticationToken.ts b/src/services/authenticationService/authentications/createBasicAuthenticationToken.ts index 4be8b292..cdfc7180 100644 --- a/src/services/authenticationService/authentications/createBasicAuthenticationToken.ts +++ b/src/services/authenticationService/authentications/createBasicAuthenticationToken.ts @@ -1,5 +1,5 @@ -import { Config } from '../../../config'; import { Base64Encoder } from '../base64Encoder'; +import { Config } from '../../../config'; export function createBasicAuthenticationToken(authenticationData: Config.Authentication.Basic) { let login; diff --git a/src/services/authenticationService/authentications/createPATAuthenticationToken.ts b/src/services/authenticationService/authentications/createPATAuthenticationToken.ts new file mode 100644 index 00000000..ea1f7e2d --- /dev/null +++ b/src/services/authenticationService/authentications/createPATAuthenticationToken.ts @@ -0,0 +1,5 @@ +import { Config } from '../../../config'; + +export async function createPATAuthenticationToken(authenticationData: Config.Authentication.PersonalAccessToken) { + return `Bearer ${authenticationData}`; +} diff --git a/src/services/authenticationService/authentications/index.ts b/src/services/authenticationService/authentications/index.ts index 4354127b..8b0efb80 100644 --- a/src/services/authenticationService/authentications/index.ts +++ b/src/services/authenticationService/authentications/index.ts @@ -1,3 +1,4 @@ export * from './createBasicAuthenticationToken'; export * from './createJWTAuthentication'; export * from './createOAuth2AuthenticationToken'; +export * from './createPATAuthenticationToken'; diff --git a/tests/e2e/pageCreating.test.ts b/tests/e2e/pageCreating.test.ts index bb1d4de0..347d7e24 100644 --- a/tests/e2e/pageCreating.test.ts +++ b/tests/e2e/pageCreating.test.ts @@ -1,68 +1,67 @@ import { ConfluenceClient } from '../../src'; +import test from 'ava'; const HOST = process.env.HOST!; const EMAIL = process.env.EMAIL!; const API_TOKEN = process.env.API_TOKEN!; -describe('Page creating', () => { - let createdContentId: string; - const client = new ConfluenceClient({ - host: HOST, - telemetry: false, - authentication: { - basic: { - email: EMAIL, - apiToken: API_TOKEN, - }, +let createdContentId: string; +const client = new ConfluenceClient({ + host: HOST, + telemetry: false, + authentication: { + basic: { + email: EMAIL, + apiToken: API_TOKEN, }, + }, +}); + +test.serial('should create space', async (t) => { + const space = await client.space.createSpace({ + name: 'Auto testing software', + key: 'AUTOMATED', }); - it('should create space', async () => { - const space = await client.space.createSpace({ - name: 'Auto testing software', - key: 'AUTOMATED', - }); + t.truthy(!!space); + t.is(space.key, 'AUTOMATED'); + t.is(space.name, 'Auto testing software'); +}); - expect(space).toBeDefined(); - expect(space.key).toBe('AUTOMATED'); - expect(space.name).toBe('Auto testing software'); +test.serial('should create content', async (t) => { + const content = await client.content.createContent({ + title: 'Test page', + space: { + key: 'AUTOMATED', + }, + type: 'page', + body: { + view: { + value: '', + representation: 'view', + }, + }, }); - it('should create content', async () => { - const content = await client.content.createContent({ - title: 'Test page', - space: { - key: 'AUTOMATED', - }, - type: 'page', - body: { - view: { - value: '', - representation: 'view', - }, - }, - }); + createdContentId = content.id; - createdContentId = content.id; + t.truthy(!!content); + t.is(content.type, 'page'); + t.is(content.space?.key, 'AUTOMATED'); +}); - expect(content).toBeDefined(); - expect(content.type).toBe('page'); - expect(content.space?.key).toBe('AUTOMATED'); +test.serial('should remove content', async (t) => { + await client.content.deleteContent({ + id: createdContentId, }); - it('should remove content', async () => { - await client.content.deleteContent({ - id: createdContentId, - }); + t.pass(); +}); - expect(true).toBeTruthy(); +test.serial('should remove space', async (t) => { + const removedSpace = await client.space.deleteSpace({ + spaceKey: 'AUTOMATED', }); - it('should remove space', async () => { - const removedSpace = await client.space.deleteSpace({ - spaceKey: 'AUTOMATED', - }); - - expect(removedSpace).toBeDefined(); - }); + t.truthy(!!removedSpace); }); diff --git a/tests/setup.ts b/tests/setup.ts deleted file mode 100644 index 132b7abe..00000000 --- a/tests/setup.ts +++ /dev/null @@ -1,3 +0,0 @@ -import * as dotenv from 'dotenv'; - -dotenv.config(); diff --git a/tests/unit/api/space.test.ts b/tests/unit/api/space.test.ts index 9d4a0de0..cd60c6c6 100644 --- a/tests/unit/api/space.test.ts +++ b/tests/unit/api/space.test.ts @@ -1,47 +1,49 @@ import * as sinon from 'sinon'; -import { ConfluenceClient, Api } from '../../../src'; +import { ConfluenceClient } from '../../../src'; +import test from 'ava'; -describe('Space', () => { - const client = new ConfluenceClient({ host: '' }); +const config = { host: '' }; + +test('when spaceKey is not provided', (t) => { + const client = new ConfluenceClient(config); const sendRequestStub = sinon.stub(client, 'sendRequest'); - let space = new Api.Space(client); - afterEach(() => { - sendRequestStub.reset(); - space = new Api.Space(client); - }); + client.space.getSpaces({}); - describe('getSpaces should generate correct URL', () => { - it('when spaceKey is not provided', () => { - space.getSpaces({}); + const callArgument = sendRequestStub.lastCall.args[0]; - const callArgument = sendRequestStub.lastCall.args[0]; + t.is(callArgument.params.spaceKey, undefined); +}); - expect(callArgument.params.spaceKey()).toBe(undefined); - }); +test('when spaceKey is empty array', (t) => { + const client = new ConfluenceClient(config); + const sendRequestStub = sinon.stub(client, 'sendRequest'); - it('when spaceKey is empty array', () => { - space.getSpaces({ spaceKey: [] }); + client.space.getSpaces({ spaceKey: [] }); - const callArgument = sendRequestStub.lastCall.args[0]; + const callArgument = sendRequestStub.lastCall.args[0]; - expect(callArgument.params.spaceKey()).toBe(''); - }); + t.is(callArgument.params.spaceKey, ''); +}); - it('when spaceKey has one key', () => { - space.getSpaces({ spaceKey: ['KEY1'] }); +test('when spaceKey has one key', (t) => { + const client = new ConfluenceClient(config); + const sendRequestStub = sinon.stub(client, 'sendRequest'); - const callArgument = sendRequestStub.lastCall.args[0]; + client.space.getSpaces({ spaceKey: ['KEY1'] }); - expect(callArgument.params.spaceKey()).toBe('spaceKey=KEY1'); - }); + const callArgument = sendRequestStub.lastCall.args[0]; + + t.is(callArgument.params.spaceKey(), 'spaceKey=KEY1'); +}); + +test('when spaceKey has multiple keys', (t) => { + const client = new ConfluenceClient(config); + const sendRequestStub = sinon.stub(client, 'sendRequest'); - it('when spaceKey has multiple keys', () => { - space.getSpaces({ spaceKey: ['KEY1', 'KEY2'] }); + client.space.getSpaces({ spaceKey: ['KEY1', 'KEY2'] }); - const callArgument = sendRequestStub.lastCall.args[0]; + const callArgument = sendRequestStub.lastCall.args[0]; - expect(callArgument.params.spaceKey()).toBe('spaceKey=KEY1&spaceKey=KEY2'); - }); - }); + t.is(callArgument.params.spaceKey(), 'spaceKey=KEY1&spaceKey=KEY2'); }); diff --git a/tests/unit/index.test.ts b/tests/unit/index.test.ts index a609a285..82b75e33 100644 --- a/tests/unit/index.test.ts +++ b/tests/unit/index.test.ts @@ -1,56 +1,55 @@ +import test from 'ava'; import { + BaseClient, Callback, - RequestConfig, - Config, Client, - BaseClient, + Config, ConfluenceClient, + RequestConfig, } from '../../src'; -describe('Facade', () => { - it('Callback should be defined', () => { - const callback: Callback = () => {}; +test('Callback should be defined', (t) => { + const callback: Callback = () => {}; - expect(callback).toBeDefined(); - }); + t.truthy(!!callback); +}); - it('RequestConfig should be defined', () => { - const requestConfig: RequestConfig = {}; +test('RequestConfig should be defined', (t) => { + const requestConfig: RequestConfig = {}; - expect(requestConfig).toBeDefined(); - }); + t.truthy(!!requestConfig); +}); - it('Config should be defined', () => { - const config: Config = { - host: '', - }; +test('Config should be defined', (t) => { + const config: Config = { + host: '', + }; - expect(config).toBeDefined(); - expect(config.host).toBeDefined(); - expect(typeof config.host).toBe('string'); - }); + t.truthy(!!config); + t.is(config.host, ''); + t.is(typeof config.host, 'string'); +}); - it('Client should be defined', async () => { - const client: Client = { - sendRequest(): Promise { - return Promise.resolve(undefined); - }, - }; +test('Client should be defined', async (t) => { + const client: Client = { + sendRequest(): Promise { + return Promise.resolve(undefined); + }, + }; - expect(client).toBeDefined(); - expect(client.sendRequest).toBeDefined(); - expect(await client.sendRequest({})).toBeUndefined(); - }); + t.truthy(!!client); + t.truthy(!!client.sendRequest); + t.falsy(!!(await client.sendRequest({}))); +}); - it('BaseClient should be defined', () => { - const baseClient = new BaseClient({ host: '' }); +test('BaseClient should be defined', (t) => { + const baseClient = new BaseClient({ host: '' }); - expect(baseClient).toBeDefined(); - }); + t.truthy(!!baseClient); +}); - it('ConfluenceClient should be defined', () => { - const confluenceClient = new ConfluenceClient({ host: '' }); +test('ConfluenceClient should be defined', (t) => { + const confluenceClient = new ConfluenceClient({ host: '' }); - expect(confluenceClient).toBeDefined(); - }); + t.truthy(!!confluenceClient); }); diff --git a/tests/unit/serverApiClient.test.ts b/tests/unit/serverApiClient.test.ts index 1e1dcb88..04663a3d 100644 --- a/tests/unit/serverApiClient.test.ts +++ b/tests/unit/serverApiClient.test.ts @@ -1,20 +1,19 @@ import * as sinon from 'sinon'; import { ServerClient } from '../../src'; +import test from 'ava'; -describe('ServerApiClient', () => { - it('should create correct url', () => { - const serverClient = new ServerClient({ - host: 'https://localhost', - }); +test('should create correct url', t => { + const serverClient = new ServerClient({ + host: 'https://localhost', + }); - const stub = sinon.stub(serverClient, 'sendRequest'); + const stub = sinon.stub(serverClient, 'sendRequest'); - serverClient.audit.createAuditRecord({ remoteAddress: '' }); + serverClient.audit.createAuditRecord({ remoteAddress: '' }); - const callArgument = stub.getCall(0).args[0]; + const callArgument = stub.getCall(0).args[0]; - // @ts-ignore - expect(serverClient.instance.defaults.baseURL).toBe('https://localhost/'); - expect(callArgument.url).toBe('/rest/api/audit'); - }); + // @ts-ignore + t.is(serverClient.instance.defaults.baseURL, 'https://localhost/'); + t.is(callArgument.url, '/rest/api/audit'); }); diff --git a/tsconfig.lint.json b/tsconfig.lint.json new file mode 100644 index 00000000..4ff5a42b --- /dev/null +++ b/tsconfig.lint.json @@ -0,0 +1,7 @@ +{ + "extends": "./tsconfig.json", + "include": [ + "src", + "tests" + ] +} diff --git a/tsconfig.tests.json b/tsconfig.tests.json deleted file mode 100644 index 639e00bc..00000000 --- a/tsconfig.tests.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "compilerOptions": { - "target": "ES6", - "module": "CommonJS", - "outDir": "out", - "strict": true, - "declaration": true, - "importHelpers": true - }, - "exclude": [ - "node_modules", - "out" - ] -} From c51075ca6bf5ca3e887515ee778aedfb2fcada26 Mon Sep 17 00:00:00 2001 From: Vladislav Tupikin Date: Sat, 2 Apr 2022 20:44:38 +0400 Subject: [PATCH 4/5] 1.4.0 --- CHANGELOG.md | 11 + README.md | 1 + package-lock.json | 425 ++++++++++++++---- package.json | 6 +- src/api/analytics.ts | 44 ++ src/api/contentChildrenAndDescendants.ts | 10 +- src/api/contentContentState.ts | 157 +++++++ src/api/experimental.ts | 217 ++++++++- src/api/group.ts | 3 + src/api/index.ts | 2 + src/api/models/availableContentStates.ts | 7 + src/api/models/contentState.ts | 8 + src/api/models/contentStateContainer.ts | 6 + src/api/models/contentStateSettings.ts | 12 + src/api/models/copyPageHierarchyRequest.ts | 2 + src/api/models/index.ts | 8 + src/api/models/longTask.ts | 8 + src/api/models/userProperty.ts | 14 + src/api/models/userPropertyCreate.ts | 4 + src/api/models/userPropertyKeyArray.ts | 11 + src/api/models/userPropertyUpdate.ts | 4 + src/api/parameters/createUserProperty.ts | 11 + src/api/parameters/deletePageTree.ts | 4 + src/api/parameters/deleteUserProperty.ts | 9 + .../parameters/getAvailableContentStates.ts | 4 + src/api/parameters/getContentState.ts | 6 + .../parameters/getContentStateLastUpdated.ts | 4 + src/api/parameters/getContentStateSettings.ts | 4 + .../parameters/getGroupMembersByGroupId.ts | 5 + src/api/parameters/getMembersByQueryParam.ts | 5 + src/api/parameters/getSpaces.ts | 32 +- src/api/parameters/getUserProperties.ts | 8 + src/api/parameters/getUserProperty.ts | 6 + src/api/parameters/index.ts | 12 + src/api/parameters/removeContentState.ts | 4 + src/api/parameters/searchGroups.ts | 5 + src/api/parameters/setContentState.ts | 8 + src/api/parameters/updateUserProperty.ts | 11 + src/api/settings.ts | 22 + src/api/users.ts | 6 +- src/clients/confluenceClient.ts | 4 + 41 files changed, 1017 insertions(+), 113 deletions(-) create mode 100644 src/api/analytics.ts create mode 100644 src/api/contentContentState.ts create mode 100644 src/api/models/availableContentStates.ts create mode 100644 src/api/models/contentState.ts create mode 100644 src/api/models/contentStateContainer.ts create mode 100644 src/api/models/contentStateSettings.ts create mode 100644 src/api/models/longTask.ts create mode 100644 src/api/models/userProperty.ts create mode 100644 src/api/models/userPropertyCreate.ts create mode 100644 src/api/models/userPropertyKeyArray.ts create mode 100644 src/api/models/userPropertyUpdate.ts create mode 100644 src/api/parameters/createUserProperty.ts create mode 100644 src/api/parameters/deletePageTree.ts create mode 100644 src/api/parameters/deleteUserProperty.ts create mode 100644 src/api/parameters/getAvailableContentStates.ts create mode 100644 src/api/parameters/getContentState.ts create mode 100644 src/api/parameters/getContentStateLastUpdated.ts create mode 100644 src/api/parameters/getContentStateSettings.ts create mode 100644 src/api/parameters/getUserProperties.ts create mode 100644 src/api/parameters/getUserProperty.ts create mode 100644 src/api/parameters/removeContentState.ts create mode 100644 src/api/parameters/setContentState.ts create mode 100644 src/api/parameters/updateUserProperty.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 05cfab5a..5bbe4cc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +- Analytics API added. +- ContentContentState API added. +- `deletePageTree` method added to `Experimental`. +- `getUserProperties` method added to `Experimental`. +- `getUserProperty` method added to `Experimental`. +- `createUserProperty` method added to `Experimental`. +- `updateUserProperty` method added to `Experimental`. +- `deleteUserProperty` method added to `Experimental`. +- `getContentStateSettings` method added to `Settings`. +- Another small changes. + ### 1.3.0 - Telemetry removed (deprecated) diff --git a/README.md b/README.md index 5cef009c..5507d60d 100644 --- a/README.md +++ b/README.md @@ -235,6 +235,7 @@ client..(parametersObject); Available groups: +- [analytics](https://developer.atlassian.com/cloud/confluence/rest/api-group-analytics/) - [audit](https://developer.atlassian.com/cloud/confluence/rest/api-group-audit) - [content](https://developer.atlassian.com/cloud/confluence/rest/api-group-content/) - [contentAttachments](https://developer.atlassian.com/cloud/confluence/rest/api-group-content---attachments/#api-group-content---attachments) diff --git a/package-lock.json b/package-lock.json index 845e868c..9be80728 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "confluence.js", - "version": "1.3.1", + "version": "1.4.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -174,6 +174,15 @@ "@types/node": "*" } }, + "@types/debug": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz", + "integrity": "sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==", + "dev": true, + "requires": { + "@types/ms": "*" + } + }, "@types/express": { "version": "4.17.13", "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz", @@ -224,6 +233,12 @@ "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==", "dev": true }, + "@types/ms": { + "version": "0.7.31", + "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz", + "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==", + "dev": true + }, "@types/node": { "version": "17.0.18", "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.18.tgz", @@ -615,10 +630,10 @@ "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, - "binary-search-bounds": { + "binary-searching": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/binary-search-bounds/-/binary-search-bounds-2.0.5.tgz", - "integrity": "sha512-H0ea4Fd3lS1+sTEB2TgcLoK21lLhwEJzlQv3IN47pJS976Gx4zoWe0ak3q+uYh60ppQxg9F16Ri4tS1sfD4+jA==", + "resolved": "https://registry.npmjs.org/binary-searching/-/binary-searching-2.0.5.tgz", + "integrity": "sha512-v4N2l3RxL+m4zDxyxz3Ne2aTmiPn8ZUpKFpdPtO+ItW1NcTCXA7JeHG5GMBSvoKSkQZ9ycS+EouDVxYB9ufKWA==", "dev": true }, "blueimp-md5": { @@ -678,21 +693,9 @@ "dev": true }, "character-entities": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz", - "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==", - "dev": true - }, - "character-entities-legacy": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz", - "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==", - "dev": true - }, - "character-reference-invalid": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz", - "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.1.tgz", + "integrity": "sha512-OzmutCf2Kmc+6DrFrrPS8/tDh2+DpnrfzdICHWhcVC9eOd0N1PXmQEE1a8iM4IziIAG+8tmTq3K+oo0ubH6RRQ==", "dev": true }, "chokidar": { @@ -924,6 +927,15 @@ } } }, + "decode-named-character-reference": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.0.1.tgz", + "integrity": "sha512-YV/0HQHreRwKb7uBopyIkLG17jG6Sv2qUchk9qSoVJ2f+flwRsPNBO0hAnjt6mTNYUT+vw9Gy2ihXg4sUWPi2w==", + "dev": true, + "requires": { + "character-entities": "^2.0.0" + } + }, "deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", @@ -966,6 +978,12 @@ } } }, + "dequal": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.2.tgz", + "integrity": "sha512-q9K8BlJVxK7hQYqa6XISGmBZbtQQWVXSrRrWreHC94rMt1QL/Impruc+7p2CYSYuVIUr+YCt6hjrs1kkdJRTug==", + "dev": true + }, "diff": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", @@ -1222,9 +1240,9 @@ } }, "eslint-config-airbnb-typescript": { - "version": "16.1.4", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-16.1.4.tgz", - "integrity": "sha512-dfm2cEaYXh4mCYd+RyJO8+PQfd5/zp8WwrCeRznly5qD9W5tal3KTjgdInYWuEAdwWnNJxWcmQ/HFiA4bfkM1g==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/eslint-config-airbnb-typescript/-/eslint-config-airbnb-typescript-16.2.0.tgz", + "integrity": "sha512-OUaMPZpTOZGKd5tXOjJ9PRU4iYNW/Z5DoHIynjsVK/FpkWdiY5+nxQW6TiJAlLwVI1l53xUOrnlZWtVBVQzuWA==", "dev": true, "requires": { "eslint-config-airbnb-base": "^15.0.0" @@ -1775,22 +1793,6 @@ "integrity": "sha512-MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g==", "dev": true }, - "is-alphabetical": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz", - "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==", - "dev": true - }, - "is-alphanumerical": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz", - "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==", - "dev": true, - "requires": { - "is-alphabetical": "^1.0.0", - "is-decimal": "^1.0.0" - } - }, "is-bigint": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", @@ -1843,12 +1845,6 @@ "has-tostringtag": "^1.0.0" } }, - "is-decimal": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", - "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==", - "dev": true - }, "is-error": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/is-error/-/is-error-2.2.2.tgz", @@ -1876,12 +1872,6 @@ "is-extglob": "^2.1.1" } }, - "is-hexadecimal": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz", - "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==", - "dev": true - }, "is-negative-zero": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", @@ -2042,6 +2032,12 @@ "integrity": "sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==", "dev": true }, + "kleur": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.4.tgz", + "integrity": "sha512-8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA==", + "dev": true + }, "levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", @@ -2052,12 +2048,6 @@ "type-check": "~0.4.0" } }, - "linguist-languages": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/linguist-languages/-/linguist-languages-7.15.0.tgz", - "integrity": "sha512-qkSSNDjDDycZ2Wcw+GziNBB3nNo3ddYUInM/PL8Amgwbd9RQ/BKGj2/1d6mdxKgBFnUqZuaDbkIwkE4KUwwmtQ==", - "dev": true - }, "load-json-file": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-7.0.1.tgz", @@ -2146,22 +2136,29 @@ } }, "mdast-util-from-markdown": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz", - "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz", + "integrity": "sha512-iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q==", "dev": true, "requires": { "@types/mdast": "^3.0.0", - "mdast-util-to-string": "^2.0.0", - "micromark": "~2.11.0", - "parse-entities": "^2.0.0", - "unist-util-stringify-position": "^2.0.0" + "@types/unist": "^2.0.0", + "decode-named-character-reference": "^1.0.0", + "mdast-util-to-string": "^3.1.0", + "micromark": "^3.0.0", + "micromark-util-decode-numeric-character-reference": "^1.0.0", + "micromark-util-decode-string": "^1.0.0", + "micromark-util-normalize-identifier": "^1.0.0", + "micromark-util-symbol": "^1.0.0", + "micromark-util-types": "^1.0.0", + "unist-util-stringify-position": "^3.0.0", + "uvu": "^0.5.0" } }, "mdast-util-to-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz", - "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz", + "integrity": "sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==", "dev": true }, "mem": { @@ -2181,15 +2178,238 @@ "dev": true }, "micromark": { - "version": "2.11.4", - "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz", - "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==", + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/micromark/-/micromark-3.0.10.tgz", + "integrity": "sha512-ryTDy6UUunOXy2HPjelppgJ2sNfcPz1pLlMdA6Rz9jPzhLikWXv/irpWV/I2jd68Uhmny7hHxAlAhk4+vWggpg==", "dev": true, "requires": { + "@types/debug": "^4.0.0", "debug": "^4.0.0", - "parse-entities": "^2.0.0" + "decode-named-character-reference": "^1.0.0", + "micromark-core-commonmark": "^1.0.1", + "micromark-factory-space": "^1.0.0", + "micromark-util-character": "^1.0.0", + "micromark-util-chunked": "^1.0.0", + "micromark-util-combine-extensions": "^1.0.0", + "micromark-util-decode-numeric-character-reference": "^1.0.0", + "micromark-util-encode": "^1.0.0", + "micromark-util-normalize-identifier": "^1.0.0", + "micromark-util-resolve-all": "^1.0.0", + "micromark-util-sanitize-uri": "^1.0.0", + "micromark-util-subtokenize": "^1.0.0", + "micromark-util-symbol": "^1.0.0", + "micromark-util-types": "^1.0.1", + "uvu": "^0.5.0" + } + }, + "micromark-core-commonmark": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-1.0.6.tgz", + "integrity": "sha512-K+PkJTxqjFfSNkfAhp4GB+cZPfQd6dxtTXnf+RjZOV7T4EEXnvgzOcnp+eSTmpGk9d1S9sL6/lqrgSNn/s0HZA==", + "dev": true, + "requires": { + "decode-named-character-reference": "^1.0.0", + "micromark-factory-destination": "^1.0.0", + "micromark-factory-label": "^1.0.0", + "micromark-factory-space": "^1.0.0", + "micromark-factory-title": "^1.0.0", + "micromark-factory-whitespace": "^1.0.0", + "micromark-util-character": "^1.0.0", + "micromark-util-chunked": "^1.0.0", + "micromark-util-classify-character": "^1.0.0", + "micromark-util-html-tag-name": "^1.0.0", + "micromark-util-normalize-identifier": "^1.0.0", + "micromark-util-resolve-all": "^1.0.0", + "micromark-util-subtokenize": "^1.0.0", + "micromark-util-symbol": "^1.0.0", + "micromark-util-types": "^1.0.1", + "uvu": "^0.5.0" + } + }, + "micromark-factory-destination": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz", + "integrity": "sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw==", + "dev": true, + "requires": { + "micromark-util-character": "^1.0.0", + "micromark-util-symbol": "^1.0.0", + "micromark-util-types": "^1.0.0" } }, + "micromark-factory-label": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-1.0.2.tgz", + "integrity": "sha512-CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg==", + "dev": true, + "requires": { + "micromark-util-character": "^1.0.0", + "micromark-util-symbol": "^1.0.0", + "micromark-util-types": "^1.0.0", + "uvu": "^0.5.0" + } + }, + "micromark-factory-space": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz", + "integrity": "sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew==", + "dev": true, + "requires": { + "micromark-util-character": "^1.0.0", + "micromark-util-types": "^1.0.0" + } + }, + "micromark-factory-title": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-1.0.2.tgz", + "integrity": "sha512-zily+Nr4yFqgMGRKLpTVsNl5L4PMu485fGFDOQJQBl2NFpjGte1e86zC0da93wf97jrc4+2G2GQudFMHn3IX+A==", + "dev": true, + "requires": { + "micromark-factory-space": "^1.0.0", + "micromark-util-character": "^1.0.0", + "micromark-util-symbol": "^1.0.0", + "micromark-util-types": "^1.0.0", + "uvu": "^0.5.0" + } + }, + "micromark-factory-whitespace": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz", + "integrity": "sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A==", + "dev": true, + "requires": { + "micromark-factory-space": "^1.0.0", + "micromark-util-character": "^1.0.0", + "micromark-util-symbol": "^1.0.0", + "micromark-util-types": "^1.0.0" + } + }, + "micromark-util-character": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-1.1.0.tgz", + "integrity": "sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg==", + "dev": true, + "requires": { + "micromark-util-symbol": "^1.0.0", + "micromark-util-types": "^1.0.0" + } + }, + "micromark-util-chunked": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz", + "integrity": "sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g==", + "dev": true, + "requires": { + "micromark-util-symbol": "^1.0.0" + } + }, + "micromark-util-classify-character": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz", + "integrity": "sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA==", + "dev": true, + "requires": { + "micromark-util-character": "^1.0.0", + "micromark-util-symbol": "^1.0.0", + "micromark-util-types": "^1.0.0" + } + }, + "micromark-util-combine-extensions": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz", + "integrity": "sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA==", + "dev": true, + "requires": { + "micromark-util-chunked": "^1.0.0", + "micromark-util-types": "^1.0.0" + } + }, + "micromark-util-decode-numeric-character-reference": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz", + "integrity": "sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w==", + "dev": true, + "requires": { + "micromark-util-symbol": "^1.0.0" + } + }, + "micromark-util-decode-string": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-1.0.2.tgz", + "integrity": "sha512-DLT5Ho02qr6QWVNYbRZ3RYOSSWWFuH3tJexd3dgN1odEuPNxCngTCXJum7+ViRAd9BbdxCvMToPOD/IvVhzG6Q==", + "dev": true, + "requires": { + "decode-named-character-reference": "^1.0.0", + "micromark-util-character": "^1.0.0", + "micromark-util-decode-numeric-character-reference": "^1.0.0", + "micromark-util-symbol": "^1.0.0" + } + }, + "micromark-util-encode": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-1.0.1.tgz", + "integrity": "sha512-U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA==", + "dev": true + }, + "micromark-util-html-tag-name": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.0.0.tgz", + "integrity": "sha512-NenEKIshW2ZI/ERv9HtFNsrn3llSPZtY337LID/24WeLqMzeZhBEE6BQ0vS2ZBjshm5n40chKtJ3qjAbVV8S0g==", + "dev": true + }, + "micromark-util-normalize-identifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz", + "integrity": "sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg==", + "dev": true, + "requires": { + "micromark-util-symbol": "^1.0.0" + } + }, + "micromark-util-resolve-all": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz", + "integrity": "sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw==", + "dev": true, + "requires": { + "micromark-util-types": "^1.0.0" + } + }, + "micromark-util-sanitize-uri": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.0.0.tgz", + "integrity": "sha512-cCxvBKlmac4rxCGx6ejlIviRaMKZc0fWm5HdCHEeDWRSkn44l6NdYVRyU+0nT1XC72EQJMZV8IPHF+jTr56lAg==", + "dev": true, + "requires": { + "micromark-util-character": "^1.0.0", + "micromark-util-encode": "^1.0.0", + "micromark-util-symbol": "^1.0.0" + } + }, + "micromark-util-subtokenize": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.2.tgz", + "integrity": "sha512-d90uqCnXp/cy4G881Ub4psE57Sf8YD0pim9QdjCRNjfas2M1u6Lbt+XZK9gnHL2XFhnozZiEdCa9CNfXSfQ6xA==", + "dev": true, + "requires": { + "micromark-util-chunked": "^1.0.0", + "micromark-util-symbol": "^1.0.0", + "micromark-util-types": "^1.0.0", + "uvu": "^0.5.0" + } + }, + "micromark-util-symbol": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-1.0.1.tgz", + "integrity": "sha512-oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ==", + "dev": true + }, + "micromark-util-types": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-1.0.2.tgz", + "integrity": "sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w==", + "dev": true + }, "micromatch": { "version": "4.0.5", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", @@ -2218,7 +2438,14 @@ "minimist": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", + "dev": true + }, + "mri": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", + "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", + "dev": true }, "ms": { "version": "2.1.3", @@ -2423,20 +2650,6 @@ } } }, - "parse-entities": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", - "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", - "dev": true, - "requires": { - "character-entities": "^1.0.0", - "character-entities-legacy": "^1.0.0", - "character-reference-invalid": "^1.0.0", - "is-alphanumerical": "^1.0.0", - "is-decimal": "^1.0.0", - "is-hexadecimal": "^1.0.0" - } - }, "parse-ms": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz", @@ -2565,15 +2778,14 @@ "dev": true }, "prettier-plugin-jsdoc": { - "version": "0.3.33", - "resolved": "https://registry.npmjs.org/prettier-plugin-jsdoc/-/prettier-plugin-jsdoc-0.3.33.tgz", - "integrity": "sha512-DvSuTArH2nUFCa0DrSkLfJwsIpXxhpvxwIIvE2Gs0zEyDIdjFGKa9oCj/h17MQk640Gzm4Eey3u4NwyfMq0uiw==", + "version": "0.3.36", + "resolved": "https://registry.npmjs.org/prettier-plugin-jsdoc/-/prettier-plugin-jsdoc-0.3.36.tgz", + "integrity": "sha512-Sij6almwQyQSh4X8T9IOHz3qGkK5PBZrUtd7ywVUECUiXvz+pYAuXM4293ABmCyVA9SoFbUMggiX9EjJiAzhxA==", "dev": true, "requires": { - "binary-search-bounds": "^2.0.5", - "comment-parser": "^1.1.4", - "linguist-languages": "^7.13.0", - "mdast-util-from-markdown": "^0.8.5" + "binary-searching": "^2.0.5", + "comment-parser": "^1.3.1", + "mdast-util-from-markdown": "^1.2.0" } }, "pretty-ms": { @@ -2668,6 +2880,15 @@ "queue-microtask": "^1.2.2" } }, + "sade": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz", + "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==", + "dev": true, + "requires": { + "mri": "^1.1.0" + } + }, "semver": { "version": "7.3.5", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", @@ -3030,12 +3251,12 @@ } }, "unist-util-stringify-position": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz", - "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz", + "integrity": "sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==", "dev": true, "requires": { - "@types/unist": "^2.0.2" + "@types/unist": "^2.0.0" } }, "uri-js": { @@ -3047,6 +3268,18 @@ "punycode": "^2.1.0" } }, + "uvu": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/uvu/-/uvu-0.5.3.tgz", + "integrity": "sha512-brFwqA3FXzilmtnIyJ+CxdkInkY/i4ErvP7uV0DnUVxQcQ55reuHphorpF+tZoVHK2MniZ/VJzI7zJQoc9T9Yw==", + "dev": true, + "requires": { + "dequal": "^2.0.0", + "diff": "^5.0.0", + "kleur": "^4.0.3", + "sade": "^1.7.3" + } + }, "v8-compile-cache": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", diff --git a/package.json b/package.json index 4e072156..21809467 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "confluence.js", - "version": "1.3.1", + "version": "1.4.0", "description": "confluence.js is a powerful Node.JS/Browser module that allows you to interact with the Confluence API very easily", "author": "Vladislav Tupikin ", "license": "MIT", @@ -47,11 +47,11 @@ "dotenv": "^16.0.0", "eslint": "^8.12.0", "eslint-config-airbnb": "^19.0.4", - "eslint-config-airbnb-typescript": "^16.1.4", + "eslint-config-airbnb-typescript": "^16.2.0", "eslint-import-resolver-typescript": "^2.7.0", "eslint-plugin-import": "^2.25.4", "prettier": "^2.6.1", - "prettier-plugin-jsdoc": "^0.3.33", + "prettier-plugin-jsdoc": "^0.3.36", "sinon": "^13.0.1", "ts-node": "^10.7.0", "typedoc": "^0.22.13", diff --git a/src/api/analytics.ts b/src/api/analytics.ts new file mode 100644 index 00000000..a8ffed8c --- /dev/null +++ b/src/api/analytics.ts @@ -0,0 +1,44 @@ +import * as Models from './models'; +import * as Parameters from './parameters'; +import { Callback } from '../callback'; +import { Client } from '../clients'; +import { RequestConfig } from '../requestConfig'; + +export class Analytics { + constructor(private client: Client) {} + + /** Get the total number of views a piece of content has. */ + async getViews(parameters: Parameters.GetViews, callback: Callback): Promise; + /** Get the total number of views a piece of content has. */ + async getViews(parameters: Parameters.GetViews, callback?: never): Promise; + async getViews(parameters: Parameters.GetViews, callback?: Callback): Promise { + const config: RequestConfig = { + url: `/api/analytics/content/${parameters.contentId}/views`, + method: 'GET', + params: { + fromDate: parameters.fromDate, + }, + }; + + return this.client.sendRequest(config, callback); + } + + /** Get the total number of distinct viewers a piece of content has. */ + async getViewers(parameters: Parameters.GetViewers, callback: Callback): Promise; + /** Get the total number of distinct viewers a piece of content has. */ + async getViewers(parameters: Parameters.GetViewers, callback?: never): Promise; + async getViewers( + parameters: Parameters.GetViewers, + callback?: Callback, + ): Promise { + const config: RequestConfig = { + url: `/api/analytics/content/${parameters.contentId}/viewers`, + method: 'GET', + params: { + fromDate: parameters.fromDate, + }, + }; + + return this.client.sendRequest(config, callback); + } +} diff --git a/src/api/contentChildrenAndDescendants.ts b/src/api/contentChildrenAndDescendants.ts index c6fe9594..f579b3c5 100644 --- a/src/api/contentChildrenAndDescendants.ts +++ b/src/api/contentChildrenAndDescendants.ts @@ -302,7 +302,10 @@ export class ContentChildrenAndDescendants { * of renaming page titles during the copy; for example, search and replace can be used in conjunction to rewrite the * copied page titles. */ - async copyPageHierarchy(parameters: Parameters.CopyPageHierarchy, callback: Callback): Promise; + async copyPageHierarchy( + parameters: Parameters.CopyPageHierarchy, + callback: Callback + ): Promise; /** * Copy page hierarchy allows the copying of an entire hierarchy of pages and their associated properties, permissions * and attachments. The id path parameter refers to the content id of the page to copy, and the new parent of this @@ -310,8 +313,8 @@ export class ContentChildrenAndDescendants { * of renaming page titles during the copy; for example, search and replace can be used in conjunction to rewrite the * copied page titles. */ - async copyPageHierarchy(parameters: Parameters.CopyPageHierarchy, callback?: never): Promise; - async copyPageHierarchy( + async copyPageHierarchy(parameters: Parameters.CopyPageHierarchy, callback?: never): Promise; + async copyPageHierarchy( parameters: Parameters.CopyPageHierarchy, callback?: Callback, ): Promise { @@ -324,6 +327,7 @@ export class ContentChildrenAndDescendants { copyProperties: parameters.copyProperties, copyLabels: parameters.copyLabels, copyCustomContents: parameters.copyCustomContents, + copyDescendants: parameters.copyDescendants, destinationPageId: parameters.destinationPageId, titleOptions: parameters.titleOptions, }, diff --git a/src/api/contentContentState.ts b/src/api/contentContentState.ts new file mode 100644 index 00000000..ec4ac552 --- /dev/null +++ b/src/api/contentContentState.ts @@ -0,0 +1,157 @@ +import * as Models from './models'; +import * as Parameters from './parameters'; +import { Callback } from '../callback'; +import { Client } from '../clients'; +import { RequestConfig } from '../requestConfig'; + +export class ContentContentState { + constructor(private client: Client) {} + + /** + * Gets the current page status of the draft or published version of content. To specify the draft version, set the + * parameter status to PUBLISHED, otherwise DRAFT. + */ + async getContentState( + parameters: Parameters.GetContentState, + callback: Callback + ): Promise; + /** + * Gets the current page status of the draft or published version of content. To specify the draft version, set the + * parameter status to PUBLISHED, otherwise DRAFT. + */ + async getContentState( + parameters: Parameters.GetContentState, + callback?: never + ): Promise; + async getContentState( + parameters: Parameters.GetContentState, + callback?: Callback, + ): Promise { + const config: RequestConfig = { + url: `/api/content/${parameters.contentId}/state`, + method: 'GET', + params: { + designation: parameters.designation, + }, + }; + + return this.client.sendRequest(config, callback); + } + + /** + * Sets the content state of the content specified and creates a new version (publishes the content without changing + * the body) of the content with the new status. The desired type of status must be allowed. There are space suggested + * statuses and custom statuses. To specify the desired new status, one can use the id of the status or the name and + * color of the status. If contentStateId is defined, then name and color are ignored. If contentStateId is not + * defined, name and color will be used if provided. Firstly, we will determine if a status of this name and color + * exists, and if it does, that this status is used. If it does not exist, and custom statuses are allowed, a custom + * status with this name and color will be created. Color can be specified in traditional english colors (teal, + * magenta, lavender, etc.) or as a hex string ex: #0ff0Fd. + */ + async setContentState( + parameters: Parameters.SetContentState, + callback: Callback + ): Promise; + /** + * Sets the content state of the content specified and creates a new version (publishes the content without changing + * the body) of the content with the new status. The desired type of status must be allowed. There are space suggested + * statuses and custom statuses. To specify the desired new status, one can use the id of the status or the name and + * color of the status. If contentStateId is defined, then name and color are ignored. If contentStateId is not + * defined, name and color will be used if provided. Firstly, we will determine if a status of this name and color + * exists, and if it does, that this status is used. If it does not exist, and custom statuses are allowed, a custom + * status with this name and color will be created. Color can be specified in traditional english colors (teal, + * magenta, lavender, etc.) or as a hex string ex: #0ff0Fd. + */ + async setContentState( + parameters: Parameters.SetContentState, + callback?: never + ): Promise; + async setContentState( + parameters: Parameters.SetContentState, + callback?: Callback, + ): Promise { + const config: RequestConfig = { + url: `/api/content/${parameters.contentId}/state`, + method: 'PUT', + params: { + contentStateId: parameters.contentStateId, + name: parameters.name, + color: parameters.color, + }, + }; + + return this.client.sendRequest(config, callback); + } + + /** + * Removes the content state of the content specified and creates a new version (publishes the content without + * changing the body) of the content with the new status. + */ + async removeContentState( + parameters: Parameters.RemoveContentState, + callback: Callback + ): Promise; + /** + * Removes the content state of the content specified and creates a new version (publishes the content without + * changing the body) of the content with the new status. + */ + async removeContentState( + parameters: Parameters.RemoveContentState, + callback?: never + ): Promise; + async removeContentState( + parameters: Parameters.RemoveContentState, + callback?: Callback, + ): Promise { + const config: RequestConfig = { + url: `/api/content/${parameters.contentId}/state`, + method: 'DELETE', + }; + + return this.client.sendRequest(config, callback); + } + + /** Gets a Global Timestamp of the last time the content state was updated */ + async getContentStateLastUpdated( + parameters: Parameters.GetContentStateLastUpdated, + callback: Callback + ): Promise; + /** Gets a Global Timestamp of the last time the content state was updated */ + async getContentStateLastUpdated( + parameters: Parameters.GetContentStateLastUpdated, + callback?: never + ): Promise; + async getContentStateLastUpdated( + parameters: Parameters.GetContentStateLastUpdated, + callback?: Callback, + ): Promise { + const config: RequestConfig = { + url: `/api/content/${parameters.contentId}/state/last-updated`, + method: 'GET', + }; + + return this.client.sendRequest(config, callback); + } + + /** Gets content states that are available for the content to be set as. */ + async getAvailableContentStates( + parameters: Parameters.GetAvailableContentStates, + callback: Callback + ): Promise; + /** Gets content states that are available for the content to be set as. */ + async getAvailableContentStates( + parameters: Parameters.GetAvailableContentStates, + callback?: never + ): Promise; + async getAvailableContentStates( + parameters: Parameters.GetAvailableContentStates, + callback?: Callback, + ): Promise { + const config: RequestConfig = { + url: `/api/content/${parameters.contentId}/state/available-states`, + method: 'GET', + }; + + return this.client.sendRequest(config, callback); + } +} diff --git a/src/api/experimental.ts b/src/api/experimental.ts index aace257a..d37bfb3a 100644 --- a/src/api/experimental.ts +++ b/src/api/experimental.ts @@ -7,6 +7,49 @@ import { RequestConfig } from '../requestConfig'; export class Experimental { constructor(private client: Client) {} + /** + * Moves a pagetree rooted at a page to the space's trash: + * + * - If the content's type is `page` and its status is `current`, it will be trashed including all its descendants. + * - For every other combination of content type and status, this API is not supported. + * + * This API accepts the pageTree delete request and returns a task ID. The delete process happens asynchronously. + * + * Use the `/longtask/` REST API to get the copy task status. + * + * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Delete' permission for the space that the + * content is in. + */ + async deletePageTree( + parameters: Parameters.DeletePageTree, + callback: Callback + ): Promise; + /** + * Moves a pagetree rooted at a page to the space's trash: + * + * - If the content's type is `page` and its status is `current`, it will be trashed including all its descendants. + * - For every other combination of content type and status, this API is not supported. + * + * This API accepts the pageTree delete request and returns a task ID. The delete process happens asynchronously. + * + * Use the `/longtask/` REST API to get the copy task status. + * + * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: 'Delete' permission for the space that the + * content is in. + */ + async deletePageTree(parameters: Parameters.DeletePageTree, callback?: never): Promise; + async deletePageTree( + parameters: Parameters.DeletePageTree, + callback?: Callback, + ): Promise { + const config: RequestConfig = { + url: `/api/content/${parameters.id}/pageTree`, + method: 'DELETE', + }; + + return this.client.sendRequest(config, callback); + } + /** * Returns a list of labels associated with a space. Can provide a prefix as well as other filters to select different * types of labels. @@ -100,22 +143,182 @@ export class Experimental { return this.client.sendRequest(config, callback); } - /** Get the total number of views a piece of content has. */ - async getViews(parameters: Parameters.GetViews, callback: Callback): Promise; - /** Get the total number of views a piece of content has. */ - async getViews(parameters: Parameters.GetViews, callback?: never): Promise; - async getViews(parameters: Parameters.GetViews, callback?: Callback): Promise { + /** + * Returns the properties for a user as list of property keys. For more information about user properties, see + * [Confluence entity properties](https://developer.atlassian.com/cloud/confluence/confluence-entity-properties/). + * `Note`, these properties stored against a user are on a Confluence site level and not space/content level. + * + * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to access the Confluence site + * ('Can use' global permission). + */ + async getUserProperties( + parameters: Parameters.GetUserProperties, + callback: Callback + ): Promise; + /** + * Returns the properties for a user as list of property keys. For more information about user properties, see + * [Confluence entity properties](https://developer.atlassian.com/cloud/confluence/confluence-entity-properties/). + * `Note`, these properties stored against a user are on a Confluence site level and not space/content level. + * + * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to access the Confluence site + * ('Can use' global permission). + */ + async getUserProperties( + parameters: Parameters.GetUserProperties, + callback?: never + ): Promise; + async getUserProperties( + parameters: Parameters.GetUserProperties, + callback?: Callback, + ): Promise { const config: RequestConfig = { - url: `/api/analytics/content/${parameters.contentId}/views`, + url: `/api/user/${parameters.userId}/property`, method: 'GET', params: { - fromDate: parameters.fromDate, + start: parameters.start, + limit: parameters.limit, }, }; return this.client.sendRequest(config, callback); } + /** + * Returns the property corresponding to `key` for a user. For more information about user properties, see [Confluence + * entity properties](https://developer.atlassian.com/cloud/confluence/confluence-entity-properties/). `Note`, these + * properties stored against a user are on a Confluence site level and not space/content level. + * + * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to access the Confluence site + * ('Can use' global permission). + */ + async getUserProperty( + parameters: Parameters.GetUserProperty, + callback: Callback + ): Promise; + /** + * Returns the property corresponding to `key` for a user. For more information about user properties, see [Confluence + * entity properties](https://developer.atlassian.com/cloud/confluence/confluence-entity-properties/). `Note`, these + * properties stored against a user are on a Confluence site level and not space/content level. + * + * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to access the Confluence site + * ('Can use' global permission). + */ + async getUserProperty(parameters: Parameters.GetUserProperty, callback?: never): Promise; + async getUserProperty( + parameters: Parameters.GetUserProperty, + callback?: Callback, + ): Promise { + const config: RequestConfig = { + url: `/api/user/${parameters.userId}/property/${parameters.key}`, + method: 'GET', + }; + + return this.client.sendRequest(config, callback); + } + + /** + * Creates a property for a user. For more information about user properties, see [Confluence entity properties] + * (https://developer.atlassian.com/cloud/confluence/confluence-entity-properties/). `Note`, these properties stored + * against a user are on a Confluence site level and not space/content level. + * + * `Note:` the number of properties which could be created per app in a tenant for each user might be restricted by + * fixed system limits. **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to access + * the Confluence site ('Can use' global permission). + */ + async createUserProperty( + parameters: Parameters.CreateUserProperty, + callback: Callback + ): Promise; + /** + * Creates a property for a user. For more information about user properties, see [Confluence entity properties] + * (https://developer.atlassian.com/cloud/confluence/confluence-entity-properties/). `Note`, these properties stored + * against a user are on a Confluence site level and not space/content level. + * + * `Note:` the number of properties which could be created per app in a tenant for each user might be restricted by + * fixed system limits. **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to access + * the Confluence site ('Can use' global permission). + */ + async createUserProperty(parameters: Parameters.CreateUserProperty, callback?: never): Promise; + async createUserProperty( + parameters: Parameters.CreateUserProperty, + callback?: Callback, + ): Promise { + const config: RequestConfig = { + url: `/api/user/${parameters.userId}/property/${parameters.key}`, + method: 'POST', + data: { + value: parameters.value, + }, + }; + + return this.client.sendRequest(config, callback); + } + + /** + * Updates a property for the given user. Note, you cannot update the key of a user property, only the value. For more + * information about user properties, see [Confluence entity + * properties](https://developer.atlassian.com/cloud/confluence/confluence-entity-properties/). `Note`, these + * properties stored against a user are on a Confluence site level and not space/content level. + * + * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to access the Confluence site + * ('Can use' global permission). + */ + async updateUserProperty(parameters: Parameters.UpdateUserProperty, callback: Callback): Promise; + /** + * Updates a property for the given user. Note, you cannot update the key of a user property, only the value. For more + * information about user properties, see [Confluence entity + * properties](https://developer.atlassian.com/cloud/confluence/confluence-entity-properties/). `Note`, these + * properties stored against a user are on a Confluence site level and not space/content level. + * + * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to access the Confluence site + * ('Can use' global permission). + */ + async updateUserProperty(parameters: Parameters.UpdateUserProperty, callback?: never): Promise; + async updateUserProperty( + parameters: Parameters.UpdateUserProperty, + callback?: Callback, + ): Promise { + const config: RequestConfig = { + url: `/api/user/${parameters.userId}/property/${parameters.key}`, + method: 'PUT', + data: { + value: parameters.value, + }, + }; + + return this.client.sendRequest(config, callback); + } + + /** + * Deletes a property for the given user. For more information about user properties, see [Confluence entity + * properties](https://developer.atlassian.com/cloud/confluence/confluence-entity-properties/). `Note`, these + * properties stored against a user are on a Confluence site level and not space/content level. + * + * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to access the Confluence site + * ('Can use' global permission). + */ + async deleteUserProperty(parameters: Parameters.DeleteUserProperty, callback: Callback): Promise; + /** + * Deletes a property for the given user. For more information about user properties, see [Confluence entity + * properties](https://developer.atlassian.com/cloud/confluence/confluence-entity-properties/). `Note`, these + * properties stored against a user are on a Confluence site level and not space/content level. + * + * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to access the Confluence site + * ('Can use' global permission). + */ + async deleteUserProperty(parameters: Parameters.DeleteUserProperty, callback?: never): Promise; + async deleteUserProperty( + parameters: Parameters.DeleteUserProperty, + callback?: Callback, + ): Promise { + const config: RequestConfig = { + url: `/api/user/${parameters.userId}/property/${parameters.key}`, + method: 'DELETE', + }; + + return this.client.sendRequest(config, callback); + } + /** Get the total number of distinct viewers a piece of content has. */ async getViewers(parameters: Parameters.GetViewers, callback: Callback): Promise; /** Get the total number of distinct viewers a piece of content has. */ diff --git a/src/api/group.ts b/src/api/group.ts index 4a290d83..1f317dea 100644 --- a/src/api/group.ts +++ b/src/api/group.ts @@ -252,6 +252,7 @@ export class Group { name: parameters.name, start: parameters.start, limit: parameters.limit, + shouldReturnTotalSize: parameters.shouldReturnTotalSize, }, }; @@ -330,6 +331,7 @@ export class Group { query: parameters.query, start: parameters.start, limit: parameters.limit, + shouldReturnTotalSize: parameters.shouldReturnTotalSize, }, }; @@ -440,6 +442,7 @@ export class Group { params: { start: parameters.start, limit: parameters.limit, + shouldReturnTotalSize: parameters.shouldReturnTotalSize, }, }; diff --git a/src/api/index.ts b/src/api/index.ts index 41e5aec5..1d40496d 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1,9 +1,11 @@ +export * from './analytics'; export * from './audit'; export * from './content'; export * from './contentAttachments'; export * from './contentBody'; export * from './contentChildrenAndDescendants'; export * from './contentComments'; +export * from './contentContentState'; export * from './contentLabels'; export * from './contentMacroBody'; export * from './contentPermissions'; diff --git a/src/api/models/availableContentStates.ts b/src/api/models/availableContentStates.ts new file mode 100644 index 00000000..38851b1a --- /dev/null +++ b/src/api/models/availableContentStates.ts @@ -0,0 +1,7 @@ +import { ContentState } from './contentState'; + +export interface AvailableContentStates { + /** Space suggested content states that can be used in the space */ + spaceContentStates: ContentState[]; + customContentStates: ContentState[]; +} diff --git a/src/api/models/contentState.ts b/src/api/models/contentState.ts new file mode 100644 index 00000000..5b357059 --- /dev/null +++ b/src/api/models/contentState.ts @@ -0,0 +1,8 @@ +export interface ContentState { + /** Identifier of content state. If 0, 1, or 2, this is a default space state */ + id: number; + /** Name of content state. */ + name: string; + /** Hex string representing color of state */ + color: string; +} diff --git a/src/api/models/contentStateContainer.ts b/src/api/models/contentStateContainer.ts new file mode 100644 index 00000000..b1b34798 --- /dev/null +++ b/src/api/models/contentStateContainer.ts @@ -0,0 +1,6 @@ +import { ContentState } from './contentState'; + +export interface ContentStateContainer { + /** Null or Content State */ + target?: ContentState; +} diff --git a/src/api/models/contentStateSettings.ts b/src/api/models/contentStateSettings.ts new file mode 100644 index 00000000..dbaed327 --- /dev/null +++ b/src/api/models/contentStateSettings.ts @@ -0,0 +1,12 @@ +import { ContentState } from './contentState'; + +export interface ContentStateSettings { + /** Whether users can place content states on any pages and blog posts in the space */ + contentStatesAllowed: boolean; + /** Whether users can create custom states on the fly on pages and blog posts */ + customContentStatesAllowed: boolean; + /** Whether space content states are allowed */ + spaceContentStatesAllowed: boolean; + /** Space content states that users in the space can choose from */ + spaceContentStates?: ContentState[]; +} diff --git a/src/api/models/copyPageHierarchyRequest.ts b/src/api/models/copyPageHierarchyRequest.ts index 18af99a5..17ef8647 100644 --- a/src/api/models/copyPageHierarchyRequest.ts +++ b/src/api/models/copyPageHierarchyRequest.ts @@ -11,6 +11,8 @@ export interface CopyPageHierarchyRequest { copyLabels?: boolean; /** If set to `true`, custom contents are copied to the destination page. */ copyCustomContents?: boolean; + /** If set to `true`, descendants are copied to the destination page. */ + copyDescendants?: boolean; destinationPageId: string; titleOptions?: CopyPageHierarchyTitleOptions; } diff --git a/src/api/models/index.ts b/src/api/models/index.ts index 4feae3a8..9be4b9d9 100644 --- a/src/api/models/index.ts +++ b/src/api/models/index.ts @@ -82,7 +82,15 @@ export * from './labelCreateArray'; export * from './labelDetails'; export * from './labeledContent'; export * from './labeledContentPageResponse'; +export * from './contentStateSettings'; export * from './labeledContentType'; +export * from './longTask'; +export * from './userPropertyCreate'; +export * from './userPropertyUpdate'; +export * from './contentStateContainer'; +export * from './availableContentStates'; +export * from './userPropertyKeyArray'; +export * from './userProperty'; export * from './longTaskStatus'; export * from './longTaskStatusArray'; export * from './longTaskStatusWithLinks'; diff --git a/src/api/models/longTask.ts b/src/api/models/longTask.ts new file mode 100644 index 00000000..b3d37c08 --- /dev/null +++ b/src/api/models/longTask.ts @@ -0,0 +1,8 @@ +export interface LongTask { + /** A unique identifier for the long task */ + id: string; + links: { + /** The URL to retrieve status of long task. */ + status?: string; + }; +} diff --git a/src/api/models/userProperty.ts b/src/api/models/userProperty.ts new file mode 100644 index 00000000..3ded4e66 --- /dev/null +++ b/src/api/models/userProperty.ts @@ -0,0 +1,14 @@ +import { GenericLinks } from './genericLinks'; + +export interface UserProperty { + key: string; + /** The value of the content property. */ + value: {}; + /** A unique identifier for the user property */ + id: string; + /** Datetime when the property was last modified such as `2022-02-01T12:00:00.111Z` */ + lastModifiedDate: string; + /** Datetime when the property was created such as `2022-01-01T12:00:00.111Z` */ + createdDate: string; + Links?: GenericLinks; +} diff --git a/src/api/models/userPropertyCreate.ts b/src/api/models/userPropertyCreate.ts new file mode 100644 index 00000000..bbc64795 --- /dev/null +++ b/src/api/models/userPropertyCreate.ts @@ -0,0 +1,4 @@ +export interface UserPropertyCreate { + /** The value of the user property. */ + value: {}; +} diff --git a/src/api/models/userPropertyKeyArray.ts b/src/api/models/userPropertyKeyArray.ts new file mode 100644 index 00000000..337cb210 --- /dev/null +++ b/src/api/models/userPropertyKeyArray.ts @@ -0,0 +1,11 @@ +import { GenericLinks } from './genericLinks'; + +export interface UserPropertyKeyArray { + results: { + key?: string; + }[]; + start?: number; + limit?: number; + size?: number; + Links?: GenericLinks; +} diff --git a/src/api/models/userPropertyUpdate.ts b/src/api/models/userPropertyUpdate.ts new file mode 100644 index 00000000..0408de76 --- /dev/null +++ b/src/api/models/userPropertyUpdate.ts @@ -0,0 +1,4 @@ +export interface UserPropertyUpdate { + /** The value of the user property. */ + value: {}; +} diff --git a/src/api/parameters/createUserProperty.ts b/src/api/parameters/createUserProperty.ts new file mode 100644 index 00000000..ad10f788 --- /dev/null +++ b/src/api/parameters/createUserProperty.ts @@ -0,0 +1,11 @@ +import { UserPropertyCreate } from '../models'; + +export interface CreateUserProperty extends UserPropertyCreate { + /** + * The account ID of the user. The accountId uniquely identifies the user across all Atlassian products. For + * example, 384093:32b4d9w0-f6a5-3535-11a3-9c8c88d10192 + */ + userId: string; + /** The key of the user property. */ + key: string; +} diff --git a/src/api/parameters/deletePageTree.ts b/src/api/parameters/deletePageTree.ts new file mode 100644 index 00000000..c2d4b1be --- /dev/null +++ b/src/api/parameters/deletePageTree.ts @@ -0,0 +1,4 @@ +export interface DeletePageTree { + /** The ID of the content which forms root of the page tree, to be deleted. */ + id: string; +} diff --git a/src/api/parameters/deleteUserProperty.ts b/src/api/parameters/deleteUserProperty.ts new file mode 100644 index 00000000..8aa45310 --- /dev/null +++ b/src/api/parameters/deleteUserProperty.ts @@ -0,0 +1,9 @@ +export interface DeleteUserProperty { + /** + * The account ID of the user. The accountId uniquely identifies the user across all Atlassian products. For + * example, 384093:32b4d9w0-f6a5-3535-11a3-9c8c88d10192 + */ + userId: string; + /** The key of the user property. */ + key: string; +} diff --git a/src/api/parameters/getAvailableContentStates.ts b/src/api/parameters/getAvailableContentStates.ts new file mode 100644 index 00000000..9bf87b81 --- /dev/null +++ b/src/api/parameters/getAvailableContentStates.ts @@ -0,0 +1,4 @@ +export interface GetAvailableContentStates { + /** Id of content to get available states for */ + contentId: string; +} diff --git a/src/api/parameters/getContentState.ts b/src/api/parameters/getContentState.ts new file mode 100644 index 00000000..4041de4f --- /dev/null +++ b/src/api/parameters/getContentState.ts @@ -0,0 +1,6 @@ +export interface GetContentState { + /** The Id of the page whose content state is of interest. */ + contentId: string; + /** Set designation=DRAFT or designation=PUBLISHED. */ + designation?: string; +} diff --git a/src/api/parameters/getContentStateLastUpdated.ts b/src/api/parameters/getContentStateLastUpdated.ts new file mode 100644 index 00000000..07af02bb --- /dev/null +++ b/src/api/parameters/getContentStateLastUpdated.ts @@ -0,0 +1,4 @@ +export interface GetContentStateLastUpdated { + /** Id of Content to get information for */ + contentId: string; +} diff --git a/src/api/parameters/getContentStateSettings.ts b/src/api/parameters/getContentStateSettings.ts new file mode 100644 index 00000000..37fb0723 --- /dev/null +++ b/src/api/parameters/getContentStateSettings.ts @@ -0,0 +1,4 @@ +export interface GetContentStateSettings { + /** SpaceKey */ + spaceKey: string; +} diff --git a/src/api/parameters/getGroupMembersByGroupId.ts b/src/api/parameters/getGroupMembersByGroupId.ts index a7f2de88..45f4cbd1 100644 --- a/src/api/parameters/getGroupMembersByGroupId.ts +++ b/src/api/parameters/getGroupMembersByGroupId.ts @@ -5,4 +5,9 @@ export interface GetGroupMembersByGroupId { start?: number; /** The maximum number of users to return per page. Note, this may be restricted by fixed system limits. */ limit?: number; + /** + * Whether to include total size parameter in the results. Note, fetching total size property is an expensive + * operation; use it if your use case needs this value. + */ + shouldReturnTotalSize?: boolean; } diff --git a/src/api/parameters/getMembersByQueryParam.ts b/src/api/parameters/getMembersByQueryParam.ts index 37d9702c..e737f0d6 100644 --- a/src/api/parameters/getMembersByQueryParam.ts +++ b/src/api/parameters/getMembersByQueryParam.ts @@ -8,4 +8,9 @@ export interface GetMembersByQueryParam { * say if the limit parameter exceeds 200, this API will return a maximum of 200 users per page. */ limit?: number; + /** + * Whether to include total size parameter in the results. Note, fetching total size property is an expensive + * operation; use it if your use case needs this value. + */ + shouldReturnTotalSize?: boolean; } diff --git a/src/api/parameters/getSpaces.ts b/src/api/parameters/getSpaces.ts index fc11a280..ee4c428e 100644 --- a/src/api/parameters/getSpaces.ts +++ b/src/api/parameters/getSpaces.ts @@ -21,7 +21,37 @@ export interface GetSpaces { */ favouriteUserKey?: string; /** A multi-value parameter indicating which properties of the content to expand. */ - expand?: string[]; + expand?: + | 'settings' + | 'metadata' + | 'metadata.labels' + | 'operations' + | 'lookAndFeel' + | 'permissions' + | 'icon' + | 'description' + | 'description.plain' + | 'description.view' + | 'theme' + | 'homepage' + | 'history' + | ( + | 'settings' + | 'metadata' + | 'metadata.labels' + | 'operations' + | 'lookAndFeel' + | 'permissions' + | 'icon' + | 'description' + | 'description.plain' + | 'description.view' + | 'theme' + | 'homepage' + | 'history' + )[] + | string + | string[]; /** The starting index of the returned spaces. */ start?: number; /** The maximum number of spaces to return per page. Note, this may be restricted by fixed system limits. */ diff --git a/src/api/parameters/getUserProperties.ts b/src/api/parameters/getUserProperties.ts new file mode 100644 index 00000000..221d048f --- /dev/null +++ b/src/api/parameters/getUserProperties.ts @@ -0,0 +1,8 @@ +export interface GetUserProperties { + /** The account ID of the user to be queried for its properties. */ + userId: string; + /** The starting index of the returned properties. */ + start?: number; + /** The maximum number of properties to return per page. Note, this may be restricted by fixed system limits. */ + limit?: number; +} diff --git a/src/api/parameters/getUserProperty.ts b/src/api/parameters/getUserProperty.ts new file mode 100644 index 00000000..de07e55d --- /dev/null +++ b/src/api/parameters/getUserProperty.ts @@ -0,0 +1,6 @@ +export interface GetUserProperty { + /** The account ID of the user to be queried for its properties. */ + userId: string; + /** The key of the user property. */ + key: string; +} diff --git a/src/api/parameters/index.ts b/src/api/parameters/index.ts index b4d99e8d..b561205b 100644 --- a/src/api/parameters/index.ts +++ b/src/api/parameters/index.ts @@ -30,15 +30,18 @@ export * from './createRelationship'; export * from './createSpace'; export * from './createSpaceProperty'; export * from './createSpacePropertyForKey'; +export * from './createUserProperty'; export * from './delete'; export * from './deleteContent'; export * from './deleteContentProperty'; export * from './deleteContentVersion'; export * from './deleteLabelFromSpace'; +export * from './deletePageTree'; export * from './deleteRelationship'; export * from './deleteRestrictions'; export * from './deleteSpace'; export * from './deleteSpaceProperty'; +export * from './deleteUserProperty'; export * from './descendantsOfType'; export * from './downloadAttachment'; export * from './exportAuditRecords'; @@ -49,6 +52,7 @@ export * from './getAnonymousUser'; export * from './getAttachments'; export * from './getAuditRecords'; export * from './getAuditRecordsForTimePeriod'; +export * from './getAvailableContentStates'; export * from './getBlueprintTemplates'; export * from './getBulkUserLookup'; export * from './getBulkUserMigration'; @@ -64,6 +68,9 @@ export * from './getContentProperties'; export * from './getContentProperty'; export * from './getContentRestrictionStatusForGroup'; export * from './getContentRestrictionStatusForUser'; +export * from './getContentState'; +export * from './getContentStateLastUpdated'; +export * from './getContentStateSettings'; export * from './getContentTemplate'; export * from './getContentTemplates'; export * from './getContentVersion'; @@ -105,6 +112,8 @@ export * from './getTasks'; export * from './getTheme'; export * from './getThemes'; export * from './getUser'; +export * from './getUserProperties'; +export * from './getUserProperty'; export * from './getViewers'; export * from './getViews'; export * from './getWatchersForSpace'; @@ -117,6 +126,7 @@ export * from './permissionCheck'; export * from './publishLegacyDraft'; export * from './publishSharedDraft'; export * from './registerModules'; +export * from './removeContentState'; export * from './removeContentWatcher'; export * from './removeGroup'; export * from './removeGroupById'; @@ -140,6 +150,7 @@ export * from './searchContentByCQL'; export * from './searchGroups'; export * from './searchTasks'; export * from './searchUser'; +export * from './setContentState'; export * from './setLookAndFeelSettings'; export * from './setRetentionPeriod'; export * from './setSpaceTheme'; @@ -155,4 +166,5 @@ export * from './updateSpace'; export * from './updateSpaceProperty'; export * from './updateSpaceSettings'; export * from './updateTaskById'; +export * from './updateUserProperty'; export * from './userSearch'; diff --git a/src/api/parameters/removeContentState.ts b/src/api/parameters/removeContentState.ts new file mode 100644 index 00000000..ae5605dc --- /dev/null +++ b/src/api/parameters/removeContentState.ts @@ -0,0 +1,4 @@ +export interface RemoveContentState { + /** The Id of the content whose content state is to be set. */ + contentId: string; +} diff --git a/src/api/parameters/searchGroups.ts b/src/api/parameters/searchGroups.ts index 8f69001c..55dd4b0b 100644 --- a/src/api/parameters/searchGroups.ts +++ b/src/api/parameters/searchGroups.ts @@ -5,4 +5,9 @@ export interface SearchGroups { start?: number; /** The maximum number of groups to return per page. Note, this is restricted to a maximum limit of 200 groups. */ limit?: number; + /** + * Whether to include total size parameter in the results. Note, fetching total size property is an expensive + * operation; use it if your use case needs this value. + */ + shouldReturnTotalSize?: boolean; } diff --git a/src/api/parameters/setContentState.ts b/src/api/parameters/setContentState.ts new file mode 100644 index 00000000..13ae347a --- /dev/null +++ b/src/api/parameters/setContentState.ts @@ -0,0 +1,8 @@ +export interface SetContentState { + /** The Id of the content whose content state is to be set. */ + contentId: string; + /** The Id of the content */ + contentStateId?: number; + name?: string; + color?: string; +} diff --git a/src/api/parameters/updateUserProperty.ts b/src/api/parameters/updateUserProperty.ts new file mode 100644 index 00000000..4cb8ec73 --- /dev/null +++ b/src/api/parameters/updateUserProperty.ts @@ -0,0 +1,11 @@ +import { UserPropertyUpdate } from '../models'; + +export interface UpdateUserProperty extends UserPropertyUpdate { + /** + * The account ID of the user. The accountId uniquely identifies the user across all Atlassian products. For + * example, 384093:32b4d9w0-f6a5-3535-11a3-9c8c88d10192 + */ + userId: string; + /** The key of the user property. */ + key: string; +} diff --git a/src/api/settings.ts b/src/api/settings.ts index f2494c55..9bc7127f 100644 --- a/src/api/settings.ts +++ b/src/api/settings.ts @@ -230,4 +230,26 @@ export class Settings { return this.client.sendRequest(config, callback); } + + /** Gets Content State settings for a space */ + async getContentStateSettings( + parameters: Parameters.GetContentStateSettings, + callback: Callback + ): Promise; + /** Gets Content State settings for a space */ + async getContentStateSettings( + parameters: Parameters.GetContentStateSettings, + callback?: never + ): Promise; + async getContentStateSettings( + parameters: Parameters.GetContentStateSettings, + callback?: Callback, + ): Promise { + const config: RequestConfig = { + url: `/api/space/${parameters.spaceKey}/state/settings`, + method: 'GET', + }; + + return this.client.sendRequest(config, callback); + } } diff --git a/src/api/users.ts b/src/api/users.ts index 2ca21b67..a2d83754 100644 --- a/src/api/users.ts +++ b/src/api/users.ts @@ -119,7 +119,7 @@ export class Users { * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to access the Confluence site * ('Can use' global permission). */ - async getGroupMembershipsForUser( + async getGroupMembershipsForUser( parameters: Parameters.GetGroupMembershipsForUser, callback: Callback ): Promise; @@ -129,11 +129,11 @@ export class Users { * **[Permissions](https://confluence.atlassian.com/x/_AozKw) required**: Permission to access the Confluence site * ('Can use' global permission). */ - async getGroupMembershipsForUser( + async getGroupMembershipsForUser( parameters: Parameters.GetGroupMembershipsForUser, callback?: never ): Promise; - async getGroupMembershipsForUser( + async getGroupMembershipsForUser( parameters: Parameters.GetGroupMembershipsForUser, callback?: Callback, ): Promise { diff --git a/src/clients/confluenceClient.ts b/src/clients/confluenceClient.ts index 60916d8f..c036a9d0 100644 --- a/src/clients/confluenceClient.ts +++ b/src/clients/confluenceClient.ts @@ -1,11 +1,13 @@ import { BaseClient } from './baseClient'; import { + Analytics, Audit, Content, ContentAttachments, ContentBody, ContentChildrenAndDescendants, ContentComments, + ContentContentState, ContentLabels, ContentMacroBody, ContentPermissions, @@ -32,12 +34,14 @@ import { } from '../api'; export class ConfluenceClient extends BaseClient { + analytics = new Analytics(this); audit = new Audit(this); content = new Content(this); contentAttachments = new ContentAttachments(this); contentBody = new ContentBody(this); contentChildrenAndDescendants = new ContentChildrenAndDescendants(this); contentComments = new ContentComments(this); + contentContentState = new ContentContentState(this); contentLabels = new ContentLabels(this); contentMacroBody = new ContentMacroBody(this); contentPermissions = new ContentPermissions(this); From fa1d740d51efd4b207efa01e52b5f6e63b38c9d7 Mon Sep 17 00:00:00 2001 From: Vladislav Tupikin Date: Sat, 2 Apr 2022 20:47:52 +0400 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bbe4cc7..a0bb4b12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - `deleteUserProperty` method added to `Experimental`. - `getContentStateSettings` method added to `Settings`. - Another small changes. +- Personal Access token authentication added. ### 1.3.0